diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 74dea387a..4cc6d4f05 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 ### Version
-_Version of Slic3r Prusa Edition used goes here_
+_Version of Slic3r++ used goes here_
 
-_Use `About->About Slic3r` for release versions_
+_Use `About->About Slic3r++` for release versions_
 
 _For -dev versions, use `git describe --tag` or get the hash value for the version you downloaded or `git rev-parse HEAD`_
 
@@ -18,9 +18,9 @@ _What 3D printer brand / version are you printing on, is it a stock model or did
   * _If this is a command-line slicing issue, include the options used_
 * _Expected Results_
 * _Actual Results_
-  * _Screenshots from __*Slic3r*__ preview are preferred_
+  * _Screenshots from __*Slic3r++*__ preview are preferred_
 
 _Is this a new feature request?_
 
 #### Project File (.3MF) where problem occurs
-_Upload a Slic3r PE Project File (.3MF) (`Plater -> Export plate as 3MF` for Slic3r PE 1.41.2 and older, `File -> Save` / `Save Project` for Slic3r PE 1.42.0-alpha and newer)_
+_Upload a Slic3r++ Project File (.3MF) (`Plater -> Export plate as 3MF` for Slic3r PE 1.41.2 and older, `File -> Save` / `Save Project` for Slic3r++, Slic3r PE 1.42.0-alpha and newer)_
diff --git a/Build.PL b/Build.PL
index 3f1cf2633..dfbeac8d9 100644
--- a/Build.PL
+++ b/Build.PL
@@ -3,7 +3,7 @@
 print "This script is currently used for installing Perl dependenices for running\n";
 print "the libslic3r unit / integration tests through Perl prove.\n";
 print "If you don't plan to run the unit / integration tests, you don't need to\n";
-print "install these dependencies to build and run Slic3r.\n";
+print "install these dependencies to build and run Slic3r++.\n";
 
 use strict;
 use warnings;
@@ -122,7 +122,7 @@ EOF
 }
 
 print "\n";
-print "In the next step, you need to build the Slic3r C++ library.\n";
+print "In the next step, you need to build the Slic3r++ C++ library.\n";
 print "1) Create a build directory and change to it\n";
 print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
 print "3) run make\n";
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01be581dd..9ccb6e481 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,13 +49,18 @@ foreach (_cache_var ${_cache_vars})
     endif ()
 endforeach()
 
+if (SLIC3R_GUI)
+    add_definitions(-DSLIC3R_GUI)
+endif ()
+
 if (MSVC)
     if (SLIC3R_MSVC_COMPILE_PARALLEL)
 	   add_compile_options(/MP)
     endif ()
     # /bigobj (Increase Number of Sections in .Obj file)
     # error C3859: virtual memory range for PCH exceeded; please recompile with a command line option of '-Zm90' or greater
-    add_compile_options(-bigobj -Zm316)
+    # Generate symbols at every build target, even for the release.
+    add_compile_options(-bigobj -Zm316 /Zi)
 endif ()
 
 # Display and check CMAKE_PREFIX_PATH
@@ -135,6 +140,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
         # Workaround for an old CMake, which does not understand CMAKE_CXX_STANDARD.
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     endif()
+
+    # Boost on Raspberry-Pi does not link to pthreads.
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    find_package(Threads REQUIRED)
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
@@ -226,7 +235,11 @@ if(SLIC3R_STATIC)
 endif()
 #set(Boost_DEBUG ON)
 # set(Boost_COMPILER "-vc120")
-find_package(Boost REQUIRED COMPONENTS system filesystem thread log locale regex)
+if(NOT WIN32)
+    # boost::process was introduced first in version 1.64.0
+    set(MINIMUM_BOOST_VERSION "1.64.0")
+endif()
+find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS system filesystem thread log locale regex)
 if(Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
     if (APPLE)
@@ -317,7 +330,7 @@ include_directories(${GLEW_INCLUDE_DIRS})
 # l10n
 set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
 add_custom_target(pot
-    COMMAND xgettext --keyword=L --from-code=UTF-8 --debug
+    COMMAND xgettext --keyword=L --add-comments=TRN --from-code=UTF-8 --debug
         -f "${L10N_DIR}/list.txt"
         -o "${L10N_DIR}/Slic3r++.pot"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -348,7 +361,7 @@ endif()
 if (WIN32)
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 else ()
-    set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/slic3r-prusa3d")
+    set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/slic3r++")
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${SLIC3R_FHS_RESOURCES}")
 endif ()
 configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)
diff --git a/slic3r.sublime-project b/PrusaSlicer.sublime-project
similarity index 100%
rename from slic3r.sublime-project
rename to PrusaSlicer.sublime-project
diff --git a/README.md b/README.md
index 159195f1f..29017303e 100644
--- a/README.md
+++ b/README.md
@@ -4,25 +4,27 @@ A: Yeah!
 
 Slic3r
 ======
-Prebuilt Windows 32b is available through the [git releases page](https://github.com/supermerill/Slic3r/releases).
+Prebuilt Windows 64b is available through the [git releases page](https://github.com/supermerill/Slic3r/releases).
 
 <img width=256 src=https://cloud.githubusercontent.com/assets/31754/22719818/09998c92-ed6d-11e6-9fa0-09de638f3a36.png />
 
-Slic3r takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for 
-3D printers. It's compatible with any modern printer based on the RepRap toolchain,
-including all those based on the Marlin, Sprinter and Repetier firmware. It also works
+Slic3r++ takes 3D models (STL, OBJ, AMF) and converts them into G-code
+instructions for FFF printers or PNG layers for mSLA 3D printers. It's
+compatible with any modern printer based on the RepRap toolchain, including all
+those based on the Marlin, Prusa, Sprinter and Repetier firmware. It also works
 with Mach3, LinuxCNC and Machinekit controllers.
 
-See the [project homepage](http://slic3r.org/) at slic3r.org and the
-[manual](http://manual.slic3r.org/) for more information.
+Slic3r++ is based on [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranelucci and the RepRap community.
+
+See the [project homepage](https://www.prusa3d.com/slic3r-prusa-edition/) and
+the [documentation directory](doc/) for more information.
 
 ### What language is it written in?
 
 Almost everything are written in C++,
 
-The C++ API is public and its use in other projects is encouraged.
-The goal is to make Slic3r fully modular so that any part of its logic
-can be used separately.
+The slicing core is the `libslic3r` library, which can be built and used in a standalone way.
+The command line interface is a thin wrapper over `libslic3r`.
 
 ### What are this fork main features/differences?
 
@@ -32,7 +34,7 @@ can be used separately.
 * Better Thin walls (anchored inside the print, no more random bits at the ends).
 * Can join perimeters into a big one to avoid travel moves.
 * Many other little options and corrections (like the filled concentric pattern).
-* It has also all the current slic3rPE features.
+* It has also all the current slic3rPE/PrusaSlicer features.
 
 #### Complete changelog [here](https://github.com/supermerill/Slic3r/wiki)
 
@@ -61,20 +63,21 @@ Other major features are:
 * several infill patterns including honeycomb, spirals, Hilbert curves, gyroid
 * support material, raft, brim, skirt
 * **standby temperature** and automatic wiping for multi-extruder printing
-* customizable **G-code macros** and output filename with variable placeholders
+* [customizable **G-code macros**](https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-Prusa-Edition-Macro-Language) and output filename with variable placeholders
 * support for **post-processing scripts**
 * **cooling logic** controlling fan speed and dynamic print speed
 
-### How to install?
+### Development
 
 You can download a precompiled package from the release page.
 it will run without the need for any dependency.
 
-If you want to compile the source yourself follow the instructions on one of these wiki pages: 
-* [Linux](https://github.com/supermerill/Slic3r/tree/master/doc/How%20to%20build%20-%20UNIX.md)
-* [Windows](https://github.com/supermerill/Slic3r/tree/master/doc/How%20to%20build%20-%20Windows.md)
-* [Mac OSX](https://github.com/supermerill/Slic3r/tree/master/doc/How_to_build_Slic3r.txt)
 
+If you want to compile the source yourself, follow the instructions on one of
+these documentation pages:
+* [Linux](doc/How%20to%20build%20-%20Linux%20et%20al.md)
+* [macOS](doc/How%20to%20build%20-%20Mac%20OS.md)
+* [Windows](doc/How%20to%20build%20-%20Windows.md)
 ### Can I help?
 
 Sure! You can do the following to find things that are available to help with:
@@ -83,315 +86,12 @@ Sure! You can do the following to find things that are available to help with:
 Before sending patches and pull requests contact me (preferably through opening a github issue or commenting on an existing, related, issue) to discuss your proposed
 changes: this way we'll ensure nobody wastes their time and no conflicts arise in development.
 
-### What's Slic3r license?
+Slic3r++ is licensed under the _GNU Affero General Public License, version 3_.
+The Slic3r++ is originally based on Slic3r by Alessandro Ranellucci.
 
 Slic3r is licensed under the _GNU Affero General Public License, version 3_.
 The first author is Alessandro Ranellucci, and many contributors
-Then the he Prusa team
+Then the Prusa team
 Then Durand remi for this fork
 
-The [Silk icon set](http://www.famfamfam.com/lab/icons/silk/) used (and modified) in Slic3r is
-licensed under the _Creative Commons Attribution 3.0 License_.
-The author of the Silk icon set is Mark James.
-
-### How can I invoke slic3r.pl using the command line? (not up-to-date yet, use the --help command instead)
-
-    Usage: slic3r.pl [ OPTIONS ] [ file.stl ] [ file2.stl ] ...
-    
-        --help              Output this usage screen and exit
-        --version           Output the version of Slic3r and exit
-        --save <file>       Save configuration to the specified file
-        --load <file>       Load configuration from the specified file. It can be used
-                            more than once to load options from multiple files.
-        -o, --output <file> File to output gcode to (by default, the file will be saved
-                            into the same directory as the input file using the
-                            --output-filename-format to generate the filename.) If a
-                            directory is specified for this option, the output will
-                            be saved under that directory, and the filename will be
-                            generated by --output-filename-format.
-
-      Non-slicing actions (no G-code will be generated):
-        --repair            Repair given STL files and save them as <name>_fixed.obj
-        --cut <z>           Cut given input files at given Z (relative) and export
-                            them as <name>_upper.stl and <name>_lower.stl
-        --split             Split the shells contained in given STL file into several STL files
-        --info              Output information about the supplied file(s) and exit
-    
-        -j, --threads <num> Number of threads to use (1+, default: 2)
-    
-      GUI options:
-        --gui               Forces the GUI launch instead of command line slicing (if you
-                            supply a model file, it will be loaded into the plater)
-        --no-plater         Disable the plater tab
-        --no-gui            Forces the command line slicing instead of gui. 
-                            This takes precedence over --gui if both are present.
-        --autosave <file>   Automatically export current configuration to the specified file
-    
-      Output options:
-        --output-filename-format
-                            Output file name format; all config options enclosed in brackets
-                            will be replaced by their values, as well as [input_filename_base]
-                            and [input_filename] (default: [input_filename_base].gcode)
-        --post-process      Generated G-code will be processed with the supplied script;
-                            call this more than once to process through multiple scripts.
-        --export-png        Export zipped PNG files containing slices instead of G-code.
-        -m, --merge         If multiple files are supplied, they will be composed into a single
-                            print rather than processed individually.
-    
-      Printer options:
-        --nozzle-diameter   Diameter of nozzle in mm (default: 0.5)
-        --print-center      Coordinates in mm of the point to center the print around
-                            (default: 100,100)
-        --z-offset          Additional height in mm to add to vertical coordinates
-                            (+/-, default: 0)
-        --gcode-flavor      The type of G-code to generate (reprap/teacup/repetier/makerware/sailfish/mach3/machinekit/smoothie/no-extrusion,
-                            default: reprap)
-        --use-relative-e-distances Enable this to get relative E values (default: no)
-        --use-firmware-retraction  Enable firmware-controlled retraction using G10/G11 (default: no)
-        --use-volumetric-e  Express E in cubic millimeters and prepend M200 (default: no)
-        --gcode-comments    Make G-code verbose by adding comments (default: no)
-    
-      Filament options:
-        --filament-diameter Diameter in mm of your raw filament (default: 3)
-        --extrusion-multiplier
-                            Change this to alter the amount of plastic extruded. There should be
-                            very little need to change this value, which is only useful to
-                            compensate for filament packing (default: 1)
-        --temperature       Extrusion temperature in degree Celsius, set 0 to disable (default: 200)
-        --first-layer-temperature Extrusion temperature for the first layer, in degree Celsius,
-                            set 0 to disable (default: same as --temperature)
-        --bed-temperature   Heated bed temperature in degree Celsius, set 0 to disable (default: 0)
-        --first-layer-bed-temperature Heated bed temperature for the first layer, in degree Celsius,
-                            set 0 to disable (default: same as --bed-temperature)
-    
-      Speed options:
-        --travel-speed      Speed of non-print moves in mm/s (default: 130)
-        --perimeter-speed   Speed of print moves for perimeters in mm/s (default: 30)
-        --small-perimeter-speed
-                            Speed of print moves for small perimeters in mm/s or % over perimeter speed
-                            (default: 30)
-        --external-perimeter-speed
-                            Speed of print moves for the external perimeter in mm/s or % over perimeter speed
-                            (default: 70%)
-        --infill-speed      Speed of print moves in mm/s (default: 60)
-        --solid-infill-speed Speed of print moves for solid surfaces in mm/s or % over infill speed
-                            (default: 60)
-        --top-solid-infill-speed Speed of print moves for top surfaces in mm/s or % over solid infill speed
-                            (default: 50)
-        --support-material-speed
-                            Speed of support material print moves in mm/s (default: 60)
-        --support-material-interface-speed
-                            Speed of support material interface print moves in mm/s or % over support material
-                            speed (default: 100%)
-        --bridge-speed      Speed of bridge print moves in mm/s (default: 60)
-        --gap-fill-speed    Speed of gap fill print moves in mm/s (default: 20)
-        --first-layer-speed Speed of print moves for bottom layer, expressed either as an absolute
-                            value or as a percentage over normal speeds (default: 30%)
-    
-      Acceleration options:
-        --perimeter-acceleration
-                            Overrides firmware's default acceleration for perimeters. (mm/s^2, set zero
-                            to disable; default: 0)
-        --infill-acceleration
-                            Overrides firmware's default acceleration for infill. (mm/s^2, set zero
-                            to disable; default: 0)
-        --bridge-acceleration
-                            Overrides firmware's default acceleration for bridges. (mm/s^2, set zero
-                            to disable; default: 0)
-        --first-layer-acceleration
-                            Overrides firmware's default acceleration for first layer. (mm/s^2, set zero
-                            to disable; default: 0)
-        --default-acceleration
-                            Acceleration will be reset to this value after the specific settings above
-                            have been applied. (mm/s^2, set zero to disable; default: 0)
-    
-      Accuracy options:
-        --layer-height      Layer height in mm (default: 0.3)
-        --first-layer-height Layer height for first layer (mm or %, default: 0.35)
-        --infill-every-layers
-                            Infill every N layers (default: 1)
-        --solid-infill-every-layers
-                            Force a solid layer every N layers (default: 0)
-    
-      Print options:
-        --perimeters        Number of perimeters/horizontal skins (range: 0+, default: 3)
-        --top-solid-layers  Number of solid layers to do for top surfaces (range: 0+, default: 3)
-        --bottom-solid-layers  Number of solid layers to do for bottom surfaces (range: 0+, default: 3)
-        --solid-layers      Shortcut for setting the two options above at once
-        --fill-density      Infill density (range: 0%-100%, default: 40%)
-        --fill-angle        Infill angle in degrees (range: 0-90, default: 45)
-        --fill-pattern      Pattern to use to fill non-solid layers (default: honeycomb)
-        --solid-fill-pattern Pattern to use to fill solid layers (default: rectilinear)
-        --start-gcode       Load initial G-code from the supplied file. This will overwrite
-                            the default command (home all axes [G28]).
-        --end-gcode         Load final G-code from the supplied file. This will overwrite
-                            the default commands (turn off temperature [M104 S0],
-                            home X axis [G28 X], disable motors [M84]).
-        --before-layer-gcode  Load before-layer-change G-code from the supplied file (default: nothing).
-        --layer-gcode       Load after-layer-change G-code from the supplied file (default: nothing).
-        --toolchange-gcode  Load tool-change G-code from the supplied file (default: nothing).
-        --seam-position     Position of loop starting points (random/nearest/aligned, default: aligned).
-        --external-perimeters-first Reverse perimeter order. (default: no)
-        --spiral-vase       Experimental option to raise Z gradually when printing single-walled vases
-                            (default: no)
-        --only-retract-when-crossing-perimeters
-                            Disable retraction when travelling between infill paths inside the same island.
-                            (default: no)
-        --solid-infill-below-area
-                            Force solid infill when a region has a smaller area than this threshold
-                            (mm^2, default: 70)
-        --infill-only-where-needed
-                            Only infill under ceilings (default: no)
-        --infill-first      Make infill before perimeters (default: no)
-    
-       Quality options (slower slicing):
-        --extra-perimeters  Add more perimeters when needed (default: yes)
-        --avoid-crossing-perimeters Optimize travel moves so that no perimeters are crossed (default: no)
-        --thin-walls        Detect single-width walls (default: yes)
-        --overhangs         Experimental option to use bridge flow, speed and fan for overhangs
-                            (default: yes)
-    
-       Support material options:
-        --support-material  Generate support material for overhangs
-        --support-material-threshold
-                            Overhang threshold angle (range: 0-90, set 0 for automatic detection,
-                            default: 0)
-        --support-material-pattern
-                            Pattern to use for support material (default: honeycomb)
-        --support-material-spacing
-                            Spacing between pattern lines (mm, default: 2.5)
-        --support-material-angle
-                            Support material angle in degrees (range: 0-90, default: 0)
-        --support-material-contact-distance
-                            Vertical distance between object and support material
-                            (0+, default: 0.2)
-        --support-material-interface-layers
-                            Number of perpendicular layers between support material and object (0+, default: 3)
-        --support-material-interface-spacing
-                            Spacing between interface pattern lines (mm, set 0 to get a solid layer, default: 0)
-        --raft-layers       Number of layers to raise the printed objects by (range: 0+, default: 0)
-        --support-material-enforce-layers
-                            Enforce support material on the specified number of layers from bottom,
-                            regardless of --support-material and threshold (0+, default: 0)
-        --dont-support-bridges
-                            Experimental option for preventing support material from being generated under bridged areas (default: yes)
-    
-       Retraction options:
-        --retract-length    Length of retraction in mm when pausing extrusion (default: 1)
-        --retract-speed     Speed for retraction in mm/s (default: 30)
-        --retract-restart-extra
-                            Additional amount of filament in mm to push after
-                            compensating retraction (default: 0)
-        --retract-before-travel
-                            Only retract before travel moves of this length in mm (default: 2)
-        --retract-lift      Lift Z by the given distance in mm when retracting (default: 0)
-        --retract-lift-above Only lift Z when above the specified height (default: 0)
-        --retract-lift-below Only lift Z when below the specified height (default: 0)
-        --retract-layer-change
-                            Enforce a retraction before each Z move (default: no)
-        --wipe              Wipe the nozzle while doing a retraction (default: no)
-    
-       Retraction options for multi-extruder setups:
-        --retract-length-toolchange
-                            Length of retraction in mm when disabling tool (default: 10)
-        --retract-restart-extra-toolchange
-                            Additional amount of filament in mm to push after
-                            switching tool (default: 0)
-    
-       Cooling options:
-        --cooling           Enable fan and cooling control
-        --min-fan-speed     Minimum fan speed (default: 35%)
-        --max-fan-speed     Maximum fan speed (default: 100%)
-        --bridge-fan-speed  Fan speed to use when bridging (default: 100%)
-        --top-fan-speed     Fan speed to use when printing top layer (default: 100%)
-        --fan-below-layer-time Enable fan if layer print time is below this approximate number
-                            of seconds (default: 60)
-        --slowdown-below-layer-time Slow down if layer print time is below this approximate number
-                            of seconds (default: 30)
-        --min-print-speed   Minimum print speed (mm/s, default: 10)
-        --disable-fan-first-layers Disable fan for the first N layers (default: 1)
-        --fan-always-on     Keep fan always on at min fan speed, even for layers that don't need
-                            cooling
-    
-       Skirt options:
-        --skirts            Number of skirts to draw (0+, default: 1)
-        --skirt-distance    Distance in mm between innermost skirt and object
-                            (default: 6)
-        --skirt-height      Height of skirts to draw (expressed in layers, 0+, default: 1)
-        --min-skirt-length  Generate no less than the number of loops required to consume this length
-                            of filament on the first layer, for each extruder (mm, 0+, default: 0)
-        --brim-width        Width of the brim that will get added to each object to help adhesion
-                            (mm, default: 0)
-    
-       Transform options:
-        --scale             Factor for scaling input object (default: 1)
-        --rotate            Rotation angle in degrees (0-360, default: 0)
-        --duplicate         Number of items with auto-arrange (1+, default: 1)
-        --duplicate-grid    Number of items with grid arrangement (default: 1,1)
-        --duplicate-distance Distance in mm between copies (default: 6)
-        --dont-arrange      Don't arrange the objects on the build plate. The model coordinates
-                            define the absolute positions on the build plate. 
-                            The option --print-center will be ignored.
-        --xy-size-compensation
-                            Grow/shrink objects by the configured absolute distance (mm, default: 0)
-    
-       Sequential printing options:
-        --complete-objects  When printing multiple objects and/or copies, complete each one before
-                            starting the next one; watch out for extruder collisions (default: no)
-        --extruder-clearance-radius Radius in mm above which extruder won't collide with anything
-                            (default: 20)
-        --extruder-clearance-height Maximum vertical extruder depth; i.e. vertical distance from
-                            extruder tip and carriage bottom (default: 20)
-    
-       Miscellaneous options:
-        --notes             Notes to be added as comments to the output file
-        --resolution        Minimum detail resolution (mm, set zero for full resolution, default: 0)
-    
-       Flow options (advanced):
-        --extrusion-width   Set extrusion width manually; it accepts either an absolute value in mm
-                            (like 0.65) or a percentage over layer height (like 200%)
-        --first-layer-extrusion-width
-                            Set a different extrusion width for first layer
-        --perimeter-extrusion-width
-                            Set a different extrusion width for perimeters
-        --external-perimeter-extrusion-width
-                            Set a different extrusion width for external perimeters
-        --infill-extrusion-width
-                            Set a different extrusion width for infill
-        --solid-infill-extrusion-width
-                            Set a different extrusion width for solid infill
-        --top-infill-extrusion-width
-                            Set a different extrusion width for top infill
-        --support-material-extrusion-width
-                            Set a different extrusion width for support material
-        --infill-overlap    Overlap between infill and perimeters (default: 15%)
-        --bridge-flow-ratio Multiplier for extrusion when bridging (> 0, default: 1)
-        --over-bridge-flow-ratio Multiplier for extrusion when printing the layer above a bride (> 0, default: 1.15)
-    
-       Multiple extruder options:
-        --extruder-offset   Offset of each extruder, if firmware doesn't handle the displacement
-                            (can be specified multiple times, default: 0x0)
-        --perimeter-extruder
-                            Extruder to use for perimeters and brim (1+, default: 1)
-        --infill-extruder   Extruder to use for infill (1+, default: 1)
-        --solid-infill-extruder   Extruder to use for solid infill (1+, default: 1)
-        --support-material-extruder
-                            Extruder to use for support material, raft and skirt (1+, default: 1)
-        --support-material-interface-extruder
-                            Extruder to use for support material interface (1+, default: 1)
-                            --ooze-prevention   Drop temperature and park extruders outside a full skirt for automatic wiping
-                            (default: no)
-        --ooze-prevention   Drop temperature and park extruders outside a full skirt for automatic wiping
-                            (default: no)
-        --standby-temperature-delta
-                            Temperature difference to be applied when an extruder is not active and
-                            --ooze-prevention is enabled (default: -5)
-
-
-If you want to change a preset file, just do
-
-    slic3r.pl --load config.ini --layer-height 0.25 --save config.ini
-
-If you want to slice a file overriding an option contained in your preset file:
-
-    slic3r.pl --load config.ini --layer-height 0.25 file.stl
+Please refer to the [Command Line Interface](https://github.com/prusa3d/PrusaSlicer/wiki/Command-Line-Interface) wiki page.
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 1e025adac..d29b8611e 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# This CMake project downloads, configures and builds Slic3r PE dependencies on Unix and Windows.
+# This CMake project downloads, configures and builds Slic3r++ dependencies on Unix and Windows.
 #
 # When using this script, it's recommended to perform an out-of-source build using CMake.
 #
 # All the dependencies are installed in a `destdir` directory in the root of the build directory,
 # in a traditional Unix-style prefix structure. The destdir can be used directly by CMake
 # when building Slic3r - to do this, set the CMAKE_PREFIX_PATH to ${destdir}/usr/local.
-# Warning: On UNIX/Linux, you also need to set -DSLIC3R_STATIC=1 when building Slic3r.
+# Warning: On UNIX/Linux, you also need to set -DSlic3r_STATIC=1 when building Slic3r.
 #
 # For better clarity of console output, it's recommended to _not_ use a parallelized build
 # for the top-level command, ie. use `make -j 1` or `ninja -j 1` to force single-threaded top-level
@@ -32,6 +32,7 @@ if (NPROC EQUAL 0)
 endif ()
 
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
+
 option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON)
 option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3.1 (Linux only)" OFF)
 
@@ -73,7 +74,9 @@ else ()
     include("deps-linux.cmake")
 endif()
 
-add_custom_target(deps ALL
+if (MSVC)
+
+    add_custom_target(deps ALL
     DEPENDS
         dep_boost
         dep_tbb
@@ -81,8 +84,22 @@ add_custom_target(deps ALL
         dep_wxwidgets
         dep_gtest
         dep_nlopt
-        dep_libpng
-)
+        dep_zlib    # on Windows we still need zlib
+    )
+
+else()
+
+    add_custom_target(deps ALL
+    DEPENDS
+        dep_boost
+        dep_tbb
+        dep_libcurl
+        dep_wxwidgets
+        dep_gtest
+        dep_nlopt
+    )
+
+endif()
 
 # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands
 # because they seem to generate bogus build files (possibly a bug in ExternalProject).
diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake
index 125553f77..03e8e12d5 100644
--- a/deps/deps-linux.cmake
+++ b/deps/deps-linux.cmake
@@ -3,7 +3,6 @@ set(DEP_CMAKE_OPTS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 
 include("deps-unix-common.cmake")
 
-
 ExternalProject_Add(dep_boost
     EXCLUDE_FROM_ALL 1
     URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz"
@@ -25,19 +24,6 @@ ExternalProject_Add(dep_boost
     INSTALL_COMMAND ""   # b2 does that already
 )
 
-ExternalProject_Add(dep_libpng
-    EXCLUDE_FROM_ALL 1
-    URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz"
-    URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f
-    CMAKE_GENERATOR "${DEP_MSVC_GEN}"
-    CMAKE_ARGS
-        -DPNG_SHARED=OFF
-        -DPNG_TESTS=OFF
-        ${DEP_CMAKE_OPTS}
-    INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
-    INSTALL_COMMAND ""
-)
-
 ExternalProject_Add(dep_libopenssl
     EXCLUDE_FROM_ALL 1
     URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz"
@@ -55,7 +41,7 @@ ExternalProject_Add(dep_libopenssl
 
 ExternalProject_Add(dep_libcurl
     EXCLUDE_FROM_ALL 1
-   DEPENDS dep_libopenssl
+    DEPENDS dep_libopenssl
     URL "https://curl.haxx.se/download/curl-7.58.0.tar.gz"
     URL_HASH SHA256=cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115
     BUILD_IN_SOURCE 1
@@ -127,7 +113,7 @@ ExternalProject_Add(dep_wxwidgets
         --with-libxpm=builtin
         --with-libjpeg=builtin
         --with-libtiff=builtin
-        --with-zlib=builtin
+        --with-zlib
         --with-expat=builtin
         --disable-precomp-headers
         --enable-debug_info
diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake
index 4676b14fc..c7c6819e3 100644
--- a/deps/deps-macos.cmake
+++ b/deps/deps-macos.cmake
@@ -87,26 +87,14 @@ ExternalProject_Add(dep_libcurl
     INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
 )
 
-ExternalProject_Add(dep_libpng
-    EXCLUDE_FROM_ALL 1
-    URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz"
-    URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f
-    CMAKE_GENERATOR "${DEP_MSVC_GEN}"
-    CMAKE_ARGS
-        -DPNG_SHARED=OFF
-        -DPNG_TESTS=OFF
-        ${DEP_CMAKE_OPTS}
-    INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
-    INSTALL_COMMAND ""
-)
-
-
 ExternalProject_Add(dep_wxwidgets
     EXCLUDE_FROM_ALL 1
-    URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2"
-    URL_HASH SHA256=4cb8d23d70f9261debf7d6cfeca667fc0a7d2b6565adb8f1c484f9b674f1f27a
+    GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets"
+    GIT_TAG v3.1.1-patched
+#    URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2"
+#    URL_HASH SHA256=4cb8d23d70f9261debf7d6cfeca667fc0a7d2b6565adb8f1c484f9b674f1f27a
     BUILD_IN_SOURCE 1
-    PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/wxwidgets-pngprefix.h" src/png/pngprefix.h
+#    PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/wxwidgets-pngprefix.h" src/png/pngprefix.h
     CONFIGURE_COMMAND env "CXXFLAGS=${DEP_WERRORS_SDK}" "CFLAGS=${DEP_WERRORS_SDK}" ./configure
         "--prefix=${DESTDIR}/usr/local"
         --disable-shared
@@ -119,7 +107,7 @@ ExternalProject_Add(dep_wxwidgets
         --with-libxpm=builtin
         --with-libjpeg=builtin
         --with-libtiff=builtin
-        --with-zlib=builtin
+        --with-zlib
         --with-expat=builtin
         --disable-debug
         --disable-debug_flag
diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake
index 6c0a1b182..3cf843f73 100644
--- a/deps/deps-unix-common.cmake
+++ b/deps/deps-unix-common.cmake
@@ -8,30 +8,27 @@ ExternalProject_Add(dep_tbb
     CMAKE_ARGS
         -DTBB_BUILD_SHARED=OFF
         -DTBB_BUILD_TESTS=OFF
+        -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
         ${DEP_CMAKE_OPTS}
-    INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
 )
 
 ExternalProject_Add(dep_gtest
     EXCLUDE_FROM_ALL 1
     URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz"
     URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
-    CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS}
-    INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
+    CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
 )
 
 ExternalProject_Add(dep_nlopt
     EXCLUDE_FROM_ALL 1
     URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz"
     URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
-    CMAKE_GENERATOR "${DEP_MSVC_GEN}"
     CMAKE_ARGS
         -DBUILD_SHARED_LIBS=OFF
         -DNLOPT_PYTHON=OFF
         -DNLOPT_OCTAVE=OFF
         -DNLOPT_MATLAB=OFF
         -DNLOPT_GUILE=OFF
+        -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
         ${DEP_CMAKE_OPTS}
-    INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
-    INSTALL_COMMAND ""
 )
diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake
index 7276277e6..b3b31e5f3 100644
--- a/deps/deps-windows.cmake
+++ b/deps/deps-windows.cmake
@@ -62,7 +62,7 @@ ExternalProject_Add(dep_tbb
         -DTBB_BUILD_SHARED=OFF
         -DTBB_BUILD_TESTS=OFF
         "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
-    BUILD_COMMAND msbuild /P:Configuration=Release INSTALL.vcxproj
+    BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
     INSTALL_COMMAND ""
 )
 if (${DEP_DEBUG})
@@ -70,7 +70,7 @@ if (${DEP_DEBUG})
     ExternalProject_Add_Step(dep_tbb build_debug
         DEPENDEES build
         DEPENDERS install
-        COMMAND msbuild /P:Configuration=Debug INSTALL.vcxproj
+        COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
         WORKING_DIRECTORY "${BINARY_DIR}"
     )
 endif ()
@@ -86,7 +86,7 @@ ExternalProject_Add(dep_gtest
         -Dgtest_force_shared_crt=ON
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
         "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
-    BUILD_COMMAND msbuild /P:Configuration=Release INSTALL.vcxproj
+    BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
     INSTALL_COMMAND ""
 )
 if (${DEP_DEBUG})
@@ -94,7 +94,7 @@ if (${DEP_DEBUG})
     ExternalProject_Add_Step(dep_gtest build_debug
         DEPENDEES build
         DEPENDERS install
-        COMMAND msbuild /P:Configuration=Debug INSTALL.vcxproj
+        COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
         WORKING_DIRECTORY "${BINARY_DIR}"
     )
 endif ()
@@ -114,7 +114,7 @@ ExternalProject_Add(dep_nlopt
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
         -DCMAKE_DEBUG_POSTFIX=d
         "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
-    BUILD_COMMAND msbuild /P:Configuration=Release INSTALL.vcxproj
+    BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
     INSTALL_COMMAND ""
 )
 if (${DEP_DEBUG})
@@ -122,7 +122,7 @@ if (${DEP_DEBUG})
     ExternalProject_Add_Step(dep_nlopt build_debug
         DEPENDEES build
         DEPENDERS install
-        COMMAND msbuild /P:Configuration=Debug INSTALL.vcxproj
+        COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
         WORKING_DIRECTORY "${BINARY_DIR}"
     )
 endif ()
@@ -138,7 +138,7 @@ ExternalProject_Add(dep_zlib
         "-DINSTALL_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}\\fallout"   # I found no better way of preventing zlib from creating & installing DLLs :-/
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
         "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
-    BUILD_COMMAND msbuild /P:Configuration=Release INSTALL.vcxproj
+    BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
     INSTALL_COMMAND ""
 )
 if (${DEP_DEBUG})
@@ -146,7 +146,7 @@ if (${DEP_DEBUG})
     ExternalProject_Add_Step(dep_zlib build_debug
         DEPENDEES build
         DEPENDERS install
-        COMMAND msbuild /P:Configuration=Debug INSTALL.vcxproj
+        COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj
         WORKING_DIRECTORY "${BINARY_DIR}"
     )
 endif ()
@@ -165,46 +165,6 @@ if (${DEP_DEBUG})
 endif ()
 
 
-ExternalProject_Add(dep_libpng
-    DEPENDS dep_zlib
-    EXCLUDE_FROM_ALL 1
-    URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz"
-    URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f
-    CMAKE_GENERATOR "${DEP_MSVC_GEN}"
-    CMAKE_ARGS
-        -DPNG_SHARED=OFF
-        -DPNG_TESTS=OFF
-        -DSKIP_INSTALL_FILES=ON                                   # Prevent installation of man pages et al.
-        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-        "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
-    BUILD_COMMAND msbuild /P:Configuration=Release INSTALL.vcxproj
-    INSTALL_COMMAND ""
-)
-if (${DEP_DEBUG})
-    ExternalProject_Get_Property(dep_libpng BINARY_DIR)
-    ExternalProject_Add_Step(dep_libpng build_debug
-        DEPENDEES build
-        DEPENDERS install
-        COMMAND msbuild /P:Configuration=Debug INSTALL.vcxproj
-        WORKING_DIRECTORY "${BINARY_DIR}"
-    )
-endif ()
-# The following steps are unfortunately needed to remove the _static suffix on libraries
-# (And also overwrite the dynamic .lib)
-ExternalProject_Add_Step(dep_libpng fix_static
-    DEPENDEES install
-    COMMAND "${CMAKE_COMMAND}" -E rename libpng16_static.lib libpng16.lib
-    WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\"
-)
-if (${DEP_DEBUG})
-    ExternalProject_Add_Step(dep_libpng fix_static_debug
-        DEPENDEES install
-        COMMAND "${CMAKE_COMMAND}" -E rename libpng16_staticd.lib libpng16d.lib
-        WORKING_DIRECTORY "${DESTDIR}\\usr\\local\\lib\\"
-    )
-endif ()
-
-
 if (${DEPS_BITS} EQUAL 32)
     set(DEP_LIBCURL_TARGET "x86")
 else ()
@@ -250,10 +210,12 @@ endif ()
 
 ExternalProject_Add(dep_wxwidgets
     EXCLUDE_FROM_ALL 1
-    URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2"
-    URL_HASH SHA256=c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e
+    GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets"
+    GIT_TAG v3.1.1-patched
+#    URL "https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2"
+#    URL_HASH SHA256=c925dfe17e8f8b09eb7ea9bfdcfcc13696a3e14e92750effd839f5e10726159e
     BUILD_IN_SOURCE 1
-    PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}\\wxwidgets-pngprefix.h" src\\png\\pngprefix.h
+#    PATCH_COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}\\wxwidgets-pngprefix.h" src\\png\\pngprefix.h
     CONFIGURE_COMMAND ""
     BUILD_COMMAND cd build\\msw && nmake /f makefile.vc BUILD=release SHARED=0 UNICODE=1 USE_GUI=1 "${DEP_WXWIDGETS_TARGET}"
     INSTALL_COMMAND "${CMAKE_COMMAND}" -E copy_directory include "${DESTDIR}\\usr\\local\\include"
diff --git a/deps/wxwidgets-pngprefix.h b/deps/wxwidgets-pngprefix.h
index de62e310b..67c70af80 100644
--- a/deps/wxwidgets-pngprefix.h
+++ b/deps/wxwidgets-pngprefix.h
@@ -1,4 +1,4 @@
-// Patched in Slic3r: These two were missing:
+// Patched in PrusaSlicer: These two were missing:
 #define png_write_eXIf wx_png_write_eXIf
 #define png_handle_eXIf wx_png_handle_eXIf
 
diff --git a/doc/How to build - Linux et al.md b/doc/How to build - Linux et al.md
index 14ec23b2d..67556a6f7 100644
--- a/doc/How to build - Linux et al.md	
+++ b/doc/How to build - Linux et al.md	
@@ -1,13 +1,13 @@
 
-# Building Slic3r PE on UNIX/Linux
+# Building Slic3r++ on UNIX/Linux
 
-Slic3r PE uses the CMake build system and requires several dependencies.
+Slic3r++ uses the CMake build system and requires several dependencies.
 The dependencies can be listed in `deps/deps-linux.cmake`, although they don't necessarily need to be as recent
 as the versions listed - generally versions available on conservative Linux distros such as Debian stable or CentOS should suffice.
 
 Perl is not required any more.
 
-In a typical situation, one would open a command line, go to the Slic3r sources, create a directory called `build` or similar,
+In a typical situation, one would open a command line, go to the Slic3r++ sources, create a directory called `build` or similar,
 `cd` into it and call:
 
     cmake ..
@@ -19,13 +19,13 @@ Additional CMake flags may be applicable as explained below.
 
 ### Dependency resolution
 
-By default Slic3r looks for dependencies the default way CMake looks for them, i.e. in default system locations.
-On Linux this will typically make Slic3r depend on dynamically loaded libraries from the system, however, Slic3r can be told
+By default Slic3r++ looks for dependencies the default way CMake looks for them, i.e. in default system locations.
+On Linux this will typically make Slic3r++ depend on dynamically loaded libraries from the system, however, Slic3r++ can be told
 to specifically look for static libraries with the `SLIC3R_STATIC` flag passed to cmake:
 
     cmake .. -DSLIC3R_STATIC=1
 
-Additionally, Slic3r can be built in a static manner mostly independent of the system libraries with a dependencies bundle
+Additionally, Slic3r++ can be built in a static manner mostly independent of the system libraries with a dependencies bundle
 created using CMake script in the `deps` directory (these are not interconnected with the rest of the CMake scripts).
 
 Note: We say _mostly independent_ because it's still expected the system will provide some transitive dependencies, such as GTK for wxWidgets.
@@ -37,7 +37,7 @@ To do this, go to the `deps` directory, create a `build` subdirectory (or the li
 where the target destdir is a directory of your choosing where the dependencies will be installed.
 You can also omit the `DESTDIR` option to use the default, in that case the `destdir` will be created inside the `build` directory where `cmake` is run.
 
-To pass the destdir path to the top-level Slic3r CMake script, use the `CMAKE_PREFIX_PATH` option along with turning on `SLIC3R_STATIC`:
+To pass the destdir path to the top-level Slic3r++ CMake script, use the `CMAKE_PREFIX_PATH` option along with turning on `SLIC3R_STATIC`:
 
     cmake .. -DSLIC3R_STATIC=1 -DCMAKE_PREFIX_PATH=<path to destdir>/usr/local
 
@@ -48,24 +48,24 @@ This is because wxWidgets hardcode the installation path.
 
 ### wxWidgets version
 
-By default, Slic3r PE looks for wxWidgets 3.1, this is because the 3.1 version has
+By default, Slic3r++ looks for wxWidgets 3.1, this is because the 3.1 version has
 a number of bugfixes and improvements not found in 3.0. However, it can also be built with wxWidgets 3.0.
 This is done by passing this option to CMake:
 
     -DSLIC3R_WX_STABLE=1
 
-Note that Slic3r PE is tested with wxWidgets 3.0 somewhat sporadically and so there may be bugs in bleeding edge releases.
+Note that Slic3r++ is tested with wxWidgets 3.0 somewhat sporadically and so there may be bugs in bleeding edge releases.
 
 ### Build variant
 
-By default Slic3r builds the release variant.
+By default Slic3r++ builds the release variant.
 To create a debug build, use the following CMake flag:
 
     -DCMAKE_BUILD_TYPE=Debug
 
 ### Enabling address sanitizer
 
-If you're using GCC/Clang compiler, it is possible to build Slic3r with the built-in address sanitizer enabled to help detect memory-corruption issues.
+If you're using GCC/Clang compiler, it is possible to build Slic3r++ with the built-in address sanitizer enabled to help detect memory-corruption issues.
 To enable it, simply use the following CMake flag:
 
     -DSLIC3R_ASAN=1
@@ -74,12 +74,12 @@ This requires GCC>4.8 or Clang>3.1.
 
 ### Installation
 
-At runtime, Slic3r needs a way to access its resource files. By default, it looks for a `resources` directory relative to its binary.
+At runtime, Slic3r++ needs a way to access its resource files. By default, it looks for a `resources` directory relative to its binary.
 
-If you instead want Slic3r installed in a structure according to the File System Hierarchy Standard, use the `SLIC3R_FHS` flag
+If you instead want Slic3r++ installed in a structure according to the File System Hierarchy Standard, use the `SLIC3R_FHS` flag
 
     cmake .. -DSLIC3R_FHS=1
 
-This will make Slic3r look for a fixed-location `share/slic3r-prusa3d` directory instead (note that the location becomes hardcoded).
+This will make Slic3r++ look for a fixed-location `share/slic3r-prusa3d` directory instead (note that the location becomes hardcoded).
 
-You can then use the `make install` target to install Slic3r.
+You can then use the `make install` target to install Slic3r++.
diff --git a/doc/How to build - Mac OS.md b/doc/How to build - Mac OS.md
index 670e9fd87..e03fa475d 100644
--- a/doc/How to build - Mac OS.md	
+++ b/doc/How to build - Mac OS.md	
@@ -1,12 +1,12 @@
 
-# Building Slic3r PE on Mac OS
+# Building Slic3r++ on Mac OS
 
-To build Slic3r PE on Mac OS, you will need to install XCode, [CMake](https://cmake.org/) (available on Brew) and possibly git.
+To build Slic3r++ on Mac OS, you will need to install XCode, [CMake](https://cmake.org/) (available on Brew) and possibly git.
 
 ### Dependencies
 
-Slic3r comes with a set of CMake scripts to build its dependencies, it lives in the `deps` directory.
-Open a terminal window and navigate to Slic3r sources directory and then to `deps`.
+Slic3r++ comes with a set of CMake scripts to build its dependencies, it lives in the `deps` directory.
+Open a terminal window and navigate to Slic3r++ sources directory and then to `deps`.
 Use the following commands to build the dependencies:
 
     mkdir build
@@ -21,10 +21,10 @@ You can also customize the bundle output path using the `-DDESTDIR=<some path>`
 (This is because wxWidgets hardcodes the installation path.)
 
 
-### Building Slic3r
+### Building Slic3r++
 
-If dependencies are built without errors, you can proceed to build Slic3r itself.
-Go back to top level Slic3r sources directory and use these commands:
+If dependencies are built without errors, you can proceed to build Slic3r++ itself.
+Go back to top level Slic3r++ sources directory and use these commands:
 
     mkdir build
     cd build
@@ -33,7 +33,7 @@ Go back to top level Slic3r sources directory and use these commands:
 The `CMAKE_PREFIX_PATH` is the path to the dependencies bundle but with `/usr/local` appended - if you set a custom path
 using the `DESTDIR` option, you will need to change this accordingly. **Warning:** the `CMAKE_PREFIX_PATH` needs to be an absolute path.
 
-The CMake command above prepares Slic3r for building from the command line.
+The CMake command above prepares Slic3r++ for building from the command line.
 To start the build, use
 
     make -jN
@@ -44,12 +44,12 @@ Alternatively, if you would like to use XCode GUI, modify the `cmake` command to
 
     cmake .. -GXcode -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local"
 
-and then open the `Slic3r.xcodeproj` file.
+and then open the `Slic3r++.xcodeproj` file.
 This should open up XCode where you can perform build using the GUI or perform other tasks.
 
 ### Note on Mac OS X SDKs
 
-By default Slic3r builds against whichever SDK is the default on the current system.
+By default Slic3r++ builds against whichever SDK is the default on the current system.
 
 This can be customized. The `CMAKE_OSX_SYSROOT` option sets the path to the SDK directory location
 and the `CMAKE_OSX_DEPLOYMENT_TARGET` option sets the target OS X system version (eg. `10.14` or similar).
@@ -58,6 +58,13 @@ In case you set both, the two settings need to agree with each other. (Building
 is currently unsupported because some of the dependencies don't support this, most notably wxWidgets.)
 
 Please note that the `CMAKE_OSX_DEPLOYMENT_TARGET` and `CMAKE_OSX_SYSROOT` options need to be set the same
-on both the dependencies bundle as well as Slic3r PE itself.
+on both the dependencies bundle as well as Slic3r++ itself.
 
-Official Mac Slic3r builds are currently built against SDK 10.9 to ensure compatibility with older Macs.
+Official Mac Slic3r++ builds are currently built against SDK 10.9 to ensure compatibility with older Macs.
+
+_Warning:_ XCode may be set such that it rejects SDKs bellow some version (silently, more or less).
+This is set in the property list file
+
+    /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Info.plist
+
+To remove the limitation, simply delete the key `MinimumSDKVersion` from that file.
diff --git a/doc/How to build - Windows.md b/doc/How to build - Windows.md
index e09c2a1d2..5042b16a3 100644
--- a/doc/How to build - Windows.md	
+++ b/doc/How to build - Windows.md	
@@ -1,7 +1,7 @@
 
-# Building Slic3r PE on Microsoft Windows
+# Building Slic3r++ on Microsoft Windows
 
-The currently supported way of building Slic3r PE on Windows is with CMake and MS Visual Studio 2013.
+The currently supported way of building Slic3r++ on Windows is with CMake and MS Visual Studio 2013.
 You can use the free [Visual Studio 2013 Community Edition](https://www.visualstudio.com/vs/older-downloads/).
 CMake installer can be downloaded from [the official website](https://cmake.org/download/).
 
@@ -11,8 +11,8 @@ _Note:_ Thanks to [**@supermerill**](https://github.com/supermerill) for testing
 
 ### Dependencies
 
-On Windows Slic3r is built against statically built libraries.
-We provide a prebuilt package of all the needed dependencies.
+On Windows Slic3r++ is built against statically built libraries.
+We provide a prebuilt package of all the needed dependencies. This package only works on Visual Studio 2013, so if you are using a newer version of Visual Studio, you need to compile the dependencies yourself as per [below](#building-the-dependencies-package-yourself).
 The package comes in a several variants:
 
   - [64 bit, Release mode only](https://bintray.com/vojtechkral/Slic3r-PE/download_file?file_path=destdir-64.7z) (41 MB, 578 MB unpacked)
@@ -26,14 +26,14 @@ If you're unsure where to unpack the package, unpack it into `C:\local\` (but it
 
 Alternatively you can also compile the dependencies yourself, see below.
 
-### Building Slic3r PE with Visual Studio
+### Building Slic3r++ with Visual Studio
 
-First obtain the Slic3 PE sources via either git or by extracting the source archive.
+First obtain the Slic3r++ sources via either git or by extracting the source archive.
 
 Then you will need to note down the so-called 'prefix path' to the dependencies, this is the location of the dependencies packages + `\usr\local` appended.
 For example on 64 bits this would be `C:\local\destdir-64\usr\local`. The prefix path will need to be passed to CMake.
 
-When ready, open the relevant Visual Studio command line and `cd` into the directory with Slic3r sources.
+When ready, open the relevant Visual Studio command line and `cd` into the directory with Slic3r++ sources.
 Use these commands to prepare Visual Studio solution file:
 
     mkdir build
@@ -44,16 +44,16 @@ Note that if you're building a 32-bit variant, you will need to change the `"Vis
 
 Conversely, if you're using Visual Studio version other than 2013, the version number will need to be changed accordingly.
 
-If `cmake` has finished without errors, go to the build directory and open the `Slic3r.sln` solution file in Visual Studio.
-Before building, make sure you're building the right project (use one of those starting with `slic3r_app_...`) and that you're building
+If `cmake` has finished without errors, go to the build directory and open the `Slic3r++.sln` solution file in Visual Studio.
+Before building, make sure you're building the right project (use one of those starting with `Slic3r++_app_...`) and that you're building
 with the right configuration, i.e. _Release_ vs. _Debug_. When unsure, choose _Release_.
 Note that you won't be able to build a _Debug_ variant against a _Release_-only dependencies package.
 
 #### Installing using the `INSTALL` project
 
-Slic3r PE can be run from the Visual Studio or from Visual Studio's build directory (`src\Release` or `src\Debug`),
+Slic3r++ can be run from the Visual Studio or from Visual Studio's build directory (`src\Release` or `src\Debug`),
 but for longer-term usage you might want to install somewhere using the `INSTALL` project.
-By default, this installs into `C:\Program Files\Slic3r`.
+By default, this installs into `C:\Program Files\Slic3r++`.
 To customize the install path, use the `-DCMAKE_INSTALL_PREFIX=<path of your choice>` when invoking `cmake`.
 
 ### Building from the command line
@@ -66,7 +66,7 @@ There are several options for building from the command line:
 
 To build with msbuild, use the same CMake command as in previous paragraph and then build using
 
-    msbuild /P:Configuration=Release ALL_BUILD.vcxproj
+    msbuild /m /P:Configuration=Release ALL_BUILD.vcxproj
 
 To build with Ninja or nmake, replace the `-G` option in the CMake call with `-G Ninja` or `-G "NMake Makefiles"` , respectively.
 Then use either `ninja` or `nmake` to start the build.
@@ -75,32 +75,38 @@ To install, use `msbuild /P:Configuration=Release INSTALL.vcxproj` , `ninja inst
 
 ### Building the dependencies package yourself
 
-The dependencies package is built using CMake scripts inside the `deps` subdirectory of Slic3r PE sources.
+The dependencies package is built using CMake scripts inside the `deps` subdirectory of Slic3r++ sources.
 (This is intentionally not interconnected with the CMake scripts in the rest of the sources.)
 
-Open the preferred Visual Studio command line (64 or 32 bit variant) and `cd` into the directory with Slic3r sources.
+Open the preferred Visual Studio command line (64 or 32 bit variant) and `cd` into the directory with Slic3r++ sources.
 Then `cd` into the `deps` directory and use these commands to build:
 
     mkdir build
     cd build
     cmake .. -G "Visual Studio 12 Win64" -DDESTDIR="C:\local\destdir-custom"
-    msbuild ALL_BUILD.vcxproj
+    msbuild /m ALL_BUILD.vcxproj
 
 You can also use the Visual Studio GUI or other generators as mentioned above.
 
 The `DESTDIR` option is the location where the bundle will be installed.
-This may be customized. If you leave it empty, the `DESTDIR` will be places inside the same `build` directory. For using your newly compile deps, use -DCMAKE_INSTALL_PREFIX=<path_of_build\destdir\usr\local> in your cmake command for slic3r.
+This may be customized. If you leave it empty, the `DESTDIR` will be placed inside the same `build` directory.
 
 Warning: If the `build` directory is nested too deep inside other folders, various file paths during the build
-become too long and the build might fail due to file writing errors. For this reason, it is recommended to
+become too long and the build might fail due to file writing errors (\*). For this reason, it is recommended to
 place the `build` directory relatively close to the drive root.
 
 Note that the build variant that you may choose using Visual Studio (i.e. _Release_ or _Debug_ etc.) when building the dependency package is **not relevant**.
 The dependency build will by default build _both_ the _Release_ and _Debug_ variants regardless of what you choose in Visual Studio.
-You can disable building of the debug variant by passing the `-DDEP_DEBUG=OFF` option to CMake, this will only produce a _Release_ build.
+You can disable building of the debug variant by passing the
+
+    -DDEP_DEBUG=OFF
+
+option to CMake, this will only produce a _Release_ build.
 
 Refer to the CMake scripts inside the `deps` directory to see which dependencies are built in what versions and how this is done.
 
+\*) Specifically, the problem arises when building boost. Boost build tool appends all build options into paths of
+intermediate files, which are not handled correctly by either `b2.exe` or possibly `ninja` (?).
 ### building tests
 
 You must use visual studio 2017, and build all deps & all projects with it (not the same compiler as vs 2013). Also, you have to add the "CRT SDK" to your windows 2017 installation (can be done via the VS intaller).
diff --git a/doc/Localization_guide.md b/doc/Localization_guide.md
index 656f225ef..f013118ae 100644
--- a/doc/Localization_guide.md
+++ b/doc/Localization_guide.md
@@ -1,6 +1,8 @@
 # Localization and translation guide
 
-The purpose of this guide is to describe how to contribute to the Slic3rPE translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
+note: this guide was done for PrusaSlicer. You can use PrusaSlicer .pom file for Slic3r++ but some fields will be missed.
+
+The purpose of this guide is to describe how to contribute to the PrusaSlicer translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
 
 Those can be downloaded here: 
 -    https://sourceforge.net/directory/os:windows/?q=gnu+gettext GNUgettext package contains a set of tools to extract strings from the source code and to create the translation Catalog.
@@ -13,40 +15,40 @@ Full manual for GNUgettext can be seen here: http://www.gnu.org/software/gettext
 
 ### Scenario 1. How do I add a translation or fix an existing translation
 1. Get PO-file from corresponding folder here:
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization
 2. Open this file in PoEdit as "Edit a translation"
 3. Apply your corrections to the translation
-4. Push changed Slic3rPE.po and Slic3rPE.mo (will create automatically after saving of Slic3r.po in PoEdit) back to to the enter folder.
+4. Push changed PrusaSlicer.po and PrusaSlicer.mo (will create automatically after saving of PrusaSlicer.po in PoEdit) back to to the enter folder.
 
 ### Scenario 2. How do I add a new language support
-1. Get file Slic3rPE.pot here :
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization
+1. Get file PrusaSlicer.pot here :
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization
 2. Open it in PoEdit for "Create new translation"
 3. Select Translation Language (for example French).
 4. As a result you will have fr.po - the file containing translation to French.
 Notice. When the translation is complete you need to:
-    - Rename the file to Slic3rPE.po
-    - Click "Save file" button. Slic3rPE.mo will be created immediately
-    - Both Slic3rPE.po and Slic3rPE.mo have to be saved here:
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization/fr
+    - Rename the file to PrusaSlicer.po
+    - Click "Save file" button. PrusaSlicer.mo will be created immediately
+    - Both PrusaSlicer.po and PrusaSlicer.mo have to be saved here:
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization/fr
 ( name of folder "fr" means "French" - the translation language). 
 
-### Scenario 3. How do I add a new text resource when implementing a feature to Slic3rPE
-Each string resource in Slic3rPE available for translation needs to be explicitly marked using L() macro like this:
+### Scenario 3. How do I add a new text resource when implementing a feature to PrusaSlicer
+Each string resource in PrusaSlicer available for translation needs to be explicitly marked using L() macro like this:
 ```C++
 auto msg = L("This message to be localized")
 ```
-To get translated text use one of needed macro/function (`_(s)`, `_CHB(s)` or `L_str(s)` ).
+To get translated text use one of needed macro/function (`_(s)` or `_CHB(s)` ).
 If you add new file resource, add it to the list of files containing macro `L()`
 
-### Scenario 4. How do I use GNUgettext to localize my own application taking Slic3rPE as an example
+### Scenario 4. How do I use GNUgettext to localize my own application taking PrusaSlicer as an example
 
 1.  For convenience create a list of files with this macro `L(s)`. We have 
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization/list.txt.
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization/list.txt.
 
 2.  Create template file(*.POT) with GNUgettext command:
     ```
-        xgettext --keyword=L --from-code=UTF-8 --debug -o Slic3rPE.pot -f list.txt
+        xgettext --keyword=L --add-comments=TRN --from-code=UTF-8 --debug -o PrusaSlicer.pot -f list.txt
     ```
 
     Use flag `--from-code=UTF-8` to specify that the source strings are in UTF-8 encoding
diff --git a/resources/icons/Slic3r.icns b/resources/icons/Slic3r.icns
deleted file mode 100644
index c1eba897e..000000000
Binary files a/resources/icons/Slic3r.icns and /dev/null differ
diff --git a/resources/icons/Slic3r_192px_grayscale.png b/resources/icons/Slic3r_192px_grayscale.png
deleted file mode 100644
index 910f94187..000000000
Binary files a/resources/icons/Slic3r_192px_grayscale.png and /dev/null differ
diff --git a/resources/icons/action_undo.png b/resources/icons/action_undo.png
deleted file mode 100644
index 06bb98b22..000000000
Binary files a/resources/icons/action_undo.png and /dev/null differ
diff --git a/resources/icons/action_undo_grey.png b/resources/icons/action_undo_grey.png
deleted file mode 100644
index eaa1593e3..000000000
Binary files a/resources/icons/action_undo_grey.png and /dev/null differ
diff --git a/resources/icons/add.png b/resources/icons/add.png
deleted file mode 100644
index dde16d5e9..000000000
Binary files a/resources/icons/add.png and /dev/null differ
diff --git a/resources/icons/add_copies.svg b/resources/icons/add_copies.svg
new file mode 100644
index 000000000..45b1d27cf
--- /dev/null
+++ b/resources/icons/add_copies.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="add_x5F_copies">
+	<g>
+		<path fill="#808080" d="M8,2c3.31,0,6,2.69,6,6s-2.69,6-6,6s-6-2.69-6-6S4.69,2,8,2 M8,1C4.13,1,1,4.13,1,8s3.13,7,7,7s7-3.13,7-7
+			S11.87,1,8,1L8,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M12,8.75H4C3.59,8.75,3.25,8.41,3.25,8S3.59,7.25,4,7.25h8c0.41,0,0.75,0.34,0.75,0.75S12.41,8.75,12,8.75
+			z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,12.75c-0.41,0-0.75-0.34-0.75-0.75V4c0-0.41,0.34-0.75,0.75-0.75S8.75,3.59,8.75,4v8
+			C8.75,12.41,8.41,12.75,8,12.75z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/add_modifier.svg b/resources/icons/add_modifier.svg
new file mode 100644
index 000000000..c3cfaabbb
--- /dev/null
+++ b/resources/icons/add_modifier.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="add_x5F_modifer">
+	<path fill="#808080" d="M10.98,9.78c-0.29,0-0.52,0.23-0.52,0.52v2.09v1.04c0,0.29-0.23,0.52-0.52,0.52H2.62
+		c-0.29,0-0.53-0.24-0.53-0.53L2.04,6.12c0-0.14,0.05-0.27,0.15-0.37c0.1-0.1,0.23-0.15,0.37-0.15l3.19,0v0
+		c0.29,0,0.52-0.23,0.52-0.52S6.04,4.55,5.75,4.55H3.66c-0.01,0-0.01,0-0.02,0l-1.08,0c-0.42,0-0.81,0.16-1.11,0.46
+		C1.16,5.31,1,5.71,1,6.13l0.04,7.31C1.05,14.3,1.75,15,2.62,15h7.31c0.86,0,1.57-0.7,1.57-1.57v-1.04V10.3
+		C11.5,10.01,11.27,9.78,10.98,9.78z"/>
+	<circle fill="#ED6B21" cx="11" cy="5" r="3.5"/>
+</g>
+</svg>
diff --git a/resources/icons/add_object.png b/resources/icons/add_object.png
deleted file mode 100644
index ffc958edc..000000000
Binary files a/resources/icons/add_object.png and /dev/null differ
diff --git a/resources/icons/add_part.svg b/resources/icons/add_part.svg
new file mode 100644
index 000000000..5f0afdcc3
--- /dev/null
+++ b/resources/icons/add_part.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="add_x5F_part">
+	<g>
+		<path fill="#ED6B21" d="M11,8.5c-0.28,0-0.5-0.22-0.5-0.5V2c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v6
+			C11.5,8.28,11.28,8.5,11,8.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,5.5H8C7.72,5.5,7.5,5.28,7.5,5S7.72,4.5,8,4.5h6c0.28,0,0.5,0.22,0.5,0.5S14.28,5.5,14,5.5z"/>
+	</g>
+	<path fill="#808080" d="M10.98,9.78c-0.29,0-0.52,0.23-0.52,0.52v2.09v1.04c0,0.29-0.23,0.52-0.52,0.52H2.62
+		c-0.29,0-0.53-0.24-0.53-0.53L2.04,6.12c0-0.14,0.05-0.27,0.15-0.37c0.1-0.1,0.23-0.15,0.37-0.15l3.19,0v0
+		c0.29,0,0.52-0.23,0.52-0.52S6.04,4.55,5.75,4.55H3.66c-0.01,0-0.01,0-0.02,0l-1.08,0c-0.42,0-0.81,0.16-1.11,0.46
+		C1.16,5.31,1,5.71,1,6.13l0.04,7.31C1.05,14.3,1.75,15,2.62,15h7.31c0.86,0,1.57-0.7,1.57-1.57v-1.04V10.3
+		C11.5,10.01,11.27,9.78,10.98,9.78z"/>
+</g>
+</svg>
diff --git a/resources/icons/advanced_plus.svg b/resources/icons/advanced_plus.svg
new file mode 100644
index 000000000..48c4e08db
--- /dev/null
+++ b/resources/icons/advanced_plus.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="advanced_x2B_">
+	<path fill="#808080" d="M10.98,9.78c-0.29,0-0.52,0.23-0.52,0.52v2.09v1.04c0,0.29-0.23,0.52-0.52,0.52H2.62
+		c-0.29,0-0.53-0.24-0.53-0.53L2.04,6.12c0-0.14,0.05-0.27,0.15-0.37c0.1-0.1,0.23-0.15,0.37-0.15l3.19,0v0
+		c0.29,0,0.52-0.23,0.52-0.52S6.04,4.55,5.75,4.55H3.66c-0.01,0-0.01,0-0.02,0l-1.08,0c-0.42,0-0.81,0.16-1.11,0.46
+		C1.16,5.31,1,5.71,1,6.13l0.04,7.31C1.05,14.3,1.75,15,2.62,15h7.31c0.86,0,1.57-0.7,1.57-1.57v-1.04V10.3
+		C11.5,10.01,11.27,9.78,10.98,9.78z"/>
+	<path fill="#ED6B21" d="M13.56,5.38c-0.01-0.13,0.06-0.33,0.15-0.43l0.13-0.15c0.09-0.1,0.12-0.29,0.07-0.42l-0.2-0.48
+		c-0.05-0.13-0.21-0.24-0.35-0.25l-0.2-0.01c-0.14-0.01-0.32-0.1-0.41-0.2c-0.09-0.1-0.37-0.45-0.38-0.59l-0.01-0.2
+		c-0.01-0.14-0.12-0.29-0.25-0.35l-0.48-0.2c-0.13-0.05-0.32-0.02-0.42,0.07L11.06,2.3c-0.1,0.09-0.3,0.16-0.44,0.15
+		s-0.57-0.06-0.68-0.15L9.79,2.16C9.69,2.07,9.5,2.04,9.37,2.1L8.89,2.3C8.76,2.35,8.65,2.5,8.64,2.64l-0.01,0.2
+		c-0.01,0.14-0.1,0.32-0.2,0.41c-0.1,0.09-0.45,0.37-0.59,0.38l-0.2,0.01C7.5,3.65,7.35,3.76,7.3,3.89L7.1,4.37
+		C7.04,4.5,7.07,4.69,7.16,4.79L7.3,4.94c0.09,0.1,0.16,0.3,0.15,0.44C7.44,5.51,7.38,5.95,7.29,6.06L7.16,6.21
+		C7.07,6.31,7.04,6.5,7.1,6.63l0.2,0.48C7.35,7.24,7.5,7.35,7.64,7.36l0.2,0.01c0.14,0.01,0.32,0.1,0.41,0.2
+		c0.09,0.1,0.37,0.45,0.38,0.59l0.01,0.2C8.65,8.5,8.76,8.65,8.89,8.7l0.48,0.2C9.5,8.96,9.69,8.93,9.79,8.84L9.94,8.7
+		c0.1-0.09,0.3-0.16,0.44-0.15c0.14,0.01,0.57,0.06,0.68,0.15l0.15,0.13c0.1,0.09,0.29,0.12,0.42,0.07l0.48-0.2
+		c0.13-0.05,0.24-0.21,0.25-0.35l0.01-0.2c0.01-0.14,0.1-0.32,0.2-0.41s0.45-0.37,0.59-0.38l0.2-0.01c0.14-0.01,0.29-0.12,0.35-0.25
+		l0.2-0.48c0.05-0.13,0.02-0.32-0.07-0.42L13.7,6.06C13.61,5.95,13.56,5.51,13.56,5.38z M10.5,7.55c-1.13,0-2.05-0.92-2.05-2.05
+		s0.92-2.05,2.05-2.05s2.05,0.92,2.05,2.05S11.63,7.55,10.5,7.55z"/>
+</g>
+</svg>
diff --git a/resources/icons/application_view_tile.png b/resources/icons/application_view_tile.png
deleted file mode 100644
index 3bc0bd32f..000000000
Binary files a/resources/icons/application_view_tile.png and /dev/null differ
diff --git a/resources/icons/arrow_down.png b/resources/icons/arrow_down.png
deleted file mode 100644
index 2c4e27937..000000000
Binary files a/resources/icons/arrow_down.png and /dev/null differ
diff --git a/resources/icons/arrow_left.png b/resources/icons/arrow_left.png
deleted file mode 100644
index 5dc696781..000000000
Binary files a/resources/icons/arrow_left.png and /dev/null differ
diff --git a/resources/icons/arrow_out.png b/resources/icons/arrow_out.png
deleted file mode 100644
index 557d7b60b..000000000
Binary files a/resources/icons/arrow_out.png and /dev/null differ
diff --git a/resources/icons/arrow_refresh.png b/resources/icons/arrow_refresh.png
deleted file mode 100644
index 0de26566d..000000000
Binary files a/resources/icons/arrow_refresh.png and /dev/null differ
diff --git a/resources/icons/arrow_right.png b/resources/icons/arrow_right.png
deleted file mode 100644
index b1a181923..000000000
Binary files a/resources/icons/arrow_right.png and /dev/null differ
diff --git a/resources/icons/arrow_rotate_anticlockwise.png b/resources/icons/arrow_rotate_anticlockwise.png
deleted file mode 100644
index abc7535df..000000000
Binary files a/resources/icons/arrow_rotate_anticlockwise.png and /dev/null differ
diff --git a/resources/icons/arrow_rotate_clockwise.png b/resources/icons/arrow_rotate_clockwise.png
deleted file mode 100644
index 8624dfd11..000000000
Binary files a/resources/icons/arrow_rotate_clockwise.png and /dev/null differ
diff --git a/resources/icons/arrow_undo.png b/resources/icons/arrow_undo.png
deleted file mode 100644
index 6972c5e59..000000000
Binary files a/resources/icons/arrow_undo.png and /dev/null differ
diff --git a/resources/icons/arrow_up.png b/resources/icons/arrow_up.png
deleted file mode 100644
index 3319fcc72..000000000
Binary files a/resources/icons/arrow_up.png and /dev/null differ
diff --git a/resources/icons/box.png b/resources/icons/box.png
deleted file mode 100644
index 424648192..000000000
Binary files a/resources/icons/box.png and /dev/null differ
diff --git a/resources/icons/brick.png b/resources/icons/brick.png
deleted file mode 100644
index 660d48d4f..000000000
Binary files a/resources/icons/brick.png and /dev/null differ
diff --git a/resources/icons/brick_add.png b/resources/icons/brick_add.png
deleted file mode 100644
index 978b9fa35..000000000
Binary files a/resources/icons/brick_add.png and /dev/null differ
diff --git a/resources/icons/brick_delete.png b/resources/icons/brick_delete.png
deleted file mode 100644
index 0e8ecdbdc..000000000
Binary files a/resources/icons/brick_delete.png and /dev/null differ
diff --git a/resources/icons/brick_go.png b/resources/icons/brick_go.png
deleted file mode 100644
index 409c8f4cb..000000000
Binary files a/resources/icons/brick_go.png and /dev/null differ
diff --git a/resources/icons/bricks.png b/resources/icons/bricks.png
deleted file mode 100644
index 8eb0091ea..000000000
Binary files a/resources/icons/bricks.png and /dev/null differ
diff --git a/resources/icons/browse.svg b/resources/icons/browse.svg
new file mode 100644
index 000000000..c4297c41d
--- /dev/null
+++ b/resources/icons/browse.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="browse">
+	<path fill="#ED6B21" d="M8.49,2.43c-1.71-1.71-4.49-1.71-6.2,0s-1.71,4.49,0,6.2c1.59,1.59,4.1,1.7,5.82,0.34l1.48,1.48
+		c0,0-0.36,0.36,0,0.73s3.65,3.65,3.65,3.65s0.36,0.36,0.73,0c0.36-0.36,0.73-0.73,0.73-0.73s0.36-0.36,0-0.73s-3.65-3.65-3.65-3.65
+		c-0.36-0.36-0.73,0-0.73,0L8.83,8.25C10.19,6.52,10.08,4.02,8.49,2.43z M8.1,8.25c-1.5,1.5-3.93,1.5-5.43,0s-1.5-3.93,0-5.43
+		s3.93-1.5,5.43,0S9.6,6.75,8.1,8.25z"/>
+</g>
+</svg>
diff --git a/resources/icons/building.png b/resources/icons/building.png
deleted file mode 100644
index 37f638f27..000000000
Binary files a/resources/icons/building.png and /dev/null differ
diff --git a/resources/icons/bullet_arrow_down.png b/resources/icons/bullet_arrow_down.png
deleted file mode 100644
index 9b23c06d7..000000000
Binary files a/resources/icons/bullet_arrow_down.png and /dev/null differ
diff --git a/resources/icons/bullet_arrow_up.png b/resources/icons/bullet_arrow_up.png
deleted file mode 100644
index 24df0f421..000000000
Binary files a/resources/icons/bullet_arrow_up.png and /dev/null differ
diff --git a/resources/icons/bullet_green.png b/resources/icons/bullet_green.png
deleted file mode 100644
index 058ad261f..000000000
Binary files a/resources/icons/bullet_green.png and /dev/null differ
diff --git a/resources/icons/bullet_red.png b/resources/icons/bullet_red.png
deleted file mode 100644
index 0cd803115..000000000
Binary files a/resources/icons/bullet_red.png and /dev/null differ
diff --git a/resources/icons/cog.png b/resources/icons/cog.png
deleted file mode 100644
index 3c858b7b2..000000000
Binary files a/resources/icons/cog.png and /dev/null differ
diff --git a/resources/icons/cog.svg b/resources/icons/cog.svg
new file mode 100644
index 000000000..07adb6610
--- /dev/null
+++ b/resources/icons/cog.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="machine_x2B_cog">
+	<path fill="#808080" d="M13.77,6.39c-0.13-0.47-0.32-0.92-0.55-1.33l0.43-1.3l-1.41-1.41l-1.3,0.43c-0.42-0.23-0.86-0.42-1.33-0.55
+		L9,1H7L6.39,2.23C5.92,2.36,5.47,2.54,5.06,2.78l-1.3-0.43L2.34,3.76l0.43,1.3C2.54,5.47,2.36,5.92,2.23,6.39L1,7v2l1.23,0.61
+		c0.13,0.47,0.32,0.92,0.55,1.33l-0.43,1.3l1.41,1.41l1.3-0.43c0.42,0.23,0.86,0.42,1.33,0.55L7,15h2l0.61-1.23
+		c0.47-0.13,0.92-0.32,1.33-0.55l1.3,0.43l1.41-1.41l-0.43-1.3c0.23-0.42,0.42-0.86,0.55-1.33L15,9V7L13.77,6.39z M8,13
+		c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	<path fill="#ED6B21" d="M11.3,7.08c-0.07-0.27-0.18-0.52-0.31-0.76l0.25-0.74l-0.81-0.81L9.68,5.01C9.45,4.88,9.19,4.78,8.92,4.7
+		L8.57,4H7.43L7.08,4.7C6.81,4.78,6.55,4.88,6.32,5.01L5.58,4.77L4.77,5.58l0.25,0.74C4.88,6.55,4.78,6.81,4.7,7.08L4,7.43v1.14
+		l0.7,0.35c0.07,0.27,0.18,0.52,0.31,0.76l-0.25,0.74l0.81,0.81l0.74-0.25c0.24,0.13,0.49,0.24,0.76,0.31L7.43,12h1.14l0.35-0.7
+		c0.27-0.07,0.52-0.18,0.76-0.31l0.74,0.25l0.81-0.81l-0.25-0.74c0.13-0.24,0.24-0.49,0.31-0.76L12,8.57V7.43L11.3,7.08z M8,10.86
+		c-1.58,0-2.86-1.28-2.86-2.86S6.42,5.14,8,5.14S10.86,6.42,10.86,8S9.58,10.86,8,10.86z"/>
+</g>
+</svg>
diff --git a/resources/icons/control_pause.png b/resources/icons/control_pause.png
deleted file mode 100644
index 2d9ce9c4e..000000000
Binary files a/resources/icons/control_pause.png and /dev/null differ
diff --git a/resources/icons/control_pause_blue.png b/resources/icons/control_pause_blue.png
deleted file mode 100644
index ec61099b0..000000000
Binary files a/resources/icons/control_pause_blue.png and /dev/null differ
diff --git a/resources/icons/control_play.png b/resources/icons/control_play.png
deleted file mode 100644
index 0846555d0..000000000
Binary files a/resources/icons/control_play.png and /dev/null differ
diff --git a/resources/icons/control_play_blue.png b/resources/icons/control_play_blue.png
deleted file mode 100644
index f8c8ec683..000000000
Binary files a/resources/icons/control_play_blue.png and /dev/null differ
diff --git a/resources/icons/control_stop.png b/resources/icons/control_stop.png
deleted file mode 100644
index 893bb60e5..000000000
Binary files a/resources/icons/control_stop.png and /dev/null differ
diff --git a/resources/icons/control_stop_blue.png b/resources/icons/control_stop_blue.png
deleted file mode 100644
index e6f75d232..000000000
Binary files a/resources/icons/control_stop_blue.png and /dev/null differ
diff --git a/resources/icons/cooling.svg b/resources/icons/cooling.svg
new file mode 100644
index 000000000..b5d80e434
--- /dev/null
+++ b/resources/icons/cooling.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="cooling">
+	<path fill="#808080" d="M14,1H2C1.45,1,1,1.45,1,2v12c0,0.55,0.45,1,1,1h12c0.55,0,1-0.45,1-1V2C15,1.45,14.55,1,14,1z M8,14
+		c-3.31,0-6-2.69-6-6s2.69-6,6-6s6,2.69,6,6S11.31,14,8,14z"/>
+	<g>
+		<path fill="#ED6B21" d="M7.86,7.14C7.94,7.41,8,7.7,8,8c0,1.66-1.34,3-3,3c-0.3,0-0.59-0.06-0.86-0.14C4.51,12.09,5.64,13,7,13
+			c1.66,0,3-1.34,3-3C10,8.64,9.09,7.51,7.86,7.14z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,8C6.34,8,5,6.66,5,5c0-0.3,0.06-0.59,0.14-0.86C3.91,4.51,3,5.64,3,7c0,1.66,1.34,3,3,3
+			c1.36,0,2.49-0.91,2.86-2.14C8.59,7.94,8.3,8,8,8z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M10,6C8.64,6,7.51,6.91,7.14,8.14C7.41,8.06,7.7,8,8,8c1.66,0,3,1.34,3,3c0,0.3-0.06,0.59-0.14,0.86
+			C12.09,11.49,13,10.36,13,9C13,7.34,11.66,6,10,6z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,8c0-1.66,1.34-3,3-3c0.3,0,0.59,0.06,0.86,0.14C11.49,3.91,10.36,3,9,3C7.34,3,6,4.34,6,6
+			c0,1.36,0.91,2.49,2.14,2.86C8.06,8.59,8,8.3,8,8z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/copy.svg b/resources/icons/copy.svg
new file mode 100644
index 000000000..9b8430dd7
--- /dev/null
+++ b/resources/icons/copy.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="copy">
+	<g>
+		<path fill="#ED6B21" d="M115.76,51.2l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h66.04c4.2,0,7.62-3.42,7.62-7.62v-50.8C120.09,58.17,118.23,53.67,115.76,51.2z M111.42,54.04h-6.57
+			v-6.57L111.42,54.04z M115.01,112.47c0,1.4-1.14,2.54-2.54,2.54H46.43c-1.4,0-2.54-1.14-2.54-2.54V46.42
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46v12.24c0,1.4,1.14,2.54,2.54,2.54h12.24c0.28,0.91,0.46,1.8,0.46,2.54
+			V112.47z"/>
+		<path fill="#ED6B21" d="M53.97,59.13h35.72c1.4,0,2.54-1.14,2.54-2.54s-1.14-2.54-2.54-2.54H53.97c-1.4,0-2.54,1.14-2.54,2.54
+			S52.56,59.13,53.97,59.13z"/>
+		<path fill="#ED6B21" d="M104.93,69.29H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,69.29,104.93,69.29z"/>
+		<path fill="#ED6B21" d="M104.93,84.53H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,84.53,104.93,84.53z"/>
+		<path fill="#ED6B21" d="M104.93,99.77H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,99.77,104.93,99.77z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M85.27,20.71l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h17.78c1.4,0,2.54-1.14,2.54-2.54s-1.14-2.54-2.54-2.54H15.94c-1.4,0-2.54-1.14-2.54-2.54V15.94
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46V26.1c0,1.4,1.14,2.54,2.54,2.54h12.45c0.16,0.49,0.25,0.93,0.25,1.27
+			v3.81c0,1.4,1.14,2.54,2.54,2.54c1.4,0,2.54-1.14,2.54-2.54v-3.81C89.61,27.14,87.75,23.19,85.27,20.71z M74.37,16.99l6.57,6.57
+			h-6.57V16.99z"/>
+		<path fill="#FFFFFF" d="M59.21,23.56H23.48c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h35.72c1.4,0,2.54-1.14,2.54-2.54
+			S60.61,23.56,59.21,23.56z"/>
+		<path fill="#FFFFFF" d="M28.73,38.8h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,38.8,28.73,38.8z"/>
+		<path fill="#FFFFFF" d="M28.73,54.04h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,54.04,28.73,54.04z"/>
+		<path fill="#FFFFFF" d="M28.73,69.29h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,69.29,28.73,69.29z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/copy_menu.svg b/resources/icons/copy_menu.svg
new file mode 100644
index 000000000..0d1af6a0a
--- /dev/null
+++ b/resources/icons/copy_menu.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="copy">
+	<g>
+		<path fill="#ED6B21" d="M115.76,51.2l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h66.04c4.2,0,7.62-3.42,7.62-7.62v-50.8C120.09,58.17,118.23,53.67,115.76,51.2z M111.42,54.04h-6.57
+			v-6.57L111.42,54.04z M115.01,112.47c0,1.4-1.14,2.54-2.54,2.54H46.43c-1.4,0-2.54-1.14-2.54-2.54V46.42
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46v12.24c0,1.4,1.14,2.54,2.54,2.54h12.24c0.28,0.91,0.46,1.8,0.46,2.54
+			V112.47z"/>
+		<path fill="#ED6B21" d="M53.97,59.13h35.72c1.4,0,2.54-1.14,2.54-2.54s-1.14-2.54-2.54-2.54H53.97c-1.4,0-2.54,1.14-2.54,2.54
+			S52.56,59.13,53.97,59.13z"/>
+		<path fill="#ED6B21" d="M104.93,69.29H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,69.29,104.93,69.29z"/>
+		<path fill="#ED6B21" d="M104.93,84.53H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,84.53,104.93,84.53z"/>
+		<path fill="#ED6B21" d="M104.93,99.77H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,99.77,104.93,99.77z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M85.27,20.71l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h17.78c1.4,0,2.54-1.14,2.54-2.54s-1.14-2.54-2.54-2.54H15.94c-1.4,0-2.54-1.14-2.54-2.54V15.94
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46V26.1c0,1.4,1.14,2.54,2.54,2.54h12.45c0.16,0.49,0.25,0.93,0.25,1.27
+			v3.81c0,1.4,1.14,2.54,2.54,2.54c1.4,0,2.54-1.14,2.54-2.54v-3.81C89.61,27.14,87.75,23.19,85.27,20.71z M74.37,16.99l6.57,6.57
+			h-6.57V16.99z"/>
+		<path fill="#808080" d="M59.21,23.56H23.48c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h35.72c1.4,0,2.54-1.14,2.54-2.54
+			S60.61,23.56,59.21,23.56z"/>
+		<path fill="#808080" d="M28.73,38.8h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,38.8,28.73,38.8z"/>
+		<path fill="#808080" d="M28.73,54.04h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,54.04,28.73,54.04z"/>
+		<path fill="#808080" d="M28.73,69.29h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,69.29,28.73,69.29z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/cross.png b/resources/icons/cross.png
deleted file mode 100644
index 54f790b47..000000000
Binary files a/resources/icons/cross.png and /dev/null differ
diff --git a/resources/icons/cross.svg b/resources/icons/cross.svg
new file mode 100644
index 000000000..96835d259
--- /dev/null
+++ b/resources/icons/cross.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="cross">
+	<g>
+		
+			<line fill="none" stroke="#ED6B21" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="14" y1="2" x2="2" y2="14"/>
+	</g>
+	<g>
+		
+			<line fill="none" stroke="#ED6B21" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="2" y1="2" x2="14" y2="14"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/delete.png b/resources/icons/delete.png
deleted file mode 100644
index 143c70944..000000000
Binary files a/resources/icons/delete.png and /dev/null differ
diff --git a/resources/icons/delete.svg b/resources/icons/delete.svg
new file mode 100644
index 000000000..f0976a76b
--- /dev/null
+++ b/resources/icons/delete.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="delete">
+	<g>
+		<path fill="#ED6B21" d="M13,10c0-1.1-0.9-2-2-2H5c-1.1,0-2,0.9-2,2v3c0,1.1,0.9,2,2,2h6c1.1,0,2-0.9,2-2V10z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M12,5.01c0.25,0,0.47,0.09,0.62,0.26c0.15,0.17,0.22,0.4,0.2,0.64l-0.64,7.01C12.13,13.49,11.58,14,11,14
+			H5c-0.58,0-1.13-0.51-1.19-1.08L3.18,5.91c-0.02-0.25,0.05-0.47,0.2-0.64C3.53,5.1,3.75,5.01,4,5.01H12 M12,4.01H4
+			c-1.1,0-1.92,0.9-1.82,1.99l0.64,7.01C2.92,14.1,3.9,15,5,15h6c1.1,0,2.08-0.9,2.18-1.99L13.82,6C13.92,4.91,13.1,4.01,12,4.01
+			L12,4.01z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M13,3.5H3C2.72,3.5,2.5,3.28,2.5,3S2.72,2.5,3,2.5h10c0.28,0,0.5,0.22,0.5,0.5S13.28,3.5,13,3.5z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M10,2.5H6C5.72,2.5,5.5,2.28,5.5,2S5.72,1.5,6,1.5h4c0.28,0,0.5,0.22,0.5,0.5S10.28,2.5,10,2.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/delete_all_menu.svg b/resources/icons/delete_all_menu.svg
new file mode 100644
index 000000000..5ee6d6ea6
--- /dev/null
+++ b/resources/icons/delete_all_menu.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="DELETE_ALL_1_">
+	<path fill="#808080" d="M103.52,43.87l-13.31,69.97H37.79L24.48,43.87H103.52 M108.77,37.87H19.23c-1.1,0-1.83,0.88-1.63,1.96
+		l14.84,78.04c0.21,1.08,1.27,1.96,2.37,1.96h58.36c1.1,0,2.17-0.88,2.37-1.96l14.84-78.04C110.6,38.75,109.87,37.87,108.77,37.87
+		L108.77,37.87z"/>
+	<g>
+		<path fill="#ED6B21" d="M89.38,22.97c-1.1,0-2-0.9-2-2v-10.9c0-1.1-0.9-2-2-2H42.62c-1.1,0-2,0.9-2,2v10.9c0,1.1-0.9,2-2,2H19.23
+			c-1.1,0-2,0.9-2,2v3.45c0,1.1,0.9,2,2,2h89.54c1.1,0,2-0.9,2-2v-3.45c0-1.1-0.9-2-2-2H89.38z M79.59,20.97c0,1.1-0.9,2-2,2H50.41
+			c-1.1,0-2-0.9-2-2v-3.45c0-1.1,0.9-2,2-2h27.18c1.1,0,2,0.9,2,2V20.97z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M93.17,73.5H34.83c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h58.34c0.83,0,1.5,0.67,1.5,1.5
+			S94,73.5,93.17,73.5z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M90.14,89.45H37.96c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h52.18c0.83,0,1.5,0.67,1.5,1.5
+			S90.97,89.45,90.14,89.45z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M87.1,105.4H40.9c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h46.2c0.83,0,1.5,0.67,1.5,1.5
+			S87.93,105.4,87.1,105.4z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M96.2,57.56H31.8c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h64.4c0.83,0,1.5,0.67,1.5,1.5
+			S97.03,57.56,96.2,57.56z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/disclosure_triangle_close.png b/resources/icons/disclosure_triangle_close.png
deleted file mode 100644
index 0660422c7..000000000
Binary files a/resources/icons/disclosure_triangle_close.png and /dev/null differ
diff --git a/resources/icons/disclosure_triangle_open.png b/resources/icons/disclosure_triangle_open.png
deleted file mode 100644
index 81112f2a2..000000000
Binary files a/resources/icons/disclosure_triangle_open.png and /dev/null differ
diff --git a/resources/icons/disk.png b/resources/icons/disk.png
deleted file mode 100644
index 70dd3d3f1..000000000
Binary files a/resources/icons/disk.png and /dev/null differ
diff --git a/resources/icons/dot.svg b/resources/icons/dot.svg
new file mode 100644
index 000000000..236db3678
--- /dev/null
+++ b/resources/icons/dot.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<circle fill="#808080" cx="8" cy="8" r="3"/>
+</g>
+</svg>
diff --git a/resources/icons/dot_white.svg b/resources/icons/dot_white.svg
new file mode 100644
index 000000000..90fbaf7fb
--- /dev/null
+++ b/resources/icons/dot_white.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<circle fill="#FFFFFF" cx="8" cy="8" r="3"/>
+</g>
+</svg>
diff --git a/resources/icons/editor_menu.svg b/resources/icons/editor_menu.svg
new file mode 100644
index 000000000..223efda0f
--- /dev/null
+++ b/resources/icons/editor_menu.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="editor">
+	<g>
+		<path fill="none" stroke="#101010" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M118.68,8.83L92.1,37.03c-0.75,0.8-2.27,1.46-3.37,1.46H9.44"/>
+	</g>
+	<g>
+		
+			<line fill="none" stroke="#101010" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="90.72" y1="118.69" x2="90.72" y2="38.81"/>
+	</g>
+	<g>
+		<path fill="none" stroke="#101010" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M119.88,91.51v-81.4c0-1.1-0.9-2-2-2H42.92c-1.1,0-2.66,0.61-3.47,1.36L9.59,37.13c-0.81,0.75-1.47,2.26-1.47,3.36v77.39
+			c0,1.1,0.9,2,2,2h78.61c1.1,0,2.65-0.63,3.44-1.39l27.67-26.82"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/empty_icon.png b/resources/icons/empty_icon.png
deleted file mode 100644
index 2dd8f0afe..000000000
Binary files a/resources/icons/empty_icon.png and /dev/null differ
diff --git a/resources/icons/erase.png b/resources/icons/erase.png
deleted file mode 100644
index 4c4cfd755..000000000
Binary files a/resources/icons/erase.png and /dev/null differ
diff --git a/resources/icons/error.png b/resources/icons/error.png
deleted file mode 100644
index 428360d27..000000000
Binary files a/resources/icons/error.png and /dev/null differ
diff --git a/resources/icons/exclamation.svg b/resources/icons/exclamation.svg
new file mode 100644
index 000000000..456802652
--- /dev/null
+++ b/resources/icons/exclamation.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#ED6B21" d="M8,11c-0.55,0-1-0.45-1-1V7c0-0.55,0.45-1,1-1s1,0.45,1,1v3C9,10.55,8.55,11,8,11z"/>
+	</g>
+	<g>
+		<circle fill="#ED6B21" cx="8" cy="13" r="1"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M15,15.5H1c-0.18,0-0.34-0.09-0.43-0.24c-0.09-0.15-0.09-0.34-0.01-0.49l7-13c0.17-0.32,0.71-0.32,0.88,0
+			l7,13c0.08,0.16,0.08,0.34-0.01,0.49C15.34,15.41,15.18,15.5,15,15.5z M1.84,14.5h12.33L8,3.05L1.84,14.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/exclamation_mark_.png b/resources/icons/exclamation_mark_.png
deleted file mode 100644
index 5fe7c1355..000000000
Binary files a/resources/icons/exclamation_mark_.png and /dev/null differ
diff --git a/resources/icons/export_config.svg b/resources/icons/export_config.svg
new file mode 100644
index 000000000..e70035dae
--- /dev/null
+++ b/resources/icons/export_config.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_config">
+	<path fill="#808080" d="M14.22,6.61c-0.25-0.12-0.52-0.43-0.6-0.68s-0.32-1.09-0.23-1.35l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83
+		L12.6,2.7c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45
+		C9.1,1.2,8.77,1,8.5,1h-1C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5
+		C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12
+		L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.52,0.43,0.6,0.68s0.32,1.09,0.23,1.35
+		L2.5,11.77c-0.09,0.26,0,0.63,0.2,0.83L3.4,13.3c0.19,0.19,0.57,0.28,0.83,0.2l0.35-0.12c0.26-0.09,0.67-0.06,0.91,0.05
+		s1,0.54,1.12,0.79l0.17,0.33C6.9,14.8,7.22,15,7.5,15h1c0.27,0,0.6-0.2,0.72-0.45l0.17-0.33c0.12-0.25,0.43-0.52,0.68-0.6
+		s1.09-0.32,1.35-0.23l0.35,0.12c0.26,0.09,0.63,0,0.83-0.2l0.71-0.71c0.19-0.19,0.28-0.57,0.2-0.83l-0.12-0.35
+		c-0.09-0.26-0.06-0.67,0.05-0.91s0.54-1,0.79-1.12l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72L14.22,6.61z
+		 M8,13c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	<path fill="#ED6B21" d="M11.65,8.35c0.19-0.19,0.19-0.51,0-0.71L8.92,4.92C8.73,4.73,8.57,4.8,8.57,5.07v1.29
+		c0,0.28-0.22,0.5-0.5,0.5H4.5C4.22,6.86,4,7.08,4,7.36v1.29c0,0.27,0.22,0.5,0.5,0.5h3.57c0.28,0,0.5,0.22,0.5,0.5v1.29
+		c0,0.27,0.16,0.34,0.35,0.15L11.65,8.35z"/>
+</g>
+</svg>
diff --git a/resources/icons/export_config_bundle.svg b/resources/icons/export_config_bundle.svg
new file mode 100644
index 000000000..1e587689d
--- /dev/null
+++ b/resources/icons/export_config_bundle.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_config_x5F_bundle">
+	<g>
+		<path fill="#808080" d="M1.2,12.61c0.11,0.08,0.21,0.22,0.23,0.31c0.02,0.09,0.04,0.43-0.03,0.55s-0.05,0.31,0.03,0.42l0.12,0.17
+			c0.08,0.11,0.25,0.19,0.39,0.17c0.13-0.02,0.3,0.01,0.38,0.06s0.33,0.28,0.37,0.41c0.04,0.13,0.18,0.25,0.32,0.27l0.21,0.04
+			c0.14,0.02,0.31-0.05,0.39-0.16s0.22-0.21,0.31-0.23c0.09-0.02,0.43-0.04,0.55,0.03c0.12,0.06,0.31,0.05,0.42-0.03l0.17-0.12
+			c0.11-0.08,0.19-0.25,0.17-0.39c-0.02-0.13,0.01-0.3,0.06-0.38s0.28-0.33,0.41-0.37c0.13-0.04,0.25-0.18,0.27-0.32l0.04-0.21
+			c0.02-0.14-0.05-0.31-0.16-0.39c-0.11-0.08-0.21-0.22-0.23-0.31c-0.02-0.09-0.04-0.43,0.03-0.55c0.06-0.12,0.05-0.31-0.03-0.42
+			L5.5,10.98c-0.08-0.11-0.25-0.19-0.39-0.17c-0.13,0.02-0.3-0.01-0.38-0.06c-0.08-0.05-0.33-0.28-0.37-0.41
+			c-0.04-0.13-0.18-0.25-0.32-0.27l-0.21-0.04c-0.14-0.02-0.31,0.05-0.39,0.16s-0.22,0.21-0.31,0.23S2.7,10.46,2.58,10.4
+			c-0.12-0.06-0.31-0.05-0.42,0.03l-0.17,0.12c-0.11,0.08-0.19,0.25-0.17,0.39s-0.01,0.3-0.06,0.38c-0.05,0.08-0.28,0.33-0.41,0.37
+			c-0.13,0.04-0.25,0.18-0.27,0.32l-0.04,0.21C1.02,12.36,1.09,12.53,1.2,12.61z M3.71,11.42c0.61,0.1,1.02,0.68,0.92,1.28
+			c-0.1,0.61-0.68,1.02-1.28,0.92c-0.61-0.1-1.02-0.68-0.92-1.28C2.53,11.73,3.1,11.32,3.71,11.42z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M10.39,4.47c0.13,0.03,0.28,0.13,0.33,0.21c0.05,0.08,0.19,0.38,0.18,0.52s0.07,0.3,0.19,0.38l0.18,0.11
+			c0.12,0.07,0.31,0.08,0.42,0.01c0.12-0.07,0.28-0.11,0.38-0.09c0.09,0.02,0.41,0.13,0.5,0.24c0.09,0.1,0.26,0.17,0.4,0.13
+			l0.21-0.05c0.13-0.03,0.27-0.16,0.3-0.29c0.03-0.13,0.13-0.28,0.21-0.33c0.08-0.05,0.38-0.19,0.52-0.18
+			c0.13,0.01,0.3-0.07,0.38-0.19l0.11-0.18c0.07-0.12,0.08-0.31,0.01-0.42c-0.07-0.12-0.11-0.28-0.09-0.38
+			c0.02-0.09,0.13-0.41,0.24-0.5c0.1-0.09,0.17-0.26,0.13-0.4l-0.05-0.21c-0.03-0.13-0.16-0.27-0.29-0.3
+			c-0.13-0.03-0.28-0.13-0.33-0.21s-0.19-0.38-0.18-0.52c0.01-0.13-0.07-0.3-0.19-0.38l-0.18-0.11c-0.12-0.07-0.31-0.08-0.42-0.01
+			c-0.12,0.07-0.28,0.11-0.38,0.09c-0.09-0.02-0.41-0.13-0.5-0.24c-0.09-0.1-0.26-0.17-0.4-0.13L11.87,1.1
+			c-0.13,0.03-0.27,0.16-0.3,0.29s-0.13,0.28-0.21,0.33s-0.38,0.19-0.52,0.18s-0.3,0.07-0.38,0.19l-0.11,0.18
+			c-0.07,0.12-0.08,0.31-0.01,0.42c0.07,0.12,0.11,0.28,0.09,0.38s-0.13,0.41-0.24,0.5c-0.1,0.09-0.17,0.26-0.13,0.4l0.05,0.21
+			C10.13,4.3,10.26,4.44,10.39,4.47z M12.27,2.43c0.6-0.13,1.2,0.24,1.33,0.84c0.13,0.6-0.24,1.2-0.84,1.33
+			c-0.6,0.13-1.2-0.24-1.33-0.84C11.3,3.16,11.67,2.56,12.27,2.43z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M1.85,4.19C1.8,4.32,1.66,4.47,1.53,4.53L1.15,4.71C1.02,4.77,0.92,4.93,0.91,5.06L0.89,5.92
+			c0,0.14,0.09,0.3,0.21,0.37l0.37,0.2C1.6,6.55,1.73,6.71,1.77,6.84l0.17,0.44C2,7.41,2,7.62,1.96,7.75l-0.15,0.4
+			C1.76,8.28,1.8,8.47,1.89,8.57l0.58,0.62c0.09,0.1,0.28,0.15,0.41,0.11L3.3,9.17c0.13-0.04,0.34-0.02,0.46,0.04l0.43,0.2
+			c0.13,0.05,0.28,0.19,0.34,0.32l0.18,0.39c0.06,0.12,0.22,0.23,0.35,0.23l0.85,0.03c0.14,0,0.3-0.09,0.37-0.21l0.2-0.37
+			c0.07-0.12,0.23-0.25,0.36-0.29l0.44-0.17c0.13-0.06,0.33-0.06,0.46-0.02l0.4,0.15C8.28,9.5,8.47,9.47,8.57,9.37l0.62-0.58
+			c0.1-0.09,0.15-0.28,0.11-0.41L9.17,7.97C9.13,7.84,9.16,7.63,9.22,7.51l0.2-0.43c0.05-0.13,0.19-0.28,0.32-0.34l0.39-0.18
+			c0.12-0.06,0.23-0.22,0.23-0.35l0.03-0.85c0-0.14-0.09-0.3-0.21-0.37l-0.37-0.2C9.67,4.71,9.54,4.55,9.49,4.42L9.33,3.98
+			C9.27,3.85,9.26,3.64,9.31,3.52l0.15-0.4C9.5,2.99,9.47,2.8,9.37,2.7L8.79,2.08c-0.09-0.1-0.28-0.15-0.41-0.11L7.97,2.09
+			C7.84,2.13,7.63,2.11,7.51,2.05l-0.43-0.2C6.94,1.8,6.79,1.66,6.73,1.53L6.56,1.15C6.5,1.02,6.34,0.92,6.2,0.91L5.35,0.89
+			c-0.14,0-0.3,0.09-0.37,0.21l-0.2,0.37C4.71,1.6,4.55,1.73,4.42,1.77L3.98,1.94C3.85,2,3.64,2,3.52,1.96l-0.4-0.15
+			C2.99,1.76,2.8,1.8,2.7,1.89L2.08,2.48c-0.1,0.09-0.15,0.28-0.11,0.41L2.09,3.3c0.04,0.13,0.02,0.34-0.04,0.46L1.85,4.19z
+			 M6.75,3.15c1.37,0.62,1.98,2.23,1.36,3.6s-2.23,1.98-3.6,1.36C3.15,7.5,2.54,5.89,3.15,4.52S5.38,2.54,6.75,3.15z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14.65,11.78c0.19-0.19,0.19-0.51,0-0.71l-2.72-2.72c-0.19-0.19-0.35-0.13-0.35,0.15v1.29
+			c0,0.28-0.22,0.5-0.5,0.5H8.49c-0.28,0-0.5,0.23-0.5,0.5v1.29c0,0.28,0.22,0.5,0.5,0.5h2.58c0.28,0,0.5,0.23,0.5,0.5v1.29
+			c0,0.28,0.16,0.34,0.35,0.15L14.65,11.78z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/export_gcode.svg b/resources/icons/export_gcode.svg
new file mode 100644
index 000000000..317e01f7d
--- /dev/null
+++ b/resources/icons/export_gcode.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_gcode">
+	<g>
+		<path fill="#808080" d="M5.02,7.17H9v3.08c0,2.6-1.23,3.72-4.05,3.72S1,12.85,1,10.29V5.54C1,3.12,2.09,2,4.95,2S9,3,9,5.54H6.88
+			c0-1.11-0.28-1.66-1.92-1.66c-1.54,0-1.83,0.69-1.83,1.77v4.65c0,1.12,0.29,1.77,1.83,1.77c1.54,0,2.08-0.65,2.08-1.82V9.09H5.02
+			V7.17z"/>
+	</g>
+	<path fill="#ED6B21" d="M14.65,8.35c0.19-0.19,0.19-0.51,0-0.71l-4.29-4.29C10.16,3.16,10,3.22,10,3.5v9
+		c0,0.27,0.16,0.34,0.35,0.15L14.65,8.35z"/>
+</g>
+</svg>
diff --git a/resources/icons/export_plater.svg b/resources/icons/export_plater.svg
new file mode 100644
index 000000000..641d952ad
--- /dev/null
+++ b/resources/icons/export_plater.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_plater">
+	<path fill="#808080" d="M13,2c0.55,0,1,0.45,1,1V13c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+		c-1.1,0-2,0.89-2,2V13c0,1.1,0.89,2,2,2H13c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	<path fill="#ED6B21" d="M11.65,8.35c0.19-0.19,0.19-0.51,0-0.71L8.92,4.92C8.73,4.73,8.57,4.8,8.57,5.07v1.29
+		c0,0.28-0.22,0.5-0.5,0.5H4.5C4.22,6.86,4,7.08,4,7.36v1.29c0,0.27,0.22,0.5,0.5,0.5h3.57c0.28,0,0.5,0.22,0.5,0.5v1.29
+		c0,0.27,0.16,0.34,0.35,0.15L11.65,8.35z"/>
+</g>
+</svg>
diff --git a/resources/icons/flag-green-icon.png b/resources/icons/flag-green-icon.png
deleted file mode 100644
index e4bc611f8..000000000
Binary files a/resources/icons/flag-green-icon.png and /dev/null differ
diff --git a/resources/icons/flag-red-icon.png b/resources/icons/flag-red-icon.png
deleted file mode 100644
index e8a602da7..000000000
Binary files a/resources/icons/flag-red-icon.png and /dev/null differ
diff --git a/resources/icons/flag_green.svg b/resources/icons/flag_green.svg
new file mode 100644
index 000000000..90932e5e4
--- /dev/null
+++ b/resources/icons/flag_green.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="flag_x5F_green">
+	
+		<line fill="none" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="14" y1="2" x2="14" y2="14"/>
+	<path fill="#8CC63F" d="M13,2C8.2,2,5.8,4.4,1,4.4v7.2c4.8,0,7.2-2.4,12-2.4V2z"/>
+</g>
+</svg>
diff --git a/resources/icons/flag_red.svg b/resources/icons/flag_red.svg
new file mode 100644
index 000000000..8d39a9d6a
--- /dev/null
+++ b/resources/icons/flag_red.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="flag_x5F_red">
+	
+		<line fill="none" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="14" y1="2" x2="14" y2="14"/>
+	<path fill="#ED1C24" d="M13,2C8.2,2,5.8,4.4,1,4.4v7.2c4.8,0,7.2-2.4,12-2.4V2z"/>
+</g>
+</svg>
diff --git a/resources/icons/funnel.png b/resources/icons/funnel.png
deleted file mode 100644
index 07ab7ad44..000000000
Binary files a/resources/icons/funnel.png and /dev/null differ
diff --git a/resources/icons/funnel.svg b/resources/icons/funnel.svg
new file mode 100644
index 000000000..8877722e3
--- /dev/null
+++ b/resources/icons/funnel.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="extruder_x2B_funnel">
+	<rect x="1" y="1" display="none" fill="#808080" width="14" height="6"/>
+	<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-miterlimit="10" x1="8" y1="9.37" x2="8" y2="15"/>
+	<polygon display="none" fill="#808080" points="5,7 5,8 8,10 11,8 11,7 	"/>
+	<g>
+		<path fill="#808080" d="M14,2l0,4h-3c-0.55,0-1,0.45-1,1v0.47L8,8.8L6,7.46V7c0-0.55-0.45-1-1-1L2,6l0-4H14 M14,1H2
+			C1.45,1,1,1.45,1,2v4c0,0.55,0.45,1,1,1h3v1l2.45,1.63C7.61,9.74,7.81,9.8,8,9.8c0.19,0,0.39-0.06,0.55-0.17L11,8V7h3
+			c0.55,0,1-0.45,1-1V2C15,1.45,14.55,1,14,1L14,1z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/gizmos.png b/resources/icons/gizmos.png
deleted file mode 100644
index 448e826b8..000000000
Binary files a/resources/icons/gizmos.png and /dev/null differ
diff --git a/resources/icons/hourglass.png b/resources/icons/hourglass.png
deleted file mode 100644
index e39feab8b..000000000
Binary files a/resources/icons/hourglass.png and /dev/null differ
diff --git a/resources/icons/house.png b/resources/icons/house.png
deleted file mode 100644
index fed62219f..000000000
Binary files a/resources/icons/house.png and /dev/null differ
diff --git a/resources/icons/import_config.svg b/resources/icons/import_config.svg
new file mode 100644
index 000000000..636a31151
--- /dev/null
+++ b/resources/icons/import_config.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="import_x5F_config">
+	<g>
+		<path fill="#808080" d="M14.22,6.61c-0.25-0.12-0.52-0.43-0.6-0.68s-0.32-1.09-0.23-1.35l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83
+			L12.6,2.7c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45
+			C9.1,1.2,8.77,1,8.5,1h-1C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5
+			C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12
+			L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.52,0.43,0.6,0.68s0.32,1.09,0.23,1.35
+			L2.5,11.77c-0.09,0.26,0,0.63,0.2,0.83L3.4,13.3c0.19,0.19,0.57,0.28,0.83,0.2l0.35-0.12c0.26-0.09,0.67-0.06,0.91,0.05
+			s1,0.54,1.12,0.79l0.17,0.33C6.9,14.8,7.22,15,7.5,15h1c0.27,0,0.6-0.2,0.72-0.45l0.17-0.33c0.12-0.25,0.43-0.52,0.68-0.6
+			s1.09-0.32,1.35-0.23l0.35,0.12c0.26,0.09,0.63,0,0.83-0.2l0.71-0.71c0.19-0.19,0.28-0.57,0.2-0.83l-0.12-0.35
+			c-0.09-0.26-0.06-0.67,0.05-0.91s0.54-1,0.79-1.12l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72L14.22,6.61z
+			 M8,13c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,12c-0.55,0-1-0.45-1-1V5c0-0.55,0.45-1,1-1s1,0.45,1,1v6C9,11.55,8.55,12,8,12z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,9H5C4.45,9,4,8.55,4,8s0.45-1,1-1h6c0.55,0,1,0.45,1,1S11.55,9,11,9z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/import_config_bundle.svg b/resources/icons/import_config_bundle.svg
new file mode 100644
index 000000000..b8342760a
--- /dev/null
+++ b/resources/icons/import_config_bundle.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="import_x5F_config_x5F_bundle">
+	<g>
+		<g>
+			<path fill="#808080" d="M1.2,12.61c0.11,0.08,0.21,0.22,0.23,0.31c0.02,0.09,0.04,0.43-0.03,0.55s-0.05,0.31,0.03,0.42l0.12,0.17
+				c0.08,0.11,0.25,0.19,0.39,0.17c0.13-0.02,0.3,0.01,0.38,0.06s0.33,0.28,0.37,0.41c0.04,0.13,0.18,0.25,0.32,0.27l0.21,0.04
+				c0.14,0.02,0.31-0.05,0.39-0.16s0.22-0.21,0.31-0.23c0.09-0.02,0.43-0.04,0.55,0.03c0.12,0.06,0.31,0.05,0.42-0.03l0.17-0.12
+				c0.11-0.08,0.19-0.25,0.17-0.39c-0.02-0.13,0.01-0.3,0.06-0.38s0.28-0.33,0.41-0.37c0.13-0.04,0.25-0.18,0.27-0.32l0.04-0.21
+				c0.02-0.14-0.05-0.31-0.16-0.39c-0.11-0.08-0.21-0.22-0.23-0.31c-0.02-0.09-0.04-0.43,0.03-0.55c0.06-0.12,0.05-0.31-0.03-0.42
+				L5.5,10.98c-0.08-0.11-0.25-0.19-0.39-0.17c-0.13,0.02-0.3-0.01-0.38-0.06c-0.08-0.05-0.33-0.28-0.37-0.41
+				c-0.04-0.13-0.18-0.25-0.32-0.27l-0.21-0.04c-0.14-0.02-0.31,0.05-0.39,0.16s-0.22,0.21-0.31,0.23S2.7,10.46,2.58,10.4
+				c-0.12-0.06-0.31-0.05-0.42,0.03l-0.17,0.12c-0.11,0.08-0.19,0.25-0.17,0.39s-0.01,0.3-0.06,0.38c-0.05,0.08-0.28,0.33-0.41,0.37
+				c-0.13,0.04-0.25,0.18-0.27,0.32l-0.04,0.21C1.02,12.36,1.09,12.53,1.2,12.61z M3.71,11.42c0.61,0.1,1.02,0.68,0.92,1.28
+				c-0.1,0.61-0.68,1.02-1.28,0.92c-0.61-0.1-1.02-0.68-0.92-1.28C2.53,11.73,3.1,11.32,3.71,11.42z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#808080" d="M10.39,4.47c0.13,0.03,0.28,0.13,0.33,0.21c0.05,0.08,0.19,0.38,0.18,0.52s0.07,0.3,0.19,0.38l0.18,0.11
+				c0.12,0.07,0.31,0.08,0.42,0.01c0.12-0.07,0.28-0.11,0.38-0.09c0.09,0.02,0.41,0.13,0.5,0.24c0.09,0.1,0.26,0.17,0.4,0.13
+				l0.21-0.05c0.13-0.03,0.27-0.16,0.3-0.29c0.03-0.13,0.13-0.28,0.21-0.33c0.08-0.05,0.38-0.19,0.52-0.18
+				c0.13,0.01,0.3-0.07,0.38-0.19l0.11-0.18c0.07-0.12,0.08-0.31,0.01-0.42c-0.07-0.12-0.11-0.28-0.09-0.38
+				c0.02-0.09,0.13-0.41,0.24-0.5c0.1-0.09,0.17-0.26,0.13-0.4l-0.05-0.21c-0.03-0.13-0.16-0.27-0.29-0.3
+				c-0.13-0.03-0.28-0.13-0.33-0.21s-0.19-0.38-0.18-0.52c0.01-0.13-0.07-0.3-0.19-0.38l-0.18-0.11c-0.12-0.07-0.31-0.08-0.42-0.01
+				c-0.12,0.07-0.28,0.11-0.38,0.09c-0.09-0.02-0.41-0.13-0.5-0.24c-0.09-0.1-0.26-0.17-0.4-0.13L11.87,1.1
+				c-0.13,0.03-0.27,0.16-0.3,0.29s-0.13,0.28-0.21,0.33s-0.38,0.19-0.52,0.18s-0.3,0.07-0.38,0.19l-0.11,0.18
+				c-0.07,0.12-0.08,0.31-0.01,0.42c0.07,0.12,0.11,0.28,0.09,0.38s-0.13,0.41-0.24,0.5c-0.1,0.09-0.17,0.26-0.13,0.4l0.05,0.21
+				C10.13,4.3,10.26,4.44,10.39,4.47z M12.27,2.43c0.6-0.13,1.2,0.24,1.33,0.84c0.13,0.6-0.24,1.2-0.84,1.33
+				c-0.6,0.13-1.2-0.24-1.33-0.84C11.3,3.16,11.67,2.56,12.27,2.43z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#808080" d="M1.85,4.19C1.8,4.32,1.66,4.47,1.53,4.53L1.15,4.71C1.02,4.77,0.92,4.93,0.91,5.06L0.89,5.92
+				c0,0.14,0.09,0.3,0.21,0.37l0.37,0.2C1.6,6.55,1.73,6.71,1.77,6.84l0.17,0.44C2,7.41,2,7.62,1.96,7.75l-0.15,0.4
+				C1.76,8.28,1.8,8.47,1.89,8.57l0.58,0.62c0.09,0.1,0.28,0.15,0.41,0.11L3.3,9.17c0.13-0.04,0.34-0.02,0.46,0.04l0.43,0.2
+				c0.13,0.05,0.28,0.19,0.34,0.32l0.18,0.39c0.06,0.12,0.22,0.23,0.35,0.23l0.85,0.03c0.14,0,0.3-0.09,0.37-0.21l0.2-0.37
+				c0.07-0.12,0.23-0.25,0.36-0.29l0.44-0.17c0.13-0.06,0.33-0.06,0.46-0.02l0.4,0.15C8.28,9.5,8.47,9.47,8.57,9.37l0.62-0.58
+				c0.1-0.09,0.15-0.28,0.11-0.41L9.17,7.97C9.13,7.84,9.16,7.63,9.22,7.51l0.2-0.43c0.05-0.13,0.19-0.28,0.32-0.34l0.39-0.18
+				c0.12-0.06,0.23-0.22,0.23-0.35l0.03-0.85c0-0.14-0.09-0.3-0.21-0.37l-0.37-0.2C9.67,4.71,9.54,4.55,9.49,4.42L9.33,3.98
+				C9.27,3.85,9.26,3.64,9.31,3.52l0.15-0.4C9.5,2.99,9.47,2.8,9.37,2.7L8.79,2.08c-0.09-0.1-0.28-0.15-0.41-0.11L7.97,2.09
+				C7.84,2.13,7.63,2.11,7.51,2.05l-0.43-0.2C6.94,1.8,6.79,1.66,6.73,1.53L6.56,1.15C6.5,1.02,6.34,0.92,6.2,0.91L5.35,0.89
+				c-0.14,0-0.3,0.09-0.37,0.21l-0.2,0.37C4.71,1.6,4.55,1.73,4.42,1.77L3.98,1.94C3.85,2,3.64,2,3.52,1.96l-0.4-0.15
+				C2.99,1.76,2.8,1.8,2.7,1.89L2.08,2.48c-0.1,0.09-0.15,0.28-0.11,0.41L2.09,3.3c0.04,0.13,0.02,0.34-0.04,0.46L1.85,4.19z
+				 M6.75,3.15c1.37,0.62,1.98,2.23,1.36,3.6s-2.23,1.98-3.6,1.36C3.15,7.5,2.54,5.89,3.15,4.52S5.38,2.54,6.75,3.15z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#ED6B21" d="M11,15c-0.55,0-1-0.45-1-1V8c0-0.55,0.45-1,1-1s1,0.45,1,1v6C12,14.55,11.55,15,11,15z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#ED6B21" d="M14,12H8c-0.55,0-1-0.45-1-1s0.45-1,1-1h6c0.55,0,1,0.45,1,1S14.55,12,14,12z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/import_plater.svg b/resources/icons/import_plater.svg
new file mode 100644
index 000000000..a953122f2
--- /dev/null
+++ b/resources/icons/import_plater.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="import_x5F_plater">
+	<g>
+		<path fill="#808080" d="M13,2c0.55,0,1,0.45,1,1V13c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+			c-1.1,0-2,0.89-2,2V13c0,1.1,0.89,2,2,2H13c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,12c-0.55,0-1-0.45-1-1V5c0-0.55,0.45-1,1-1s1,0.45,1,1v6C9,11.55,8.55,12,8,12z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,9H5C4.45,9,4,8.55,4,8s0.45-1,1-1h6c0.55,0,1,0.45,1,1S11.55,9,11,9z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/infill.png b/resources/icons/infill.png
deleted file mode 100644
index 69d3c7254..000000000
Binary files a/resources/icons/infill.png and /dev/null differ
diff --git a/resources/icons/infill.svg b/resources/icons/infill.svg
new file mode 100644
index 000000000..fcb1f99c9
--- /dev/null
+++ b/resources/icons/infill.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="infill">
+	<g>
+		<defs>
+			<polygon id="SVGID_1_" points="8,1.03 2,5.03 2,7.03 2,11.03 8,15.03 14,11.03 14,7.03 14,5.03 			"/>
+		</defs>
+		<clipPath id="SVGID_2_">
+			<use xlink:href="#SVGID_1_"  overflow="visible"/>
+		</clipPath>
+		<g clip-path="url(#SVGID_2_)">
+			
+				<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="2.32" y1="11.59" x2="8.56" y2="1.34"/>
+			
+				<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="4.88" y1="13.15" x2="11.12" y2="2.9"/>
+			
+				<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="7.44" y1="14.71" x2="13.68" y2="4.46"/>
+			
+				<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="4.44" y1="2.34" x2="14.68" y2="8.59"/>
+			
+				<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="2.88" y1="4.91" x2="13.12" y2="11.15"/>
+			
+				<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="1.32" y1="7.47" x2="11.56" y2="13.71"/>
+		</g>
+	</g>
+	<g>
+		<path fill="#808080" d="M8,2.23l5,3.33v1.46v3.46l-5,3.33l-5-3.33V7.03V5.56L8,2.23 M8,1.03l-6,4v2v4l6,4l6-4v-4v-2L8,1.03L8,1.03
+			z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/joystick.png b/resources/icons/joystick.png
deleted file mode 100644
index 62168f56f..000000000
Binary files a/resources/icons/joystick.png and /dev/null differ
diff --git a/resources/icons/lambda.png b/resources/icons/lambda.png
deleted file mode 100644
index 3be73b142..000000000
Binary files a/resources/icons/lambda.png and /dev/null differ
diff --git a/resources/icons/lambda_.png b/resources/icons/lambda_.png
deleted file mode 100644
index 8e9d2b0ea..000000000
Binary files a/resources/icons/lambda_.png and /dev/null differ
diff --git a/resources/icons/layers.png b/resources/icons/layers.png
deleted file mode 100644
index e1358a362..000000000
Binary files a/resources/icons/layers.png and /dev/null differ
diff --git a/resources/icons/layers.svg b/resources/icons/layers.svg
index 7718a8cbd..da5dec21d 100644
--- a/resources/icons/layers.svg
+++ b/resources/icons/layers.svg
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
-<g>
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="layers">
 	<g>
-		<rect x="7.98" y="105" fill="#FFFFFF" width="112.04" height="15"/>
-	</g>
-	<g>
-		<rect x="7.98" y="85.67" fill="#FFFFFF" width="112.04" height="13"/>
-	</g>
-	<g>
-		<rect x="7.98" y="66.33" fill="#FFFFFF" width="112.04" height="11"/>
-	</g>
-	<g>
-		<rect x="7.98" y="47" fill="#ED6B21" width="112.04" height="9"/>
-	</g>
-	<g>
-		<rect x="7.98" y="27.67" fill="#ED6B21" width="112.04" height="7"/>
-	</g>
-	<g>
-		<rect x="7.98" y="8.33" fill="#ED6B21" width="112.04" height="5"/>
+		<g>
+			<rect x="1" y="13" fill="#808080" width="14" height="2"/>
+		</g>
+		<g>
+			<rect x="1" y="10.6" fill="#808080" width="14" height="1.74"/>
+		</g>
+		<g>
+			<rect x="1" y="8.19" fill="#808080" width="14" height="1.47"/>
+		</g>
+		<g>
+			<rect x="1" y="5.79" fill="#ED6B21" width="14" height="1.2"/>
+		</g>
+		<g>
+			<rect x="1" y="3.39" fill="#ED6B21" width="14" height="0.93"/>
+		</g>
+		<g>
+			<rect x="1" y="0.99" fill="#808080" width="14" height="0.67"/>
+		</g>
 	</g>
 </g>
 </svg>
diff --git a/resources/icons/layers_white.svg b/resources/icons/layers_white.svg
new file mode 100644
index 000000000..cd71fab3a
--- /dev/null
+++ b/resources/icons/layers_white.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="layers">
+	<g>
+		<g>
+			<rect x="1" y="13" fill="#FFFFFF" width="14" height="2"/>
+		</g>
+		<g>
+			<rect x="1" y="10.6" fill="#FFFFFF" width="14" height="1.74"/>
+		</g>
+		<g>
+			<rect x="1" y="8.19" fill="#FFFFFF" width="14" height="1.47"/>
+		</g>
+		<g>
+			<rect x="1" y="5.79" fill="#ED6B21" width="14" height="1.2"/>
+		</g>
+		<g>
+			<rect x="1" y="3.39" fill="#ED6B21" width="14" height="0.93"/>
+		</g>
+		<g>
+			<rect x="1" y="0.99" fill="#FFFFFF" width="14" height="0.67"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/lock.png b/resources/icons/lock.png
deleted file mode 100644
index 2ebc4f6f9..000000000
Binary files a/resources/icons/lock.png and /dev/null differ
diff --git a/resources/icons/lock_closed.svg b/resources/icons/lock_closed.svg
new file mode 100644
index 000000000..549cdba23
--- /dev/null
+++ b/resources/icons/lock_closed.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="lock_x5F_closed">
+	<path fill="none" stroke="#808080" stroke-width="2" stroke-miterlimit="10" d="M4,8V4c0,0,0-2,2-2c1,0,3,0,4,0c2,0,2,2,2,2v4"/>
+	<path fill="#808080" d="M13,8H3C2.45,8,2,8.45,2,9v5c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1V9C14,8.45,13.55,8,13,8z M10,12H8.91
+		c-0.21,0.58-0.76,1-1.41,1C6.67,13,6,12.33,6,11.5S6.67,10,7.5,10c0.65,0,1.2,0.42,1.41,1H10V12z"/>
+</g>
+</svg>
diff --git a/resources/icons/lock_closed_white.svg b/resources/icons/lock_closed_white.svg
new file mode 100644
index 000000000..1665dc9a0
--- /dev/null
+++ b/resources/icons/lock_closed_white.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="lock_x5F_closed">
+	<path fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" d="M4,8V4c0,0,0-2,2-2c1,0,3,0,4,0c2,0,2,2,2,2v4"/>
+	<path fill="#FFFFFF" d="M13,8H3C2.45,8,2,8.45,2,9v5c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1V9C14,8.45,13.55,8,13,8z M10,12H8.91
+		c-0.21,0.58-0.76,1-1.41,1C6.67,13,6,12.33,6,11.5S6.67,10,7.5,10c0.65,0,1.2,0.42,1.41,1H10V12z"/>
+</g>
+</svg>
diff --git a/resources/icons/lock_open.png b/resources/icons/lock_open.png
deleted file mode 100644
index a471765ff..000000000
Binary files a/resources/icons/lock_open.png and /dev/null differ
diff --git a/resources/icons/lock_open.svg b/resources/icons/lock_open.svg
new file mode 100644
index 000000000..047e8685c
--- /dev/null
+++ b/resources/icons/lock_open.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="lock_x5F_open">
+	<path fill="none" stroke="#ED6B21" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" d="M4,8V4c0,0,0-2,2-2
+		c1,0,3,0,4,0c2,0,2,2,2,2v1"/>
+	<path fill="#ED6B21" d="M13,8H3C2.45,8,2,8.45,2,9v5c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1V9C14,8.45,13.55,8,13,8z M10,12H8.91
+		c-0.21,0.58-0.76,1-1.41,1C6.67,13,6,12.33,6,11.5S6.67,10,7.5,10c0.65,0,1.2,0.42,1.41,1H10V12z"/>
+</g>
+</svg>
diff --git a/resources/icons/lorry_add.png b/resources/icons/lorry_add.png
deleted file mode 100644
index a2c512499..000000000
Binary files a/resources/icons/lorry_add.png and /dev/null differ
diff --git a/resources/icons/lorry_go.png b/resources/icons/lorry_go.png
deleted file mode 100644
index 1c296a6aa..000000000
Binary files a/resources/icons/lorry_go.png and /dev/null differ
diff --git a/resources/icons/mark_X.svg b/resources/icons/mark_X.svg
new file mode 100644
index 000000000..1045debc5
--- /dev/null
+++ b/resources/icons/mark_X.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="X">
+	<path fill="#FF0000" d="M8,1C4.13,1,1,4.13,1,8c0,3.87,3.13,7,7,7s7-3.13,7-7C15,4.13,11.87,1,8,1z M9.26,12l-0.62-1.33L8,8.93
+		l-0.68,1.83L6.74,12H5.19l1.85-4.04L5.34,4H6.9l0.53,1.3L8,7l0.56-1.67L9.1,4h1.56l-1.7,3.96L10.81,12H9.26z"/>
+</g>
+</svg>
diff --git a/resources/icons/mark_Y.svg b/resources/icons/mark_Y.svg
new file mode 100644
index 000000000..26e01b295
--- /dev/null
+++ b/resources/icons/mark_Y.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="Y">
+	<path fill="#00FF00" d="M8,1C4.13,1,1,4.13,1,8c0,3.87,3.13,7,7,7s7-3.13,7-7C15,4.13,11.87,1,8,1z M8.72,8.65V12H7.3V8.65L5.27,4
+		h1.55l0.62,1.47l0.58,1.71L8.6,5.43L9.19,4h1.55L8.72,8.65z"/>
+</g>
+</svg>
diff --git a/resources/icons/mark_Z.svg b/resources/icons/mark_Z.svg
new file mode 100644
index 000000000..cd2826ac0
--- /dev/null
+++ b/resources/icons/mark_Z.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="Y_1_">
+	<path fill="#0000FF" d="M8,1C4.13,1,1,4.13,1,8c0,3.87,3.13,7,7,7s7-3.13,7-7C15,4.13,11.87,1,8,1z M10.42,10.73v1.27H5.41
+		l3.12-6.71H5.84V4.01h4.75l-3.07,6.72H10.42z"/>
+</g>
+</svg>
diff --git a/resources/icons/mode_middle_.png b/resources/icons/mode_advanced_.png
similarity index 100%
rename from resources/icons/mode_middle_.png
rename to resources/icons/mode_advanced_.png
diff --git a/resources/icons/mode_middle_sq.png b/resources/icons/mode_advanced_sq.png
similarity index 100%
rename from resources/icons/mode_middle_sq.png
rename to resources/icons/mode_advanced_sq.png
diff --git a/resources/icons/mode_expert.png b/resources/icons/mode_expert.png
deleted file mode 100644
index 1716bab44..000000000
Binary files a/resources/icons/mode_expert.png and /dev/null differ
diff --git a/resources/icons/mode_middle.png b/resources/icons/mode_middle.png
deleted file mode 100644
index b08f73ca6..000000000
Binary files a/resources/icons/mode_middle.png and /dev/null differ
diff --git a/resources/icons/mode_off_sq.png b/resources/icons/mode_off_sq.png
deleted file mode 100644
index 8d8185653..000000000
Binary files a/resources/icons/mode_off_sq.png and /dev/null differ
diff --git a/resources/icons/mode_simple.png b/resources/icons/mode_simple.png
deleted file mode 100644
index 8bc300228..000000000
Binary files a/resources/icons/mode_simple.png and /dev/null differ
diff --git a/resources/icons/move_hover.png b/resources/icons/move_hover.png
deleted file mode 100644
index 8cd66cab9..000000000
Binary files a/resources/icons/move_hover.png and /dev/null differ
diff --git a/resources/icons/move_off.png b/resources/icons/move_off.png
deleted file mode 100644
index 9e44690df..000000000
Binary files a/resources/icons/move_off.png and /dev/null differ
diff --git a/resources/icons/move_on.png b/resources/icons/move_on.png
deleted file mode 100644
index c19be461d..000000000
Binary files a/resources/icons/move_on.png and /dev/null differ
diff --git a/resources/icons/note.png b/resources/icons/note.png
deleted file mode 100644
index 40e206f17..000000000
Binary files a/resources/icons/note.png and /dev/null differ
diff --git a/resources/icons/note.svg b/resources/icons/note.svg
new file mode 100644
index 000000000..c14214201
--- /dev/null
+++ b/resources/icons/note.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="notes">
+	<g>
+		<path fill="#808080" d="M11,2l0,12l-9,0L2,2H11 M11,1H2C1.45,1,1,1.45,1,2V14c0,0.55,0.45,1,1,1H11c0.55,0,1-0.45,1-1V2
+			C12,1.45,11.55,1,11,1L11,1z"/>
+	</g>
+	<path fill="#ED6B21" d="M14,3L14,3c-0.55,0-1,0.45-1,1v10c0,0.55,0.45,1,1,1h0c0.55,0,1-0.45,1-1V4C15,3.45,14.55,3,14,3z"/>
+	<polygon fill="#ED6B21" points="15,4 13,4 14,1 	"/>
+	<g>
+		<line fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="4" x2="10" y2="4"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="6" x2="10" y2="6"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="8" x2="10" y2="8"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="10" x2="7" y2="10"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/number_of_copies.svg b/resources/icons/number_of_copies.svg
new file mode 100644
index 000000000..a5c8affc7
--- /dev/null
+++ b/resources/icons/number_of_copies.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="number_x5F_of_x5F_copies">
+	<g>
+		<path fill="#808080" d="M13,2c0.55,0,1,0.45,1,1V13c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+			c-1.1,0-2,0.89-2,2V13c0,1.1,0.89,2,2,2H13c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M6,4.5H4C3.72,4.5,3.5,4.28,3.5,4S3.72,3.5,4,3.5h2c0.28,0,0.5,0.22,0.5,0.5S6.28,4.5,6,4.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M12,8.5H8C7.72,8.5,7.5,8.28,7.5,8S7.72,7.5,8,7.5h4c0.28,0,0.5,0.22,0.5,0.5S12.28,8.5,12,8.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M6,12.5H4c-0.28,0-0.5-0.22-0.5-0.5s0.22-0.5,0.5-0.5h2c0.28,0,0.5,0.22,0.5,0.5S6.28,12.5,6,12.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M5,12.5c-0.28,0-0.5-0.22-0.5-0.5V4c0-0.28,0.22-0.5,0.5-0.5S5.5,3.72,5.5,4v8C5.5,12.28,5.28,12.5,5,12.5
+			z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M10,10.5c-0.28,0-0.5-0.22-0.5-0.5V6c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v4
+			C10.5,10.28,10.28,10.5,10,10.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/object.png b/resources/icons/object.png
deleted file mode 100644
index c85cbaf2f..000000000
Binary files a/resources/icons/object.png and /dev/null differ
diff --git a/resources/icons/open.svg b/resources/icons/open.svg
new file mode 100644
index 000000000..8fcddc2a6
--- /dev/null
+++ b/resources/icons/open.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="open">
+	<path fill="#808080" d="M1.22,14V3c0,0,0-1,1-1s4,0,5,0s1,2,2,2s4,0,4,0s1,0,1,1v2h-1c0,0,0,0,0-1s-1-1-1-1h-3.5c-1,0-1-2-2-2
+		s-3.5,0-3.5,0c-1,0-1,1-1,1v9v1h1v1c0,0,0,0-1,0S1.22,14,1.22,14z"/>
+	<path fill="#ED6B21" d="M5,6C4.45,6,3.86,6.43,3.68,6.95l-2.37,7.1C1.14,14.57,1.45,15,2,15h10c0.55,0,1.14-0.43,1.32-0.95
+		l2.37-7.1C15.86,6.43,15.55,6,15,6L5,6z"/>
+</g>
+</svg>
diff --git a/resources/icons/output+page_white.svg b/resources/icons/output+page_white.svg
new file mode 100644
index 000000000..ec1518f25
--- /dev/null
+++ b/resources/icons/output+page_white.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="output_x2B_page_x5F_white">
+	<g>
+		<path fill="#808080" d="M14.5,10c-0.27,0-0.5,0.23-0.5,0.5v3c0,0.27-0.23,0.5-0.5,0.5h-11C2.22,14,2,13.77,2,13.5v-11
+			C2,2.22,2.22,2,2.5,2h11C13.77,2,14,2.22,14,2.5v3C14,5.78,14.23,6,14.5,6l0,0C14.77,6,15,5.78,15,5.5v-4C15,1.23,14.77,1,14.5,1
+			h-13C1.23,1,1,1.23,1,1.5v13C1,14.77,1.23,15,1.5,15h13c0.27,0,0.5-0.23,0.5-0.5v-4C15,10.23,14.77,10,14.5,10L14.5,10z"/>
+	</g>
+	<path fill="#808080" d="M11,10h-0.04c-0.39,0.57-0.94,1.04-1.63,1.32c-1.83,0.73-3.91-0.16-4.64-1.99s0.16-3.91,1.99-4.64
+		C8.26,4.05,10.03,4.64,10.96,6H11V4.99c-0.11-0.11-0.2-0.23-0.32-0.33l-0.06-0.98L9.31,3.12L8.57,3.75
+		C8.23,3.71,7.88,3.7,7.54,3.74L6.81,3.09L5.48,3.62L5.4,4.6C5.12,4.81,4.87,5.05,4.66,5.32L3.69,5.37L3.12,6.69l0.63,0.75
+		C3.71,7.77,3.7,8.12,3.74,8.46L3.09,9.19l0.53,1.33L4.6,10.6c0.21,0.28,0.45,0.52,0.72,0.74l0.06,0.98l1.31,0.56l0.75-0.63
+		c0.34,0.05,0.68,0.05,1.03,0.01l0.73,0.65l1.33-0.53l0.08-0.98c0.15-0.11,0.27-0.26,0.4-0.39V10z"/>
+	<g>
+		<path fill="#ED6B21" d="M14.65,8.35c0.19-0.19,0.19-0.51,0-0.71l-2.29-2.29C12.16,5.16,12,5.22,12,5.5v1C12,6.78,11.77,7,11.5,7
+			h-3C8.23,7,8,7.22,8,7.5v1C8,8.77,8.23,9,8.5,9h3C11.77,9,12,9.23,12,9.5v1c0,0.27,0.16,0.34,0.35,0.15L14.65,8.35z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/overlay/cut_hover.png b/resources/icons/overlay/cut_hover.png
deleted file mode 100644
index b026667c2..000000000
Binary files a/resources/icons/overlay/cut_hover.png and /dev/null differ
diff --git a/resources/icons/overlay/cut_off.png b/resources/icons/overlay/cut_off.png
deleted file mode 100644
index c01f20554..000000000
Binary files a/resources/icons/overlay/cut_off.png and /dev/null differ
diff --git a/resources/icons/overlay/cut_on.png b/resources/icons/overlay/cut_on.png
deleted file mode 100644
index fac6ecb45..000000000
Binary files a/resources/icons/overlay/cut_on.png and /dev/null differ
diff --git a/resources/icons/overlay/layflat_hover.png b/resources/icons/overlay/layflat_hover.png
deleted file mode 100644
index 508916e48..000000000
Binary files a/resources/icons/overlay/layflat_hover.png and /dev/null differ
diff --git a/resources/icons/overlay/layflat_off.png b/resources/icons/overlay/layflat_off.png
deleted file mode 100644
index 6bfadd316..000000000
Binary files a/resources/icons/overlay/layflat_off.png and /dev/null differ
diff --git a/resources/icons/overlay/layflat_on.png b/resources/icons/overlay/layflat_on.png
deleted file mode 100644
index 4892b57fc..000000000
Binary files a/resources/icons/overlay/layflat_on.png and /dev/null differ
diff --git a/resources/icons/overlay/move_hover.png b/resources/icons/overlay/move_hover.png
deleted file mode 100644
index 933c34c24..000000000
Binary files a/resources/icons/overlay/move_hover.png and /dev/null differ
diff --git a/resources/icons/overlay/move_off.png b/resources/icons/overlay/move_off.png
deleted file mode 100644
index 6c921a042..000000000
Binary files a/resources/icons/overlay/move_off.png and /dev/null differ
diff --git a/resources/icons/overlay/move_on.png b/resources/icons/overlay/move_on.png
deleted file mode 100644
index 80204b52e..000000000
Binary files a/resources/icons/overlay/move_on.png and /dev/null differ
diff --git a/resources/icons/overlay/rotate_hover.png b/resources/icons/overlay/rotate_hover.png
deleted file mode 100644
index 9df377fc7..000000000
Binary files a/resources/icons/overlay/rotate_hover.png and /dev/null differ
diff --git a/resources/icons/overlay/rotate_off.png b/resources/icons/overlay/rotate_off.png
deleted file mode 100644
index f5b652979..000000000
Binary files a/resources/icons/overlay/rotate_off.png and /dev/null differ
diff --git a/resources/icons/overlay/rotate_on.png b/resources/icons/overlay/rotate_on.png
deleted file mode 100644
index 6d4c5bf31..000000000
Binary files a/resources/icons/overlay/rotate_on.png and /dev/null differ
diff --git a/resources/icons/overlay/scale_hover.png b/resources/icons/overlay/scale_hover.png
deleted file mode 100644
index 40a05fffd..000000000
Binary files a/resources/icons/overlay/scale_hover.png and /dev/null differ
diff --git a/resources/icons/overlay/scale_off.png b/resources/icons/overlay/scale_off.png
deleted file mode 100644
index 351d5a004..000000000
Binary files a/resources/icons/overlay/scale_off.png and /dev/null differ
diff --git a/resources/icons/overlay/scale_on.png b/resources/icons/overlay/scale_on.png
deleted file mode 100644
index f8450e105..000000000
Binary files a/resources/icons/overlay/scale_on.png and /dev/null differ
diff --git a/resources/icons/overlay/sla_support_points_hover.png b/resources/icons/overlay/sla_support_points_hover.png
deleted file mode 100644
index 2b385c0e7..000000000
Binary files a/resources/icons/overlay/sla_support_points_hover.png and /dev/null differ
diff --git a/resources/icons/overlay/sla_support_points_off.png b/resources/icons/overlay/sla_support_points_off.png
deleted file mode 100644
index 0a1e3f570..000000000
Binary files a/resources/icons/overlay/sla_support_points_off.png and /dev/null differ
diff --git a/resources/icons/overlay/sla_support_points_on.png b/resources/icons/overlay/sla_support_points_on.png
deleted file mode 100644
index e7f5d0a87..000000000
Binary files a/resources/icons/overlay/sla_support_points_on.png and /dev/null differ
diff --git a/resources/icons/package.png b/resources/icons/package.png
deleted file mode 100644
index 78945fe19..000000000
Binary files a/resources/icons/package.png and /dev/null differ
diff --git a/resources/icons/package_green.png b/resources/icons/package_green.png
deleted file mode 100644
index 2e5104016..000000000
Binary files a/resources/icons/package_green.png and /dev/null differ
diff --git a/resources/icons/pad.svg b/resources/icons/pad.svg
new file mode 100644
index 000000000..dc5907e37
--- /dev/null
+++ b/resources/icons/pad.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="pad">
+	<g>
+		<path fill="#ED6B21" d="M14,14H2c-0.55,0-1-0.45-1-1s0.45-1,1-1h12c0.55,0,1,0.45,1,1S14.55,14,14,14z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M8,8.17c-0.4,0-0.8-0.1-1.11-0.31L2.55,4.97C1.95,4.57,1.5,3.72,1.5,3V2c0-0.28,0.22-0.5,0.5-0.5
+			S2.5,1.72,2.5,2v1c0,0.38,0.29,0.93,0.61,1.14l4.34,2.89c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89C13.21,3.93,13.5,3.38,13.5,3V2
+			c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v1c0,0.72-0.45,1.57-1.05,1.97L9.11,7.86C8.8,8.07,8.4,8.17,8,8.17z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#808080" d="M13,11.38c-0.21,0-0.38-0.17-0.38-0.38V7c0-0.21,0.17-0.38,0.38-0.38S13.38,6.79,13.38,7v4
+				C13.38,11.21,13.21,11.38,13,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M12,7.49"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M12,11"/>
+		</g>
+		<g>
+			<path fill="#808080" d="M11,11.38c-0.21,0-0.38-0.17-0.38-0.38V8.12c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V11
+				C11.38,11.21,11.21,11.38,11,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M10,8.79"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M10,11"/>
+		</g>
+		<g>
+			<path fill="#808080" d="M9,11.38c-0.21,0-0.38-0.17-0.38-0.38V9.5c0-0.21,0.17-0.38,0.38-0.38S9.38,9.29,9.38,9.5V11
+				C9.38,11.21,9.21,11.38,9,11.38z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#808080" d="M3,11.38c-0.21,0-0.38-0.17-0.38-0.38V7c0-0.21,0.17-0.38,0.38-0.38S3.37,6.79,3.37,7v4
+				C3.37,11.21,3.2,11.38,3,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M4,7.49"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M4,11"/>
+		</g>
+		<g>
+			<path fill="#808080" d="M5,11.38c-0.21,0-0.38-0.17-0.38-0.38V8.12c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V11
+				C5.37,11.21,5.2,11.38,5,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M6,8.79"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M6,11"/>
+		</g>
+		<g>
+			<path fill="#808080" d="M7,11.38c-0.21,0-0.38-0.17-0.38-0.38V9.5c0-0.21,0.17-0.38,0.38-0.38S7.37,9.29,7.37,9.5V11
+				C7.37,11.21,7.2,11.38,7,11.38z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/page_white_go.png b/resources/icons/page_white_go.png
deleted file mode 100644
index fee12fb25..000000000
Binary files a/resources/icons/page_white_go.png and /dev/null differ
diff --git a/resources/icons/paste.svg b/resources/icons/paste.svg
new file mode 100644
index 000000000..028ffb8ea
--- /dev/null
+++ b/resources/icons/paste.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="paste">
+	<path fill="#FFFFFF" d="M33.73,107.03H15.94c-1.4,0-2.54-1.14-2.54-2.54V23.52c0-1.4,1.14-2.54,2.54-2.54h7.62v5.08
+		c0,1.4,1.14,2.54,2.54,2.54h45.72c1.4,0,2.54-1.14,2.54-2.54v-5.08h7.62c1.4,0,2.54,1.14,2.54,2.54v10.16
+		c0,1.4,1.14,2.54,2.54,2.54c1.4,0,2.54-1.14,2.54-2.54V23.52c0-4.2-3.42-7.62-7.62-7.62h-7.62v-5.08c0-1.4-1.14-2.54-2.54-2.54
+		H26.11c-1.4,0-2.54,1.14-2.54,2.54v5.08h-7.62c-4.2,0-7.62,3.42-7.62,7.62v80.97c0,4.2,3.42,7.62,7.62,7.62h17.78
+		c1.4,0,2.54-1.14,2.54-2.54C36.27,108.16,35.13,107.03,33.73,107.03z M28.65,13.36h40.64v10.16H28.65V13.36z"/>
+	<g>
+		<path fill="#ED6B21" d="M53.97,59.08h35.72c1.4,0,2.54-1.14,2.54-2.54c0-1.4-1.14-2.54-2.54-2.54H53.97
+			c-1.4,0-2.54,1.14-2.54,2.54C51.43,57.94,52.56,59.08,53.97,59.08z"/>
+		<path fill="#ED6B21" d="M104.93,69.24H53.97c-1.4,0-2.54,1.14-2.54,2.54c0,1.4,1.14,2.54,2.54,2.54h50.96
+			c1.4,0,2.54-1.14,2.54-2.54C107.47,70.38,106.33,69.24,104.93,69.24z"/>
+		<path fill="#ED6B21" d="M104.93,99.72H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,99.72,104.93,99.72z"/>
+		<path fill="#ED6B21" d="M115.75,51.15l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h66.04c4.2,0,7.62-3.42,7.62-7.62v-50.8C120.09,58.12,118.23,53.62,115.75,51.15z M104.85,47.43
+			l6.57,6.57h-6.57V47.43z M115.01,112.42c0,1.4-1.14,2.54-2.54,2.54H46.43c-1.4,0-2.54-1.14-2.54-2.54V46.38
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46v12.24c0,1.4,1.14,2.54,2.54,2.54h12.24c0.28,0.91,0.46,1.8,0.46,2.54
+			V112.42z"/>
+		<path fill="#ED6B21" d="M104.93,84.48H53.97c-1.4,0-2.54,1.14-2.54,2.54c0,1.4,1.14,2.54,2.54,2.54h50.96
+			c1.4,0,2.54-1.14,2.54-2.54C107.47,85.62,106.33,84.48,104.93,84.48z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/paste_menu.svg b/resources/icons/paste_menu.svg
new file mode 100644
index 000000000..74dbbf8ee
--- /dev/null
+++ b/resources/icons/paste_menu.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="paste">
+	<path fill="#808080" d="M33.73,107.03H15.94c-1.4,0-2.54-1.14-2.54-2.54V23.52c0-1.4,1.14-2.54,2.54-2.54h7.62v5.08
+		c0,1.4,1.14,2.54,2.54,2.54h45.72c1.4,0,2.54-1.14,2.54-2.54v-5.08h7.62c1.4,0,2.54,1.14,2.54,2.54v10.16
+		c0,1.4,1.14,2.54,2.54,2.54c1.4,0,2.54-1.14,2.54-2.54V23.52c0-4.2-3.42-7.62-7.62-7.62h-7.62v-5.08c0-1.4-1.14-2.54-2.54-2.54
+		H26.11c-1.4,0-2.54,1.14-2.54,2.54v5.08h-7.62c-4.2,0-7.62,3.42-7.62,7.62v80.97c0,4.2,3.42,7.62,7.62,7.62h17.78
+		c1.4,0,2.54-1.14,2.54-2.54C36.27,108.16,35.13,107.03,33.73,107.03z M28.65,13.36h40.64v10.16H28.65V13.36z"/>
+	<g>
+		<path fill="#ED6B21" d="M53.97,59.08h35.72c1.4,0,2.54-1.14,2.54-2.54c0-1.4-1.14-2.54-2.54-2.54H53.97
+			c-1.4,0-2.54,1.14-2.54,2.54C51.43,57.94,52.56,59.08,53.97,59.08z"/>
+		<path fill="#ED6B21" d="M104.93,69.24H53.97c-1.4,0-2.54,1.14-2.54,2.54c0,1.4,1.14,2.54,2.54,2.54h50.96
+			c1.4,0,2.54-1.14,2.54-2.54C107.47,70.38,106.33,69.24,104.93,69.24z"/>
+		<path fill="#ED6B21" d="M104.93,99.72H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,99.72,104.93,99.72z"/>
+		<path fill="#ED6B21" d="M115.75,51.15l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h66.04c4.2,0,7.62-3.42,7.62-7.62v-50.8C120.09,58.12,118.23,53.62,115.75,51.15z M104.85,47.43
+			l6.57,6.57h-6.57V47.43z M115.01,112.42c0,1.4-1.14,2.54-2.54,2.54H46.43c-1.4,0-2.54-1.14-2.54-2.54V46.38
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46v12.24c0,1.4,1.14,2.54,2.54,2.54h12.24c0.28,0.91,0.46,1.8,0.46,2.54
+			V112.42z"/>
+		<path fill="#ED6B21" d="M104.93,84.48H53.97c-1.4,0-2.54,1.14-2.54,2.54c0,1.4,1.14,2.54,2.54,2.54h50.96
+			c1.4,0,2.54-1.14,2.54-2.54C107.47,85.62,106.33,84.48,104.93,84.48z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/plater.svg b/resources/icons/plater.svg
new file mode 100644
index 000000000..6fd21215b
--- /dev/null
+++ b/resources/icons/plater.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="plater">
+	<path fill="#808080" d="M13,2c0.55,0,1,0.45,1,1V13c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+		c-1.1,0-2,0.89-2,2V13c0,1.1,0.89,2,2,2H13c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	<path fill="#ED6B21" d="M8.42,3.28c-0.23-0.15-0.6-0.15-0.83,0l-3.46,2.3C3.9,5.73,3.71,6.08,3.71,6.36v1.85c0,0.28,0,0.54,0,0.58
+		s0,0.31,0,0.58v0.27c0,0.27,0.19,0.62,0.42,0.78l3.46,2.3c0.23,0.15,0.6,0.15,0.83,0l3.46-2.3c0.23-0.15,0.42-0.5,0.42-0.78V9.38
+		c0-0.28,0-0.54,0-0.58s0-0.31,0-0.58V6.36c0-0.28-0.19-0.62-0.42-0.78L8.42,3.28z"/>
+</g>
+</svg>
diff --git a/resources/icons/plugin.png b/resources/icons/plugin.png
deleted file mode 100644
index 322685238..000000000
Binary files a/resources/icons/plugin.png and /dev/null differ
diff --git a/resources/icons/plugin_add.png b/resources/icons/plugin_add.png
deleted file mode 100644
index ae43690ec..000000000
Binary files a/resources/icons/plugin_add.png and /dev/null differ
diff --git a/resources/icons/plugin_go.png b/resources/icons/plugin_go.png
deleted file mode 100644
index 41da9913d..000000000
Binary files a/resources/icons/plugin_go.png and /dev/null differ
diff --git a/resources/icons/preview_menu.svg b/resources/icons/preview_menu.svg
new file mode 100644
index 000000000..725caf7b8
--- /dev/null
+++ b/resources/icons/preview_menu.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="preview">
+	<g>
+		<path fill="#101010" d="M90.72,121.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12l-29.16,28.57C91.49,121.23,91.11,121.38,90.72,121.38z"/>
+	</g>
+	<g>
+		<path fill="#101010" d="M90.72,111.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.14
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12l-29.16,28.57C91.49,111.23,91.11,111.38,90.72,111.38z"/>
+	</g>
+	<g>
+		<path fill="#101010" d="M90.72,101.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.14
+			c0.59-0.58,1.54-0.57,2.12,0.02s0.57,1.54-0.02,2.12l-29.16,28.57C91.49,101.23,91.11,101.38,90.72,101.38z"/>
+	</g>
+	<g>
+		<path fill="#101010" d="M90.72,91.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02s0.57,1.54-0.02,2.12L91.77,90.95C91.49,91.23,91.11,91.38,90.72,91.38z"/>
+	</g>
+	<g>
+		<path fill="#101010" d="M90.72,81.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12L91.77,80.95C91.49,81.23,91.11,81.38,90.72,81.38z"/>
+	</g>
+	<g>
+		<path fill="#101010" d="M90.72,71.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12L91.77,70.95C91.49,71.23,91.11,71.38,90.72,71.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M90.72,61.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12L91.77,60.95C91.49,61.23,91.11,61.38,90.72,61.38z"/>
+	</g>
+	<g>
+		<path fill="#101010" d="M90.72,51.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02s0.57,1.54-0.02,2.12L91.77,50.95C91.49,51.23,91.11,51.38,90.72,51.38z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#101010" d="M88.72,41.38H9.18c-1.68,0-2.22-0.95-2.37-1.36s-0.37-1.48,0.89-2.59L38.43,10.5
+				c1.1-0.96,3.03-1.69,4.49-1.69h75.85c1.65,0,2.22,0.94,2.38,1.34s0.42,1.47-0.75,2.63c0,0,0,0,0,0L93.2,39.55
+				C92.14,40.59,90.21,41.38,88.72,41.38z M11.17,38.38h77.55c0.71,0,1.87-0.47,2.37-0.97l26.01-25.6H42.92
+				c-0.74,0-1.96,0.46-2.51,0.95L11.17,38.38z M118.89,11.82C118.89,11.82,118.89,11.82,118.89,11.82
+				C118.89,11.82,118.89,11.82,118.89,11.82z M119.34,11.71L119.34,11.71L119.34,11.71z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/printer.svg b/resources/icons/printer.svg
new file mode 100644
index 000000000..91e103ec7
--- /dev/null
+++ b/resources/icons/printer.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="printer">
+	<rect x="1" y="1" fill="#808080" width="1" height="14"/>
+	<rect x="14" y="1" fill="#808080" width="1" height="14"/>
+	<rect x="7.5" y="-1.5" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 13.5 -2.5)" fill="#808080" width="1" height="14"/>
+	<rect x="7.5" y="-5.5" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 9.5 -6.5)" fill="#808080" width="1" height="14"/>
+	<rect x="7" y="7" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 22 6)" fill="#808080" width="2" height="14"/>
+	<rect x="3" y="4" fill="#ED6B21" width="4" height="4"/>
+	<polygon fill="#ED6B21" points="5,9 4,8 6,8 	"/>
+</g>
+</svg>
diff --git a/resources/icons/printer_empty.png b/resources/icons/printer_empty.png
deleted file mode 100644
index ddaae7e8a..000000000
Binary files a/resources/icons/printer_empty.png and /dev/null differ
diff --git a/resources/icons/printer_white.svg b/resources/icons/printer_white.svg
new file mode 100644
index 000000000..d94f6fd5c
--- /dev/null
+++ b/resources/icons/printer_white.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="printer">
+	<rect x="1" y="1" fill="#FFFFFF" width="1" height="14"/>
+	<rect x="14" y="1" fill="#FFFFFF" width="1" height="14"/>
+	<rect x="1" y="5" fill="#FFFFFF" width="14" height="1"/>
+	<rect x="1" y="1" fill="#FFFFFF" width="14" height="1"/>
+	<rect x="1" y="13" fill="#FFFFFF" width="14" height="2"/>
+	<rect x="3" y="4" fill="#ED6B21" width="4" height="4"/>
+	<polygon fill="#ED6B21" points="5,9 4,8 6,8 	"/>
+</g>
+</svg>
diff --git a/resources/icons/printers/PrusaResearch_SL1.png b/resources/icons/printers/PrusaResearch_SL1.png
index 3c15f95ea..b4425a705 100644
Binary files a/resources/icons/printers/PrusaResearch_SL1.png and b/resources/icons/printers/PrusaResearch_SL1.png differ
diff --git a/resources/icons/question.svg b/resources/icons/question.svg
new file mode 100644
index 000000000..5463243c6
--- /dev/null
+++ b/resources/icons/question.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="question">
+	<path fill="none" stroke="#ED6B21" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" d="M4,5c0,0,0,0,0-1s1-2,2-2
+		s3,0,4,0c2,0,2,2,2,3v1c0,1-1,2-2,2S9,8,9,8s1,0,0,0s-2,1-2,2s0,1,0,1"/>
+	<circle fill="#ED6B21" cx="7" cy="14" r="1"/>
+</g>
+</svg>
diff --git a/resources/icons/question_mark_01.png b/resources/icons/question_mark_01.png
deleted file mode 100644
index 25814a61d..000000000
Binary files a/resources/icons/question_mark_01.png and /dev/null differ
diff --git a/resources/icons/re_slice.svg b/resources/icons/re_slice.svg
new file mode 100644
index 000000000..54490ea42
--- /dev/null
+++ b/resources/icons/re_slice.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="slice">
+	<path fill="#808080" d="M14.22,6.61c-0.25-0.12-0.52-0.43-0.6-0.68s-0.32-1.09-0.23-1.35l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83
+		L12.6,2.7c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45
+		C9.1,1.2,8.77,1,8.5,1h-1C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5
+		C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12
+		L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.52,0.43,0.6,0.68s0.32,1.09,0.23,1.35
+		L2.5,11.77c-0.09,0.26,0,0.63,0.2,0.83l0.7,0.7c0.19,0.19,0.57,0.28,0.83,0.2l0.35-0.12c0.26-0.09,0.67-0.06,0.91,0.05
+		s1,0.54,1.12,0.79l0.17,0.33C6.9,14.8,7.22,15,7.5,15h1c0.27,0,0.6-0.2,0.72-0.45l0.17-0.33c0.12-0.25,0.43-0.52,0.68-0.6
+		s1.09-0.32,1.35-0.23l0.35,0.12c0.26,0.09,0.63,0,0.83-0.2l0.71-0.71c0.19-0.19,0.28-0.57,0.2-0.83l-0.12-0.35
+		c-0.09-0.26-0.06-0.67,0.05-0.91s0.54-1,0.79-1.12l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72L14.22,6.61z
+		 M8,13c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	<path fill="#ED6B21" d="M6.86,5.51C6.39,5.23,6,5.45,6,6v4c0,0.55,0.39,0.77,0.86,0.49l3.29-1.97c0.47-0.28,0.47-0.75,0-1.03
+		L6.86,5.51z"/>
+</g>
+</svg>
diff --git a/resources/icons/remove_copies.svg b/resources/icons/remove_copies.svg
new file mode 100644
index 000000000..d249cb5bc
--- /dev/null
+++ b/resources/icons/remove_copies.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="remove_x5F_copies">
+	<g>
+		<path fill="#808080" d="M8,2c3.31,0,6,2.69,6,6s-2.69,6-6,6s-6-2.69-6-6S4.69,2,8,2 M8,1C4.13,1,1,4.13,1,8s3.13,7,7,7s7-3.13,7-7
+			S11.87,1,8,1L8,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M12,8.75H4C3.59,8.75,3.25,8.41,3.25,8S3.59,7.25,4,7.25h8c0.41,0,0.75,0.34,0.75,0.75S12.41,8.75,12,8.75
+			z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/remove_menu.svg b/resources/icons/remove_menu.svg
new file mode 100644
index 000000000..a25ae965b
--- /dev/null
+++ b/resources/icons/remove_menu.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<path fill="#808080" d="M38.11,44.25H25.75c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72H38.1c0.95,0,1.72-0.77,1.72-1.72
+	C39.83,45.02,39.06,44.25,38.11,44.25z M45.89,45.97c0,0.95,0.77,1.72,1.72,1.72h12.35c0.95,0,1.72-0.77,1.72-1.72
+	s-0.77-1.72-1.72-1.72H47.61C46.66,44.25,45.89,45.02,45.89,45.97z M68.11,43.6c-0.33,0.28-0.52,0.65-0.59,1.04
+	c-0.59,0.27-1,0.87-1,1.56v5.6c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72v-5.34c0.12-0.06,0.24-0.13,0.35-0.22
+	c0.13-0.11,0.25-0.23,0.36-0.34l8.27-8.77c0.65-0.69,0.62-1.78-0.07-2.43s-1.78-0.62-2.43,0.07l-8.27,8.78
+	C68.16,43.56,68.14,43.58,68.11,43.6z M68.25,76.84c-0.95,0-1.72,0.77-1.72,1.72V89.1c0,0.95,0.77,1.72,1.72,1.72
+	c0.95,0,1.72-0.77,1.72-1.72V78.56C69.97,77.61,69.2,76.84,68.25,76.84z M69.97,59.91c0-0.95-0.77-1.72-1.72-1.72
+	c-0.95,0-1.72,0.77-1.72,1.72v10.54c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72V59.91z M88.92,56.35
+	c-0.95,0-1.72,0.77-1.72,1.72v3.4c0,0.34-0.02,0.63-0.04,0.85c-0.51,0.55-0.62,1.38-0.22,2.06c0.32,0.54,0.89,0.84,1.48,0.84
+	c0.3,0,0.6-0.08,0.88-0.24l0.25-0.15c0.67-0.4,1.09-1.1,1.09-3.35v-3.4C90.64,57.12,89.87,56.35,88.92,56.35z M41.81,26.17h11.3
+	c0.95,0,1.72-0.77,1.72-1.72s-0.77-1.72-1.72-1.72h-11.3c-0.95,0-1.72,0.77-1.72,1.72S40.86,26.17,41.81,26.17z M87.2,22.73h-5.39
+	c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72h2.75l-1.58,1.68c-0.65,0.69-0.62,1.78,0.07,2.43c0.33,0.31,0.76,0.47,1.18,0.47
+	c0.46,0,0.91-0.18,1.25-0.54l1.72-1.82v0.99c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72v-3.21
+	C90.64,24.27,89.09,22.73,87.2,22.73z M61.81,26.17h11.3c0.95,0,1.72-0.77,1.72-1.72s-0.77-1.72-1.72-1.72h-11.3
+	c-0.95,0-1.72,0.77-1.72,1.72S60.86,26.17,61.81,26.17z M9.71,67.54c0.95,0,1.72-0.77,1.72-1.72v-11.3c0-0.95-0.77-1.72-1.72-1.72
+	s-1.72,0.77-1.72,1.72v11.3C7.99,66.77,8.76,67.54,9.71,67.54z M24.65,33.86c0.42,0,0.84-0.15,1.17-0.46l7.04-6.52
+	c0.14-0.13,0.46-0.34,0.9-0.51c0.89-0.34,1.34-1.33,1-2.22s-1.33-1.34-2.22-1c-0.8,0.3-1.52,0.73-2.03,1.2l-7.04,6.52
+	c-0.7,0.65-0.74,1.74-0.09,2.43C23.73,33.68,24.19,33.86,24.65,33.86z M70.35,99.28l-0.37,0.36v-2.43c0-0.95-0.77-1.72-1.72-1.72
+	c-0.95,0-1.72,0.77-1.72,1.72v4.72H61.3c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72h5.23c1.4,0,3.15-0.7,4.16-1.66l2.03-1.94
+	c0.69-0.66,0.71-1.75,0.06-2.43C72.13,98.65,71.03,98.63,70.35,99.28z M52.6,101.93H41.3c-0.95,0-1.72,0.77-1.72,1.72
+	s0.77,1.72,1.72,1.72h11.3c0.95,0,1.72-0.77,1.72-1.72S53.55,101.93,52.6,101.93z M88.92,36.35c-0.95,0-1.72,0.77-1.72,1.72v11.3
+	c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72v-11.3C90.64,37.12,89.87,36.35,88.92,36.35z M32.61,101.93H21.3
+	c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72h11.3c0.95,0,1.72-0.77,1.72-1.72S33.56,101.93,32.61,101.93z M9.71,87.54
+	c0.95,0,1.72-0.77,1.72-1.72v-11.3c0-0.95-0.77-1.72-1.72-1.72s-1.72,0.77-1.72,1.72v11.3C7.99,86.77,8.76,87.54,9.71,87.54z
+	 M12.61,101.93h-1.18v-7.42c0-0.95-0.77-1.72-1.72-1.72s-1.72,0.77-1.72,1.72v7.42c0,1.9,1.54,3.44,3.44,3.44h1.18
+	c0.95,0,1.72-0.77,1.72-1.72S13.56,101.93,12.61,101.93z M19.53,36.88c-0.65-0.7-1.74-0.74-2.43-0.09l-7.3,6.76
+	c-0.55,0.51-0.93,1.15-1.16,1.6C8.22,46,8.56,47.03,9.41,47.46c0.25,0.12,0.51,0.18,0.77,0.18h0.01c0.14,0.04,0.29,0.07,0.45,0.07
+	h5.6c0.95,0,1.72-0.77,1.72-1.72s-0.77-1.72-1.72-1.72h-2.13l5.33-4.94C20.14,38.66,20.18,37.57,19.53,36.88z M80.7,89.4l-4.05,3.86
+	c-0.69,0.66-0.71,1.75-0.06,2.43c0.34,0.35,0.79,0.53,1.25,0.53c0.43,0,0.86-0.16,1.19-0.48l4.05-3.86
+	c0.69-0.66,0.71-1.75,0.06-2.43C82.48,88.77,81.39,88.75,80.7,89.4z"/>
+<g>
+	<path fill="#ED6B21" d="M98.82,101.06c-11.63,0-21.09-9.46-21.09-21.09s9.46-21.09,21.09-21.09s21.09,9.46,21.09,21.09
+		S110.45,101.06,98.82,101.06z M98.82,62.32c-9.73,0-17.65,7.92-17.65,17.65s7.92,17.65,17.65,17.65s17.65-7.92,17.65-17.65
+		S108.55,62.32,98.82,62.32z"/>
+</g>
+<g>
+	<path fill="#ED6B21" d="M110.44,81.84c0,1.1-0.9,2-2,2H89.2c-1.1,0-2-0.9-2-2v-3.75c0-1.1,0.9-2,2-2h19.25c1.1,0,2,0.9,2,2
+		L110.44,81.84L110.44,81.84z"/>
+</g>
+</svg>
diff --git a/resources/icons/resin.svg b/resources/icons/resin.svg
new file mode 100644
index 000000000..da44606a0
--- /dev/null
+++ b/resources/icons/resin.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="resin">
+	<rect x="4" y="7" fill="#ED6B21" width="8" height="8"/>
+	<path fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" d="M4.5,15h6.99c0.28,0,0.5-0.23,0.5-0.5V6
+		c0-1-2-1-2-2s0-1,0-1h1V1.5C11,1.23,10.77,1,10.5,1H5.5C5.23,1,5,1.23,5,1.5V3h1v1c0,1-2,1-2,2v8.5C4,14.77,4.23,15,4.5,15z"/>
+</g>
+</svg>
diff --git a/resources/icons/reslice.png b/resources/icons/reslice.png
deleted file mode 100644
index 167c0eccd..000000000
Binary files a/resources/icons/reslice.png and /dev/null differ
diff --git a/resources/icons/save.svg b/resources/icons/save.svg
new file mode 100644
index 000000000..9e3fb961e
--- /dev/null
+++ b/resources/icons/save.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="save">
+	<g>
+		<path fill="#808080" d="M12,2c1.44,0,2,0.56,2,2v10L2,14L2,2H12 M12,1H2C1.45,1,1,1.45,1,2V14c0,0.55,0.45,1,1,1h12
+			c0.55,0,1-0.45,1-1l0-10C15,2,14,1,12,1L12,1z"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="8" x2="10" y2="8"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="10" x2="10" y2="10"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#808080" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="12" x2="7" y2="12"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,1H5C4.45,1,4,1.45,4,2V5c0,0.55,0.45,1,1,1H11c0.55,0,1-0.45,1-1V2C12,1.45,11.55,1,11,1z M6,4.5
+			C6,4.78,5.78,5,5.5,5S5,4.78,5,4.5v-2C5,2.22,5.22,2,5.5,2S6,2.22,6,2.5V4.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/scale_hover.png b/resources/icons/scale_hover.png
deleted file mode 100644
index 394cb4b20..000000000
Binary files a/resources/icons/scale_hover.png and /dev/null differ
diff --git a/resources/icons/scale_off.png b/resources/icons/scale_off.png
deleted file mode 100644
index fac035099..000000000
Binary files a/resources/icons/scale_off.png and /dev/null differ
diff --git a/resources/icons/scale_on.png b/resources/icons/scale_on.png
deleted file mode 100644
index 4d4c075f3..000000000
Binary files a/resources/icons/scale_on.png and /dev/null differ
diff --git a/resources/icons/set_separate_obj.svg b/resources/icons/set_separate_obj.svg
new file mode 100644
index 000000000..c95149e2d
--- /dev/null
+++ b/resources/icons/set_separate_obj.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="set_x5F_separate_x5F_obj">
+	<g>
+		<path fill="#808080" d="M6,15.49H2.04c-0.83,0-1.5-0.67-1.51-1.5l-0.02-3.96c0-0.4,0.15-0.78,0.44-1.06C1.22,8.69,1.6,8.53,2,8.53
+			l4,0c0.83,0,1.5,0.67,1.5,1.5v3.96C7.5,14.82,6.83,15.49,6,15.49z M6,9.53l-4,0c-0.13,0-0.26,0.05-0.35,0.15
+			C1.56,9.77,1.51,9.9,1.51,10.03l0.02,3.96c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5v-3.96C6.5,9.75,6.28,9.53,6,9.53z"
+			/>
+	</g>
+	<g>
+		<path fill="#808080" d="M6,7.5H2.04c-0.83,0-1.5-0.67-1.51-1.5L0.51,2.04c0-0.4,0.15-0.78,0.44-1.06C1.22,0.7,1.6,0.54,2,0.54l4,0
+			c0.83,0,1.5,0.67,1.5,1.5V6C7.5,6.83,6.83,7.5,6,7.5z M6,1.54l-4,0c-0.13,0-0.26,0.05-0.35,0.15C1.56,1.78,1.51,1.9,1.51,2.04
+			L1.53,6c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5V2.04C6.5,1.76,6.28,1.54,6,1.54z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,7.5h-3.96c-0.83,0-1.5-0.67-1.51-1.5L8.51,2.04c0-0.4,0.15-0.78,0.44-1.06C9.22,0.7,9.6,0.54,10,0.54
+			l4,0c0.83,0,1.5,0.67,1.5,1.5V6C15.5,6.83,14.83,7.5,14,7.5z M14,1.54l-4,0c-0.13,0-0.26,0.05-0.35,0.15
+			C9.56,1.78,9.5,1.9,9.51,2.04L9.53,6c0,0.27,0.23,0.5,0.51,0.5H14c0.28,0,0.5-0.22,0.5-0.5V2.04C14.5,1.76,14.28,1.54,14,1.54z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M14,15.5h-3.96c-0.83,0-1.5-0.67-1.51-1.5l-0.02-3.96c0-0.4,0.15-0.78,0.44-1.06
+			C9.22,8.7,9.6,8.54,10,8.54l4,0c0.83,0,1.5,0.67,1.5,1.5V14C15.5,14.83,14.83,15.5,14,15.5z M14,9.54l-4,0
+			c-0.13,0-0.26,0.05-0.35,0.15C9.56,9.78,9.5,9.9,9.51,10.04L9.53,14c0,0.27,0.23,0.5,0.51,0.5H14c0.28,0,0.5-0.22,0.5-0.5v-3.96
+			C14.5,9.76,14.28,9.54,14,9.54z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/shape_flip_horizontal.png b/resources/icons/shape_flip_horizontal.png
deleted file mode 100644
index 8667c81f8..000000000
Binary files a/resources/icons/shape_flip_horizontal.png and /dev/null differ
diff --git a/resources/icons/shape_handles.png b/resources/icons/shape_handles.png
deleted file mode 100644
index ce27fe3a0..000000000
Binary files a/resources/icons/shape_handles.png and /dev/null differ
diff --git a/resources/icons/shape_ungroup_o.png b/resources/icons/shape_ungroup_o.png
deleted file mode 100644
index 97746d32c..000000000
Binary files a/resources/icons/shape_ungroup_o.png and /dev/null differ
diff --git a/resources/icons/shape_ungroup_p.png b/resources/icons/shape_ungroup_p.png
deleted file mode 100644
index 81c0198ff..000000000
Binary files a/resources/icons/shape_ungroup_p.png and /dev/null differ
diff --git a/resources/icons/skirt+brim.svg b/resources/icons/skirt+brim.svg
new file mode 100644
index 000000000..9242761b6
--- /dev/null
+++ b/resources/icons/skirt+brim.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="skirt_x2B_brim">
+	<g id="skirt_x2B_brim_-_box">
+		<g>
+			<path fill="#808080" d="M8,3.26L12.12,6v1.17v2.88L8,12.8l-4.12-2.74V7.17V6L8,3.26 M8,2.06L2.88,5.47v1.71v3.41L8,14l5.12-3.41
+				V7.17V5.47L8,2.06L8,2.06z"/>
+		</g>
+	</g>
+	<g id="skirt_x2B_brim_-_box_1_">
+		<g>
+			<path fill="#ED6B21" d="M8,1.63l5.5,3.67v1.73v3.73L8,14.43l-5.5-3.67V7.03V5.3L8,1.63 M8,1.03l-6,4v2v4l6,4l6-4v-4v-2L8,1.03
+				L8,1.03z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/sla_support_points_reset.png b/resources/icons/sla_support_points_reset.png
deleted file mode 100644
index 6e051fe95..000000000
Binary files a/resources/icons/sla_support_points_reset.png and /dev/null differ
diff --git a/resources/icons/sla_support_points_tooltip.png b/resources/icons/sla_support_points_tooltip.png
deleted file mode 100644
index 1bdfd3440..000000000
Binary files a/resources/icons/sla_support_points_tooltip.png and /dev/null differ
diff --git a/resources/icons/split.png b/resources/icons/split.png
deleted file mode 100644
index c5680ab91..000000000
Binary files a/resources/icons/split.png and /dev/null differ
diff --git a/resources/icons/split_object_SMALL.svg b/resources/icons/split_object_SMALL.svg
new file mode 100644
index 000000000..7e362c2ba
--- /dev/null
+++ b/resources/icons/split_object_SMALL.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="split_x5F_object_x5F_small">
+	<path fill="#808080" d="M10.98,7.22c-0.29,0-0.52-0.23-0.52-0.52V4.61V3.57c0-0.29-0.23-0.52-0.52-0.52H2.62
+		c-0.29,0-0.53,0.24-0.53,0.53l-0.04,7.31c0,0.14,0.05,0.27,0.15,0.37c0.1,0.1,0.23,0.15,0.37,0.15l3.19,0v0
+		c0.29,0,0.52,0.23,0.52,0.52s-0.23,0.52-0.52,0.52H3.66c-0.01,0-0.01,0-0.02,0l-1.08,0c-0.42,0-0.81-0.16-1.11-0.46
+		C1.16,11.69,1,11.29,1,10.87l0.04-7.31C1.05,2.7,1.75,2,2.62,2h7.31c0.86,0,1.57,0.7,1.57,1.57v1.04V6.7
+		C11.5,6.99,11.27,7.22,10.98,7.22z"/>
+	<g>
+		<path fill="#ED6B21" d="M13.53,8H7.47C7.21,8,7,8.21,7,8.47v6.07C7,14.79,7.21,15,7.47,15h6.07c0.26,0,0.47-0.21,0.47-0.47V8.47
+			C14,8.21,13.79,8,13.53,8z M12.36,12.68c0,1.14-0.57,1.65-1.88,1.65s-1.84-0.51-1.84-1.65v-2.33c0-1.17,0.51-1.65,1.84-1.65
+			c1.33,0,1.88,0.48,1.88,1.65V12.68z"/>
+		<path fill="#ED6B21" d="M10.47,9.57c-0.72,0-0.85,0.32-0.85,0.82v2.23c0,0.52,0.14,0.82,0.85,0.82c0.72,0,0.89-0.3,0.89-0.82V10.4
+			C11.37,9.9,11.24,9.57,10.47,9.57z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/split_parts_SMALL.svg b/resources/icons/split_parts_SMALL.svg
new file mode 100644
index 000000000..45f90bee0
--- /dev/null
+++ b/resources/icons/split_parts_SMALL.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="split_x5F_parts_x5F_small">
+	<path fill="#808080" d="M10.98,7.22c-0.29,0-0.52-0.23-0.52-0.52V4.61V3.57c0-0.29-0.23-0.52-0.52-0.52H2.62
+		c-0.29,0-0.53,0.24-0.53,0.53l-0.04,7.31c0,0.14,0.05,0.27,0.15,0.37c0.1,0.1,0.23,0.15,0.37,0.15l3.19,0v0
+		c0.29,0,0.52,0.23,0.52,0.52s-0.23,0.52-0.52,0.52H3.66c-0.01,0-0.01,0-0.02,0l-1.08,0c-0.42,0-0.81-0.16-1.11-0.46
+		C1.16,11.69,1,11.29,1,10.87l0.04-7.31C1.05,2.7,1.75,2,2.62,2h7.31c0.86,0,1.57,0.7,1.57,1.57v1.04V6.7
+		C11.5,6.99,11.27,7.22,10.98,7.22z"/>
+	<g>
+		<path fill="#ED6B21" d="M13.53,8H7.47C7.21,8,7,8.21,7,8.47v6.07C7,14.79,7.21,15,7.47,15h6.07c0.26,0,0.47-0.21,0.47-0.47V8.47
+			C14,8.21,13.79,8,13.53,8z M12.19,10.89c0,1.16-0.65,1.69-1.99,1.69H9.81v1.72H8.79V8.7h1.41c1.35,0,1.99,0.49,1.99,1.67V10.89z"
+			/>
+		<path fill="#ED6B21" d="M10.21,9.62H9.81v2h0.39c0.73,0,0.97-0.25,0.97-0.78v-0.41C11.17,9.89,10.99,9.62,10.21,9.62z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/spool.png b/resources/icons/spool.png
deleted file mode 100644
index ab06d9912..000000000
Binary files a/resources/icons/spool.png and /dev/null differ
diff --git a/resources/icons/spool.svg b/resources/icons/spool.svg
new file mode 100644
index 000000000..840365938
--- /dev/null
+++ b/resources/icons/spool.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="spool">
+	
+		<line fill="none" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="2" y1="2" x2="2" y2="14"/>
+	
+		<line fill="none" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="14" y1="2" x2="14" y2="14"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="4" y1="3" x2="4" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="6" y1="3" x2="6" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="8" y1="3" x2="8" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10" y1="3" x2="10" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="12" y1="3" x2="12" y2="13"/>
+</g>
+</svg>
diff --git a/resources/icons/support.svg b/resources/icons/support.svg
new file mode 100644
index 000000000..65c7592c8
--- /dev/null
+++ b/resources/icons/support.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="support">
+	<polygon fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="8,1 
+		2.31,4.79 2.31,8.57 2.31,8.79 2.31,10.47 8,14.25 13.69,10.47 13.69,8.79 13.69,8.57 13.69,4.79 	"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="12.69" y1="15" x2="12.69" y2="12.44"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="13.87" y1="15" x2="13.87" y2="11.64"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="2.13" y1="15" x2="2.13" y2="11.64"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="3.33" y1="15" x2="3.33" y2="12.44"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="4.51" y1="15" x2="4.51" y2="13.22"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="5.66" y1="15" x2="5.66" y2="14"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="10.34" y1="15" x2="10.34" y2="14"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="11.5" y1="15" x2="11.5" y2="13.22"/>
+</g>
+</svg>
diff --git a/resources/icons/support_blocker.png b/resources/icons/support_blocker.png
deleted file mode 100644
index 8a66c73f4..000000000
Binary files a/resources/icons/support_blocker.png and /dev/null differ
diff --git a/resources/icons/support_blocker.svg b/resources/icons/support_blocker.svg
new file mode 100644
index 000000000..56086b279
--- /dev/null
+++ b/resources/icons/support_blocker.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="support_x5F_blocker">
+	<g>
+		<path fill="#808080" d="M8,8.17c-0.4,0-0.8-0.1-1.11-0.31L2.55,4.97C1.95,4.57,1.5,3.72,1.5,3V2c0-0.28,0.22-0.5,0.5-0.5
+			S2.5,1.72,2.5,2v1c0,0.38,0.29,0.93,0.61,1.14l4.34,2.89c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89C13.21,3.93,13.5,3.38,13.5,3V2
+			c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v1c0,0.72-0.45,1.57-1.05,1.97L9.11,7.86C8.8,8.07,8.4,8.17,8,8.17z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,8.38c-0.12,0-0.24-0.06-0.31-0.17c-0.11-0.17-0.07-0.41,0.1-0.52l3-2c0.12-0.08,0.26-0.08,0.38-0.02
+			s0.2,0.19,0.2,0.33v2c0,0.21-0.17,0.38-0.38,0.38S13.62,8.21,13.62,8V6.7l-2.42,1.61C11.14,8.35,11.07,8.38,11,8.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,14.38h-3c-0.21,0-0.38-0.17-0.38-0.38s0.17-0.38,0.38-0.38h2.62V13c0-0.21,0.17-0.38,0.38-0.38
+			s0.38,0.17,0.38,0.38v1C14.38,14.21,14.21,14.38,14,14.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M9,14.38H7c-0.21,0-0.38-0.17-0.38-0.38S6.79,13.62,7,13.62h2c0.21,0,0.38,0.17,0.38,0.38
+			S9.21,14.38,9,14.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,11.38c-0.21,0-0.38-0.17-0.38-0.38v-1c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38v1
+			C14.38,11.21,14.21,11.38,14,11.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,10.38c-0.13,0-0.25-0.06-0.32-0.18C7.57,10.02,7.63,9.79,7.8,9.68l1.62-1C9.6,8.57,9.83,8.63,9.94,8.8
+			c0.11,0.18,0.05,0.41-0.12,0.52l-1.62,1C8.14,10.36,8.07,10.38,8,10.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M5,8.38c-0.07,0-0.14-0.02-0.21-0.06L2.38,6.7V8c0,0.21-0.17,0.38-0.38,0.38S1.62,8.21,1.62,8V6
+			c0-0.14,0.08-0.27,0.2-0.33C1.95,5.6,2.09,5.61,2.21,5.69l3,2c0.17,0.11,0.22,0.35,0.1,0.52C5.24,8.32,5.12,8.38,5,8.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M5,14.38H2c-0.21,0-0.38-0.17-0.38-0.38v-1c0-0.21,0.17-0.38,0.38-0.38S2.38,12.79,2.38,13v0.62H5
+			c0.21,0,0.38,0.17,0.38,0.38S5.21,14.38,5,14.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M2,11.38c-0.21,0-0.38-0.17-0.38-0.38v-1c0-0.21,0.17-0.38,0.38-0.38S2.38,9.79,2.38,10v1
+			C2.38,11.21,2.21,11.38,2,11.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,10.38c-0.07,0-0.14-0.02-0.2-0.06l-1.62-1C6.01,9.21,5.96,8.98,6.06,8.8C6.17,8.63,6.4,8.57,6.58,8.68
+			l1.62,1c0.18,0.11,0.23,0.34,0.12,0.52C8.25,10.31,8.13,10.38,8,10.38z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/support_blocker_.png b/resources/icons/support_blocker_.png
deleted file mode 100644
index fc658e4f6..000000000
Binary files a/resources/icons/support_blocker_.png and /dev/null differ
diff --git a/resources/icons/support_enforcer.png b/resources/icons/support_enforcer.png
deleted file mode 100644
index c0bef8d5e..000000000
Binary files a/resources/icons/support_enforcer.png and /dev/null differ
diff --git a/resources/icons/support_enforcer.svg b/resources/icons/support_enforcer.svg
new file mode 100644
index 000000000..0f0eb4907
--- /dev/null
+++ b/resources/icons/support_enforcer.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="support_x5F_enfocer">
+	<g>
+		<path fill="#808080" d="M8,8.17c-0.4,0-0.8-0.1-1.11-0.31L2.55,4.97C1.95,4.57,1.5,3.72,1.5,3V2c0-0.28,0.22-0.5,0.5-0.5
+			S2.5,1.72,2.5,2v1c0,0.38,0.29,0.93,0.61,1.14l4.34,2.89c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89C13.21,3.93,13.5,3.38,13.5,3V2
+			c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v1c0,0.72-0.45,1.57-1.05,1.97L9.11,7.86C8.8,8.07,8.4,8.17,8,8.17z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M13,14.5H3c-0.83,0-1.5-0.67-1.5-1.5V7c0-0.45,0.19-0.81,0.51-0.98c0.32-0.17,0.72-0.13,1.1,0.12
+			l4.34,2.89c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89c0.38-0.25,0.78-0.3,1.1-0.12C14.31,6.19,14.5,6.55,14.5,7v6
+			C14.5,13.83,13.83,14.5,13,14.5z M2.5,6.94c0,0.02,0,0.04,0,0.06v6c0,0.28,0.22,0.5,0.5,0.5h10c0.28,0,0.5-0.22,0.5-0.5V7
+			c0-0.02,0-0.04,0-0.06c-0.02,0.01-0.03,0.02-0.05,0.03L9.11,9.86c-0.62,0.41-1.6,0.41-2.22,0L2.55,6.97
+			C2.54,6.96,2.52,6.95,2.5,6.94z M8.83,9.45L8.83,9.45L8.83,9.45z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/support_enforcer_.png b/resources/icons/support_enforcer_.png
deleted file mode 100644
index ac34b6cb0..000000000
Binary files a/resources/icons/support_enforcer_.png and /dev/null differ
diff --git a/resources/icons/sys_lock.png b/resources/icons/sys_lock.png
deleted file mode 100644
index a33eadbca..000000000
Binary files a/resources/icons/sys_lock.png and /dev/null differ
diff --git a/resources/icons/sys_unlock.png b/resources/icons/sys_unlock.png
deleted file mode 100644
index d53c288a1..000000000
Binary files a/resources/icons/sys_unlock.png and /dev/null differ
diff --git a/resources/icons/sys_unlock_grey.png b/resources/icons/sys_unlock_grey.png
deleted file mode 100644
index 0dedf4dee..000000000
Binary files a/resources/icons/sys_unlock_grey.png and /dev/null differ
diff --git a/resources/icons/tag_blue.png b/resources/icons/tag_blue.png
deleted file mode 100644
index 45aebfbb1..000000000
Binary files a/resources/icons/tag_blue.png and /dev/null differ
diff --git a/resources/icons/test.svg b/resources/icons/test.svg
new file mode 100644
index 000000000..abf35d0ae
--- /dev/null
+++ b/resources/icons/test.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="test">
+	<g>
+		<path fill="#808080" d="M13,1.5h-1.5v1h1v12h-9v-12h1v-1H3C2.72,1.5,2.5,1.72,2.5,2v13c0,0.28,0.22,0.5,0.5,0.5h10
+			c0.28,0,0.5-0.22,0.5-0.5V2C13.5,1.72,13.28,1.5,13,1.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,8.5H5C4.72,8.5,4.5,8.28,4.5,8V5c0-0.28,0.22-0.5,0.5-0.5h3c0.28,0,0.5,0.22,0.5,0.5v3
+			C8.5,8.28,8.28,8.5,8,8.5z M5.5,7.5h2v-2h-2V7.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,13.5H5c-0.28,0-0.5-0.22-0.5-0.5v-3c0-0.28,0.22-0.5,0.5-0.5h3c0.28,0,0.5,0.22,0.5,0.5v3
+			C8.5,13.28,8.28,13.5,8,13.5z M5.5,12.5h2v-2h-2V12.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,5.5h-1C9.72,5.5,9.5,5.28,9.5,5S9.72,4.5,10,4.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,5.5,11,5.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,7.5h-1C9.72,7.5,9.5,7.28,9.5,7S9.72,6.5,10,6.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,7.5,11,7.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,10.5h-1c-0.28,0-0.5-0.22-0.5-0.5S9.72,9.5,10,9.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,10.5,11,10.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,12.5h-1c-0.28,0-0.5-0.22-0.5-0.5s0.22-0.5,0.5-0.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,12.5,11,12.5z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#808080" d="M11,3.5H5C4.72,3.5,4.5,3.28,4.5,3V1c0-0.28,0.22-0.5,0.5-0.5h6c0.28,0,0.5,0.22,0.5,0.5v2
+				C11.5,3.28,11.28,3.5,11,3.5z M5.5,2.5h5v-1h-5V2.5z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/textfield.png b/resources/icons/textfield.png
deleted file mode 100644
index d37e7304e..000000000
Binary files a/resources/icons/textfield.png and /dev/null differ
diff --git a/resources/icons/time.png b/resources/icons/time.png
deleted file mode 100644
index 3b8d2995f..000000000
Binary files a/resources/icons/time.png and /dev/null differ
diff --git a/resources/icons/time.svg b/resources/icons/time.svg
new file mode 100644
index 000000000..5d8f23cfc
--- /dev/null
+++ b/resources/icons/time.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="time">
+	<g>
+		<path fill="#808080" d="M8,2c3.31,0,6,2.69,6,6s-2.69,6-6,6s-6-2.69-6-6S4.69,2,8,2 M8,1C4.13,1,1,4.13,1,8s3.13,7,7,7s7-3.13,7-7
+			S11.87,1,8,1L8,1z"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-miterlimit="10" x1="5" y1="4" x2="8" y2="8"/>
+	</g>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.5" y1="8" x2="8" y2="8"/>
+</g>
+</svg>
diff --git a/resources/icons/toolbar.png b/resources/icons/toolbar.png
deleted file mode 100644
index 581db339e..000000000
Binary files a/resources/icons/toolbar.png and /dev/null differ
diff --git a/resources/icons/toolbar141.png b/resources/icons/toolbar141.png
deleted file mode 100644
index 888b7b1f9..000000000
Binary files a/resources/icons/toolbar141.png and /dev/null differ
diff --git a/resources/icons/undo.svg b/resources/icons/undo.svg
new file mode 100644
index 000000000..fbc580d88
--- /dev/null
+++ b/resources/icons/undo.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="undo">
+	<path fill="none" stroke="#ED6B21" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" d="M3,11
+		c0.91,1.78,2.76,3,4.89,3c3.04,0,5.5-2.46,5.5-5.5c0-3.04-2.46-5.5-5.5-5.5c-0.17,0-0.34,0.01-0.5,0.03"/>
+	
+		<polygon fill="#ED6B21" stroke="#ED6B21" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
+		7.39,1 7.39,5 4.39,3 	"/>
+</g>
+</svg>
diff --git a/resources/icons/upload_queue.svg b/resources/icons/upload_queue.svg
new file mode 100644
index 000000000..764717836
--- /dev/null
+++ b/resources/icons/upload_queue.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="gueue">
+	<g>
+		<path fill="#808080" d="M6,15.49H2.04c-0.83,0-1.5-0.67-1.51-1.5l-0.02-3.96c0-0.4,0.15-0.78,0.44-1.06C1.22,8.69,1.6,8.53,2,8.53
+			l4,0c0.83,0,1.5,0.67,1.5,1.5v3.96C7.5,14.82,6.83,15.49,6,15.49z M6,9.53l-4,0c-0.13,0-0.26,0.05-0.35,0.15
+			C1.56,9.77,1.51,9.9,1.51,10.03l0.02,3.96c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5v-3.96C6.5,9.75,6.28,9.53,6,9.53z"
+			/>
+	</g>
+	<g>
+		<path fill="#808080" d="M6,7.5H2.04c-0.83,0-1.5-0.67-1.51-1.5L0.51,2.04c0-0.4,0.15-0.78,0.44-1.06C1.22,0.7,1.6,0.54,2,0.54l4,0
+			c0,0,0,0,0,0c0.4,0,0.77,0.16,1.06,0.44C7.34,1.26,7.5,1.64,7.5,2.04V6C7.5,6.83,6.83,7.5,6,7.5z M6,1.54C6,1.54,6,1.54,6,1.54
+			l-4,0c-0.13,0-0.26,0.05-0.35,0.15C1.56,1.78,1.51,1.9,1.51,2.04L1.53,6c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5V2.04
+			c0-0.13-0.05-0.26-0.15-0.35C6.26,1.59,6.13,1.54,6,1.54z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M14,7.5h-3.96c-0.83,0-1.5-0.67-1.51-1.5L8.51,2.04c0-0.4,0.15-0.78,0.44-1.06C9.22,0.7,9.6,0.54,10,0.54
+			l4,0h0c0.4,0,0.78,0.16,1.06,0.44c0.28,0.28,0.44,0.66,0.44,1.06V6C15.5,6.83,14.83,7.5,14,7.5z M14,1.54C14,1.54,14,1.54,14,1.54
+			l-4,0c-0.13,0-0.26,0.05-0.35,0.15C9.56,1.78,9.5,1.9,9.51,2.04L9.53,6c0,0.27,0.23,0.5,0.51,0.5H14c0.28,0,0.5-0.22,0.5-0.5V2.04
+			c0-0.13-0.05-0.26-0.15-0.35S14.13,1.54,14,1.54z"/>
+	</g>
+	<path fill="#ED6B21" d="M12,8.5c-1.93,0-3.5,1.57-3.5,3.5s1.57,3.5,3.5,3.5s3.5-1.57,3.5-3.5S13.93,8.5,12,8.5z M13.45,12.58H12
+		c-0.09,0-0.17-0.02-0.24-0.06c-0.02-0.01-0.04-0.02-0.05-0.04c-0.05-0.03-0.1-0.07-0.14-0.12c-0.01-0.01-0.02-0.01-0.03-0.02
+		l-1.25-1.67c-0.19-0.26-0.14-0.62,0.12-0.82c0.26-0.19,0.62-0.14,0.82,0.12l1.07,1.43h1.17c0.32,0,0.58,0.26,0.58,0.58
+		C14.04,12.32,13.78,12.58,13.45,12.58z"/>
+</g>
+</svg>
diff --git a/resources/icons/variable_layer_height.png b/resources/icons/variable_layer_height.png
deleted file mode 100644
index 2fbdd6920..000000000
Binary files a/resources/icons/variable_layer_height.png and /dev/null differ
diff --git a/resources/icons/view_toolbar.png b/resources/icons/view_toolbar.png
deleted file mode 100644
index 8cfb8d091..000000000
Binary files a/resources/icons/view_toolbar.png and /dev/null differ
diff --git a/resources/icons/wand.png b/resources/icons/wand.png
deleted file mode 100644
index 44ccbf812..000000000
Binary files a/resources/icons/wand.png and /dev/null differ
diff --git a/resources/icons/white/add_copies.svg b/resources/icons/white/add_copies.svg
new file mode 100644
index 000000000..17eff0179
--- /dev/null
+++ b/resources/icons/white/add_copies.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="add_x5F_copies">
+	<g>
+		<path fill="#FFFFFF" d="M8,2c3.31,0,6,2.69,6,6s-2.69,6-6,6s-6-2.69-6-6S4.69,2,8,2 M8,1C4.13,1,1,4.13,1,8s3.13,7,7,7s7-3.13,7-7
+			S11.87,1,8,1L8,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M12,8.75H4C3.59,8.75,3.25,8.41,3.25,8S3.59,7.25,4,7.25h8c0.41,0,0.75,0.34,0.75,0.75S12.41,8.75,12,8.75
+			z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,12.75c-0.41,0-0.75-0.34-0.75-0.75V4c0-0.41,0.34-0.75,0.75-0.75S8.75,3.59,8.75,4v8
+			C8.75,12.41,8.41,12.75,8,12.75z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/add_modifier.svg b/resources/icons/white/add_modifier.svg
new file mode 100644
index 000000000..09c3ce27d
--- /dev/null
+++ b/resources/icons/white/add_modifier.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="add_x5F_modifer">
+	<path fill="#FFFFFF" d="M10.98,9.78c-0.29,0-0.52,0.23-0.52,0.52v2.09v1.04c0,0.29-0.23,0.52-0.52,0.52H2.62
+		c-0.29,0-0.53-0.24-0.53-0.53l-0.05-7.3c0-0.14,0.05-0.27,0.15-0.37c0.1-0.1,0.23-0.15,0.37-0.15h3.19l0,0
+		c0.29,0,0.52-0.23,0.52-0.52S6.04,4.55,5.75,4.55H3.66c-0.01,0-0.01,0-0.02,0H2.56c-0.42,0-0.81,0.16-1.11,0.46
+		C1.16,5.31,1,5.71,1,6.13l0.04,7.31C1.05,14.3,1.75,15,2.62,15h7.31c0.86,0,1.57-0.7,1.57-1.57v-1.04V10.3
+		C11.5,10.01,11.27,9.78,10.98,9.78z"/>
+	<circle fill="#ED6B21" cx="11" cy="5" r="3.5"/>
+</g>
+</svg>
diff --git a/resources/icons/white/add_part.svg b/resources/icons/white/add_part.svg
new file mode 100644
index 000000000..b7c800bbb
--- /dev/null
+++ b/resources/icons/white/add_part.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="add_x5F_part_1_">
+	<g>
+		<path fill="#ED6B21" d="M11,15c-0.55,0-1-0.45-1-1V8c0-0.55,0.45-1,1-1s1,0.45,1,1v6C12,14.55,11.55,15,11,15z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,12H8c-0.55,0-1-0.45-1-1s0.45-1,1-1h6c0.55,0,1,0.45,1,1S14.55,12,14,12z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M10.98,6.22c-0.29,0-0.52-0.23-0.52-0.52V3.61V2.57c0-0.29-0.23-0.52-0.52-0.52H2.62
+			c-0.29,0-0.53,0.24-0.53,0.53l-0.05,7.3c0,0.14,0.05,0.27,0.15,0.37c0.1,0.1,0.23,0.15,0.37,0.15h3.19l0,0
+			c0.29,0,0.52,0.23,0.52,0.52s-0.23,0.52-0.52,0.52H3.66c-0.01,0-0.01,0-0.02,0H2.56c-0.42,0-0.81-0.16-1.11-0.46
+			C1.16,10.69,1,10.29,1,9.87l0.04-7.31C1.05,1.7,1.75,1,2.62,1h7.31c0.86,0,1.57,0.7,1.57,1.57v1.04V5.7
+			C11.5,5.99,11.27,6.22,10.98,6.22z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/advanced+wrench.svg b/resources/icons/white/advanced+wrench.svg
new file mode 100644
index 000000000..5e878cb3c
--- /dev/null
+++ b/resources/icons/white/advanced+wrench.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="advanced_x2B_wrench">
+	<g>
+		<path fill="#FFFFFF" d="M7.61,3.81C7.49,3.75,7.35,3.6,7.31,3.47S7.15,2.92,7.19,2.79l0.06-0.17c0.04-0.13,0-0.32-0.1-0.41
+			L6.8,1.85c-0.1-0.1-0.28-0.14-0.41-0.1L6.21,1.81C6.08,1.85,5.88,1.84,5.76,1.78S5.26,1.51,5.2,1.39L5.11,1.22
+			C5.05,1.1,4.89,1,4.75,1h-0.5c-0.14,0-0.3,0.1-0.36,0.22L3.81,1.39C3.75,1.51,3.6,1.65,3.47,1.69S2.92,1.85,2.79,1.81L2.62,1.75
+			c-0.13-0.04-0.32,0-0.41,0.1L1.85,2.2c-0.1,0.1-0.14,0.28-0.1,0.41l0.06,0.17c0.04,0.13,0.03,0.33-0.03,0.45s-0.27,0.5-0.39,0.56
+			l-0.17,0.1C1.1,3.95,1,4.11,1,4.25v0.5c0,0.14,0.1,0.3,0.22,0.36l0.17,0.08c0.12,0.06,0.26,0.21,0.3,0.34S1.85,6.07,1.81,6.2
+			L1.75,6.38c-0.04,0.13,0,0.32,0.1,0.41L2.2,7.15c0.1,0.1,0.28,0.14,0.41,0.1l0.17-0.06c0.13-0.04,0.33-0.03,0.45,0.03
+			s0.5,0.27,0.56,0.39l0.08,0.17C3.95,7.9,4.11,8,4.25,8h0.5c0.14,0,0.3-0.1,0.36-0.22l0.08-0.17c0.06-0.12,0.21-0.26,0.34-0.3
+			S6.07,7.15,6.2,7.19l0.17,0.06c0.13,0.04,0.32,0,0.41-0.1L7.15,6.8c0.1-0.1,0.14-0.28,0.1-0.41L7.19,6.21
+			C7.15,6.08,7.16,5.88,7.22,5.76s0.27-0.5,0.39-0.56l0.17-0.08C7.9,5.05,8,4.89,8,4.75v-0.5c0-0.14-0.1-0.3-0.22-0.36L7.61,3.81z
+			 M4.5,6.42c-1.06,0-1.92-0.86-1.92-1.92S3.44,2.58,4.5,2.58S6.42,3.44,6.42,4.5S5.56,6.42,4.5,6.42z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M12.61,2.6c-0.12-0.06-0.24-0.18-0.28-0.27s-0.11-0.42-0.06-0.54s0-0.31-0.1-0.41l-0.15-0.15
+			c-0.1-0.1-0.28-0.14-0.41-0.1s-0.3,0.04-0.39,0S10.86,0.9,10.8,0.78s-0.22-0.22-0.36-0.22h-0.21c-0.14,0-0.3,0.1-0.36,0.22
+			S9.68,1.03,9.59,1.06s-0.41,0.1-0.54,0.06s-0.31,0-0.41,0.1L8.49,1.37c-0.1,0.1-0.14,0.28-0.1,0.41s0.04,0.3,0,0.39
+			S8.17,2.54,8.05,2.6S7.83,2.82,7.83,2.96v0.21c0,0.14,0.1,0.3,0.22,0.36C8.17,3.59,8.3,3.71,8.33,3.8s0.11,0.42,0.06,0.54
+			s0,0.31,0.1,0.41L8.64,4.9C8.74,5,8.92,5.04,9.05,5s0.3-0.04,0.39,0s0.37,0.22,0.43,0.34s0.22,0.22,0.36,0.22h0.21
+			c0.14,0,0.3-0.1,0.36-0.22s0.18-0.24,0.27-0.28S11.49,4.95,11.61,5s0.31,0,0.41-0.1l0.15-0.15c0.1-0.1,0.14-0.28,0.1-0.41
+			s-0.04-0.3,0-0.39s0.22-0.37,0.34-0.43s0.22-0.22,0.22-0.36v-0.2C12.83,2.82,12.74,2.66,12.61,2.6z M10.33,4.18
+			c-0.62,0-1.11-0.5-1.11-1.11c0-0.62,0.5-1.11,1.11-1.11s1.11,0.5,1.11,1.11C11.45,3.68,10.95,4.18,10.33,4.18z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14.38,9.89c-0.01-0.14,0.06-0.33,0.15-0.44l0.31-0.35c0.09-0.1,0.12-0.29,0.07-0.42l-0.35-0.85
+			c-0.05-0.13-0.21-0.24-0.35-0.25l-0.47-0.03c-0.14-0.01-0.32-0.1-0.42-0.2l-0.37-0.37c-0.1-0.09-0.2-0.28-0.2-0.41L12.72,6.1
+			c-0.01-0.14-0.12-0.29-0.25-0.35L11.62,5.4c-0.13-0.05-0.32-0.02-0.42,0.07l-0.36,0.31c-0.1,0.09-0.3,0.16-0.44,0.15H9.88
+			c-0.13,0-0.33-0.07-0.43-0.16L9.1,5.46C8.99,5.37,8.8,5.34,8.68,5.4L7.83,5.75C7.7,5.8,7.59,5.95,7.58,6.09L7.55,6.56
+			c-0.01,0.14-0.1,0.32-0.2,0.42L6.98,7.34c-0.09,0.1-0.28,0.2-0.41,0.2L6.09,7.58C5.95,7.59,5.8,7.7,5.75,7.83L5.4,8.68
+			C5.34,8.8,5.37,8.99,5.46,9.1l0.31,0.36c0.09,0.1,0.16,0.3,0.15,0.44v0.52c0.01,0.14-0.06,0.33-0.15,0.44L5.46,11.2
+			c-0.09,0.1-0.12,0.29-0.07,0.42l0.35,0.85c0.05,0.13,0.21,0.24,0.35,0.25l0.47,0.03c0.14,0.01,0.32,0.1,0.42,0.2l0.37,0.37
+			c0.1,0.09,0.2,0.28,0.2,0.41l0.03,0.47c0.01,0.14,0.12,0.29,0.25,0.35l0.85,0.35C8.81,14.95,9,14.92,9.1,14.83l0.36-0.31
+			c0.1-0.09,0.3-0.16,0.44-0.15h0.52c0.14-0.01,0.33,0.06,0.44,0.15l0.35,0.31c0.1,0.09,0.29,0.12,0.42,0.07l0.85-0.35
+			c0.13-0.05,0.24-0.21,0.25-0.35l0.03-0.47c0.01-0.14,0.1-0.32,0.2-0.42l0.37-0.37c0.09-0.1,0.28-0.2,0.41-0.21l0.47-0.03
+			c0.14-0.01,0.29-0.12,0.35-0.25l0.35-0.85c0.05-0.13,0.02-0.32-0.07-0.42l-0.31-0.36c-0.09-0.1-0.16-0.3-0.15-0.44L14.38,9.89z
+			 M10.15,13c-1.57,0-2.85-1.27-2.85-2.85S8.58,7.3,10.15,7.3S13,8.58,13,10.15S11.72,13,10.15,13z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/advanced_plus.svg b/resources/icons/white/advanced_plus.svg
new file mode 100644
index 000000000..db532ec4b
--- /dev/null
+++ b/resources/icons/white/advanced_plus.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="advanced_x2B_">
+	<path fill="#FFFFFF" d="M10.98,9.78c-0.29,0-0.52,0.23-0.52,0.52v2.09v1.04c0,0.29-0.23,0.52-0.52,0.52H2.62
+		c-0.29,0-0.53-0.24-0.53-0.53l-0.05-7.3c0-0.14,0.05-0.27,0.15-0.37c0.1-0.1,0.23-0.15,0.37-0.15h3.19l0,0
+		c0.29,0,0.52-0.23,0.52-0.52S6.04,4.55,5.75,4.55H3.66c-0.01,0-0.01,0-0.02,0H2.56c-0.42,0-0.81,0.16-1.11,0.46
+		C1.16,5.31,1,5.71,1,6.13l0.04,7.31C1.05,14.3,1.75,15,2.62,15h7.31c0.86,0,1.57-0.7,1.57-1.57v-1.04V10.3
+		C11.5,10.01,11.27,9.78,10.98,9.78z"/>
+	<path fill="#ED6B21" d="M13.56,5.38c-0.01-0.13,0.06-0.33,0.15-0.43l0.13-0.15c0.09-0.1,0.12-0.29,0.07-0.42l-0.2-0.48
+		c-0.05-0.13-0.21-0.24-0.35-0.25l-0.2-0.01c-0.14-0.01-0.32-0.1-0.41-0.2c-0.09-0.1-0.37-0.45-0.38-0.59l-0.01-0.2
+		c-0.01-0.14-0.12-0.29-0.25-0.35l-0.48-0.2c-0.13-0.05-0.32-0.02-0.42,0.07L11.06,2.3c-0.1,0.09-0.3,0.16-0.44,0.15
+		S10.05,2.39,9.94,2.3L9.79,2.16C9.69,2.07,9.5,2.04,9.37,2.1L8.89,2.3C8.76,2.35,8.65,2.5,8.64,2.64l-0.01,0.2
+		c-0.01,0.14-0.1,0.32-0.2,0.41c-0.1,0.09-0.45,0.37-0.59,0.38l-0.2,0.01C7.5,3.65,7.35,3.76,7.3,3.89L7.1,4.37
+		C7.04,4.5,7.07,4.69,7.16,4.79L7.3,4.94c0.09,0.1,0.16,0.3,0.15,0.44C7.44,5.51,7.38,5.95,7.29,6.06L7.16,6.21
+		C7.07,6.31,7.04,6.5,7.1,6.63l0.2,0.48c0.05,0.13,0.2,0.24,0.34,0.25l0.2,0.01c0.14,0.01,0.32,0.1,0.41,0.2s0.37,0.45,0.38,0.59
+		l0.01,0.2C8.65,8.5,8.76,8.65,8.89,8.7l0.48,0.2C9.5,8.96,9.69,8.93,9.79,8.84L9.94,8.7c0.1-0.09,0.3-0.16,0.44-0.15
+		c0.14,0.01,0.57,0.06,0.68,0.15l0.15,0.13c0.1,0.09,0.29,0.12,0.42,0.07l0.48-0.2c0.13-0.05,0.24-0.21,0.25-0.35l0.01-0.2
+		c0.01-0.14,0.1-0.32,0.2-0.41s0.45-0.37,0.59-0.38l0.2-0.01c0.14-0.01,0.29-0.12,0.35-0.25l0.2-0.48c0.05-0.13,0.02-0.32-0.07-0.42
+		L13.7,6.06C13.61,5.95,13.56,5.51,13.56,5.38z M10.5,7.55c-1.13,0-2.05-0.92-2.05-2.05s0.92-2.05,2.05-2.05s2.05,0.92,2.05,2.05
+		S11.63,7.55,10.5,7.55z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/cog.svg b/resources/icons/white/cog.svg
new file mode 100644
index 000000000..773e4d65d
--- /dev/null
+++ b/resources/icons/white/cog.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="machine_x2B_cog">
+	<path fill="#ffffff" d="M13.77,6.39c-0.13-0.47-0.32-0.92-0.55-1.33l0.43-1.3l-1.41-1.41l-1.3,0.43c-0.42-0.23-0.86-0.42-1.33-0.55
+		L9,1H7L6.39,2.23C5.92,2.36,5.47,2.54,5.06,2.78l-1.3-0.43L2.34,3.76l0.43,1.3C2.54,5.47,2.36,5.92,2.23,6.39L1,7v2l1.23,0.61
+		c0.13,0.47,0.32,0.92,0.55,1.33l-0.43,1.3l1.41,1.41l1.3-0.43c0.42,0.23,0.86,0.42,1.33,0.55L7,15h2l0.61-1.23
+		c0.47-0.13,0.92-0.32,1.33-0.55l1.3,0.43l1.41-1.41l-0.43-1.3c0.23-0.42,0.42-0.86,0.55-1.33L15,9V7L13.77,6.39z M8,13
+		c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	<path fill="#ED6B21" d="M11.3,7.08c-0.07-0.27-0.18-0.52-0.31-0.76l0.25-0.74l-0.81-0.81L9.68,5.01C9.45,4.88,9.19,4.78,8.92,4.7
+		L8.57,4H7.43L7.08,4.7C6.81,4.78,6.55,4.88,6.32,5.01L5.58,4.77L4.77,5.58l0.25,0.74C4.88,6.55,4.78,6.81,4.7,7.08L4,7.43v1.14
+		l0.7,0.35c0.07,0.27,0.18,0.52,0.31,0.76l-0.25,0.74l0.81,0.81l0.74-0.25c0.24,0.13,0.49,0.24,0.76,0.31L7.43,12h1.14l0.35-0.7
+		c0.27-0.07,0.52-0.18,0.76-0.31l0.74,0.25l0.81-0.81l-0.25-0.74c0.13-0.24,0.24-0.49,0.31-0.76L12,8.57V7.43L11.3,7.08z M8,10.86
+		c-1.58,0-2.86-1.28-2.86-2.86S6.42,5.14,8,5.14S10.86,6.42,10.86,8S9.58,10.86,8,10.86z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/cooling.svg b/resources/icons/white/cooling.svg
new file mode 100644
index 000000000..29bd04c36
--- /dev/null
+++ b/resources/icons/white/cooling.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="cooling">
+	<path fill="#FFFFFF" d="M14,1H2C1.45,1,1,1.45,1,2v12c0,0.55,0.45,1,1,1h12c0.55,0,1-0.45,1-1V2C15,1.45,14.55,1,14,1z M8,14
+		c-3.31,0-6-2.69-6-6s2.69-6,6-6s6,2.69,6,6S11.31,14,8,14z"/>
+	<g>
+		<path fill="#ED6B21" d="M7.86,7.14C7.94,7.41,8,7.7,8,8c0,1.66-1.34,3-3,3c-0.3,0-0.59-0.06-0.86-0.14C4.51,12.09,5.64,13,7,13
+			c1.66,0,3-1.34,3-3C10,8.64,9.09,7.51,7.86,7.14z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,8C6.34,8,5,6.66,5,5c0-0.3,0.06-0.59,0.14-0.86C3.91,4.51,3,5.64,3,7c0,1.66,1.34,3,3,3
+			c1.36,0,2.49-0.91,2.86-2.14C8.59,7.94,8.3,8,8,8z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M10,6C8.64,6,7.51,6.91,7.14,8.14C7.41,8.06,7.7,8,8,8c1.66,0,3,1.34,3,3c0,0.3-0.06,0.59-0.14,0.86
+			C12.09,11.49,13,10.36,13,9C13,7.34,11.66,6,10,6z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,8c0-1.66,1.34-3,3-3c0.3,0,0.59,0.06,0.86,0.14C11.49,3.91,10.36,3,9,3C7.34,3,6,4.34,6,6
+			c0,1.36,0.91,2.49,2.14,2.86C8.06,8.59,8,8.3,8,8z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/copy_menu.svg b/resources/icons/white/copy_menu.svg
new file mode 100644
index 000000000..d660aab6a
--- /dev/null
+++ b/resources/icons/white/copy_menu.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="copy">
+	<g>
+		<path fill="#ED6B21" d="M115.76,51.2l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h66.04c4.2,0,7.62-3.42,7.62-7.62v-50.8C120.09,58.17,118.23,53.67,115.76,51.2z M111.42,54.04h-6.57
+			v-6.57L111.42,54.04z M115.01,112.47c0,1.4-1.14,2.54-2.54,2.54H46.43c-1.4,0-2.54-1.14-2.54-2.54V46.42
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46v12.24c0,1.4,1.14,2.54,2.54,2.54h12.24c0.28,0.91,0.46,1.8,0.46,2.54
+			V112.47z"/>
+		<path fill="#ED6B21" d="M53.97,59.13h35.72c1.4,0,2.54-1.14,2.54-2.54s-1.14-2.54-2.54-2.54H53.97c-1.4,0-2.54,1.14-2.54,2.54
+			S52.56,59.13,53.97,59.13z"/>
+		<path fill="#ED6B21" d="M104.93,69.29H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,69.29,104.93,69.29z"/>
+		<path fill="#ED6B21" d="M104.93,84.53H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,84.53,104.93,84.53z"/>
+		<path fill="#ED6B21" d="M104.93,99.77H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,99.77,104.93,99.77z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M85.27,20.71l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h17.78c1.4,0,2.54-1.14,2.54-2.54s-1.14-2.54-2.54-2.54H15.94c-1.4,0-2.54-1.14-2.54-2.54V15.94
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46V26.1c0,1.4,1.14,2.54,2.54,2.54h12.45c0.16,0.49,0.25,0.93,0.25,1.27
+			v3.81c0,1.4,1.14,2.54,2.54,2.54c1.4,0,2.54-1.14,2.54-2.54v-3.81C89.61,27.14,87.75,23.19,85.27,20.71z M74.37,16.99l6.57,6.57
+			h-6.57V16.99z"/>
+		<path fill="#ffffff" d="M59.21,23.56H23.48c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h35.72c1.4,0,2.54-1.14,2.54-2.54
+			S60.61,23.56,59.21,23.56z"/>
+		<path fill="#ffffff" d="M28.73,38.8h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,38.8,28.73,38.8z"/>
+		<path fill="#ffffff" d="M28.73,54.04h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,54.04,28.73,54.04z"/>
+		<path fill="#ffffff" d="M28.73,69.29h-5.24c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h5.24c1.4,0,2.54-1.14,2.54-2.54
+			S30.13,69.29,28.73,69.29z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/delete.svg b/resources/icons/white/delete.svg
new file mode 100644
index 000000000..91d5ce74c
--- /dev/null
+++ b/resources/icons/white/delete.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="delete">
+	<g>
+		<path fill="#ED6B21" d="M13,10c0-1.1-0.9-2-2-2H5c-1.1,0-2,0.9-2,2v3c0,1.1,0.9,2,2,2h6c1.1,0,2-0.9,2-2V10z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M12,5.01c0.25,0,0.47,0.09,0.62,0.26s0.22,0.4,0.2,0.64l-0.64,7.01C12.13,13.49,11.58,14,11,14H5
+			c-0.58,0-1.13-0.51-1.19-1.08L3.18,5.91c-0.02-0.25,0.05-0.47,0.2-0.64C3.53,5.1,3.75,5.01,4,5.01H12 M12,4.01H4
+			c-1.1,0-1.92,0.9-1.82,1.99l0.64,7.01C2.92,14.1,3.9,15,5,15h6c1.1,0,2.08-0.9,2.18-1.99L13.82,6C13.92,4.91,13.1,4.01,12,4.01
+			L12,4.01z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M13,3.5H3C2.72,3.5,2.5,3.28,2.5,3S2.72,2.5,3,2.5h10c0.28,0,0.5,0.22,0.5,0.5S13.28,3.5,13,3.5z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M10,2.5H6C5.72,2.5,5.5,2.28,5.5,2S5.72,1.5,6,1.5h4c0.28,0,0.5,0.22,0.5,0.5S10.28,2.5,10,2.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/delete_all_menu.svg b/resources/icons/white/delete_all_menu.svg
new file mode 100644
index 000000000..5d825c424
--- /dev/null
+++ b/resources/icons/white/delete_all_menu.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="DELETE_ALL_1_">
+	<path fill="#ffffff" d="M103.52,43.87l-13.31,69.97H37.79L24.48,43.87H103.52 M108.77,37.87H19.23c-1.1,0-1.83,0.88-1.63,1.96
+		l14.84,78.04c0.21,1.08,1.27,1.96,2.37,1.96h58.36c1.1,0,2.17-0.88,2.37-1.96l14.84-78.04C110.6,38.75,109.87,37.87,108.77,37.87
+		L108.77,37.87z"/>
+	<g>
+		<path fill="#ED6B21" d="M89.38,22.97c-1.1,0-2-0.9-2-2v-10.9c0-1.1-0.9-2-2-2H42.62c-1.1,0-2,0.9-2,2v10.9c0,1.1-0.9,2-2,2H19.23
+			c-1.1,0-2,0.9-2,2v3.45c0,1.1,0.9,2,2,2h89.54c1.1,0,2-0.9,2-2v-3.45c0-1.1-0.9-2-2-2H89.38z M79.59,20.97c0,1.1-0.9,2-2,2H50.41
+			c-1.1,0-2-0.9-2-2v-3.45c0-1.1,0.9-2,2-2h27.18c1.1,0,2,0.9,2,2V20.97z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M93.17,73.5H34.83c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h58.34c0.83,0,1.5,0.67,1.5,1.5
+			S94,73.5,93.17,73.5z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M90.14,89.45H37.96c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h52.18c0.83,0,1.5,0.67,1.5,1.5
+			S90.97,89.45,90.14,89.45z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M87.1,105.4H40.9c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h46.2c0.83,0,1.5,0.67,1.5,1.5
+			S87.93,105.4,87.1,105.4z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M96.2,57.56H31.8c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h64.4c0.83,0,1.5,0.67,1.5,1.5
+			S97.03,57.56,96.2,57.56z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/editor_menu.svg b/resources/icons/white/editor_menu.svg
new file mode 100644
index 000000000..649d2c40f
--- /dev/null
+++ b/resources/icons/white/editor_menu.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="editor">
+	<g>
+		<path fill="none" stroke="#ffffff" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M118.68,8.83L92.1,37.03c-0.75,0.8-2.27,1.46-3.37,1.46H9.44"/>
+	</g>
+	<g>
+		
+			<line fill="none" stroke="#ffffff" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="90.72" y1="118.69" x2="90.72" y2="38.81"/>
+	</g>
+	<g>
+		<path fill="none" stroke="#ffffff" stroke-width="3" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M119.88,91.51v-81.4c0-1.1-0.9-2-2-2H42.92c-1.1,0-2.66,0.61-3.47,1.36L9.59,37.13c-0.81,0.75-1.47,2.26-1.47,3.36v77.39
+			c0,1.1,0.9,2,2,2h78.61c1.1,0,2.65-0.63,3.44-1.39l27.67-26.82"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/export_config.svg b/resources/icons/white/export_config.svg
new file mode 100644
index 000000000..22f8ebe1a
--- /dev/null
+++ b/resources/icons/white/export_config.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_config">
+	<path fill="#FFFFFF" d="M14.22,6.61c-0.25-0.12-0.52-0.43-0.6-0.68s-0.32-1.09-0.23-1.35l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83
+		L12.6,2.7c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45
+		C9.1,1.2,8.77,1,8.5,1h-1C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5
+		C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12
+		L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.52,0.43,0.6,0.68s0.32,1.09,0.23,1.35
+		L2.5,11.77c-0.09,0.26,0,0.63,0.2,0.83l0.7,0.7c0.19,0.19,0.57,0.28,0.83,0.2l0.35-0.12c0.26-0.09,0.67-0.06,0.91,0.05
+		s1,0.54,1.12,0.79l0.17,0.33C6.9,14.8,7.22,15,7.5,15h1c0.27,0,0.6-0.2,0.72-0.45l0.17-0.33c0.12-0.25,0.43-0.52,0.68-0.6
+		s1.09-0.32,1.35-0.23l0.35,0.12c0.26,0.09,0.63,0,0.83-0.2l0.71-0.71c0.19-0.19,0.28-0.57,0.2-0.83l-0.12-0.35
+		c-0.09-0.26-0.06-0.67,0.05-0.91s0.54-1,0.79-1.12l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72L14.22,6.61z
+		 M8,13c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	<path fill="#ED6B21" d="M11.65,8.35c0.19-0.19,0.19-0.51,0-0.71L8.92,4.92C8.73,4.73,8.57,4.8,8.57,5.07v1.29
+		c0,0.28-0.22,0.5-0.5,0.5H4.5C4.22,6.86,4,7.08,4,7.36v1.29c0,0.27,0.22,0.5,0.5,0.5h3.57c0.28,0,0.5,0.22,0.5,0.5v1.29
+		c0,0.27,0.16,0.34,0.35,0.15L11.65,8.35z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/export_config_bundle.svg b/resources/icons/white/export_config_bundle.svg
new file mode 100644
index 000000000..99bd62b6c
--- /dev/null
+++ b/resources/icons/white/export_config_bundle.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_config_x5F_bundle">
+	<g>
+		<path fill="#FFFFFF" d="M1.2,12.61c0.11,0.08,0.21,0.22,0.23,0.31s0.04,0.43-0.03,0.55s-0.05,0.31,0.03,0.42l0.12,0.17
+			c0.08,0.11,0.25,0.19,0.39,0.17c0.13-0.02,0.3,0.01,0.38,0.06s0.33,0.28,0.37,0.41s0.18,0.25,0.32,0.27l0.21,0.04
+			c0.14,0.02,0.31-0.05,0.39-0.16s0.22-0.21,0.31-0.23c0.09-0.02,0.43-0.04,0.55,0.03c0.12,0.06,0.31,0.05,0.42-0.03l0.17-0.12
+			c0.11-0.08,0.19-0.25,0.17-0.39c-0.02-0.13,0.01-0.3,0.06-0.38s0.28-0.33,0.41-0.37c0.13-0.04,0.25-0.18,0.27-0.32l0.04-0.21
+			c0.02-0.14-0.05-0.31-0.16-0.39c-0.11-0.08-0.21-0.22-0.23-0.31s-0.04-0.43,0.03-0.55c0.06-0.12,0.05-0.31-0.03-0.42L5.5,10.98
+			c-0.08-0.11-0.25-0.19-0.39-0.17c-0.13,0.02-0.3-0.01-0.38-0.06s-0.33-0.28-0.37-0.41s-0.18-0.25-0.32-0.27l-0.21-0.04
+			c-0.14-0.02-0.31,0.05-0.39,0.16s-0.22,0.21-0.31,0.23S2.7,10.46,2.58,10.4c-0.12-0.06-0.31-0.05-0.42,0.03l-0.17,0.12
+			c-0.11,0.08-0.19,0.25-0.17,0.39s-0.01,0.3-0.06,0.38s-0.28,0.33-0.41,0.37s-0.25,0.18-0.27,0.32l-0.04,0.21
+			C1.02,12.36,1.09,12.53,1.2,12.61z M3.71,11.42c0.61,0.1,1.02,0.68,0.92,1.28c-0.1,0.61-0.68,1.02-1.28,0.92
+			c-0.61-0.1-1.02-0.68-0.92-1.28C2.53,11.73,3.1,11.32,3.71,11.42z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M10.39,4.47c0.13,0.03,0.28,0.13,0.33,0.21s0.19,0.38,0.18,0.52s0.07,0.3,0.19,0.38l0.18,0.11
+			c0.12,0.07,0.31,0.08,0.42,0.01c0.12-0.07,0.28-0.11,0.38-0.09c0.09,0.02,0.41,0.13,0.5,0.24c0.09,0.1,0.26,0.17,0.4,0.13
+			l0.21-0.05c0.13-0.03,0.27-0.16,0.3-0.29s0.13-0.28,0.21-0.33c0.08-0.05,0.38-0.19,0.52-0.18c0.13,0.01,0.3-0.07,0.38-0.19
+			l0.11-0.18c0.07-0.12,0.08-0.31,0.01-0.42c-0.07-0.12-0.11-0.28-0.09-0.38c0.02-0.09,0.13-0.41,0.24-0.5
+			c0.1-0.09,0.17-0.26,0.13-0.4l-0.05-0.21c-0.03-0.13-0.16-0.27-0.29-0.3s-0.28-0.13-0.33-0.21s-0.19-0.38-0.18-0.52
+			c0.01-0.13-0.07-0.3-0.19-0.38l-0.18-0.11c-0.12-0.07-0.31-0.08-0.42-0.01c-0.12,0.07-0.28,0.11-0.38,0.09
+			c-0.09-0.02-0.41-0.13-0.5-0.24c-0.09-0.1-0.26-0.17-0.4-0.13l-0.2,0.06c-0.13,0.03-0.27,0.16-0.3,0.29s-0.13,0.28-0.21,0.33
+			s-0.38,0.19-0.52,0.18s-0.3,0.07-0.38,0.19l-0.11,0.18c-0.07,0.12-0.08,0.31-0.01,0.42c0.07,0.12,0.11,0.28,0.09,0.38
+			s-0.13,0.41-0.24,0.5c-0.1,0.09-0.17,0.26-0.13,0.4l0.05,0.21C10.13,4.3,10.26,4.44,10.39,4.47z M12.27,2.43
+			c0.6-0.13,1.2,0.24,1.33,0.84s-0.24,1.2-0.84,1.33c-0.6,0.13-1.2-0.24-1.33-0.84S11.67,2.56,12.27,2.43z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M1.85,4.19C1.8,4.32,1.66,4.47,1.53,4.53L1.15,4.71C1.02,4.77,0.92,4.93,0.91,5.06L0.89,5.92
+			c0,0.14,0.09,0.3,0.21,0.37l0.37,0.2c0.13,0.06,0.26,0.22,0.3,0.35l0.17,0.44C2,7.41,2,7.62,1.96,7.75l-0.15,0.4
+			C1.76,8.28,1.8,8.47,1.89,8.57l0.58,0.62c0.09,0.1,0.28,0.15,0.41,0.11L3.3,9.17c0.13-0.04,0.34-0.02,0.46,0.04l0.43,0.2
+			C4.32,9.46,4.47,9.6,4.53,9.73l0.18,0.39c0.06,0.12,0.22,0.23,0.35,0.23l0.85,0.03c0.14,0,0.3-0.09,0.37-0.21l0.2-0.37
+			c0.07-0.12,0.23-0.25,0.36-0.29l0.44-0.17c0.13-0.06,0.33-0.06,0.46-0.02l0.4,0.15c0.14,0.03,0.33,0,0.43-0.1l0.62-0.58
+			C9.29,8.7,9.34,8.51,9.3,8.38L9.17,7.97C9.13,7.84,9.16,7.63,9.22,7.51l0.2-0.43C9.47,6.95,9.61,6.8,9.74,6.74l0.39-0.18
+			c0.12-0.06,0.23-0.22,0.23-0.35l0.03-0.85c0-0.14-0.09-0.3-0.21-0.37l-0.37-0.2C9.67,4.71,9.54,4.55,9.49,4.42L9.33,3.98
+			C9.27,3.85,9.26,3.64,9.31,3.52l0.15-0.4C9.5,2.99,9.47,2.8,9.37,2.7L8.79,2.08C8.7,1.98,8.51,1.93,8.38,1.97L7.97,2.09
+			C7.84,2.13,7.63,2.11,7.51,2.05l-0.43-0.2C6.94,1.8,6.79,1.66,6.73,1.53L6.56,1.15C6.5,1.02,6.34,0.92,6.2,0.91L5.35,0.89
+			c-0.14,0-0.3,0.09-0.37,0.21l-0.2,0.37C4.71,1.6,4.55,1.73,4.42,1.77L3.98,1.94C3.85,2,3.64,2,3.52,1.96l-0.4-0.15
+			C2.99,1.76,2.8,1.8,2.7,1.89L2.08,2.48c-0.1,0.09-0.15,0.28-0.11,0.41L2.09,3.3c0.04,0.13,0.02,0.34-0.04,0.46L1.85,4.19z
+			 M6.75,3.15c1.37,0.62,1.98,2.23,1.36,3.6s-2.23,1.98-3.6,1.36C3.15,7.5,2.54,5.89,3.15,4.52S5.38,2.54,6.75,3.15z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14.65,11.78c0.19-0.19,0.19-0.51,0-0.71l-2.72-2.72c-0.19-0.19-0.35-0.13-0.35,0.15v1.29
+			c0,0.28-0.22,0.5-0.5,0.5H8.49c-0.28,0-0.5,0.23-0.5,0.5v1.29c0,0.28,0.22,0.5,0.5,0.5h2.58c0.28,0,0.5,0.23,0.5,0.5v1.29
+			c0,0.28,0.16,0.34,0.35,0.15L14.65,11.78z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/export_gcode.svg b/resources/icons/white/export_gcode.svg
new file mode 100644
index 000000000..39f5225cb
--- /dev/null
+++ b/resources/icons/white/export_gcode.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_gcode">
+	<g>
+		<path fill="#FFFFFF" d="M5.02,7.17H9v3.08c0,2.6-1.23,3.72-4.05,3.72S1,12.85,1,10.29V5.54C1,3.12,2.09,2,4.95,2S9,3,9,5.54H6.88
+			c0-1.11-0.28-1.66-1.92-1.66c-1.54,0-1.83,0.69-1.83,1.77v4.65c0,1.12,0.29,1.77,1.83,1.77s2.08-0.65,2.08-1.82V9.09H5.02V7.17z"
+			/>
+	</g>
+	<path fill="#ED6B21" d="M14.65,8.35c0.19-0.19,0.19-0.51,0-0.71l-4.29-4.29C10.16,3.16,10,3.22,10,3.5v9
+		c0,0.27,0.16,0.34,0.35,0.15L14.65,8.35z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/export_plate.svg b/resources/icons/white/export_plate.svg
new file mode 100644
index 000000000..18159d2a8
--- /dev/null
+++ b/resources/icons/white/export_plate.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#ED6B21;}
+</style>
+<g id="export_x5F_plater">
+	<path class="st0" d="M13,2c0.5,0,1,0.4,1,1v10c0,0.5-0.4,1-1,1H3c-0.5,0-1-0.4-1-1V3c0-0.5,0.4-1,1-1H13 M13,1H3C1.9,1,1,1.9,1,3
+		v10c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V3C15,1.9,14.1,1,13,1L13,1z"/>
+	<path class="st1" d="M11.6,8.4c0.2-0.2,0.2-0.5,0-0.7L8.9,4.9C8.7,4.7,8.6,4.8,8.6,5.1v1.3c0,0.3-0.2,0.5-0.5,0.5H4.5
+		C4.2,6.9,4,7.1,4,7.4v1.3C4,9,4.2,9.2,4.5,9.2h3.6c0.3,0,0.5,0.2,0.5,0.5V11c0,0.3,0.2,0.3,0.4,0.1L11.6,8.4z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/export_plater.svg b/resources/icons/white/export_plater.svg
new file mode 100644
index 000000000..e71b38a0a
--- /dev/null
+++ b/resources/icons/white/export_plater.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="export_x5F_plater">
+	<path fill="#FFFFFF" d="M13,2c0.55,0,1,0.45,1,1v10c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+		C1.9,1,1,1.89,1,3v10c0,1.1,0.89,2,2,2h10c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	<path fill="#ED6B21" d="M11.65,8.35c0.19-0.19,0.19-0.51,0-0.71L8.92,4.92C8.73,4.73,8.57,4.8,8.57,5.07v1.29
+		c0,0.28-0.22,0.5-0.5,0.5H4.5C4.22,6.86,4,7.08,4,7.36v1.29c0,0.27,0.22,0.5,0.5,0.5h3.57c0.28,0,0.5,0.22,0.5,0.5v1.29
+		c0,0.27,0.16,0.34,0.35,0.15L11.65,8.35z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/extruder+funnel.svg b/resources/icons/white/extruder+funnel.svg
new file mode 100644
index 000000000..de6b227da
--- /dev/null
+++ b/resources/icons/white/extruder+funnel.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="extruder_x2B_funnel">
+	<rect x="1" y="1" display="none" fill="#808080" width="14" height="6"/>
+	<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-miterlimit="10" x1="8" y1="9.37" x2="8" y2="15"/>
+	<polygon display="none" fill="#808080" points="5,7 5,8 8,10 11,8 11,7 	"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,2v4h-3c-0.55,0-1,0.45-1,1v0.47L8,8.8L6,7.46V7c0-0.55-0.45-1-1-1H2V2H14 M14,1H2C1.45,1,1,1.45,1,2v4
+			c0,0.55,0.45,1,1,1h3v1l2.45,1.63C7.61,9.74,7.81,9.8,8,9.8c0.19,0,0.39-0.06,0.55-0.17L11,8V7h3c0.55,0,1-0.45,1-1V2
+			C15,1.45,14.55,1,14,1L14,1z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/flag_green.svg b/resources/icons/white/flag_green.svg
new file mode 100644
index 000000000..8479d0e9a
--- /dev/null
+++ b/resources/icons/white/flag_green.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="flag_x5F_green">
+	
+		<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="14" y1="2" x2="14" y2="14"/>
+	<path fill="#8CC63F" d="M13,2C8.2,2,5.8,4.4,1,4.4v7.2c4.8,0,7.2-2.4,12-2.4V2z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/flag_red.svg b/resources/icons/white/flag_red.svg
new file mode 100644
index 000000000..a9b1cf8fe
--- /dev/null
+++ b/resources/icons/white/flag_red.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="flag_x5F_red">
+	
+		<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="14" y1="2" x2="14" y2="14"/>
+	<path fill="#ED1C24" d="M13,2C8.2,2,5.8,4.4,1,4.4v7.2c4.8,0,7.2-2.4,12-2.4V2z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/import_config.svg b/resources/icons/white/import_config.svg
new file mode 100644
index 000000000..001277f73
--- /dev/null
+++ b/resources/icons/white/import_config.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="import_x5F_config">
+	<g>
+		<path fill="#FFFFFF" d="M14.22,6.61c-0.25-0.12-0.52-0.43-0.6-0.68s-0.32-1.09-0.23-1.35l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83
+			L12.6,2.7c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45
+			C9.1,1.2,8.77,1,8.5,1h-1C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5
+			C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12
+			L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.52,0.43,0.6,0.68s0.32,1.09,0.23,1.35
+			L2.5,11.77c-0.09,0.26,0,0.63,0.2,0.83l0.7,0.7c0.19,0.19,0.57,0.28,0.83,0.2l0.35-0.12c0.26-0.09,0.67-0.06,0.91,0.05
+			s1,0.54,1.12,0.79l0.17,0.33C6.9,14.8,7.22,15,7.5,15h1c0.27,0,0.6-0.2,0.72-0.45l0.17-0.33c0.12-0.25,0.43-0.52,0.68-0.6
+			s1.09-0.32,1.35-0.23l0.35,0.12c0.26,0.09,0.63,0,0.83-0.2l0.71-0.71c0.19-0.19,0.28-0.57,0.2-0.83l-0.12-0.35
+			c-0.09-0.26-0.06-0.67,0.05-0.91s0.54-1,0.79-1.12l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72L14.22,6.61z
+			 M8,13c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,12c-0.55,0-1-0.45-1-1V5c0-0.55,0.45-1,1-1s1,0.45,1,1v6C9,11.55,8.55,12,8,12z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,9H5C4.45,9,4,8.55,4,8s0.45-1,1-1h6c0.55,0,1,0.45,1,1S11.55,9,11,9z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/import_config_bundle.svg b/resources/icons/white/import_config_bundle.svg
new file mode 100644
index 000000000..c16cd7b3c
--- /dev/null
+++ b/resources/icons/white/import_config_bundle.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="import_x5F_config_x5F_bundle">
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M1.2,12.61c0.11,0.08,0.21,0.22,0.23,0.31s0.04,0.43-0.03,0.55s-0.05,0.31,0.03,0.42l0.12,0.17
+				c0.08,0.11,0.25,0.19,0.39,0.17c0.13-0.02,0.3,0.01,0.38,0.06s0.33,0.28,0.37,0.41s0.18,0.25,0.32,0.27l0.21,0.04
+				c0.14,0.02,0.31-0.05,0.39-0.16s0.22-0.21,0.31-0.23c0.09-0.02,0.43-0.04,0.55,0.03c0.12,0.06,0.31,0.05,0.42-0.03l0.17-0.12
+				c0.11-0.08,0.19-0.25,0.17-0.39c-0.02-0.13,0.01-0.3,0.06-0.38s0.28-0.33,0.41-0.37c0.13-0.04,0.25-0.18,0.27-0.32l0.04-0.21
+				c0.02-0.14-0.05-0.31-0.16-0.39c-0.11-0.08-0.21-0.22-0.23-0.31s-0.04-0.43,0.03-0.55c0.06-0.12,0.05-0.31-0.03-0.42L5.5,10.98
+				c-0.08-0.11-0.25-0.19-0.39-0.17c-0.13,0.02-0.3-0.01-0.38-0.06s-0.33-0.28-0.37-0.41s-0.18-0.25-0.32-0.27l-0.21-0.04
+				c-0.14-0.02-0.31,0.05-0.39,0.16s-0.22,0.21-0.31,0.23S2.7,10.46,2.58,10.4c-0.12-0.06-0.31-0.05-0.42,0.03l-0.17,0.12
+				c-0.11,0.08-0.19,0.25-0.17,0.39s-0.01,0.3-0.06,0.38s-0.28,0.33-0.41,0.37s-0.25,0.18-0.27,0.32l-0.04,0.21
+				C1.02,12.36,1.09,12.53,1.2,12.61z M3.71,11.42c0.61,0.1,1.02,0.68,0.92,1.28c-0.1,0.61-0.68,1.02-1.28,0.92
+				c-0.61-0.1-1.02-0.68-0.92-1.28C2.53,11.73,3.1,11.32,3.71,11.42z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M10.39,4.47c0.13,0.03,0.28,0.13,0.33,0.21s0.19,0.38,0.18,0.52s0.07,0.3,0.19,0.38l0.18,0.11
+				c0.12,0.07,0.31,0.08,0.42,0.01c0.12-0.07,0.28-0.11,0.38-0.09c0.09,0.02,0.41,0.13,0.5,0.24c0.09,0.1,0.26,0.17,0.4,0.13
+				l0.21-0.05c0.13-0.03,0.27-0.16,0.3-0.29s0.13-0.28,0.21-0.33c0.08-0.05,0.38-0.19,0.52-0.18c0.13,0.01,0.3-0.07,0.38-0.19
+				l0.11-0.18c0.07-0.12,0.08-0.31,0.01-0.42c-0.07-0.12-0.11-0.28-0.09-0.38c0.02-0.09,0.13-0.41,0.24-0.5
+				c0.1-0.09,0.17-0.26,0.13-0.4l-0.05-0.21c-0.03-0.13-0.16-0.27-0.29-0.3s-0.28-0.13-0.33-0.21s-0.19-0.38-0.18-0.52
+				c0.01-0.13-0.07-0.3-0.19-0.38l-0.18-0.11c-0.12-0.07-0.31-0.08-0.42-0.01c-0.12,0.07-0.28,0.11-0.38,0.09
+				c-0.09-0.02-0.41-0.13-0.5-0.24c-0.09-0.1-0.26-0.17-0.4-0.13l-0.2,0.06c-0.13,0.03-0.27,0.16-0.3,0.29s-0.13,0.28-0.21,0.33
+				s-0.38,0.19-0.52,0.18s-0.3,0.07-0.38,0.19l-0.11,0.18c-0.07,0.12-0.08,0.31-0.01,0.42c0.07,0.12,0.11,0.28,0.09,0.38
+				s-0.13,0.41-0.24,0.5c-0.1,0.09-0.17,0.26-0.13,0.4l0.05,0.21C10.13,4.3,10.26,4.44,10.39,4.47z M12.27,2.43
+				c0.6-0.13,1.2,0.24,1.33,0.84s-0.24,1.2-0.84,1.33c-0.6,0.13-1.2-0.24-1.33-0.84S11.67,2.56,12.27,2.43z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M1.85,4.19C1.8,4.32,1.66,4.47,1.53,4.53L1.15,4.71C1.02,4.77,0.92,4.93,0.91,5.06L0.89,5.92
+				c0,0.14,0.09,0.3,0.21,0.37l0.37,0.2c0.13,0.06,0.26,0.22,0.3,0.35l0.17,0.44C2,7.41,2,7.62,1.96,7.75l-0.15,0.4
+				C1.76,8.28,1.8,8.47,1.89,8.57l0.58,0.62c0.09,0.1,0.28,0.15,0.41,0.11L3.3,9.17c0.13-0.04,0.34-0.02,0.46,0.04l0.43,0.2
+				C4.32,9.46,4.47,9.6,4.53,9.73l0.18,0.39c0.06,0.12,0.22,0.23,0.35,0.23l0.85,0.03c0.14,0,0.3-0.09,0.37-0.21l0.2-0.37
+				c0.07-0.12,0.23-0.25,0.36-0.29l0.44-0.17c0.13-0.06,0.33-0.06,0.46-0.02l0.4,0.15c0.14,0.03,0.33,0,0.43-0.1l0.62-0.58
+				C9.29,8.7,9.34,8.51,9.3,8.38L9.17,7.97C9.13,7.84,9.16,7.63,9.22,7.51l0.2-0.43C9.47,6.95,9.61,6.8,9.74,6.74l0.39-0.18
+				c0.12-0.06,0.23-0.22,0.23-0.35l0.03-0.85c0-0.14-0.09-0.3-0.21-0.37l-0.37-0.2C9.67,4.71,9.54,4.55,9.49,4.42L9.33,3.98
+				C9.27,3.85,9.26,3.64,9.31,3.52l0.15-0.4C9.5,2.99,9.47,2.8,9.37,2.7L8.79,2.08C8.7,1.98,8.51,1.93,8.38,1.97L7.97,2.09
+				C7.84,2.13,7.63,2.11,7.51,2.05l-0.43-0.2C6.94,1.8,6.79,1.66,6.73,1.53L6.56,1.15C6.5,1.02,6.34,0.92,6.2,0.91L5.35,0.89
+				c-0.14,0-0.3,0.09-0.37,0.21l-0.2,0.37C4.71,1.6,4.55,1.73,4.42,1.77L3.98,1.94C3.85,2,3.64,2,3.52,1.96l-0.4-0.15
+				C2.99,1.76,2.8,1.8,2.7,1.89L2.08,2.48c-0.1,0.09-0.15,0.28-0.11,0.41L2.09,3.3c0.04,0.13,0.02,0.34-0.04,0.46L1.85,4.19z
+				 M6.75,3.15c1.37,0.62,1.98,2.23,1.36,3.6s-2.23,1.98-3.6,1.36C3.15,7.5,2.54,5.89,3.15,4.52S5.38,2.54,6.75,3.15z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#ED6B21" d="M11,15c-0.55,0-1-0.45-1-1V8c0-0.55,0.45-1,1-1s1,0.45,1,1v6C12,14.55,11.55,15,11,15z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#ED6B21" d="M14,12H8c-0.55,0-1-0.45-1-1s0.45-1,1-1h6c0.55,0,1,0.45,1,1S14.55,12,14,12z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/import_plate.svg b/resources/icons/white/import_plate.svg
new file mode 100644
index 000000000..7f888e3d7
--- /dev/null
+++ b/resources/icons/white/import_plate.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 16 16"
+	 style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#ED6B21;}
+</style>
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  bottomLeftOrigin="true" height="14" width="14" x="1" y="1"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g id="import_x5F_plater">
+	<g>
+		<path class="st0" d="M13,2c0.5,0,1,0.4,1,1v10c0,0.5-0.4,1-1,1H3c-0.5,0-1-0.4-1-1V3c0-0.5,0.4-1,1-1H13 M13,1H3C1.9,1,1,1.9,1,3
+			v10c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V3C15,1.9,14.1,1,13,1L13,1z"/>
+	</g>
+	<g>
+		<path class="st1" d="M8,12c-0.6,0-1-0.4-1-1V5c0-0.6,0.4-1,1-1s1,0.4,1,1v6C9,11.6,8.6,12,8,12z"/>
+	</g>
+	<g>
+		<path class="st1" d="M11,9H5C4.4,9,4,8.6,4,8s0.4-1,1-1h6c0.6,0,1,0.4,1,1C12,8.6,11.6,9,11,9z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/import_plater.svg b/resources/icons/white/import_plater.svg
new file mode 100644
index 000000000..1dc5aae6e
--- /dev/null
+++ b/resources/icons/white/import_plater.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="import_x5F_plater">
+	<g>
+		<path fill="#FFFFFF" d="M13,2c0.55,0,1,0.45,1,1v10c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+			C1.9,1,1,1.89,1,3v10c0,1.1,0.89,2,2,2h10c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,12c-0.55,0-1-0.45-1-1V5c0-0.55,0.45-1,1-1s1,0.45,1,1v6C9,11.55,8.55,12,8,12z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,9H5C4.45,9,4,8.55,4,8s0.45-1,1-1h6c0.55,0,1,0.45,1,1S11.55,9,11,9z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/infill.svg b/resources/icons/white/infill.svg
new file mode 100644
index 000000000..086043099
--- /dev/null
+++ b/resources/icons/white/infill.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="infill">
+	<g>
+		<g>
+			<defs>
+				<polygon id="SVGID_1_" points="8,1.03 2,5.03 2,7.03 2,11.03 8,15.03 14,11.03 14,7.03 14,5.03 				"/>
+			</defs>
+			<clipPath id="SVGID_2_">
+				<use xlink:href="#SVGID_1_"  overflow="visible"/>
+			</clipPath>
+			<g clip-path="url(#SVGID_2_)">
+				
+					<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="2.32" y1="11.59" x2="8.56" y2="1.34"/>
+				
+					<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="4.88" y1="13.15" x2="11.12" y2="2.9"/>
+				
+					<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="7.44" y1="14.71" x2="13.68" y2="4.46"/>
+				
+					<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="4.44" y1="2.34" x2="14.68" y2="8.59"/>
+				
+					<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="2.88" y1="4.91" x2="13.12" y2="11.15"/>
+				
+					<line fill="none" stroke="#ED6B21" stroke-width="0.7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" x1="1.32" y1="7.47" x2="11.56" y2="13.71"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M8,2.23l5,3.33v1.46v3.46l-5,3.33l-5-3.33V7.03V5.56L8,2.23 M8,1.03l-6,4v2v4l6,4l6-4v-4v-2L8,1.03L8,1.03
+			z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/layers.svg b/resources/icons/white/layers.svg
new file mode 100644
index 000000000..cd71fab3a
--- /dev/null
+++ b/resources/icons/white/layers.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="layers">
+	<g>
+		<g>
+			<rect x="1" y="13" fill="#FFFFFF" width="14" height="2"/>
+		</g>
+		<g>
+			<rect x="1" y="10.6" fill="#FFFFFF" width="14" height="1.74"/>
+		</g>
+		<g>
+			<rect x="1" y="8.19" fill="#FFFFFF" width="14" height="1.47"/>
+		</g>
+		<g>
+			<rect x="1" y="5.79" fill="#ED6B21" width="14" height="1.2"/>
+		</g>
+		<g>
+			<rect x="1" y="3.39" fill="#ED6B21" width="14" height="0.93"/>
+		</g>
+		<g>
+			<rect x="1" y="0.99" fill="#FFFFFF" width="14" height="0.67"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/lock2_closed.svg b/resources/icons/white/lock2_closed.svg
new file mode 100644
index 000000000..726c850a1
--- /dev/null
+++ b/resources/icons/white/lock2_closed.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="lock2_x5F_closed">
+	<path fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" d="M4,8V4c0,0,0-2,2-2c1,0,3,0,4,0c2,0,2,2,2,2v4"/>
+	<path fill="#FFFFFF" d="M13,8H3C2.45,8,2,8.45,2,9v5c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1V9C14,8.45,13.55,8,13,8z M10,12H8.91
+		c-0.21,0.58-0.76,1-1.41,1C6.67,13,6,12.33,6,11.5S6.67,10,7.5,10c0.65,0,1.2,0.42,1.41,1H10V12z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/lock_closed.svg b/resources/icons/white/lock_closed.svg
new file mode 100644
index 000000000..1665dc9a0
--- /dev/null
+++ b/resources/icons/white/lock_closed.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="lock_x5F_closed">
+	<path fill="none" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" d="M4,8V4c0,0,0-2,2-2c1,0,3,0,4,0c2,0,2,2,2,2v4"/>
+	<path fill="#FFFFFF" d="M13,8H3C2.45,8,2,8.45,2,9v5c0,0.55,0.45,1,1,1h10c0.55,0,1-0.45,1-1V9C14,8.45,13.55,8,13,8z M10,12H8.91
+		c-0.21,0.58-0.76,1-1.41,1C6.67,13,6,12.33,6,11.5S6.67,10,7.5,10c0.65,0,1.2,0.42,1.41,1H10V12z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/machine+cog.svg b/resources/icons/white/machine+cog.svg
new file mode 100644
index 000000000..ec49265b8
--- /dev/null
+++ b/resources/icons/white/machine+cog.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="machine_x2B_cog">
+	<g>
+		<path fill="#FFFFFF" d="M14.22,6.61c-0.25-0.12-0.52-0.43-0.6-0.68s-0.32-1.09-0.23-1.35l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83
+			L12.6,2.7c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45
+			C9.1,1.2,8.77,1,8.5,1h-1C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5
+			C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12
+			L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.52,0.43,0.6,0.68s0.32,1.09,0.23,1.35
+			L2.5,11.77c-0.09,0.26,0,0.63,0.2,0.83l0.7,0.7c0.19,0.19,0.57,0.28,0.83,0.2l0.35-0.12c0.26-0.09,0.67-0.06,0.91,0.05
+			s1,0.54,1.12,0.79l0.17,0.33C6.9,14.8,7.22,15,7.5,15h1c0.27,0,0.6-0.2,0.72-0.45l0.17-0.33c0.12-0.25,0.43-0.52,0.68-0.6
+			s1.09-0.32,1.35-0.23l0.35,0.12c0.26,0.09,0.63,0,0.83-0.2l0.71-0.71c0.19-0.19,0.28-0.57,0.2-0.83l-0.12-0.35
+			c-0.09-0.26-0.06-0.67,0.05-0.91s0.54-1,0.79-1.12l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72L14.22,6.61z
+			 M8,13c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11.65,7.25c-0.19-0.1-0.39-0.29-0.44-0.44s-0.17-0.67-0.1-0.87s-0.04-0.53-0.23-0.72l-0.1-0.1
+			c-0.19-0.19-0.52-0.3-0.72-0.23s-0.48,0.07-0.62,0C9.3,4.83,8.84,4.54,8.75,4.35C8.65,4.16,8.35,4,8.07,4H7.93
+			C7.65,4,7.35,4.16,7.25,4.35S6.96,4.74,6.81,4.79s-0.67,0.17-0.87,0.1S5.42,4.93,5.22,5.12l-0.1,0.1
+			c-0.19,0.19-0.3,0.52-0.23,0.72s0.07,0.48,0,0.62C4.83,6.7,4.54,7.16,4.35,7.25C4.16,7.35,4,7.65,4,7.93v0.14
+			c0,0.28,0.16,0.58,0.35,0.68s0.39,0.29,0.44,0.44c0.05,0.14,0.17,0.67,0.1,0.87s0.04,0.53,0.23,0.72l0.1,0.1
+			c0.19,0.19,0.52,0.3,0.72,0.23s0.48-0.07,0.62,0s0.59,0.35,0.69,0.54C7.35,11.84,7.65,12,7.93,12h0.14c0.28,0,0.58-0.16,0.68-0.35
+			c0.1-0.19,0.29-0.39,0.44-0.44c0.14-0.05,0.67-0.17,0.87-0.1s0.53-0.04,0.72-0.23l0.1-0.1c0.19-0.19,0.3-0.52,0.23-0.72
+			s-0.07-0.48,0-0.62s0.35-0.59,0.54-0.69C11.84,8.65,12,8.35,12,8.07V7.93C12,7.65,11.84,7.35,11.65,7.25z M8,10.86
+			c-1.58,0-2.86-1.28-2.86-2.86S6.42,5.14,8,5.14S10.86,6.42,10.86,8S9.58,10.86,8,10.86z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/notes.svg b/resources/icons/white/notes.svg
new file mode 100644
index 000000000..25de4191e
--- /dev/null
+++ b/resources/icons/white/notes.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="notes">
+	<g>
+		<path fill="#FFFFFF" d="M11,2v12H2V2H11 M11,1H2C1.45,1,1,1.45,1,2v12c0,0.55,0.45,1,1,1h9c0.55,0,1-0.45,1-1V2
+			C12,1.45,11.55,1,11,1L11,1z"/>
+	</g>
+	<path fill="#ED6B21" d="M14,3L14,3c-0.55,0-1,0.45-1,1v10c0,0.55,0.45,1,1,1l0,0c0.55,0,1-0.45,1-1V4C15,3.45,14.55,3,14,3z"/>
+	<polygon fill="#ED6B21" points="15,4 13,4 14,1 	"/>
+	<g>
+		<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="4" x2="10" y2="4"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="6" x2="10" y2="6"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="8" x2="10" y2="8"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" x1="3" y1="10" x2="7" y2="10"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/number_of_copies.svg b/resources/icons/white/number_of_copies.svg
new file mode 100644
index 000000000..7c9d78a80
--- /dev/null
+++ b/resources/icons/white/number_of_copies.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="number_x5F_of_x5F_copies">
+	<g>
+		<path fill="#FFFFFF" d="M13,2c0.55,0,1,0.45,1,1v10c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+			C1.9,1,1,1.89,1,3v10c0,1.1,0.89,2,2,2h10c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M6,4.5H4C3.72,4.5,3.5,4.28,3.5,4S3.72,3.5,4,3.5h2c0.28,0,0.5,0.22,0.5,0.5S6.28,4.5,6,4.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M12,8.5H8C7.72,8.5,7.5,8.28,7.5,8S7.72,7.5,8,7.5h4c0.28,0,0.5,0.22,0.5,0.5C12.5,8.28,12.28,8.5,12,8.5z
+			"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M6,12.5H4c-0.28,0-0.5-0.22-0.5-0.5s0.22-0.5,0.5-0.5h2c0.28,0,0.5,0.22,0.5,0.5S6.28,12.5,6,12.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M5,12.5c-0.28,0-0.5-0.22-0.5-0.5V4c0-0.28,0.22-0.5,0.5-0.5S5.5,3.72,5.5,4v8C5.5,12.28,5.28,12.5,5,12.5
+			z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M10,10.5c-0.28,0-0.5-0.22-0.5-0.5V6c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v4
+			C10.5,10.28,10.28,10.5,10,10.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/open.svg b/resources/icons/white/open.svg
new file mode 100644
index 000000000..0ea9ecdb2
--- /dev/null
+++ b/resources/icons/white/open.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="open">
+	<path fill="#FFFFFF" d="M1.22,14V3c0,0,0-1,1-1s4,0,5,0s1,2,2,2s4,0,4,0s1,0,1,1v2h-1c0,0,0,0,0-1s-1-1-1-1h-3.5c-1,0-1-2-2-2
+		s-3.5,0-3.5,0c-1,0-1,1-1,1v9v1h1v1c0,0,0,0-1,0S1.22,14,1.22,14z"/>
+	<path fill="#ED6B21" d="M5,6C4.45,6,3.86,6.43,3.68,6.95l-2.37,7.1C1.14,14.57,1.45,15,2,15h10c0.55,0,1.14-0.43,1.32-0.95
+		l2.37-7.1C15.86,6.43,15.55,6,15,6H5z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/output+page_white.svg b/resources/icons/white/output+page_white.svg
new file mode 100644
index 000000000..083874003
--- /dev/null
+++ b/resources/icons/white/output+page_white.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="output_x2B_page_x5F_white">
+	<path fill="#FFFFFF" d="M14.5,10c-0.27,0-0.5,0.23-0.5,0.5v3c0,0.27-0.23,0.5-0.5,0.5h-11C2.22,14,2,13.77,2,13.5v-11
+		C2,2.22,2.22,2,2.5,2h11C13.77,2,14,2.22,14,2.5v3C14,5.78,14.23,6,14.5,6l0,0C14.77,6,15,5.78,15,5.5v-4C15,1.23,14.77,1,14.5,1
+		h-13C1.23,1,1,1.23,1,1.5v13C1,14.77,1.23,15,1.5,15h13c0.27,0,0.5-0.23,0.5-0.5v-4C15,10.23,14.77,10,14.5,10L14.5,10z"/>
+	<path fill="#FFFFFF" d="M11,10.5c0-0.27-0.01-0.5-0.02-0.5s-0.17,0.17-0.36,0.37c0,0-0.61,0.67-1.3,0.95
+		c-1.83,0.73-3.91-0.16-4.64-1.99s0.16-3.91,1.99-4.64c1.59-0.64,3.88,1.02,3.88,1.02C10.77,5.87,10.97,6,10.98,6S11,5.78,11,5.5
+		V5.49c0-0.28-0.04-0.55-0.1-0.62s-0.23-0.43-0.25-0.7s-0.24-0.58-0.49-0.68L9.77,3.32C9.52,3.21,9.15,3.26,8.94,3.44
+		s-0.53,0.3-0.71,0.29S7.37,3.6,7.17,3.42S6.6,3.18,6.34,3.28l-0.4,0.16c-0.26,0.1-0.48,0.41-0.5,0.67S5.28,4.7,5.14,4.82
+		s-0.69,0.5-0.96,0.52S3.6,5.58,3.49,5.83l-0.17,0.4C3.21,6.48,3.26,6.85,3.44,7.06s0.3,0.53,0.29,0.71S3.6,8.63,3.42,8.83
+		S3.18,9.4,3.28,9.66l0.16,0.4c0.1,0.26,0.41,0.48,0.67,0.5s0.59,0.16,0.71,0.3s0.5,0.69,0.52,0.96s0.24,0.58,0.49,0.68l0.39,0.17
+		c0.25,0.11,0.63,0.05,0.83-0.12s0.53-0.3,0.71-0.29s0.85,0.13,1.05,0.31s0.57,0.24,0.83,0.14l0.4-0.16c0.26-0.1,0.48-0.41,0.5-0.67
+		s0.1-0.55,0.17-0.62S11,10.79,11,10.51V10.5z"/>
+	<path fill="#ED6B21" d="M14.65,8.35c0.19-0.19,0.19-0.51,0-0.71l-2.29-2.29C12.16,5.16,12,5.22,12,5.5v1C12,6.78,11.77,7,11.5,7h-3
+		C8.23,7,8,7.22,8,7.5v1C8,8.77,8.23,9,8.5,9h3C11.77,9,12,9.23,12,9.5v1c0,0.27,0.16,0.34,0.35,0.15L14.65,8.35z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/pad.svg b/resources/icons/white/pad.svg
new file mode 100644
index 000000000..cddb2da02
--- /dev/null
+++ b/resources/icons/white/pad.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="pad">
+	<g>
+		<path fill="#ED6B21" d="M14,14H2c-0.55,0-1-0.45-1-1s0.45-1,1-1h12c0.55,0,1,0.45,1,1S14.55,14,14,14z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M8,8.17c-0.4,0-0.8-0.1-1.11-0.31L2.55,4.97C1.95,4.57,1.5,3.72,1.5,3V2c0-0.28,0.22-0.5,0.5-0.5
+			S2.5,1.72,2.5,2v1c0,0.38,0.29,0.93,0.61,1.14l4.34,2.89c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89c0.31-0.21,0.6-0.76,0.6-1.14V2
+			c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v1c0,0.72-0.45,1.57-1.05,1.97L9.11,7.86C8.8,8.07,8.4,8.17,8,8.17z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M13,11.38c-0.21,0-0.38-0.17-0.38-0.38V7c0-0.21,0.17-0.38,0.38-0.38S13.38,6.79,13.38,7v4
+				C13.38,11.21,13.21,11.38,13,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M12,7.49"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M12,11"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M11,11.38c-0.21,0-0.38-0.17-0.38-0.38V8.12c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V11
+				C11.38,11.21,11.21,11.38,11,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M10,8.79"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M10,11"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M9,11.38c-0.21,0-0.38-0.17-0.38-0.38V9.5c0-0.21,0.17-0.38,0.38-0.38S9.38,9.29,9.38,9.5V11
+				C9.38,11.21,9.21,11.38,9,11.38z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M3,11.38c-0.21,0-0.38-0.17-0.38-0.38V7c0-0.21,0.17-0.38,0.38-0.38S3.37,6.79,3.37,7v4
+				C3.37,11.21,3.2,11.38,3,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M4,7.49"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M4,11"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M5,11.38c-0.21,0-0.38-0.17-0.38-0.38V8.12c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V11
+				C5.37,11.21,5.2,11.38,5,11.38z"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M6,8.79"/>
+		</g>
+		<g>
+			
+				<path fill="#FFFFFF" stroke="#808080" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M6,11"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M7,11.38c-0.21,0-0.38-0.17-0.38-0.38V9.5c0-0.21,0.17-0.38,0.38-0.38S7.37,9.29,7.37,9.5V11
+				C7.37,11.21,7.2,11.38,7,11.38z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/paste_menu.svg b/resources/icons/white/paste_menu.svg
new file mode 100644
index 000000000..465c2faf0
--- /dev/null
+++ b/resources/icons/white/paste_menu.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="paste">
+	<path fill="#ffffff" d="M33.73,107.03H15.94c-1.4,0-2.54-1.14-2.54-2.54V23.52c0-1.4,1.14-2.54,2.54-2.54h7.62v5.08
+		c0,1.4,1.14,2.54,2.54,2.54h45.72c1.4,0,2.54-1.14,2.54-2.54v-5.08h7.62c1.4,0,2.54,1.14,2.54,2.54v10.16
+		c0,1.4,1.14,2.54,2.54,2.54c1.4,0,2.54-1.14,2.54-2.54V23.52c0-4.2-3.42-7.62-7.62-7.62h-7.62v-5.08c0-1.4-1.14-2.54-2.54-2.54
+		H26.11c-1.4,0-2.54,1.14-2.54,2.54v5.08h-7.62c-4.2,0-7.62,3.42-7.62,7.62v80.97c0,4.2,3.42,7.62,7.62,7.62h17.78
+		c1.4,0,2.54-1.14,2.54-2.54C36.27,108.16,35.13,107.03,33.73,107.03z M28.65,13.36h40.64v10.16H28.65V13.36z"/>
+	<g>
+		<path fill="#ED6B21" d="M53.97,59.08h35.72c1.4,0,2.54-1.14,2.54-2.54c0-1.4-1.14-2.54-2.54-2.54H53.97
+			c-1.4,0-2.54,1.14-2.54,2.54C51.43,57.94,52.56,59.08,53.97,59.08z"/>
+		<path fill="#ED6B21" d="M104.93,69.24H53.97c-1.4,0-2.54,1.14-2.54,2.54c0,1.4,1.14,2.54,2.54,2.54h50.96
+			c1.4,0,2.54-1.14,2.54-2.54C107.47,70.38,106.33,69.24,104.93,69.24z"/>
+		<path fill="#ED6B21" d="M104.93,99.72H53.97c-1.4,0-2.54,1.14-2.54,2.54s1.14,2.54,2.54,2.54h50.96c1.4,0,2.54-1.14,2.54-2.54
+			S106.33,99.72,104.93,99.72z"/>
+		<path fill="#ED6B21" d="M115.75,51.15l-8.06-8.06c-2.47-2.47-6.97-4.34-10.47-4.34h-50.8c-4.2,0-7.62,3.42-7.62,7.62v66.04
+			c0,4.2,3.42,7.62,7.62,7.62h66.04c4.2,0,7.62-3.42,7.62-7.62v-50.8C120.09,58.12,118.23,53.62,115.75,51.15z M104.85,47.43
+			l6.57,6.57h-6.57V47.43z M115.01,112.42c0,1.4-1.14,2.54-2.54,2.54H46.43c-1.4,0-2.54-1.14-2.54-2.54V46.38
+			c0-1.4,1.14-2.54,2.54-2.54h50.8c0.74,0,1.63,0.18,2.54,0.46v12.24c0,1.4,1.14,2.54,2.54,2.54h12.24c0.28,0.91,0.46,1.8,0.46,2.54
+			V112.42z"/>
+		<path fill="#ED6B21" d="M104.93,84.48H53.97c-1.4,0-2.54,1.14-2.54,2.54c0,1.4,1.14,2.54,2.54,2.54h50.96
+			c1.4,0,2.54-1.14,2.54-2.54C107.47,85.62,106.33,84.48,104.93,84.48z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/plater.svg b/resources/icons/white/plater.svg
new file mode 100644
index 000000000..d637a5e7e
--- /dev/null
+++ b/resources/icons/white/plater.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="plater">
+	<path fill="#FFFFFF" d="M13,2c0.55,0,1,0.45,1,1v10c0,0.55-0.45,1-1,1H3c-0.55,0-1-0.45-1-1V3c0-0.55,0.45-1,1-1H13 M13,1H3
+		C1.9,1,1,1.89,1,3v10c0,1.1,0.89,2,2,2h10c1.1,0,2-0.89,2-2V3C15,1.89,14.11,1,13,1L13,1z"/>
+	<path fill="#ED6B21" d="M8.42,3.28c-0.23-0.15-0.6-0.15-0.83,0l-3.46,2.3C3.9,5.73,3.71,6.08,3.71,6.36v1.85c0,0.28,0,0.54,0,0.58
+		s0,0.31,0,0.58v0.27c0,0.27,0.19,0.62,0.42,0.78l3.46,2.3c0.23,0.15,0.6,0.15,0.83,0l3.46-2.3c0.23-0.15,0.42-0.5,0.42-0.78V9.38
+		c0-0.28,0-0.54,0-0.58s0-0.31,0-0.58V6.36c0-0.28-0.19-0.62-0.42-0.78L8.42,3.28z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/preview_menu.svg b/resources/icons/white/preview_menu.svg
new file mode 100644
index 000000000..98095359c
--- /dev/null
+++ b/resources/icons/white/preview_menu.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="preview">
+	<g>
+		<path fill="#ffffff" d="M90.72,121.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12l-29.16,28.57C91.49,121.23,91.11,121.38,90.72,121.38z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M90.72,111.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.14
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12l-29.16,28.57C91.49,111.23,91.11,111.38,90.72,111.38z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M90.72,101.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.14
+			c0.59-0.58,1.54-0.57,2.12,0.02s0.57,1.54-0.02,2.12l-29.16,28.57C91.49,101.23,91.11,101.38,90.72,101.38z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M90.72,91.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02s0.57,1.54-0.02,2.12L91.77,90.95C91.49,91.23,91.11,91.38,90.72,91.38z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M90.72,81.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12L91.77,80.95C91.49,81.23,91.11,81.38,90.72,81.38z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M90.72,71.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12L91.77,70.95C91.49,71.23,91.11,71.38,90.72,71.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M90.72,61.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02c0.58,0.59,0.57,1.54-0.02,2.12L91.77,60.95C91.49,61.23,91.11,61.38,90.72,61.38z"/>
+	</g>
+	<g>
+		<path fill="#ffffff" d="M90.72,51.38H8.12c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5h81.99l28.72-28.15
+			c0.59-0.58,1.54-0.57,2.12,0.02s0.57,1.54-0.02,2.12L91.77,50.95C91.49,51.23,91.11,51.38,90.72,51.38z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#ffffff" d="M88.72,41.38H9.18c-1.68,0-2.22-0.95-2.37-1.36s-0.37-1.48,0.89-2.59L38.43,10.5
+				c1.1-0.96,3.03-1.69,4.49-1.69h75.85c1.65,0,2.22,0.94,2.38,1.34s0.42,1.47-0.75,2.63c0,0,0,0,0,0L93.2,39.55
+				C92.14,40.59,90.21,41.38,88.72,41.38z M11.17,38.38h77.55c0.71,0,1.87-0.47,2.37-0.97l26.01-25.6H42.92
+				c-0.74,0-1.96,0.46-2.51,0.95L11.17,38.38z M118.89,11.82C118.89,11.82,118.89,11.82,118.89,11.82
+				C118.89,11.82,118.89,11.82,118.89,11.82z M119.34,11.71L119.34,11.71L119.34,11.71z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/printer.svg b/resources/icons/white/printer.svg
new file mode 100644
index 000000000..d94f6fd5c
--- /dev/null
+++ b/resources/icons/white/printer.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="printer">
+	<rect x="1" y="1" fill="#FFFFFF" width="1" height="14"/>
+	<rect x="14" y="1" fill="#FFFFFF" width="1" height="14"/>
+	<rect x="1" y="5" fill="#FFFFFF" width="14" height="1"/>
+	<rect x="1" y="1" fill="#FFFFFF" width="14" height="1"/>
+	<rect x="1" y="13" fill="#FFFFFF" width="14" height="2"/>
+	<rect x="3" y="4" fill="#ED6B21" width="4" height="4"/>
+	<polygon fill="#ED6B21" points="5,9 4,8 6,8 	"/>
+</g>
+</svg>
diff --git a/resources/icons/white/re_slice.svg b/resources/icons/white/re_slice.svg
new file mode 100644
index 000000000..b8d7dc727
--- /dev/null
+++ b/resources/icons/white/re_slice.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="slice">
+	<path fill="#FFFFFF" d="M14.22,6.61c-0.25-0.12-0.52-0.43-0.6-0.68s-0.32-1.09-0.23-1.35l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83
+		L12.6,2.7c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45
+		C9.1,1.2,8.77,1,8.5,1h-1C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5
+		C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12
+		L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.52,0.43,0.6,0.68s0.32,1.09,0.23,1.35
+		L2.5,11.77c-0.09,0.26,0,0.63,0.2,0.83l0.7,0.7c0.19,0.19,0.57,0.28,0.83,0.2l0.35-0.12c0.26-0.09,0.67-0.06,0.91,0.05
+		s1,0.54,1.12,0.79l0.17,0.33C6.9,14.8,7.22,15,7.5,15h1c0.27,0,0.6-0.2,0.72-0.45l0.17-0.33c0.12-0.25,0.43-0.52,0.68-0.6
+		s1.09-0.32,1.35-0.23l0.35,0.12c0.26,0.09,0.63,0,0.83-0.2l0.71-0.71c0.19-0.19,0.28-0.57,0.2-0.83l-0.12-0.35
+		c-0.09-0.26-0.06-0.67,0.05-0.91s0.54-1,0.79-1.12l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72L14.22,6.61z
+		 M8,13c-2.76,0-5-2.24-5-5s2.24-5,5-5s5,2.24,5,5S10.76,13,8,13z"/>
+	<path fill="#ED6B21" d="M6.86,5.51C6.39,5.23,6,5.45,6,6v4c0,0.55,0.39,0.77,0.86,0.49l3.29-1.97c0.47-0.28,0.47-0.75,0-1.03
+		L6.86,5.51z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/remove_copies.svg b/resources/icons/white/remove_copies.svg
new file mode 100644
index 000000000..5b277e45e
--- /dev/null
+++ b/resources/icons/white/remove_copies.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="remove_x5F_copies">
+	<g>
+		<path fill="#FFFFFF" d="M8,2c3.31,0,6,2.69,6,6s-2.69,6-6,6s-6-2.69-6-6S4.69,2,8,2 M8,1C4.13,1,1,4.13,1,8s3.13,7,7,7s7-3.13,7-7
+			S11.87,1,8,1L8,1z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M12,8.75H4C3.59,8.75,3.25,8.41,3.25,8S3.59,7.25,4,7.25h8c0.41,0,0.75,0.34,0.75,0.75S12.41,8.75,12,8.75
+			z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/remove_menu.svg b/resources/icons/white/remove_menu.svg
new file mode 100644
index 000000000..59360a33f
--- /dev/null
+++ b/resources/icons/white/remove_menu.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<path fill="#ffffff" d="M38.11,44.25H25.75c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72H38.1c0.95,0,1.72-0.77,1.72-1.72
+	C39.83,45.02,39.06,44.25,38.11,44.25z M45.89,45.97c0,0.95,0.77,1.72,1.72,1.72h12.35c0.95,0,1.72-0.77,1.72-1.72
+	s-0.77-1.72-1.72-1.72H47.61C46.66,44.25,45.89,45.02,45.89,45.97z M68.11,43.6c-0.33,0.28-0.52,0.65-0.59,1.04
+	c-0.59,0.27-1,0.87-1,1.56v5.6c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72v-5.34c0.12-0.06,0.24-0.13,0.35-0.22
+	c0.13-0.11,0.25-0.23,0.36-0.34l8.27-8.77c0.65-0.69,0.62-1.78-0.07-2.43s-1.78-0.62-2.43,0.07l-8.27,8.78
+	C68.16,43.56,68.14,43.58,68.11,43.6z M68.25,76.84c-0.95,0-1.72,0.77-1.72,1.72V89.1c0,0.95,0.77,1.72,1.72,1.72
+	c0.95,0,1.72-0.77,1.72-1.72V78.56C69.97,77.61,69.2,76.84,68.25,76.84z M69.97,59.91c0-0.95-0.77-1.72-1.72-1.72
+	c-0.95,0-1.72,0.77-1.72,1.72v10.54c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72V59.91z M88.92,56.35
+	c-0.95,0-1.72,0.77-1.72,1.72v3.4c0,0.34-0.02,0.63-0.04,0.85c-0.51,0.55-0.62,1.38-0.22,2.06c0.32,0.54,0.89,0.84,1.48,0.84
+	c0.3,0,0.6-0.08,0.88-0.24l0.25-0.15c0.67-0.4,1.09-1.1,1.09-3.35v-3.4C90.64,57.12,89.87,56.35,88.92,56.35z M41.81,26.17h11.3
+	c0.95,0,1.72-0.77,1.72-1.72s-0.77-1.72-1.72-1.72h-11.3c-0.95,0-1.72,0.77-1.72,1.72S40.86,26.17,41.81,26.17z M87.2,22.73h-5.39
+	c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72h2.75l-1.58,1.68c-0.65,0.69-0.62,1.78,0.07,2.43c0.33,0.31,0.76,0.47,1.18,0.47
+	c0.46,0,0.91-0.18,1.25-0.54l1.72-1.82v0.99c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72v-3.21
+	C90.64,24.27,89.09,22.73,87.2,22.73z M61.81,26.17h11.3c0.95,0,1.72-0.77,1.72-1.72s-0.77-1.72-1.72-1.72h-11.3
+	c-0.95,0-1.72,0.77-1.72,1.72S60.86,26.17,61.81,26.17z M9.71,67.54c0.95,0,1.72-0.77,1.72-1.72v-11.3c0-0.95-0.77-1.72-1.72-1.72
+	s-1.72,0.77-1.72,1.72v11.3C7.99,66.77,8.76,67.54,9.71,67.54z M24.65,33.86c0.42,0,0.84-0.15,1.17-0.46l7.04-6.52
+	c0.14-0.13,0.46-0.34,0.9-0.51c0.89-0.34,1.34-1.33,1-2.22s-1.33-1.34-2.22-1c-0.8,0.3-1.52,0.73-2.03,1.2l-7.04,6.52
+	c-0.7,0.65-0.74,1.74-0.09,2.43C23.73,33.68,24.19,33.86,24.65,33.86z M70.35,99.28l-0.37,0.36v-2.43c0-0.95-0.77-1.72-1.72-1.72
+	c-0.95,0-1.72,0.77-1.72,1.72v4.72H61.3c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72h5.23c1.4,0,3.15-0.7,4.16-1.66l2.03-1.94
+	c0.69-0.66,0.71-1.75,0.06-2.43C72.13,98.65,71.03,98.63,70.35,99.28z M52.6,101.93H41.3c-0.95,0-1.72,0.77-1.72,1.72
+	s0.77,1.72,1.72,1.72h11.3c0.95,0,1.72-0.77,1.72-1.72S53.55,101.93,52.6,101.93z M88.92,36.35c-0.95,0-1.72,0.77-1.72,1.72v11.3
+	c0,0.95,0.77,1.72,1.72,1.72c0.95,0,1.72-0.77,1.72-1.72v-11.3C90.64,37.12,89.87,36.35,88.92,36.35z M32.61,101.93H21.3
+	c-0.95,0-1.72,0.77-1.72,1.72s0.77,1.72,1.72,1.72h11.3c0.95,0,1.72-0.77,1.72-1.72S33.56,101.93,32.61,101.93z M9.71,87.54
+	c0.95,0,1.72-0.77,1.72-1.72v-11.3c0-0.95-0.77-1.72-1.72-1.72s-1.72,0.77-1.72,1.72v11.3C7.99,86.77,8.76,87.54,9.71,87.54z
+	 M12.61,101.93h-1.18v-7.42c0-0.95-0.77-1.72-1.72-1.72s-1.72,0.77-1.72,1.72v7.42c0,1.9,1.54,3.44,3.44,3.44h1.18
+	c0.95,0,1.72-0.77,1.72-1.72S13.56,101.93,12.61,101.93z M19.53,36.88c-0.65-0.7-1.74-0.74-2.43-0.09l-7.3,6.76
+	c-0.55,0.51-0.93,1.15-1.16,1.6C8.22,46,8.56,47.03,9.41,47.46c0.25,0.12,0.51,0.18,0.77,0.18h0.01c0.14,0.04,0.29,0.07,0.45,0.07
+	h5.6c0.95,0,1.72-0.77,1.72-1.72s-0.77-1.72-1.72-1.72h-2.13l5.33-4.94C20.14,38.66,20.18,37.57,19.53,36.88z M80.7,89.4l-4.05,3.86
+	c-0.69,0.66-0.71,1.75-0.06,2.43c0.34,0.35,0.79,0.53,1.25,0.53c0.43,0,0.86-0.16,1.19-0.48l4.05-3.86
+	c0.69-0.66,0.71-1.75,0.06-2.43C82.48,88.77,81.39,88.75,80.7,89.4z"/>
+<g>
+	<path fill="#ED6B21" d="M98.82,101.06c-11.63,0-21.09-9.46-21.09-21.09s9.46-21.09,21.09-21.09s21.09,9.46,21.09,21.09
+		S110.45,101.06,98.82,101.06z M98.82,62.32c-9.73,0-17.65,7.92-17.65,17.65s7.92,17.65,17.65,17.65s17.65-7.92,17.65-17.65
+		S108.55,62.32,98.82,62.32z"/>
+</g>
+<g>
+	<path fill="#ED6B21" d="M110.44,81.84c0,1.1-0.9,2-2,2H89.2c-1.1,0-2-0.9-2-2v-3.75c0-1.1,0.9-2,2-2h19.25c1.1,0,2,0.9,2,2
+		L110.44,81.84L110.44,81.84z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/resin.svg b/resources/icons/white/resin.svg
new file mode 100644
index 000000000..81abfae0c
--- /dev/null
+++ b/resources/icons/white/resin.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="resin">
+	<rect x="4" y="7" fill="#ED6B21" width="8" height="8"/>
+	<path fill="none" stroke="#FFFFFF" stroke-linecap="round" stroke-miterlimit="10" d="M4.5,15h6.99c0.28,0,0.5-0.23,0.5-0.5V6
+		c0-1-2-1-2-2s0-1,0-1h1V1.5C11,1.23,10.77,1,10.5,1h-5C5.23,1,5,1.23,5,1.5V3h1v1c0,1-2,1-2,2v8.5C4,14.77,4.23,15,4.5,15z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/save.svg b/resources/icons/white/save.svg
new file mode 100644
index 000000000..3349a42dd
--- /dev/null
+++ b/resources/icons/white/save.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="save">
+	<g>
+		<path fill="#FFFFFF" d="M12,2c1.44,0,2,0.56,2,2v10H2V2H12 M12,1H2C1.45,1,1,1.45,1,2v12c0,0.55,0.45,1,1,1h12c0.55,0,1-0.45,1-1
+			V4C15,2,14,1,12,1L12,1z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M10,8.5H3C2.72,8.5,2.5,8.28,2.5,8S2.72,7.5,3,7.5h7c0.28,0,0.5,0.22,0.5,0.5C10.5,8.28,10.28,8.5,10,8.5z
+			"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M10,10.5H3c-0.28,0-0.5-0.22-0.5-0.5S2.72,9.5,3,9.5h7c0.28,0,0.5,0.22,0.5,0.5S10.28,10.5,10,10.5z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M7,12.5H3c-0.28,0-0.5-0.22-0.5-0.5s0.22-0.5,0.5-0.5h4c0.28,0,0.5,0.22,0.5,0.5S7.28,12.5,7,12.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,1H5C4.45,1,4,1.45,4,2v3c0,0.55,0.45,1,1,1h6c0.55,0,1-0.45,1-1V2C12,1.45,11.55,1,11,1z M6,4.5
+			C6,4.78,5.78,5,5.5,5S5,4.78,5,4.5v-2C5,2.22,5.22,2,5.5,2S6,2.22,6,2.5V4.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/set_separate_obj.svg b/resources/icons/white/set_separate_obj.svg
new file mode 100644
index 000000000..de083c1c9
--- /dev/null
+++ b/resources/icons/white/set_separate_obj.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="set_x5F_separate_x5F_obj">
+	<g>
+		<path fill="#FFFFFF" d="M6,15.49H2.04c-0.83,0-1.5-0.67-1.51-1.5l-0.02-3.96c0-0.4,0.15-0.78,0.44-1.06C1.22,8.69,1.6,8.53,2,8.53
+			h4c0.83,0,1.5,0.67,1.5,1.5v3.96C7.5,14.82,6.83,15.49,6,15.49z M6,9.53H2c-0.13,0-0.26,0.05-0.35,0.15
+			C1.56,9.77,1.51,9.9,1.51,10.03l0.02,3.96c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5v-3.96C6.5,9.75,6.28,9.53,6,9.53z"
+			/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M6,7.5H2.04c-0.83,0-1.5-0.67-1.51-1.5L0.51,2.04c0-0.4,0.15-0.78,0.44-1.06C1.22,0.7,1.6,0.54,2,0.54h4
+			c0.83,0,1.5,0.67,1.5,1.5V6C7.5,6.83,6.83,7.5,6,7.5z M6,1.54H2c-0.13,0-0.26,0.05-0.35,0.15C1.56,1.78,1.51,1.9,1.51,2.04L1.53,6
+			c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5V2.04C6.5,1.76,6.28,1.54,6,1.54z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,7.5h-3.96c-0.83,0-1.5-0.67-1.51-1.5L8.51,2.04c0-0.4,0.15-0.78,0.44-1.06C9.22,0.7,9.6,0.54,10,0.54
+			h4c0.83,0,1.5,0.67,1.5,1.5V6C15.5,6.83,14.83,7.5,14,7.5z M14,1.54h-4c-0.13,0-0.26,0.05-0.35,0.15C9.56,1.78,9.5,1.9,9.51,2.04
+			L9.53,6c0,0.27,0.23,0.5,0.51,0.5H14c0.28,0,0.5-0.22,0.5-0.5V2.04C14.5,1.76,14.28,1.54,14,1.54z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M14,15.5h-3.96c-0.83,0-1.5-0.67-1.51-1.5l-0.02-3.96c0-0.4,0.15-0.78,0.44-1.06
+			C9.22,8.7,9.6,8.54,10,8.54h4c0.83,0,1.5,0.67,1.5,1.5V14C15.5,14.83,14.83,15.5,14,15.5z M14,9.54h-4
+			c-0.13,0-0.26,0.05-0.35,0.15C9.56,9.78,9.5,9.9,9.51,10.04L9.53,14c0,0.27,0.23,0.5,0.51,0.5H14c0.28,0,0.5-0.22,0.5-0.5v-3.96
+			C14.5,9.76,14.28,9.54,14,9.54z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/skirt+brim.svg b/resources/icons/white/skirt+brim.svg
new file mode 100644
index 000000000..684e177d2
--- /dev/null
+++ b/resources/icons/white/skirt+brim.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#FFFFFF" d="M11.9,5.59L8.42,3.27c-0.23-0.15-0.6-0.15-0.83,0L4.1,5.59C3.87,5.75,3.69,6.1,3.69,6.37v0.44v1v0.44
+	c0,0.28,0,0.72,0,1v0.44c0,0.28,0.19,0.62,0.42,0.78l3.48,2.32c0.23,0.15,0.6,0.15,0.83,0l3.48-2.32c0.23-0.15,0.42-0.5,0.42-0.78
+	V9.25c0-0.28,0-0.72,0-1V7.81v-1V6.37C12.31,6.1,12.13,5.75,11.9,5.59z M11.47,7.81v0.44c0,0.27,0,0.71,0,0.99s-0.19,0.62-0.42,0.78
+	l-2.64,1.76c-0.23,0.15-0.6,0.15-0.83,0l-2.64-1.76c-0.23-0.15-0.42-0.5-0.42-0.78c0-0.27,0-0.71,0-0.99V7.81V6.82
+	c0-0.27,0.19-0.62,0.42-0.78l2.64-1.76c0.23-0.15,0.6-0.15,0.83,0l2.64,1.76c0.23,0.15,0.42,0.5,0.42,0.78V7.81z"/>
+<path fill="#ED6B21" d="M13.17,4.47L8.83,1.58c-0.46-0.31-1.21-0.31-1.66,0L2.83,4.47C2.37,4.78,2,5.48,2,6.03s0,1.45,0,2v2
+	c0,0.55,0.37,1.25,0.83,1.55l4.34,2.89c0.46,0.31,1.21,0.31,1.66,0l4.34-2.89c0.46-0.31,0.83-1,0.83-1.55v-2c0-0.55,0-1.45,0-2
+	S13.63,4.78,13.17,4.47z M13.25,8.03v1.6c0,0.55-0.37,1.25-0.83,1.55l-3.59,2.39c-0.46,0.31-1.21,0.31-1.66,0l-3.59-2.39
+	c-0.46-0.31-0.83-1-0.83-1.55v-1.6c0-0.48,0-1.14,0-1.6c0-0.55,0.37-1.25,0.83-1.55l3.59-2.39c0.46-0.31,1.21-0.31,1.66,0l3.59,2.39
+	c0.46,0.31,0.83,1,0.83,1.55C13.25,6.89,13.25,7.55,13.25,8.03z"/>
+</svg>
diff --git a/resources/icons/white/split_object_SMALL.svg b/resources/icons/white/split_object_SMALL.svg
new file mode 100644
index 000000000..4795cab51
--- /dev/null
+++ b/resources/icons/white/split_object_SMALL.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="split_x5F_object_x5F_small">
+	<path fill="#FFFFFF" d="M10.98,7.22c-0.29,0-0.52-0.23-0.52-0.52V4.61V3.57c0-0.29-0.23-0.52-0.52-0.52H2.62
+		c-0.29,0-0.53,0.24-0.53,0.53l-0.04,7.31c0,0.14,0.05,0.27,0.15,0.37c0.1,0.1,0.23,0.15,0.37,0.15h3.19l0,0
+		c0.29,0,0.52,0.23,0.52,0.52s-0.23,0.52-0.52,0.52h-2.1c-0.01,0-0.01,0-0.02,0H2.56c-0.42,0-0.81-0.16-1.11-0.46
+		C1.16,11.69,1,11.29,1,10.87l0.04-7.31C1.05,2.7,1.75,2,2.62,2h7.31c0.86,0,1.57,0.7,1.57,1.57v1.04V6.7
+		C11.5,6.99,11.27,7.22,10.98,7.22z"/>
+	<g>
+		<path fill="#ED6B21" d="M13.53,8H7.47C7.21,8,7,8.21,7,8.47v6.07C7,14.79,7.21,15,7.47,15h6.07c0.26,0,0.47-0.21,0.47-0.47V8.47
+			C14,8.21,13.79,8,13.53,8z M12.36,12.68c0,1.14-0.57,1.65-1.88,1.65s-1.84-0.51-1.84-1.65v-2.33c0-1.17,0.51-1.65,1.84-1.65
+			s1.88,0.48,1.88,1.65V12.68z"/>
+		<path fill="#ED6B21" d="M10.47,9.57c-0.72,0-0.85,0.32-0.85,0.82v2.23c0,0.52,0.14,0.82,0.85,0.82c0.72,0,0.89-0.3,0.89-0.82V10.4
+			C11.37,9.9,11.24,9.57,10.47,9.57z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/split_parts_SMALL.svg b/resources/icons/white/split_parts_SMALL.svg
new file mode 100644
index 000000000..eba846c17
--- /dev/null
+++ b/resources/icons/white/split_parts_SMALL.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="split_x5F_parts_x5F_small">
+	<path fill="#FFFFFF" d="M10.98,7.22c-0.29,0-0.52-0.23-0.52-0.52V4.61V3.57c0-0.29-0.23-0.52-0.52-0.52H2.62
+		c-0.29,0-0.53,0.24-0.53,0.53l-0.04,7.31c0,0.14,0.05,0.27,0.15,0.37c0.1,0.1,0.23,0.15,0.37,0.15h3.19l0,0
+		c0.29,0,0.52,0.23,0.52,0.52s-0.23,0.52-0.52,0.52h-2.1c-0.01,0-0.01,0-0.02,0H2.56c-0.42,0-0.81-0.16-1.11-0.46
+		C1.16,11.69,1,11.29,1,10.87l0.04-7.31C1.05,2.7,1.75,2,2.62,2h7.31c0.86,0,1.57,0.7,1.57,1.57v1.04V6.7
+		C11.5,6.99,11.27,7.22,10.98,7.22z"/>
+	<g>
+		<path fill="#ED6B21" d="M13.53,8H7.47C7.21,8,7,8.21,7,8.47v6.07C7,14.79,7.21,15,7.47,15h6.07c0.26,0,0.47-0.21,0.47-0.47V8.47
+			C14,8.21,13.79,8,13.53,8z M12.19,10.89c0,1.16-0.65,1.69-1.99,1.69H9.81v1.72H8.79V8.7h1.41c1.35,0,1.99,0.49,1.99,1.67V10.89z"
+			/>
+		<path fill="#ED6B21" d="M10.21,9.62h-0.4v2h0.39c0.73,0,0.97-0.25,0.97-0.78v-0.41C11.17,9.89,10.99,9.62,10.21,9.62z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/spool.svg b/resources/icons/white/spool.svg
new file mode 100644
index 000000000..7c9fbab97
--- /dev/null
+++ b/resources/icons/white/spool.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="spool">
+	
+		<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="2" y1="2" x2="2" y2="14"/>
+	
+		<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" x1="14" y1="2" x2="14" y2="14"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="4" y1="3" x2="4" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="6" y1="3" x2="6" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="8" y1="3" x2="8" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="10" y1="3" x2="10" y2="13"/>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="12" y1="3" x2="12" y2="13"/>
+</g>
+</svg>
diff --git a/resources/icons/white/support.svg b/resources/icons/white/support.svg
new file mode 100644
index 000000000..52b7c6b40
--- /dev/null
+++ b/resources/icons/white/support.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="support">
+	<g>
+		<path fill="#FFFFFF" d="M8.42,0.91c-0.23-0.15-0.6-0.15-0.83,0L3.11,3.89c-0.23,0.15-0.42,0.5-0.42,0.78v0.57c0,0.28,0,0.55,0,0.6
+			s0,0.33,0,0.6V7.2c0,0.27,0,0.55,0,0.6s0,0.33,0,0.6v0.57c0,0.28,0.19,0.62,0.42,0.78l4.47,2.98c0.23,0.15,0.6,0.15,0.83,0
+			l4.47-2.98c0.23-0.15,0.42-0.5,0.42-0.78V8.4c0-0.27,0-0.55,0-0.6s0-0.33,0-0.6V6.44c0-0.28,0-0.55,0-0.6s0-0.33,0-0.6V4.67
+			c0-0.28-0.19-0.62-0.42-0.78L8.42,0.91z M12.42,5.24c0,0.28,0,0.55,0,0.6s0,0.33,0,0.6V7.2c0,0.27,0,0.55,0,0.6s0,0.33,0,0.6v0.09
+			c0,0.28-0.19,0.62-0.42,0.78l-3.59,2.39c-0.23,0.15-0.6,0.15-0.83,0L3.99,9.27c-0.23-0.15-0.42-0.5-0.42-0.78V8.4
+			c0-0.27,0-0.55,0-0.6s0-0.33,0-0.6V6.44c0-0.28,0-0.55,0-0.6s0-0.33,0-0.6v-0.1c0-0.27,0.19-0.62,0.42-0.78l3.59-2.39
+			c0.23-0.15,0.6-0.15,0.83,0L12,4.36c0.23,0.15,0.42,0.5,0.42,0.78V5.24z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#ED6B21" d="M13,15.38c-0.21,0-0.38-0.17-0.38-0.38v-4c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38v4
+				C13.38,15.21,13.21,15.38,13,15.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M12,11.49"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M12,15"/>
+		</g>
+		<g>
+			<path fill="#ED6B21" d="M11,15.38c-0.21,0-0.38-0.17-0.38-0.38v-2.88c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V15
+				C11.38,15.21,11.21,15.38,11,15.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M10,12.79"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M10,15"/>
+		</g>
+		<g>
+			<path fill="#ED6B21" d="M9,15.38c-0.21,0-0.38-0.17-0.38-0.38v-1.5c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V15
+				C9.38,15.21,9.21,15.38,9,15.38z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#ED6B21" d="M3,15.38c-0.21,0-0.38-0.17-0.38-0.38v-4c0-0.21,0.17-0.38,0.38-0.38S3.37,10.79,3.37,11v4
+				C3.37,15.21,3.2,15.38,3,15.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M4,11.49"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M4,15"/>
+		</g>
+		<g>
+			<path fill="#ED6B21" d="M5,15.38c-0.21,0-0.38-0.17-0.38-0.38v-2.88c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V15
+				C5.37,15.21,5.2,15.38,5,15.38z"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M6,12.79"/>
+		</g>
+		<g>
+			
+				<path fill="none" stroke="#ED6B21" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+				M6,15"/>
+		</g>
+		<g>
+			<path fill="#ED6B21" d="M7,15.38c-0.21,0-0.38-0.17-0.38-0.38v-1.5c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38V15
+				C7.37,15.21,7.2,15.38,7,15.38z"/>
+		</g>
+	</g>
+	<g>
+		
+			<path fill="none" stroke="#ED6B21" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M8,14"/>
+	</g>
+	<g>
+		
+			<path fill="none" stroke="#ED6B21" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+			M8,15"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/support_blocker.svg b/resources/icons/white/support_blocker.svg
new file mode 100644
index 000000000..17401e2ab
--- /dev/null
+++ b/resources/icons/white/support_blocker.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="support_x5F_blocker">
+	<g>
+		<path fill="#FFFFFF" d="M8,8.17c-0.4,0-0.8-0.1-1.11-0.31L2.55,4.97C1.95,4.57,1.5,3.72,1.5,3V2c0-0.28,0.22-0.5,0.5-0.5
+			S2.5,1.72,2.5,2v1c0,0.38,0.29,0.93,0.61,1.14l4.34,2.89c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89c0.31-0.21,0.6-0.76,0.6-1.14V2
+			c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v1c0,0.72-0.45,1.57-1.05,1.97L9.11,7.86C8.8,8.07,8.4,8.17,8,8.17z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,8.38c-0.12,0-0.24-0.06-0.31-0.17c-0.11-0.17-0.07-0.41,0.1-0.52l3-2c0.12-0.08,0.26-0.08,0.38-0.02
+			s0.2,0.19,0.2,0.33v2c0,0.21-0.17,0.38-0.38,0.38S13.62,8.21,13.62,8V6.7L11.2,8.31C11.14,8.35,11.07,8.38,11,8.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,14.38h-3c-0.21,0-0.38-0.17-0.38-0.38s0.17-0.38,0.38-0.38h2.62V13c0-0.21,0.17-0.38,0.38-0.38
+			s0.38,0.17,0.38,0.38v1C14.38,14.21,14.21,14.38,14,14.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M9,14.38H7c-0.21,0-0.38-0.17-0.38-0.38S6.79,13.62,7,13.62h2c0.21,0,0.38,0.17,0.38,0.38
+			S9.21,14.38,9,14.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14,11.38c-0.21,0-0.38-0.17-0.38-0.38v-1c0-0.21,0.17-0.38,0.38-0.38s0.38,0.17,0.38,0.38v1
+			C14.38,11.21,14.21,11.38,14,11.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,10.38c-0.13,0-0.25-0.06-0.32-0.18C7.57,10.02,7.63,9.79,7.8,9.68l1.62-1C9.6,8.57,9.83,8.63,9.94,8.8
+			c0.11,0.18,0.05,0.41-0.12,0.52l-1.62,1C8.14,10.36,8.07,10.38,8,10.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M5,8.38c-0.07,0-0.14-0.02-0.21-0.06L2.38,6.7V8c0,0.21-0.17,0.38-0.38,0.38S1.62,8.21,1.62,8V6
+			c0-0.14,0.08-0.27,0.2-0.33C1.95,5.6,2.09,5.61,2.21,5.69l3,2c0.17,0.11,0.22,0.35,0.1,0.52C5.24,8.32,5.12,8.38,5,8.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M5,14.38H2c-0.21,0-0.38-0.17-0.38-0.38v-1c0-0.21,0.17-0.38,0.38-0.38S2.38,12.79,2.38,13v0.62H5
+			c0.21,0,0.38,0.17,0.38,0.38S5.21,14.38,5,14.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M2,11.38c-0.21,0-0.38-0.17-0.38-0.38v-1c0-0.21,0.17-0.38,0.38-0.38S2.38,9.79,2.38,10v1
+			C2.38,11.21,2.21,11.38,2,11.38z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,10.38c-0.07,0-0.14-0.02-0.2-0.06l-1.62-1C6.01,9.21,5.96,8.98,6.06,8.8C6.17,8.63,6.4,8.57,6.58,8.68
+			l1.62,1c0.18,0.11,0.23,0.34,0.12,0.52C8.25,10.31,8.13,10.38,8,10.38z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/support_enforcer.svg b/resources/icons/white/support_enforcer.svg
new file mode 100644
index 000000000..0de2dc6a7
--- /dev/null
+++ b/resources/icons/white/support_enforcer.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="support_x5F_enfocer">
+	<g>
+		<path fill="#FFFFFF" d="M8,8.17c-0.4,0-0.8-0.1-1.11-0.31L2.55,4.97C1.95,4.57,1.5,3.72,1.5,3V2c0-0.28,0.22-0.5,0.5-0.5
+			S2.5,1.72,2.5,2v1c0,0.38,0.29,0.93,0.61,1.14l4.34,2.89c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89c0.31-0.21,0.6-0.76,0.6-1.14V2
+			c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v1c0,0.72-0.45,1.57-1.05,1.97L9.11,7.86C8.8,8.07,8.4,8.17,8,8.17z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M13,14.5H3c-0.83,0-1.5-0.67-1.5-1.5V7c0-0.45,0.19-0.81,0.51-0.98s0.72-0.13,1.1,0.12l4.34,2.89
+			c0.29,0.19,0.82,0.19,1.11,0l4.34-2.89c0.38-0.25,0.78-0.3,1.1-0.12c0.31,0.17,0.5,0.53,0.5,0.98v6C14.5,13.83,13.83,14.5,13,14.5
+			z M2.5,6.94c0,0.02,0,0.04,0,0.06v6c0,0.28,0.22,0.5,0.5,0.5h10c0.28,0,0.5-0.22,0.5-0.5V7c0-0.02,0-0.04,0-0.06
+			c-0.02,0.01-0.03,0.02-0.05,0.03L9.11,9.86c-0.62,0.41-1.6,0.41-2.22,0L2.55,6.97C2.54,6.96,2.52,6.95,2.5,6.94z M8.83,9.45
+			L8.83,9.45L8.83,9.45z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/test.svg b/resources/icons/white/test.svg
new file mode 100644
index 000000000..639bbbde8
--- /dev/null
+++ b/resources/icons/white/test.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="test">
+	<g>
+		<path fill="#FFFFFF" d="M13,1.5h-1.5v1h1v12h-9v-12h1v-1H3C2.72,1.5,2.5,1.72,2.5,2v13c0,0.28,0.22,0.5,0.5,0.5h10
+			c0.28,0,0.5-0.22,0.5-0.5V2C13.5,1.72,13.28,1.5,13,1.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,8.5H5C4.72,8.5,4.5,8.28,4.5,8V5c0-0.28,0.22-0.5,0.5-0.5h3c0.28,0,0.5,0.22,0.5,0.5v3
+			C8.5,8.28,8.28,8.5,8,8.5z M5.5,7.5h2v-2h-2V7.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M8,13.5H5c-0.28,0-0.5-0.22-0.5-0.5v-3c0-0.28,0.22-0.5,0.5-0.5h3c0.28,0,0.5,0.22,0.5,0.5v3
+			C8.5,13.28,8.28,13.5,8,13.5z M5.5,12.5h2v-2h-2V12.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,5.5h-1C9.72,5.5,9.5,5.28,9.5,5S9.72,4.5,10,4.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,5.5,11,5.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,7.5h-1C9.72,7.5,9.5,7.28,9.5,7S9.72,6.5,10,6.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,7.5,11,7.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,10.5h-1c-0.28,0-0.5-0.22-0.5-0.5S9.72,9.5,10,9.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,10.5,11,10.5z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M11,12.5h-1c-0.28,0-0.5-0.22-0.5-0.5s0.22-0.5,0.5-0.5h1c0.28,0,0.5,0.22,0.5,0.5S11.28,12.5,11,12.5z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M11,3.5H5C4.72,3.5,4.5,3.28,4.5,3V1c0-0.28,0.22-0.5,0.5-0.5h6c0.28,0,0.5,0.22,0.5,0.5v2
+				C11.5,3.28,11.28,3.5,11,3.5z M5.5,2.5h5v-1h-5V2.5z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/white/time.svg b/resources/icons/white/time.svg
new file mode 100644
index 000000000..d014286b5
--- /dev/null
+++ b/resources/icons/white/time.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="time">
+	<g>
+		<path fill="#FFFFFF" d="M8,2c3.31,0,6,2.69,6,6s-2.69,6-6,6s-6-2.69-6-6S4.69,2,8,2 M8,1C4.13,1,1,4.13,1,8s3.13,7,7,7s7-3.13,7-7
+			S11.87,1,8,1L8,1z"/>
+	</g>
+	<g>
+		<line fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-miterlimit="10" x1="5" y1="4" x2="8" y2="8"/>
+	</g>
+	
+		<line fill="none" stroke="#ED6B21" stroke-width="1.5" stroke-linecap="round" stroke-miterlimit="10" x1="11.5" y1="8" x2="8" y2="8"/>
+</g>
+</svg>
diff --git a/resources/icons/white/upload_queue.svg b/resources/icons/white/upload_queue.svg
new file mode 100644
index 000000000..710e2be89
--- /dev/null
+++ b/resources/icons/white/upload_queue.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="gueue">
+	<g>
+		<path fill="#FFFFFF" d="M6,15.49H2.04c-0.83,0-1.5-0.67-1.51-1.5l-0.02-3.96c0-0.4,0.15-0.78,0.44-1.06C1.22,8.69,1.6,8.53,2,8.53
+			h4c0.83,0,1.5,0.67,1.5,1.5v3.96C7.5,14.82,6.83,15.49,6,15.49z M6,9.53H2c-0.13,0-0.26,0.05-0.35,0.15
+			C1.56,9.77,1.51,9.9,1.51,10.03l0.02,3.96c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5v-3.96C6.5,9.75,6.28,9.53,6,9.53z"
+			/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M6,7.5H2.04c-0.83,0-1.5-0.67-1.51-1.5L0.51,2.04c0-0.4,0.15-0.78,0.44-1.06C1.22,0.7,1.6,0.54,2,0.54h4
+			l0,0c0.4,0,0.77,0.16,1.06,0.44C7.34,1.26,7.5,1.64,7.5,2.04V6C7.5,6.83,6.83,7.5,6,7.5z M6,1.54L6,1.54H2
+			c-0.13,0-0.26,0.05-0.35,0.15C1.56,1.78,1.51,1.9,1.51,2.04L1.53,6c0,0.28,0.23,0.5,0.51,0.5H6c0.28,0,0.5-0.22,0.5-0.5V2.04
+			c0-0.13-0.05-0.26-0.15-0.35C6.26,1.59,6.13,1.54,6,1.54z"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M14,7.5h-3.96c-0.83,0-1.5-0.67-1.51-1.5L8.51,2.04c0-0.4,0.15-0.78,0.44-1.06C9.22,0.7,9.6,0.54,10,0.54
+			h4l0,0c0.4,0,0.78,0.16,1.06,0.44s0.44,0.66,0.44,1.06V6C15.5,6.83,14.83,7.5,14,7.5z M14,1.54L14,1.54h-4
+			c-0.13,0-0.26,0.05-0.35,0.15C9.56,1.78,9.5,1.9,9.51,2.04L9.53,6c0,0.27,0.23,0.5,0.51,0.5H14c0.28,0,0.5-0.22,0.5-0.5V2.04
+			c0-0.13-0.05-0.26-0.15-0.35S14.13,1.54,14,1.54z"/>
+	</g>
+	<path fill="#ED6B21" d="M12,8.5c-1.93,0-3.5,1.57-3.5,3.5s1.57,3.5,3.5,3.5s3.5-1.57,3.5-3.5S13.93,8.5,12,8.5z M13.45,12.58H12
+		c-0.09,0-0.17-0.02-0.24-0.06c-0.02-0.01-0.04-0.02-0.05-0.04c-0.05-0.03-0.1-0.07-0.14-0.12c-0.01-0.01-0.02-0.01-0.03-0.02
+		l-1.25-1.67c-0.19-0.26-0.14-0.62,0.12-0.82c0.26-0.19,0.62-0.14,0.82,0.12l1.07,1.43h1.17c0.32,0,0.58,0.26,0.58,0.58
+		C14.04,12.32,13.78,12.58,13.45,12.58z"/>
+</g>
+</svg>
diff --git a/resources/icons/white/wrench.svg b/resources/icons/white/wrench.svg
new file mode 100644
index 000000000..714c5a82a
--- /dev/null
+++ b/resources/icons/white/wrench.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="advanced_x2B_wrench">
+	<path fill="#FFFFFF" d="M7.4,3.7C7.3,3.5,7.2,3.2,7.1,3l0.2-0.7L6.6,1.7L6,1.9C5.8,1.8,5.5,1.7,5.3,1.6L5,1H4L3.7,1.6
+		C3.5,1.7,3.2,1.8,3,1.9L2.4,1.7L1.7,2.4L1.9,3C1.8,3.2,1.7,3.5,1.6,3.7L1,4v1l0.6,0.3C1.7,5.5,1.8,5.8,1.9,6L1.7,6.6l0.7,0.7L3,7.1
+		c0.2,0.1,0.4,0.2,0.7,0.3L4,8h1l0.3-0.6C5.5,7.3,5.8,7.2,6,7.1l0.7,0.2l0.7-0.7L7.1,6c0.1-0.2,0.2-0.4,0.3-0.7L8,5V4L7.4,3.7z
+		 M4.5,6.4c-1.1,0-1.9-0.9-1.9-1.9s0.9-1.9,1.9-1.9s1.9,0.9,1.9,1.9S5.6,6.4,4.5,6.4z"/>
+	<path fill="#FFFFFF" d="M12.4,2.5c-0.1-0.2-0.1-0.3-0.2-0.5l0.1-0.5L11.8,1l-0.5,0.2C11.2,1.1,11.1,1,10.9,1l-0.2-0.4H10L9.8,1
+		C9.6,1,9.4,1.1,9.3,1.2L8.8,1L8.3,1.5L8.5,2C8.4,2.2,8.3,2.3,8.3,2.5L7.8,2.7v0.7l0.4,0.2c0,0.2,0.1,0.3,0.2,0.5L8.3,4.6l0.5,0.5
+		l0.5-0.2C9.4,5,9.6,5.1,9.8,5.1L10,5.6h0.7l0.2-0.4c0.2,0,0.3-0.1,0.5-0.2l0.5,0.2l0.5-0.5l-0.2-0.5c0.1-0.2,0.1-0.3,0.2-0.5
+		l0.4-0.2V2.7L12.4,2.5z M10.3,4.2c-0.6,0-1.1-0.5-1.1-1.1S9.7,2,10.3,2s1.1,0.5,1.1,1.1S10.9,4.2,10.3,4.2z"/>
+	<path fill="#ED6B21" d="M14.4,9.6L15,8.9l-0.5-1.3l-1-0.1C13.3,7.3,13,7,12.8,6.8l-0.1-1l-1.3-0.5l-0.7,0.6c-0.3,0-0.7,0-1,0
+		L8.9,5.3L7.6,5.8l-0.1,1C7.3,7,7,7.3,6.8,7.5l-1,0.1L5.3,8.9l0.6,0.7c0,0.3,0,0.7,0,1l-0.6,0.7l0.5,1.3l1,0.1
+		C7,13,7.3,13.3,7.5,13.5l0.1,1L8.9,15l0.7-0.6c0.3,0,0.7,0,1,0l0.7,0.6l1.3-0.5l0.1-1c0.3-0.2,0.5-0.5,0.7-0.7l1-0.1l0.5-1.3
+		l-0.6-0.7C14.4,10.3,14.4,10,14.4,9.6z M10.2,13c-1.6,0-2.9-1.3-2.9-2.8c0-1.6,1.3-2.9,2.9-2.9S13,8.6,13,10.2
+		C13,11.7,11.7,13,10.2,13z"/>
+</g>
+</svg>
diff --git a/resources/icons/wrench.png b/resources/icons/wrench.png
deleted file mode 100644
index 4dc553cdd..000000000
Binary files a/resources/icons/wrench.png and /dev/null differ
diff --git a/resources/icons/wrench.svg b/resources/icons/wrench.svg
new file mode 100644
index 000000000..5266ec1eb
--- /dev/null
+++ b/resources/icons/wrench.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="advanced_x2B_wrench">
+	<g>
+		<path fill="#808080" d="M7.61,3.81c-0.12-0.06-0.26-0.21-0.3-0.34S7.15,2.92,7.19,2.79l0.06-0.17c0.04-0.13,0-0.32-0.1-0.41
+			L6.8,1.85c-0.1-0.1-0.28-0.14-0.41-0.1L6.21,1.81C6.08,1.85,5.88,1.84,5.76,1.78s-0.5-0.27-0.56-0.39L5.11,1.22
+			C5.05,1.1,4.89,1,4.75,1h-0.5c-0.14,0-0.3,0.1-0.36,0.22L3.81,1.39c-0.06,0.12-0.21,0.26-0.34,0.3S2.92,1.85,2.79,1.81L2.62,1.75
+			c-0.13-0.04-0.32,0-0.41,0.1L1.85,2.2c-0.1,0.1-0.14,0.28-0.1,0.41l0.06,0.17c0.04,0.13,0.03,0.33-0.03,0.45s-0.27,0.5-0.39,0.56
+			L1.22,3.89C1.1,3.95,1,4.11,1,4.25v0.5c0,0.14,0.1,0.3,0.22,0.36l0.17,0.08c0.12,0.06,0.26,0.21,0.3,0.34s0.16,0.54,0.12,0.67
+			L1.75,6.38c-0.04,0.13,0,0.32,0.1,0.41L2.2,7.15c0.1,0.1,0.28,0.14,0.41,0.1l0.17-0.06c0.13-0.04,0.33-0.03,0.45,0.03
+			s0.5,0.27,0.56,0.39l0.08,0.17C3.95,7.9,4.11,8,4.25,8h0.5c0.14,0,0.3-0.1,0.36-0.22l0.08-0.17c0.06-0.12,0.21-0.26,0.34-0.3
+			s0.54-0.16,0.67-0.12l0.17,0.06c0.13,0.04,0.32,0,0.41-0.1L7.15,6.8c0.1-0.1,0.14-0.28,0.1-0.41L7.19,6.21
+			C7.15,6.08,7.16,5.88,7.22,5.76s0.27-0.5,0.39-0.56l0.17-0.08C7.9,5.05,8,4.89,8,4.75v-0.5c0-0.14-0.1-0.3-0.22-0.36L7.61,3.81z
+			 M4.5,6.42c-1.06,0-1.92-0.86-1.92-1.92c0-1.06,0.86-1.92,1.92-1.92S6.42,3.44,6.42,4.5C6.42,5.56,5.56,6.42,4.5,6.42z"/>
+	</g>
+	<g>
+		<path fill="#808080" d="M12.61,2.6c-0.12-0.06-0.24-0.18-0.28-0.27s-0.11-0.42-0.06-0.54s0-0.31-0.1-0.41l-0.15-0.15
+			c-0.1-0.1-0.28-0.14-0.41-0.1s-0.3,0.04-0.39,0S10.86,0.9,10.8,0.78s-0.22-0.22-0.36-0.22h-0.21c-0.14,0-0.3,0.1-0.36,0.22
+			S9.68,1.03,9.59,1.06S9.18,1.16,9.05,1.12s-0.31,0-0.41,0.1L8.49,1.37c-0.1,0.1-0.14,0.28-0.1,0.41s0.04,0.3,0,0.39
+			S8.17,2.54,8.05,2.6S7.83,2.82,7.83,2.96v0.21c0,0.14,0.1,0.3,0.22,0.36S8.3,3.71,8.33,3.8s0.11,0.42,0.06,0.54s0,0.31,0.1,0.41
+			l0.15,0.15c0.1,0.1,0.28,0.14,0.41,0.1s0.3-0.04,0.39,0s0.37,0.22,0.43,0.34s0.22,0.22,0.36,0.22h0.21c0.14,0,0.3-0.1,0.36-0.22
+			s0.18-0.24,0.27-0.28s0.42-0.11,0.54-0.06s0.31,0,0.41-0.1l0.15-0.15c0.1-0.1,0.14-0.28,0.1-0.41s-0.04-0.3,0-0.39
+			s0.22-0.37,0.34-0.43s0.22-0.22,0.22-0.36V2.96C12.83,2.82,12.74,2.66,12.61,2.6z M10.33,4.18c-0.62,0-1.11-0.5-1.11-1.11
+			c0-0.62,0.5-1.11,1.11-1.11s1.11,0.5,1.11,1.11C11.45,3.68,10.95,4.18,10.33,4.18z"/>
+	</g>
+	<g>
+		<path fill="#ED6B21" d="M14.38,9.89c-0.01-0.14,0.06-0.33,0.15-0.44l0.31-0.35c0.09-0.1,0.12-0.29,0.07-0.42l-0.35-0.85
+			c-0.05-0.13-0.21-0.24-0.35-0.25l-0.47-0.03c-0.14-0.01-0.32-0.1-0.42-0.2l-0.37-0.37c-0.1-0.09-0.2-0.28-0.2-0.41l-0.03-0.47
+			c-0.01-0.14-0.12-0.29-0.25-0.35L11.62,5.4c-0.13-0.05-0.32-0.02-0.42,0.07l-0.36,0.31c-0.1,0.09-0.3,0.16-0.44,0.15l-0.52,0
+			C9.75,5.93,9.55,5.86,9.45,5.77L9.1,5.46C8.99,5.37,8.8,5.34,8.68,5.4L7.83,5.75C7.7,5.8,7.59,5.95,7.58,6.09L7.55,6.56
+			c-0.01,0.14-0.1,0.32-0.2,0.42L6.98,7.34c-0.09,0.1-0.28,0.2-0.41,0.2L6.09,7.58C5.95,7.59,5.8,7.7,5.75,7.83L5.4,8.68
+			C5.34,8.8,5.37,8.99,5.46,9.1l0.31,0.36c0.09,0.1,0.16,0.3,0.15,0.44l0,0.52c0.01,0.14-0.06,0.33-0.15,0.44L5.46,11.2
+			c-0.09,0.1-0.12,0.29-0.07,0.42l0.35,0.85c0.05,0.13,0.21,0.24,0.35,0.25l0.47,0.03c0.14,0.01,0.32,0.1,0.42,0.2l0.37,0.37
+			c0.1,0.09,0.2,0.28,0.2,0.41l0.03,0.47c0.01,0.14,0.12,0.29,0.25,0.35l0.85,0.35c0.13,0.05,0.32,0.02,0.42-0.07l0.36-0.31
+			c0.1-0.09,0.3-0.16,0.44-0.15l0.52,0c0.14-0.01,0.33,0.06,0.44,0.15l0.35,0.31c0.1,0.09,0.29,0.12,0.42,0.07l0.85-0.35
+			c0.13-0.05,0.24-0.21,0.25-0.35l0.03-0.47c0.01-0.14,0.1-0.32,0.2-0.42l0.37-0.37c0.09-0.1,0.28-0.2,0.41-0.21l0.47-0.03
+			c0.14-0.01,0.29-0.12,0.35-0.25l0.35-0.85c0.05-0.13,0.02-0.32-0.07-0.42l-0.31-0.36c-0.09-0.1-0.16-0.3-0.15-0.44L14.38,9.89z
+			 M10.15,13c-1.57,0-2.85-1.27-2.85-2.85S8.58,7.3,10.15,7.3S13,8.58,13,10.15S11.72,13,10.15,13z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/wrench_white.svg b/resources/icons/wrench_white.svg
new file mode 100644
index 000000000..714c5a82a
--- /dev/null
+++ b/resources/icons/wrench_white.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="advanced_x2B_wrench">
+	<path fill="#FFFFFF" d="M7.4,3.7C7.3,3.5,7.2,3.2,7.1,3l0.2-0.7L6.6,1.7L6,1.9C5.8,1.8,5.5,1.7,5.3,1.6L5,1H4L3.7,1.6
+		C3.5,1.7,3.2,1.8,3,1.9L2.4,1.7L1.7,2.4L1.9,3C1.8,3.2,1.7,3.5,1.6,3.7L1,4v1l0.6,0.3C1.7,5.5,1.8,5.8,1.9,6L1.7,6.6l0.7,0.7L3,7.1
+		c0.2,0.1,0.4,0.2,0.7,0.3L4,8h1l0.3-0.6C5.5,7.3,5.8,7.2,6,7.1l0.7,0.2l0.7-0.7L7.1,6c0.1-0.2,0.2-0.4,0.3-0.7L8,5V4L7.4,3.7z
+		 M4.5,6.4c-1.1,0-1.9-0.9-1.9-1.9s0.9-1.9,1.9-1.9s1.9,0.9,1.9,1.9S5.6,6.4,4.5,6.4z"/>
+	<path fill="#FFFFFF" d="M12.4,2.5c-0.1-0.2-0.1-0.3-0.2-0.5l0.1-0.5L11.8,1l-0.5,0.2C11.2,1.1,11.1,1,10.9,1l-0.2-0.4H10L9.8,1
+		C9.6,1,9.4,1.1,9.3,1.2L8.8,1L8.3,1.5L8.5,2C8.4,2.2,8.3,2.3,8.3,2.5L7.8,2.7v0.7l0.4,0.2c0,0.2,0.1,0.3,0.2,0.5L8.3,4.6l0.5,0.5
+		l0.5-0.2C9.4,5,9.6,5.1,9.8,5.1L10,5.6h0.7l0.2-0.4c0.2,0,0.3-0.1,0.5-0.2l0.5,0.2l0.5-0.5l-0.2-0.5c0.1-0.2,0.1-0.3,0.2-0.5
+		l0.4-0.2V2.7L12.4,2.5z M10.3,4.2c-0.6,0-1.1-0.5-1.1-1.1S9.7,2,10.3,2s1.1,0.5,1.1,1.1S10.9,4.2,10.3,4.2z"/>
+	<path fill="#ED6B21" d="M14.4,9.6L15,8.9l-0.5-1.3l-1-0.1C13.3,7.3,13,7,12.8,6.8l-0.1-1l-1.3-0.5l-0.7,0.6c-0.3,0-0.7,0-1,0
+		L8.9,5.3L7.6,5.8l-0.1,1C7.3,7,7,7.3,6.8,7.5l-1,0.1L5.3,8.9l0.6,0.7c0,0.3,0,0.7,0,1l-0.6,0.7l0.5,1.3l1,0.1
+		C7,13,7.3,13.3,7.5,13.5l0.1,1L8.9,15l0.7-0.6c0.3,0,0.7,0,1,0l0.7,0.6l1.3-0.5l0.1-1c0.3-0.2,0.5-0.5,0.7-0.7l1-0.1l0.5-1.3
+		l-0.6-0.7C14.4,10.3,14.4,10,14.4,9.6z M10.2,13c-1.6,0-2.9-1.3-2.9-2.8c0-1.6,1.3-2.9,2.9-2.9S13,8.6,13,10.2
+		C13,11.7,11.7,13,10.2,13z"/>
+</g>
+</svg>
diff --git a/resources/icons/zoom.png b/resources/icons/zoom.png
deleted file mode 100644
index 908612e39..000000000
Binary files a/resources/icons/zoom.png and /dev/null differ
diff --git a/resources/localization/Slic3rPE.pot b/resources/localization/PrusaSlicer.pot
similarity index 50%
rename from resources/localization/Slic3rPE.pot
rename to resources/localization/PrusaSlicer.pot
index c8ec2f4ac..e453150b8 100644
--- a/resources/localization/Slic3rPE.pot
+++ b/resources/localization/PrusaSlicer.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
+"POT-Creation-Date: 2019-05-13 15:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,485 +17,576 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/slic3r/GUI/AboutDialog.cpp:33
-msgid "About Slic3r"
+#: src/slic3r/GUI/AboutDialog.cpp:35
+#, possible-c-format
+msgid "About %s"
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
+#: src/slic3r/GUI/AboutDialog.cpp:67 src/slic3r/GUI/MainFrame.cpp:59
 msgid "Version"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:43
+#: src/slic3r/GUI/AboutDialog.cpp:92
+msgid "Copyright"
+msgstr ""
+
+#. TRN "Slic3r _is licensed under the_ License"
+#: src/slic3r/GUI/AboutDialog.cpp:94
+msgid "is licensed under the"
+msgstr ""
+
+#: src/slic3r/GUI/AboutDialog.cpp:95
+msgid "GNU Affero General Public License, version 3"
+msgstr ""
+
+#: src/slic3r/GUI/AboutDialog.cpp:96
+msgid ""
+"Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, "
+"Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and "
+"numerous others."
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:84
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:400
+msgid "Copying of the temporary G-code to the output G-code failed"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:85
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:398
+msgid "Running post-processing scripts"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:87
+msgid "G-code file exported to %1%"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:91
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:109
+msgid "Slicing complete"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:105
+msgid "Masked SLA file exported to %1%"
+msgstr ""
+
+#: src/slic3r/GUI/BackgroundSlicingProcess.cpp:409
+msgid "Scheduling upload to `%1%`. See Window -> Print Host Upload Queue"
+msgstr ""
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:60
 msgid "Shape"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
+#: src/slic3r/GUI/BedShapeDialog.cpp:68
 msgid "Rectangular"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
+#: src/slic3r/GUI/BedShapeDialog.cpp:72
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:232 src/slic3r/GUI/Plater.cpp:137
+#: src/slic3r/GUI/Tab.cpp:2263
 msgid "Size"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
+#: src/slic3r/GUI/BedShapeDialog.cpp:73
 msgid "Size in X and Y of the rectangular plate."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
+#: src/slic3r/GUI/BedShapeDialog.cpp:79
 msgid "Origin"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
+#: src/slic3r/GUI/BedShapeDialog.cpp:80
 msgid ""
 "Distance of the 0,0 G-code coordinate from the front left corner of the "
 "rectangle."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
+#: src/slic3r/GUI/BedShapeDialog.cpp:84
 msgid "Circular"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
+#: src/slic3r/GUI/BedShapeDialog.cpp:87 src/slic3r/GUI/ConfigWizard.cpp:118
+#: src/slic3r/GUI/ConfigWizard.cpp:565 src/slic3r/GUI/ConfigWizard.cpp:579
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:229
+#: src/slic3r/GUI/WipeTowerDialog.cpp:84 src/libslic3r/PrintConfig.cpp:60
+#: src/libslic3r/PrintConfig.cpp:67 src/libslic3r/PrintConfig.cpp:76
+#: src/libslic3r/PrintConfig.cpp:211 src/libslic3r/PrintConfig.cpp:286
+#: src/libslic3r/PrintConfig.cpp:294 src/libslic3r/PrintConfig.cpp:344
+#: src/libslic3r/PrintConfig.cpp:354 src/libslic3r/PrintConfig.cpp:474
+#: src/libslic3r/PrintConfig.cpp:485 src/libslic3r/PrintConfig.cpp:503
+#: src/libslic3r/PrintConfig.cpp:681 src/libslic3r/PrintConfig.cpp:1191
+#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1270
+#: src/libslic3r/PrintConfig.cpp:1288 src/libslic3r/PrintConfig.cpp:1340
+#: src/libslic3r/PrintConfig.cpp:1350 src/libslic3r/PrintConfig.cpp:1471
+#: src/libslic3r/PrintConfig.cpp:1479 src/libslic3r/PrintConfig.cpp:1520
+#: src/libslic3r/PrintConfig.cpp:1528 src/libslic3r/PrintConfig.cpp:1538
+#: src/libslic3r/PrintConfig.cpp:1546 src/libslic3r/PrintConfig.cpp:1554
+#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1853
+#: src/libslic3r/PrintConfig.cpp:1923 src/libslic3r/PrintConfig.cpp:1957
+#: src/libslic3r/PrintConfig.cpp:2150 src/libslic3r/PrintConfig.cpp:2157
+#: src/libslic3r/PrintConfig.cpp:2164 src/libslic3r/PrintConfig.cpp:2194
+#: src/libslic3r/PrintConfig.cpp:2204 src/libslic3r/PrintConfig.cpp:2214
+#: src/libslic3r/PrintConfig.cpp:2322 src/libslic3r/PrintConfig.cpp:2397
+#: src/libslic3r/PrintConfig.cpp:2406 src/libslic3r/PrintConfig.cpp:2415
+#: src/libslic3r/PrintConfig.cpp:2425 src/libslic3r/PrintConfig.cpp:2469
+#: src/libslic3r/PrintConfig.cpp:2479 src/libslic3r/PrintConfig.cpp:2498
+#: src/libslic3r/PrintConfig.cpp:2508 src/libslic3r/PrintConfig.cpp:2517
+#: src/libslic3r/PrintConfig.cpp:2535 src/libslic3r/PrintConfig.cpp:2550
+#: src/libslic3r/PrintConfig.cpp:2564 src/libslic3r/PrintConfig.cpp:2577
+#: src/libslic3r/PrintConfig.cpp:2587
 msgid "mm"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
+#: src/slic3r/GUI/BedShapeDialog.cpp:88 src/libslic3r/PrintConfig.cpp:678
 msgid "Diameter"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
+#: src/slic3r/GUI/BedShapeDialog.cpp:89
 msgid ""
 "Diameter of the print bed. It is assumed that origin (0,0) is located in the "
 "center."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
+#: src/slic3r/GUI/BedShapeDialog.cpp:93 src/slic3r/GUI/GUI_Preview.cpp:239
 #: src/libslic3r/GCode/PreviewData.cpp:175
 msgid "Custom"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
+#: src/slic3r/GUI/BedShapeDialog.cpp:97
 msgid "Load shape from STL..."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
+#: src/slic3r/GUI/BedShapeDialog.cpp:143
 msgid "Settings"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
+#: src/slic3r/GUI/BedShapeDialog.cpp:316
 msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
-msgid "Error! "
+#: src/slic3r/GUI/BedShapeDialog.cpp:333 src/slic3r/GUI/GUI_ObjectList.cpp:1438
+msgid "Error!"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
+#: src/slic3r/GUI/BedShapeDialog.cpp:342
 msgid "The selected file contains no geometry."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
+#: src/slic3r/GUI/BedShapeDialog.cpp:346
 msgid ""
 "The selected file contains several disjoint areas. This is not supported."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/BedShapeDialog.hpp:45 src/slic3r/GUI/ConfigWizard.cpp:530
 msgid "Bed Shape"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:54
+#: src/slic3r/GUI/BonjourDialog.cpp:55
 msgid "Network lookup"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:67
+#: src/slic3r/GUI/BonjourDialog.cpp:72
 msgid "Address"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:68
+#: src/slic3r/GUI/BonjourDialog.cpp:73
 msgid "Hostname"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:69
+#: src/slic3r/GUI/BonjourDialog.cpp:74
 msgid "Service name"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:70
+#: src/slic3r/GUI/BonjourDialog.cpp:76
 msgid "OctoPrint version"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:188
+#: src/slic3r/GUI/BonjourDialog.cpp:218
 msgid "Searching for devices"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:195
+#: src/slic3r/GUI/BonjourDialog.cpp:225
 msgid "Finished"
 msgstr ""
 
-#: src/slic3r/GUI/ButtonsDescription.cpp:15
+#: src/slic3r/GUI/ButtonsDescription.cpp:16
 msgid "Buttons And Text Colors Description"
 msgstr ""
 
-#: src/slic3r/GUI/ButtonsDescription.cpp:40
+#: src/slic3r/GUI/ButtonsDescription.cpp:36
 msgid "Value is the same as the system value"
 msgstr ""
 
-#: src/slic3r/GUI/ButtonsDescription.cpp:57
+#: src/slic3r/GUI/ButtonsDescription.cpp:53
 msgid ""
 "Value was changed and is not equal to the system value or the last saved "
 "preset"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
 msgid "Upgrade"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
 msgid "Downgrade"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
 msgid "Before roll back"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:24
 msgid "User"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:27
 msgid "Unknown"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
-msgid "Active: "
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "slic3r version"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
-msgid "print"
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:39
+msgid "Active"
 msgstr ""
 
 #: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
+msgid "slic3r version"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1274
+msgid "print"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:47
 msgid "filaments"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:48 src/slic3r/GUI/Preset.cpp:1278
 msgid "printer"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52 src/slic3r/GUI/Tab.cpp:932
 msgid "vendor"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
 msgid "version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
 msgid "min slic3r version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:55
 msgid "max slic3r version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:58
 msgid "model"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:58
 msgid "variants"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
-msgid "Incompatible with this Slic3r"
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:70
+#, possible-c-format
+msgid "Incompatible with this %s"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:73
 msgid "Activate"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:99
 msgid "Configuration Snapshots"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:92
+#: src/slic3r/GUI/ConfigWizard.cpp:118
 msgid "nozzle"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
+#: src/slic3r/GUI/ConfigWizard.cpp:122
+msgid "Alternate nozzles:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
+#: src/slic3r/GUI/ConfigWizard.cpp:188
+msgid "All standard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
+#: src/slic3r/GUI/ConfigWizard.cpp:189 src/slic3r/GUI/Tab.cpp:3007
+msgid "All"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:190 src/slic3r/GUI/Plater.cpp:433
+#: src/libslic3r/GCode/PreviewData.cpp:162
+msgid "None"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:296
 #, possible-c-format
-msgid "Welcome to the Slic3r %s"
+msgid "Welcome to the %s Configuration Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:298
+#, possible-c-format
+msgid "Welcome to the %s Configuration Wizard"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:300
 msgid "Welcome"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
+#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/GUI_App.cpp:707
 #, possible-c-format
 msgid "Run %s"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:234
+#: src/slic3r/GUI/ConfigWizard.cpp:306
 #, possible-c-format
 msgid ""
-"Hello, welcome to Slic3r Prusa Edition! 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 ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:238
+#: src/slic3r/GUI/ConfigWizard.cpp:311
 msgid ""
 "Remove user profiles - install from scratch (a snapshot will be taken "
 "beforehand)"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
+#: src/slic3r/GUI/ConfigWizard.cpp:342
+#, possible-c-format
+msgid "%s Family"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
+#: src/slic3r/GUI/ConfigWizard.cpp:379
+msgid "Custom Printer Setup"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:379
+msgid "Custom Printer"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:381
+msgid "Define a custom printer profile"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:383
+msgid "Custom profile name:"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:407
 msgid "Automatic updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:407
 msgid "Updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
+#: src/slic3r/GUI/ConfigWizard.cpp:415 src/slic3r/GUI/Preferences.cpp:61
 msgid "Check for application updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
+#: src/slic3r/GUI/ConfigWizard.cpp:419
+#, possible-c-format
 msgid ""
-"If enabled, Slic3r checks for new versions of Slic3r PE online. When a new "
-"version becomes available a notification is displayed at the next "
+"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 ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
+#: src/slic3r/GUI/ConfigWizard.cpp:425 src/slic3r/GUI/Preferences.cpp:69
 msgid "Update built-in Presets automatically"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
+#: src/slic3r/GUI/ConfigWizard.cpp:429
+#, possible-c-format
 msgid ""
-"If enabled, Slic3r downloads updates of built-in system presets in the "
-"background. These updates are downloaded into a separate temporary location. "
+"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 ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:308
+#: src/slic3r/GUI/ConfigWizard.cpp:432
 msgid ""
 "Updates are never applied without user's consent and never overwrite user's "
 "customized settings."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:313
+#: src/slic3r/GUI/ConfigWizard.cpp:437
 msgid ""
 "Additionally a backup snapshot of the whole configuration is created before "
 "an update is applied."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:320
+#: src/slic3r/GUI/ConfigWizard.cpp:444
 msgid "Other Vendors"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:322
-msgid "Pick another vendor supported by Slic3r PE:"
+#: src/slic3r/GUI/ConfigWizard.cpp:446
+#, possible-c-format
+msgid "Pick another vendor supported by %s:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381
+#: src/slic3r/GUI/ConfigWizard.cpp:492
 msgid "Firmware Type"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
+#: src/slic3r/GUI/ConfigWizard.cpp:492 src/slic3r/GUI/Tab.cpp:1926
 msgid "Firmware"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:385
+#: src/slic3r/GUI/ConfigWizard.cpp:496
 msgid "Choose the type of firmware used by your printer."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/ConfigWizard.cpp:530
 msgid "Bed Shape and Size"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:422
+#: src/slic3r/GUI/ConfigWizard.cpp:533
 msgid "Set the shape of your printer's bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:547
 msgid "Filament and Nozzle Diameters"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:547
 msgid "Print Diameters"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:452
+#: src/slic3r/GUI/ConfigWizard.cpp:561
 msgid "Enter the diameter of your printer's hot end nozzle."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:455
+#: src/slic3r/GUI/ConfigWizard.cpp:564
 msgid "Nozzle Diameter:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:465
+#: src/slic3r/GUI/ConfigWizard.cpp:574
 msgid "Enter the diameter of your filament."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:466
+#: src/slic3r/GUI/ConfigWizard.cpp:575
 msgid ""
 "Good precision is required, so use a caliper and do multiple measurements "
 "along the filament, then compute the average."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:469
+#: src/slic3r/GUI/ConfigWizard.cpp:578
 msgid "Filament Diameter:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:596
 msgid "Extruder and Bed Temperatures"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:596
 msgid "Temperatures"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:503
+#: src/slic3r/GUI/ConfigWizard.cpp:612
 msgid "Enter the temperature needed for extruding your filament."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:504
+#: src/slic3r/GUI/ConfigWizard.cpp:613
 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:507
+#: src/slic3r/GUI/ConfigWizard.cpp:616
 msgid "Extrusion Temperature:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
+#: src/slic3r/GUI/ConfigWizard.cpp:617 src/slic3r/GUI/ConfigWizard.cpp:631
 msgid "°C"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:517
+#: src/slic3r/GUI/ConfigWizard.cpp:626
 msgid ""
 "Enter the bed temperature needed for getting your filament to stick to your "
 "heated bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:518
+#: src/slic3r/GUI/ConfigWizard.cpp:627
 msgid ""
 "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
 "no heated bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:521
+#: src/slic3r/GUI/ConfigWizard.cpp:630
 msgid "Bed Temperature:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:833
+#: src/slic3r/GUI/ConfigWizard.cpp:1093
+msgid "Select all standard printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1096
 msgid "< &Back"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:834
+#: src/slic3r/GUI/ConfigWizard.cpp:1097
 msgid "&Next >"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:835
+#: src/slic3r/GUI/ConfigWizard.cpp:1098
 msgid "&Finish"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:906
-msgid "Configuration Wizard"
+#: src/slic3r/GUI/ConfigWizard.cpp:1099 src/slic3r/GUI/FirmwareDialog.cpp:147
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:37
+#: src/slic3r/GUI/ProgressStatusBar.cpp:28
+msgid "Cancel"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:907
-msgid "Configuration &Wizard"
+#: src/slic3r/GUI/ConfigWizard.cpp:1113
+msgid "Prusa FFF Technology Printers"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:909
+#: src/slic3r/GUI/ConfigWizard.cpp:1116
+msgid "Prusa MSLA Technology Printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1185
 msgid "Configuration Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:910
+#: src/slic3r/GUI/ConfigWizard.cpp:1186
 msgid "Configuration &Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:109
+#: src/slic3r/GUI/ConfigWizard.cpp:1188
+msgid "Configuration Wizard"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1189
+msgid "Configuration &Wizard"
+msgstr ""
+
+#: src/slic3r/GUI/Field.cpp:117
 msgid "default value"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:112
+#: src/slic3r/GUI/Field.cpp:120
 msgid "parameter name"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:140
+#: src/slic3r/GUI/Field.cpp:148
 #, possible-c-format
 msgid "%s doesn't support percentage"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
+#: src/slic3r/GUI/Field.cpp:162 src/slic3r/GUI/Field.cpp:185
+msgid "Invalid numeric input."
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:153
+#: src/slic3r/GUI/Field.cpp:167
 msgid "Input value is out of range"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:176
+#: src/slic3r/GUI/Field.cpp:193
 #, possible-c-format
 msgid ""
 "Do you mean %d%% instead of %d %s?\n"
@@ -503,40 +594,35 @@ msgid ""
 "or NO if you are sure that %d %s is a correct value."
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:179
+#: src/slic3r/GUI/Field.cpp:196
 msgid "Parameter validation"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
+#: src/slic3r/GUI/FirmwareDialog.cpp:146
 msgid "Flash!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
+#: src/slic3r/GUI/FirmwareDialog.cpp:148
 msgid "Flashing in progress. Please do not disconnect the printer!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
+#: src/slic3r/GUI/FirmwareDialog.cpp:192
+msgid "Flashing failed"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:273
 msgid "Flashing succeeded!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
+#: src/slic3r/GUI/FirmwareDialog.cpp:274
 msgid "Flashing failed. Please see the avrdude log below."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
+#: src/slic3r/GUI/FirmwareDialog.cpp:275
 msgid "Flashing cancelled."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, possible-c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
+#: src/slic3r/GUI/FirmwareDialog.cpp:313
 #, possible-c-format
 msgid ""
 "This firmware hex file does not match the printer model.\n"
@@ -547,2013 +633,2615 @@ msgid ""
 "Please only continue if you are sure this is the right thing to do."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
+#: src/slic3r/GUI/FirmwareDialog.cpp:400 src/slic3r/GUI/FirmwareDialog.cpp:436
+#, possible-c-format
 msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
+"Multiple %s devices found. Please only connect one at a time for flashing."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
+#: src/slic3r/GUI/FirmwareDialog.cpp:417
+#, 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 ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
+#: src/slic3r/GUI/FirmwareDialog.cpp:530
+#, possible-c-format
+msgid "The %s device could not have been found"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:608
 #, possible-c-format
 msgid "Error accessing port at %s: %s"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
+#: src/slic3r/GUI/FirmwareDialog.cpp:610
+#, possible-c-format
+msgid "Error: %s"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:740
 msgid "Firmware flasher"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
+#: src/slic3r/GUI/FirmwareDialog.cpp:765
 msgid "Firmware image:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
+#: src/slic3r/GUI/FirmwareDialog.cpp:768 src/slic3r/GUI/Tab.cpp:1687
+#: src/slic3r/GUI/Tab.cpp:1743
+msgid "Browse"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:770
 msgid "Serial port:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
+#: src/slic3r/GUI/FirmwareDialog.cpp:772
 msgid "Autodetected"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
+#: src/slic3r/GUI/FirmwareDialog.cpp:773
 msgid "Rescan"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
+#: src/slic3r/GUI/FirmwareDialog.cpp:780
 msgid "Progress:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
+#: src/slic3r/GUI/FirmwareDialog.cpp:783
 msgid "Status:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
+#: src/slic3r/GUI/FirmwareDialog.cpp:784
 msgid "Ready"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
+#: src/slic3r/GUI/FirmwareDialog.cpp:804
+msgid "Advanced: Output log"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
+#: src/slic3r/GUI/FirmwareDialog.cpp:815
+#: src/slic3r/GUI/PrintHostDialogs.cpp:160
+msgid "Close"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:863
 msgid ""
 "Are you sure you want to cancel firmware flashing?\n"
 "This could leave your printer in an unusable state!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
+#: src/slic3r/GUI/FirmwareDialog.cpp:864
 msgid "Confirmation"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
+#: src/slic3r/GUI/FirmwareDialog.cpp:867
 msgid "Cancelling..."
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
-msgid "Detected object outside print volume"
+#: src/slic3r/GUI/GLCanvas3D.cpp:720
+msgid "An object outside the print area was detected"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
-msgid "Detected toolpath outside print volume"
+#: src/slic3r/GUI/GLCanvas3D.cpp:721
+msgid "A toolpath outside the print area was detected"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
+#: src/slic3r/GUI/GLCanvas3D.cpp:722
+msgid "SLA supports outside the print area were detected"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:723
+msgid "Some objects are not visible when editing supports"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
+#: src/slic3r/GUI/GLCanvas3D.cpp:725
+msgid ""
+"An object outside the print area was detected\n"
+"Resolve the current problem to continue slicing"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:1694
+msgid "Last frame"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
+#: src/slic3r/GUI/GLCanvas3D.cpp:1698
+msgid "ms"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3434
+msgid "Add..."
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3444 src/slic3r/GUI/GUI_ObjectList.cpp:1267
+#: src/slic3r/GUI/Plater.cpp:2933 src/slic3r/GUI/Plater.cpp:2951
+#: src/slic3r/GUI/Tab.cpp:2957
+msgid "Delete"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3455 src/slic3r/GUI/Plater.cpp:3341
+msgid "Delete all"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3466 src/slic3r/GUI/KBShortcutsDialog.cpp:135
+msgid "Arrange"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3480
+msgid "Copy"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3491
+msgid "Paste"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3505
+msgid "Add instance"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
+#: src/slic3r/GUI/GLCanvas3D.cpp:3517
+msgid "Remove instance"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
+#: src/slic3r/GUI/GLCanvas3D.cpp:3532
+msgid "Split to objects"
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:3544 src/slic3r/GUI/GUI_ObjectList.cpp:1122
+msgid "Split to parts"
+msgstr ""
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:3559
+msgid "Layers editing"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:35
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:195
 msgid "Rotate lower part upwards"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:36
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:198
 msgid "Perform cut"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2276
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:43
 msgid "Cut object:"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:88
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:188 src/libslic3r/PrintConfig.cpp:3039
 msgid "Cut"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2466
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:193
 msgid "Keep upper part"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2467
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:194
 msgid "Keep lower part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
+#: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:32
+msgid "Place on face"
 msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:51
+msgid "Move"
 msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:177
+msgid "Position (mm)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:177
+msgid "Displacement (mm)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:458
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:305
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:324
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:342
+#: src/libslic3r/PrintConfig.cpp:3088
+msgid "Rotate"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:491
+msgid "Rotation (deg)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:51
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:231
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:325
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:343
+#: src/libslic3r/PrintConfig.cpp:3103
+msgid "Scale"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:276
+msgid "Scale (%)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:840
+msgid "Head diameter"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:853
+msgid "Lock supports under new islands"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:857
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1239
+msgid "Remove selected points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:861
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:914
+msgid "Remove all points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:866
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1242
+msgid "Apply changes"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:871
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1243
+msgid "Discard changes"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:879
+msgid "Minimal points distance"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:890
+#: src/libslic3r/PrintConfig.cpp:2524
+msgid "Support points density"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:904
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1245
+msgid "Auto-generate points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:910
+msgid "Manual editing"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:928
+msgid "Clipping of view"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:930
+msgid "Reset direction"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:997
+msgid "SLA Support Points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1024
+msgid "Do you want to save your manually edited support points?"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1025
+msgid "Save changes?"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1168
+msgid ""
+"Autogeneration will erase all manually edited points.\n"
+"\n"
+"Are you sure you want to do it?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1170 src/slic3r/GUI/GUI.cpp:283
+#: src/slic3r/GUI/WipeTowerDialog.cpp:44 src/slic3r/GUI/WipeTowerDialog.cpp:328
 msgid "Warning"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:377
-msgid "Choose one file (3MF):"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1202
+msgid "SLA gizmo keyboard shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:389
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1213
+msgid "Note: some shortcuts work in (non)editing mode only."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:451
-msgid "Array of language names and identifiers should have the same size."
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1231
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1234
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1235
+msgid "Left click"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Select the language"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1231
+msgid "Add point"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Language"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1232
+msgid "Right click"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
-msgid "Default"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1232
+msgid "Remove point"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "&Configuration Snapshots"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1233
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1236
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1237
+msgid "Drag"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "Inspect / activate configuration snapshots"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1233
+msgid "Move point"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Take Configuration &Snapshot"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1234
+msgid "Add point to selection"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Capture a configuration snapshot"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1235
+msgid "Remove point from selection"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "&Preferences"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1236
+msgid "Select by rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "Application preferences"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1237
+msgid "Deselect by rectangle"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1238
+msgid "Select all points"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple View Mode"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1240
+msgid "Mouse wheel"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
-msgid "Advanced"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1240
+msgid "Move clipping plane"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:617
-msgid "Advanced View Mode"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1241
+msgid "Reset clipping plane"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1244
+msgid "Switch to editing mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert View Mode"
+#: src/slic3r/GUI/GUI.cpp:142 src/slic3r/GUI/Tab.cpp:2816
+msgid "It's impossible to print multi-part object(s) with SLA technology."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Mode"
+#: src/slic3r/GUI/GUI.cpp:143
+msgid "Please check and fix your object list."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Slic3r View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:622
-msgid "Change Application &Language"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Flash printer &firmware"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Taking configuration snapshot"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Snapshot name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
+#: src/slic3r/GUI/GUI.cpp:144 src/slic3r/GUI/Tab.cpp:2818
 msgid "Attention!"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:691
+#: src/slic3r/GUI/GUI.cpp:277
+msgid "Notice"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:393
+msgid "Changing of an application language"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:401 src/slic3r/GUI/GUI_App.cpp:410
+msgid "Recreating"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:414
+msgid "Loading of current presets"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:422
+msgid "Loading of a mode view"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:504
+msgid "Choose one file (3MF):"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:516
+msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:558
+msgid "Select the language"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:559
+msgid "Language"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:710
+msgid "&Configuration Snapshots"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:710
+msgid "Inspect / activate configuration snapshots"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:711
+msgid "Take Configuration &Snapshot"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:711
+msgid "Capture a configuration snapshot"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:714
+msgid "&Preferences"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:720
+msgid "Application preferences"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:723 src/slic3r/GUI/wxExtensions.cpp:2509
+msgid "Simple"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:723
+msgid "Simple View Mode"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:724 src/slic3r/GUI/GUI_ObjectList.cpp:85
+#: src/slic3r/GUI/GUI_ObjectList.cpp:539 src/slic3r/GUI/Tab.cpp:1030
+#: src/slic3r/GUI/Tab.cpp:1045 src/slic3r/GUI/Tab.cpp:1143
+#: src/slic3r/GUI/Tab.cpp:1146 src/slic3r/GUI/Tab.cpp:1520
+#: src/slic3r/GUI/Tab.cpp:1946 src/slic3r/GUI/Tab.cpp:3461
+#: src/slic3r/GUI/wxExtensions.cpp:2510 src/libslic3r/PrintConfig.cpp:73
+#: src/libslic3r/PrintConfig.cpp:188 src/libslic3r/PrintConfig.cpp:351
+#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:2200
+msgid "Advanced"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:724
+msgid "Advanced View Mode"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:725 src/slic3r/GUI/wxExtensions.cpp:2511
+msgid "Expert"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:725
+msgid "Expert View Mode"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:730
+msgid "Mode"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:730
+#, possible-c-format
+msgid "%s View Mode"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:732
+msgid "Change Application &Language"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:734
+msgid "Flash printer &firmware"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:734
+msgid "Upload a firmware image into an Arduino based printer"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:746
+msgid "Taking configuration snapshot"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:746
+msgid "Snapshot name"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:789
+msgid ""
+"Switching the language will trigger application restart.\n"
+"You will lose content of the plater."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:791
+msgid "Do you want to proceed?"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:792
+msgid "Language selection"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:811
 msgid "&Configuration"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid "You have unsaved changes "
+#: src/slic3r/GUI/GUI_App.cpp:831
+msgid "The presets on the following tabs were modified"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid ". Discard changes and continue anyway?"
+#: src/slic3r/GUI/GUI_App.cpp:831 src/slic3r/GUI/Tab.cpp:2804
+msgid "Discard changes and continue anyway?"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:712
+#: src/slic3r/GUI/GUI_App.cpp:832
 msgid "Unsaved Presets"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:28 src/slic3r/GUI/GUI_ObjectList.cpp:77
+#: src/slic3r/GUI/GUI_ObjectList.cpp:531 src/libslic3r/PrintConfig.cpp:57
+#: src/libslic3r/PrintConfig.cpp:151 src/libslic3r/PrintConfig.cpp:382
+#: src/libslic3r/PrintConfig.cpp:439 src/libslic3r/PrintConfig.cpp:447
+#: src/libslic3r/PrintConfig.cpp:843 src/libslic3r/PrintConfig.cpp:1027
+#: src/libslic3r/PrintConfig.cpp:1330 src/libslic3r/PrintConfig.cpp:1396
+#: src/libslic3r/PrintConfig.cpp:1577 src/libslic3r/PrintConfig.cpp:2012
+#: src/libslic3r/PrintConfig.cpp:2069
 msgid "Layers and Perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
+#: src/slic3r/GUI/GUI_ObjectList.cpp:29 src/slic3r/GUI/GUI_ObjectList.cpp:78
+#: src/slic3r/GUI/GUI_ObjectList.cpp:532 src/slic3r/GUI/Plater.cpp:447
+#: src/slic3r/GUI/Tab.cpp:1034 src/slic3r/GUI/Tab.cpp:1035
+#: src/slic3r/GUI/Tab.cpp:1364 src/libslic3r/PrintConfig.cpp:168
+#: src/libslic3r/PrintConfig.cpp:390 src/libslic3r/PrintConfig.cpp:730
+#: src/libslic3r/PrintConfig.cpp:744 src/libslic3r/PrintConfig.cpp:781
+#: src/libslic3r/PrintConfig.cpp:934 src/libslic3r/PrintConfig.cpp:944
+#: src/libslic3r/PrintConfig.cpp:962 src/libslic3r/PrintConfig.cpp:980
+#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:1684
+#: src/libslic3r/PrintConfig.cpp:1701
 msgid "Infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
+#: src/slic3r/GUI/GUI_ObjectList.cpp:30 src/slic3r/GUI/GUI_ObjectList.cpp:79
+#: src/slic3r/GUI/GUI_ObjectList.cpp:533 src/slic3r/GUI/GUI_Preview.cpp:236
+#: src/slic3r/GUI/Tab.cpp:1063 src/slic3r/GUI/Tab.cpp:1064
+#: src/libslic3r/PrintConfig.cpp:335 src/libslic3r/PrintConfig.cpp:1457
+#: src/libslic3r/PrintConfig.cpp:1805 src/libslic3r/PrintConfig.cpp:1811
+#: src/libslic3r/PrintConfig.cpp:1819 src/libslic3r/PrintConfig.cpp:1831
+#: src/libslic3r/PrintConfig.cpp:1841 src/libslic3r/PrintConfig.cpp:1849
+#: src/libslic3r/PrintConfig.cpp:1864 src/libslic3r/PrintConfig.cpp:1885
+#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:1912
+#: src/libslic3r/PrintConfig.cpp:1921 src/libslic3r/PrintConfig.cpp:1930
+#: src/libslic3r/PrintConfig.cpp:1941 src/libslic3r/PrintConfig.cpp:1955
+#: src/libslic3r/PrintConfig.cpp:1963 src/libslic3r/PrintConfig.cpp:1964
+#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:1981
+#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/GCode/PreviewData.cpp:172
 msgid "Support material"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
+#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_ObjectList.cpp:81
+#: src/slic3r/GUI/GUI_ObjectList.cpp:535 src/slic3r/GUI/Tab.cpp:1123
+#: src/slic3r/GUI/Tab.cpp:1850 src/libslic3r/PrintConfig.cpp:457
+#: src/libslic3r/PrintConfig.cpp:955 src/libslic3r/PrintConfig.cpp:1365
+#: src/libslic3r/PrintConfig.cpp:1693 src/libslic3r/PrintConfig.cpp:1877
+#: src/libslic3r/PrintConfig.cpp:1903 src/libslic3r/PrintConfig.cpp:2176
+#: src/libslic3r/PrintConfig.cpp:2184
 msgid "Extruders"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
+#: src/slic3r/GUI/GUI_ObjectList.cpp:39
+msgid "Pad and Support"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:45
+msgid "Add part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:46
+msgid "Add modifier"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:47
+msgid "Add support enforcer"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:48
+msgid "Add support blocker"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:80 src/slic3r/GUI/GUI_ObjectList.cpp:534
+#: src/slic3r/GUI/GUI_Preview.cpp:215 src/slic3r/GUI/Tab.cpp:1088
+#: src/libslic3r/PrintConfig.cpp:200 src/libslic3r/PrintConfig.cpp:427
+#: src/libslic3r/PrintConfig.cpp:872 src/libslic3r/PrintConfig.cpp:1000
+#: src/libslic3r/PrintConfig.cpp:1386 src/libslic3r/PrintConfig.cpp:1623
+#: src/libslic3r/PrintConfig.cpp:1672 src/libslic3r/PrintConfig.cpp:1723
+#: src/libslic3r/PrintConfig.cpp:2054
+msgid "Speed"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:82 src/slic3r/GUI/GUI_ObjectList.cpp:536
+#: src/libslic3r/PrintConfig.cpp:417 src/libslic3r/PrintConfig.cpp:524
+#: src/libslic3r/PrintConfig.cpp:831 src/libslic3r/PrintConfig.cpp:963
+#: src/libslic3r/PrintConfig.cpp:1374 src/libslic3r/PrintConfig.cpp:1713
+#: src/libslic3r/PrintConfig.cpp:1886 src/libslic3r/PrintConfig.cpp:2043
 msgid "Extrusion Width"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
+#: src/slic3r/GUI/GUI_ObjectList.cpp:87 src/slic3r/GUI/GUI_ObjectList.cpp:541
+#: src/slic3r/GUI/Plater.cpp:429 src/slic3r/GUI/Tab.cpp:3423
+#: src/slic3r/GUI/Tab.cpp:3424 src/libslic3r/PrintConfig.cpp:2388
+#: src/libslic3r/PrintConfig.cpp:2395 src/libslic3r/PrintConfig.cpp:2404
+#: src/libslic3r/PrintConfig.cpp:2413 src/libslic3r/PrintConfig.cpp:2423
+#: src/libslic3r/PrintConfig.cpp:2449 src/libslic3r/PrintConfig.cpp:2456
+#: src/libslic3r/PrintConfig.cpp:2467 src/libslic3r/PrintConfig.cpp:2477
+#: src/libslic3r/PrintConfig.cpp:2486 src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2505 src/libslic3r/PrintConfig.cpp:2515
+#: src/libslic3r/PrintConfig.cpp:2525 src/libslic3r/PrintConfig.cpp:2533
 msgid "Supports"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
+#: src/slic3r/GUI/GUI_ObjectList.cpp:88 src/slic3r/GUI/GUI_ObjectList.cpp:542
+#: src/slic3r/GUI/Tab.cpp:3451 src/slic3r/GUI/Tab.cpp:3452
+#: src/libslic3r/PrintConfig.cpp:2541 src/libslic3r/PrintConfig.cpp:2548
+#: src/libslic3r/PrintConfig.cpp:2562 src/libslic3r/PrintConfig.cpp:2572
+#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
 msgid "Pad"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
+#: src/slic3r/GUI/GUI_ObjectList.cpp:203
 msgid "Name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
-msgid "Right button click the icon to change the object settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
+#: src/slic3r/GUI/GUI_ObjectList.cpp:257
 #, possible-c-format
 msgid "Auto-repaired (%d errors):\n"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
+#: src/slic3r/GUI/GUI_ObjectList.cpp:264
 msgid "degenerate facets"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
+#: src/slic3r/GUI/GUI_ObjectList.cpp:265
 msgid "edges fixed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
+#: src/slic3r/GUI/GUI_ObjectList.cpp:266
 msgid "facets removed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
+#: src/slic3r/GUI/GUI_ObjectList.cpp:267
 msgid "facets added"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:268
 msgid "facets reversed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:269
 msgid "backwards edges"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
+#: src/slic3r/GUI/GUI_ObjectList.cpp:277
 msgid "Right button click the icon to fix STL through Netfabb"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
+#: src/slic3r/GUI/GUI_ObjectList.cpp:306
+msgid "Right button click the icon to change the object settings"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:357 src/slic3r/GUI/GUI_ObjectList.cpp:378
+#: src/slic3r/GUI/GUI_ObjectList.cpp:390 src/slic3r/GUI/GUI_ObjectList.cpp:2846
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2856
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2888 src/slic3r/GUI/wxExtensions.cpp:499
+#: src/slic3r/GUI/wxExtensions.cpp:524
+msgid "default"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:362 src/slic3r/GUI/Tab.cpp:1484
+#: src/libslic3r/PrintConfig.cpp:456
 msgid "Extruder"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
+#: src/slic3r/GUI/GUI_ObjectList.cpp:876 src/slic3r/GUI/GUI_ObjectList.cpp:1151
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1157
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1384
+#, possible-c-format
+msgid "Quick Add Settings (%s)"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:939
 msgid "Select showing settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1072
 msgid "Load"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1077
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1102
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1105
 msgid "Box"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1077
 msgid "Cylinder"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1077
 msgid "Sphere"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1077
 msgid "Slab"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
-msgid "Split to parts"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1130
 msgid "Add settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1197
 msgid "Change type"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1204
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1338
+msgid "Set as a Separated Object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1210
+msgid "Rename"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1220
+msgid "Fix through the Netfabb"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1229 src/slic3r/GUI/Plater.cpp:2969
+msgid "Export as STL"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1236
+msgid "Change extruder"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1255 src/libslic3r/PrintConfig.cpp:300
+msgid "Default"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1261
+msgid "Select new extruder for the object/part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1338
+msgid "Set as a Separated Objects"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1551
+msgid "Generic"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1694
 msgid "You can't delete the last solid part from object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1711
 msgid "You can't delete the last intance from object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1737 src/slic3r/GUI/Plater.cpp:2306
 msgid ""
 "The selected object couldn't be split because it contains only one part."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1846
 msgid "Group manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1858
 msgid "Object manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1868
 msgid "Object Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1872
 msgid "Part Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1881
 msgid "Part manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1887
 msgid "Instance manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2412
+msgid "Object or Instance"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2412
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2543
+msgid "Part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2414
+msgid "Unsupported selection"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2415
+#, possible-c-format
+msgid "You started your selection with %s Item."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2416
+#, possible-c-format
+msgid "In this mode you can select only other %s Items%s"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2419
+msgid "of a current Object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2424
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2497 src/slic3r/GUI/Plater.cpp:118
+msgid "Info"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
 msgid "You can't change a type of the last solid part of the object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2543
+msgid "Modifier"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2543
+msgid "Support Enforcer"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2543
+msgid "Support Blocker"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2545
+msgid "Type:"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2545
 msgid "Select type of part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2709
+msgid "Enter new name"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2709
+msgid "Renaming"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2725
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2819 src/slic3r/GUI/Tab.cpp:3304
+#: src/slic3r/GUI/Tab.cpp:3308
 msgid "The supplied name is not valid;"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2726
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2820 src/slic3r/GUI/Tab.cpp:3305
 msgid "the following characters are not allowed:"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2836
+msgid "Set extruder for selected items"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2837
+msgid "Select extruder number for selected objects and/or parts"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2850
+msgid "Select extruder number:"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2851
+msgid "This extruder will be set for selected items"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:40
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:83
+msgid "World coordinates"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:41
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:84
+msgid "Local coordinates"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:60
+msgid "Select coordinate space, in which the transformation will be performed."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:102
 msgid "Object Manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:153
 msgid "Object name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:229
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:282
 msgid "Position"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:230
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:283
 msgid "Rotation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:284
 msgid "Scale factors"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:341
 msgid "Translate"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:235
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:640
+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 ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:643
+msgid ""
+"This operation is irreversible.\n"
+"Do you want to proceed?"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:58
+msgid "Additional Settings"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:83
+msgid "Remove parameter"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Preview.cpp:209
 msgid "View"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:212 src/slic3r/GUI/GUI_Preview.cpp:537
 #: src/libslic3r/GCode/PreviewData.cpp:394
 msgid "Feature type"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
+#: src/slic3r/GUI/GUI_Preview.cpp:213 src/libslic3r/PrintConfig.cpp:469
 msgid "Height"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
+#: src/slic3r/GUI/GUI_Preview.cpp:214 src/libslic3r/PrintConfig.cpp:2162
 msgid "Width"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:242
+#: src/slic3r/GUI/GUI_Preview.cpp:216
 msgid "Volumetric flow rate"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
+#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/GUI_Preview.cpp:315
+#: src/slic3r/GUI/GUI_Preview.cpp:481 src/slic3r/GUI/GUI_Preview.cpp:537
+#: src/slic3r/GUI/GUI_Preview.cpp:713 src/libslic3r/GCode/PreviewData.cpp:404
 msgid "Tool"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/GUI_Preview.cpp:535
 #: src/libslic3r/GCode/PreviewData.cpp:406
 msgid "Color Print"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:247
+#: src/slic3r/GUI/GUI_Preview.cpp:221
 msgid "Show"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/GUI_Preview.cpp:225
 msgid "Feature types"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
+#: src/slic3r/GUI/GUI_Preview.cpp:227 src/libslic3r/GCode/PreviewData.cpp:163
 msgid "Perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
+#: src/slic3r/GUI/GUI_Preview.cpp:228 src/libslic3r/GCode/PreviewData.cpp:164
 msgid "External perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
+#: src/slic3r/GUI/GUI_Preview.cpp:229 src/libslic3r/GCode/PreviewData.cpp:165
 msgid "Overhang perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
+#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/GCode/PreviewData.cpp:166
 msgid "Internal infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
+#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/PrintConfig.cpp:1712
+#: src/libslic3r/PrintConfig.cpp:1722 src/libslic3r/GCode/PreviewData.cpp:167
 msgid "Solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
+#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/PrintConfig.cpp:2042
+#: src/libslic3r/PrintConfig.cpp:2053 src/libslic3r/GCode/PreviewData.cpp:168
 msgid "Top solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
+#: src/slic3r/GUI/GUI_Preview.cpp:233 src/libslic3r/GCode/PreviewData.cpp:169
 msgid "Bridge infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
+#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/PrintConfig.cpp:871
 #: src/libslic3r/GCode/PreviewData.cpp:170
 msgid "Gap fill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
+#: src/slic3r/GUI/GUI_Preview.cpp:235 src/slic3r/GUI/Tab.cpp:1054
 #: src/libslic3r/GCode/PreviewData.cpp:171
 msgid "Skirt"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
+#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/PrintConfig.cpp:1929
 #: src/libslic3r/GCode/PreviewData.cpp:173
 msgid "Support material interface"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
+#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/Tab.cpp:1134
 #: src/libslic3r/GCode/PreviewData.cpp:174
 msgid "Wipe tower"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
+#: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/PrintConfig.cpp:2076
 msgid "Travel"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:270
+#: src/slic3r/GUI/GUI_Preview.cpp:244
 msgid "Retractions"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:271
+#: src/slic3r/GUI/GUI_Preview.cpp:245
 msgid "Unretractions"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:272
+#: src/slic3r/GUI/GUI_Preview.cpp:246
 msgid "Shells"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
-msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
-msgid "Export G-code"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:13 src/slic3r/GUI/MainFrame.cpp:571
+msgid "Keyboard Shortcuts"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:105
-msgid "Save project (3MF)"
+msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
+msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "(Re)slice"
+msgid "Load Config from .ini/amf/3mf/gcode"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Quick slice"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:108 src/slic3r/GUI/Plater.cpp:740
+#: src/slic3r/GUI/Plater.cpp:3864 src/libslic3r/PrintConfig.cpp:2990
+msgid "Export G-code"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat last quick slice"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
+msgid "Save project (3MF)"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:110
-msgid "Select Plater Tab"
+msgid "Load Config from .ini/amf/3mf/gcode and merge"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Quick slice and Save as"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Select Print Settings Tab"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
-msgid "Select Filament Settings Tab"
+msgid "(Re)slice"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:114
-msgid "Select Printer Settings Tab"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
-msgid "Switch to 3D"
+msgid "Select Plater Tab"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:116
-msgid "Switch to Preview"
+msgid "Select Print Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:117
+msgid "Select Filament Settings Tab"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
-msgid "Print host upload queue"
+msgid "Select Printer Settings Tab"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:119
-msgid "Camera view "
+msgid "Switch to 3D"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:120
-msgid "Add Instance to selected object "
+msgid "Switch to Preview"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
-msgid "Remove Instance from selected object"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:121 src/slic3r/GUI/Preferences.cpp:10
+msgid "Preferences"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:122
-msgid "Show keyboard shortcuts list"
+#: src/slic3r/GUI/PrintHostDialogs.cpp:135
+msgid "Print host upload queue"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
+msgid "Camera view"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:124
-msgid "Select multiple object/Move multiple object"
+msgid "Add Instance of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
-msgid "Arrange"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:125
+msgid "Remove Instance of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
-msgid "Select All objects"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Show keyboard shortcuts list"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
-msgid "Delete selected"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
+msgid "Press to select multiple object or move multiple object with mouse"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
-msgid "Delete All"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
+msgid "Main Shortcuts"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:136
-msgid "Gizmo move"
+msgid "Select All objects"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:137
-msgid "Gizmo scale"
+msgid "Delete selected"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:138
-msgid "Gizmo rotate"
+msgid "Delete All"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Gizmo cut"
+msgid "Copy to clipboard"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Gizmo Place face on bed"
+msgid "Paste from clipboard"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Gizmo SLA support points"
+msgid "Gizmo move"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Zoom to Bed"
+msgid "Gizmo scale"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Zoom to all objects in scene, if none selected"
+msgid "Gizmo rotate"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Zoom to selected object"
+msgid "Gizmo cut"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Zoom in"
+msgid "Gizmo Place face on bed"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Zoom out"
+msgid "Gizmo SLA support points"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Unselect gizmo, keep object selection"
+#, possible-c-format
+msgid ""
+"Press to snap by 5% in Gizmo scale\n"
+"or by 1mm in Gizmo move"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:148
+msgid ""
+"Press to scale or rotate selected objects\n"
+"around their own center"
 msgstr ""
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:149
+msgid "Zoom to Bed"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:150
+msgid "Zoom to all objects in scene, if none selected"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:151
+msgid "Zoom to selected object"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:152
+msgid "Zoom in"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:153
+msgid "Zoom out"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:154
+msgid "Unselect gizmo, keep object selection"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
 msgid "Plater Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
 msgid "Arrow Up"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:173
 msgid "Upper Layer"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
 msgid "Arrow Down"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:174
 msgid "Lower Layer"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
 msgid "Preview Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:53
-msgid ""
-" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+msgid "Move current slider thumb Up"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:130
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
+msgid "Move current slider thumb Down"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
+msgid "Arrow Left"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
+msgid "Set upper thumb to current slider thumb"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
+msgid "Arrow Right"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
+msgid "Set lower thumb to current slider thumb"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:186
+msgid "Add color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:187
+msgid "Delete color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:189
+msgid "Layers Slider Shortcuts"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:36
+msgid "based on Slic3r"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:61
+msgid ""
+" - Remember to check for updates at http://github.com/prusa3d/PrusaSlicer/"
+"releases"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:163
 msgid "Plater"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
+#: src/slic3r/GUI/MainFrame.cpp:344
+msgid "&Open Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:236
+#: src/slic3r/GUI/MainFrame.cpp:344
 msgid "Open a project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
+#: src/slic3r/GUI/MainFrame.cpp:346
+msgid "&Save Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:238
+#: src/slic3r/GUI/MainFrame.cpp:346
 msgid "Save current project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
+#: src/slic3r/GUI/MainFrame.cpp:348
+msgid "Save Project &as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:240
+#: src/slic3r/GUI/MainFrame.cpp:348
 msgid "Save current project file as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:354
 msgid "Import STL/OBJ/AM&F/3MF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:354
 msgid "Load a model"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:357
 msgid "Import &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:357
 msgid "Load exported configuration file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:359
 msgid "Import Config from &project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:359
 msgid "Load configuration from project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:362
 msgid "Import Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:362
 msgid "Load presets from a bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:256
+#: src/slic3r/GUI/MainFrame.cpp:364
 msgid "&Import"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:367 src/slic3r/GUI/MainFrame.cpp:607
 msgid "Export &G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:367
 msgid "Export current plate as G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:371
 msgid "Export plate as &STL"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:371
 msgid "Export current plate as STL"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:373
+msgid "Export plate as STL including supports"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:373
+msgid "Export current plate as STL including supports"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:375
 msgid "Export plate as &AMF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:375
 msgid "Export current plate as AMF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:378
 msgid "Export &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:378
 msgid "Export current configuration to file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:380
 msgid "Export Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:380
 msgid "Export all presets to file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:271
+#: src/slic3r/GUI/MainFrame.cpp:382
 msgid "&Export"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:388
 msgid "Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:388
 msgid "Slice a file into a G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:394
 msgid "Quick Slice and Save As"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:394
 msgid "Slice a file into a G-code, save as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:289
+#: src/slic3r/GUI/MainFrame.cpp:400
 msgid "Repeat Last Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:400
+msgid "Repeat last quick slice"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:408
 msgid "(Re)Slice &Now"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:408
 msgid "Start new slicing process"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:411
 msgid "&Repair STL file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:411
 msgid "Automatically repair an STL file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:303
+#: src/slic3r/GUI/MainFrame.cpp:414
 msgid "&Quit"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "Quit Slic3r"
+#: src/slic3r/GUI/MainFrame.cpp:414
+#, possible-c-format
+msgid "Quit %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:449
 msgid "&Select all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:449
 msgid "Selects all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:452
 msgid "&Delete selected"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:452
 msgid "Deletes the current selection"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:454
 msgid "Delete &all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:454
 msgid "Deletes all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:459
+msgid "&Copy"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:459
+msgid "Copy selection to clipboard"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid "&Paste"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:461
+msgid "Paste clipboard"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:476
 msgid "&Plater Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:476
 msgid "Show the plater"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:483
 msgid "P&rint Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:483
 msgid "Show the print settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:485 src/slic3r/GUI/MainFrame.cpp:609
 msgid "&Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:485
 msgid "Show the filament settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:488
 msgid "Print&er Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:488
 msgid "Show the printer settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:492
 msgid "3&D"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:492
 msgid "Show the 3D editing view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:494
 msgid "Pre&view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:494
 msgid "Show the 3D slices preview"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:515
 msgid "Print &Host Upload Queue"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:515
 msgid "Display the Print Host Upload Queue window"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
+#: src/slic3r/GUI/MainFrame.cpp:524
+msgid "Iso"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:388
+#: src/slic3r/GUI/MainFrame.cpp:524
 msgid "Iso View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
+#. TRN To be shown in the main menu View->Top
+#: src/slic3r/GUI/MainFrame.cpp:527
+msgid "Top"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:390
+#. TRN To be shown in Print Settings "Top solid layers"
+#: src/libslic3r/PrintConfig.cpp:2068
+msgctxt "Layers"
+msgid "Top"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:527
 msgid "Top View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
+#. TRN To be shown in the main menu View->Bottom
+#: src/slic3r/GUI/MainFrame.cpp:529
+msgid "Bottom"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:391
+#. TRN To be shown in Print Settings "Bottom solid layers"
+#: src/libslic3r/PrintConfig.cpp:150
+msgctxt "Layers"
+msgid "Bottom"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:529
 msgid "Bottom View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
+#: src/slic3r/GUI/MainFrame.cpp:530
+msgid "Front"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:392
+#: src/slic3r/GUI/MainFrame.cpp:530
 msgid "Front View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
+#: src/slic3r/GUI/MainFrame.cpp:531 src/libslic3r/PrintConfig.cpp:1587
+msgid "Rear"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:393
+#: src/slic3r/GUI/MainFrame.cpp:531
 msgid "Rear View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
+#: src/slic3r/GUI/MainFrame.cpp:532
+msgid "Left"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:394
+#: src/slic3r/GUI/MainFrame.cpp:532
 msgid "Left View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
+#: src/slic3r/GUI/MainFrame.cpp:533
+msgid "Right"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:395
+#: src/slic3r/GUI/MainFrame.cpp:533
 msgid "Right View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:409
+#: src/slic3r/GUI/MainFrame.cpp:547
 msgid "Prusa 3D &Drivers"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:409
+#: src/slic3r/GUI/MainFrame.cpp:547
 msgid "Open the Prusa3D drivers download page in your browser"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
+#: src/slic3r/GUI/MainFrame.cpp:549
+msgid "Software &Releases"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
+#: src/slic3r/GUI/MainFrame.cpp:549
+msgid "Open the software releases page in your browser"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
+#: src/slic3r/GUI/MainFrame.cpp:555
+#, possible-c-format
+msgid "%s &Website"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
+#: src/slic3r/GUI/MainFrame.cpp:556
+#, possible-c-format
+msgid "Open the %s website in your browser"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:422
+#: src/slic3r/GUI/MainFrame.cpp:562
 msgid "System &Info"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:422
+#: src/slic3r/GUI/MainFrame.cpp:562
 msgid "Show system information"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:424
+#: src/slic3r/GUI/MainFrame.cpp:564
 msgid "Show &Configuration Folder"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:424
+#: src/slic3r/GUI/MainFrame.cpp:564
 msgid "Show user configuration folder (datadir)"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:426
+#: src/slic3r/GUI/MainFrame.cpp:566
 msgid "Report an I&ssue"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
+#: src/slic3r/GUI/MainFrame.cpp:566
+#, possible-c-format
+msgid "Report an issue on %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
+#: src/slic3r/GUI/MainFrame.cpp:568
+#, possible-c-format
+msgid "&About %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:428
+#: src/slic3r/GUI/MainFrame.cpp:568
 msgid "Show about dialog"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
+#: src/slic3r/GUI/MainFrame.cpp:571
 msgid "Show the list of the keyboard shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:439
+#: src/slic3r/GUI/MainFrame.cpp:579
 msgid "&File"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:440
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid "&Edit"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:441
+#: src/slic3r/GUI/MainFrame.cpp:581
 msgid "&Window"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:442
+#: src/slic3r/GUI/MainFrame.cpp:582
 msgid "&View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:445
+#: src/slic3r/GUI/MainFrame.cpp:585
 msgid "&Help"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:472
+#: src/slic3r/GUI/MainFrame.cpp:607 src/slic3r/GUI/Plater.cpp:3864
+msgid "Export"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:609
+msgid "Mate&rial Settings Tab"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:630
 msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:486
+#: src/slic3r/GUI/MainFrame.cpp:644
 msgid "No previously sliced file."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
+#: src/slic3r/GUI/MainFrame.cpp:645 src/slic3r/GUI/PrintHostDialogs.cpp:230
 msgid "Error"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:650
 msgid "Previously sliced file ("
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:650
 msgid ") not found."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:493
+#: src/slic3r/GUI/MainFrame.cpp:651
 msgid "File Not Found"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
-msgid "Save "
+#: src/slic3r/GUI/MainFrame.cpp:686
+#, possible-c-format
+msgid "Save %s file as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:686
 msgid "SVG"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:686
 msgid "G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid " file as:"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:548
+#: src/slic3r/GUI/MainFrame.cpp:701
 msgid "Save zip file as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:560
+#: src/slic3r/GUI/MainFrame.cpp:713 src/slic3r/GUI/Plater.cpp:2439
+#: src/slic3r/GUI/Plater.cpp:3658 src/slic3r/GUI/Tab.cpp:1163
+#: src/slic3r/GUI/Tab.cpp:3462
 msgid "Slicing"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Processing "
+#. TRN "Processing input_file_basename"
+#: src/slic3r/GUI/MainFrame.cpp:715
+#, possible-c-format
+msgid "Processing %s"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:583
+#: src/slic3r/GUI/MainFrame.cpp:738
 msgid " was successfully sliced."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:585
+#: src/slic3r/GUI/MainFrame.cpp:740
 msgid "Slicing Done!"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:600
+#: src/slic3r/GUI/MainFrame.cpp:755
 msgid "Select the STL file to repair:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:768
 msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:783
 msgid "Your file was repaired."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:783 src/libslic3r/PrintConfig.cpp:3084
 msgid "Repair"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:643
+#: src/slic3r/GUI/MainFrame.cpp:797
 msgid "Save configuration as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
+#: src/slic3r/GUI/MainFrame.cpp:817 src/slic3r/GUI/MainFrame.cpp:881
 msgid "Select configuration to load:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:700
+#: src/slic3r/GUI/MainFrame.cpp:854
 msgid "Save presets bundle as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:751
+#: src/slic3r/GUI/MainFrame.cpp:905
 #, possible-c-format
 msgid "%d presets successfully imported."
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r error"
+#: src/slic3r/GUI/MsgDialog.cpp:73
+#, possible-c-format
+msgid "%s error"
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r has encountered an error"
+#: src/slic3r/GUI/MsgDialog.cpp:74
+#, possible-c-format
+msgid "%s has encountered an error"
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:126
+#: src/slic3r/GUI/Plater.cpp:138
 msgid "Volume"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:127
+#: src/slic3r/GUI/Plater.cpp:139
 msgid "Facets"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:128
+#: src/slic3r/GUI/Plater.cpp:140
 msgid "Materials"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:131
+#: src/slic3r/GUI/Plater.cpp:143
 msgid "Manifold"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:174
+#: src/slic3r/GUI/Plater.cpp:193
 msgid "Sliced Info"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
+#: src/slic3r/GUI/Plater.cpp:212 src/slic3r/GUI/Plater.cpp:1048
 msgid "Used Filament (m)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:194
+#: src/slic3r/GUI/Plater.cpp:213
 msgid "Used Filament (mm³)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:195
+#: src/slic3r/GUI/Plater.cpp:214
 msgid "Used Filament (g)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
+#: src/slic3r/GUI/Plater.cpp:215
+msgid "Used Material (unit)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:216 src/slic3r/GUI/Plater.cpp:1063
 #: src/libslic3r/PrintConfig.cpp:718
 msgid "Cost"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
+#: src/slic3r/GUI/Plater.cpp:217 src/slic3r/GUI/Plater.cpp:1035
+#: src/slic3r/GUI/Plater.cpp:1077
 msgid "Estimated printing time"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:198
+#: src/slic3r/GUI/Plater.cpp:218
 msgid "Number of tool changes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
+#: src/slic3r/GUI/Plater.cpp:292
+msgid "Click to edit preset"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:364
+#: src/slic3r/GUI/Plater.cpp:432
 msgid "Select what kind of support do you need"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
+#: src/slic3r/GUI/Plater.cpp:434 src/libslic3r/PrintConfig.cpp:1840
+#: src/libslic3r/PrintConfig.cpp:2448
 msgid "Support on build plate only"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:367
+#: src/slic3r/GUI/Plater.cpp:435 src/slic3r/GUI/Plater.cpp:528
+msgid "For support enforcers only"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:436
 msgid "Everywhere"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
+#: src/slic3r/GUI/Plater.cpp:454 src/slic3r/GUI/Tab.cpp:1060
 msgid "Brim"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:381
+#: src/slic3r/GUI/Plater.cpp:456
 msgid ""
 "This flag enables the brim that will be printed around each object on the "
 "first layer."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:390
+#: src/slic3r/GUI/Plater.cpp:464
 msgid "Purging volumes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:556
+#: src/slic3r/GUI/Plater.cpp:688
 msgid "Print settings"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
+#: src/slic3r/GUI/Plater.cpp:689 src/slic3r/GUI/Tab.cpp:1475
+#: src/slic3r/GUI/Tab.cpp:1476
 msgid "Filament"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
-msgid "SLA print"
+#: src/slic3r/GUI/Plater.cpp:690
+msgid "SLA print settings"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
+#: src/slic3r/GUI/Plater.cpp:691 src/slic3r/GUI/Preset.cpp:1277
 msgid "SLA material"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:560
+#: src/slic3r/GUI/Plater.cpp:692
 msgid "Printer"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:588
+#: src/slic3r/GUI/Plater.cpp:738 src/slic3r/GUI/Plater.cpp:3865
 msgid "Send to printer"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:607
+#: src/slic3r/GUI/Plater.cpp:741 src/slic3r/GUI/Plater.cpp:2439
+#: src/slic3r/GUI/Plater.cpp:3661
 msgid "Slice now"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:787
+#: src/slic3r/GUI/Plater.cpp:880
+msgid "Hold Shift to Slice & Export G-code"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:981
 #, possible-c-format
 msgid "%d (%d shells)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:792
+#: src/slic3r/GUI/Plater.cpp:986
 #, possible-c-format
 msgid "Auto-repaired (%d errors)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:795
+#: src/slic3r/GUI/Plater.cpp:989
 #, 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:805
+#: src/slic3r/GUI/Plater.cpp:999
 msgid "Yes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:1022
+msgid "Used Material (ml)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1025
+msgid "object(s)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1025
+msgid "supports and pad"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1050 src/slic3r/GUI/Plater.cpp:1065
 msgid "objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:1050 src/slic3r/GUI/Plater.cpp:1065
 msgid "wipe tower"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:855
+#: src/slic3r/GUI/Plater.cpp:1080
 msgid "normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:859
-msgid "silent mode"
+#: src/slic3r/GUI/Plater.cpp:1084
+msgid "stealth mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1304
+#: src/slic3r/GUI/Plater.cpp:1604
 msgid "Loading"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1314
+#: src/slic3r/GUI/Plater.cpp:1614
 #, possible-c-format
 msgid "Processing input file %s\n"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1366
+#: src/slic3r/GUI/Plater.cpp:1672
 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 ""
 
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
+#: src/slic3r/GUI/Plater.cpp:1675 src/slic3r/GUI/Plater.cpp:1783
 msgid "Multi-part object detected"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1388
+#: src/slic3r/GUI/Plater.cpp:1726
+msgid ""
+"This file cannot be loaded in a simple mode. Do you want to switch to an "
+"advanced mode?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1727
+msgid "Detected advanced data"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1760
 #, possible-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 ""
 
-#: src/slic3r/GUI/Plater.cpp:1408
+#: src/slic3r/GUI/Plater.cpp:1780
 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 ""
 
-#: src/slic3r/GUI/Plater.cpp:1424
+#: src/slic3r/GUI/Plater.cpp:1796
 msgid "Loaded"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1492
+#: src/slic3r/GUI/Plater.cpp:1894
 msgid ""
 "Your object appears to be too large, so it was automatically scaled down to "
 "fit your print bed."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1493
+#: src/slic3r/GUI/Plater.cpp:1895
 msgid "Object too large?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
+#: src/slic3r/GUI/Plater.cpp:1945
+msgid "Export STL file:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1538
+#: src/slic3r/GUI/Plater.cpp:1952
+msgid "Export AMF file:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1958
 msgid "Save file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1702
+#: src/slic3r/GUI/Plater.cpp:2123
 msgid "Arranging canceled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1705
+#: src/slic3r/GUI/Plater.cpp:2126
 msgid "Arranging"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1736
+#: src/slic3r/GUI/Plater.cpp:2163
 msgid "Could not arrange model objects! Some geometries may be invalid."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1740
+#: src/slic3r/GUI/Plater.cpp:2170
 msgid "Arranging done."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1782
+#: src/slic3r/GUI/Plater.cpp:2211
 msgid "Orientation search canceled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1787
+#: src/slic3r/GUI/Plater.cpp:2216
 msgid "Searching for optimal orientation"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1797
+#: src/slic3r/GUI/Plater.cpp:2278
 msgid "Orientation found."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1818
+#: src/slic3r/GUI/Plater.cpp:2298
 msgid ""
 "The selected object can't be split because it contains more than one volume/"
 "material."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
+#: src/slic3r/GUI/Plater.cpp:2424
+msgid "Invalid data"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2433
+msgid "Ready to slice"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2471 src/slic3r/GUI/PrintHostDialogs.cpp:231
 msgid "Cancelling"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1962
+#: src/slic3r/GUI/Plater.cpp:2488
 msgid "Another export job is currently running."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2215
+#: src/slic3r/GUI/Plater.cpp:2749
 msgid "Export failed"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
+#: src/slic3r/GUI/Plater.cpp:2754 src/slic3r/GUI/PrintHostDialogs.cpp:232
 msgid "Cancelled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2840 src/slic3r/GUI/Plater.cpp:2852
+#: src/slic3r/GUI/Plater.cpp:2939
 msgid "Increase copies"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2933 src/slic3r/GUI/Plater.cpp:2951
+msgid "Remove the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2939
 msgid "Place one more copy of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2941
 msgid "Decrease copies"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2941
 msgid "Remove one copy of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2943
 msgid "Set number of copies"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2943
 msgid "Change the number of copies of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2966
 msgid "Reload from Disk"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2966
 msgid "Reload the selected file from Disk"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
+#: src/slic3r/GUI/Plater.cpp:2969
+msgid "Export the selected object as STL file"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2981
 msgid "Along X axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2981
 msgid "Mirror the selected object along the X axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2983
 msgid "Along Y axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2983
 msgid "Mirror the selected object along the Y axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2985
 msgid "Along Z axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2985
 msgid "Mirror the selected object along the Z axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2988
 msgid "Mirror"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2988
 msgid "Mirror the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2400
+#: src/slic3r/GUI/Plater.cpp:3008
 msgid "To objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
+#: src/slic3r/GUI/Plater.cpp:3008 src/slic3r/GUI/Plater.cpp:3030
 msgid "Split the selected object into individual objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2402
+#: src/slic3r/GUI/Plater.cpp:3010
 msgid "To parts"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:3010 src/slic3r/GUI/Plater.cpp:3050
 msgid "Split the selected object into individual sub-parts"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:3013 src/slic3r/GUI/Plater.cpp:3030
+#: src/slic3r/GUI/Plater.cpp:3050 src/libslic3r/PrintConfig.cpp:3108
 msgid "Split"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2405
+#: src/slic3r/GUI/Plater.cpp:3013
 msgid "Split the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:3036
 msgid "Optimize orientation"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:3036
 msgid "Optimize the rotation of the object for better print results."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2795
+#: src/slic3r/GUI/Plater.cpp:3099
+msgid "3D editor view"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3110 src/slic3r/GUI/Tab.cpp:2294
+msgid "Preview"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3341
+msgid "All objects will be removed, continue ?"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3476
 msgid "Save G-code file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
+#: src/slic3r/GUI/Plater.cpp:3476
+msgid "Save SL1 file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2845
+#: src/slic3r/GUI/Plater.cpp:3588
 #, possible-c-format
 msgid "STL file exported to %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2861
+#: src/slic3r/GUI/Plater.cpp:3604
 #, possible-c-format
 msgid "AMF file exported to %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2864
+#: src/slic3r/GUI/Plater.cpp:3607
 #, possible-c-format
 msgid "Error exporting AMF file %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2891
+#: src/slic3r/GUI/Plater.cpp:3633
 #, possible-c-format
 msgid "3MF file exported to %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2894
+#: src/slic3r/GUI/Plater.cpp:3636
 #, possible-c-format
 msgid "Error exporting 3MF file %s"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
+#: src/slic3r/GUI/Plater.cpp:3865
+msgid "Send G-code"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:19 src/slic3r/GUI/Tab.cpp:1818
+#: src/slic3r/GUI/Tab.cpp:2019
 msgid "General"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:34
+#: src/slic3r/GUI/Preferences.cpp:36
 msgid "Remember output directory"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:36
+#: src/slic3r/GUI/Preferences.cpp:38
 msgid ""
 "If this is enabled, Slic3r will prompt the last output directory instead of "
 "the one containing the input files."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:42
+#: src/slic3r/GUI/Preferences.cpp:44
 msgid "Auto-center parts"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:44
+#: src/slic3r/GUI/Preferences.cpp:46
 msgid ""
 "If this is enabled, Slic3r will auto-center objects around the print bed "
 "center."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:50
+#: src/slic3r/GUI/Preferences.cpp:52
 msgid "Background processing"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:52
+#: src/slic3r/GUI/Preferences.cpp:54
 msgid ""
 "If this is enabled, Slic3r will pre-process objects as soon as they're "
 "loaded in order to save time when exporting G-code."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:74
-msgid "Suppress \" - default - \" presets"
+#: src/slic3r/GUI/Preferences.cpp:63
+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 ""
+
+#: src/slic3r/GUI/Preferences.cpp:71
+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 ""
 
 #: src/slic3r/GUI/Preferences.cpp:76
+msgid "Suppress \" - default - \" presets"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:78
 msgid ""
 "Suppress \" - default - \" presets in the Print / Filament / Printer "
 "selections once there are any other valid presets available."
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:82
+#: src/slic3r/GUI/Preferences.cpp:84
 msgid "Show incompatible print and filament presets"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:84
+#: src/slic3r/GUI/Preferences.cpp:86
 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:90
+#: src/slic3r/GUI/Preferences.cpp:93
 msgid "Use legacy OpenGL 1.1 rendering"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:92
+#: src/slic3r/GUI/Preferences.cpp:95
 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 ""
 
-#: src/slic3r/GUI/Preferences.cpp:115
-msgid "You need to restart Slic3r to make the changes effective."
+#: src/slic3r/GUI/Preferences.cpp:103
+msgid "Use Retina resolution for the 3D scene"
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:170
+#: src/slic3r/GUI/Preferences.cpp:105
+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 ""
+
+#: src/slic3r/GUI/Preferences.cpp:130
+#, possible-c-format
+msgid "You need to restart %s to make the changes effective."
+msgstr ""
+
+#: src/slic3r/GUI/Preset.cpp:207
 msgid "modified"
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
+#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:970
+#: src/slic3r/GUI/Preset.cpp:1035 src/slic3r/GUI/Preset.cpp:1067
+#: src/slic3r/GUI/PresetBundle.cpp:1488 src/slic3r/GUI/PresetBundle.cpp:1553
 msgid "System presets"
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
+#: src/slic3r/GUI/Preset.cpp:974 src/slic3r/GUI/Preset.cpp:1071
+#: src/slic3r/GUI/PresetBundle.cpp:1558
 msgid "User presets"
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:1157
+#: src/slic3r/GUI/Preset.cpp:1003 src/slic3r/GUI/Tab.cpp:240
+msgid "Add a new printer"
+msgstr ""
+
+#: src/slic3r/GUI/Preset.cpp:1275
 msgid "filament"
 msgstr ""
 
+#: src/slic3r/GUI/Preset.cpp:1276
+msgid "SLA print"
+msgstr ""
+
 #: src/slic3r/GUI/PresetHints.cpp:28
-#, possible-c-format
 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)."
+"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 ""
 
-#: src/slic3r/GUI/PresetHints.cpp:32
-#, possible-c-format
+#: src/slic3r/GUI/PresetHints.cpp:35
 msgid ""
 "\n"
-"If estimated layer time is greater, but still below ~%ds, fan will run at a "
-"proportionally decreasing speed between %d%% and %d%%."
+"If estimated layer time is greater, but still below ~%1%s, fan will run at a "
+"proportionally decreasing speed between %2%%% and %3%%%."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:36
+#: src/slic3r/GUI/PresetHints.cpp:39
 msgid ""
 "\n"
-"During the other layers, fan "
+"During the other layers, fan"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:38
-msgid "Fan "
+#: src/slic3r/GUI/PresetHints.cpp:41
+msgid "Fan"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:43
-#, possible-c-format
-msgid "will always run at %d%% "
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:46
-#, possible-c-format
-msgid "except for the first %d layers"
+#: src/slic3r/GUI/PresetHints.cpp:47
+msgid "will always run at %1%%%"
 msgstr ""
 
 #: src/slic3r/GUI/PresetHints.cpp:50
-msgid "except for the first layer"
+msgid "except for the first %1% layers."
 msgstr ""
 
 #: src/slic3r/GUI/PresetHints.cpp:52
+msgid "except for the first layer."
+msgstr ""
+
+#: src/slic3r/GUI/PresetHints.cpp:54
 msgid "will be turned off."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:153
+#: src/slic3r/GUI/PresetHints.cpp:155
 msgid "external perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:162
+#: src/slic3r/GUI/PresetHints.cpp:164
 msgid "perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:171
+#: src/slic3r/GUI/PresetHints.cpp:173
 msgid "infill"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:181
+#: src/slic3r/GUI/PresetHints.cpp:183
 msgid "solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:189
+#: src/slic3r/GUI/PresetHints.cpp:191
 msgid "top solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:200
+#: src/slic3r/GUI/PresetHints.cpp:202
 msgid "support"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:210
+#: src/slic3r/GUI/PresetHints.cpp:212
 msgid "support interface"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:216
+#: src/slic3r/GUI/PresetHints.cpp:218
 msgid "First layer volumetric"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:216
+#: src/slic3r/GUI/PresetHints.cpp:218
 msgid "Bridging volumetric"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:216
+#: src/slic3r/GUI/PresetHints.cpp:218
 msgid "Volumetric"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:217
-msgid " flow rate is maximized "
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:220
-msgid "by the print profile maximum"
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:221
-msgid "when printing "
+#: src/slic3r/GUI/PresetHints.cpp:219
+msgid "flow rate is maximized"
 msgstr ""
 
 #: src/slic3r/GUI/PresetHints.cpp:222
-msgid " with a volumetric rate "
+msgid "by the print profile maximum"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:226
-#, possible-c-format
-msgid "%3.2f mm³/s"
+#: src/slic3r/GUI/PresetHints.cpp:223
+msgid "when printing"
+msgstr ""
+
+#: src/slic3r/GUI/PresetHints.cpp:224
+msgid "with a volumetric rate"
 msgstr ""
 
 #: src/slic3r/GUI/PresetHints.cpp:228
 #, possible-c-format
-msgid " at filament speed %3.2f mm/s."
+msgid "%3.2f mm³/s at filament speed %3.2f mm/s."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:247
+#: src/slic3r/GUI/PresetHints.cpp:246
 msgid ""
 "Recommended object thin wall thickness: Not available due to invalid layer "
 "height."
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:264
+#: src/slic3r/GUI/PresetHints.cpp:262
 #, possible-c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
+msgid "Recommended object thin wall thickness for layer height %.2f and"
 msgstr ""
 
-#: src/slic3r/GUI/PresetHints.cpp:271
+#: src/slic3r/GUI/PresetHints.cpp:268
 #, possible-c-format
-msgid "%d lines: %.2lf mm"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Send G-Code to printer host"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Upload to Printer Host with the following filename:"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
-msgid "Start printing after upload"
+msgid "%d lines: %.2f mm"
 msgstr ""
 
 #: src/slic3r/GUI/PrintHostDialogs.cpp:33
+msgid "Send G-Code to printer host"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:33
+msgid "Upload to Printer Host with the following filename:"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:35
+msgid "Start printing after upload"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:42
 msgid "Use forward slashes ( / ) as a directory separator if needed."
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
-msgid "Cancel selected"
+#: src/slic3r/GUI/PrintHostDialogs.cpp:148
+msgid "ID"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
-msgid "Show error message"
+#: src/slic3r/GUI/PrintHostDialogs.cpp:149
+msgid "Progress"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
+#: src/slic3r/GUI/PrintHostDialogs.cpp:150
+msgid "Status"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:151
+msgid "Host"
 msgstr ""
 
 #: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
+msgid "Filename"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:153
+msgid "Error Message"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:156
+msgid "Cancel selected"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:158
+msgid "Show error message"
+msgstr ""
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:197
+#: src/slic3r/GUI/PrintHostDialogs.cpp:228
 msgid "Enqueued"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
+#: src/slic3r/GUI/PrintHostDialogs.cpp:229
 msgid "Uploading"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
+#: src/slic3r/GUI/PrintHostDialogs.cpp:233
 msgid "Completed"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
+#: src/slic3r/GUI/PrintHostDialogs.cpp:271
 msgid "Error uploading to print host:"
 msgstr ""
 
@@ -2565,11 +3253,11 @@ msgstr ""
 msgid "Time"
 msgstr ""
 
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
+#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/WipeTowerDialog.cpp:82
+#: src/libslic3r/PrintConfig.cpp:613 src/libslic3r/PrintConfig.cpp:657
+#: src/libslic3r/PrintConfig.cpp:672 src/libslic3r/PrintConfig.cpp:2268
+#: src/libslic3r/PrintConfig.cpp:2277 src/libslic3r/PrintConfig.cpp:2337
+#: src/libslic3r/PrintConfig.cpp:2344
 msgid "s"
 msgstr ""
 
@@ -2577,215 +3265,227 @@ msgstr ""
 msgid "Volumetric speed"
 msgstr ""
 
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
-msgid "Slic3r Prusa Edition - System Information"
+#: src/slic3r/GUI/RammingChart.cpp:81 src/libslic3r/PrintConfig.cpp:570
+#: src/libslic3r/PrintConfig.cpp:1210
+msgid "mm³/s"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
+#: src/slic3r/GUI/SysInfoDialog.cpp:44
+msgid "System Information"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:52 src/libslic3r/PrintConfig.cpp:230
 msgid "Compatible printers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:50
+#: src/slic3r/GUI/Tab.cpp:53
 msgid "Select the printers this profile is compatible with."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
+#: src/slic3r/GUI/Tab.cpp:58 src/libslic3r/PrintConfig.cpp:245
 msgid "Compatible print profiles"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:56
+#: src/slic3r/GUI/Tab.cpp:59
 msgid "Select the print profiles this profile is compatible with."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:118
-msgid "Save current "
+#. TRN "Save current Settings"
+#: src/slic3r/GUI/Tab.cpp:133
+#, possible-c-format
+msgid "Save current %s"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:119
+#: src/slic3r/GUI/Tab.cpp:134
 msgid "Delete this preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:131
+#: src/slic3r/GUI/Tab.cpp:139
 msgid ""
 "Hover the cursor over buttons to find more information \n"
 "or click this button."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:824
+#: src/slic3r/GUI/Tab.cpp:918
 msgid "It's a default preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:825
+#: src/slic3r/GUI/Tab.cpp:919
 msgid "It's a system preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:826
-msgid "Current preset is inherited from "
+#: src/slic3r/GUI/Tab.cpp:920
+#, possible-c-format
+msgid "Current preset is inherited from %s"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:831
-msgid "It can't be deleted or modified. "
+#: src/slic3r/GUI/Tab.cpp:921
+msgid "default preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:832
+#: src/slic3r/GUI/Tab.cpp:925
+msgid "It can't be deleted or modified."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:926
 msgid ""
-"Any modifications should be saved as a new preset inherited from this one. "
+"Any modifications should be saved as a new preset inherited from this one."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:833
+#: src/slic3r/GUI/Tab.cpp:927
 msgid "To do that please specify a new name for the preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:837
+#: src/slic3r/GUI/Tab.cpp:931
 msgid "Additional information:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:843
+#: src/slic3r/GUI/Tab.cpp:937
 msgid "printer model"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:851
+#: src/slic3r/GUI/Tab.cpp:945
 msgid "default print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:854
+#: src/slic3r/GUI/Tab.cpp:948
 msgid "default filament profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:868
+#: src/slic3r/GUI/Tab.cpp:962
 msgid "default SLA material profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:872
+#: src/slic3r/GUI/Tab.cpp:966
 msgid "default SLA print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
+#: src/slic3r/GUI/Tab.cpp:1001 src/slic3r/GUI/Tab.cpp:3417
 msgid "Layers and perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
+#: src/slic3r/GUI/Tab.cpp:1002 src/libslic3r/PrintConfig.cpp:56
 msgid "Layer height"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:924
+#: src/slic3r/GUI/Tab.cpp:1006
 msgid "Vertical shells"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:935
+#: src/slic3r/GUI/Tab.cpp:1017
 msgid "Horizontal shells"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:1018 src/libslic3r/PrintConfig.cpp:1735
 msgid "Solid layers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:941
+#: src/slic3r/GUI/Tab.cpp:1023
 msgid "Quality (slower slicing)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:958
+#: src/slic3r/GUI/Tab.cpp:1041
 msgid "Reducing printing time"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:970
+#: src/slic3r/GUI/Tab.cpp:1053
 msgid "Skirt and brim"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:987
+#: src/slic3r/GUI/Tab.cpp:1070
 msgid "Raft"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:991
+#: src/slic3r/GUI/Tab.cpp:1074
 msgid "Options for support material and raft"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1006
+#: src/slic3r/GUI/Tab.cpp:1089
 msgid "Speed for print moves"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1018
+#: src/slic3r/GUI/Tab.cpp:1101
 msgid "Speed for non-print moves"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1021
+#: src/slic3r/GUI/Tab.cpp:1104
 msgid "Modifiers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1024
+#: src/slic3r/GUI/Tab.cpp:1107
 msgid "Acceleration control (advanced)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1031
+#: src/slic3r/GUI/Tab.cpp:1114
 msgid "Autospeed (advanced)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1037
+#: src/slic3r/GUI/Tab.cpp:1122
 msgid "Multiple Extruders"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1045
+#: src/slic3r/GUI/Tab.cpp:1130
 msgid "Ooze prevention"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1062
+#: src/slic3r/GUI/Tab.cpp:1147
 msgid "Extrusion width"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1072
+#: src/slic3r/GUI/Tab.cpp:1157
 msgid "Overlap"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1075
+#: src/slic3r/GUI/Tab.cpp:1160
 msgid "Flow"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1078
+#: src/slic3r/GUI/Tab.cpp:1169
 msgid "Other"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
+#: src/slic3r/GUI/Tab.cpp:1172 src/slic3r/GUI/Tab.cpp:3465
 msgid "Output options"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1086
+#: src/slic3r/GUI/Tab.cpp:1173
 msgid "Sequential printing"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1088
+#: src/slic3r/GUI/Tab.cpp:1175
 msgid "Extruder clearance (mm)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
+#: src/slic3r/GUI/Tab.cpp:1184 src/slic3r/GUI/Tab.cpp:3466
 msgid "Output file"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
+#: src/slic3r/GUI/Tab.cpp:1191 src/libslic3r/PrintConfig.cpp:1408
 msgid "Post-processing scripts"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
+#: src/slic3r/GUI/Tab.cpp:1197 src/slic3r/GUI/Tab.cpp:1198
+#: src/slic3r/GUI/Tab.cpp:1581 src/slic3r/GUI/Tab.cpp:1582
+#: src/slic3r/GUI/Tab.cpp:1991 src/slic3r/GUI/Tab.cpp:1992
+#: src/slic3r/GUI/Tab.cpp:2085 src/slic3r/GUI/Tab.cpp:2086
+#: src/slic3r/GUI/Tab.cpp:3354 src/slic3r/GUI/Tab.cpp:3355
 msgid "Notes"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
+#: src/slic3r/GUI/Tab.cpp:1204 src/slic3r/GUI/Tab.cpp:1589
+#: src/slic3r/GUI/Tab.cpp:1998 src/slic3r/GUI/Tab.cpp:2092
+#: src/slic3r/GUI/Tab.cpp:3362 src/slic3r/GUI/Tab.cpp:3471
 msgid "Dependencies"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
+#: src/slic3r/GUI/Tab.cpp:1205 src/slic3r/GUI/Tab.cpp:1590
+#: src/slic3r/GUI/Tab.cpp:1999 src/slic3r/GUI/Tab.cpp:2093
+#: src/slic3r/GUI/Tab.cpp:3363 src/slic3r/GUI/Tab.cpp:3472
 msgid "Profile dependencies"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1161
-#, no-c-format
+#: src/slic3r/GUI/Tab.cpp:1251
+#, possible-c-format
 msgid ""
 "The Spiral Vase mode requires:\n"
 "- one perimeter\n"
@@ -2797,11 +3497,11 @@ msgid ""
 "Shall I adjust those settings in order to enable Spiral Vase?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1168
+#: src/slic3r/GUI/Tab.cpp:1258
 msgid "Spiral Vase"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1191
+#: src/slic3r/GUI/Tab.cpp:1281
 msgid ""
 "The Wipe Tower currently supports the non-soluble supports only\n"
 "if they are printed with the current extruder without triggering a tool "
@@ -2812,11 +3512,11 @@ msgid ""
 "Shall I adjust those settings in order to enable the Wipe Tower?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
+#: src/slic3r/GUI/Tab.cpp:1285 src/slic3r/GUI/Tab.cpp:1302
 msgid "Wipe Tower"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1209
+#: src/slic3r/GUI/Tab.cpp:1299
 msgid ""
 "For the Wipe Tower to work with the soluble supports, the support layers\n"
 "need to be synchronized with the object layers.\n"
@@ -2824,7 +3524,7 @@ msgid ""
 "Shall I synchronize support layers in order to enable the Wipe Tower?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1227
+#: src/slic3r/GUI/Tab.cpp:1317
 msgid ""
 "Supports work better, if the following feature is enabled:\n"
 "- Detect bridging perimeters\n"
@@ -2832,409 +3532,415 @@ msgid ""
 "Shall I adjust those settings for supports?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1230
+#: src/slic3r/GUI/Tab.cpp:1320
 msgid "Support Generator"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1272
-msgid "The "
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1272
-#, no-c-format
+#: src/slic3r/GUI/Tab.cpp:1362
 msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
+"The %1% infill pattern is not supposed to work at 100%% density.\n"
 "\n"
 "Shall I switch to rectilinear fill pattern?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1388
-msgid "Temperature "
+#: src/slic3r/GUI/Tab.cpp:1483 src/libslic3r/PrintConfig.cpp:2005
+msgid "Temperature"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1394
+#: src/slic3r/GUI/Tab.cpp:1489
 msgid "Bed"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1399
+#: src/slic3r/GUI/Tab.cpp:1494
 msgid "Cooling"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
+#: src/slic3r/GUI/Tab.cpp:1495 src/libslic3r/PrintConfig.cpp:1311
+#: src/libslic3r/PrintConfig.cpp:2124
 msgid "Enable"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1411
+#: src/slic3r/GUI/Tab.cpp:1506
 msgid "Fan settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1412
+#: src/slic3r/GUI/Tab.cpp:1507
 msgid "Fan speed"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1420
+#: src/slic3r/GUI/Tab.cpp:1515
 msgid "Cooling thresholds"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1426
+#: src/slic3r/GUI/Tab.cpp:1521
 msgid "Filament properties"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1430
+#: src/slic3r/GUI/Tab.cpp:1525
 msgid "Print speed override"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1440
+#: src/slic3r/GUI/Tab.cpp:1535
 msgid "Toolchange parameters with single extruder MM printers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1455
+#: src/slic3r/GUI/Tab.cpp:1550
 msgid "Ramming settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
+#: src/slic3r/GUI/Tab.cpp:1568 src/slic3r/GUI/Tab.cpp:1954
 msgid "Custom G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
+#: src/slic3r/GUI/Tab.cpp:1569 src/slic3r/GUI/Tab.cpp:1955
+#: src/libslic3r/PrintConfig.cpp:1761 src/libslic3r/PrintConfig.cpp:1776
 msgid "Start G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
+#: src/slic3r/GUI/Tab.cpp:1575 src/slic3r/GUI/Tab.cpp:1961
+#: src/libslic3r/PrintConfig.cpp:360 src/libslic3r/PrintConfig.cpp:370
 msgid "End G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
-msgid " Browse "
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:1706 src/slic3r/GUI/Tab.cpp:1894
 msgid "Test"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1615
+#: src/slic3r/GUI/Tab.cpp:1716
 msgid "Could not get a valid Printer Host reference"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1722 src/slic3r/GUI/Tab.cpp:1907
 msgid "Success!"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1636
+#: src/slic3r/GUI/Tab.cpp:1737
 msgid ""
 "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
 "signed certificate."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1648
+#: src/slic3r/GUI/Tab.cpp:1750
 msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1649
+#: src/slic3r/GUI/Tab.cpp:1751
 msgid "Open CA certificate file"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1676
+#: src/slic3r/GUI/Tab.cpp:1779
+#, possible-c-format
 msgid ""
 "HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
+"    \tOn this system, %s uses HTTPS certificates from the system Certificate "
 "Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate "
+"    \tTo use a custom CA file, please import your CA file into Certificate "
 "Store / Keychain."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
+#: src/slic3r/GUI/Tab.cpp:1819 src/slic3r/GUI/Tab.cpp:2020
 msgid "Size and coordinates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
-msgid " Set "
+#: src/slic3r/GUI/Tab.cpp:1824 src/slic3r/GUI/Tab.cpp:2025
+#: src/slic3r/GUI/Tab.cpp:3009
+msgid "Set"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1740
+#: src/slic3r/GUI/Tab.cpp:1846
 msgid "Capabilities"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1745
+#: src/slic3r/GUI/Tab.cpp:1851
 msgid "Number of extruders of the printer."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1773
+#: src/slic3r/GUI/Tab.cpp:1879
 msgid "USB/Serial connection"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
+#: src/slic3r/GUI/Tab.cpp:1880 src/libslic3r/PrintConfig.cpp:1616
 msgid "Serial port"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1779
+#: src/slic3r/GUI/Tab.cpp:1885
 msgid "Rescan serial ports"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1907
 msgid "Connection to printer works correctly."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1804
+#: src/slic3r/GUI/Tab.cpp:1910
 msgid "Connection failed."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
+#: src/slic3r/GUI/Tab.cpp:1923 src/slic3r/GUI/Tab.cpp:2080
 msgid "Print Host upload"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
+#: src/slic3r/GUI/Tab.cpp:1967 src/libslic3r/PrintConfig.cpp:129
 msgid "Before layer change G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
+#: src/slic3r/GUI/Tab.cpp:1973 src/libslic3r/PrintConfig.cpp:1032
 msgid "After layer change G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
+#: src/slic3r/GUI/Tab.cpp:1979 src/libslic3r/PrintConfig.cpp:2031
 msgid "Tool change G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1877
+#: src/slic3r/GUI/Tab.cpp:1985
 msgid "Between objects G-code (for sequential printing)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1938
+#: src/slic3r/GUI/Tab.cpp:2047
 msgid "Display"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
+#: src/slic3r/GUI/Tab.cpp:2058
+msgid "Tilt"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2059
+msgid "Tilt time"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2065 src/slic3r/GUI/Tab.cpp:3336
 msgid "Corrections"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
+#: src/slic3r/GUI/Tab.cpp:2142 src/slic3r/GUI/Tab.cpp:2215
+#: src/libslic3r/PrintConfig.cpp:1082 src/libslic3r/PrintConfig.cpp:1100
+#: src/libslic3r/PrintConfig.cpp:1118 src/libslic3r/PrintConfig.cpp:1135
+#: src/libslic3r/PrintConfig.cpp:1146 src/libslic3r/PrintConfig.cpp:1157
+#: src/libslic3r/PrintConfig.cpp:1168
 msgid "Machine limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2025
-msgid "Values in this column are for Full Power mode"
+#: src/slic3r/GUI/Tab.cpp:2156
+msgid "Values in this column are for Normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2026
-msgid "Full Power"
+#: src/slic3r/GUI/Tab.cpp:2157
+msgid "Normal"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2031
-msgid "Values in this column are for Silent mode"
+#: src/slic3r/GUI/Tab.cpp:2162
+msgid "Values in this column are for Stealth mode"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2032
-msgid "Silent"
+#: src/slic3r/GUI/Tab.cpp:2163
+msgid "Stealth"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2040
+#: src/slic3r/GUI/Tab.cpp:2171
 msgid "Maximum feedrates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2045
+#: src/slic3r/GUI/Tab.cpp:2176
 msgid "Maximum accelerations"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2052
+#: src/slic3r/GUI/Tab.cpp:2183
 msgid "Jerk limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2057
+#: src/slic3r/GUI/Tab.cpp:2188
 msgid "Minimum feedrates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
+#: src/slic3r/GUI/Tab.cpp:2237 src/slic3r/GUI/Tab.cpp:2245
 msgid "Single extruder MM setup"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2104
+#: src/slic3r/GUI/Tab.cpp:2246
 msgid "Single extruder multimaterial parameters"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
+#: src/slic3r/GUI/Tab.cpp:2259 src/libslic3r/GCode/PreviewData.cpp:475
 #, possible-c-format
 msgid "Extruder %d"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2125
+#: src/slic3r/GUI/Tab.cpp:2266
 msgid "Layer height limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2130
+#: src/slic3r/GUI/Tab.cpp:2271
 msgid "Position (for multi-extruder printers)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2133
+#: src/slic3r/GUI/Tab.cpp:2274
 msgid "Retraction"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2136
+#: src/slic3r/GUI/Tab.cpp:2277
 msgid "Only lift Z"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2149
+#: src/slic3r/GUI/Tab.cpp:2290
 msgid ""
 "Retraction when tool is disabled (advanced settings for multi-extruder "
 "setups)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2153
-msgid "Preview"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2284
+#: src/slic3r/GUI/Tab.cpp:2449
 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 ""
 
-#: src/slic3r/GUI/Tab.cpp:2286
+#: src/slic3r/GUI/Tab.cpp:2451
 msgid "Firmware Retraction"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2565
+#: src/slic3r/GUI/Tab.cpp:2777
 #, possible-c-format
 msgid "Default preset (%s)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2566
+#: src/slic3r/GUI/Tab.cpp:2778
 #, possible-c-format
 msgid "Preset (%s)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2583
+#: src/slic3r/GUI/Tab.cpp:2795
 msgid "has the following unsaved changes:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2586
+#: src/slic3r/GUI/Tab.cpp:2798
 msgid "is not compatible with printer"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2587
+#: src/slic3r/GUI/Tab.cpp:2799
 msgid "is not compatible with print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2589
+#: src/slic3r/GUI/Tab.cpp:2801
 msgid "and it has the following unsaved changes:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2592
-msgid "Discard changes and continue anyway?"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2593
+#: src/slic3r/GUI/Tab.cpp:2805
 msgid "Unsaved Changes"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
+#: src/slic3r/GUI/Tab.cpp:2817
 msgid "Please check your object list before preset changing."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2699
+#: src/slic3r/GUI/Tab.cpp:2896
+msgid "%1% - Copy"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2919
 msgid "The supplied name is empty. It can't be saved."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2704
+#: src/slic3r/GUI/Tab.cpp:2924
 msgid "Cannot overwrite a system profile."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2708
+#: src/slic3r/GUI/Tab.cpp:2928
 msgid "Cannot overwrite an external profile."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2954
 msgid "remove"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2954
 msgid "delete"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid "Are you sure you want to "
+#. TRN  remove/delete
+#: src/slic3r/GUI/Tab.cpp:2956
+msgid "Are you sure you want to %1% the selected preset?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid " the selected preset?"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2736
+#: src/slic3r/GUI/Tab.cpp:2957
 msgid "Remove"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2737
-msgid " Preset"
+#. TRN  Remove/Delete
+#: src/slic3r/GUI/Tab.cpp:2959
+msgid "%1% Preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
+#: src/slic3r/GUI/Tab.cpp:3085
+msgid "LOCKED LOCK"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2869
+#. TRN Description for "LOCKED LOCK"
+#: src/slic3r/GUI/Tab.cpp:3087
 msgid ""
-"LOCKED LOCK;indicates that the settings are the same as the system values "
-"for the current option group"
+"indicates that the settings are the same as the system values for the "
+"current option group"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2872
+#: src/slic3r/GUI/Tab.cpp:3089
+msgid "UNLOCKED LOCK"
+msgstr ""
+
+#. TRN Description for "UNLOCKED LOCK"
+#: src/slic3r/GUI/Tab.cpp:3091
 msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
-"the system values for the current option group.\n"
+"indicates that some settings were changed and are not equal to the system "
+"values for the current option group.\n"
 "Click the UNLOCKED LOCK icon to reset all settings for current option group "
 "to the system values."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2878
+#: src/slic3r/GUI/Tab.cpp:3096
+msgid "WHITE BULLET"
+msgstr ""
+
+#. TRN Description for "WHITE BULLET"
+#: src/slic3r/GUI/Tab.cpp:3098
 msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
+"for the left button: \tindicates a non-system preset,\n"
 "for the right button: \tindicates that the settings hasn't been modified."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2882
+#: src/slic3r/GUI/Tab.cpp:3101
+msgid "BACK ARROW"
+msgstr ""
+
+#. TRN Description for "BACK ARROW"
+#: src/slic3r/GUI/Tab.cpp:3103
 msgid ""
-"BACK ARROW;indicates that the settings were changed and are not equal to the "
-"last saved preset for the current option group.\n"
+"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 ""
 
-#: src/slic3r/GUI/Tab.cpp:2908
+#: src/slic3r/GUI/Tab.cpp:3128
 msgid ""
 "LOCKED LOCK icon indicates that the settings are the same as the system "
 "values for the current option group"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2910
+#: src/slic3r/GUI/Tab.cpp:3130
 msgid ""
 "UNLOCKED LOCK icon indicates that some settings were changed and are not "
 "equal to the system values for the current option group.\n"
 "Click to reset all settings for current option group to the system values."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2913
+#: src/slic3r/GUI/Tab.cpp:3133
 msgid "WHITE BULLET icon indicates a non system preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2916
+#: src/slic3r/GUI/Tab.cpp:3136
 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:2918
+#: src/slic3r/GUI/Tab.cpp:3138
 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"
@@ -3242,124 +3948,143 @@ msgid ""
 "preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2924
+#: src/slic3r/GUI/Tab.cpp:3144
 msgid ""
 "LOCKED LOCK icon indicates that the value is the same as the system value."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2925
+#: src/slic3r/GUI/Tab.cpp:3145
 msgid ""
 "UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
 "the system value.\n"
 "Click to reset current value to the system value."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2931
+#: src/slic3r/GUI/Tab.cpp:3151
 msgid ""
 "WHITE BULLET icon indicates that the value is the same as in the last saved "
 "preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2932
+#: src/slic3r/GUI/Tab.cpp:3152
 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 ""
 
-#: src/slic3r/GUI/Tab.cpp:3031
-msgid " as:"
+#. TRN Preset
+#: src/slic3r/GUI/Tab.cpp:3265
+#, possible-c-format
+msgid "Save %s as:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3075
+#: src/slic3r/GUI/Tab.cpp:3309
 msgid "the following postfix are not allowed:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3079
+#: src/slic3r/GUI/Tab.cpp:3313
 msgid "The supplied name is not available."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3092
+#: src/slic3r/GUI/Tab.cpp:3326
 msgid "Material"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
+#: src/slic3r/GUI/Tab.cpp:3328 src/slic3r/GUI/Tab.cpp:3419
 msgid "Layers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3098
+#: src/slic3r/GUI/Tab.cpp:3332
 msgid "Exposure"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3183
+#: src/slic3r/GUI/Tab.cpp:3427
 msgid "Support head"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3188
+#: src/slic3r/GUI/Tab.cpp:3432
 msgid "Support pillar"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3196
+#: src/slic3r/GUI/Tab.cpp:3442
 msgid "Connection of the support sticks and junctions"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3200
+#: src/slic3r/GUI/Tab.cpp:3447
 msgid "Automatic generation"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
+#: src/slic3r/GUI/Tab.cpp:3509
+msgid "Head penetration should not be greater than the head width."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3510
+msgid "Invalid Head penetration"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3522
+msgid "Pinhead diameter should be smaller than the pillar diameter."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3523
+msgid "Invalid pinhead diameter"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.hpp:318 src/slic3r/GUI/Tab.hpp:411
 msgid "Print Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:311
+#: src/slic3r/GUI/Tab.hpp:337
 msgid "Filament Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:344
+#: src/slic3r/GUI/Tab.hpp:372
 msgid "Printer Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:367
+#: src/slic3r/GUI/Tab.hpp:396
 msgid "Material Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:393
+#: src/slic3r/GUI/Tab.hpp:423
 msgid "Save preset"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
+#: src/slic3r/GUI/UpdateDialogs.cpp:30
 msgid "Update available"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "New version of Slic3r PE is available"
+#: src/slic3r/GUI/UpdateDialogs.cpp:30
+#, possible-c-format
+msgid "New version of %s is available"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
+#: src/slic3r/GUI/UpdateDialogs.cpp:37
 msgid "To download, follow the link below."
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
+#: src/slic3r/GUI/UpdateDialogs.cpp:45
 msgid "Current version:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
+#: src/slic3r/GUI/UpdateDialogs.cpp:47
 msgid "New version:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
+#: src/slic3r/GUI/UpdateDialogs.cpp:55
 msgid "Don't notify about new releases any more"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
+#: src/slic3r/GUI/UpdateDialogs.cpp:73 src/slic3r/GUI/UpdateDialogs.cpp:168
 msgid "Configuration update"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
+#: src/slic3r/GUI/UpdateDialogs.cpp:73
 msgid "Configuration update is available"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
+#: src/slic3r/GUI/UpdateDialogs.cpp:76
 msgid ""
 "Would you like to install it?\n"
 "\n"
@@ -3369,47 +4094,51 @@ msgid ""
 "Updated configuration bundles:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r incompatibility"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r configuration is incompatible"
-msgstr ""
-
 #: src/slic3r/GUI/UpdateDialogs.cpp:112
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed "
-"configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using "
-"a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
 #, possible-c-format
-msgid "This Slic3r PE version: %s"
+msgid "%s incompatibility"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
+#: src/slic3r/GUI/UpdateDialogs.cpp:113
+#, possible-c-format
+msgid "%s configuration is incompatible"
+msgstr ""
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:118
+#, 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.\n"
+msgstr ""
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:127
+#, possible-c-format
+msgid "This %s version: %s"
+msgstr ""
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:132
 msgid "Incompatible bundles:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
-msgid "Exit Slic3r"
+#: src/slic3r/GUI/UpdateDialogs.cpp:148
+#, possible-c-format
+msgid "Exit %s"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
+#: src/slic3r/GUI/UpdateDialogs.cpp:151
 msgid "Re-configure"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
+#: src/slic3r/GUI/UpdateDialogs.cpp:172
 #, possible-c-format
 msgid ""
-"Slic3r PE now uses an updated configuration structure.\n"
+"%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 "
@@ -3422,15 +4151,15 @@ msgid ""
 "choose whether to enable automatic preset updates."
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:182
+#: src/slic3r/GUI/UpdateDialogs.cpp:188
 msgid "For more information please visit our wiki page:"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
+#: src/slic3r/GUI/WipeTowerDialog.cpp:14
 msgid "Ramming customization"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
+#: src/slic3r/GUI/WipeTowerDialog.cpp:40
 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 "
@@ -3443,63 +4172,63 @@ msgid ""
 "jams, extruder wheel grinding into filament etc."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82
 msgid "Total ramming time"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
+#: src/slic3r/GUI/WipeTowerDialog.cpp:84
 msgid "Total rammed volume"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/slic3r/GUI/WipeTowerDialog.cpp:88
 msgid "Ramming line width"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
+#: src/slic3r/GUI/WipeTowerDialog.cpp:90
 msgid "Ramming line spacing"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
+#: src/slic3r/GUI/WipeTowerDialog.cpp:141
 msgid "Wipe tower - Purging volume adjustment"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
+#: src/slic3r/GUI/WipeTowerDialog.cpp:225
 msgid ""
 "Here you can adjust required purging volume (mm³) for any given pair of "
 "tools."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
+#: src/slic3r/GUI/WipeTowerDialog.cpp:226
 msgid "Extruder changed to"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
+#: src/slic3r/GUI/WipeTowerDialog.cpp:234
 msgid "unloaded"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
+#: src/slic3r/GUI/WipeTowerDialog.cpp:235
 msgid "loaded"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
+#: src/slic3r/GUI/WipeTowerDialog.cpp:240
 msgid "Tool #"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
+#: src/slic3r/GUI/WipeTowerDialog.cpp:247
 msgid ""
 "Total purging volume is calculated by summing two values below, depending on "
 "which tools are loaded/unloaded."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
+#: src/slic3r/GUI/WipeTowerDialog.cpp:248
 msgid "Volume to purge (mm³) when the filament is being"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
+#: src/slic3r/GUI/WipeTowerDialog.cpp:262
 msgid "From"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
+#: src/slic3r/GUI/WipeTowerDialog.cpp:327
 msgid ""
 "Switching to simple settings will discard changes done in the advanced "
 "mode!\n"
@@ -3507,57 +4236,96 @@ msgid ""
 "Do you want to proceed?"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show simplified settings"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show advanced settings"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:65
+#: src/slic3r/GUI/wxExtensions.cpp:400
+msgid "Instances"
+msgstr ""
+
+#: src/slic3r/GUI/wxExtensions.cpp:407 src/slic3r/GUI/wxExtensions.cpp:474
+#, possible-c-format
+msgid "Instance %d"
+msgstr ""
+
+#: src/slic3r/GUI/wxExtensions.cpp:2462
+#, possible-c-format
+msgid "Switch to the %s mode"
+msgstr ""
+
+#: src/slic3r/GUI/wxExtensions.cpp:2463
+#, possible-c-format
+msgid "Current mode is %s"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:51
+msgid "Connection to Duet works correctly."
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:56
+msgid "Could not connect to Duet"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:154
+msgid "Unknown error occured"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:148
+msgid "Wrong password"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:151
+msgid "Could not get resources to create a new connection"
+msgstr ""
+
+#: src/slic3r/Utils/OctoPrint.cpp:69
 #, possible-c-format
 msgid "Mismatched type of print host: %s"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:80
+#: src/slic3r/Utils/OctoPrint.cpp:84
 msgid "Connection to OctoPrint works correctly."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Could not connect to OctoPrint"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Note: OctoPrint version at least 1.1.0 is required."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:181
-msgid "Connection to Prusa SLA works correctly."
+#: src/slic3r/Utils/OctoPrint.cpp:195
+msgid "Connection to Prusa SL1 works correctly."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:186
+#: src/slic3r/Utils/OctoPrint.cpp:200
 msgid "Could not connect to Prusa SLA"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:571
+#: src/slic3r/Utils/PresetUpdater.cpp:583
 #, possible-c-format
 msgid "requires min. %s and max. %s"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:576
+#: src/slic3r/Utils/PresetUpdater.cpp:588
 #, possible-c-format
 msgid "requires min. %s"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:578
+#: src/slic3r/Utils/PresetUpdater.cpp:590
 #, possible-c-format
 msgid "requires max. %s"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:359
+msgid "Exporting source model"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:235
@@ -3565,7 +4333,7 @@ msgid "Failed loading the input model."
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
+msgid "Repairing model by the Netfabb service"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:248
@@ -3573,8 +4341,8 @@ msgid "Mesh repair failed."
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the repaired model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:378
+msgid "Loading repaired model"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:263
@@ -3583,124 +4351,268 @@ msgstr ""
 msgid "Saving mesh into the 3MF container failed."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
+#: src/slic3r/Utils/FixModelByWin10.cpp:340
 msgid "Model fixing"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
+#: src/slic3r/Utils/FixModelByWin10.cpp:341
 msgid "Exporting model..."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
+#: src/slic3r/Utils/FixModelByWin10.cpp:368
 msgid "Export of a temporary 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
+#: src/slic3r/Utils/FixModelByWin10.cpp:383
 msgid "Import of the repaired 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
+#: src/slic3r/Utils/FixModelByWin10.cpp:385
+msgid "Repaired 3MF file does not contain any object"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:387
+msgid "Repaired 3MF file contains more than one object"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:389
+msgid "Repaired 3MF file does not contain any volume"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:391
+msgid "Repaired 3MF file contains more than one volume"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:400
 msgid "Model repair finished"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
+#: src/slic3r/Utils/FixModelByWin10.cpp:406
 msgid "Model repair canceled"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
 msgid "Model repaired successfully"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model Repair by the Netfabb service"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model repair failed: \n"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1175
+#: src/libslic3r/Zipper.cpp:35
+msgid "undefined error"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:37
+msgid "too many files"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:39
+msgid "file too large"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:41
+msgid "unsupported method"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:43
+msgid "unsupported encryption"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:45
+msgid "unsupported feature"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:47
+msgid "failed finding central directory"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:49
+msgid "not a ZIP archive"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:51
+msgid "invalid header or archive is corrupted"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:53
+msgid "unsupported multidisk archive"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:55
+msgid "decompression failed or archive is corrupted"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:57
+msgid "compression failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:59
+msgid "unexpected decompressed size"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:61
+msgid "CRC-32 check failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:63
+msgid "unsupported central directory size"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:65
+msgid "allocation failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:67
+msgid "file open failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:69
+msgid "file create failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:71
+msgid "file write failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:73
+msgid "file read failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:75
+msgid "file close failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:77
+msgid "file seek failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:79
+msgid "file stat failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:81
+msgid "invalid parameter"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:83
+msgid "invalid filename"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:85
+msgid "buffer too small"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:87
+msgid "internal error"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:89
+msgid "file not found"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:91
+msgid "archive is too large"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:93
+msgid "validation failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:95
+msgid "write calledback failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:105
+msgid "Error with zip archive"
+msgstr ""
+
+#: src/libslic3r/Print.cpp:1135
 msgid "All objects are outside of the print volume."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1201
+#: src/libslic3r/Print.cpp:1162
 msgid "Some objects are too close; your extruder will collide with them."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1216
+#: src/libslic3r/Print.cpp:1177
 msgid ""
 "Some objects are too tall and cannot be printed without extruder collisions."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1226
+#: src/libslic3r/Print.cpp:1187
 msgid "The Spiral Vase option can only be used when printing a single object."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1228
+#: src/libslic3r/Print.cpp:1189
 msgid ""
 "The Spiral Vase option can only be used when printing single material "
 "objects."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1234
+#: src/libslic3r/Print.cpp:1195
 msgid ""
 "All extruders must have the same diameter for single extruder multimaterial "
 "printer."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1239
+#: src/libslic3r/Print.cpp:1200
 msgid ""
 "The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
 "and Repetier G-code flavors."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1241
+#: src/libslic3r/Print.cpp:1202
 msgid ""
 "The Wipe Tower is currently only supported with the relative extruder "
 "addressing (use_relative_e_distances=1)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1253
+#: src/libslic3r/Print.cpp:1223
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
+"layer heights"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1255
+#: src/libslic3r/Print.cpp:1225
 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:1257
+#: src/libslic3r/Print.cpp:1227
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "with the same support_material_contact_distance"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1259
+#: src/libslic3r/Print.cpp:1229
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are sliced "
 "equally."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1281
+#: src/libslic3r/Print.cpp:1258
 msgid ""
 "The Wipe tower is only supported if all objects have the same layer height "
 "profile"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1290
+#: src/libslic3r/Print.cpp:1268
 msgid "The supplied settings will cause an empty print."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1307
+#: src/libslic3r/Print.cpp:1285
 msgid ""
 "One or more object were assigned an extruder that the printer does not have."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1316
+#: src/libslic3r/Print.cpp:1294
 msgid ""
 "Printing with multiple extruders of differing nozzle diameters. If support "
 "is to be printed with the current extruder (support_material_extruder == 0 "
@@ -3708,13 +4620,13 @@ msgid ""
 "same diameter."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1324
+#: src/libslic3r/Print.cpp:1302
 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:1328
+#: src/libslic3r/Print.cpp:1306
 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 "
@@ -3722,79 +4634,197 @@ msgid ""
 "set to 0)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1335
+#: src/libslic3r/Print.cpp:1313
 msgid "first_layer_height"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1350
+#: src/libslic3r/Print.cpp:1328
 msgid "First layer height can't be greater than nozzle diameter"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1354
+#: src/libslic3r/Print.cpp:1332
 msgid "Layer height can't be greater than nozzle diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
+#: src/libslic3r/Print.cpp:1476
+msgid "Infilling layers"
+msgstr ""
+
+#: src/libslic3r/Print.cpp:1484
+msgid "Generating skirt"
+msgstr ""
+
+#: src/libslic3r/Print.cpp:1492
+msgid "Generating brim"
+msgstr ""
+
+#: src/libslic3r/Print.cpp:1520
+msgid "Exporting G-code"
+msgstr ""
+
+#: src/libslic3r/Print.cpp:1524
+msgid "Generating G-code"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:57
+msgid "Slicing model"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:58 src/libslic3r/SLAPrint.cpp:819
+msgid "Generating support points"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:59
+msgid "Generating support tree"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:60
+msgid "Generating pad"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:61
+msgid "Slicing supports"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:78
+msgid "Merging slices and calculating statistics"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:79
+msgid "Rasterizing layers"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:622
+msgid ""
+"Cannot proceed without support points! Add support points or disable support "
+"generation."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:634
+msgid "Elevation is too low for object."
+msgstr ""
+
+#. TRN To be shown at the status bar on SLA slicing error.
+#: src/libslic3r/SLAPrint.cpp:719
+msgid "Slicing had to be stopped due to an internal error."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:867 src/libslic3r/SLAPrint.cpp:877
+#: src/libslic3r/SLAPrint.cpp:925
+msgid "Visualizing supports"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:1463
+msgid "Slicing done"
+msgstr ""
+
+#: src/libslic3r/PrintBase.cpp:65
+msgid "Failed processing of the output_filename_format template."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:43 src/libslic3r/PrintConfig.cpp:44
 msgid "Printer technology"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:41
+#: src/libslic3r/PrintConfig.cpp:51
 msgid "Bed shape"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:48
+#: src/libslic3r/PrintConfig.cpp:58
 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:56
+#: src/libslic3r/PrintConfig.cpp:65
 msgid "Max print height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:57
+#: src/libslic3r/PrintConfig.cpp:66
 msgid ""
 "Set this to the maximum height that can be reached by your extruder while "
 "printing."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:73
-msgid "Avoid crossing perimeters"
+#: src/libslic3r/PrintConfig.cpp:72
+msgid "Slice gap closing radius"
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:74
 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 ""
+
+#: src/libslic3r/PrintConfig.cpp:82
+msgid "Hostname, IP or URL"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:83
+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."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:89
+msgid "API Key / Password"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:90
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:96
+msgid "HTTPS CA File"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:97
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:112
+msgid "Avoid crossing perimeters"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:113
+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 ""
 
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
+#: src/libslic3r/PrintConfig.cpp:120 src/libslic3r/PrintConfig.cpp:2002
 msgid "Other layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:83
+#: src/libslic3r/PrintConfig.cpp:121
 msgid ""
 "Bed temperature for layers after the first one. Set this to zero to disable "
 "bed temperature control commands in the output."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:86
+#: src/libslic3r/PrintConfig.cpp:123
 msgid "Bed temperature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:93
+#: src/libslic3r/PrintConfig.cpp:130
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:104
+#: src/libslic3r/PrintConfig.cpp:140
 msgid "Between objects G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:105
+#: src/libslic3r/PrintConfig.cpp:141
 msgid ""
 "This code is inserted between objects when using sequential printing. By "
 "default extruder and bed temperature are reset using non-wait command; "
@@ -3804,73 +4834,70 @@ msgid ""
 "S[first_layer_temperature]\" command wherever you want."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:116
+#: src/libslic3r/PrintConfig.cpp:152
 msgid "Number of solid layers to generate on bottom surfaces."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:118
+#: src/libslic3r/PrintConfig.cpp:153
 msgid "Bottom solid layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:123
+#: src/libslic3r/PrintConfig.cpp:158
 msgid "Bridge"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:124
+#: src/libslic3r/PrintConfig.cpp:159
 msgid ""
 "This is the acceleration your printer will use for bridges. Set zero to "
 "disable acceleration control for bridges."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
+#: src/libslic3r/PrintConfig.cpp:161 src/libslic3r/PrintConfig.cpp:304
+#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:937
+#: src/libslic3r/PrintConfig.cpp:1106 src/libslic3r/PrintConfig.cpp:1159
+#: src/libslic3r/PrintConfig.cpp:1170 src/libslic3r/PrintConfig.cpp:1359
 msgid "mm/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:133
+#: src/libslic3r/PrintConfig.cpp:167
 msgid "Bridging angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:135
+#: src/libslic3r/PrintConfig.cpp:169
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
+#: src/libslic3r/PrintConfig.cpp:172 src/libslic3r/PrintConfig.cpp:734
+#: src/libslic3r/PrintConfig.cpp:1595 src/libslic3r/PrintConfig.cpp:1605
+#: src/libslic3r/PrintConfig.cpp:1833 src/libslic3r/PrintConfig.cpp:1987
+#: src/libslic3r/PrintConfig.cpp:2171 src/libslic3r/PrintConfig.cpp:2488
+#: src/libslic3r/PrintConfig.cpp:2597
 msgid "°"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:145
+#: src/libslic3r/PrintConfig.cpp:178
 msgid "Bridges fan speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:146
+#: src/libslic3r/PrintConfig.cpp:179
 msgid "This fan speed is enforced during all bridges and overhangs."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
+#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:746
+#: src/libslic3r/PrintConfig.cpp:1179 src/libslic3r/PrintConfig.cpp:1242
+#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:2285
+#: src/libslic3r/PrintConfig.cpp:2527
 msgid "%"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:155
+#: src/libslic3r/PrintConfig.cpp:187
 msgid "Bridge flow ratio"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:157
+#: src/libslic3r/PrintConfig.cpp:189
 msgid ""
 "This factor affects the amount of plastic for bridging. You can decrease it "
 "slightly to pull the extrudates and prevent sagging, although default "
@@ -3878,83 +4905,83 @@ msgid ""
 "before tweaking this."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:168
+#: src/libslic3r/PrintConfig.cpp:199
 msgid "Bridges"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:170
+#: src/libslic3r/PrintConfig.cpp:201
 msgid "Speed for printing bridges."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
+#: src/libslic3r/PrintConfig.cpp:202 src/libslic3r/PrintConfig.cpp:578
+#: src/libslic3r/PrintConfig.cpp:586 src/libslic3r/PrintConfig.cpp:595
+#: src/libslic3r/PrintConfig.cpp:603 src/libslic3r/PrintConfig.cpp:630
+#: src/libslic3r/PrintConfig.cpp:649 src/libslic3r/PrintConfig.cpp:875
+#: src/libslic3r/PrintConfig.cpp:1002 src/libslic3r/PrintConfig.cpp:1088
+#: src/libslic3r/PrintConfig.cpp:1124 src/libslic3r/PrintConfig.cpp:1137
+#: src/libslic3r/PrintConfig.cpp:1148 src/libslic3r/PrintConfig.cpp:1201
+#: src/libslic3r/PrintConfig.cpp:1260 src/libslic3r/PrintConfig.cpp:1388
+#: src/libslic3r/PrintConfig.cpp:1562 src/libslic3r/PrintConfig.cpp:1571
+#: src/libslic3r/PrintConfig.cpp:1966 src/libslic3r/PrintConfig.cpp:2078
 msgid "mm/s"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:178
+#: src/libslic3r/PrintConfig.cpp:209
 msgid "Brim width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:179
+#: src/libslic3r/PrintConfig.cpp:210
 msgid ""
 "Horizontal width of the brim that will be printed around each object on the "
 "first layer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:187
+#: src/libslic3r/PrintConfig.cpp:217
 msgid "Clip multi-part objects"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:188
+#: src/libslic3r/PrintConfig.cpp:218
 msgid ""
-"When printing multi-material objects, this settings will make slic3r to clip "
+"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 ""
 
-#: src/libslic3r/PrintConfig.cpp:196
+#: src/libslic3r/PrintConfig.cpp:225
 msgid "Colorprint height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:197
-msgid "Heights at which a filament change is to occur. "
+#: src/libslic3r/PrintConfig.cpp:226
+msgid "Heights at which a filament change is to occur."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:207
+#: src/libslic3r/PrintConfig.cpp:236
 msgid "Compatible printers condition"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:208
+#: src/libslic3r/PrintConfig.cpp:237
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:220
+#: src/libslic3r/PrintConfig.cpp:251
 msgid "Compatible print profiles condition"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:221
+#: src/libslic3r/PrintConfig.cpp:252
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:235
+#: src/libslic3r/PrintConfig.cpp:269
 msgid "Complete individual objects"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:236
+#: src/libslic3r/PrintConfig.cpp:270
 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). "
@@ -3962,114 +4989,114 @@ msgid ""
 "warn and prevent you from extruder collisions, but beware."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:245
+#: src/libslic3r/PrintConfig.cpp:278
 msgid "Enable auto cooling"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:246
+#: src/libslic3r/PrintConfig.cpp:279
 msgid ""
 "This flag enables the automatic cooling logic that adjusts print speed and "
 "fan speed according to layer printing time."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:252
+#: src/libslic3r/PrintConfig.cpp:284
 msgid "Cooling tube position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:253
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
+#: src/libslic3r/PrintConfig.cpp:285
+msgid "Distance of the center-point of the cooling tube from the extruder tip."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:261
+#: src/libslic3r/PrintConfig.cpp:292
 msgid "Cooling tube length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:262
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
+#: src/libslic3r/PrintConfig.cpp:293
+msgid "Length of the cooling tube to limit space for cooling moves inside it."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:271
+#: src/libslic3r/PrintConfig.cpp:301
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:281
+#: src/libslic3r/PrintConfig.cpp:310
 msgid "Default filament profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:282
+#: src/libslic3r/PrintConfig.cpp:311
 msgid ""
 "Default filament profile associated with the current printer profile. On "
 "selection of the current printer profile, this filament profile will be "
 "activated."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:287
+#: src/libslic3r/PrintConfig.cpp:317
 msgid "Default print profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:318 src/libslic3r/PrintConfig.cpp:2366
+#: src/libslic3r/PrintConfig.cpp:2377
 msgid ""
 "Default print profile associated with the current printer profile. On "
 "selection of the current printer profile, this print profile will be "
 "activated."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:293
+#: src/libslic3r/PrintConfig.cpp:324
 msgid "Disable fan for the first"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:294
+#: src/libslic3r/PrintConfig.cpp:325
 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:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
+#: src/libslic3r/PrintConfig.cpp:327 src/libslic3r/PrintConfig.cpp:947
+#: src/libslic3r/PrintConfig.cpp:1460 src/libslic3r/PrintConfig.cpp:1645
+#: src/libslic3r/PrintConfig.cpp:1706 src/libslic3r/PrintConfig.cpp:1869
+#: src/libslic3r/PrintConfig.cpp:1914
 msgid "layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:304
+#: src/libslic3r/PrintConfig.cpp:334
 msgid "Don't support bridges"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:306
+#: src/libslic3r/PrintConfig.cpp:336
 msgid ""
 "Experimental option for preventing support material from being generated "
 "under bridged areas."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:313
+#: src/libslic3r/PrintConfig.cpp:342
 msgid "Distance between copies"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:314
+#: src/libslic3r/PrintConfig.cpp:343
 msgid "Distance used for the auto-arrange feature of the plater."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:322
+#: src/libslic3r/PrintConfig.cpp:350
 msgid "Elephant foot compensation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:324
+#: src/libslic3r/PrintConfig.cpp:352
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:334
+#: src/libslic3r/PrintConfig.cpp:361
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:345
+#: src/libslic3r/PrintConfig.cpp:371
 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 "
@@ -4077,52 +5104,62 @@ msgid ""
 "extruder order."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:356
+#: src/libslic3r/PrintConfig.cpp:381
 msgid "Ensure vertical shell thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:358
+#: src/libslic3r/PrintConfig.cpp:383
 msgid ""
 "Add solid infill near sloping surfaces to guarantee the vertical shell "
 "thickness (top+bottom solid layers)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
+#: src/libslic3r/PrintConfig.cpp:389
+msgid "Top fill pattern"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:367
+#: src/libslic3r/PrintConfig.cpp:391
 msgid ""
-"Fill pattern for top/bottom infill. This only affects the external 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
+#: src/libslic3r/PrintConfig.cpp:399 src/libslic3r/PrintConfig.cpp:797
+#: src/libslic3r/PrintConfig.cpp:1947
 msgid "Rectilinear"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
+#: src/libslic3r/PrintConfig.cpp:400 src/libslic3r/PrintConfig.cpp:803
 msgid "Concentric"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
+#: src/libslic3r/PrintConfig.cpp:401 src/libslic3r/PrintConfig.cpp:807
 msgid "Hilbert Curve"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
+#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:808
 msgid "Archimedean Chords"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
+#: src/libslic3r/PrintConfig.cpp:403 src/libslic3r/PrintConfig.cpp:809
 msgid "Octagram Spiral"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
+#: src/libslic3r/PrintConfig.cpp:410
+msgid "Bottom fill pattern"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:411
+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:416 src/libslic3r/PrintConfig.cpp:426
 msgid "External perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:388
+#: src/libslic3r/PrintConfig.cpp:418
 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, "
@@ -4130,56 +5167,56 @@ msgid ""
 "(for example 200%), it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
+#: src/libslic3r/PrintConfig.cpp:421 src/libslic3r/PrintConfig.cpp:836
+#: src/libslic3r/PrintConfig.cpp:968 src/libslic3r/PrintConfig.cpp:1379
+#: src/libslic3r/PrintConfig.cpp:1717 src/libslic3r/PrintConfig.cpp:1890
+#: src/libslic3r/PrintConfig.cpp:2048
 msgid "mm or % (leave 0 for default)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:399
+#: src/libslic3r/PrintConfig.cpp:428
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
+#: src/libslic3r/PrintConfig.cpp:431 src/libslic3r/PrintConfig.cpp:857
+#: src/libslic3r/PrintConfig.cpp:1676 src/libslic3r/PrintConfig.cpp:1727
+#: src/libslic3r/PrintConfig.cpp:1933 src/libslic3r/PrintConfig.cpp:2060
 msgid "mm/s or %"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:409
+#: src/libslic3r/PrintConfig.cpp:438
 msgid "External perimeters first"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:411
+#: src/libslic3r/PrintConfig.cpp:440
 msgid ""
 "Print contour perimeters from the outermost one to the innermost one instead "
 "of the default inverse order."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:418
+#: src/libslic3r/PrintConfig.cpp:446
 msgid "Extra perimeters if needed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:420
-#, no-c-format
+#: src/libslic3r/PrintConfig.cpp:448
+#, possible-c-format
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:431
+#: src/libslic3r/PrintConfig.cpp:458
 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:444
+#: src/libslic3r/PrintConfig.cpp:470
 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 "
@@ -4187,30 +5224,30 @@ msgid ""
 "extruder can peek before colliding with other printed objects."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:455
+#: src/libslic3r/PrintConfig.cpp:480
 msgid "Radius"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:456
+#: src/libslic3r/PrintConfig.cpp:481
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:467
+#: src/libslic3r/PrintConfig.cpp:491
 msgid "Extruder Color"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
+#: src/libslic3r/PrintConfig.cpp:492 src/libslic3r/PrintConfig.cpp:552
 msgid "This is only used in the Slic3r interface as a visual help."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:475
+#: src/libslic3r/PrintConfig.cpp:498
 msgid "Extruder offset"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:476
+#: src/libslic3r/PrintConfig.cpp:499
 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 "
@@ -4218,21 +5255,21 @@ msgid ""
 "coordinates (they will be subtracted from the XY coordinate)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:486
+#: src/libslic3r/PrintConfig.cpp:508
 msgid "Extrusion axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:487
+#: src/libslic3r/PrintConfig.cpp:509
 msgid ""
 "Use this option to set the axis letter associated to your printer's extruder "
 "(usually E but some printers use A)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:493
+#: src/libslic3r/PrintConfig.cpp:514
 msgid "Extrusion multiplier"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:494
+#: src/libslic3r/PrintConfig.cpp:515
 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. "
@@ -4240,11 +5277,11 @@ msgid ""
 "more, check filament diameter and your firmware E steps."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:503
+#: src/libslic3r/PrintConfig.cpp:523
 msgid "Default extrusion width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:505
+#: src/libslic3r/PrintConfig.cpp:525
 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 "
@@ -4253,131 +5290,127 @@ msgid ""
 "height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:509
+#: src/libslic3r/PrintConfig.cpp:529
 msgid "mm or % (leave 0 for auto)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:515
+#: src/libslic3r/PrintConfig.cpp:534
 msgid "Keep fan always on"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:516
+#: src/libslic3r/PrintConfig.cpp:535
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:522
+#: src/libslic3r/PrintConfig.cpp:540
 msgid "Enable fan if layer print time is below"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:523
+#: src/libslic3r/PrintConfig.cpp:541
 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:525 src/libslic3r/PrintConfig.cpp:1711
+#: src/libslic3r/PrintConfig.cpp:543 src/libslic3r/PrintConfig.cpp:1663
 msgid "approximate seconds"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:534
+#: src/libslic3r/PrintConfig.cpp:551
 msgid "Color"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:541
+#: src/libslic3r/PrintConfig.cpp:557
 msgid "Filament notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:542
+#: src/libslic3r/PrintConfig.cpp:558
 msgid "You can put your notes regarding the filament here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
+#: src/libslic3r/PrintConfig.cpp:566 src/libslic3r/PrintConfig.cpp:1207
 msgid "Max volumetric speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:552
+#: src/libslic3r/PrintConfig.cpp:567
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
-msgid "mm³/s"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:562
+#: src/libslic3r/PrintConfig.cpp:576
 msgid "Loading speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:563
-msgid "Speed used for loading the filament on the wipe tower. "
+#: src/libslic3r/PrintConfig.cpp:577
+msgid "Speed used for loading the filament on the wipe tower."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:571
+#: src/libslic3r/PrintConfig.cpp:584
 msgid "Loading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:572
-msgid "Speed used at the very beginning of loading phase. "
+#: src/libslic3r/PrintConfig.cpp:585
+msgid "Speed used at the very beginning of loading phase."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:580
+#: src/libslic3r/PrintConfig.cpp:592
 msgid "Unloading speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:581
+#: src/libslic3r/PrintConfig.cpp:593
 msgid ""
 "Speed used for unloading the filament on the wipe tower (does not affect  "
-"initial part of unloading just after ramming). "
+"initial part of unloading just after ramming)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:590
+#: src/libslic3r/PrintConfig.cpp:601
 msgid "Unloading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:591
+#: src/libslic3r/PrintConfig.cpp:602
 msgid ""
-"Speed used for unloading the tip of the filament immediately after ramming. "
+"Speed used for unloading the tip of the filament immediately after ramming."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:599
+#: src/libslic3r/PrintConfig.cpp:609
 msgid "Delay after unloading"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:600
+#: src/libslic3r/PrintConfig.cpp:610
 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. "
+"original dimensions."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:610
+#: src/libslic3r/PrintConfig.cpp:619
 msgid "Number of cooling moves"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:611
+#: src/libslic3r/PrintConfig.cpp:620
 msgid ""
 "Filament is cooled by being moved back and forth in the cooling tubes. "
-"Specify desired number of these moves "
+"Specify desired number of these moves."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:620
+#: src/libslic3r/PrintConfig.cpp:628
 msgid "Speed of the first cooling move"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:621
-msgid "Cooling moves are gradually accelerating beginning at this speed. "
+#: src/libslic3r/PrintConfig.cpp:629
+msgid "Cooling moves are gradually accelerating beginning at this speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:629
+#: src/libslic3r/PrintConfig.cpp:636
 msgid "Minimal purge on wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:630
+#: src/libslic3r/PrintConfig.cpp:637
 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 "
@@ -4386,62 +5419,62 @@ msgid ""
 "to produce successive infill or sacrificial object extrusions reliably."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:635
+#: src/libslic3r/PrintConfig.cpp:641
 msgid "mm³"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:641
+#: src/libslic3r/PrintConfig.cpp:647
 msgid "Speed of the last cooling move"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:642
-msgid "Cooling moves are gradually accelerating towards this speed. "
+#: src/libslic3r/PrintConfig.cpp:648
+msgid "Cooling moves are gradually accelerating towards this speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:650
+#: src/libslic3r/PrintConfig.cpp:655
 msgid "Filament load time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:651
+#: src/libslic3r/PrintConfig.cpp:656
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:659
+#: src/libslic3r/PrintConfig.cpp:663
 msgid "Ramming parameters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:660
+#: src/libslic3r/PrintConfig.cpp:664
 msgid ""
 "This string is edited by RammingDialog and contains ramming specific "
-"parameters "
+"parameters."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:667
+#: src/libslic3r/PrintConfig.cpp:670
 msgid "Filament unload time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:668
+#: src/libslic3r/PrintConfig.cpp:671
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:677
+#: src/libslic3r/PrintConfig.cpp:679
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:685
+#: src/libslic3r/PrintConfig.cpp:686
 msgid "Density"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:686
+#: src/libslic3r/PrintConfig.cpp:687
 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 "
@@ -4449,7 +5482,7 @@ msgid ""
 "displacement."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:689
+#: src/libslic3r/PrintConfig.cpp:690
 msgid "g/cm³"
 msgstr ""
 
@@ -4490,72 +5523,72 @@ msgid ""
 "so this setting does not affect them."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:743
 msgid "Fill density"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:746
+#: src/libslic3r/PrintConfig.cpp:745
 msgid "Density of internal infill, expressed in the range 0% - 100%."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:782
+#: src/libslic3r/PrintConfig.cpp:780
 msgid "Fill pattern"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:784
+#: src/libslic3r/PrintConfig.cpp:782
 msgid "Fill pattern for general low-density infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:801
+#: src/libslic3r/PrintConfig.cpp:798
 msgid "Grid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:802
+#: src/libslic3r/PrintConfig.cpp:799
 msgid "Triangles"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:803
+#: src/libslic3r/PrintConfig.cpp:800
 msgid "Stars"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:804
+#: src/libslic3r/PrintConfig.cpp:801
 msgid "Cubic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:805
+#: src/libslic3r/PrintConfig.cpp:802
 msgid "Line"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
+#: src/libslic3r/PrintConfig.cpp:804 src/libslic3r/PrintConfig.cpp:1949
 msgid "Honeycomb"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:808
+#: src/libslic3r/PrintConfig.cpp:805
 msgid "3D Honeycomb"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:809
+#: src/libslic3r/PrintConfig.cpp:806
 msgid "Gyroid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
+#: src/libslic3r/PrintConfig.cpp:813 src/libslic3r/PrintConfig.cpp:822
+#: src/libslic3r/PrintConfig.cpp:830 src/libslic3r/PrintConfig.cpp:863
 msgid "First layer"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:817
+#: src/libslic3r/PrintConfig.cpp:814
 msgid ""
 "This is the acceleration your printer will use for first layer. Set zero to "
 "disable acceleration control for first layer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:827
+#: src/libslic3r/PrintConfig.cpp:823
 msgid ""
 "Heated build plate temperature for the first layer. Set this to zero to "
 "disable bed temperature control commands in the output."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:837
+#: src/libslic3r/PrintConfig.cpp:832
 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 "
@@ -4563,11 +5596,11 @@ msgid ""
 "layer height. If set to zero, it will use the default extrusion width."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:848
+#: src/libslic3r/PrintConfig.cpp:842
 msgid "First layer height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:850
+#: src/libslic3r/PrintConfig.cpp:844
 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 "
@@ -4575,52 +5608,52 @@ msgid ""
 "example: 150%) over the default layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
+#: src/libslic3r/PrintConfig.cpp:848 src/libslic3r/PrintConfig.cpp:993
+#: src/libslic3r/PrintConfig.cpp:1822
 msgid "mm or %"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:860
+#: src/libslic3r/PrintConfig.cpp:853
 msgid "First layer speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:861
+#: src/libslic3r/PrintConfig.cpp:854
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:872
+#: src/libslic3r/PrintConfig.cpp:864
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:882
+#: src/libslic3r/PrintConfig.cpp:873
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:890
+#: src/libslic3r/PrintConfig.cpp:881
 msgid "Verbose G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:891
+#: src/libslic3r/PrintConfig.cpp:882
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:899
+#: src/libslic3r/PrintConfig.cpp:889
 msgid "G-code flavor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:900
+#: src/libslic3r/PrintConfig.cpp:890
 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 "
@@ -4628,50 +5661,62 @@ msgid ""
 "extrusion value at all."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:924
+#: src/libslic3r/PrintConfig.cpp:913
 msgid "No extrusion"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:929
+#: src/libslic3r/PrintConfig.cpp:918
+msgid "Label objects"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:919
+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."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:926
 msgid "High extruder current on filament swap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:930
+#: src/libslic3r/PrintConfig.cpp:927
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:939
+#: src/libslic3r/PrintConfig.cpp:935
 msgid ""
 "This is the acceleration your printer will use for infill. Set zero to "
 "disable acceleration control for infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:948
+#: src/libslic3r/PrintConfig.cpp:943
 msgid "Combine infill every"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:950
+#: src/libslic3r/PrintConfig.cpp:945
 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:954
+#: src/libslic3r/PrintConfig.cpp:948
 msgid "Combine infill every n layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:954
 msgid "Infill extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:962
+#: src/libslic3r/PrintConfig.cpp:956
 msgid "The extruder to use when printing infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:971
+#: src/libslic3r/PrintConfig.cpp:964
 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 "
@@ -4680,32 +5725,32 @@ msgid ""
 "example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:981
+#: src/libslic3r/PrintConfig.cpp:973
 msgid "Infill before perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:982
+#: src/libslic3r/PrintConfig.cpp:974
 msgid ""
 "This option will switch the print order of perimeters and infill, making the "
 "latter first."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:988
+#: src/libslic3r/PrintConfig.cpp:979
 msgid "Only infill where needed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:990
+#: src/libslic3r/PrintConfig.cpp:981
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:998
+#: src/libslic3r/PrintConfig.cpp:988
 msgid "Infill/perimeters overlap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1000
+#: src/libslic3r/PrintConfig.cpp:990
 msgid ""
 "This setting applies an additional overlap between infill and perimeters for "
 "better bonding. Theoretically this shouldn't be needed, but backlash might "
@@ -4713,30 +5758,30 @@ msgid ""
 "perimeter extrusion width."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1012
+#: src/libslic3r/PrintConfig.cpp:1001
 msgid "Speed for printing the internal fill. Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1020
+#: src/libslic3r/PrintConfig.cpp:1009
 msgid "Inherits profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1021
+#: src/libslic3r/PrintConfig.cpp:1010
 msgid "Name of the profile, from which this profile inherits."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1032
+#: src/libslic3r/PrintConfig.cpp:1023
 msgid "Interface shells"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1033
+#: src/libslic3r/PrintConfig.cpp:1024
 msgid ""
 "Force the generation of solid shells between adjacent materials/volumes. "
 "Useful for multi-extruder prints with translucent materials or manual "
 "soluble support material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1043
+#: src/libslic3r/PrintConfig.cpp:1033
 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 "
@@ -4744,11 +5789,11 @@ msgid ""
 "[layer_z]."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1054
+#: src/libslic3r/PrintConfig.cpp:1044
 msgid "Supports remaining times"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1055
+#: src/libslic3r/PrintConfig.cpp:1045
 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. "
@@ -4756,64 +5801,152 @@ msgid ""
 "firmware supports M73 Qxx Sxx for the silent mode."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1063
-msgid "Supports silent mode"
+#: src/libslic3r/PrintConfig.cpp:1053
+msgid "Supports stealth mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1064
-msgid "Set silent mode for the G-code flavor"
+#: src/libslic3r/PrintConfig.cpp:1054
+msgid "The firmware supports stealth mode"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1078
+msgid "Maximum feedrate X"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1079
+msgid "Maximum feedrate Y"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1080
+msgid "Maximum feedrate Z"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1081
+msgid "Maximum feedrate E"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1084
+msgid "Maximum feedrate of the X axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1085
+msgid "Maximum feedrate of the Y axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1086
+msgid "Maximum feedrate of the Z axis"
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:1087
-msgid "Maximum feedrate %1%"
+msgid "Maximum feedrate of the E axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1089
-msgid "Maximum feedrate of the %1% axis"
+#: src/libslic3r/PrintConfig.cpp:1096
+msgid "Maximum acceleration X"
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:1097
-msgid "Maximum acceleration %1%"
+msgid "Maximum acceleration Y"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1098
+msgid "Maximum acceleration Z"
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:1099
-msgid "Maximum acceleration of the %1% axis"
+msgid "Maximum acceleration E"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1107
-msgid "Maximum jerk %1%"
+#: src/libslic3r/PrintConfig.cpp:1102
+msgid "Maximum acceleration of the X axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1109
-msgid "Maximum jerk of the %1% axis"
+#: src/libslic3r/PrintConfig.cpp:1103
+msgid "Maximum acceleration of the Y axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
+#: src/libslic3r/PrintConfig.cpp:1104
+msgid "Maximum acceleration of the Z axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1105
+msgid "Maximum acceleration of the E axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1114
+msgid "Maximum jerk X"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1115
+msgid "Maximum jerk Y"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1116
+msgid "Maximum jerk Z"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1117
+msgid "Maximum jerk E"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1120
+msgid "Maximum jerk of the X axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1121
+msgid "Maximum jerk of the Y axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1122
+msgid "Maximum jerk of the Z axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1123
+msgid "Maximum jerk of the E axis"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1134
 msgid "Minimum feedrate when extruding"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
+#: src/libslic3r/PrintConfig.cpp:1136
+msgid "Minimum feedrate when extruding (M205 S)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1145
 msgid "Minimum travel feedrate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
+#: src/libslic3r/PrintConfig.cpp:1147
+msgid "Minimum travel feedrate (M205 T)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1156
 msgid "Maximum acceleration when extruding"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
+#: src/libslic3r/PrintConfig.cpp:1158
+msgid "Maximum acceleration when extruding (M204 S)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1167
 msgid "Maximum acceleration when retracting"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
+#: src/libslic3r/PrintConfig.cpp:1169
+msgid "Maximum acceleration when retracting (M204 T)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:1177 src/libslic3r/PrintConfig.cpp:1186
 msgid "Max"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1164
+#: src/libslic3r/PrintConfig.cpp:1178
 msgid "This setting represents the maximum speed of your fan."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1174
-#, no-c-format
+#: src/libslic3r/PrintConfig.cpp:1187
+#, possible-c-format
 msgid ""
 "This is the highest printable layer height for this extruder, used to cap "
 "the variable layer height and support layer height. Maximum recommended "
@@ -4821,28 +5954,28 @@ msgid ""
 "adhesion. If set to 0, layer height is limited to 75% of the nozzle diameter."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1185
+#: src/libslic3r/PrintConfig.cpp:1197
 msgid "Max print speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1186
+#: src/libslic3r/PrintConfig.cpp:1198
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1197
+#: src/libslic3r/PrintConfig.cpp:1208
 msgid ""
 "This experimental setting is used to set the maximum volumetric speed your "
 "extruder supports."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1206
+#: src/libslic3r/PrintConfig.cpp:1217
 msgid "Max volumetric slope positive"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
+#: src/libslic3r/PrintConfig.cpp:1218 src/libslic3r/PrintConfig.cpp:1229
 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 "
@@ -4850,119 +5983,99 @@ msgid ""
 "s) to 5.4 mm³/s (feedrate 60 mm/s) will take at least 2 seconds."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
+#: src/libslic3r/PrintConfig.cpp:1222 src/libslic3r/PrintConfig.cpp:1233
 msgid "mm³/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1218
+#: src/libslic3r/PrintConfig.cpp:1228
 msgid "Max volumetric slope negative"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
+#: src/libslic3r/PrintConfig.cpp:1240 src/libslic3r/PrintConfig.cpp:1249
 msgid "Min"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1231
+#: src/libslic3r/PrintConfig.cpp:1241
 msgid "This setting represents the minimum PWM your fan needs to work."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1241
+#: src/libslic3r/PrintConfig.cpp:1250
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1250
+#: src/libslic3r/PrintConfig.cpp:1258
 msgid "Min print speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1251
+#: src/libslic3r/PrintConfig.cpp:1259
 msgid "Slic3r will not scale speed down below this speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1259
+#: src/libslic3r/PrintConfig.cpp:1266
 msgid "Minimal filament extrusion length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1260
+#: src/libslic3r/PrintConfig.cpp:1267
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1270
+#: src/libslic3r/PrintConfig.cpp:1276
 msgid "Configuration notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1271
+#: src/libslic3r/PrintConfig.cpp:1277
 msgid ""
 "You can put here your personal notes. This text will be added to the G-code "
 "header comments."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1281
+#: src/libslic3r/PrintConfig.cpp:1286
 msgid "Nozzle diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1287
 msgid ""
 "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1288
+#: src/libslic3r/PrintConfig.cpp:1292
 msgid "Host Type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1289
+#: src/libslic3r/PrintConfig.cpp:1293
 msgid ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
+#: src/libslic3r/PrintConfig.cpp:1304
 msgid "Only retract when crossing perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1326
+#: src/libslic3r/PrintConfig.cpp:1305
 msgid ""
 "Disables retraction when the travel path does not exceed the upper layer's "
 "perimeters (and thus any ooze will be probably invisible)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1334
+#: src/libslic3r/PrintConfig.cpp:1312
 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:1342
+#: src/libslic3r/PrintConfig.cpp:1319
 msgid "Output filename format"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1343
+#: src/libslic3r/PrintConfig.cpp:1320
 msgid ""
 "You can use all configuration options as variables inside this template. For "
 "example: [layer_height], [fill_density] etc. You can also use [timestamp], "
@@ -4970,60 +6083,60 @@ msgid ""
 "[input_filename], [input_filename_base]."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1329
 msgid "Detect bridging perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1355
+#: src/libslic3r/PrintConfig.cpp:1331
 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:1362
+#: src/libslic3r/PrintConfig.cpp:1337
 msgid "Filament parking position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1363
+#: src/libslic3r/PrintConfig.cpp:1338
 msgid ""
 "Distance of the extruder tip from the position where the filament is parked "
-"when unloaded. This should match the value in printer firmware. "
+"when unloaded. This should match the value in printer firmware."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1372
+#: src/libslic3r/PrintConfig.cpp:1346
 msgid "Extra loading distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1373
+#: src/libslic3r/PrintConfig.cpp:1347
 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. "
+"than unloading."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
+#: src/libslic3r/PrintConfig.cpp:1355 src/libslic3r/PrintConfig.cpp:1373
+#: src/libslic3r/PrintConfig.cpp:1385 src/libslic3r/PrintConfig.cpp:1395
 msgid "Perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1383
+#: src/libslic3r/PrintConfig.cpp:1356
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1392
+#: src/libslic3r/PrintConfig.cpp:1364
 msgid "Perimeter extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1394
+#: src/libslic3r/PrintConfig.cpp:1366
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1404
+#: src/libslic3r/PrintConfig.cpp:1375
 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 "
@@ -5032,12 +6145,12 @@ msgid ""
 "it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1417
+#: src/libslic3r/PrintConfig.cpp:1387
 msgid ""
 "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1427
+#: src/libslic3r/PrintConfig.cpp:1397
 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 "
@@ -5045,11 +6158,11 @@ msgid ""
 "Perimeters option is enabled."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1431
+#: src/libslic3r/PrintConfig.cpp:1401
 msgid "(minimum)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1439
+#: src/libslic3r/PrintConfig.cpp:1409
 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. "
@@ -5058,55 +6171,55 @@ msgid ""
 "environment variables."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1452
+#: src/libslic3r/PrintConfig.cpp:1421
 msgid "Printer type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1453
+#: src/libslic3r/PrintConfig.cpp:1422
 msgid "Type of the printer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1457
+#: src/libslic3r/PrintConfig.cpp:1427
 msgid "Printer notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1458
+#: src/libslic3r/PrintConfig.cpp:1428
 msgid "You can put your notes regarding the printer here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1467
+#: src/libslic3r/PrintConfig.cpp:1436
 msgid "Printer vendor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1468
+#: src/libslic3r/PrintConfig.cpp:1437
 msgid "Name of the printer vendor."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1472
+#: src/libslic3r/PrintConfig.cpp:1442
 msgid "Printer variant"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1473
+#: src/libslic3r/PrintConfig.cpp:1443
 msgid ""
 "Name of the printer variant. For example, the printer variants may be "
 "differentiated by a nozzle diameter."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1483
+#: src/libslic3r/PrintConfig.cpp:1456
 msgid "Raft layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1485
+#: src/libslic3r/PrintConfig.cpp:1458
 msgid ""
 "The object will be raised by this number of layers, and support material "
 "will be generated under it."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1494
+#: src/libslic3r/PrintConfig.cpp:1466
 msgid "Resolution"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1495
+#: src/libslic3r/PrintConfig.cpp:1467
 msgid ""
 "Minimum detail resolution, used to simplify the input file for speeding up "
 "the slicing job and reducing memory usage. High-resolution models often "
@@ -5114,282 +6227,278 @@ msgid ""
 "simplification and use full resolution from input."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1506
+#: src/libslic3r/PrintConfig.cpp:1477
 msgid "Minimum travel after retraction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1507
+#: src/libslic3r/PrintConfig.cpp:1478
 msgid ""
 "Retraction is not triggered when travel moves are shorter than this length."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1514
+#: src/libslic3r/PrintConfig.cpp:1484
 msgid "Retract amount before wipe"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1515
+#: src/libslic3r/PrintConfig.cpp:1485
 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:1523
+#: src/libslic3r/PrintConfig.cpp:1492
 msgid "Retract on layer change"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1493
 msgid "This flag enforces a retraction whenever a Z move is done."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
+#: src/libslic3r/PrintConfig.cpp:1498 src/libslic3r/PrintConfig.cpp:1506
 msgid "Length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1531
+#: src/libslic3r/PrintConfig.cpp:1499
 msgid "Retraction Length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1532
+#: src/libslic3r/PrintConfig.cpp:1500
 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:1534 src/libslic3r/PrintConfig.cpp:1544
+#: src/libslic3r/PrintConfig.cpp:1502 src/libslic3r/PrintConfig.cpp:1511
 msgid "mm (zero to disable)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1540
+#: src/libslic3r/PrintConfig.cpp:1507
 msgid "Retraction Length (Toolchange)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1541
+#: src/libslic3r/PrintConfig.cpp:1508
 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:1550
+#: src/libslic3r/PrintConfig.cpp:1516
 msgid "Lift Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1551
+#: src/libslic3r/PrintConfig.cpp:1517
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1559
+#: src/libslic3r/PrintConfig.cpp:1524
 msgid "Above Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1560
+#: src/libslic3r/PrintConfig.cpp:1525
 msgid "Only lift Z above"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1561
+#: src/libslic3r/PrintConfig.cpp:1526
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1569
+#: src/libslic3r/PrintConfig.cpp:1533
 msgid "Below Z"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1570
+#: src/libslic3r/PrintConfig.cpp:1534
 msgid "Only lift Z below"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1571
+#: src/libslic3r/PrintConfig.cpp:1535
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
+#: src/libslic3r/PrintConfig.cpp:1543 src/libslic3r/PrintConfig.cpp:1551
 msgid "Extra length on restart"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1581
+#: src/libslic3r/PrintConfig.cpp:1544
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1590
+#: src/libslic3r/PrintConfig.cpp:1552
 msgid ""
 "When the retraction is compensated after changing tool, the extruder will "
 "push this additional amount of filament."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
+#: src/libslic3r/PrintConfig.cpp:1559 src/libslic3r/PrintConfig.cpp:1560
 msgid "Retraction Speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1600
+#: src/libslic3r/PrintConfig.cpp:1561
 msgid "The speed for retractions (it only applies to the extruder motor)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
+#: src/libslic3r/PrintConfig.cpp:1567 src/libslic3r/PrintConfig.cpp:1568
 msgid "Deretraction Speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1609
+#: src/libslic3r/PrintConfig.cpp:1569
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1617
+#: src/libslic3r/PrintConfig.cpp:1576
 msgid "Seam position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1619
+#: src/libslic3r/PrintConfig.cpp:1578
 msgid "Position of perimeters starting points."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1626
+#: src/libslic3r/PrintConfig.cpp:1584
 msgid "Random"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1627
+#: src/libslic3r/PrintConfig.cpp:1585
 msgid "Nearest"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1628
+#: src/libslic3r/PrintConfig.cpp:1586
 msgid "Aligned"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1636
+#: src/libslic3r/PrintConfig.cpp:1594
 msgid "Direction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1638
+#: src/libslic3r/PrintConfig.cpp:1596
 msgid "Preferred direction of the seam"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1639
+#: src/libslic3r/PrintConfig.cpp:1597
 msgid "Seam preferred direction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1647
+#: src/libslic3r/PrintConfig.cpp:1604
 msgid "Jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1649
+#: src/libslic3r/PrintConfig.cpp:1606
 msgid "Seam preferred direction jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1650
+#: src/libslic3r/PrintConfig.cpp:1607
 msgid "Preferred direction of the seam - jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1661
+#: src/libslic3r/PrintConfig.cpp:1617
 msgid "USB/serial port for printer connection."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1669
+#: src/libslic3r/PrintConfig.cpp:1624
 msgid "Serial port speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1670
+#: src/libslic3r/PrintConfig.cpp:1625
 msgid "Speed (baud) of USB/serial port for printer connection."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1679
+#: src/libslic3r/PrintConfig.cpp:1634
 msgid "Distance from object"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1680
+#: src/libslic3r/PrintConfig.cpp:1635
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1688
+#: src/libslic3r/PrintConfig.cpp:1642
 msgid "Skirt height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1689
+#: src/libslic3r/PrintConfig.cpp:1643
 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:1697
+#: src/libslic3r/PrintConfig.cpp:1650
 msgid "Loops (minimum)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1698
+#: src/libslic3r/PrintConfig.cpp:1651
 msgid "Skirt Loops"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1699
+#: src/libslic3r/PrintConfig.cpp:1652
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1708
+#: src/libslic3r/PrintConfig.cpp:1660
 msgid "Slow down if layer print time is below"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1709
+#: src/libslic3r/PrintConfig.cpp:1661
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1720
+#: src/libslic3r/PrintConfig.cpp:1671
 msgid "Small perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1722
+#: src/libslic3r/PrintConfig.cpp:1673
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1732
+#: src/libslic3r/PrintConfig.cpp:1683
 msgid "Solid infill threshold area"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1734
+#: src/libslic3r/PrintConfig.cpp:1685
 msgid ""
 "Force solid infill for regions having a smaller area than the specified "
 "threshold."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1735
+#: src/libslic3r/PrintConfig.cpp:1686
 msgid "mm²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1742
+#: src/libslic3r/PrintConfig.cpp:1692
 msgid "Solid infill extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1744
+#: src/libslic3r/PrintConfig.cpp:1694
 msgid "The extruder to use when printing solid infill."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1751
+#: src/libslic3r/PrintConfig.cpp:1700
 msgid "Solid infill every"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1753
+#: src/libslic3r/PrintConfig.cpp:1702
 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 "
@@ -5397,7 +6506,7 @@ msgid ""
 "according to nozzle diameter and layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1766
+#: src/libslic3r/PrintConfig.cpp:1714
 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, "
@@ -5405,22 +6514,22 @@ msgid ""
 "(for example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1777
+#: src/libslic3r/PrintConfig.cpp:1724
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1789
+#: src/libslic3r/PrintConfig.cpp:1736
 msgid "Number of solid layers to generate on top and bottom surfaces."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1796
+#: src/libslic3r/PrintConfig.cpp:1742
 msgid "Spiral vase"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1797
+#: src/libslic3r/PrintConfig.cpp:1743
 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, "
@@ -5429,18 +6538,18 @@ msgid ""
 "when printing more than an object."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1806
+#: src/libslic3r/PrintConfig.cpp:1751
 msgid "Temperature variation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1807
+#: src/libslic3r/PrintConfig.cpp:1752
 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:1818
+#: src/libslic3r/PrintConfig.cpp:1762
 msgid ""
 "This start procedure is inserted at the beginning, after bed has reached the "
 "target temperature and extruder just started heating, and before extruder "
@@ -5451,7 +6560,7 @@ msgid ""
 "\"M109 S[first_layer_temperature]\" command wherever you want."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1834
+#: src/libslic3r/PrintConfig.cpp:1777
 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 "
@@ -5463,93 +6572,93 @@ msgid ""
 "extruders, the gcode is processed in extruder order."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1850
+#: src/libslic3r/PrintConfig.cpp:1792
 msgid "Single Extruder Multi Material"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1851
+#: src/libslic3r/PrintConfig.cpp:1793
 msgid "The printer multiplexes filaments into a single hot end."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1857
+#: src/libslic3r/PrintConfig.cpp:1798
 msgid "Prime all printing extruders"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1858
+#: src/libslic3r/PrintConfig.cpp:1799
 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:1864
+#: src/libslic3r/PrintConfig.cpp:1804
 msgid "Generate support material"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1866
+#: src/libslic3r/PrintConfig.cpp:1806
 msgid "Enable support material generation."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1871
+#: src/libslic3r/PrintConfig.cpp:1810
 msgid "Auto generated supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:1812
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1880
+#: src/libslic3r/PrintConfig.cpp:1818
 msgid "XY separation between an object and its support"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1882
+#: src/libslic3r/PrintConfig.cpp:1820
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1893
+#: src/libslic3r/PrintConfig.cpp:1830
 msgid "Pattern angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1832
 msgid ""
 "Use this setting to rotate the support material pattern on the horizontal "
 "plane."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1906
+#: src/libslic3r/PrintConfig.cpp:1842 src/libslic3r/PrintConfig.cpp:2450
 msgid ""
 "Only create support if it lies on a build plate. Don't create support on a "
 "print."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1913
+#: src/libslic3r/PrintConfig.cpp:1848
 msgid "Contact Z distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:1850
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1923
-msgid "soluble"
+#: src/libslic3r/PrintConfig.cpp:1857
+msgid "0 (soluble)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1924
-msgid "detachable"
+#: src/libslic3r/PrintConfig.cpp:1858
+msgid "0.2 (detachable)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1929
+#: src/libslic3r/PrintConfig.cpp:1863
 msgid "Enforce support for the first"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1931
+#: src/libslic3r/PrintConfig.cpp:1865
 msgid ""
 "Generate support material for the specified number of layers counting from "
 "bottom, regardless of whether normal support material is enabled or not and "
@@ -5557,21 +6666,21 @@ msgid ""
 "of objects having a very thin or poor footprint on the build plate."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1870
 msgid "Enforce support for the first n layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1943
+#: src/libslic3r/PrintConfig.cpp:1876
 msgid "Support material/raft/skirt extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1945
+#: src/libslic3r/PrintConfig.cpp:1878
 msgid ""
 "The extruder to use when printing support material, raft and skirt (1+, 0 to "
 "use the current extruder to minimize tool changes)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1955
+#: src/libslic3r/PrintConfig.cpp:1887
 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, "
@@ -5579,89 +6688,89 @@ msgid ""
 "example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1964
+#: src/libslic3r/PrintConfig.cpp:1895
 msgid "Interface loops"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1966
+#: src/libslic3r/PrintConfig.cpp:1897
 msgid ""
 "Cover the top contact layer of the supports with loops. Disabled by default."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1972
+#: src/libslic3r/PrintConfig.cpp:1902
 msgid "Support material/raft interface extruder"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1974
+#: src/libslic3r/PrintConfig.cpp:1904
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1982
+#: src/libslic3r/PrintConfig.cpp:1911
 msgid "Interface layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1984
+#: src/libslic3r/PrintConfig.cpp:1913
 msgid ""
 "Number of interface layers to insert between the object(s) and support "
 "material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1992
+#: src/libslic3r/PrintConfig.cpp:1920
 msgid "Interface pattern spacing"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1994
+#: src/libslic3r/PrintConfig.cpp:1922
 msgid "Spacing between interface lines. Set zero to get a solid interface."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2004
+#: src/libslic3r/PrintConfig.cpp:1931
 msgid ""
 "Speed for printing support material interface layers. If expressed as "
 "percentage (for example 50%) it will be calculated over support material "
 "speed."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2013
+#: src/libslic3r/PrintConfig.cpp:1940
 msgid "Pattern"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2015
+#: src/libslic3r/PrintConfig.cpp:1942
 msgid "Pattern used to generate support material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2022
+#: src/libslic3r/PrintConfig.cpp:1948
 msgid "Rectilinear grid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2028
+#: src/libslic3r/PrintConfig.cpp:1954
 msgid "Pattern spacing"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2030
+#: src/libslic3r/PrintConfig.cpp:1956
 msgid "Spacing between support material lines."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2040
+#: src/libslic3r/PrintConfig.cpp:1965
 msgid "Speed for printing support material."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2047
+#: src/libslic3r/PrintConfig.cpp:1972
 msgid "Synchronize with object layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2049
+#: src/libslic3r/PrintConfig.cpp:1974
 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:2056
+#: src/libslic3r/PrintConfig.cpp:1980
 msgid "Overhang threshold"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2058
+#: src/libslic3r/PrintConfig.cpp:1982
 msgid ""
 "Support material will not be generated for overhangs whose slope angle (90° "
 "= vertical) is above the given threshold. In other words, this value "
@@ -5670,54 +6779,50 @@ msgid ""
 "detection (recommended)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2071
+#: src/libslic3r/PrintConfig.cpp:1994
 msgid "With sheath around the support"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2073
+#: src/libslic3r/PrintConfig.cpp:1996
 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:2081
+#: src/libslic3r/PrintConfig.cpp:2003
 msgid ""
 "Extruder temperature for layers after the first one. Set this to zero to "
 "disable temperature control commands in the output."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2084
-msgid "Temperature"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2090
+#: src/libslic3r/PrintConfig.cpp:2011
 msgid "Detect thin walls"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2092
+#: src/libslic3r/PrintConfig.cpp:2013
 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:2099
+#: src/libslic3r/PrintConfig.cpp:2019
 msgid "Threads"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2100
+#: src/libslic3r/PrintConfig.cpp:2020
 msgid ""
 "Threads are used to parallelize long-running tasks. Optimal threads number "
 "is slightly above the number of available cores/processors."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2112
+#: src/libslic3r/PrintConfig.cpp:2032
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2125
+#: src/libslic3r/PrintConfig.cpp:2044
 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 "
@@ -5726,7 +6831,7 @@ msgid ""
 "percentage (for example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2055
 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 "
@@ -5735,48 +6840,43 @@ msgid ""
 "for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2151
+#: src/libslic3r/PrintConfig.cpp:2070
 msgid "Number of solid layers to generate on top surfaces."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2153
+#: src/libslic3r/PrintConfig.cpp:2071
 msgid "Top solid layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2159
+#: src/libslic3r/PrintConfig.cpp:2077
 msgid "Speed for travel moves (jumps between distant extrusion points)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2168
+#: src/libslic3r/PrintConfig.cpp:2085
 msgid "Use firmware retraction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2169
+#: src/libslic3r/PrintConfig.cpp:2086
 msgid ""
 "This experimental setting uses G10 and G11 commands to have the firmware "
 "handle the retraction. This is only supported in recent Marlin."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2176
+#: src/libslic3r/PrintConfig.cpp:2092
 msgid "Use relative E distances"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2177
+#: src/libslic3r/PrintConfig.cpp:2093
 msgid ""
 "If your firmware requires relative E values, check this, otherwise leave it "
 "unchecked. Most firmwares use absolute values."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2184
+#: src/libslic3r/PrintConfig.cpp:2099
 msgid "Use volumetric E"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2185
+#: src/libslic3r/PrintConfig.cpp:2100
 msgid ""
 "This experimental setting uses outputs the E values in cubic millimeters "
 "instead of linear millimeters. If your firmware doesn't already know "
@@ -5786,131 +6886,127 @@ msgid ""
 "only supported in recent Marlin."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2196
+#: src/libslic3r/PrintConfig.cpp:2110
 msgid "Enable variable layer height feature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2197
+#: src/libslic3r/PrintConfig.cpp:2111
 msgid ""
 "Some printers or printer setups may have difficulties printing with a "
 "variable layer height. Enabled by default."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2204
+#: src/libslic3r/PrintConfig.cpp:2117
 msgid "Wipe while retracting"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2205
+#: src/libslic3r/PrintConfig.cpp:2118
 msgid ""
 "This flag will move the nozzle while retracting to minimize the possible "
 "blob on leaky extruders."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2213
+#: src/libslic3r/PrintConfig.cpp:2125
 msgid ""
 "Multi material printers may need to prime or purge extruders on tool "
 "changes. Extrude the excess material into the wipe tower."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2220
+#: src/libslic3r/PrintConfig.cpp:2131
 msgid "Purging volumes - load/unload volumes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2221
+#: src/libslic3r/PrintConfig.cpp:2132
 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. "
+"volumes below."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2228
+#: src/libslic3r/PrintConfig.cpp:2138
 msgid "Purging volumes - matrix"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2229
+#: src/libslic3r/PrintConfig.cpp:2139
 msgid ""
 "This matrix describes volumes (in cubic milimetres) required to purge the "
-"new filament on the wipe tower for any given pair of tools. "
+"new filament on the wipe tower for any given pair of tools."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2239
+#: src/libslic3r/PrintConfig.cpp:2148
 msgid "Position X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2240
+#: src/libslic3r/PrintConfig.cpp:2149
 msgid "X coordinate of the left front corner of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2247
+#: src/libslic3r/PrintConfig.cpp:2155
 msgid "Position Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2248
+#: src/libslic3r/PrintConfig.cpp:2156
 msgid "Y coordinate of the left front corner of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2256
+#: src/libslic3r/PrintConfig.cpp:2163
 msgid "Width of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2263
+#: src/libslic3r/PrintConfig.cpp:2169
 msgid "Wipe tower rotation angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2264
-msgid "Wipe tower rotation angle with respect to x-axis "
+#: src/libslic3r/PrintConfig.cpp:2170
+msgid "Wipe tower rotation angle with respect to x-axis."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2265
-msgid "degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2272
+#: src/libslic3r/PrintConfig.cpp:2177
 msgid "Wipe into this object's infill"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2273
+#: src/libslic3r/PrintConfig.cpp:2178
 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:2281
+#: src/libslic3r/PrintConfig.cpp:2185
 msgid "Wipe into this object"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2282
+#: src/libslic3r/PrintConfig.cpp:2186
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2289
+#: src/libslic3r/PrintConfig.cpp:2192
 msgid "Maximal bridging distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2290
-msgid "Maximal distance between supports on sparse infill sections. "
+#: src/libslic3r/PrintConfig.cpp:2193
+msgid "Maximal distance between supports on sparse infill sections."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2297
+#: src/libslic3r/PrintConfig.cpp:2199
 msgid "XY Size Compensation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2299
+#: src/libslic3r/PrintConfig.cpp:2201
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2308
+#: src/libslic3r/PrintConfig.cpp:2209
 msgid "Z offset"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2309
+#: src/libslic3r/PrintConfig.cpp:2210
 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 "
@@ -5918,389 +7014,498 @@ msgid ""
 "print bed, set this to -0.3 (or fix your endstop)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
+#: src/libslic3r/PrintConfig.cpp:2227
 msgid "Display width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2374
+#: src/libslic3r/PrintConfig.cpp:2228
 msgid "Width of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2380
+#: src/libslic3r/PrintConfig.cpp:2233
 msgid "Display height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2381
+#: src/libslic3r/PrintConfig.cpp:2234
 msgid "Height of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2387
+#: src/libslic3r/PrintConfig.cpp:2239
 msgid "Number of pixels in"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2389
+#: src/libslic3r/PrintConfig.cpp:2241
 msgid "Number of pixels in X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2396
+#: src/libslic3r/PrintConfig.cpp:2247
 msgid "Number of pixels in Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2402
+#: src/libslic3r/PrintConfig.cpp:2252
 msgid "Display orientation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2403
+#: src/libslic3r/PrintConfig.cpp:2253
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2410
+#: src/libslic3r/PrintConfig.cpp:2259
 msgid "Landscape"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2411
+#: src/libslic3r/PrintConfig.cpp:2260
 msgid "Portrait"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
+#: src/libslic3r/PrintConfig.cpp:2265
+msgid "Fast"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2266
+msgid "Fast tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2267
+msgid "Time of the fast tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2274
+msgid "Slow"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2275
+msgid "Slow tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2276
+msgid "Time of the slow tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2283
+msgid "Area fill"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2284
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:2291 src/libslic3r/PrintConfig.cpp:2292
+#: src/libslic3r/PrintConfig.cpp:2293
 msgid "Printer scaling correction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
+#: src/libslic3r/PrintConfig.cpp:2299 src/libslic3r/PrintConfig.cpp:2300
+msgid "Printer absolute correction"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2301
+msgid ""
+"Will inflate or deflate the sliced 2D polygons according to the sign of the "
+"correction."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2307 src/libslic3r/PrintConfig.cpp:2308
+msgid "Printer gamma correction"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2309
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2321
 msgid "Initial layer height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
+#: src/libslic3r/PrintConfig.cpp:2327
+msgid "Faded layers"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2328
+msgid ""
+"Number of the layers needed for the exposure time fade from initial exposure "
+"time to the exposure time"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2336
+msgid "Exposure time"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2342 src/libslic3r/PrintConfig.cpp:2343
 msgid "Initial exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
+#: src/libslic3r/PrintConfig.cpp:2349 src/libslic3r/PrintConfig.cpp:2350
+msgid "Correction for expansion"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
+#: src/libslic3r/PrintConfig.cpp:2356
 msgid "SLA print material notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2459
+#: src/libslic3r/PrintConfig.cpp:2357
 msgid "You can put your notes regarding the SLA print material here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
+#: src/libslic3r/PrintConfig.cpp:2365 src/libslic3r/PrintConfig.cpp:2376
 msgid "Default SLA material profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2487
+#: src/libslic3r/PrintConfig.cpp:2387
 msgid "Generate supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2489
+#: src/libslic3r/PrintConfig.cpp:2389
 msgid "Generate supports for the models"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2494
+#: src/libslic3r/PrintConfig.cpp:2394
 msgid "Support head front diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2396
 msgid "Diameter of the pointing side of the head"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2503
+#: src/libslic3r/PrintConfig.cpp:2403
 msgid "Support head penetration"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2505
+#: src/libslic3r/PrintConfig.cpp:2405
 msgid "How much the pinhead has to penetrate the model surface"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2412
 msgid "Support head width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2514
+#: src/libslic3r/PrintConfig.cpp:2414
 msgid "Width from the back sphere center to the front sphere center"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2521
+#: src/libslic3r/PrintConfig.cpp:2422
 msgid "Support pillar diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2523
+#: src/libslic3r/PrintConfig.cpp:2424
 msgid "Diameter in mm of the support pillars"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2530
+#: src/libslic3r/PrintConfig.cpp:2432
 msgid "Support pillar connection mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2531
+#: src/libslic3r/PrintConfig.cpp:2433
 msgid ""
-"Controls the bridge type between two neigboring pillars. Can be zig-zag, "
+"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:2540
+#: src/libslic3r/PrintConfig.cpp:2441
 msgid "Zig-Zag"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2541
+#: src/libslic3r/PrintConfig.cpp:2442
 msgid "Cross"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2542
+#: src/libslic3r/PrintConfig.cpp:2443
 msgid "Dynamic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2546
+#: src/libslic3r/PrintConfig.cpp:2455
 msgid "Pillar widening factor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2548
+#: src/libslic3r/PrintConfig.cpp:2457
 msgid ""
 "Merging bridges or pillars into another pillars can increase the radius. "
 "Zero means no increase, one means full increase."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2557
+#: src/libslic3r/PrintConfig.cpp:2466
 msgid "Support base diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2559
+#: src/libslic3r/PrintConfig.cpp:2468
 msgid "Diameter in mm of the pillar base"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2566
+#: src/libslic3r/PrintConfig.cpp:2476
 msgid "Support base height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2568
+#: src/libslic3r/PrintConfig.cpp:2478
 msgid "The height of the pillar base cone"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2575
+#: src/libslic3r/PrintConfig.cpp:2485
 msgid "Critical angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2577
+#: src/libslic3r/PrintConfig.cpp:2487
 msgid "The default angle for connecting support sticks and junctions."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2584
+#: src/libslic3r/PrintConfig.cpp:2495
 msgid "Max bridge length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2586
+#: src/libslic3r/PrintConfig.cpp:2497
 msgid "The max length of a bridge"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2593
+#: src/libslic3r/PrintConfig.cpp:2504
+msgid "Max pillar linking distance"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2506
+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:2514
 msgid "Object elevation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2595
+#: src/libslic3r/PrintConfig.cpp:2516
 msgid "How much the supports should lift up the supported object."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
+#: src/libslic3r/PrintConfig.cpp:2526
+msgid "This is a relative measure of support points density."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
+#: src/libslic3r/PrintConfig.cpp:2532
+msgid "Minimal distance of the support points"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
+#: src/libslic3r/PrintConfig.cpp:2534
+msgid "No support points will be placed closer than this threshold."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
+#: src/libslic3r/PrintConfig.cpp:2540
 msgid "Use pad"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2631
+#: src/libslic3r/PrintConfig.cpp:2542
 msgid "Add a pad underneath the supported model"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2636
+#: src/libslic3r/PrintConfig.cpp:2547
 msgid "Pad wall thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2645
+#: src/libslic3r/PrintConfig.cpp:2549
+msgid "The thickness of the pad and its optional cavity walls."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2557
 msgid "Pad wall height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2654
+#: src/libslic3r/PrintConfig.cpp:2558
+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:2571
 msgid "Max merge distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2663
+#: src/libslic3r/PrintConfig.cpp:2573
+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:2584
 msgid "Pad edge radius"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
+#: src/libslic3r/PrintConfig.cpp:2593
+msgid "Pad wall slope"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3023
+#: src/libslic3r/PrintConfig.cpp:2595
 msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
+"The slope of the pad wall relative to the bed plane. 90 degrees means "
+"straight walls."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
+#: src/libslic3r/PrintConfig.cpp:2957
+msgid "Export OBJ"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
+#: src/libslic3r/PrintConfig.cpp:2958
+msgid "Export the model(s) as OBJ."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3038
+#: src/libslic3r/PrintConfig.cpp:2969
+msgid "Export SLA"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2970
+msgid "Slice the model and export SLA printing layers as PNG."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2975
 msgid "Export 3MF"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
+#: src/libslic3r/PrintConfig.cpp:2976
+msgid "Export the model(s) as 3MF."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3044
+#: src/libslic3r/PrintConfig.cpp:2980
+msgid "Export AMF"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2981
+msgid "Export the model(s) as AMF."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2985
+msgid "Export STL"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2986
+msgid "Export the model(s) as STL."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2991
+msgid "Slice the model and export toolpaths as G-code."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2996
 msgid "Slice"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
+#: src/libslic3r/PrintConfig.cpp:2997
+msgid ""
+"Slice the model as FFF or SLA based on the printer_technology configuration "
+"value."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3050
+#: src/libslic3r/PrintConfig.cpp:3002
 msgid "Help"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3051
+#: src/libslic3r/PrintConfig.cpp:3003
 msgid "Show this help."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
+#: src/libslic3r/PrintConfig.cpp:3008
+msgid "Help (FFF options)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
+#: src/libslic3r/PrintConfig.cpp:3009
+msgid "Show the full list of print/G-code configuration options."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3063
+#: src/libslic3r/PrintConfig.cpp:3013
+msgid "Help (SLA options)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3014
+msgid "Show the full list of SLA print configuration options."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3018
 msgid "Output Model Info"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3064
+#: src/libslic3r/PrintConfig.cpp:3019
 msgid "Write information about the model to the console."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
+#: src/libslic3r/PrintConfig.cpp:3023
+msgid "Save config file"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3024
+msgid "Save configuration to the specified file."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3034
+msgid "Align XY"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3035
+msgid "Align the model to the given point."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3040
+msgid "Cut model at the given Z."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3061
+msgid "Center"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3062
+msgid "Center the print around the given center."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3066
+msgid "Don't arrange"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3067
+msgid ""
+"Do not rearrange the given models before merging and keep their original XY "
+"coordinates."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
+msgid "Duplicate"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3071
+msgid "Multiply copies by this factor."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
+msgid "Duplicate by grid"
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3076
+msgid "Multiply copies by creating a grid."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3079
+msgid "Merge"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3080
 msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
+"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:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
+#: src/libslic3r/PrintConfig.cpp:3085
 msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
+"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:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
+#: src/libslic3r/PrintConfig.cpp:3089
+msgid "Rotation angle around the Z axis in degrees."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3093
@@ -6308,35 +7513,108 @@ msgid "Rotate around X"
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
+msgid "Rotation angle around the X axis in degrees."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3099
+#: src/libslic3r/PrintConfig.cpp:3098
 msgid "Rotate around Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
+#: src/libslic3r/PrintConfig.cpp:3099
+msgid "Rotation angle around the Y axis in degrees."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
+#: src/libslic3r/PrintConfig.cpp:3104
+msgid "Scaling factor or percentage."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
+#: src/libslic3r/PrintConfig.cpp:3109
+msgid ""
+"Detect unconnected parts in the given model(s) and split them into separate "
+"objects."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
+msgid "Scale to Fit"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
+#: src/libslic3r/PrintConfig.cpp:3113
+msgid "Scale to fit the given volume."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3122
+msgid "Ignore non-existent config files"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3123
+msgid "Do not fail if a file supplied to --load does not exist."
 msgstr ""
 
 #: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
+msgid "Load config file"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3127
+msgid ""
+"Load configuration from the specified file. It can be used more than once to "
+"load options from multiple files."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3130
+msgid "Output File"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3131
+msgid ""
+"The file where the output will be written (if not specified, it will be "
+"based on the input file)."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3141
+msgid "Data directory"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3142
+msgid ""
+"Load and store settings at the given directory. This is useful for "
+"maintaining different profiles or including configurations from a network "
+"storage."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3145
+msgid "Logging level"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3146
+msgid ""
+"Messages with severity lower or eqal to the loglevel will be printed out. 0:"
+"trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3151
+msgid "Render with a software renderer"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3152
+msgid ""
+"Render with a software renderer. The bundled MESA software renderer is "
+"loaded instead of the default OpenGL driver."
+msgstr ""
+
+#: src/libslic3r/PrintObject.cpp:110
+msgid "Processing triangulated mesh"
+msgstr ""
+
+#: src/libslic3r/PrintObject.cpp:141
+msgid "Generating perimeters"
+msgstr ""
+
+#: src/libslic3r/PrintObject.cpp:251
+msgid "Preparing infill"
+msgstr ""
+
+#: src/libslic3r/PrintObject.cpp:391
+msgid "Generating support material"
 msgstr ""
 
 #: src/libslic3r/GCode/PreviewData.cpp:176
diff --git a/resources/localization/cs_CZ/Slic3rPE.mo b/resources/localization/cs_CZ/Slic3rPE.mo
deleted file mode 100644
index b6ce71411..000000000
Binary files a/resources/localization/cs_CZ/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/cs_CZ/Slic3rPE_cs.po b/resources/localization/cs_CZ/Slic3rPE_cs.po
index f28786157..7c5da27bb 100644
--- a/resources/localization/cs_CZ/Slic3rPE_cs.po
+++ b/resources/localization/cs_CZ/Slic3rPE_cs.po
@@ -1,7052 +1,7419 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language-Team: \n"
 "Language: cs_CZ\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: PhraseApp (phraseapp.com)\n"
 
-#: src/slic3r/GUI/AboutDialog.cpp:33
-msgid "About Slic3r"
-msgstr "O Slic3ru"
+#: xs/src/slic3r/GUI/Tab.cpp:2149
+msgid "\n\nand it has the following unsaved changes:"
+msgstr "\n\na má neuložené následující změny:"
 
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
-msgid "Version"
-msgstr "Verze"
+#: xs/src/slic3r/GUI/Tab.cpp:2152
+msgid "\n\nDiscard changes and continue anyway?"
+msgstr "\n\nZahodit změny a přesto pokra�ovat?"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:43
-msgid "Shape"
-msgstr "Tvar"
+#: xs/src/slic3r/GUI/Tab.cpp:2150
+msgid "\n\nhas the following unsaved changes:"
+msgstr "\n\nmá neuložené následující změny:"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
-msgid "Rectangular"
-msgstr "Obdélníkový"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
-msgid "Size"
-msgstr "Rozměr"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
-msgid "Size in X and Y of the rectangular plate."
-msgstr "Rozměr obdélníkové tiskové podložky v ose X a Y."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
-msgid "Origin"
-msgstr "Po�átek"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
-msgid ""
-"Distance of the 0,0 G-code coordinate from the front left corner of the "
-"rectangle."
-msgstr "Vzdálenost souřadnice 0,0 G-code od předního levého rohu obdélníku."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
-msgid "Circular"
-msgstr "Kruhový"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
-msgid "mm"
-msgstr "mm"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
-msgid "Diameter"
-msgstr "Průměr"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
-msgid ""
-"Diameter of the print bed. It is assumed that origin (0,0) is located in the "
-"center."
-msgstr ""
-"Průměr tiskové podložky. Přepokládaný po�átek (0,0) je umístěn uprostřed."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
-#: src/libslic3r/GCode/PreviewData.cpp:175
-msgid "Custom"
-msgstr "Vlastní"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
-msgid "Load shape from STL..."
-msgstr ""
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
-msgid "Settings"
-msgstr "Nastavení"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr ""
-"Vyberte soubor pro import tvaru tiskové podložky z (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
-msgid "Error! "
-msgstr "Chyba! "
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr "Vybraný soubor neobsahuje geometrii."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
-msgid ""
-"The selected file contains several disjoint areas. This is not supported."
-msgstr ""
-"Vybraný soubor obsahuje několik nespojených ploch. Tato možnost není "
-"podporována."
-
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape"
-msgstr "Tvar tiskové podložky"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:54
-msgid "Network lookup"
-msgstr "Hledání v síti"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:67
-msgid "Address"
-msgstr "Adresa"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:68
-msgid "Hostname"
-msgstr "Název hosta"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:69
-msgid "Service name"
-msgstr "Název služby"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:70
-msgid "OctoPrint version"
-msgstr "Verze OctoPrintu"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:188
-msgid "Searching for devices"
-msgstr "Hledám zařízení"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:195
-msgid "Finished"
-msgstr "Dokon�eno"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:15
-msgid "Buttons And Text Colors Description"
-msgstr "Barvy pro textové popisky a tla�ítka"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:40
-msgid "Value is the same as the system value"
-msgstr "Hodnota je shodná se systémovou hodnotou"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:57
-msgid ""
-"Value was changed and is not equal to the system value or the last saved "
-"preset"
-msgstr ""
-"Hodnota byla změněna a není shodná se systémovou hodnotou nebo naposled "
-"uloženým přednastavením"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
-msgid "Upgrade"
-msgstr "Aktualizovat"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
-msgid "Downgrade"
-msgstr "Downgrade"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
-msgid "Before roll back"
-msgstr "Before roll back"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
-msgid "User"
-msgstr "Uživatel"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
-msgid "Unknown"
-msgstr "Neznámý"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
-msgid "Active: "
-msgstr "Aktivní: "
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "slic3r version"
-msgstr "verze slic3ru"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
-msgid "print"
-msgstr "tisk"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "filaments"
-msgstr "filamenty"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
-msgid "printer"
-msgstr "tiskárna"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
-msgid "vendor"
-msgstr "prodejce"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
-msgid "version"
-msgstr "verze"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
-msgid "min slic3r version"
-msgstr "min verze slic3ru"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
-msgid "max slic3r version"
-msgstr "max verze slic3ru"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "model"
-msgstr "model"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "variants"
-msgstr "varianty"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
-msgid "Incompatible with this Slic3r"
-msgstr "Nekompatibilní s tímto Slic3rem"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
-msgid "Activate"
-msgstr "Aktivovat"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
-msgid "Configuration Snapshots"
-msgstr "Záloha konfigurace"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:92
-msgid "nozzle"
-msgstr "tryska"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
-msgstr "Vybrat vše"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "Odzna�it vše"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-#, c-format
-msgid "Welcome to the Slic3r %s"
-msgstr "Vítejte v Slic3r %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-msgid "Welcome"
-msgstr "Vítejte"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
-#, c-format
-msgid "Run %s"
-msgstr "Spustit %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:234
-#, c-format
-msgid ""
-"Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
-"configuration; just a few settings and you will be ready to print."
-msgstr ""
-"Zdravím, vítejte ve Slic3r Prusa Edition! Tento %s vám pomůže se základní "
-"konfigurací; jen několik nastavení a budete připraveni k tisku."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:238
-msgid ""
-"Remove user profiles - install from scratch (a snapshot will be taken "
-"beforehand)"
-msgstr ""
-"Odstranit uživatelské profily - �istá instalace (nejprve bude provedena "
-"záloha)"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr "Ostatní prodejci"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr "Vlastní nastavení"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Automatic updates"
-msgstr "Automatické aktualizace"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Updates"
-msgstr "Aktualizace"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
-msgid "Check for application updates"
-msgstr "Zkontrolovat aktualizace aplikace"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
-msgid ""
-"If enabled, Slic3r checks for new versions of Slic3r PE 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 ""
-"Pokud je povoleno, kontroluje Slic3r nově dostupné verze Slic3r PE. V "
-"případě, že je nová verze k dispozici, zobrazí se notifikace při dalším "
-"startu programu (nikdy během užívání aplikace). Tento systém slouží pouze "
-"pro  upozornění uživatele, nedochází k automatické instalaci."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
-msgid "Update built-in Presets automatically"
-msgstr "Aktualizovat vestavěné přednastavení automaticky"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
-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 ""
-"Pokud je povoleno, stáhne Slic3r na pozadí aktualizace vestavěných "
-"systémových přednastavení. Tyto aktualizace jsou staženy do do�asného "
-"umístění. Pokud je k dispozici nové přednastavení, zobrazí se upozornění při "
-"startu programu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:308
-msgid ""
-"Updates are never applied without user's consent and never overwrite user's "
-"customized settings."
-msgstr ""
-"Aktualizace nejsou nikdy nainstalovány bez vědomí uživatele a nikdy "
-"nepřepíšou upravená uživatelská nastavení."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:313
-msgid ""
-"Additionally a backup snapshot of the whole configuration is created before "
-"an update is applied."
-msgstr ""
-"Dále je před nainstalováním aktualizace vytvořena záloha veškerého nastavení."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:320
-msgid "Other Vendors"
-msgstr "Ostatní výrobci"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:322
-msgid "Pick another vendor supported by Slic3r PE:"
-msgstr "Vyberte si jiného prodejce podporovaného v Slic3r PE:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381
-msgid "Firmware Type"
-msgstr "Typ firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
-msgid "Firmware"
-msgstr "Firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:385
-msgid "Choose the type of firmware used by your printer."
-msgstr "Vyberte typ firmware používaný vaší tiskárnou."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape and Size"
-msgstr "Tvar a rozměr podložky"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:422
-msgid "Set the shape of your printer's bed."
-msgstr "Nastavte tvar vaší tiskové podložky."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Filament and Nozzle Diameters"
-msgstr "Průměry filamentu a trysky"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Print Diameters"
-msgstr "Průměry tisku"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:452
-msgid "Enter the diameter of your printer's hot end nozzle."
-msgstr "Zadejte průměr trysky hotendu vaší tiskárny."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:455
-msgid "Nozzle Diameter:"
-msgstr "Průměr trysky:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:465
-msgid "Enter the diameter of your filament."
-msgstr "Zadejte průměr vašeho filamentu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:466
-msgid ""
-"Good precision is required, so use a caliper and do multiple measurements "
-"along the filament, then compute the average."
-msgstr ""
-"Je zapotřebí velká přesnost, proto použijte posuvné měřítko (šupleru) a "
-"prove�te několik měření po délce filamentu, poté vypo�ítejte průměr."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:469
-msgid "Filament Diameter:"
-msgstr "Průměr filamentu:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Extruder and Bed Temperatures"
-msgstr "Teploty extruderu a podložky"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Temperatures"
-msgstr "Teploty"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:503
-msgid "Enter the temperature needed for extruding your filament."
-msgstr "Zadejte požadovanou teplotu pro extruzi vašeho filamentu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:504
-msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
-msgstr "Obecným pravidlem je 160 až 230° pro PLA a 215 až 250° pro ABS."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:507
-msgid "Extrusion Temperature:"
-msgstr "Teplota extruze:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
-msgid "°C"
-msgstr "°C"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:517
-msgid ""
-"Enter the bed temperature needed for getting your filament to stick to your "
-"heated bed."
-msgstr ""
-"Zadejte požadovanou teplotu filamentu, aby se spojil s vyhřívanou podložkou."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:518
-msgid ""
-"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
-"no heated bed."
-msgstr ""
-"Obecným pravidlem je 160 až 230° pro PLA a 215 až 250° pro ABS. Zadejte "
-"nula, pokud nemáte vyhřívanou podložku."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:521
-msgid "Bed Temperature:"
-msgstr "Teplota tiskové podložky:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:833
-msgid "< &Back"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:834
-msgid "&Next >"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:835
-msgid "&Finish"
-msgstr "&Dokon�it"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:906
-msgid "Configuration Wizard"
-msgstr "Průvodce nastavením"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:907
-msgid "Configuration &Wizard"
-msgstr "Průvodce &nastavením"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:909
-msgid "Configuration Assistant"
-msgstr "Průvodce nastavení tiskárny"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:910
-msgid "Configuration &Assistant"
-msgstr "Průvodce &nastavení tiskárny"
-
-#: src/slic3r/GUI/Field.cpp:109
-msgid "default value"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:112
-msgid "parameter name"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:140
-#, c-format
-msgid "%s doesn't support percentage"
-msgstr "%s nepodporuje procenta"
-
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:153
-msgid "Input value is out of range"
-msgstr "Zadaná hodnota je mimo rozsah"
-
-#: src/slic3r/GUI/Field.cpp:176
-#, c-format
-msgid ""
-"Do you mean %d%% instead of %d %s?\n"
-"Select YES if you want to change this value to %d%%, \n"
-"or NO if you are sure that %d %s is a correct value."
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:179
-msgid "Parameter validation"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
-msgid "Flash!"
-msgstr "Nahrát!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
-msgid "Flashing in progress. Please do not disconnect the printer!"
-msgstr "Probíhá nahrávání firmware. Prosím neodpojujte tiskárnu!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
-msgid "Flashing succeeded!"
-msgstr "Nahrávání bylo úspěšné!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
-msgid "Flashing failed. Please see the avrdude log below."
-msgstr "Nahrání selhalo. Projděte si prosím avrdude log níže."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
-msgid "Flashing cancelled."
-msgstr "Nahrávání zrušeno."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
-#, 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 ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
-msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
-#, c-format
-msgid "Error accessing port at %s: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
-msgid "Firmware flasher"
-msgstr "Nahrání firmware"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
-msgid "Firmware image:"
-msgstr "Soubor s firmware:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
-msgid "Serial port:"
-msgstr "Sériový port:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
-msgid "Autodetected"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
-msgid "Rescan"
-msgstr "Prohledat"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
-msgid "Progress:"
-msgstr "Průběh:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
-msgid "Status:"
-msgstr "Stav:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
-msgid "Ready"
-msgstr "Připraveno"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr "Pokro�ilé: výstupní log avrdude"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-"Opravdu chcete ukon�it nahrávání firmware?\n"
-"Tiskárna může zůstat v nefunk�ním stavu!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
-msgid "Confirmation"
-msgstr "Potvrzení"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
-msgid "Cancelling..."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
-msgid "Detected object outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
-msgid "Detected toolpath outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "Oto�it"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "Měřítko"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
-msgid "Rotate lower part upwards"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
-msgid "Perform cut"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2276
-msgid "Cut object:"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
-msgid "Cut"
-msgstr "Řezat"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2466
-msgid "Keep upper part"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2467
-msgid "Keep lower part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "Oznámení"
-
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr "Attempt to free unreferenced scalar"
-
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
-msgid "Warning"
-msgstr "Varování"
-
-#: src/slic3r/GUI/GUI_App.cpp:377
-msgid "Choose one file (3MF):"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:389
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Vyberte jeden nebo více souborů (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/GUI_App.cpp:451
-msgid "Array of language names and identifiers should have the same size."
-msgstr "Pole jazykových jmen a identifikátorů by měla mít stejnou velikost."
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Select the language"
-msgstr "Výběr jazyka"
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Language"
-msgstr "Jazyk"
-
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
-msgid "Default"
-msgstr "Výchozí"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "&Configuration Snapshots"
-msgstr "Záloha &Konfigurace"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "Inspect / activate configuration snapshots"
-msgstr "Zkontrolovat / aktivovat zálohy konfigurace"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Take Configuration &Snapshot"
-msgstr "Provést &Zálohu Konfigurace"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Capture a configuration snapshot"
-msgstr "Vytvořit aktuální zálohu konfigurace"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "&Preferences"
-msgstr "&Nastavení"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "Application preferences"
-msgstr "Nastavení aplikace"
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
-msgid "Advanced"
-msgstr "Pokro�ilé"
-
-#: src/slic3r/GUI/GUI_App.cpp:617
-msgid "Advanced View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Slic3r View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:622
-msgid "Change Application &Language"
-msgstr "Změnit &jazyk aplikace"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Flash printer &firmware"
-msgstr "Nahrát &firmware tiskárny"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr "Nahrát firmware do tiskárny s Arduinem"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Taking configuration snapshot"
-msgstr "Ukládání zálohy nastavení"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Snapshot name"
-msgstr "Název zálohy"
-
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "Aplikace bude restartována"
-
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "Pozor!"
-
-#: src/slic3r/GUI/GUI_App.cpp:691
-msgid "&Configuration"
-msgstr "&Konfigurace"
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid "You have unsaved changes "
-msgstr "Máte neuložené změny "
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid ". Discard changes and continue anyway?"
-msgstr ". Zahodit změny a přesto pokra�ovat?"
-
-#: src/slic3r/GUI/GUI_App.cpp:712
-msgid "Unsaved Presets"
-msgstr "Neuložená Přednastavení"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
-msgid "Layers and Perimeters"
-msgstr "Vrstvy a perimetry"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
-msgid "Infill"
-msgstr "Výplň"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
-msgid "Support material"
-msgstr "Podpory"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "Rychlost"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
-msgid "Extruders"
-msgstr "Extruder"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
-msgid "Extrusion Width"
-msgstr "Šíře extruze"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
-msgid "Supports"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
-msgid "Pad"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
-msgid "Name"
-msgstr "Název"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
-msgid "Right button click the icon to change the object settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
-#, c-format
-msgid "Auto-repaired (%d errors):\n"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
-msgid "degenerate facets"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
-msgid "edges fixed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
-msgid "facets removed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
-msgid "facets added"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
-msgid "facets reversed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
-msgid "backwards edges"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
-msgid "Right button click the icon to fix STL through Netfabb"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
-msgid "Extruder"
-msgstr "Extruder"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
-msgid "Select showing settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
-msgid "Load"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
-msgid "Box"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Cylinder"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Sphere"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Slab"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
-msgid "Split to parts"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
-msgid "Add settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
-msgid "Change type"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
-msgid "You can't delete the last solid part from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
-msgid "You can't delete the last intance from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
-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."
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
-msgid "Group manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
-msgid "Object manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
-msgid "Object Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
-msgid "Part Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
-msgid "Part manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
-msgid "Instance manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
-msgid "You can't change a type of the last solid part of the object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
-msgid "Select type of part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
-msgid "The supplied name is not valid;"
-msgstr "Zadaný název je naplatný;"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
-msgid "the following characters are not allowed:"
-msgstr "následující znaky nejsou povoleny:"
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
-msgid "Object Manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
-msgid "Object name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
-msgid "Position"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
-msgid "Rotation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
-msgid "Scale factors"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
-msgid "Translate"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:235
-msgid "View"
-msgstr "Zobrazení"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:394
-msgid "Feature type"
-msgstr "Typ"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
-msgid "Height"
-msgstr "Výška"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
-msgid "Width"
-msgstr "Šířka"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:242
-msgid "Volumetric flow rate"
-msgstr "Objemový průtok"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
-msgid "Tool"
-msgstr "Nástroj"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:406
-msgid "Color Print"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:247
-msgid "Show"
-msgstr "Zobrazit"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
-msgid "Feature types"
-msgstr "Typy extruzí"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
-msgid "Perimeter"
-msgstr "Perimetr"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
-msgid "External perimeter"
-msgstr "Vnější perimetr"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
-msgid "Overhang perimeter"
-msgstr "Perimetr převisu"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
-msgid "Internal infill"
-msgstr "Vnitřní výplň"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
-msgid "Solid infill"
-msgstr "Plná výplň"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
-msgid "Top solid infill"
-msgstr "Výplň plných horních"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
-msgid "Bridge infill"
-msgstr "Výplň mostů"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
-#: src/libslic3r/GCode/PreviewData.cpp:170
-msgid "Gap fill"
-msgstr "Výplň tenkých stěn"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
-#: src/libslic3r/GCode/PreviewData.cpp:171
-msgid "Skirt"
-msgstr "Obrys"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
-#: src/libslic3r/GCode/PreviewData.cpp:173
-msgid "Support material interface"
-msgstr "Kontaktní vrstvy podpor"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
-#: src/libslic3r/GCode/PreviewData.cpp:174
-msgid "Wipe tower"
-msgstr "Čistící věž"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
-msgid "Travel"
-msgstr "Rychloposun"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:270
-msgid "Retractions"
-msgstr "Retrakce"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:271
-msgid "Unretractions"
-msgstr "Deretrakce"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:272
-msgid "Shells"
-msgstr "Skořápky"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
-msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
-msgid "Export G-code"
-msgstr "Exportovat G-kód"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
-msgid "Save project (3MF)"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "(Re)slice"
-msgstr "znovu slicovat"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Quick slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat last quick slice"
-msgstr "Opakovat poslední rychlé slicování"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
-msgid "Select Plater Tab"
-msgstr "Zobrazit panel Podložka"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Quick slice and Save as"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Select Print Settings Tab"
-msgstr "Zobrazit panel Nastavení tisku"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
-msgid "Select Filament Settings Tab"
-msgstr "Zobrazit panel Nastavení filamentu"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
-msgid "Select Printer Settings Tab"
-msgstr "Zobrazit panel Nastavení tiskárny"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
-msgid "Switch to 3D"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
-msgid "Switch to Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
-msgstr "Nastavení"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
-msgid "Print host upload queue"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
-msgid "Camera view "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
-msgid "Add Instance to selected object "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
-msgid "Remove Instance from selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
-msgid "Show keyboard shortcuts list"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
-msgid "Select multiple object/Move multiple object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
-msgid "Arrange"
-msgstr "Uspořádat"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
-msgid "Select All objects"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
-msgid "Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
-msgid "Delete All"
-msgstr "Smazat VÅ¡e"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
-msgid "Gizmo move"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
-msgid "Gizmo scale"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
-msgid "Gizmo rotate"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Gizmo cut"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Gizmo Place face on bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Gizmo SLA support points"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Zoom to Bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Zoom to all objects in scene, if none selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Zoom to selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Zoom in"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Zoom out"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Unselect gizmo, keep object selection"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
-msgid "Plater Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Arrow Up"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Upper Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Arrow Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Lower Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
-msgid "Preview Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:53
-msgid ""
-" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
-msgstr ""
-" - Nezapomeňte zkontrolovat aktualizace na http://github.com/prusa3d/slic3r/"
-"releases"
-
-#: src/slic3r/GUI/MainFrame.cpp:130
-msgid "Plater"
-msgstr "Podložka"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "&Otevřít"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "Open a project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
-msgstr "&Uložit"
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "Save current project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
-msgstr "Uložit &jako"
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save current project file as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Import STL/OBJ/AM&F/3MF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Load a model"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Import &Config"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Load exported configuration file"
-msgstr "Na�íst exportovaný konfigura�ní soubor"
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Import Config from &project"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Load configuration from project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Import Config &Bundle"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Load presets from a bundle"
-msgstr "Na�íst přednastavení z balíku"
-
-#: src/slic3r/GUI/MainFrame.cpp:256
-msgid "&Import"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export &G-code"
-msgstr "Exportovat &G-kód"
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export current plate as G-code"
-msgstr "Exportovat stávající plochu do G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export plate as &STL"
-msgstr "Exportovat plochu jako &STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export current plate as STL"
-msgstr "Exportovat stávající plochu jako STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export plate as &AMF"
-msgstr "Exportovat plochu jako &AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export current plate as AMF"
-msgstr "Exportovat stávající plochu jako AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export &Config"
-msgstr "Exportovat &Konfiguraci"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export current configuration to file"
-msgstr "Exportovat sou�asnou konfiguraci do souboru"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export Config &Bundle"
-msgstr "Exportovat Konfigura�ní &Balík"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export all presets to file"
-msgstr "Exportovat všechna přednastavení do souboru"
-
-#: src/slic3r/GUI/MainFrame.cpp:271
-msgid "&Export"
-msgstr "&Exportovat"
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Quick Slice"
-msgstr "Rychlé Slicování"
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Slice a file into a G-code"
-msgstr "Slicovat soubor do G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Quick Slice and Save As"
-msgstr "Rychlé Slicování a Uložit jako"
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Slice a file into a G-code, save as"
-msgstr "Slicovat soubor do G-code, uložit jako"
-
-#: src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat Last Quick Slice"
-msgstr "Opakovat Poslední Slicování"
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "(Re)Slice &Now"
-msgstr "(Z&novu)Slicovat"
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "Start new slicing process"
-msgstr "Zahájit nový slicovací proces"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "&Repair STL file"
-msgstr "Op&ravit soubor STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "Automatically repair an STL file"
-msgstr "Automaticky opravit STL soubor"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "&Quit"
-msgstr "U&kon�it"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "Quit Slic3r"
-msgstr "Ukon�it Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "&Select all"
-msgstr "&Vybrat vše"
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "Selects all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "&Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "Deletes the current selection"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Delete &all"
-msgstr "&Smazat VÅ¡e"
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Deletes all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "&Plater Tab"
-msgstr "Panel &Podložka"
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "Show the plater"
-msgstr "Zobrazit podložku"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "P&rint Settings Tab"
-msgstr "Panel Nastavení t&isku"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "Show the print settings"
-msgstr "Zobrazit nastavení tisku"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "&Filament Settings Tab"
-msgstr "Panel Nastavení &filamentu"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "Show the filament settings"
-msgstr "Zobrazit nastavení filamentu"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Print&er Settings Tab"
-msgstr "Panel Nastavení &tiskárny"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Show the printer settings"
-msgstr "Zobrazit nastavení tiskárny"
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "3&D"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "Show the 3D editing view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Pre&view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Show the 3D slices preview"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Print &Host Upload Queue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Display the Print Host Upload Queue window"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr "&Izometrické"
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "Iso View"
-msgstr "Izometrické zobrazení"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr "S&vrchu"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "Top View"
-msgstr "Pohled svrchu"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr "Ze&spod"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "Bottom View"
-msgstr "Pohled zespod"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr "Z&epředu"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "Front View"
-msgstr "Pohled zepředu"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr "Zeza&du"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "Rear View"
-msgstr "Pohled zezadu"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr "Z&leva"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "Left View"
-msgstr "Pohled zleva"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr "Z&prava"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "Right View"
-msgstr "Pohled zprava"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Prusa 3D &Drivers"
-msgstr "Prusa 3D &Ovlada�e"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr "Otevřít stránku pro stahování Prusa 3D ovlada�ů ve vašem prohlíže�i"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
-msgstr "&Vydání Prusa Edice"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
-msgstr "Otavřít stránku vydání Prusa Edice ve vašem prohlíže�i"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
-msgstr "Slic3r &Webová stránka"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
-msgstr "Otevřít webovou stránku Slic3ru ve vašem prohlíže�i"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr "Slic3r &návod"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr "Otevřít Slic3r návod ve vašem prohlíže�i"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "System &Info"
-msgstr "&Informace o systému"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "Show system information"
-msgstr "Zobrazit systémové informace"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show &Configuration Folder"
-msgstr "Otevřít &adresář nastavení"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show user configuration folder (datadir)"
-msgstr "Zobrazit uživatelský adresář konfigurace (datadir)"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an I&ssue"
-msgstr "Nahlásit &chybu"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
-msgstr "Nahlásit chybu ve Slic3eru Prusa Edice"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
-msgstr "&O Slic3ru"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "Show about dialog"
-msgstr "Zobrazit okno o Slic3ru"
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "Show the list of the keyboard shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:439
-msgid "&File"
-msgstr "&Soubor"
-
-#: src/slic3r/GUI/MainFrame.cpp:440
-msgid "&Edit"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:441
-msgid "&Window"
-msgstr "&Okno"
-
-#: src/slic3r/GUI/MainFrame.cpp:442
-msgid "&View"
-msgstr "&Zobrazení"
-
-#: src/slic3r/GUI/MainFrame.cpp:445
-msgid "&Help"
-msgstr "&Pomoc"
-
-#: src/slic3r/GUI/MainFrame.cpp:472
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Zvolit soubor ke slicování (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/MainFrame.cpp:486
-msgid "No previously sliced file."
-msgstr "Žádné dříve slicované soubory."
-
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
-msgid "Error"
-msgstr "Chyba"
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid "Previously sliced file ("
-msgstr "Dříve slicovaný soubor ("
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid ") not found."
-msgstr ") nebyl nalezen."
-
-#: src/slic3r/GUI/MainFrame.cpp:493
-msgid "File Not Found"
-msgstr "Soubor nenalezen"
-
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
-msgid "Save "
-msgstr "Uložit "
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "SVG"
-msgstr "SVG"
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "G-code"
-msgstr "G-code"
-
-# Context: L('Save ') . ($params{export_svg} ? L('SVG') : L('G-code')) . L(' file as:'), e.g. "Save G-Code file as:"
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid " file as:"
-msgstr " soubor jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:548
-msgid "Save zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Slicing"
-msgstr "Slicování"
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Processing "
-msgstr "Zpracovávám "
-
-#: src/slic3r/GUI/MainFrame.cpp:583
-msgid " was successfully sliced."
-msgstr " byl úspěšně slicován."
-
-#: src/slic3r/GUI/MainFrame.cpp:585
-msgid "Slicing Done!"
-msgstr "Slicování dokon�eno!"
-
-#: src/slic3r/GUI/MainFrame.cpp:600
-msgid "Select the STL file to repair:"
-msgstr "Vyberte STL soubor k opravÄ›:"
-
-#: src/slic3r/GUI/MainFrame.cpp:614
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr "Uložit soubor OBJ (méně náchylný na chyby souřadnic než STL) jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Your file was repaired."
-msgstr "Váš soubor byl opraven."
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Repair"
-msgstr "Oprava"
-
-#: src/slic3r/GUI/MainFrame.cpp:643
-msgid "Save configuration as:"
-msgstr "Uložit konfiguraci jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
-msgid "Select configuration to load:"
-msgstr "Zvolte konfiguraci k na�tení:"
-
-#: src/slic3r/GUI/MainFrame.cpp:700
-msgid "Save presets bundle as:"
-msgstr "Uložit balík přednastavení jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:751
-#, c-format
-msgid "%d presets successfully imported."
-msgstr "%d přednastavení úspěšně importováno."
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r error"
-msgstr "Chyba Slic3ru"
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r has encountered an error"
-msgstr "Došlo k chybě Slic3ru"
-
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "Info"
-
-#: src/slic3r/GUI/Plater.cpp:126
-msgid "Volume"
-msgstr "Obsah"
-
-#: src/slic3r/GUI/Plater.cpp:127
-msgid "Facets"
-msgstr "Facety"
-
-#: src/slic3r/GUI/Plater.cpp:128
-msgid "Materials"
-msgstr "Materiálů"
-
-#: src/slic3r/GUI/Plater.cpp:131
-msgid "Manifold"
-msgstr "Model OK"
-
-#: src/slic3r/GUI/Plater.cpp:174
-msgid "Sliced Info"
-msgstr "Informace o slicování"
-
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
-msgid "Used Filament (m)"
-msgstr "Použito Filamentu (m)"
-
-#: src/slic3r/GUI/Plater.cpp:194
-msgid "Used Filament (mm³)"
-msgstr "Použito Filamentu (mm³)"
-
-#: src/slic3r/GUI/Plater.cpp:195
-msgid "Used Filament (g)"
-msgstr "Použito Filamentu (g)"
-
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
-msgid "Cost"
-msgstr "Náklady"
-
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
-msgid "Estimated printing time"
-msgstr "Odhadovaný �as tisku"
-
-#: src/slic3r/GUI/Plater.cpp:198
-msgid "Number of tool changes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr "Podpora"
-
-#: src/slic3r/GUI/Plater.cpp:364
-msgid "Select what kind of support do you need"
-msgstr "Vyberte typ podpor, které potřebujete"
-
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "Žádný"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
-msgid "Support on build plate only"
-msgstr "Podpory pouze na tiskové ploše"
-
-#: src/slic3r/GUI/Plater.cpp:367
-msgid "Everywhere"
-msgstr "VÅ¡ude"
-
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
-msgid "Brim"
-msgstr "Límec"
-
-#: src/slic3r/GUI/Plater.cpp:381
-msgid ""
-"This flag enables the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Tato vlajka zapíná límec, který bude vytištěn kolem každého objektu při "
-"první vrstvě."
-
-#: src/slic3r/GUI/Plater.cpp:390
-msgid "Purging volumes"
-msgstr "Objemy �ištění"
-
-#: src/slic3r/GUI/Plater.cpp:556
-msgid "Print settings"
-msgstr "Nastavení tisku"
-
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
-msgid "Filament"
-msgstr "Filament"
-
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
-msgid "SLA print"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
-msgid "SLA material"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:560
-msgid "Printer"
-msgstr "Tiskárna"
-
-#: src/slic3r/GUI/Plater.cpp:588
-msgid "Send to printer"
-msgstr "Odeslat do tiskárny"
-
-#: src/slic3r/GUI/Plater.cpp:607
-msgid "Slice now"
-msgstr "Slicovat"
-
-#: src/slic3r/GUI/Plater.cpp:787
-#, c-format
-msgid "%d (%d shells)"
-msgstr "%d (%d obalů)"
-
-#: src/slic3r/GUI/Plater.cpp:792
-#, c-format
-msgid "Auto-repaired (%d errors)"
-msgstr "Automaticky opraveno (%d errors)"
-
-#: src/slic3r/GUI/Plater.cpp:795
-#, c-format
-msgid ""
-"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
-"facets reversed, %d backwards edges"
-msgstr ""
-"%d poškozených faset, %d okrajů opraveno, %d faset odstraněno, %d faset "
-"přidáno, %d faset navráceno, %d zadních okrajů"
-
-#: src/slic3r/GUI/Plater.cpp:805
-msgid "Yes"
-msgstr "Ano"
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "wipe tower"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:855
-msgid "normal mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:859
-msgid "silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1304
-msgid "Loading"
-msgstr "Na�ítání"
-
-#: src/slic3r/GUI/Plater.cpp:1314
-#, c-format
-msgid "Processing input file %s\n"
-msgstr "Zpracovávám vstupní soubor %s\n"
-
-#: src/slic3r/GUI/Plater.cpp:1366
-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 ""
-"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ů?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
-msgid "Multi-part object detected"
-msgstr "Detekován objekt obsahující více �ástí"
-
-#: src/slic3r/GUI/Plater.cpp:1388
-#, 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 ""
-
-#: src/slic3r/GUI/Plater.cpp:1408
-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 ""
-"Bylo nahráno více objektů pro multi materiálovou tiskárnu.\n"
-"Mají být vloženy jako jeden objekt obsahující více �ástí, \n"
-"namísto vložení několika objektů?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1424
-msgid "Loaded"
-msgstr "Na�teno"
-
-#: src/slic3r/GUI/Plater.cpp:1492
-msgid ""
-"Your object appears to be too large, so it was automatically scaled down to "
-"fit your print bed."
-msgstr ""
-"Váš objekt se zdá být příliš velký, takže byl automaticky zmenšen, aby se "
-"vešel na tiskovou podložku."
-
-#: src/slic3r/GUI/Plater.cpp:1493
-msgid "Object too large?"
-msgstr "Objekt moc velký?"
-
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr "Exportovat nastavení tisku"
-
-#: src/slic3r/GUI/Plater.cpp:1538
-msgid "Save file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1702
-msgid "Arranging canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1705
-msgid "Arranging"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1736
-msgid "Could not arrange model objects! Some geometries may be invalid."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1740
-msgid "Arranging done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1782
-msgid "Orientation search canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1787
-msgid "Searching for optimal orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1797
-msgid "Orientation found."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1818
-msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
-msgstr ""
-"Vybraný objekt nemůže být rozdělen, protože obsahuje více nez jeden objem/"
-"materiál."
-
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
-msgid "Cancelling"
-msgstr "Ukon�ování"
-
-#: src/slic3r/GUI/Plater.cpp:1962
-msgid "Another export job is currently running."
-msgstr "V sou�asné době běží jiná úloha exportu."
-
-#: src/slic3r/GUI/Plater.cpp:2215
-msgid "Export failed"
-msgstr "Exportování selhalo"
-
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "Smazat"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "Odstanit vybraný objekt"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Increase copies"
-msgstr "Přidat kopie"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Place one more copy of the selected object"
-msgstr "Přidá jednu kopii vybraného objektu"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Decrease copies"
-msgstr "Odebrat kopie"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Remove one copy of the selected object"
-msgstr "Odstaní jednu kopii vybraného objektu"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Set number of copies"
-msgstr "Zadat po�et kopií"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Change the number of copies of the selected object"
-msgstr "Změňte po�et kopií vybraného objektu"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload from Disk"
-msgstr "Znovu na�íst z Disku"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload the selected file from Disk"
-msgstr "Znovu na�íst vybraný objekt z Disku"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
-msgstr "Exportovat objekt jako STL"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "Exportovat tento jediný objekt jako STL soubor"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Along X axis"
-msgstr "Podél osy X"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Mirror the selected object along the X axis"
-msgstr "Zrcadlit rozměr vybraného objektu podél osy X"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Along Y axis"
-msgstr "Podél osy Y"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Mirror the selected object along the Y axis"
-msgstr "Zrcadlit rozměr vybraného objektu podél osy Y"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Along Z axis"
-msgstr "Podél osy Z"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Mirror the selected object along the Z axis"
-msgstr "Zrcadlit rozměr vybraného objektu podél osy Z"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror"
-msgstr "Zrcadlit"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror the selected object"
-msgstr "Zrcadlit vybraný objekt"
-
-#: src/slic3r/GUI/Plater.cpp:2400
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
-msgid "Split the selected object into individual objects"
-msgstr "Rozdělit vybraný objekt na jednotlivé objekty"
-
-#: src/slic3r/GUI/Plater.cpp:2402
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
-msgid "Split the selected object into individual sub-parts"
-msgstr "Rozdělit vybraný objekt na jednotlivé �ásti"
-
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
-msgid "Split"
-msgstr "Rozdělit"
-
-#: src/slic3r/GUI/Plater.cpp:2405
-msgid "Split the selected object"
-msgstr "Rozdělit vybraný objekt"
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save G-code file as:"
-msgstr "Uložit G-code jako:"
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2845
-#, c-format
-msgid "STL file exported to %s"
-msgstr "Soubor STL byl exportován do %s"
-
-#: src/slic3r/GUI/Plater.cpp:2861
-#, c-format
-msgid "AMF file exported to %s"
-msgstr "Soubor AMF byl exportován do %s"
-
-#: src/slic3r/GUI/Plater.cpp:2864
-#, c-format
-msgid "Error exporting AMF file %s"
-msgstr "Chyba při exportu souboru AMF %s"
-
-#: src/slic3r/GUI/Plater.cpp:2891
-#, c-format
-msgid "3MF file exported to %s"
-msgstr "Soubor 3MF byl exportován do %s"
-
-#: src/slic3r/GUI/Plater.cpp:2894
-#, c-format
-msgid "Error exporting 3MF file %s"
-msgstr "Chyba při exportu souboru 3MF %s"
-
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
-msgid "General"
-msgstr "Obecné"
-
-#: src/slic3r/GUI/Preferences.cpp:34
-msgid "Remember output directory"
-msgstr "Pamatovat si výstupní složku"
-
-#: src/slic3r/GUI/Preferences.cpp:36
-msgid ""
-"If this is enabled, Slic3r will prompt the last output directory instead of "
-"the one containing the input files."
-msgstr ""
-"Pokud je tato volba povolena, Slic3r vyvolá poslední výstupní adresář "
-"namísto toho, který obsahuje vstupní soubory."
-
-#: src/slic3r/GUI/Preferences.cpp:42
-msgid "Auto-center parts"
-msgstr "Auto-centrování objektů"
-
-#: src/slic3r/GUI/Preferences.cpp:44
-msgid ""
-"If this is enabled, Slic3r will auto-center objects around the print bed "
-"center."
-msgstr ""
-"Pokud je tato možnost povolena, Slic3r bude automaticky centrovat objekty "
-"kolem středu tiskové plochy."
-
-#: src/slic3r/GUI/Preferences.cpp:50
-msgid "Background processing"
-msgstr "Zpracování na pozadí"
-
-#: src/slic3r/GUI/Preferences.cpp:52
-msgid ""
-"If this is enabled, Slic3r will pre-process objects as soon as they're "
-"loaded in order to save time when exporting G-code."
-msgstr ""
-"Pokud je tato možnost povolena, Slic3r předprojektuje objekty, jakmile budou "
-"na�teny, aby šetřil �as při exportu G-code."
-
-#: src/slic3r/GUI/Preferences.cpp:74
-msgid "Suppress \" - default - \" presets"
-msgstr "Potla�it “ - výchozí - “ přednastavení"
-
-#: src/slic3r/GUI/Preferences.cpp:76
-msgid ""
-"Suppress \" - default - \" presets in the Print / Filament / Printer "
-"selections once there are any other valid presets available."
-msgstr ""
-"Potla�it “ - výchozí - “ přednastavení v nabídkách Tisk / Filament / "
-"Tiskárna, jakmile budou k dispozici další platné předvolby."
-
-#: src/slic3r/GUI/Preferences.cpp:82
-msgid "Show incompatible print and filament presets"
-msgstr "Zobrazit nekompatibilní přednastavení tisku a filamentu"
-
-#: src/slic3r/GUI/Preferences.cpp:84
-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 ""
-"Pokud je zaškrtnuto, přednastavení tisku a filamentu se zobrazují v editoru "
-"přednastavení, i když jsou ozna�eny jako nekompatibilní s aktivní tiskárnou"
-
-#: src/slic3r/GUI/Preferences.cpp:90
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr "Použijte historické OpenGL 1.1 vykreslování"
-
-#: src/slic3r/GUI/Preferences.cpp:92
-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 ""
-"Pokud máte problémy s vykreslováním způsobené chybným ovlada�em OpenGL 2.0, "
-"můžete se pokusit zaškrtnout toto polí�ko. Tím se vypnou úpravy výšky "
-"hladiny a vyhlazení, takže je je lepší upgradovat grafický ovlada�."
-
-#: src/slic3r/GUI/Preferences.cpp:115
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr "Chcete-li provést změny, musíte restartovat aplikaci Slic3r."
-
-#: src/slic3r/GUI/Preset.cpp:170
-msgid "modified"
-msgstr ""
-
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
-msgid "System presets"
-msgstr "Systémové přednastavení"
-
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
-msgid "User presets"
-msgstr "Uživatelská přednastavení"
-
-#: src/slic3r/GUI/Preset.cpp:1157
-msgid "filament"
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:28
-#, c-format
-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 ""
-"Pokud je odhadovaný �as vrstvy nižší než ~% ds, bude ventilátor pracovat na "
-"%d%% a rychlost tisku bude snížena tak, aby na tuto vrstvu nebylo použito "
-"méně než %ds (rychlost však nikdy nebude snížena pod %dmm/s)."
-
-#: src/slic3r/GUI/PresetHints.cpp:32
-#, c-format
-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"
-"Pokud je odhadovaný �as vrstvy delší, ale stále pod ~% ds, bude ventilátor "
-"pracovat s plynule klesající rychlostí mezi %d%% a %d%%."
+#: xs/src/slic3r/GUI/Tab.cpp:2149
+msgid "\n\nis not compatible with printer\n"
+msgstr "\n\nnení kompatibilní s tiskárnou\n"
 
 #: src/slic3r/GUI/PresetHints.cpp:36
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-"\n"
-"V průběhu ostaních vrstev, ventilátor "
+msgid "\nDuring the other layers, fan "
+msgstr "\nV průběhu ostaních vrstev, ventilátor "
 
-#: src/slic3r/GUI/PresetHints.cpp:38
-msgid "Fan "
-msgstr "Ventilátor "
+#: src/slic3r/GUI/PresetHints.cpp:32
+#, possible-c-format
+msgid "\nIf estimated layer time is greater, but still below ~%ds, fan will run at a proportionally decreasing speed between %d%% and %d%%."
+msgstr "\nPokud je odhadovaný �as vrstvy delší, ale stále pod ~%ds, bude ventilátor pracovat s plynule klesající rychlostí mezi %d%% a %d%%."
 
-#: src/slic3r/GUI/PresetHints.cpp:43
-#, c-format
-msgid "will always run at %d%% "
-msgstr "bude vždy běžet na %d%% "
+#: lib/Slic3r/GUI/Plater.pm:1019
+msgid "\nNon-positive value."
+msgstr "\nNezáporná hodnota."
 
-#: src/slic3r/GUI/PresetHints.cpp:46
-#, c-format
-msgid "except for the first %d layers"
-msgstr "s výjimkou prvních %d vrstev"
+#: lib/Slic3r/GUI/Plater.pm:1020
+msgid "\nNot a numeric value."
+msgstr "\nNe�íselná hodnota."
 
-#: src/slic3r/GUI/PresetHints.cpp:50
-msgid "except for the first layer"
-msgstr "vyjma první vstvy"
+#: src/slic3r/GUI/MainFrame.cpp:55
+msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
+msgstr " - Nezapomeňte zkontrolovat aktualizace na http://github.com/prusa3d/slic3r/releases"
 
-#: src/slic3r/GUI/PresetHints.cpp:52
-msgid "will be turned off."
-msgstr "bude vypnut."
+#: src/slic3r/GUI/Tab.cpp:3239
+msgid " as:"
+msgstr " jako:"
 
-#: src/slic3r/GUI/PresetHints.cpp:153
-msgid "external perimeters"
-msgstr "vnější perimetry"
+#: src/slic3r/GUI/PresetHints.cpp:228
+#, possible-c-format
+msgid " at filament speed %3.2f mm/s."
+msgstr " při rychlosti filamentu %3.2f mm/s."
 
-#: src/slic3r/GUI/PresetHints.cpp:162
-msgid "perimeters"
-msgstr "perimetry"
+#: src/slic3r/GUI/Tab.cpp:1737
+msgid " Browse "
+msgstr " Procházet "
 
-#: src/slic3r/GUI/PresetHints.cpp:171
-msgid "infill"
-msgstr "výplň"
-
-#: src/slic3r/GUI/PresetHints.cpp:181
-msgid "solid infill"
-msgstr "plná výplň"
-
-#: src/slic3r/GUI/PresetHints.cpp:189
-msgid "top solid infill"
-msgstr "vrchní plná výplň"
-
-#: src/slic3r/GUI/PresetHints.cpp:200
-msgid "support"
-msgstr "podpory"
-
-#: src/slic3r/GUI/PresetHints.cpp:210
-msgid "support interface"
-msgstr "kontaktní vrstva podpor"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "First layer volumetric"
-msgstr "Volumetrická hodnota první vrstvy"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Bridging volumetric"
-msgstr "Volumetrická hodnota mostů"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Volumetric"
-msgstr "Volumetrický"
+#: src/slic3r/GUI/MainFrame.cpp:677
+msgid " file as:"
+msgstr " soubor jako:"
 
 #: src/slic3r/GUI/PresetHints.cpp:217
 msgid " flow rate is maximized "
 msgstr " průtok je maximalizován "
 
-#: src/slic3r/GUI/PresetHints.cpp:220
-msgid "by the print profile maximum"
-msgstr "maximem pro profil tisku"
+#: src/slic3r/GUI/Tab.cpp:1358
+#, no-c-format
+msgid " infill pattern is not supposed to work at 100% density.\n\nShall I switch to rectilinear fill pattern?"
+msgstr " vzor výplně není ur�en pro práci se 100% hustotou.\n\nMám přejít na vzor výplně rectilinear?"
 
-#: src/slic3r/GUI/PresetHints.cpp:221
-msgid "when printing "
-msgstr "při tisku "
+#: xs/src/slic3r/GUI/Tab.cpp:2131
+msgid " preset\n"
+msgstr " přednastavení\n"
+
+#: xs/src/slic3r/GUI/Tab.cpp:2130
+msgid " preset"
+msgstr " přednastavení"
+
+#: src/slic3r/GUI/Tab.cpp:2938
+msgid " Preset"
+msgstr " Přednastavení"
+
+#: src/slic3r/GUI/Tab.cpp:1818 src/slic3r/GUI/Tab.cpp:2019
+#: src/slic3r/GUI/Tab.cpp:2988
+msgid " Set "
+msgstr " Nastavit "
+
+#: src/slic3r/GUI/Tab.cpp:2936
+msgid " the selected preset?"
+msgstr " zvolené přednastavení?"
+
+#: src/slic3r/GUI/MainFrame.cpp:727
+msgid " was successfully sliced."
+msgstr " byl úspěšně slicován."
 
 #: src/slic3r/GUI/PresetHints.cpp:222
 msgid " with a volumetric rate "
 msgstr " s objemovou rychlostí "
 
-#: src/slic3r/GUI/PresetHints.cpp:226
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr "%3.2f mm³/s"
-
-#: src/slic3r/GUI/PresetHints.cpp:228
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr " při rychlosti filamentu %3.2f mm/s."
-
-#: src/slic3r/GUI/PresetHints.cpp:247
-msgid ""
-"Recommended object thin wall thickness: Not available due to invalid layer "
-"height."
-msgstr ""
-"Doporu�ená tloušťka stěny objektu: Není k dispozici kvůli neplatné výšce "
-"vrstvy."
-
-#: src/slic3r/GUI/PresetHints.cpp:264
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr "Doporu�ená tloušťka stěny objektu pro výšku vrstvy %.2f and "
-
-#: src/slic3r/GUI/PresetHints.cpp:271
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr "%d linie: %.2lf mm"
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Send G-Code to printer host"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Upload to Printer Host with the following filename:"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
-msgid "Start printing after upload"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
-msgid "Use forward slashes ( / ) as a directory separator if needed."
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
-msgid "Cancel selected"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
-msgid "Show error message"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
-msgid "Enqueued"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
-msgid "Uploading"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
-msgid "Completed"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
-msgid "Error uploading to print host:"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:23
-msgid "NO RAMMING AT ALL"
-msgstr "Ž�DN� RAPIDN� EXTRUZE"
-
-#: src/slic3r/GUI/RammingChart.cpp:76
-msgid "Time"
-msgstr "ÄŒas"
-
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
-msgid "s"
-msgstr "s"
-
-#: src/slic3r/GUI/RammingChart.cpp:81
-msgid "Volumetric speed"
-msgstr "Objemová rychlost"
-
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
-msgid "Slic3r Prusa Edition - System Information"
-msgstr "Slic3r Prusa Edition - Informace o systému"
-
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
-msgid "Compatible printers"
-msgstr "Kompatibilní tiskárny"
-
-#: src/slic3r/GUI/Tab.cpp:50
-msgid "Select the printers this profile is compatible with."
-msgstr "Vyberte tiskárny, s nimiž je tento profil kompatibilní."
-
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
-msgid "Compatible print profiles"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:56
-msgid "Select the print profiles this profile is compatible with."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:118
-msgid "Save current "
-msgstr "Uložit stávající "
-
-#: src/slic3r/GUI/Tab.cpp:119
-msgid "Delete this preset"
-msgstr "Smazat přednastavení"
-
-#: src/slic3r/GUI/Tab.cpp:131
-msgid ""
-"Hover the cursor over buttons to find more information \n"
-"or click this button."
-msgstr ""
-"Pro více informací přeje�te kurzorem nad tla�ítky nebo na tla�ítko klikněte."
-
-#: src/slic3r/GUI/Tab.cpp:824
-msgid "It's a default preset."
-msgstr "Je to výchozí přednastavení."
-
-#: src/slic3r/GUI/Tab.cpp:825
-msgid "It's a system preset."
-msgstr "Je to systémové přednastavení."
-
-#: src/slic3r/GUI/Tab.cpp:826
-msgid "Current preset is inherited from "
-msgstr "Aktuální nastavení je zděděno od "
-
-#: src/slic3r/GUI/Tab.cpp:831
-msgid "It can't be deleted or modified. "
-msgstr "Nelze smazat nebo upravit. "
-
-#: src/slic3r/GUI/Tab.cpp:832
-msgid ""
-"Any modifications should be saved as a new preset inherited from this one. "
-msgstr ""
-"Jakékoliv úpravy by měly být uloženy jako nové přednastavení zděděná z "
-"tohoto. "
-
-#: src/slic3r/GUI/Tab.cpp:833
-msgid "To do that please specify a new name for the preset."
-msgstr ""
-"Chcete-li akci provést, prosím nejdříve zadejte nový název přednastavení."
-
-#: src/slic3r/GUI/Tab.cpp:837
-msgid "Additional information:"
-msgstr "Doplňující informace:"
-
-#: src/slic3r/GUI/Tab.cpp:843
-msgid "printer model"
-msgstr "model tiskárny"
-
-#: src/slic3r/GUI/Tab.cpp:851
-msgid "default print profile"
-msgstr "výchozí tiskový profil"
-
-#: src/slic3r/GUI/Tab.cpp:854
-msgid "default filament profile"
-msgstr "výchozí profil filamentu"
-
-#: src/slic3r/GUI/Tab.cpp:868
-msgid "default SLA material profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:872
-msgid "default SLA print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
-msgid "Layers and perimeters"
-msgstr "Vrstvy a perimetry"
-
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
-msgid "Layer height"
-msgstr "Výška vrstvy"
-
-#: src/slic3r/GUI/Tab.cpp:924
-msgid "Vertical shells"
-msgstr "Svislé stěny"
-
-#: src/slic3r/GUI/Tab.cpp:935
-msgid "Horizontal shells"
-msgstr "Vodorovné stěny"
-
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
-msgid "Solid layers"
-msgstr "Plných vrstev"
-
-#: src/slic3r/GUI/Tab.cpp:941
-msgid "Quality (slower slicing)"
-msgstr "Kvalita (pomalejší slicing)"
-
-#: src/slic3r/GUI/Tab.cpp:958
-msgid "Reducing printing time"
-msgstr "Zkracování tiskového �asu"
-
-#: src/slic3r/GUI/Tab.cpp:970
-msgid "Skirt and brim"
-msgstr "Obrys a límec"
-
-#: src/slic3r/GUI/Tab.cpp:987
-msgid "Raft"
-msgstr "Raft"
-
-#: src/slic3r/GUI/Tab.cpp:991
-msgid "Options for support material and raft"
-msgstr "Volby pro podpory a raft"
-
-#: src/slic3r/GUI/Tab.cpp:1006
-msgid "Speed for print moves"
-msgstr "Speed for print moves"
-
-#: src/slic3r/GUI/Tab.cpp:1018
-msgid "Speed for non-print moves"
-msgstr "Netiskové rychlosti"
-
-#: src/slic3r/GUI/Tab.cpp:1021
-msgid "Modifiers"
-msgstr "Modifikátory"
-
-#: src/slic3r/GUI/Tab.cpp:1024
-msgid "Acceleration control (advanced)"
-msgstr "Kontrola akcelerací (pokro�ilé)"
-
-#: src/slic3r/GUI/Tab.cpp:1031
-msgid "Autospeed (advanced)"
-msgstr "Automatická rychlost (pokro�ilé)"
-
-#: src/slic3r/GUI/Tab.cpp:1037
-msgid "Multiple Extruders"
-msgstr "Multiple Extruders"
-
-#: src/slic3r/GUI/Tab.cpp:1045
-msgid "Ooze prevention"
-msgstr "Prevence odkapávání"
-
-#: src/slic3r/GUI/Tab.cpp:1062
-msgid "Extrusion width"
-msgstr "Šířka extruze"
-
-#: src/slic3r/GUI/Tab.cpp:1072
-msgid "Overlap"
-msgstr "Překrytí"
-
-#: src/slic3r/GUI/Tab.cpp:1075
-msgid "Flow"
-msgstr "Průtok"
-
-#: src/slic3r/GUI/Tab.cpp:1078
-msgid "Other"
-msgstr "Ostatní"
-
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
-msgid "Output options"
-msgstr "Možnosti výstupu"
-
-#: src/slic3r/GUI/Tab.cpp:1086
-msgid "Sequential printing"
-msgstr "Sekven�ní tisk"
-
-#: src/slic3r/GUI/Tab.cpp:1088
-msgid "Extruder clearance (mm)"
-msgstr "Kolizní oblast extruderu (mm)"
-
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
-msgid "Output file"
-msgstr "Výstupní soubor"
-
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
-msgid "Post-processing scripts"
-msgstr "Postproduk�ní skripty"
-
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
-msgid "Notes"
-msgstr "Poznámky"
-
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
-msgid "Dependencies"
-msgstr "Závislosti"
-
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
-msgid "Profile dependencies"
-msgstr "Profilové závislosti"
-
-#: src/slic3r/GUI/Tab.cpp:1161
-#, no-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"
-"- no ensure_vertical_shell_thickness\n"
-"\n"
-"Shall I adjust those settings in order to enable Spiral Vase?"
-msgstr ""
-"Mód spirálové vázy vyžaduje:\n"
-"- jeden perimeter\n"
-"- žádné plné vrchní vrstvy\n"
-"- 0% hustota výplně\n"
-"- žádné podpěry\n"
-"- nezjišťování vertikální tloušťky pláště\n"
-"\n"
-"Mám tyto nastavení upravit tak, aby bylo možné mód spirálové vázy zapnout?"
-
-#: src/slic3r/GUI/Tab.cpp:1168
-msgid "Spiral Vase"
-msgstr "Spirálová váza"
-
-#: src/slic3r/GUI/Tab.cpp:1191
-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 ""
-"Čistící věž v sou�asné době podporuje pouze nerozpustné podpory\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 popor tak extruder pro tisk kontaktních podpor je "
-"třeba nastavit na 0).\n"
-"\n"
-"Mám tyto nastavení upravit tak, aby bylo možné zapnout Čistící věž?"
-
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
-msgid "Wipe Tower"
-msgstr "Čistící věž"
-
-#: src/slic3r/GUI/Tab.cpp:1209
-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 ""
-"U �istící věže pokud pracujte s rozpustnými materiály, je třeba\n"
-"synchronizovat vrstvy podpor s vrstvami objektů.\n"
-"\n"
-"Mám synchronizovat vrstvy podpor, aby bylo možné zapnout Čistící věž?"
-
-#: src/slic3r/GUI/Tab.cpp:1227
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters\n"
-"\n"
-"Shall I adjust those settings for supports?"
-msgstr ""
-"Podpory fungují lépe, pokud je povolena následující funkce:\n"
-"- Zjistit přemosťovací perimetry\n"
-"\n"
-"Mám tyto nastavení pro podpory upravit?"
-
-#: src/slic3r/GUI/Tab.cpp:1230
-msgid "Support Generator"
-msgstr "Generátor Podpor"
-
-#: src/slic3r/GUI/Tab.cpp:1272
-msgid "The "
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1272
-#, no-c-format
-msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
-"\n"
-"Shall I switch to rectilinear fill pattern?"
-msgstr ""
-" vzor výplně není ur�en pro práci se 100% hustotou.\n"
-"\n"
-"Mám přejít na vzor výplně rectilinear?"
-
-#: src/slic3r/GUI/Tab.cpp:1388
-msgid "Temperature "
-msgstr "Teplota "
-
-#: src/slic3r/GUI/Tab.cpp:1394
-msgid "Bed"
-msgstr "Tisková podložka"
-
-#: src/slic3r/GUI/Tab.cpp:1399
-msgid "Cooling"
-msgstr "Chlazení"
-
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
-msgid "Enable"
-msgstr "Zapnout"
-
-#: src/slic3r/GUI/Tab.cpp:1411
-msgid "Fan settings"
-msgstr "Nastavení ventilátoru"
-
-#: src/slic3r/GUI/Tab.cpp:1412
-msgid "Fan speed"
-msgstr "Rychlost ventilátoru"
-
-#: src/slic3r/GUI/Tab.cpp:1420
-msgid "Cooling thresholds"
-msgstr "Podmínky chlazení"
-
-#: src/slic3r/GUI/Tab.cpp:1426
-msgid "Filament properties"
-msgstr "Vlastnosti filamentu"
-
-#: src/slic3r/GUI/Tab.cpp:1430
-msgid "Print speed override"
-msgstr "Přepsání rychlosti tisku"
-
-#: src/slic3r/GUI/Tab.cpp:1440
-msgid "Toolchange parameters with single extruder MM printers"
-msgstr "Parametry při výměně (Multi Material s jedním extruderem)"
-
-#: src/slic3r/GUI/Tab.cpp:1455
-msgid "Ramming settings"
-msgstr "Nastavení rapidní extruze"
-
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
-msgid "Custom G-code"
-msgstr "Vlastní G-code"
-
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
-msgid "Start G-code"
-msgstr "Za�átek G-code"
-
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
-msgid "End G-code"
-msgstr "Konec G-code"
-
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
-msgid " Browse "
-msgstr " Procházet "
-
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
-msgid "Test"
-msgstr "Test"
-
-#: src/slic3r/GUI/Tab.cpp:1615
-msgid "Could not get a valid Printer Host reference"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
-msgid "Success!"
-msgstr "Úspěch!"
-
-#: src/slic3r/GUI/Tab.cpp:1636
-msgid ""
-"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
-"signed certificate."
-msgstr ""
-"Soubor HTTPS CA je volitelný. Je nutný pouze pokud použijte HTTPS certifikát "
-"s vlastním podpisem."
-
-#: src/slic3r/GUI/Tab.cpp:1648
-msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-msgstr "Soubory s certifikátem (*.crt, *.pem)|*.crt;*.pem|Všechny soubory|*.*"
-
-#: src/slic3r/GUI/Tab.cpp:1649
-msgid "Open CA certificate file"
-msgstr "Otevřít soubor s certifikátem CA"
-
-#: src/slic3r/GUI/Tab.cpp:1676
-msgid ""
-"HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
-msgid "Size and coordinates"
-msgstr "Rozměr a souřadnice"
-
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
-msgid " Set "
-msgstr " Nastavit "
-
-#: src/slic3r/GUI/Tab.cpp:1740
-msgid "Capabilities"
-msgstr "Možnosti"
-
-#: src/slic3r/GUI/Tab.cpp:1745
-msgid "Number of extruders of the printer."
-msgstr "Po�et extrudérů tiskárny."
-
-#: src/slic3r/GUI/Tab.cpp:1773
-msgid "USB/Serial connection"
-msgstr "USB/Sériové připojení"
-
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
-msgid "Serial port"
-msgstr "Sériový port"
-
-#: src/slic3r/GUI/Tab.cpp:1779
-msgid "Rescan serial ports"
-msgstr "Znovu prohledat sériové porty"
-
-#: src/slic3r/GUI/Tab.cpp:1801
-msgid "Connection to printer works correctly."
-msgstr "Připojení k tiskárně pracuje správně."
-
-#: src/slic3r/GUI/Tab.cpp:1804
-msgid "Connection failed."
-msgstr "Připojení selhalo."
-
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
-msgid "Print Host upload"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
-msgid "Before layer change G-code"
-msgstr "G-code před změnou vrstvy"
-
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
-msgid "After layer change G-code"
-msgstr "G-code po změně vrstvy"
-
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
-msgid "Tool change G-code"
-msgstr "G-code pro výměnu nástroje"
-
-#: src/slic3r/GUI/Tab.cpp:1877
-msgid "Between objects G-code (for sequential printing)"
-msgstr "G-code mezi objekty (pro sekven�ní tisk)"
-
-#: src/slic3r/GUI/Tab.cpp:1938
-msgid "Display"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
-msgid "Corrections"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
-msgid "Machine limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2025
-msgid "Values in this column are for Full Power mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2026
-msgid "Full Power"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2031
-msgid "Values in this column are for Silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2032
-msgid "Silent"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2040
-msgid "Maximum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2045
-msgid "Maximum accelerations"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2052
-msgid "Jerk limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2057
-msgid "Minimum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
-msgid "Single extruder MM setup"
-msgstr "Nastavení jednoho extruderu MM"
-
-#: src/slic3r/GUI/Tab.cpp:2104
-msgid "Single extruder multimaterial parameters"
-msgstr "Parametry jednoho multi materiálového extruderu"
-
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
-#, c-format
-msgid "Extruder %d"
-msgstr "Extruder %d"
-
-#: src/slic3r/GUI/Tab.cpp:2125
-msgid "Layer height limits"
-msgstr "Výskové limity vrstvy"
-
-#: src/slic3r/GUI/Tab.cpp:2130
-msgid "Position (for multi-extruder printers)"
-msgstr "Pozice (pro tiskárny s více extrudery)"
-
-#: src/slic3r/GUI/Tab.cpp:2133
-msgid "Retraction"
-msgstr "Retrakce"
-
-#: src/slic3r/GUI/Tab.cpp:2136
-msgid "Only lift Z"
-msgstr "Pouze zvednout Z"
-
-#: src/slic3r/GUI/Tab.cpp:2149
-msgid ""
-"Retraction when tool is disabled (advanced settings for multi-extruder "
-"setups)"
-msgstr ""
-"Retrakce pro neaktivní extruder (pokro�ilé nastavení pro tiskárny typu "
-"MultiMaterial)"
-
-#: src/slic3r/GUI/Tab.cpp:2153
-msgid "Preview"
-msgstr "Náhled"
-
-#: src/slic3r/GUI/Tab.cpp:2284
-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 ""
-"Možnost O�istit není k dispozici při použití režimu retrací z firmwaru.\n"
-"\n"
-"Mám ji deaktivovat, aby bylo možné povolit retrakce z firmwaru?"
-
-#: src/slic3r/GUI/Tab.cpp:2286
-msgid "Firmware Retraction"
-msgstr "Firmware Retrakce"
-
-#: src/slic3r/GUI/Tab.cpp:2565
-#, c-format
-msgid "Default preset (%s)"
-msgstr "Výchozí přednastavení (%s)"
-
-#: src/slic3r/GUI/Tab.cpp:2566
-#, c-format
-msgid "Preset (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2583
-msgid "has the following unsaved changes:"
-msgstr "má neuložené následující změny:"
-
-#: src/slic3r/GUI/Tab.cpp:2586
-msgid "is not compatible with printer"
-msgstr "není kompatibilní s tiskárnou"
-
-#: src/slic3r/GUI/Tab.cpp:2587
-msgid "is not compatible with print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2589
-msgid "and it has the following unsaved changes:"
-msgstr "a má neuložené následující změny:"
-
-#: src/slic3r/GUI/Tab.cpp:2592
-msgid "Discard changes and continue anyway?"
-msgstr "Zahodit změny a přesto pokra�ovat?"
-
-#: src/slic3r/GUI/Tab.cpp:2593
-msgid "Unsaved Changes"
-msgstr "Neuložené Změny"
-
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
-msgid "Please check your object list before preset changing."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2699
-msgid "The supplied name is empty. It can't be saved."
-msgstr "Název je prázdný. Nelze uložit."
-
-#: src/slic3r/GUI/Tab.cpp:2704
-msgid "Cannot overwrite a system profile."
-msgstr "Nelze přepsat systémový profil."
-
-#: src/slic3r/GUI/Tab.cpp:2708
-msgid "Cannot overwrite an external profile."
-msgstr "Nelze přepsat externí profil."
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "remove"
-msgstr "odebrat"
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "delete"
-msgstr "smazat"
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid "Are you sure you want to "
-msgstr "Jste si jistý že chcete "
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid " the selected preset?"
-msgstr " zvolené přednastavení?"
-
-#: src/slic3r/GUI/Tab.cpp:2736
-msgid "Remove"
-msgstr "Odebrat"
-
-#: src/slic3r/GUI/Tab.cpp:2737
-msgid " Preset"
-msgstr " Přednastavení"
-
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "VÅ¡e"
-
-#: src/slic3r/GUI/Tab.cpp:2869
-msgid ""
-"LOCKED LOCK;indicates that the settings are the same as the system values "
-"for the current option group"
-msgstr ""
-"ZAMKNUT� Z�MEK; indikuje, že nastavení jsou stejná jako systémové hodnoty "
-"pro aktuální skupinu nastavení"
-
-#: src/slic3r/GUI/Tab.cpp:2872
-msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
-"the system values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group "
-"to the system values."
-msgstr ""
-"ODEMKNUT� Z�MEK;indikuje, že některá nastavení byla změněna a nejsou shodná "
-"se systémový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é hodnoty."
-
-#: src/slic3r/GUI/Tab.cpp:2878
-msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr ""
-"B�L� TEČKA;pro levé tla�ítko: indikuje nesystémové přednastavení,\n"
-"pro pravé tla�ítko: indikuje, že nastavení nebylo změněno."
-
-#: src/slic3r/GUI/Tab.cpp:2882
-msgid ""
-"BACK ARROW;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 ""
-"ŠIPKA 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í. 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/Tab.cpp:2908
-msgid ""
-"LOCKED LOCK icon indicates that the settings are the same as the system "
-"values for the current option group"
-msgstr ""
-"Ikona ZAMKNUTÉHO Z�MKU indikuje, že nastavení jsou stejná jako systémové "
-"hodnoty pro aktuální skupinu nastavení"
-
-#: src/slic3r/GUI/Tab.cpp:2910
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not "
-"equal to the system values for the current option group.\n"
-"Click to reset all settings for current option group to the system values."
-msgstr ""
-"Ikona ODEMKNUTÉHO Z�MKU indikuje, že některá nastavení byla změněna a nejsou "
-"shodná se systémový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:2913
-msgid "WHITE BULLET icon indicates a non system preset."
-msgstr "Ikona B�LÉ TEČKY indikuje nesystémové přednastavení."
-
-#: src/slic3r/GUI/Tab.cpp:2916
-msgid ""
-"WHITE BULLET icon indicates that the settings are the same as in the last "
-"saved preset for the current option group."
-msgstr ""
-"Ikona B�LÉ TEČKY indikuje, že nastavení jsou shodná s naposledy uloženým "
-"přednastavením pro danou skupinu nastavení."
-
-#: src/slic3r/GUI/Tab.cpp:2918
-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:2924
-msgid ""
-"LOCKED LOCK icon indicates that the value is the same as the system value."
-msgstr ""
-"Ikona ZAMKNUTÉHO Z�MKU indikuje, že hodnota je shodná se systémovou hodnotou."
-
-#: src/slic3r/GUI/Tab.cpp:2925
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
-"the system value.\n"
-"Click to reset current value to the system value."
-msgstr ""
-"Ikona ODEMKNUTÉHO Z�MKU indikuje, že se hodnota změnila a není shodná se "
-"systémovou hodnotou.\n"
-"Klikněte pro reset sou�asné hodnoty na systémovou hodnotu."
-
-#: src/slic3r/GUI/Tab.cpp:2931
-msgid ""
-"WHITE BULLET icon indicates that the value is the same as in the last saved "
-"preset."
-msgstr ""
-"Ikona B�LÉ TEČKY indikuje, že je hodnota shodná s naposledy uloženým "
-"přednastavením."
-
-#: src/slic3r/GUI/Tab.cpp:2932
-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"
-"Klikněte pro reset sou�asné hodnoty na naposledy uložené přednastavení."
-
-# Used in this context: _("Save ") + title + _(" as:")
-#: src/slic3r/GUI/Tab.cpp:3031
-msgid " as:"
-msgstr " jako:"
-
-#: src/slic3r/GUI/Tab.cpp:3075
-msgid "the following postfix are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3079
-msgid "The supplied name is not available."
-msgstr "Zadaný název není dostupný."
-
-#: src/slic3r/GUI/Tab.cpp:3092
-msgid "Material"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
-msgid "Layers"
-msgstr "Vrstvy"
-
-#: src/slic3r/GUI/Tab.cpp:3098
-msgid "Exposure"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3183
-msgid "Support head"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3188
-msgid "Support pillar"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3196
-msgid "Connection of the support sticks and junctions"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3200
-msgid "Automatic generation"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
-msgid "Print Settings"
-msgstr "Nastavení tisku"
-
-#: src/slic3r/GUI/Tab.hpp:311
-msgid "Filament Settings"
-msgstr "Nastavení filamentu"
-
-#: src/slic3r/GUI/Tab.hpp:344
-msgid "Printer Settings"
-msgstr "Nastavení tiskárny"
-
-#: src/slic3r/GUI/Tab.hpp:367
-msgid "Material Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:393
-msgid "Save preset"
-msgstr "Uložit přednastavení"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "Update available"
-msgstr "Je dostupná aktualizace"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "New version of Slic3r PE is available"
-msgstr "Je dostupná nová verze Slic3r PE"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
-msgid "To download, follow the link below."
-msgstr "Pro stažení, klikněte na odkaz níže."
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
-msgid "Current version:"
-msgstr "Aktuální verze:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
-msgid "New version:"
-msgstr "Nová verze:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
-msgid "Don't notify about new releases any more"
-msgstr "Neupozorňovat na nové verze"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
-msgid "Configuration update"
-msgstr "Aktualizace nastavení"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
-msgid "Configuration update is available"
-msgstr "Je k dispozici aktualizace nastavení"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
-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"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"Přejete si spustit instalaci?\n"
-"\n"
-"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/UpdateDialogs.cpp:109
-msgid "Slic3r incompatibility"
-msgstr "Nekompatibilita Slic3ru"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r configuration is incompatible"
-msgstr "Konfigurace Slic3ru není kompatibilní"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed "
-"configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using "
-"a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-"Tato verze Slic3r PE není kompatibilní se sou�asně nainstalovanými balí�ky "
-"nastavení.\n"
-"Tato situace nejspíše nastala spuštěním starší verze Slic3r PE po používání "
-"novější verze.\n"
-"\n"
-"Můžete bu� ukon�it Slic3r a zkusit to znovu s novou verzí, nebo můžete znovu "
-"spustit výchozí konfiguraci. Před instalací kompatibilního nastavení s touto "
-"verzí Slic3ru dojde k vytvoření zálohy sou�asné konfigurace.\n"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
-#, c-format
-msgid "This Slic3r PE version: %s"
-msgstr "Tato verze Slic3r PE: %s"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
-msgid "Incompatible bundles:"
-msgstr "Nekompatibilní balíky:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
-msgid "Exit Slic3r"
-msgstr "Ukon�it Slic3r"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
-msgid "Re-configure"
-msgstr "Přenastavit"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
-#, c-format
-msgid ""
-"Slic3r PE 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 ""
-"Slic3r PE 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"
-"Prosím postupujte dle %s, který následuje pro nastavení nových přednastavení "
-"a vyberte si, zdali chcete jejich automatickou aktualizaci."
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:182
-msgid "For more information please visit our wiki page:"
-msgstr "Pro více informací prosím navštivte naší wiki stránku:"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
-msgid "Ramming customization"
-msgstr "Přizpůsobení rapidní extruze"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
-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:78
-msgid "Total ramming time"
-msgstr "Celkový �as rapidní extruze"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
-msgid "Total rammed volume"
-msgstr "Celkový objem rapidní extruze"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
-msgid "Ramming line width"
-msgstr "Šířka linky při rapidní extruzi"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
-msgid "Ramming line spacing"
-msgstr "Rozestup linek při rapidní extruzi"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
-msgid "Wipe tower - Purging volume adjustment"
-msgstr "Čistící věž - Úprava objemu �ištění"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
-msgid ""
-"Here you can adjust required purging volume (mm³) for any given pair of "
-"tools."
-msgstr ""
-"Zde můžete upravit požadovaný objem �ištění (mm³) pro kteroukoliv dvojici "
-"extruderů."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
-msgid "Extruder changed to"
-msgstr "Extruder změněn na"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
-msgid "unloaded"
-msgstr "vyjmuto"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
-msgid "loaded"
-msgstr "zaváděn"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
-msgid "Tool #"
-msgstr "Nástroj #"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
-msgid ""
-"Total purging volume is calculated by summing two values below, depending on "
-"which tools are loaded/unloaded."
-msgstr ""
-"Celkový objem �ištění je spo�ítán jako sou�et dvou hodnot níže v závislosti "
-"na tom, které extrudery jsou zavedeny/vyjmuty."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
-msgid "Volume to purge (mm³) when the filament is being"
-msgstr "Objem k vy�ištění (mm³) pokud je filament"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
-msgid "From"
-msgstr "Předchozí extruder"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
-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"
-"\n"
-"Opravdu chcete pokra�ovat?"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show simplified settings"
-msgstr "Zobrazit jednoduché nastavení"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show advanced settings"
-msgstr "Zobrazit rozšířená nastavení"
-
-#: src/slic3r/Utils/OctoPrint.cpp:65
-#, c-format
-msgid "Mismatched type of print host: %s"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:80
-msgid "Connection to OctoPrint works correctly."
-msgstr "Připojení k OctoPrint pracuje správně."
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Could not connect to OctoPrint"
-msgstr "Nelze se spojit s OctoPrintem"
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr "Poznámka: Je vyžadován OctoPrint ve verzi alespoň 1.1.0."
-
-#: src/slic3r/Utils/OctoPrint.cpp:181
-msgid "Connection to Prusa SLA works correctly."
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:186
-msgid "Could not connect to Prusa SLA"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:571
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr "vyžaduje min. %s a max. %s"
-
-#: src/slic3r/Utils/PresetUpdater.cpp:576
-#, c-format
-msgid "requires min. %s"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:578
-#, c-format
-msgid "requires max. %s"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:235
-msgid "Failed loading the input model."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:248
-msgid "Mesh repair failed."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the 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 ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
-msgid "Model fixing"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
-msgid "Exporting model..."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
-msgid "Export of a temporary 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
-msgid "Import of the repaired 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
-msgid "Model repair finished"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
-msgid "Model repair canceled"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-msgid "Model repaired successfully"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model Repair by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model repair failed: \n"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1175
-msgid "All objects are outside of the print volume."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1201
-msgid "Some objects are too close; your extruder will collide with them."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1216
-msgid ""
-"Some objects are too tall and cannot be printed without extruder collisions."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1226
-msgid "The Spiral Vase option can only be used when printing a single object."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1228
-msgid ""
-"The Spiral Vase option can only be used when printing single material "
-"objects."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1234
-msgid ""
-"All extruders must have the same diameter for single extruder multimaterial "
-"printer."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1239
-msgid ""
-"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
-"and Repetier G-code flavors."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1241
-msgid ""
-"The Wipe Tower is currently only supported with the relative extruder "
-"addressing (use_relative_e_distances=1)."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1253
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1255
-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:1257
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are printed "
-"with the same support_material_contact_distance"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1259
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are sliced "
-"equally."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1281
-msgid ""
-"The Wipe tower is only supported if all objects have the same layer height "
-"profile"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1290
-msgid "The supplied settings will cause an empty print."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1307
-msgid ""
-"One or more object were assigned an extruder that the printer does not have."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1316
-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 ""
-
-#: src/libslic3r/Print.cpp:1324
-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:1328
-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 ""
-
-#: src/libslic3r/Print.cpp:1335
-msgid "first_layer_height"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1350
-msgid "First layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1354
-msgid "Layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
-msgid "Printer technology"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:41
-msgid "Bed shape"
-msgstr "Tvar tiskové podložky"
-
-#: src/libslic3r/PrintConfig.cpp:48
-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 ""
-"Toto nastavení řídí výšku (a tedy výsledný po�et) řezů/vrstev. Ten�í vrstva "
-"poskytuje lepší přesnost, ale tiskne se déle."
-
-#: src/libslic3r/PrintConfig.cpp:56
-msgid "Max print height"
-msgstr "Maximální výška tisku"
-
-#: src/libslic3r/PrintConfig.cpp:57
-msgid ""
-"Set this to the maximum height that can be reached by your extruder while "
-"printing."
-msgstr ""
-"Nastavte tuto hodnotu na maximální výšku, která může být dosažena extruderem "
-"během tisku."
-
-#: src/libslic3r/PrintConfig.cpp:73
-msgid "Avoid crossing perimeters"
-msgstr "Vyhnout se přejíždění perimetrů"
-
-#: src/libslic3r/PrintConfig.cpp:74
-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 ""
-"Optimalizovat rychloposuny do pořadí aby se minimalizovalo přejíždění "
-"perimetrů. Nejvíce užite�né u Bowdenových extruderů které trpí na vytékáné "
-"filamentu. Toto nastavení zpomaluje tisk i generování G-code."
-
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
-msgid "Other layers"
-msgstr "Ostatní vrstvy"
-
-#: src/libslic3r/PrintConfig.cpp:83
-msgid ""
-"Bed temperature for layers after the first one. Set this to zero to disable "
-"bed temperature control commands in the output."
-msgstr ""
-"Teplota tiskové podložky pro další vrstvy po první vrstvě. Nastavením na "
-"hodnotu nula vypnete ovládací příkazy teploty tiskové podložky ve výstupu."
-
-#: src/libslic3r/PrintConfig.cpp:86
-msgid "Bed temperature"
-msgstr "Teplota tiskové podložky"
-
-#: src/libslic3r/PrintConfig.cpp:93
-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 ""
-"Tento vlastní kód je vložen pro každou změnu vrstvy, předtím než se pohne Z. "
-"Můžete přidávat zástupné proměnné pro veškeré nastavení Slic3ru stejně tak "
-"jako [layer_num] a [layer_z]."
-
-#: src/libslic3r/PrintConfig.cpp:104
-msgid "Between objects G-code"
-msgstr "G-code mezi objekty"
-
-#: src/libslic3r/PrintConfig.cpp:105
-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:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "Spodních"
-
-#: src/libslic3r/PrintConfig.cpp:116
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "Po�et plných vrstev."
-
-#: src/libslic3r/PrintConfig.cpp:118
-msgid "Bottom solid layers"
-msgstr "Plné spodní vrstvy"
-
-#: src/libslic3r/PrintConfig.cpp:123
-msgid "Bridge"
-msgstr "Most"
-
-#: src/libslic3r/PrintConfig.cpp:124
-msgid ""
-"This is the acceleration your printer will use for bridges. Set zero to "
-"disable acceleration control for bridges."
-msgstr ""
-"Nastavení akcelerace tiskárny při vytváření mostů. Nastavením na nulu "
-"vypnete ovládání akcelerace pro mosty."
-
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
-msgid "mm/s²"
-msgstr "mm/s²"
-
-#: src/libslic3r/PrintConfig.cpp:133
-msgid "Bridging angle"
-msgstr "Úhel vytváření mostů"
-
-#: src/libslic3r/PrintConfig.cpp:135
-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 ""
-"Přepsání úhlu vytváření mostů. Nastavením hodnoty na nulu se bude úhel "
-"vytváření mostů vypo�ítávat automaticky. Při zadání jiného úhlu, bude pro "
-"všechny mosty použitý zadaný úhel. Pro nulový úhel zadejte 180°."
-
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
-msgid "°"
-msgstr "°"
-
-#: src/libslic3r/PrintConfig.cpp:145
-msgid "Bridges fan speed"
-msgstr "Rychlost ventilátoru při vytváření mostů"
-
-#: src/libslic3r/PrintConfig.cpp:146
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr ""
-"Nastavená rychlost ventilátoru je využita vždy při vytváření mostů a přesahů."
-
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
+#: src/libslic3r/PrintConfig.cpp:179 src/libslic3r/PrintConfig.cpp:745
+#: src/libslic3r/PrintConfig.cpp:1154 src/libslic3r/PrintConfig.cpp:1217
+#: src/libslic3r/PrintConfig.cpp:1462 src/libslic3r/PrintConfig.cpp:2260
+#: src/libslic3r/PrintConfig.cpp:2502
 msgid "%"
 msgstr "%"
 
-#: src/libslic3r/PrintConfig.cpp:155
-msgid "Bridge flow ratio"
-msgstr "Poměr průtoku při vytváření mostů"
+#: src/libslic3r/GCode/PreviewData.cpp:504
+#, possible-c-format
+msgid "%.2f - %.2f mm"
+msgstr "%.2f - %.2f mm"
 
-#: src/libslic3r/PrintConfig.cpp:157
-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 ""
-"Tato hodnota ur�uje množství vytla�eného plastu při vytváření mostů. Mírným "
-"snížením této hodnoty můžete předejít pronášení ikdyž, přednastavené hodnoty "
-"jsou většinou dobré a je lepší experimentovat s chlazením (využitím "
-"ventilátoru), než s touto hodnotou."
+#: src/slic3r/GUI/PresetHints.cpp:226
+#, possible-c-format
+msgid "%3.2f mm³/s"
+msgstr "%3.2f mm³/s"
 
-#: src/libslic3r/PrintConfig.cpp:168
-msgid "Bridges"
-msgstr "Mosty"
+#: src/slic3r/GUI/Plater.cpp:974
+#, possible-c-format
+msgid "%d (%d shells)"
+msgstr "%d (%d obalů)"
 
-#: src/libslic3r/PrintConfig.cpp:170
-msgid "Speed for printing bridges."
-msgstr "Rychlost pro vytváření mostů."
+#: src/slic3r/GUI/Plater.cpp:982
+#, possible-c-format
+msgid "%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d facets reversed, %d backwards edges"
+msgstr "%d poškozených faset, %d okrajů opraveno, %d faset odstraněno, %d faset přidáno, %d faset navráceno, %d zadních okrajů"
 
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
-msgid "mm/s"
-msgstr "mm/s"
+#: src/slic3r/GUI/PresetHints.cpp:271
+#, possible-c-format
+msgid "%d lines: %.2lf mm"
+msgstr "%d linie: %.2lf mm"
 
-#: src/libslic3r/PrintConfig.cpp:178
-msgid "Brim width"
-msgstr "Šířka límce"
+#: src/slic3r/GUI/MainFrame.cpp:894
+#, possible-c-format
+msgid "%d presets successfully imported."
+msgstr "%d přednastavení úspěšně importováno."
 
-#: src/libslic3r/PrintConfig.cpp:179
-msgid ""
-"Horizontal width of the brim that will be printed around each object on the "
-"first layer."
-msgstr "Šírka límce který bude vytištěn v první vrstvě okolo každého objektu."
+#: src/slic3r/GUI/MainFrame.cpp:553
+#, possible-c-format
+msgid "%s &Manual"
+msgstr "%s Návod"
 
-#: src/libslic3r/PrintConfig.cpp:187
-msgid "Clip multi-part objects"
-msgstr "Připnutí objektů z více �ástí k sobě"
+#: src/slic3r/GUI/MainFrame.cpp:550
+#, possible-c-format
+msgid "%s &Website"
+msgstr "%s &Webová stránka"
 
-#: src/libslic3r/PrintConfig.cpp:188
-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 ""
-"Připnutí překrývajících se objektů jeden k druhému při Multimateriálovém "
-"tisku. (Druhá �ást se připne k první, třetí �ást k první a druhé, atd)."
+#: src/slic3r/GUI/UpdateDialogs.cpp:113
+#, possible-c-format
+msgid "%s configuration is incompatible"
+msgstr "Konfigurace %s není kompatibilní"
 
-#: src/libslic3r/PrintConfig.cpp:196
-msgid "Colorprint height"
-msgstr ""
+#: src/slic3r/GUI/Field.cpp:136
+#, possible-c-format
+msgid "%s doesn't support percentage"
+msgstr "%s nepodporuje procenta"
 
-#: src/libslic3r/PrintConfig.cpp:197
-msgid "Heights at which a filament change is to occur. "
-msgstr ""
+#: src/slic3r/GUI/MsgDialog.cpp:73
+#, possible-c-format
+msgid "%s error"
+msgstr "%s chyba"
 
-#: src/libslic3r/PrintConfig.cpp:207
-msgid "Compatible printers condition"
-msgstr "Stav kompatibilních tiskáren"
+#: src/slic3r/GUI/ConfigWizard.cpp:336
+#, possible-c-format
+msgid "%s Family"
+msgstr "%s Rodina"
 
-#: src/libslic3r/PrintConfig.cpp:208
-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."
-msgstr ""
-"Logický výraz může používat konfigura�ní hodnoty aktivního profilu tiskárny. "
-"Pokud je tento logický výraz pravdivý, potom je tento profil považován za "
-"kompatibilní s aktivním profilem tiskárny."
+#: src/slic3r/GUI/MsgDialog.cpp:74
+#, possible-c-format
+msgid "%s has encountered an error"
+msgstr "Došlo k chybě v programu %s"
 
-#: src/libslic3r/PrintConfig.cpp:220
-msgid "Compatible print profiles condition"
-msgstr ""
+#: src/slic3r/GUI/UpdateDialogs.cpp:112
+#, possible-c-format
+msgid "%s incompatibility"
+msgstr "Není kompatibilní s %s"
 
-#: src/libslic3r/PrintConfig.cpp:221
-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."
-msgstr ""
+#: src/slic3r/GUI/UpdateDialogs.cpp:172
+#, possible-c-format
+msgid "%s now uses an updated configuration structure.\n\nSo 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.\nAn inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n\nPlease 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\nByly 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í.\nNově 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\nPři nastavování nových předvoleb postupujte podle pokynů v %s a vyberte, zda chcete povolit automatické přednastavené aktualizace."
 
-#: src/libslic3r/PrintConfig.cpp:235
-msgid "Complete individual objects"
-msgstr "Dokon�ení individuálních objektů"
+#: src/slic3r/GUI/GUI_App.cpp:681
+#, possible-c-format
+msgid "%s View Mode"
+msgstr "%s Režim zobrazení"
+
+#: src/slic3r/GUI/MainFrame.cpp:563
+#, possible-c-format
+msgid "&About %s"
+msgstr "O %s"
+
+#: src/slic3r/GUI/MainFrame.cpp:479
+msgid "&About Slic3r"
+msgstr "&O Slic3ru"
+
+#: src/slic3r/GUI/GUI_App.cpp:769
+msgid "&Configuration"
+msgstr "&Konfigurace"
+
+#: src/slic3r/GUI/GUI_App.cpp:661
+msgid "&Configuration Snapshots"
+msgstr "Záloha konfigura&ce"
+
+#: src/slic3r/GUI/MainFrame.cpp:454
+msgid "&Copy"
+msgstr "Kopírovat"
+
+#: src/slic3r/GUI/MainFrame.cpp:447
+msgid "&Delete selected"
+msgstr "&Smazat vybrané"
+
+#: src/slic3r/GUI/MainFrame.cpp:575
+msgid "&Edit"
+msgstr "&Editovat"
+
+#: src/slic3r/GUI/MainFrame.cpp:377
+msgid "&Export"
+msgstr "&Exportovat"
+
+#: lib/Slic3r/GUI/MainFrame.pm:227
+msgid "&Export Config Bundle…"
+msgstr "&Exportovat Konfigura�ní Balík…"
+
+#: lib/Slic3r/GUI/MainFrame.pm:221
+msgid "&Export Config…\tCtrl+E"
+msgstr "&Exportovat Konfiguraci…\tCtrl+E"
+
+#: src/slic3r/GUI/MainFrame.cpp:480 src/slic3r/GUI/MainFrame.cpp:604
+msgid "&Filament Settings Tab"
+msgstr "Panel nastavení &filamentu"
+
+#: src/slic3r/GUI/MainFrame.cpp:574
+msgid "&File"
+msgstr "&Soubor"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1094
+msgid "&Finish"
+msgstr "&Dokon�it"
+
+#: src/slic3r/GUI/MainFrame.cpp:580
+msgid "&Help"
+msgstr "&Pomoc"
+
+#: src/slic3r/GUI/MainFrame.cpp:359
+msgid "&Import"
+msgstr "&Importovat"
+
+#: lib/Slic3r/GUI/MainFrame.pm:224
+msgid "&Load Config Bundle…"
+msgstr "&Na�íst Konfigura�ní Balík…"
+
+#: lib/Slic3r/GUI/MainFrame.pm:218
+msgid "&Load Config…\tCtrl+L"
+msgstr "&Na�íst Konfiguraci…\tCtrl+L"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1093
+msgid "&Next >"
+msgstr "&Další>"
+
+#: lib/Slic3r/GUI/MainFrame.pm:376
+msgid "&Object"
+msgstr "&Objekt"
+
+#: src/slic3r/GUI/MainFrame.cpp:339
+msgid "&Open Project"
+msgstr "&Otevřít projekt"
+
+#: src/slic3r/GUI/MainFrame.cpp:456
+msgid "&Paste"
+msgstr "Vložit"
+
+#: lib/Slic3r/GUI/MainFrame.pm:375
+msgid "&Plater"
+msgstr "&Podložka"
+
+#: src/slic3r/GUI/MainFrame.cpp:471
+msgid "&Plater Tab"
+msgstr "&Panel Podložka"
+
+#: src/slic3r/GUI/GUI_App.cpp:665
+msgid "&Preferences"
+msgstr "Nastavení"
+
+#: src/slic3r/GUI/MainFrame.cpp:409
+msgid "&Quit"
+msgstr "&Ukon�it"
+
+#: src/slic3r/GUI/MainFrame.cpp:406
+msgid "&Repair STL file"
+msgstr "Op&ravit soubor STL"
+
+#: lib/Slic3r/GUI/MainFrame.pm:244
+msgid "&Repeat Last Quick Slice\tCtrl+Shift+U"
+msgstr "&Opakovat Poslední Slicování\tCtrl+Shift+U"
+
+#: src/slic3r/GUI/MainFrame.cpp:341
+msgid "&Save Project"
+msgstr "Uložit projekt"
+
+#: src/slic3r/GUI/MainFrame.cpp:444
+msgid "&Select all"
+msgstr "Vybrat vše"
+
+#: src/slic3r/GUI/MainFrame.cpp:577
+msgid "&View"
+msgstr "&Zobrazení"
+
+#: src/slic3r/GUI/MainFrame.cpp:576
+msgid "&Window"
+msgstr "&Okno"
+
+#: lib/Slic3r/GUI/MainFrame.pm:255
+msgid "(&Re)Slice Now\tCtrl+S"
+msgstr "(&Znovu)Slicovat\tCtrl+S"
+
+#: xs/src/slic3r/GUI/ConfigWizard.cpp:89
+msgid "(default)"
+msgstr "(výchozí)"
+
+#: src/libslic3r/PrintConfig.cpp:1376
+msgid "(minimum)"
+msgstr "(minimálně)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
+msgid "(Re)slice"
+msgstr "(Znovu)Slicovat"
+
+#: src/slic3r/GUI/MainFrame.cpp:403
+msgid "(Re)Slice &Now"
+msgstr "(Z&novu)Slicovat"
+
+#: src/slic3r/GUI/MainFrame.cpp:641
+msgid ") not found."
+msgstr ") nebyl nalezen."
+
+#: src/slic3r/GUI/GUI_App.cpp:789
+msgid ". Discard changes and continue anyway?"
+msgstr ". Pokra�ovat i přes zahození změn?"
+
+#: lib/Slic3r/GUI/Plater/3DPreview.pm:69
+msgid "1 Layer"
+msgstr "1 Vrstva"
+
+#: lib/Slic3r/GUI/Plater.pm:206
+msgid "2D"
+msgstr "2D"
+
+#: src/slic3r/GUI/MainFrame.cpp:487
+msgid "3&D"
+msgstr "3&D"
+
+#: lib/Slic3r/GUI/Plater.pm:164 lib/Slic3r/GUI/Plater.pm:2323
+msgid "3D"
+msgstr "3D"
+
+#: src/libslic3r/PrintConfig.cpp:804
+msgid "3D Honeycomb"
+msgstr "3D Plástev"
+
+#: src/slic3r/GUI/GUI_App.cpp:741
+msgid "3D-Scene will be cleaned."
+msgstr "3D-scéna bude smazána."
+
+#: lib/Slic3r/GUI/Plater.pm:1756
+msgid "3MF file exported to "
+msgstr "Soubor 3MF byl exportován do "
+
+#: src/slic3r/GUI/Plater.cpp:3590
+#, possible-c-format
+msgid "3MF file exported to %s"
+msgstr "Soubor 3MF byl exportován do %s"
+
+#: lib/Slic3r/GUI/Plater.pm:258
+msgid "45° ccw"
+msgstr "45° doleva"
+
+#: lib/Slic3r/GUI/Plater.pm:259
+msgid "45° cw"
+msgstr "45° doprava"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1092
+msgid "< &Back"
+msgstr "<&Zpět"
+
+#: src/libslic3r/PrintConfig.cpp:251
+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."
+msgstr "Logický výraz může používat konfigura�ní hodnoty aktivního profilu tiskárny. Pokud je tento logický výraz pravdivý, potom je tento profil považován za kompatibilní s aktivním profilem tiskárny."
 
 #: src/libslic3r/PrintConfig.cpp:236
-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."
-msgstr ""
-"Při tisku více objektů nebo kopií tiskárna kompletně dokon�í jeden objekt, "
-"předtím než za�ne tisknout druhý (za�íná od spodní vstvy). Tato vlastnost je "
-"výhodná z důvodů snížení rizika zni�ených výtisků. Slic3r by měl varovat při "
-"možné kolizi extruderu s objektem a zabránit mu, přesto doporu�ujeme "
-"obezřetnost."
+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."
+msgstr "Logický výraz může používat konfigura�ní hodnoty aktivního profilu tiskárny. Pokud je tento logický výraz pravdivý, potom je tento profil považován za kompatibilní s aktivním profilem tiskárny."
 
-#: src/libslic3r/PrintConfig.cpp:245
-msgid "Enable auto cooling"
-msgstr "Zapnutí automatického chlazení"
+#: src/slic3r/GUI/ConfigWizard.cpp:609
+msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
+msgstr "Obecným pravidlem je 160 až 230° pro PLA a 215 až 250° pro ABS."
 
-#: src/libslic3r/PrintConfig.cpp:246
-msgid ""
-"This flag enables the automatic cooling logic that adjusts print speed and "
-"fan speed according to layer printing time."
-msgstr ""
-"Zapne výpo�et automatického chlazení který upravuje rychlost tisku a "
-"ventilátoru v závislosti na délce tisku jedné vstvy."
+#: src/slic3r/GUI/ConfigWizard.cpp:623
+msgid "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have no heated bed."
+msgstr "Obecným pravidlem je 160 až 230° pro PLA a 215 až 250° pro ABS. Zadejte nula, pokud nemáte vyhřívanou podložku."
 
-#: src/libslic3r/PrintConfig.cpp:252
-msgid "Cooling tube position"
-msgstr "Pozice chladící trubi�ky"
+#: src/libslic3r/SLA/SLASupportTree.cpp:2162
+msgid "Abort"
+msgstr "Přerušit"
 
-#: src/libslic3r/PrintConfig.cpp:253
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
-msgstr "Vzdálenost ze středu chladící trubi�ky ke špi�ce extruderu "
+#: src/slic3r/GUI/AboutDialog.cpp:35
+#, possible-c-format
+msgid "About %s"
+msgstr "O %s"
 
-#: src/libslic3r/PrintConfig.cpp:261
-msgid "Cooling tube length"
-msgstr "Délka chladící trubi�ky"
+#: src/slic3r/GUI/AboutDialog.cpp:35
+msgid "About Slic3r"
+msgstr "O Slic3ru"
 
-#: src/libslic3r/PrintConfig.cpp:262
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
-msgstr ""
-"Délka kovové trubi�ky ur�ené pro ochlazení a zformování filamentu po "
-"vytažení z extruderu "
+#: src/libslic3r/GCode/PreviewData.cpp:499
+#, possible-c-format
+msgid "above %.2f mm"
+msgstr "nad %.2f mm"
 
-#: src/libslic3r/PrintConfig.cpp:271
-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."
-msgstr ""
-"Toto je hodnota akcelerace na kterou se tiskárna vrátí po specifických "
-"úpravách akcelerace například při tisku (perimetru/výplně). Nastavením na "
-"nulu zabráníte návratu rychlostí zcela."
+#: src/libslic3r/PrintConfig.cpp:1499
+msgid "Above Z"
+msgstr "Nad Z"
 
-#: src/libslic3r/PrintConfig.cpp:281
-msgid "Default filament profile"
-msgstr "Výchozí profil filamentu"
+#: src/slic3r/GUI/Tab.cpp:1103
+msgid "Acceleration control (advanced)"
+msgstr "Kontrola akcelerací (pokro�ilé)"
 
-#: src/libslic3r/PrintConfig.cpp:282
-msgid ""
-"Default filament profile associated with the current printer profile. On "
-"selection of the current printer profile, this filament profile will be "
-"activated."
-msgstr ""
-"Výchozí materiálový profil spojený se sou�asným profilem tiskárny. Při "
-"výběru sou�asného profilu tiskárny se aktivuje tento materiálový profil."
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:73
+msgid "Activate"
+msgstr "Aktivovat"
 
-#: src/libslic3r/PrintConfig.cpp:287
-msgid "Default print profile"
-msgstr "Výchozí tiskový profil"
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:39
+msgid "Active: "
+msgstr "Aktivní: "
 
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
-msgid ""
-"Default print profile associated with the current printer profile. On "
-"selection of the current printer profile, this print profile will be "
-"activated."
-msgstr ""
-"Výchozí tiskový profil spojený se sou�asným profilem tiskárny. Při výběru "
-"sou�asného profilu tiskárny se aktivuje tento tiskový profil."
+#: src/slic3r/GUI/Preset.cpp:1003 src/slic3r/GUI/Tab.cpp:237
+msgid "Add a new printer"
+msgstr "Přidat novou tiskárnu"
 
-#: src/libslic3r/PrintConfig.cpp:293
-msgid "Disable fan for the first"
-msgstr "Vypnutí chlazení pro prvních"
+#: src/libslic3r/PrintConfig.cpp:2517
+msgid "Add a pad underneath the supported model"
+msgstr "Pod podepíraný model přidá podložku"
 
-#: src/libslic3r/PrintConfig.cpp:294
-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 ""
-"Nastavením po�tu prvních vstev s vypnutým chlazením pro nezhoršování "
-"přilnavosti."
+#: src/libslic3r/PrintConfig.cpp:1971
+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 "Přidá pouzdro (jednu obvodovou �áru) kolem podpěr. Díky tomu je podpora spolehlivější, ale také obtížnější na odstranění."
 
-#: src/libslic3r/PrintConfig.cpp:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
-msgid "layers"
-msgstr "vrstvu"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:186
+msgid "Add color change marker for current layer"
+msgstr "Přidat zna�ku změny barvy pro aktuální vrstvu"
 
-#: src/libslic3r/PrintConfig.cpp:304
-msgid "Don't support bridges"
-msgstr "Nevytvářet podpory pod mosty"
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+msgid "Add Instance to selected object "
+msgstr "Přidat instanci vybraného objektu"
 
-#: src/libslic3r/PrintConfig.cpp:306
-msgid ""
-"Experimental option for preventing support material from being generated "
-"under bridged areas."
-msgstr ""
-"Experimentální nastavení pro zabránění tvorbě podpěr v oblastech po mosty."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1067
+msgid "Add modifier"
+msgstr "Přidat modifikátor"
 
-#: src/libslic3r/PrintConfig.cpp:313
-msgid "Distance between copies"
-msgstr "Vzdálenost mezi kopiemi"
-
-#: src/libslic3r/PrintConfig.cpp:314
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "Vzdálenost, použitá pro funkci automatického rozmístění po podložce."
-
-#: src/libslic3r/PrintConfig.cpp:322
-msgid "Elephant foot compensation"
-msgstr "Kompenzace rozplácnutí první vrstvy"
-
-#: src/libslic3r/PrintConfig.cpp:324
-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 ""
-"První vrstva bude v rovině XY zmenšena nakonfigurovanou hodnotou, která "
-"kompenzuje rozplácnutí první vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:334
-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 ""
-"Tato ukon�ovací procedůra je vložena na konec výstupního souboru. Můžete "
-"přidávat zástupné proměnné pro veškeré nastavení Slic3ru."
-
-#: src/libslic3r/PrintConfig.cpp:345
-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 ""
-"Tato ukon�ovací procedůra je vložena na konec výstupního souboru, před "
-"kone�ným G-code tiskárny. Můžete přidávat zástupné proměnné pro veškeré "
-"nastavení Slic3ru. Pokud máte tiskárnu s více extrudery, G-code je zpracován "
-"v pořadí extruderů."
-
-#: src/libslic3r/PrintConfig.cpp:356
-msgid "Ensure vertical shell thickness"
-msgstr "Zajistit tloušťku svislých stěn"
-
-#: src/libslic3r/PrintConfig.cpp:358
-msgid ""
-"Add solid infill near sloping surfaces to guarantee the vertical shell "
-"thickness (top+bottom solid layers)."
-msgstr ""
-"Přidá plnou výplň u šikmých ploch pro garanci tloušťky svislých stěn "
-"(vrchních a spodních plných vrstev)."
-
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "Vzor výplně horních/spodních vrstev"
-
-#: src/libslic3r/PrintConfig.cpp:367
-msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
-msgstr ""
-"Vzor výplně pro vrchní/spodní vrstvy. Ovlivňuje pouze vnější viditelné "
-"vrstvy. Neovlivňuje přilehlé plné obaly."
-
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
-msgid "Rectilinear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
-msgid "Concentric"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
-msgid "Hilbert Curve"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
-msgid "Archimedean Chords"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
-msgid "Octagram Spiral"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
-msgid "External perimeters"
-msgstr "Vnější perimetry"
-
-#: src/libslic3r/PrintConfig.cpp:388
-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 ""
-"Nastavením na kladnou hodnotu, definuje šířku manuální extruze pro vnější "
-"obvod. Pokud je ponechána nula, použije se výchozí šířka extruze, pokud je "
-"nastavena, jinak se použije průměr trysky 1,125 x. Pokud je hodnota "
-"vyjádřena jako procento (například 200%), vypo�ítá se podle výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
-msgid "mm or % (leave 0 for default)"
-msgstr "mm nebo % (ponechte 0 jako výchozí)"
-
-#: src/libslic3r/PrintConfig.cpp:399
-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 ""
-"Toto oddělené nastavení ovlivní rychlost tisku vnějších perimetrů (těch "
-"viditelných). Pokud je hodnota vyjádřena procenty (například: 80%), bude "
-"rychlost vypo�ítána z hodnoty rychlosti tisku perimetrů, nastavené výše. "
-"Nastavte nulu pro automatický výpo�et."
-
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
-msgid "mm/s or %"
-msgstr "mm/s nebo %"
-
-#: src/libslic3r/PrintConfig.cpp:409
-msgid "External perimeters first"
-msgstr "Nejprve tisknout vnější perimetry"
-
-#: src/libslic3r/PrintConfig.cpp:411
-msgid ""
-"Print contour perimeters from the outermost one to the innermost one instead "
-"of the default inverse order."
-msgstr ""
-"Tisk obrysových perimetrů od vnějších po vnitřní namísto opa�ného výchozího "
-"pořadí."
-
-#: src/libslic3r/PrintConfig.cpp:418
-msgid "Extra perimeters if needed"
-msgstr "Extra perimetry pokud jsou potřeba"
-
-#: src/libslic3r/PrintConfig.cpp:420
+#: src/libslic3r/PrintConfig.cpp:447
 #, no-c-format
-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 ""
-"Přidání více perimetrů, pokud je potřeba, pro vyvarování se tvorbě mezer v "
-"šikmých plochách. Slic3r pokra�uje v přidávání perimetrů, dokud není "
-"podepřeno více než 70% perimetrů v následující vrstvě."
+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 "Přidání více perimetrů, pokud je potřeba, pro vyvarování se tvorbě mezer v šikmých plochách. Slic3r pokra�uje v přidávání perimetrů, dokud není podepřeno více než 70% perimetrů v následující vrstvě."
 
-#: src/libslic3r/PrintConfig.cpp:431
-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 ""
-"Extruder, který chcete použít (pokud nejsou zvoleny specifi�tější nastavení "
-"extruderu). Tato hodnota přepíše nastavení perimetrového a výplňového "
-"exrtuderu, ale ne nastavení extruderu pro podpory."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1066
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1082
+msgid "Add part"
+msgstr "Přidat díl"
 
-#: src/libslic3r/PrintConfig.cpp:444
-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."
-msgstr ""
-"Zadejte vertikální vzdálenost mezi tryskou a (obvykle) ty�emi osy X. Jinými "
-"slovy, je to výška kolizního prostoru okolo extruderu a představuje "
-"maximální hloubku, které může extruder dosáhnout před kolizí s jinými, již "
-"vytištěnými, objekty."
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1229
+msgid "Add point"
+msgstr "Přidat bod"
 
-#: src/libslic3r/PrintConfig.cpp:455
-msgid "Radius"
-msgstr "Rádius"
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1232
+msgid "Add point to selection"
+msgstr "Přidat bod k výběru"
 
-#: src/libslic3r/PrintConfig.cpp:456
-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."
-msgstr ""
-"Zadejte horizontální rádius kolizního prostoru okolo extruderu. Pokud tryska "
-"není v centru tohoto rádiusu, zvolte nejdelší vzdálenost. Toto nastavení "
-"slouží ke kontrole kolizí a zobrazení grafického náhledu na podložce."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1118
+msgid "Add settings"
+msgstr "Přidat nastavení"
 
-#: src/libslic3r/PrintConfig.cpp:467
-msgid "Extruder Color"
-msgstr "Barva extruderu"
+#: src/libslic3r/PrintConfig.cpp:382
+msgid "Add solid infill near sloping surfaces to guarantee the vertical shell thickness (top+bottom solid layers)."
+msgstr "Přidá plnou výplň u šikmých ploch pro garanci tloušťky svislých stěn (vrchních a spodních plných vrstev)."
 
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr "Toto je ve Slic3ru jako názorná pomoc."
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1069
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1089
+msgid "Add support blocker"
+msgstr "Přidat blokátor podpěr"
 
-#: src/libslic3r/PrintConfig.cpp:475
-msgid "Extruder offset"
-msgstr "Odsazení extruderu"
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1068
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1086
+msgid "Add support enforcer"
+msgstr "Přidat vynucení podpěr"
 
-#: src/libslic3r/PrintConfig.cpp:476
-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)."
-msgstr ""
-"Pokud firmware nezpracovává umístění extruderu správně, potřebujete aby to "
-"vzal G-code v úvahu. Toto nastavení umožňuje ur�it odsazení každého "
-"extruderu vzhledem k prvnímu. O�ekávají se pozitivní souřadnice (budou "
-"ode�teny od souřadnice XY)."
+#: src/slic3r/GUI/Tab.cpp:920
+msgid "Additional information:"
+msgstr "Doplňující informace:"
 
-#: src/libslic3r/PrintConfig.cpp:486
-msgid "Extrusion axis"
-msgstr "Osa extruderu"
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:58
+msgid "Additional Settings"
+msgstr "Další nastavení"
 
-#: src/libslic3r/PrintConfig.cpp:487
-msgid ""
-"Use this option to set the axis letter associated to your printer's extruder "
-"(usually E but some printers use A)."
-msgstr ""
-"Touto volbou nastavíte písmeno osy přidružené k extruderu tiskárny (obvykle "
-"E, ale některé tiskárny používají A)."
+#: src/slic3r/GUI/ConfigWizard.cpp:431
+msgid "Additionally a backup snapshot of the whole configuration is created before an update is applied."
+msgstr "Dále je před nainstalováním aktualizace vytvořena záloha veškerého nastavení."
 
-#: src/libslic3r/PrintConfig.cpp:493
-msgid "Extrusion multiplier"
-msgstr "Násobi� extruze"
+#: src/slic3r/GUI/BonjourDialog.cpp:72
+msgid "Address"
+msgstr "Adresa"
 
-#: src/libslic3r/PrintConfig.cpp:494
-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."
-msgstr ""
-"Tento faktor mění poměrné množství průtoku. Možná bude třeba toto nastavení "
-"vyladit, pro dosažení hezkého povrchu a správné šířky jednotlivých stěn. "
-"Obvyklé hodnoty jsou mezi 0,9 a 1,1. Pokud si myslíte, že hodnotu "
-"potřebujete změnit více, zkontrolujte průměr filamentu a E kroky ve firmwaru."
+#: lib/Slic3r/GUI/Plater.pm:250 lib/Slic3r/GUI/Plater.pm:268
+msgid "Add…"
+msgstr "Přidat…"
 
-#: src/libslic3r/PrintConfig.cpp:503
-msgid "Default extrusion width"
-msgstr "Výchozí šířka extruze"
+#: src/slic3r/GUI/GUI_App.cpp:675 src/slic3r/GUI/GUI_ObjectList.cpp:76
+#: src/slic3r/GUI/GUI_ObjectList.cpp:517 src/slic3r/GUI/Tab.cpp:1026
+#: src/slic3r/GUI/Tab.cpp:1041 src/slic3r/GUI/Tab.cpp:1139
+#: src/slic3r/GUI/Tab.cpp:1142 src/slic3r/GUI/Tab.cpp:1515
+#: src/slic3r/GUI/Tab.cpp:1940 src/slic3r/GUI/Tab.cpp:3435
+#: src/slic3r/GUI/wxExtensions.cpp:2460 src/libslic3r/PrintConfig.cpp:72
+#: src/libslic3r/PrintConfig.cpp:187 src/libslic3r/PrintConfig.cpp:350
+#: src/libslic3r/PrintConfig.cpp:988 src/libslic3r/PrintConfig.cpp:2175
+msgid "Advanced"
+msgstr "Pokro�ilý"
 
-#: src/libslic3r/PrintConfig.cpp:505
-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 ""
-"Nastavením kladné hodnoty povolíte manuální šířku extruze. Pokud je hodnota "
-"ponechána na nule, Slic3r odvozuje šířku extruze z průměru trysky (viz "
-"nápovědy pro šířku extruze perimetru, šířku extruze výplně apod.). Pokud je "
-"hodnota vyjádřena procenty (například: 230%), vypo�ítá se z výšky vrstvy."
+#: src/slic3r/GUI/GUI_App.cpp:675
+msgid "Advanced View Mode"
+msgstr "Pokro�ilý režim"
 
-#: src/libslic3r/PrintConfig.cpp:509
-msgid "mm or % (leave 0 for auto)"
-msgstr "mm or % (pro automatické ponechte 0)"
+#: xs/src/slic3r/GUI/FirmwareDialog.cpp:400
+msgid "Advanced: avrdude output log"
+msgstr "Pokro�ilé: výstupní log avrdude"
 
-#: src/libslic3r/PrintConfig.cpp:515
-msgid "Keep fan always on"
-msgstr "Ventilátor vždy zapnutý"
+#: src/slic3r/GUI/FirmwareDialog.cpp:803
+msgid "Advanced: Output log"
+msgstr "Pokro�ilý:  Výstupní log"
 
-#: src/libslic3r/PrintConfig.cpp:516
-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 ""
-"Pokud je tato funkce zapnutá, ventilátor nebude nikdy vypnut a bude udržován "
-"v chodu alespoň rychlostí která je nastavena jako minimální rychlost. "
-"Užite�né pro PLA, škodlivé pro ABS."
+#: src/libslic3r/PrintConfig.cpp:636
+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 "Po výměně nástroje nemusí být známa přesná poloha nově zavedeného filamentu uvnitř trysky a tlak filamentu pravděpodobně ještě není stabilní. Před vy�ištěním tiskové hlavy do výplně nebo do objektu bude Slic3r toto množství materiálu vždy vytla�ovat do �istící věže, aby se spolehlivě vytvořily následné výplně nebo objekty."
 
-#: src/libslic3r/PrintConfig.cpp:522
-msgid "Enable fan if layer print time is below"
-msgstr "Zapnout ventilátor pokud je doba tisku vrstvy kratší než"
+#: src/slic3r/GUI/Tab.cpp:1967 src/libslic3r/PrintConfig.cpp:1031
+msgid "After layer change G-code"
+msgstr "G-code po změně vrstvy"
 
-#: src/libslic3r/PrintConfig.cpp:523
-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 ""
-"Pokud je doba tisku vrstvy odhadnuta jako kratší než tato nastavená hodnota "
-"ve vteřinách, ventilátor bude aktivován a jeho rychlost bude vypo�tena "
-"interpolací minimální a maximální rychlosti."
+#: src/libslic3r/PrintConfig.cpp:3009
+msgid "Align the model to the given point."
+msgstr "Zarovnejte model s daným bodem."
 
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
+#: src/libslic3r/PrintConfig.cpp:3008
+msgid "Align XY"
+msgstr "Zarovnat XY"
+
+#: src/libslic3r/PrintConfig.cpp:1561
+msgid "Aligned"
+msgstr "Zarovnaný"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:189 src/slic3r/GUI/Tab.cpp:2986
+msgid "All"
+msgstr "VÅ¡echny"
+
+#: src/libslic3r/Print.cpp:1195
+msgid "All extruders must have the same diameter for single extruder multimaterial printer."
+msgstr "Všechny průměry trysek musí být pro multimateriálovou tiskárnu s jedním extrudérem stejné."
+
+#: src/libslic3r/Print.cpp:1135
+msgid "All objects are outside of the print volume."
+msgstr "Všechny objekty jsou mimo tiskový prostor."
+
+#: src/slic3r/GUI/Plater.cpp:3298
+msgid "All objects will be removed, continue ?"
+msgstr "Všechny objekty budou obebrány, pokra�ovat?"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:188
+msgid "All standard"
+msgstr "Všechny běžné"
+
+#: src/libslic3r/Zipper.cpp:65
+msgid "allocation failed"
+msgstr "alokace selhala"
+
+#: src/slic3r/GUI/Plater.cpp:2939
+msgid "Along X axis"
+msgstr "Podél osy X"
+
+#: lib/Slic3r/GUI/Plater.pm:2251 lib/Slic3r/GUI/Plater.pm:2267
+#: lib/Slic3r/GUI/Plater.pm:2283
+msgid "Along X axis…"
+msgstr "Podél osy X…"
+
+#: src/slic3r/GUI/Plater.cpp:2941
+msgid "Along Y axis"
+msgstr "Podél osy Y"
+
+#: lib/Slic3r/GUI/Plater.pm:2254 lib/Slic3r/GUI/Plater.pm:2270
+#: lib/Slic3r/GUI/Plater.pm:2286
+msgid "Along Y axis…"
+msgstr "Podél osy Y…"
+
+#: src/slic3r/GUI/Plater.cpp:2943
+msgid "Along Z axis"
+msgstr "Podél osy Z"
+
+#: lib/Slic3r/GUI/Plater.pm:2257 lib/Slic3r/GUI/Plater.pm:2273
+#: lib/Slic3r/GUI/Plater.pm:2289
+msgid "Along Z axis…"
+msgstr "Podél osy Z…"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:122
+msgid "Alternate nozzles:"
+msgstr "Alternativní trysky:"
+
+#: lib/Slic3r/GUI/Plater.pm:1740
+msgid "AMF file exported to "
+msgstr "Soubor AMF byl exportován do "
+
+#: src/slic3r/GUI/Plater.cpp:3561
+#, possible-c-format
+msgid "AMF file exported to %s"
+msgstr "Soubor AMF byl exportován do %s"
+
+#: src/slic3r/GUI/Tab.cpp:2781
+msgid "and it has the following unsaved changes:"
+msgstr "a má neuložené následující změny:"
+
+#: src/slic3r/GUI/Plater.cpp:2461
+msgid "Another export job is currently running."
+msgstr "V sou�asné době běží jiná úloha exportu."
+
+#: src/slic3r/GUI/Tab.cpp:915
+msgid "Any modifications should be saved as a new preset inherited from this one. "
+msgstr "Jakékoliv úpravy by měly být uloženy jako nové přednastavení zděděná z tohoto. "
+
+#: xs/src/libslic3r/PrintConfig.cpp:1109
+msgid "API Key"
+msgstr "Klí� API"
+
+#: src/libslic3r/PrintConfig.cpp:88
+msgid "API Key / Password"
+msgstr "API klí� / Heslo"
+
+#: src/slic3r/GUI/GUI_App.cpp:671
+msgid "Application preferences"
+msgstr "Nastavení aplikace"
+
+#: xs/src/slic3r/GUI/GUI.cpp:406
+msgid "Application will be restarted"
+msgstr "Aplikace bude restartována"
+
+#: src/slic3r/GUI/GUI_App.cpp:740
+msgid "Application will be restarted after language change."
+msgstr "Aplikace bude po změně jazyka restartována."
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:864
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1240
+msgid "Apply changes"
+msgstr "Aplikovat změny"
+
+#: src/libslic3r/PrintConfig.cpp:542 src/libslic3r/PrintConfig.cpp:1638
 msgid "approximate seconds"
 msgstr "vteřin přibližně"
 
-#: src/libslic3r/PrintConfig.cpp:534
+#: src/libslic3r/PrintConfig.cpp:401 src/libslic3r/PrintConfig.cpp:807
+msgid "Archimedean Chords"
+msgstr "Archimedean Chords"
+
+#: src/libslic3r/Zipper.cpp:91
+msgid "archive is too large"
+msgstr "archiv je moc velký"
+
+#: src/slic3r/GUI/Tab.cpp:2936
+msgid "Are you sure you want to "
+msgstr "Jste si jistý že chcete "
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:862
+msgid "Are you sure you want to cancel firmware flashing?\nThis could leave your printer in an unusable state!"
+msgstr "Opravdu chcete ukon�it nahrávání firmware?\nTiskárna může zůstat v nefunk�ním stavu!"
+
+#: src/libslic3r/PrintConfig.cpp:2258
+msgid "Area fill"
+msgstr "Zaplněná plocha"
+
+#: lib/Slic3r/GUI/Plater.pm:2238
+msgid "Around X axis…"
+msgstr "Okolo osy X…"
+
+#: lib/Slic3r/GUI/Plater.pm:2241
+msgid "Around Y axis…"
+msgstr "Okolo osy Y…"
+
+#: lib/Slic3r/GUI/Plater.pm:2244
+msgid "Around Z axis…"
+msgstr "Okolo osy Z…"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
+msgid "Arrange"
+msgstr "Uspořádat"
+
+#: src/libslic3r/PrintConfig.cpp:3054
+msgid "Arrange the supplied models in a plate and merge them in a single model in order to perform actions once."
+msgstr "Uspořádejte modely na tiskovou podložku a slu�te je do jednoho modelu, abyste s nimi mohli provádět akce jednou."
+
+#: src/slic3r/GUI/Plater.cpp:2106
+msgid "Arranging"
+msgstr "Uspořádávání"
+
+#: src/slic3r/GUI/Plater.cpp:2103
+msgid "Arranging canceled"
+msgstr "Uspořádávání bylo zrušeno"
+
+#: src/slic3r/GUI/Plater.cpp:2144
+msgid "Arranging done."
+msgstr "Uspořádávání dokon�eno."
+
+#: src/slic3r/GUI/GUI_App.cpp:514
+msgid "Array of language names and identifiers should have the same size."
+msgstr "Pole jazykových jmen a identifikátorů by měla mít stejnou velikost."
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
+msgid "Arrow Down"
+msgstr "Šipka dolů"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
+msgid "Arrow Left"
+msgstr "Å ipka vlevo"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
+msgid "Arrow Right"
+msgstr "Å ipka vpravo"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+msgid "Arrow Up"
+msgstr "Å ipka nahoru"
+
+#: xs/src/slic3r/GUI/GUI.cpp:660
+msgid "Attempt to free unreferenced scalar"
+msgstr "Attempt to free unreferenced scalar"
+
+#: src/slic3r/GUI/GUI.cpp:144 src/slic3r/GUI/GUI_App.cpp:743
+#: src/slic3r/GUI/Tab.cpp:2798
+msgid "Attention!"
+msgstr "Pozor!"
+
+#: src/libslic3r/PrintConfig.cpp:1785
+msgid "Auto generated supports"
+msgstr "Automaticky generované podpěry"
+
+#: src/slic3r/GUI/Preferences.cpp:44
+msgid "Auto-center parts"
+msgstr "Auto-centrování objektů"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:902
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1243
+msgid "Auto-generate points"
+msgstr "Automatické generování bodů"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:669
+msgid "Auto-generate points [A]"
+msgstr "Automatické generování bodů [A]"
+
+#: src/slic3r/GUI/Plater.cpp:979
+#, possible-c-format
+msgid "Auto-repaired (%d errors)"
+msgstr "Automaticky opraveno (%d chyb)"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:230
+#, possible-c-format
+msgid "Auto-repaired (%d errors):\n"
+msgstr "Automaticky opraveno ( %d chyb):\n"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:771
+msgid "Autodetected"
+msgstr "Automaticky detekováno"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1166
+msgid "Autogeneration will erase all manually edited points.\n\nAre you sure you want to do it?\n"
+msgstr "Automatické generování vymaže všechny ru�ně vytvořené body. \n\nOpravdu to chcete udělat?\n"
+
+#: src/slic3r/GUI/Tab.cpp:3421
+msgid "Automatic generation"
+msgstr "Automatické generování"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:401
+msgid "Automatic updates"
+msgstr "Automatické aktualizace"
+
+#: src/slic3r/GUI/MainFrame.cpp:406
+msgid "Automatically repair an STL file"
+msgstr "Automaticky opravit STL soubor"
+
+#: src/slic3r/GUI/Tab.cpp:1110
+msgid "Autospeed (advanced)"
+msgstr "Automatická rychlost (pokro�ilé)"
+
+#: src/libslic3r/PrintConfig.cpp:111
+msgid "Avoid crossing perimeters"
+msgstr "Vyhnout se přejíždění perimetrů"
+
+#: src/slic3r/GUI/Tab.cpp:3113
+msgid "BACK ARROW icon indicates that the settings were changed and are not equal to the last saved preset for the current option group.\nClick 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í.\nKlikněte pro reset všech nastavení pro aktuální skupinu nastavení na naposledy uložené přednastavení."
+
+#: src/slic3r/GUI/Tab.cpp:3127
+msgid "BACK ARROW icon indicates that the value was changed and is not equal to the last saved preset.\nClick 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.\nKlikněte pro reset sou�asné hodnoty na naposledy uložené přednastavení."
+
+#: src/slic3r/GUI/Tab.cpp:3077
+msgid "BACK ARROW;indicates that the settings were changed and are not equal to the last saved preset for the current option group.\nClick the BACK ARROW icon to reset all settings for the current option group to the last saved preset."
+msgstr "ŠIPKA 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í. 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/Preferences.cpp:52
+msgid "Background processing"
+msgstr "Zpracování na pozadí"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:242
+msgid "backwards edges"
+msgstr "zadní okraje"
+
+#: src/slic3r/GUI/Tab.cpp:1484
+msgid "Bed"
+msgstr "Tisková podložka"
+
+#: src/slic3r/GUI/BedShapeDialog.hpp:45 src/slic3r/GUI/ConfigWizard.cpp:524
+msgid "Bed Shape"
+msgstr "Tvar tiskové podložky"
+
+#: src/libslic3r/PrintConfig.cpp:50
+msgid "Bed shape"
+msgstr "Tvar tiskové podložky"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:524
+msgid "Bed Shape and Size"
+msgstr "Tvar a rozměr podložky"
+
+#: src/libslic3r/PrintConfig.cpp:122
+msgid "Bed temperature"
+msgstr "Teplota tiskové podložky"
+
+#: src/libslic3r/PrintConfig.cpp:120
+msgid "Bed temperature for layers after the first one. Set this to zero to disable bed temperature control commands in the output."
+msgstr "Teplota tiskové podložky pro další vrstvy po první vrstvě. Nastavením na hodnotu nula vypnete ovládací příkazy teploty tiskové podložky ve výstupu."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:626
+msgid "Bed Temperature:"
+msgstr "Teplota tiskové podložky:"
+
+#: src/slic3r/GUI/Tab.cpp:1961 src/libslic3r/PrintConfig.cpp:128
+msgid "Before layer change G-code"
+msgstr "G-code před změnou vrstvy"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
+msgid "Before roll back"
+msgstr "Před vrácením zpět"
+
+#: src/libslic3r/PrintConfig.cpp:1508
+msgid "Below Z"
+msgstr "Pod Z"
+
+#: src/libslic3r/PrintConfig.cpp:139
+msgid "Between objects G-code"
+msgstr "G-code mezi objekty"
+
+#: src/slic3r/GUI/Tab.cpp:1979
+msgid "Between objects G-code (for sequential printing)"
+msgstr "G-code mezi objekty (pro sekven�ní tisk)"
+
+#. TRN To be shown in the main menu View->Bottom
+#: src/slic3r/GUI/MainFrame.cpp:524
+msgid "Bottom"
+msgstr "Zespod"
+
+#: src/libslic3r/PrintConfig.cpp:409
+msgid "Bottom fill pattern"
+msgstr "Vzor spodní výplně"
+
+#: src/libslic3r/PrintConfig.cpp:152
+msgid "Bottom solid layers"
+msgstr "Plné spodní vrstvy"
+
+#: src/slic3r/GUI/MainFrame.cpp:524
+msgid "Bottom View"
+msgstr "Pohled zespod"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1055
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1087
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1090
+msgid "Box"
+msgstr "Kostka"
+
+#: src/libslic3r/PrintConfig.cpp:157
+msgid "Bridge"
+msgstr "Most"
+
+#: src/libslic3r/PrintConfig.cpp:186
+msgid "Bridge flow ratio"
+msgstr "Poměr průtoku při vytváření mostů"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:233 src/libslic3r/GCode/PreviewData.cpp:169
+msgid "Bridge infill"
+msgstr "Výplň mostů"
+
+#: src/libslic3r/PrintConfig.cpp:198
+msgid "Bridges"
+msgstr "Mosty"
+
+#: src/libslic3r/PrintConfig.cpp:177
+msgid "Bridges fan speed"
+msgstr "Rychlost ventilátoru při vytváření mostů"
+
+#: src/libslic3r/PrintConfig.cpp:166
+msgid "Bridging angle"
+msgstr "Úhel vytváření mostů"
+
+#: src/libslic3r/PrintConfig.cpp:168
+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 "Přepsání úhlu vytváření mostů. Nastavením hodnoty na nulu se bude úhel vytváření mostů vypo�ítávat automaticky. Při zadání jiného úhlu, bude pro všechny mosty použitý zadaný úhel. Pro nulový úhel zadejte 180°."
+
+#: src/slic3r/GUI/PresetHints.cpp:216
+msgid "Bridging volumetric"
+msgstr "Volumetrická hodnota mostů"
+
+#: src/slic3r/GUI/Plater.cpp:446 src/slic3r/GUI/Tab.cpp:1056
+msgid "Brim"
+msgstr "Límec"
+
+#: src/libslic3r/PrintConfig.cpp:208
+msgid "Brim width"
+msgstr "Šířka límce"
+
+#: src/slic3r/GUI/Tab.cpp:1681
+msgid "Browse"
+msgstr "Procházet"
+
+#: src/libslic3r/Zipper.cpp:85
+msgid "buffer too small"
+msgstr "buffer je příliš malý"
+
+#: src/slic3r/GUI/ButtonsDescription.cpp:16
+msgid "Buttons And Text Colors Description"
+msgstr "Barvy pro textové popisky a tla�ítka"
+
+#: src/slic3r/GUI/PresetHints.cpp:220
+msgid "by the print profile maximum"
+msgstr "maximem pro profil tisku"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
+msgid "Camera view "
+msgstr "Pohled kamery"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1095 src/slic3r/GUI/FirmwareDialog.cpp:147
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:37
+#: src/slic3r/GUI/ProgressStatusBar.cpp:28
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:156
+msgid "Cancel selected"
+msgstr "Zrušit vybrané"
+
+#: src/slic3r/GUI/Plater.cpp:2727 src/slic3r/GUI/PrintHostDialogs.cpp:232
+msgid "Cancelled"
+msgstr "Zrušeno"
+
+#: src/slic3r/GUI/Plater.cpp:2444 src/slic3r/GUI/PrintHostDialogs.cpp:231
+msgid "Cancelling"
+msgstr "Zrušení"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:866
+msgid "Cancelling..."
+msgstr "Ukon�ování..."
+
+#: src/slic3r/GUI/Tab.cpp:2905
+msgid "Cannot overwrite a system profile."
+msgstr "Nelze přepsat systémový profil."
+
+#: src/slic3r/GUI/Tab.cpp:2909
+msgid "Cannot overwrite an external profile."
+msgstr "Nelze přepsat externí profil."
+
+#: src/libslic3r/SLAPrint.cpp:612
+msgid "Cannot proceed without support points! Add support points or disable support generation."
+msgstr "Nelze pokra�ovat bez podpěrných bodů! Přidejte podpěrné body nebo zakažte generování podpěr."
+
+#: src/slic3r/GUI/Tab.cpp:1840
+msgid "Capabilities"
+msgstr "Možnosti"
+
+#: src/slic3r/GUI/GUI_App.cpp:662
+msgid "Capture a configuration snapshot"
+msgstr "Vytvořit aktuální zálohu konfigurace"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2159
+msgid "Cascading pillars"
+msgstr "Kaskádové sloupy"
+
+#: src/libslic3r/PrintConfig.cpp:3035
+msgid "Center"
+msgstr "Střed"
+
+#: src/libslic3r/PrintConfig.cpp:3036
+msgid "Center the print around the given center."
+msgstr "Vycentrujte tisk kolem daného středu."
+
+#: src/slic3r/GUI/Tab.cpp:1744
+msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
+msgstr "Soubory s certifikátem (*.crt, *.pem)|*.crt;*.pem|Všechny soubory|*.*"
+
+#: src/slic3r/GUI/GUI_App.cpp:683
+msgid "Change Application &Language"
+msgstr "Změnit jazyk ap&likace"
+
+#: xs/src/slic3r/GUI/GUI.cpp:354
+msgid "Change Application Language"
+msgstr "Změnit jazyk aplikace"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1226
+msgid "Change extruder"
+msgstr "Změnit extruder"
+
+#: src/slic3r/GUI/Plater.cpp:2901
+msgid "Change the number of copies of the selected object"
+msgstr "Změňte po�et kopií vybraného objektu"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1185
+msgid "Change type"
+msgstr "Změnit typ"
+
+#: src/slic3r/GUI/GUI_App.cpp:378
+msgid "Changing of an application language"
+msgstr "Změnit jazyk aplikace"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:409 src/slic3r/GUI/Preferences.cpp:61
+msgid "Check for application updates"
+msgstr "Zkontrolovat aktualizace aplikace"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:316
+msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
+msgstr "Vyberte soubor pro import tvaru tiskové podložky z (STL/OBJ/AMF/3MF/PRUSA):"
+
+#: src/slic3r/GUI/MainFrame.cpp:621
+msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
+msgstr "Zvolit soubor ke slicování (STL/OBJ/AMF/3MF/PRUSA):"
+
+#: src/slic3r/GUI/GUI_App.cpp:489
+msgid "Choose one file (3MF):"
+msgstr "Vyberte jeden soubor (3MF):"
+
+#: src/slic3r/GUI/GUI_App.cpp:501
+msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
+msgstr "Vyberte jeden nebo více souborů (STL/OBJ/AMF/3MF/PRUSA):"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:490
+msgid "Choose the type of firmware used by your printer."
+msgstr "Vyberte typ firmware používaný vaší tiskárnou."
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:84
+msgid "Circular"
+msgstr "Kruhový"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2156
+msgid "Classification"
+msgstr "Klasifikace"
+
+#: src/slic3r/GUI/Plater.cpp:292
+msgid "Click to edit preset"
+msgstr "Klikněte pro editaci přednastavení"
+
+#: src/libslic3r/PrintConfig.cpp:216
+msgid "Clip multi-part objects"
+msgstr "Připnutí objektů z více �ástí k sobě"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:926
+msgid "Clipping of view:"
+msgstr "Řezová rovina:"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:814
+#: src/slic3r/GUI/PrintHostDialogs.cpp:160
+msgid "Close"
+msgstr "Zavřít"
+
+#: src/libslic3r/PrintConfig.cpp:550
 msgid "Color"
 msgstr "Barva"
 
-#: src/libslic3r/PrintConfig.cpp:541
-msgid "Filament notes"
-msgstr "Poznámky k filamentu"
+#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/GUI_Preview.cpp:535
+#: src/libslic3r/GCode/PreviewData.cpp:406
+msgid "Color Print"
+msgstr "Color Print"
 
-#: src/libslic3r/PrintConfig.cpp:542
-msgid "You can put your notes regarding the filament here."
-msgstr "Zde můžete vložit poznámky týkající se filamentu."
+#: src/libslic3r/PrintConfig.cpp:224
+msgid "Colorprint height"
+msgstr "Výška barevného tisku"
 
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
-msgid "Max volumetric speed"
-msgstr "Maximální objemová rychlost"
+#: src/libslic3r/PrintConfig.cpp:942
+msgid "Combine infill every"
+msgstr "Kombinovat výplň každou"
 
-#: src/libslic3r/PrintConfig.cpp:552
-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 ""
-"Maximální povolený objem průtoku pro tento filament. Omezuje maximální "
-"rychlost průtoku pro tisk až na minimální rychlost průtoku pro tisk a "
-"filament. Zadejte nulu pro nastavení bez omezení."
+#: src/libslic3r/PrintConfig.cpp:947
+msgid "Combine infill every n layers"
+msgstr "Kombinovat výplň každou n vrstvu"
 
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
-msgid "mm³/s"
-msgstr "mm³/s"
+#: src/slic3r/GUI/Tab.cpp:56 src/libslic3r/PrintConfig.cpp:244
+msgid "Compatible print profiles"
+msgstr "Kompatibilní tiskové profily"
 
-#: src/libslic3r/PrintConfig.cpp:562
-msgid "Loading speed"
-msgstr "Rychlost zavádění"
+#: src/libslic3r/PrintConfig.cpp:250
+msgid "Compatible print profiles condition"
+msgstr "Stav kompatibilních tiskových profilů"
 
-#: src/libslic3r/PrintConfig.cpp:563
-msgid "Speed used for loading the filament on the wipe tower. "
-msgstr "Rychlost použitá pro zavádění filamentu na �istící věž. "
+#: src/slic3r/GUI/Tab.cpp:50 src/libslic3r/PrintConfig.cpp:229
+msgid "Compatible printers"
+msgstr "Kompatibilní tiskárny"
 
-#: src/libslic3r/PrintConfig.cpp:571
-msgid "Loading speed at the start"
-msgstr ""
+#: src/libslic3r/PrintConfig.cpp:235
+msgid "Compatible printers condition"
+msgstr "Stav kompatibilních tiskáren"
 
-#: src/libslic3r/PrintConfig.cpp:572
-msgid "Speed used at the very beginning of loading phase. "
-msgstr ""
+#: src/libslic3r/PrintConfig.cpp:268
+msgid "Complete individual objects"
+msgstr "Dokon�ení individuálních objektů"
 
-#: src/libslic3r/PrintConfig.cpp:580
-msgid "Unloading speed"
-msgstr "Rychlost vysunutí"
+#: src/slic3r/GUI/PrintHostDialogs.cpp:233
+msgid "Completed"
+msgstr "Dokon�eno"
 
-#: src/libslic3r/PrintConfig.cpp:581
-msgid ""
-"Speed used for unloading the filament on the wipe tower (does not affect  "
-"initial part of unloading just after ramming). "
-msgstr ""
-"Rychlost vysouvání filamentu při výměně na �istící věži (úvodní �ást "
-"vysunutí okamžitě po rapidní extruzi není ovlivněna). "
+#: src/libslic3r/Zipper.cpp:57
+msgid "compression failed"
+msgstr "komprese se nezdařila"
 
-#: src/libslic3r/PrintConfig.cpp:590
-msgid "Unloading speed at the start"
-msgstr ""
+#: src/libslic3r/PrintConfig.cpp:399 src/libslic3r/PrintConfig.cpp:802
+msgid "Concentric"
+msgstr "Koncentrická"
 
-#: src/libslic3r/PrintConfig.cpp:591
-msgid ""
-"Speed used for unloading the tip of the filament immediately after ramming. "
-msgstr ""
+#: src/slic3r/GUI/ConfigWizard.cpp:1185
+msgid "Configuration &Assistant"
+msgstr "Průvodce n&astavením"
 
-#: src/libslic3r/PrintConfig.cpp:599
+#: src/slic3r/GUI/ConfigWizard.cpp:1182
+msgid "Configuration &Wizard"
+msgstr "Průvodce nastavením"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1184
+msgid "Configuration Assistant"
+msgstr "Průvodce nastavení tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:1251
+msgid "Configuration notes"
+msgstr "Konfigura�ní poznámky"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:99
+msgid "Configuration Snapshots"
+msgstr "Záloha konfigurace"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:73 src/slic3r/GUI/UpdateDialogs.cpp:168
+msgid "Configuration update"
+msgstr "Aktualizace nastavení"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:73
+msgid "Configuration update is available"
+msgstr "Je k dispozici aktualizace nastavení"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1181
+msgid "Configuration Wizard"
+msgstr "Průvodce nastavením"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:863
+msgid "Confirmation"
+msgstr "Potvrzení"
+
+#: src/slic3r/GUI/Tab.cpp:1904
+msgid "Connection failed."
+msgstr "Připojení selhalo."
+
+#: src/slic3r/GUI/Tab.cpp:3416
+msgid "Connection of the support sticks and junctions"
+msgstr "Spojení podpůrných ty�í a spojek"
+
+#: src/slic3r/Utils/Duet.cpp:51
+msgid "Connection to Duet works correctly."
+msgstr "Připojení k Duet funguje správně."
+
+#: src/slic3r/Utils/OctoPrint.cpp:84
+msgid "Connection to OctoPrint works correctly."
+msgstr "Připojení k OctoPrint pracuje správně."
+
+#: src/slic3r/GUI/Tab.cpp:1901
+msgid "Connection to printer works correctly."
+msgstr "Připojení k tiskárně pracuje správně."
+
+#: src/slic3r/Utils/OctoPrint.cpp:195
+msgid "Connection to Prusa SLA works correctly."
+msgstr "Připojení k tiskárně Prusa SLA pracuje správně."
+
+#: src/libslic3r/PrintConfig.cpp:1823
+msgid "Contact Z distance"
+msgstr "Mezera mezi podpěrami a objektem v ose Z"
+
+#: lib/Slic3r/GUI/MainFrame.pm:137
+msgid "Controller"
+msgstr "Ovlada�"
+
+#: src/libslic3r/PrintConfig.cpp:2408
+msgid "Controls the bridge type between two neigboring 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 "Řídí typ mostu mezi dvěma sousedními sloupky. Může být zig-zag, cross (double  zig-zag) nebo dynamic. Typ automaticky přepíná mezi prvními dvěma v závislosti na vzdálenosti dvou sloupků."
+
+#: src/slic3r/GUI/Tab.cpp:1489
+msgid "Cooling"
+msgstr "Chlazení"
+
+#: src/libslic3r/PrintConfig.cpp:628
+msgid "Cooling moves are gradually accelerating beginning at this speed. "
+msgstr "Chladicí pohyby se postupně zrychlují a za�ínají touto rychlostí."
+
+#: src/libslic3r/PrintConfig.cpp:647
+msgid "Cooling moves are gradually accelerating towards this speed. "
+msgstr "Chladící pohyby se postupně zrychlují až k této rychlosti."
+
+#: src/slic3r/GUI/Tab.cpp:1510
+msgid "Cooling thresholds"
+msgstr "Podmínky chlazení"
+
+#: src/libslic3r/PrintConfig.cpp:291
+msgid "Cooling tube length"
+msgstr "Délka chladící trubi�ky"
+
+#: src/libslic3r/PrintConfig.cpp:283
+msgid "Cooling tube position"
+msgstr "Pozice chladící trubi�ky"
+
+#: lib/Slic3r/GUI/Plater.pm:304 lib/Slic3r/GUI/Plater.pm:992
+msgid "Copies"
+msgstr "Kopií"
+
+#: src/slic3r/GUI/Tab.cpp:2878
+msgid "Copy"
+msgstr "Kopírovat"
+
+#: src/slic3r/GUI/MainFrame.cpp:454
+msgid "Copy selection to clipboard"
+msgstr "Kopírovat výběr do schránky"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+msgid "Copy to clipboard"
+msgstr "Kopírovat do schránky"
+
+#: src/libslic3r/PrintConfig.cpp:2324 src/libslic3r/PrintConfig.cpp:2325
+msgid "Correction for expansion"
+msgstr "Korekce expanze"
+
+#: src/slic3r/GUI/Tab.cpp:2059 src/slic3r/GUI/Tab.cpp:3310
+msgid "Corrections"
+msgstr "Korekce"
+
+#: src/slic3r/GUI/Plater.cpp:216 src/slic3r/GUI/Plater.cpp:1056
+#: src/libslic3r/PrintConfig.cpp:717
+msgid "Cost"
+msgstr "Náklady"
+
+#: src/slic3r/GUI/Plater.cpp:2140
+msgid "Could not arrange model objects! Some geometries may be invalid."
+msgstr "Objekty nelze uspořádat! Některé geometrie mohou být neplatné."
+
+#: src/slic3r/Utils/Duet.cpp:56
+msgid "Could not connect to Duet"
+msgstr "Nelze se připojit k Duet"
+
+#: src/slic3r/Utils/OctoPrint.cpp:90
+msgid "Could not connect to OctoPrint"
+msgstr "Nelze se spojit s OctoPrintem"
+
+#: src/slic3r/Utils/OctoPrint.cpp:200
+msgid "Could not connect to Prusa SLA"
+msgstr "Nelze se připojit k Prusa SLA"
+
+#: src/slic3r/GUI/Tab.cpp:1710
+msgid "Could not get a valid Printer Host reference"
+msgstr "Nelze získat platný odkaz na tiskový server"
+
+#: src/slic3r/Utils/Duet.cpp:151
+msgid "Could not get resources to create a new connection"
+msgstr "Nelze získat prostředky pro vytvoření nového spojení"
+
+#: src/libslic3r/PrintConfig.cpp:1872
+msgid "Cover the top contact layer of the supports with loops. Disabled by default."
+msgstr "Zakrýt smy�kami horní kontaktní vrstvu podpěr. Ve výchozím nastavení zakázáno."
+
+#: src/libslic3r/PrintConfig.cpp:73
+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 "Praskliny menší než 2x poloměr uzavření mezery se vyplní během slicování trojúhelníkových sítí. Operace uzavírání mezery může snížit kone�né rozlišení tisku, proto je vhodné udržovat rozumně nízkou hodnotu."
+
+#: src/libslic3r/Zipper.cpp:61
+msgid "CRC-32 check failed"
+msgstr "CRC-32 kontrola selhala"
+
+#: src/libslic3r/PrintConfig.cpp:2460
+msgid "Critical angle"
+msgstr "Kritický úhel"
+
+#: src/libslic3r/PrintConfig.cpp:2417
+msgid "Cross"
+msgstr "Cross"
+
+#: src/libslic3r/PrintConfig.cpp:800
+msgid "Cubic"
+msgstr "Kubická"
+
+#: src/slic3r/GUI/wxExtensions.cpp:2413
+#, possible-c-format
+msgid "Current mode is %s"
+msgstr "Aktuální režim je %s"
+
+#: src/slic3r/GUI/Tab.cpp:909
+msgid "Current preset is inherited from "
+msgstr "Aktuální nastavení je zděděno od "
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:45
+msgid "Current version:"
+msgstr "Aktuální verze:"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:93 src/slic3r/GUI/GUI_Preview.cpp:239
+#: src/libslic3r/GCode/PreviewData.cpp:175
+msgid "Custom"
+msgstr "Vlastní"
+
+#: src/libslic3r/PrintConfig.cpp:96
+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 "Pro HTTPS připojení  OctoPrintu lze zadat vlastní CA certifikát ve formátu crt/pem. Pokud zůstane pole prázdné, použije se výchozí úložiště certifikátů OS CA."
+
+#: src/slic3r/GUI/Tab.cpp:1563 src/slic3r/GUI/Tab.cpp:1948
+msgid "Custom G-code"
+msgstr "Vlastní G-code"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:373
+msgid "Custom Printer"
+msgstr "Vlastní tiskárna"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:373
+msgid "Custom Printer Setup"
+msgstr "Vlastní nastavení tiskárny"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:377
+msgid "Custom profile name:"
+msgstr "Vlastní název profilu:"
+
+#: xs/src/slic3r/GUI/ConfigWizard.cpp:254
+msgid "Custom setup"
+msgstr "Vlastní nastavení"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:188 src/libslic3r/PrintConfig.cpp:3013
+msgid "Cut"
+msgstr "Řezat"
+
+#: src/libslic3r/PrintConfig.cpp:3014
+msgid "Cut model at the given Z."
+msgstr "Rozříznout model v dané výšce Z."
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:43
+msgid "Cut object:"
+msgstr "Řezat objekt:"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:88
+msgid "Cut [C]"
+msgstr "Řezat [C]"
+
+#: lib/Slic3r/GUI/Plater.pm:262 lib/Slic3r/GUI/Plater.pm:278
+#: lib/Slic3r/GUI/Plater.pm:2296
+msgid "Cut…"
+msgstr "Řezat…"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1055
+msgid "Cylinder"
+msgstr "Válec"
+
+#: src/libslic3r/PrintConfig.cpp:3115
+msgid "Data directory"
+msgstr "Složka Data"
+
+#: src/libslic3r/Zipper.cpp:55
+msgid "decompression failed or archive is corrupted"
+msgstr "dekomprese selhala nebo je archiv poškozen"
+
+#: src/slic3r/GUI/Plater.cpp:2899
+msgid "Decrease copies"
+msgstr "Odebrat kopie"
+
+#: src/slic3r/GUI/GUI_App.cpp:594 src/slic3r/GUI/GUI_ObjectList.cpp:1245
+#: src/libslic3r/PrintConfig.cpp:299
+msgid "Default"
+msgstr "Výchozí"
+
+#: xs/src/slic3r/GUI/Tab.cpp:2130
+msgid "Default "
+msgstr "Výchozí "
+
+#: xs/src/slic3r/GUI/Field.cpp:98
+msgid "default"
+msgstr "výchozí"
+
+#: src/libslic3r/PrintConfig.cpp:730
+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."
+msgstr "Výchozí úhel pro orientaci výplně. Bude pro něj použito křížové šrafování. Mosty budou vyplněny nejlepším směrem, který Slic3r dokáže rozpoznat, takže toto nastavení je neovlivní."
+
+#: src/libslic3r/PrintConfig.cpp:522
+msgid "Default extrusion width"
+msgstr "Výchozí šířka extruze"
+
+#: src/slic3r/GUI/Tab.cpp:937
+msgid "default filament profile"
+msgstr "výchozí profil filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:309
+msgid "Default filament profile"
+msgstr "Výchozí profil filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:310
+msgid "Default filament profile associated with the current printer profile. On selection of the current printer profile, this filament profile will be activated."
+msgstr "Výchozí materiálový profil spojený se sou�asným profilem tiskárny. Při výběru sou�asného profilu tiskárny se aktivuje tento materiálový profil."
+
+#: src/slic3r/GUI/Tab.cpp:2757
+#, possible-c-format
+msgid "Default preset (%s)"
+msgstr "Výchozí přednastavení (%s)"
+
+#: xs/src/slic3r/GUI/Tab.cpp:2410 xs/src/slic3r/GUI/Tab.cpp:2496
+msgid "Default presets"
+msgstr "Výchozí přednastavení"
+
+#: src/libslic3r/GCode/PreviewData.cpp:491
+msgid "Default print color"
+msgstr "Výchozí barva tisku"
+
+#: src/slic3r/GUI/Tab.cpp:934
+msgid "default print profile"
+msgstr "výchozí tiskový profil"
+
+#: src/libslic3r/PrintConfig.cpp:316
+msgid "Default print profile"
+msgstr "Výchozí tiskový profil"
+
+#: src/libslic3r/PrintConfig.cpp:317 src/libslic3r/PrintConfig.cpp:2341
+#: src/libslic3r/PrintConfig.cpp:2352
+msgid "Default print profile associated with the current printer profile. On selection of the current printer profile, this print profile will be activated."
+msgstr "Výchozí tiskový profil spojený se sou�asným profilem tiskárny. Při výběru sou�asného profilu tiskárny se aktivuje tento tiskový profil."
+
+#: src/slic3r/GUI/Tab.cpp:951
+msgid "default SLA material profile"
+msgstr "výchozí profil pro SLA materiál"
+
+#: src/libslic3r/PrintConfig.cpp:2340 src/libslic3r/PrintConfig.cpp:2351
+msgid "Default SLA material profile"
+msgstr "Výchozí profil pro SLA materiál"
+
+#: src/slic3r/GUI/Tab.cpp:955
+msgid "default SLA print profile"
+msgstr "výchozí SLA tiskový profil"
+
+#: src/slic3r/GUI/Field.cpp:105
+msgid "default value"
+msgstr "výchozí hodnota"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:375
+msgid "Define a custom printer profile"
+msgstr "Vytvořit vlastní tiskový profil"
+
+#: src/libslic3r/PrintConfig.cpp:2529
+msgid "Defines the cavity depth. Set to zero to disable the cavity."
+msgstr "Definuje hloubku dutiny. Chcete-li dutinu vypnout, nastavte ji na nulu."
+
+#: src/libslic3r/PrintConfig.cpp:2533
+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 pealing the print off the vat foil difficult."
+msgstr "Definuje hloubku dutiny. Chcete-li dutinu vypnout, nastavte ji na nulu. Při povolování této funkce bu�te opatrní, protože některé pryskyřice mohou způsobit extrémní sací efekt uvnitř dutiny, což ztěžuje odlupování tisku z fólie ve vani�ce."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:237
+msgid "degenerate facets"
+msgstr "Degenerace facetů"
+
+#: src/libslic3r/PrintConfig.cpp:2572
+msgid "degrees"
+msgstr "stupňů"
+
+#: src/libslic3r/PrintConfig.cpp:608
 msgid "Delay after unloading"
 msgstr "Zpoždění po vyjmutí"
 
-#: src/libslic3r/PrintConfig.cpp:600
-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. "
-msgstr ""
-"Doba �ekání po vysunutí filamentu. Může pomoci ke spolehlivé výměně nástrojů "
-"s flexibilními materiály, které potřebují více �asu ke smrštění na původní "
-"rozměry. "
+#: src/slic3r/GUI/Tab.cpp:2935
+msgid "delete"
+msgstr "smazat"
 
-#: src/libslic3r/PrintConfig.cpp:610
-msgid "Number of cooling moves"
-msgstr ""
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1257 src/slic3r/GUI/Plater.cpp:2891
+#: src/slic3r/GUI/Plater.cpp:2909 src/slic3r/GUI/Tab.cpp:2937
+msgid "Delete"
+msgstr "Smazat"
 
-#: src/libslic3r/PrintConfig.cpp:611
-msgid ""
-"Filament is cooled by being moved back and forth in the cooling tubes. "
-"Specify desired number of these moves "
-msgstr ""
+#: src/slic3r/GUI/MainFrame.cpp:449
+msgid "Delete &all"
+msgstr "Sm&azat vše"
 
-#: src/libslic3r/PrintConfig.cpp:620
-msgid "Speed of the first cooling move"
-msgstr ""
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
+msgid "Delete All"
+msgstr "Smazat VÅ¡e"
 
-#: src/libslic3r/PrintConfig.cpp:621
-msgid "Cooling moves are gradually accelerating beginning at this speed. "
-msgstr ""
+#: src/slic3r/GUI/Plater.cpp:3298
+msgid "Delete all"
+msgstr "Smazat vše"
 
-#: src/libslic3r/PrintConfig.cpp:629
-msgid "Minimal purge on wipe tower"
-msgstr ""
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:187
+msgid "Delete color change marker for current layer"
+msgstr "Odebrat zna�ku změny barvy pro aktuální vrstvu"
 
-#: src/libslic3r/PrintConfig.cpp:630
-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 ""
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
+msgid "Delete selected"
+msgstr "Smazat vybrané"
 
-#: src/libslic3r/PrintConfig.cpp:635
-msgid "mm³"
-msgstr ""
+#: src/slic3r/GUI/Tab.cpp:131
+msgid "Delete this preset"
+msgstr "Smazat přednastavení"
 
-#: src/libslic3r/PrintConfig.cpp:641
-msgid "Speed of the last cooling move"
-msgstr ""
+#: src/slic3r/GUI/MainFrame.cpp:449
+msgid "Deletes all objects"
+msgstr "Smazat všechny objekty"
 
-#: src/libslic3r/PrintConfig.cpp:642
-msgid "Cooling moves are gradually accelerating towards this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:650
-msgid "Filament load time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:651
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:659
-msgid "Ramming parameters"
-msgstr "Parametry rapidní extruze"
-
-#: src/libslic3r/PrintConfig.cpp:660
-msgid ""
-"This string is edited by RammingDialog and contains ramming specific "
-"parameters "
-msgstr ""
-"This string is edited by RammingDialog and contains ramming specific "
-"parameters "
-
-#: src/libslic3r/PrintConfig.cpp:667
-msgid "Filament unload time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:668
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:677
-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."
-msgstr ""
-"Zde zadejte průměr filamentu. Je zapotřebí správné přesnosti, proto použijte "
-"šupleru a prove�te několik měření podél filamentu, poté vypo�tete průměr."
+#: src/slic3r/GUI/MainFrame.cpp:447
+msgid "Deletes the current selection"
+msgstr "Smaže aktuální výběr"
 
 #: src/libslic3r/PrintConfig.cpp:685
 msgid "Density"
 msgstr "Hustota"
 
+#: src/libslic3r/PrintConfig.cpp:744
+msgid "Density of internal infill, expressed in the range 0% - 100%."
+msgstr "Hustota vnitřní výplně, vyjádřená v rozmezí 0% až 100%."
+
+#: src/slic3r/GUI/Tab.cpp:1200 src/slic3r/GUI/Tab.cpp:1584
+#: src/slic3r/GUI/Tab.cpp:1992 src/slic3r/GUI/Tab.cpp:2086
+#: src/slic3r/GUI/Tab.cpp:3336 src/slic3r/GUI/Tab.cpp:3445
+msgid "Dependencies"
+msgstr "Závislosti"
+
+#: src/libslic3r/PrintConfig.cpp:1542 src/libslic3r/PrintConfig.cpp:1543
+msgid "Deretraction Speed"
+msgstr "Rychlost deretrakce"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1235
+msgid "Deselect by rectangle"
+msgstr "Odzna�it obdélníkovým výběrem myši"
+
+#: src/libslic3r/PrintConfig.cpp:1833
+msgid "detachable"
+msgstr "oddělitelný"
+
+#: src/libslic3r/PrintConfig.cpp:1304
+msgid "Detect bridging perimeters"
+msgstr "Detekovat perimetry přemostění"
+
+#: src/libslic3r/PrintConfig.cpp:1988
+msgid "Detect single-width walls (parts where two extrusions don't fit and we need to collapse them into a single trace)."
+msgstr "Detekuje stěny o tloušťce jedné �áry (�ásti, kam se dvě �áry nemohou vejít a je potřeba slou�it je do �áry jedné)."
+
+#: src/libslic3r/PrintConfig.cpp:1986
+msgid "Detect thin walls"
+msgstr "Detekovat tenké zdi"
+
+#: src/libslic3r/PrintConfig.cpp:3083
+msgid "Detect unconnected parts in the given model(s) and split them into separate objects."
+msgstr "Rozpoznat nepřipojené �ásti daného modelu(ů) a rozdělit je do samostatných objektů."
+
+#: src/slic3r/GUI/Plater.cpp:1713
+msgid "Detected advanced data"
+msgstr "Byla detekována data z pokro�ilého režimu"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:723
+msgid "Detected object outside print volume\nResolve a clash to continue slicing/export process correctly"
+msgstr "Detekován objekt mimo tiskový prostor\nVyřešte konflikt, abyste mohli správně pokra�ovat v procesu slicování/exportu"
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:719
+msgid "Detected object outside print volume"
+msgstr "Detekován objekt mimo tiskový prostor."
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:720
+msgid "Detected toolpath outside print volume"
+msgstr "Byla detekována cesta mimo tiskový objem"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:88 src/libslic3r/PrintConfig.cpp:677
+msgid "Diameter"
+msgstr "Průměr"
+
+#: src/libslic3r/PrintConfig.cpp:2443
+msgid "Diameter in mm of the pillar base"
+msgstr "Průměr základny podpěr v mm"
+
+#: src/libslic3r/PrintConfig.cpp:2399
+msgid "Diameter in mm of the support pillars"
+msgstr "Průměr podpěrných sloupů v mm"
+
+#: src/libslic3r/PrintConfig.cpp:2371
+msgid "Diameter of the pointing side of the head"
+msgstr "Průměr konce podpůrného hrotu"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:89
+msgid "Diameter of the print bed. It is assumed that origin (0,0) is located in the center."
+msgstr "Průměr tiskové podložky. Přepokládaný po�átek (0,0) je umístěn uprostřed."
+
+#: src/libslic3r/PrintConfig.cpp:1569
+msgid "Direction"
+msgstr "Směr"
+
+#: xs/src/slic3r/GUI/Preferences.cpp:76
+msgid "Disable communication with the printer over a serial / USB cable. This simplifies the user interface in case the printer is never attached to the computer."
+msgstr "Zakázat komunikaci s tiskárnou přes sériový / USB kabel. To zjednodušuje uživatelské rozhraní v případě, že tiskárna není nikdy připojena k po�íta�i."
+
+#: src/libslic3r/PrintConfig.cpp:323
+msgid "Disable fan for the first"
+msgstr "Vypnutí chlazení pro prvních"
+
+#: xs/src/slic3r/GUI/Preferences.cpp:74
+msgid "Disable USB/serial connection"
+msgstr "Vypnout USB/sériové připojení"
+
+#: src/libslic3r/PrintConfig.cpp:1280
+msgid "Disables retraction when the travel path does not exceed the upper layer's perimeters (and thus any ooze will be probably invisible)."
+msgstr "Vypne retrakce, pokud dráha nepřekro�í perimetr vrchní vrstvy (a proto bude pravděpodobně jakékoliv odkapávání neviditelné)."
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:869
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1241
+msgid "Discard changes"
+msgstr "Zahodit změny"
+
+#: src/slic3r/GUI/Tab.cpp:2784
+msgid "Discard changes and continue anyway?"
+msgstr "Zahodit změny a pokra�ovat?"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:177
+msgid "Displacement (mm)"
+msgstr "Posunutí (mm)"
+
+#: src/slic3r/GUI/Tab.cpp:2041
+msgid "Display"
+msgstr "Displej"
+
+#: src/libslic3r/PrintConfig.cpp:2208
+msgid "Display height"
+msgstr "Výška displeje"
+
+#: src/libslic3r/PrintConfig.cpp:2227
+msgid "Display orientation"
+msgstr "Orientace displeje"
+
+#: src/slic3r/GUI/MainFrame.cpp:510
+msgid "Display the Print Host Upload Queue window"
+msgstr "Zobrazit okno s frontou nahrávání do tiskového serveru."
+
+#: src/libslic3r/PrintConfig.cpp:2202
+msgid "Display width"
+msgstr "Šířka displeje"
+
+#: src/libslic3r/PrintConfig.cpp:341
+msgid "Distance between copies"
+msgstr "Vzdálenost mezi kopiemi"
+
+#: src/libslic3r/PrintConfig.cpp:1610
+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 "Vzdálenost mezi obrysem a objektem (objekty). Nastavte tuto hodnotu na nulu, pro slou�ení obrysu s předmětem (předměty) a tvorbu límce pro dosažení lepší přilnavosti."
+
+#: src/libslic3r/PrintConfig.cpp:1609
+msgid "Distance from object"
+msgstr "Vzdálenost od objektu"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:80
+msgid "Distance of the 0,0 G-code coordinate from the front left corner of the rectangle."
+msgstr "Vzdálenost souřadnice 0,0 G-code od předního levého rohu obdélníku."
+
+#: src/libslic3r/PrintConfig.cpp:284
+msgid "Distance of the center-point of the cooling tube from the extruder tip "
+msgstr "Vzdálenost ze středu chladící trubi�ky ke špi�ce extruderu "
+
+#: src/libslic3r/PrintConfig.cpp:1313
+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 "Vzdálenost špi�ky extruderu od místa, kde je zaparkován filament při vytažení. Měla by se shodovat s hodnotou ve firmware tiskárny. "
+
+#: src/libslic3r/PrintConfig.cpp:342
+msgid "Distance used for the auto-arrange feature of the plater."
+msgstr "Vzdálenost, použitá pro funkci automatického rozmístění po podložce."
+
+#: src/libslic3r/PrintConfig.cpp:3097
+msgid "Do not fail if a file supplied to --load does not exist."
+msgstr "Nepodaří se, pokud neexistuje soubor dodaný k přepína�i --load."
+
+#: src/libslic3r/PrintConfig.cpp:3041
+msgid "Do not rearrange the given models before merging and keep their original XY coordinates."
+msgstr "Nepřeuspořádávejte modely před slou�ením a tím ponecháním jejich původních souřadnic v XY."
+
+#: src/slic3r/GUI/Field.cpp:181
+#, possible-c-format
+msgid "Do you mean %d%% instead of %d %s?\nSelect YES if you want to change this value to %d%%, \nor NO if you are sure that %d %s is a correct value."
+msgstr "Myslíte %d%% namísto %d %s?\nVyberte ANO, pokud chcete změnit tuto hodnotu na %d%% nebo NE, pokud jste si jisti, že %d %s je správná hodnota."
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1022
+msgid "Do you want to save your manually edited support points ?\n"
+msgstr "Chcete uložit ru�ně upravované podpěrné body?\n"
+
+#: src/libslic3r/PrintConfig.cpp:3040
+msgid "Don't arrange"
+msgstr "Neuspořádávat"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:55
+msgid "Don't notify about new releases any more"
+msgstr "Neupozorňovat na nové verze"
+
+#: src/libslic3r/PrintConfig.cpp:333
+msgid "Don't support bridges"
+msgstr "Nevytvářet podpěry pod mosty"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2161
+msgid "Done"
+msgstr "Dokon�eno"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
+msgid "Downgrade"
+msgstr "Downgrade"
+
+#: lib/Slic3r/GUI/Plater/2D.pm:132
+msgid "Drag your objects here"
+msgstr "Přetáhněte své objekty sem"
+
+#: src/libslic3r/PrintConfig.cpp:3044
+msgid "Duplicate"
+msgstr "Duplikovat"
+
+#: src/libslic3r/PrintConfig.cpp:3049
+msgid "Duplicate by grid"
+msgstr "Duplikovat mřížkou"
+
+#: src/libslic3r/PrintConfig.cpp:2418
+msgid "Dynamic"
+msgstr "Dynamic"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:238
+msgid "edges fixed"
+msgstr "hrany opraveny"
+
+#: src/libslic3r/PrintConfig.cpp:349
+msgid "Elephant foot compensation"
+msgstr "Kompenzace rozplácnutí první vrstvy"
+
+#: src/libslic3r/SLAPrint.cpp:624
+msgid "Elevation is too low for object."
+msgstr "Výška od podložky je pro objekt příliš nízká."
+
+#: src/libslic3r/PrintConfig.cpp:1044
+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."
+msgstr "Vkládání M73 P[po�et vytištěných procent] R[zbývající �as v minutách] v 1 minutových intervalech do G-codu, aby firmware ukázal přesný zbývající �as. M73 nyní rozpoznává pouze firmware tiskárny Prusa i3 MK3. Firmware i3 MK3 také podporuje M73 Qxx Sxx pro tichý režim."
+
+#: src/slic3r/GUI/Tab.cpp:1490 src/libslic3r/PrintConfig.cpp:1286
+#: src/libslic3r/PrintConfig.cpp:2099
+msgid "Enable"
+msgstr "Zapnout"
+
+#: src/libslic3r/PrintConfig.cpp:277
+msgid "Enable auto cooling"
+msgstr "Zapnutí automatického chlazení"
+
+#: src/libslic3r/PrintConfig.cpp:539
+msgid "Enable fan if layer print time is below"
+msgstr "Zapnout ventilátor, pokud je doba tisku vrstvy kratší než"
+
+#: src/libslic3r/PrintConfig.cpp:1781
+msgid "Enable support material generation."
+msgstr "Zapne generování podpěr."
+
+#: src/libslic3r/PrintConfig.cpp:918
+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."
+msgstr "Zapněte tuto možnost, chcete-li do G-Code přidávat komentáře, které budou ur�ovat, příslušnost tiskových pohybů k jednotlivým objektům. To je užite�né pro Octoprint plugin CancelObject. Nastavení NEN� kompatibilní se Single Extruder Multi Material konfigurací a s �ištěním trysky do objektu / výplně."
+
+#: src/libslic3r/PrintConfig.cpp:881
+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 "Aktivací získáte komentovaný soubor G-code, při�emž každý řádek je doplněn popisným textem. Pokud tisknete z SD karty, dodate�né informace v souboru můžou zpomalit firmware."
+
+#: src/libslic3r/PrintConfig.cpp:2085
+msgid "Enable variable layer height feature"
+msgstr "Zapnout variabilní výšku vrstev"
+
+#: src/slic3r/GUI/Tab.cpp:1570 src/slic3r/GUI/Tab.cpp:1955
+#: src/libslic3r/PrintConfig.cpp:359 src/libslic3r/PrintConfig.cpp:369
+msgid "End G-code"
+msgstr "Konec G-code"
+
+#: src/libslic3r/PrintConfig.cpp:1838
+msgid "Enforce support for the first"
+msgstr "Zesílit podpěry pro prvních"
+
+#: src/libslic3r/PrintConfig.cpp:1845
+msgid "Enforce support for the first n layers"
+msgstr "Vynucení podpěr pro prvních n vrstev"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:197
+#: src/slic3r/GUI/PrintHostDialogs.cpp:228
+msgid "Enqueued"
+msgstr "Zařazeno do fronty"
+
+#: src/libslic3r/PrintConfig.cpp:380
+msgid "Ensure vertical shell thickness"
+msgstr "Zajistit tloušťku svislých stěn"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2709
+msgid "Enter new name"
+msgstr "Zadejte nový název"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:622
+msgid "Enter the bed temperature needed for getting your filament to stick to your heated bed."
+msgstr "Zadejte požadovanou teplotu filamentu, aby se spojil s vyhřívanou podložkou."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:570
+msgid "Enter the diameter of your filament."
+msgstr "Zadejte průměr vašeho filamentu."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:557
+msgid "Enter the diameter of your printer's hot end nozzle."
+msgstr "Zadejte průměr trysky hotendu vaší tiskárny."
+
+#: lib/Slic3r/GUI/Plater.pm:1158
+msgid "Enter the new max size for the selected object:"
+msgstr "Zvolte nový maximální rozměr pro zvolný objekt:"
+
+#: lib/Slic3r/GUI/Plater.pm:1132
+#, possible-perl-format
+msgid "Enter the new size for the selected object (print bed: %smm):"
+msgstr "Zadejte novou velikost vybraného objektu (tisková podložka: %smm):"
+
+#: lib/Slic3r/GUI/Plater.pm:992
+msgid "Enter the number of copies of the selected object:"
+msgstr "Zadejte po�et kopií pro vybraný objekt:"
+
+#: lib/Slic3r/GUI/Plater.pm:1042
+msgid "Enter the rotation angle:"
+msgstr "Zadejte úhel nato�ení:"
+
+#: lib/Slic3r/GUI/Plater.pm:1137 lib/Slic3r/GUI/Plater.pm:1163
+#, no-perl-format
+msgid "Enter the scale % for the selected object:"
+msgstr "Zadejte rozměr % pro zvolený objekt:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:608
+msgid "Enter the temperature needed for extruding your filament."
+msgstr "Zadejte požadovanou teplotu pro extruzi vašeho filamentu."
+
+#: src/libslic3r/PrintConfig.cpp:718
+msgid "Enter your filament cost per kg here. This is only for statistical information."
+msgstr "Zde zadejte cenu filamentu za kg. Slouží pouze pro statistické informace."
+
 #: src/libslic3r/PrintConfig.cpp:686
-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."
-msgstr ""
-"Zde zadejte hustotu filamentu. Toto je pouze pro statistické informace. "
-"Přípustný způsob je zvážit známou délku filamentu a vypo�ítat poměr délky k "
-"objemu. Je lepší vypo�ítat objem přímo přes posun."
+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."
+msgstr "Zde zadejte hustotu filamentu. Toto je pouze pro statistické informace. Přípustný způsob je zvážit známou délku filamentu a vypo�ítat poměr délky k objemu. Je lepší vypo�ítat objem přímo přes posun."
+
+#: src/libslic3r/PrintConfig.cpp:678
+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."
+msgstr "Zde zadejte průměr filamentu. Je zapotřebí správné přesnosti, proto použijte šupleru a prove�te několik měření podél filamentu, poté vypo�tete průměr."
+
+#: src/slic3r/GUI/MainFrame.cpp:636 src/slic3r/GUI/PrintHostDialogs.cpp:230
+msgid "Error"
+msgstr "Chyba"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:608
+#, possible-c-format
+msgid "Error accessing port at %s: %s"
+msgstr "Chyba při přístupu k portu na %s : %s"
+
+#: lib/Slic3r/GUI/Plater.pm:1760
+msgid "Error exporting 3MF file "
+msgstr "Chyba při exportu souboru 3MF "
+
+#: src/slic3r/GUI/Plater.cpp:3593
+#, possible-c-format
+msgid "Error exporting 3MF file %s"
+msgstr "Chyba při exportu souboru 3MF %s"
+
+#: lib/Slic3r/GUI/Plater.pm:1744
+msgid "Error exporting AMF file "
+msgstr "Chyba při exportu souboru AMF "
+
+#: src/slic3r/GUI/Plater.cpp:3564
+#, possible-c-format
+msgid "Error exporting AMF file %s"
+msgstr "Chyba při exportu souboru AMF %s"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:271
+msgid "Error uploading to print host:"
+msgstr "Chyba při nahrávání do tiskového serveru:"
+
+#: xs/src/slic3r/Utils/OctoPrint.cpp:98
+msgid "Error while uploading to the OctoPrint server"
+msgstr "Chyba při nahrávání na server OctoPrint"
+
+#: src/libslic3r/Zipper.cpp:105
+msgid "Error with zip archive"
+msgstr "Chyba v zip archivu"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:333 src/slic3r/GUI/GUI_ObjectList.cpp:1431
+msgid "Error! "
+msgstr "Chyba! "
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:610
+#, possible-c-format
+msgid "Error: %s"
+msgstr "Chyba: %s"
+
+#: src/slic3r/GUI/Plater.cpp:217 src/slic3r/GUI/Plater.cpp:1028
+#: src/slic3r/GUI/Plater.cpp:1070
+msgid "Estimated printing time"
+msgstr "Odhadovaný �as tisku"
+
+#: lib/Slic3r/GUI/Plater.pm:1618
+msgid "Estimated printing time (normal mode)"
+msgstr "Předpokládaná doba tisku (normální režim)"
+
+#: lib/Slic3r/GUI/Plater.pm:1620
+msgid "Estimated printing time (silent mode)"
+msgstr "Předpokládaná doba tisku (tichý režim)"
+
+#: src/slic3r/GUI/Plater.cpp:424
+msgid "Everywhere"
+msgstr "VÅ¡ude"
+
+#: src/slic3r/GUI/PresetHints.cpp:46
+#, possible-c-format
+msgid "except for the first %d layers"
+msgstr "s výjimkou prvních %d vrstev"
+
+#: src/slic3r/GUI/PresetHints.cpp:50
+msgid "except for the first layer"
+msgstr "vyjma první vrstvy"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:148
+#, possible-c-format
+msgid "Exit %s"
+msgstr "Ukon�it %s"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:144
+msgid "Exit Slic3r"
+msgstr "Ukon�it Slic3r"
+
+#: src/libslic3r/PrintConfig.cpp:335
+msgid "Experimental option for preventing support material from being generated under bridged areas."
+msgstr "Experimentální nastavení pro zabránění tvorbě podpěr v oblastech po mosty."
+
+#: src/libslic3r/PrintConfig.cpp:1306
+msgid "Experimental option to adjust flow for overhangs (bridge flow will be used), to apply bridge speed to them and enable fan."
+msgstr "Experimentální volba pro nastavení průtoku pro přesahy (použije se průtok jako u mostů), aplikuje se na ně rychlost mostu a spustí se ventilátor."
+
+#: src/slic3r/GUI/GUI_App.cpp:676 src/slic3r/GUI/wxExtensions.cpp:2461
+msgid "Expert"
+msgstr "Expert"
+
+#: src/slic3r/GUI/GUI_App.cpp:676
+msgid "Expert View Mode"
+msgstr "Režim Expert"
+
+#: src/slic3r/GUI/MainFrame.cpp:602 src/slic3r/GUI/Plater.cpp:3821
+msgid "Export"
+msgstr "Exportovat"
+
+#: src/slic3r/GUI/MainFrame.cpp:373
+msgid "Export &Config"
+msgstr "Exportovat Konfigura&ci"
+
+#: src/slic3r/GUI/MainFrame.cpp:362 src/slic3r/GUI/MainFrame.cpp:602
+msgid "Export &G-code"
+msgstr "Exportovat &G-code"
+
+#: src/libslic3r/PrintConfig.cpp:2949
+msgid "Export 3MF"
+msgstr "Exportovat 3MF"
+
+#: src/slic3r/GUI/MainFrame.cpp:375
+msgid "Export all presets to file"
+msgstr "Exportovat všechna přednastavení do souboru"
+
+#: src/libslic3r/PrintConfig.cpp:2954
+msgid "Export AMF"
+msgstr "Exportovat AMF"
+
+#: src/slic3r/GUI/Plater.cpp:1932
+msgid "Export AMF file:"
+msgstr "Exportovat AMF soubor:"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1219 src/slic3r/GUI/Plater.cpp:2927
+msgid "Export as STL"
+msgstr "Exportovat jako STL"
+
+#: lib/Slic3r/GUI/Plater.pm:1416
+msgid "Export cancelled"
+msgstr "Export zrušen"
+
+#: src/slic3r/GUI/MainFrame.cpp:375
+msgid "Export Config &Bundle"
+msgstr "Exportovat Konfigura�ní &Balík"
+
+#: src/slic3r/GUI/MainFrame.cpp:373
+msgid "Export current configuration to file"
+msgstr "Exportovat sou�asnou konfiguraci do souboru"
+
+#: lib/Slic3r/GUI/MainFrame.pm:281
+msgid "Export current plate as 3MF"
+msgstr "Exportovat stávající plochu jako 3MF"
+
+#: src/slic3r/GUI/MainFrame.cpp:370
+msgid "Export current plate as AMF"
+msgstr "Exportovat stávající plochu jako AMF"
+
+#: src/slic3r/GUI/MainFrame.cpp:362
+msgid "Export current plate as G-code"
+msgstr "Exportovat stávající plochu do G-code"
+
+#: src/slic3r/GUI/MainFrame.cpp:366
+msgid "Export current plate as STL"
+msgstr "Exportovat stávající plochu jako STL"
+
+#: src/slic3r/GUI/MainFrame.cpp:368
+msgid "Export current plate as STL including supports"
+msgstr "Exportovat stávající plochu v�etně podpěr jako STL"
+
+#: src/slic3r/GUI/Plater.cpp:2722
+msgid "Export failed"
+msgstr "Exportování selhalo"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:108 src/slic3r/GUI/Plater.cpp:733
+#: src/slic3r/GUI/Plater.cpp:3821 src/libslic3r/PrintConfig.cpp:2964
+msgid "Export G-code"
+msgstr "Exportovat G-code"
+
+#: lib/Slic3r/GUI/MainFrame.pm:272
+msgid "Export G-code..."
+msgstr "Exportovat G-code…"
+
+#: lib/Slic3r/GUI/Plater.pm:322
+msgid "Export G-code…"
+msgstr "Exportovat G-code…"
+
+#: src/libslic3r/PrintConfig.cpp:2931
+msgid "Export OBJ"
+msgstr "Exportovat OBJ"
+
+#: lib/Slic3r/GUI/Plater.pm:2307
+msgid "Export object as STL…"
+msgstr "Exportovat objekt jako STL…"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:368
+msgid "Export of a temporary 3mf file failed"
+msgstr "Export do�asného 3MF souboru selhalo."
+
+#: src/slic3r/GUI/MainFrame.cpp:370
+msgid "Export plate as &AMF"
+msgstr "Exportovat plochu jako &AMF"
+
+#: src/slic3r/GUI/MainFrame.cpp:366
+msgid "Export plate as &STL"
+msgstr "Exportovat plochu jako &STL"
+
+#: lib/Slic3r/GUI/MainFrame.pm:281
+msgid "Export plate as 3MF..."
+msgstr "Exportovat plochu jako 3MF..."
+
+#: lib/Slic3r/GUI/MainFrame.pm:278
+msgid "Export plate as AMF..."
+msgstr "Exportovat plochu jako AMF..."
+
+#: src/slic3r/GUI/MainFrame.cpp:368
+msgid "Export plate as STL including supports"
+msgstr "Exportovat plochu v�etně podpěr jako STL soubor"
+
+#: lib/Slic3r/GUI/MainFrame.pm:275
+msgid "Export plate as STL..."
+msgstr "Exportovat plochu jako STL..."
+
+#: xs/src/slic3r/GUI/GUI.cpp:930
+msgid "Export print config"
+msgstr "Exportovat nastavení tisku"
+
+#: src/libslic3r/PrintConfig.cpp:2943
+msgid "Export SLA"
+msgstr "Exportovat SLA"
+
+#: src/libslic3r/PrintConfig.cpp:2959
+msgid "Export STL"
+msgstr "Exportovat STL"
+
+#: src/slic3r/GUI/Plater.cpp:1925
+msgid "Export STL file:"
+msgstr "Exportovat STL soubor:"
+
+#: lib/Slic3r/GUI/Plater.pm:326
+msgid "Export STL…"
+msgstr "Exportovat STL…"
+
+#: src/libslic3r/PrintConfig.cpp:2924
+msgid "Export SVG"
+msgstr "Exportovat SVG"
+
+#: src/libslic3r/PrintConfig.cpp:2950
+msgid "Export the model(s) as 3MF."
+msgstr "Exportovat model(y) jako 3MF."
+
+#: src/libslic3r/PrintConfig.cpp:2955
+msgid "Export the model(s) as AMF."
+msgstr "Exportovat model(y) jako AMF."
+
+#: src/libslic3r/PrintConfig.cpp:2932
+msgid "Export the model(s) as OBJ."
+msgstr "Exportovat model(y) jako OBJ."
+
+#: src/libslic3r/PrintConfig.cpp:2960
+msgid "Export the model(s) as STL."
+msgstr "Exportovat model(y) jako STL."
+
+#: src/slic3r/GUI/Plater.cpp:2927
+msgid "Export the selected object as STL file"
+msgstr "Exportovat vybrané objekty jako STL soubor"
+
+#: lib/Slic3r/GUI/Plater.pm:2307
+msgid "Export this single object as STL file"
+msgstr "Exportovat tento jediný objekt jako STL soubor"
+
+#: src/libslic3r/Print.cpp:1517
+msgid "Exporting G-code"
+msgstr "Exportování souboru G-code"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:341
+msgid "Exporting model..."
+msgstr "Exportování modelu..."
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:219
+#: src/slic3r/Utils/FixModelByWin10.cpp:359
+msgid "Exporting source model"
+msgstr "Exportování zdrojového modelu"
+
+#: src/slic3r/GUI/Tab.cpp:3306
+msgid "Exposure"
+msgstr "Osvit"
+
+#: src/libslic3r/PrintConfig.cpp:2310 src/libslic3r/PrintConfig.cpp:2311
+msgid "Exposure time"
+msgstr "Doba osvitu"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:228 src/libslic3r/GCode/PreviewData.cpp:164
+msgid "External perimeter"
+msgstr "Vnější perimetr"
+
+#: src/slic3r/GUI/PresetHints.cpp:153
+msgid "external perimeters"
+msgstr "vnější perimetry"
+
+#: src/libslic3r/PrintConfig.cpp:415 src/libslic3r/PrintConfig.cpp:425
+msgid "External perimeters"
+msgstr "Vnější perimetry"
+
+#: src/libslic3r/PrintConfig.cpp:437
+msgid "External perimeters first"
+msgstr "Nejprve tisknout vnější perimetry"
+
+#: src/libslic3r/PrintConfig.cpp:1518 src/libslic3r/PrintConfig.cpp:1526
+msgid "Extra length on restart"
+msgstr "Extra vzdálenost při návratu"
+
+#: src/libslic3r/PrintConfig.cpp:1321
+msgid "Extra loading distance"
+msgstr "Extra délka při zavádění"
+
+#: src/libslic3r/PrintConfig.cpp:445
+msgid "Extra perimeters if needed"
+msgstr "Extra perimetry (pokud jsou potřeba)"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:335 src/slic3r/GUI/Tab.cpp:1479
+#: src/libslic3r/PrintConfig.cpp:455
+msgid "Extruder"
+msgstr "Extruder"
+
+#: src/slic3r/GUI/Tab.cpp:2253 src/libslic3r/GCode/PreviewData.cpp:475
+#, possible-c-format
+msgid "Extruder %d"
+msgstr "Extruder %d"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:592
+msgid "Extruder and Bed Temperatures"
+msgstr "Teploty extruderu a podložky"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:226
+msgid "Extruder changed to"
+msgstr "Extruder změněn na"
+
+#: src/slic3r/GUI/Tab.cpp:1171
+msgid "Extruder clearance (mm)"
+msgstr "Kolizní oblast extruderu (mm)"
+
+#: src/libslic3r/PrintConfig.cpp:490
+msgid "Extruder Color"
+msgstr "Barva extruderu"
+
+#: src/libslic3r/PrintConfig.cpp:497
+msgid "Extruder offset"
+msgstr "Odsazení extruderu"
+
+#: src/libslic3r/PrintConfig.cpp:863
+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 "Teplota extruderu pro první vrstvu. Chcete-li během tisku ru�ně ovládat teplotu, nastavte tuto hodnotu na nulu, aby se ve výstupním souboru zakázaly příkazy pro řízení teploty."
+
+#: src/libslic3r/PrintConfig.cpp:1978
+msgid "Extruder temperature for layers after the first one. Set this to zero to disable temperature control commands in the output."
+msgstr "Teplota extruderu pro následující vrstvy po vrstvě první. Nastavte tuto hodnotu na nulu, abyste zakázali příkazy pro řízení teploty na výstupu."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_ObjectList.cpp:72
+#: src/slic3r/GUI/GUI_ObjectList.cpp:513 src/slic3r/GUI/Tab.cpp:1119
+#: src/slic3r/GUI/Tab.cpp:1844 src/libslic3r/PrintConfig.cpp:456
+#: src/libslic3r/PrintConfig.cpp:954 src/libslic3r/PrintConfig.cpp:1340
+#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1852
+#: src/libslic3r/PrintConfig.cpp:1878 src/libslic3r/PrintConfig.cpp:2151
+#: src/libslic3r/PrintConfig.cpp:2159
+msgid "Extruders"
+msgstr "Extrudery"
+
+#: src/libslic3r/PrintConfig.cpp:507
+msgid "Extrusion axis"
+msgstr "Osa extruderu"
+
+#: src/libslic3r/PrintConfig.cpp:513
+msgid "Extrusion multiplier"
+msgstr "Násobi� extruze"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:612
+msgid "Extrusion Temperature:"
+msgstr "Teplota extruze:"
+
+#: src/slic3r/GUI/Tab.cpp:1143
+msgid "Extrusion width"
+msgstr "Šířka extruze"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:73 src/slic3r/GUI/GUI_ObjectList.cpp:514
+#: src/libslic3r/PrintConfig.cpp:416 src/libslic3r/PrintConfig.cpp:523
+#: src/libslic3r/PrintConfig.cpp:830 src/libslic3r/PrintConfig.cpp:962
+#: src/libslic3r/PrintConfig.cpp:1349 src/libslic3r/PrintConfig.cpp:1688
+#: src/libslic3r/PrintConfig.cpp:1861 src/libslic3r/PrintConfig.cpp:2018
+msgid "Extrusion Width"
+msgstr "Šíře extruze"
+
+#: src/slic3r/GUI/Plater.cpp:139
+msgid "Facets"
+msgstr "Facety"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:240
+msgid "facets added"
+msgstr "facety přidány"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:239
+msgid "facets removed"
+msgstr "facety odebrány"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:241
+msgid "facets reversed"
+msgstr "facety oto�eny"
+
+#: src/libslic3r/PrintConfig.cpp:2302
+msgid "Faded layers"
+msgstr "Vrstvy po�áte�ního osvitu"
+
+#: src/libslic3r/Zipper.cpp:47
+msgid "failed finding central directory"
+msgstr "selhalo nalezení kořenového adresáře"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:235
+msgid "Failed loading the input model."
+msgstr "Na�tení vstupního modelu se nezdařilo."
+
+#: src/libslic3r/PrintBase.cpp:65
+msgid "Failed processing of the output_filename_format template."
+msgstr "Zpracování šablony output_filename_format selhalo."
+
+#: src/slic3r/GUI/PresetHints.cpp:38
+msgid "Fan "
+msgstr "Ventilátor "
+
+#: src/slic3r/GUI/Tab.cpp:1501
+msgid "Fan settings"
+msgstr "Nastavení ventilátoru"
+
+#: src/slic3r/GUI/Tab.cpp:1502
+msgid "Fan speed"
+msgstr "Rychlost ventilátoru"
+
+#: src/libslic3r/PrintConfig.cpp:2240
+msgid "Fast"
+msgstr "Rychlý"
+
+#: src/libslic3r/PrintConfig.cpp:2241
+msgid "Fast tilt"
+msgstr "Rychlý náklon"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:212 src/slic3r/GUI/GUI_Preview.cpp:537
+#: src/libslic3r/GCode/PreviewData.cpp:394
+msgid "Feature type"
+msgstr "Typ"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/GUI_Preview.cpp:225
+msgid "Feature types"
+msgstr "Typy extruzí"
+
+#: lib/Slic3r/GUI/Plater.pm:256
+msgid "Fewer"
+msgstr "Méně"
+
+#: src/slic3r/GUI/Plater.cpp:682 src/slic3r/GUI/Tab.cpp:1470
+#: src/slic3r/GUI/Tab.cpp:1471
+msgid "Filament"
+msgstr "Filament"
+
+#: src/slic3r/GUI/Preset.cpp:1275
+msgid "filament"
+msgstr "filament"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:541
+msgid "Filament and Nozzle Diameters"
+msgstr "Průměry filamentu a trysky"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:574
+msgid "Filament Diameter:"
+msgstr "Průměr filamentu:"
+
+#: src/libslic3r/PrintConfig.cpp:619
+msgid "Filament is cooled by being moved back and forth in the cooling tubes. Specify desired number of these moves "
+msgstr "Filament je chlazen pohyby tam a zpět v chladicí trubi�ce. Zadejte požadovaný po�et těchto pohybů"
+
+#: src/libslic3r/PrintConfig.cpp:654
+msgid "Filament load time"
+msgstr "Doba zavádění filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:556
+msgid "Filament notes"
+msgstr "Poznámky k filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:1312
+msgid "Filament parking position"
+msgstr "Parkovací pozice filamentu"
+
+#: src/slic3r/GUI/Tab.cpp:1516
+msgid "Filament properties"
+msgstr "Vlastnosti filamentu"
+
+#: src/slic3r/GUI/Tab.hpp:335
+msgid "Filament Settings"
+msgstr "Nastavení filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:694
+msgid "Filament type"
+msgstr "Typ filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:669
+msgid "Filament unload time"
+msgstr "Doba vysouvání filamentu"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:47
+msgid "filaments"
+msgstr "filamenty"
+
+#: lib/Slic3r/GUI/Plater.pm:1555
+msgid "File added to print queue"
+msgstr "Soubor byl přidán do tiskové fronty"
+
+#: src/libslic3r/Zipper.cpp:75
+msgid "file close failed"
+msgstr "zavření souboru selhalo"
+
+#: src/libslic3r/Zipper.cpp:69
+msgid "file create failed"
+msgstr "vytvoření souboru selhalo"
+
+#: src/slic3r/GUI/MainFrame.cpp:642
+msgid "File Not Found"
+msgstr "Soubor nenalezen"
+
+#: src/libslic3r/Zipper.cpp:89
+msgid "file not found"
+msgstr "Soubor nenalezen"
+
+#: src/libslic3r/Zipper.cpp:67
+msgid "file open failed"
+msgstr "otevření souboru selhalo"
+
+#: src/libslic3r/Zipper.cpp:73
+msgid "file read failed"
+msgstr "�tení souboru se nezdařilo"
+
+#: src/libslic3r/Zipper.cpp:77
+msgid "file seek failed"
+msgstr "hledání souboru selhalo"
+
+#: src/libslic3r/Zipper.cpp:79
+msgid "file stat failed"
+msgstr "soubor stat selhal"
+
+#: src/libslic3r/Zipper.cpp:39
+msgid "file too large"
+msgstr "soubor je příliš velký"
+
+#: src/libslic3r/Zipper.cpp:71
+msgid "file write failed"
+msgstr "zápis souboru se nezdařil"
+
+#: src/libslic3r/PrintConfig.cpp:728
+msgid "Fill angle"
+msgstr "Úhel výplně"
+
+#: src/libslic3r/PrintConfig.cpp:742
+msgid "Fill density"
+msgstr "Hustota výplně"
+
+#: src/libslic3r/PrintConfig.cpp:779
+msgid "Fill pattern"
+msgstr "Vzor výplně"
+
+#: src/libslic3r/PrintConfig.cpp:410
+msgid "Fill pattern for bottom infill. This only affects the bottom external visible layer, and not its adjacent solid shells."
+msgstr "Vzor výplně pro spodní vrstvy. Ovlivňuje pouze spodní vnější viditelné vrstvy. Neovlivňuje následné plné vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:781
+msgid "Fill pattern for general low-density infill."
+msgstr "Vzor výplně pro obecnou výplň s nízkou hustotou."
+
+#: src/libslic3r/PrintConfig.cpp:390
+msgid "Fill pattern for top infill. This only affects the top visible layer, and not its adjacent solid shells."
+msgstr "Nastavte vzor pro horní výplň. Ovlivňuje pouze horní viditelnou vrstvu a ne její sousední plné vrstvy."
+
+#: xs/src/libslic3r/PrintConfig.cpp:285
+msgid "Fill pattern for top/bottom infill. This only affects the external visible layer, and not its adjacent solid shells."
+msgstr "Vzor výplně pro vrchní/spodní vrstvy. Ovlivňuje pouze vnější viditelné vrstvy. Neovlivňuje sousední plné vrstvy."
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2154
+msgid "Filtering"
+msgstr "Filtrování"
+
+#: src/slic3r/GUI/BonjourDialog.cpp:225
+msgid "Finished"
+msgstr "Dokon�eno"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:486 src/slic3r/GUI/Tab.cpp:1920
+msgid "Firmware"
+msgstr "Firmware"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:740
+msgid "Firmware flasher"
+msgstr "Aktualizace firmware"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:765
+msgid "Firmware image:"
+msgstr "Soubor s firmware:"
+
+#: src/slic3r/GUI/Tab.cpp:2431
+msgid "Firmware Retraction"
+msgstr "Firmware Retrakce"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:486
+msgid "Firmware Type"
+msgstr "Typ firmware"
+
+#: src/libslic3r/PrintConfig.cpp:812 src/libslic3r/PrintConfig.cpp:821
+#: src/libslic3r/PrintConfig.cpp:829 src/libslic3r/PrintConfig.cpp:862
+msgid "First layer"
+msgstr "První vrstva"
+
+#: src/libslic3r/PrintConfig.cpp:841
+msgid "First layer height"
+msgstr "Výška první vrstvy"
+
+#: src/libslic3r/Print.cpp:1328
+msgid "First layer height can't be greater than nozzle diameter"
+msgstr "Výška první vrstvy nesmí být větší než průměr trysky"
+
+#: src/libslic3r/PrintConfig.cpp:852
+msgid "First layer speed"
+msgstr "Rychlost první vrstvy"
+
+#: src/slic3r/GUI/PresetHints.cpp:216
+msgid "First layer volumetric"
+msgstr "Volumetrická hodnota první vrstvy"
+
+#: src/libslic3r/Print.cpp:1313
+msgid "first_layer_height"
+msgstr "first_layer_height"
+
+#: lib/Slic3r/GUI/Plater.pm:2311
+msgid "Fix STL through Netfabb"
+msgstr "Opravit STL pomocí služby Netfabb"
+
+#: lib/Slic3r/GUI/Plater.pm:2311
+msgid "Fix the model by sending it to a Netfabb cloud service through Windows 10 API"
+msgstr "Opravit model zasláním do cloudové služby Netfabb pomocí Window 10 API"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1210
+msgid "Fix through the Netfabb"
+msgstr "Opravit pomocí služby Netfabb"
+
+#: src/slic3r/GUI/GUI_App.cpp:685
+msgid "Flash printer &firmware"
+msgstr "Nahrát &firmware tiskárny"
+
+#: xs/src/slic3r/GUI/GUI.cpp:356
+msgid "Flash printer firmware"
+msgstr "Nahrát firmware tiskárny"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:146
+msgid "Flash!"
+msgstr "Nahrát!"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:275
+msgid "Flashing cancelled."
+msgstr "Nahrávání zrušeno."
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:274
+msgid "Flashing failed. Please see the avrdude log below."
+msgstr "Nahrání selhalo. Projděte si prosím avrdude log níže."
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:192
+msgid "Flashing failed: "
+msgstr "Nahrávání selhalo:"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:148
+msgid "Flashing in progress. Please do not disconnect the printer!"
+msgstr "Probíhá nahrávání firmware. Prosím neodpojujte tiskárnu!"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:273
+msgid "Flashing succeeded!"
+msgstr "Nahrávání bylo úspěšné!"
+
+#: src/slic3r/GUI/Tab.cpp:1156
+msgid "Flow"
+msgstr "Průtok"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:188
+msgid "For more information please visit our wiki page:"
+msgstr "Pro více informací prosím navštivte naší wiki stránku:"
+
+#: src/slic3r/GUI/Tab.cpp:1295
+msgid "For the Wipe Tower to work with the soluble supports, the support layers\nneed to be synchronized with the object layers.\n\nShall I synchronize support layers in order to enable the Wipe Tower?"
+msgstr "U �istící věže pokud pracujte s rozpustnými materiály, je třeba\nsynchronizovat vrstvy podpěr s vrstvami objektů.\n\nMám synchronizovat vrstvy podpěr, aby bylo možné zapnout Čistící věž?"
+
+#: src/libslic3r/Print.cpp:1302
+msgid "For the Wipe Tower to work with the soluble supports, the support layers need to be synchronized with the object layers."
+msgstr "U �istící věže pokud pracujte s rozpustnými materiály, je třeba\nsynchronizovat vrstvy podpěr s vrstvami objektů."
+
+#: src/libslic3r/PrintConfig.cpp:1660
+msgid "Force solid infill for regions having a smaller area than the specified threshold."
+msgstr "Vynucení plné výplně pro oblasti, které mají menší plochu, než je stanovená prahová hodnota."
+
+#: src/libslic3r/PrintConfig.cpp:1023
+msgid "Force the generation of solid shells between adjacent materials/volumes. Useful for multi-extruder prints with translucent materials or manual soluble support material."
+msgstr "Vynucení vytváření pevných skořepin mezi sousedními materiály/objemy. Užite�né pro tisk s více extrudery s průsvitnými materiály nebo ru�ně rozpustným podpůrným materiálem."
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:262
+msgid "From"
+msgstr "Předchozí extruder"
+
+#: src/slic3r/GUI/MainFrame.cpp:525
+msgid "Front"
+msgstr "Zepředu"
+
+#: src/slic3r/GUI/MainFrame.cpp:525
+msgid "Front View"
+msgstr "Pohled zepředu"
+
+#: src/slic3r/GUI/Tab.cpp:2151
+msgid "Full Power"
+msgstr "Plný výkon (režim Normal)"
+
+#: src/slic3r/GUI/MainFrame.cpp:677
+msgid "G-code"
+msgstr "G-code"
+
+#: lib/Slic3r/GUI/Plater.pm:1561
+msgid "G-code file exported to "
+msgstr "Soubor G-code byl exportován do "
+
+#: src/libslic3r/PrintConfig.cpp:888
+msgid "G-code flavor"
+msgstr "Druh G-code"
 
 #: src/libslic3r/PrintConfig.cpp:689
 msgid "g/cm³"
 msgstr "g/cm³"
 
-#: src/libslic3r/PrintConfig.cpp:695
-msgid "Filament type"
-msgstr "Typ filamentu"
+#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/PrintConfig.cpp:870
+#: src/libslic3r/GCode/PreviewData.cpp:170
+msgid "Gap fill"
+msgstr "Výplň tenkých stěn"
 
-#: src/libslic3r/PrintConfig.cpp:696
-msgid "The filament material type for use in custom G-codes."
-msgstr ""
+#: src/slic3r/GUI/Preferences.cpp:19 src/slic3r/GUI/Tab.cpp:1812
+#: src/slic3r/GUI/Tab.cpp:2013
+msgid "General"
+msgstr "Obecné"
 
-#: src/libslic3r/PrintConfig.cpp:712
-msgid "Soluble material"
-msgstr "Rozpustný materiál"
+#: src/libslic3r/PrintConfig.cpp:1242
+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."
+msgstr "Nevygenerovat méně, než po�et obrysových smy�ek, potřebných ke spotřebování specifikovaného množství filamentu na spodní vrstvu. U strojů s více extrudery platí toto minimum pro každý extruder."
 
-#: src/libslic3r/PrintConfig.cpp:713
-msgid "Soluble material is most likely used for a soluble support."
-msgstr "Rozpustný materiál je převážně používán pro tisk rozpustných podpor."
+#: src/libslic3r/SLA/SLASupportTree.cpp:2155
+msgid "Generate pinheads"
+msgstr "Generovat podpůrné hroty"
 
-#: src/libslic3r/PrintConfig.cpp:719
-msgid ""
-"Enter your filament cost per kg here. This is only for statistical "
-"information."
-msgstr ""
-"Zde zadejte cenu filamentu za kg. Slouží pouze pro statistické informace."
+#: src/libslic3r/PrintConfig.cpp:1779
+msgid "Generate support material"
+msgstr "Generovat podpěry"
 
-#: src/libslic3r/PrintConfig.cpp:720
-msgid "money/kg"
-msgstr "korun/kg"
+#: src/libslic3r/PrintConfig.cpp:1840
+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 "Vygeneruje podpěry pro zadaný po�et vrstev po�ítaných od spodního okraje, bez ohledu na to, zda jsou povoleny standartní podpěry nebo nikoliv a bez ohledu na jakýkoli prah úhlu. To je užite�né pro získání větší přilnavosti předmětů s velmi tenkou nebo špatnou stopou na tiskové podložce."
 
-#: src/libslic3r/PrintConfig.cpp:729
-msgid "Fill angle"
-msgstr "Úhel výplně"
+#: src/libslic3r/PrintConfig.cpp:2362
+msgid "Generate supports"
+msgstr "Generovat podpěry"
 
-#: src/libslic3r/PrintConfig.cpp:731
-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."
-msgstr ""
-"Výchozí úhel pro orientaci výplně. Bude pro něj použito křížové šrafování. "
-"Mosty budou vyplněny nejlepším směrem, který Slic3r dokáže rozpoznat, takže "
-"toto nastavení je neovlivní."
+#: src/libslic3r/PrintConfig.cpp:2364
+msgid "Generate supports for the models"
+msgstr "Generovat podpěry modelů"
 
-#: src/libslic3r/PrintConfig.cpp:744
-msgid "Fill density"
-msgstr "Hustota výplně"
+#: src/libslic3r/Print.cpp:1492
+msgid "Generating brim"
+msgstr "Generování límce"
 
-#: src/libslic3r/PrintConfig.cpp:746
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "Hustota vnitřní výplně, vyjádřená v rozmezí 0% až 100%."
+#: src/libslic3r/SLAPrint.cpp:58
+msgid "Generating pad"
+msgstr "Generování podložky"
 
-#: src/libslic3r/PrintConfig.cpp:782
-msgid "Fill pattern"
-msgstr "Vzor výplně"
+#: src/libslic3r/Print.cpp:1484
+msgid "Generating skirt"
+msgstr "Generování obrysových smy�ek"
 
-#: src/libslic3r/PrintConfig.cpp:784
-msgid "Fill pattern for general low-density infill."
-msgstr "Vzor výplně pro obecnou výplň s nízkou hustotou."
+#: src/libslic3r/SLAPrint.cpp:56 src/libslic3r/SLAPrint.cpp:809
+msgid "Generating support points"
+msgstr "Generování podpěrných bodů"
 
-#: src/libslic3r/PrintConfig.cpp:801
+#: src/libslic3r/SLAPrint.cpp:57
+msgid "Generating support tree"
+msgstr "Generování podpěr typu strom"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1551
+msgid "Generic"
+msgstr "Obecný"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
+msgid "Gizmo cut"
+msgstr "Gizmo řez"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+msgid "Gizmo move"
+msgstr "Gizmo posuv"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
+msgid "Gizmo Place face on bed"
+msgstr "Gizmo Umístit plochou na podložku"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
+msgid "Gizmo rotate"
+msgstr "Gizmo rotace"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
+msgid "Gizmo scale"
+msgstr "Gizmo měřítko"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
+msgid "Gizmo SLA support points"
+msgstr "Gizmo SLA podpěrné body"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:571
+msgid "Good precision is required, so use a caliper and do multiple measurements along the filament, then compute the average."
+msgstr "Je zapotřebí velká přesnost, proto použijte posuvné měřítko (šupleru) a prove�te několik měření po délce filamentu, poté vypo�ítejte průměr."
+
+#: src/libslic3r/PrintConfig.cpp:797
 msgid "Grid"
-msgstr ""
+msgstr "Mřížka"
 
-#: src/libslic3r/PrintConfig.cpp:802
-msgid "Triangles"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:803
-msgid "Stars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:804
-msgid "Cubic"
-msgstr ""
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1846
+msgid "Group manipulation"
+msgstr "Manipulace se skupinou"
 
 #: src/libslic3r/PrintConfig.cpp:805
-msgid "Line"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
-msgid "Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:808
-msgid "3D Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:809
 msgid "Gyroid"
-msgstr ""
+msgstr "Gyroid"
 
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
-msgid "First layer"
-msgstr "První vrstva"
+#: src/slic3r/GUI/Tab.cpp:2775
+msgid "has the following unsaved changes:"
+msgstr "má neuložené následující změny:"
 
-#: src/libslic3r/PrintConfig.cpp:817
-msgid ""
-"This is the acceleration your printer will use for first layer. Set zero to "
-"disable acceleration control for first layer."
-msgstr ""
-"Toto je zrychlení, které vaše tiskárna použije pro první vrstvu. Nastavte "
-"nulu pro vypnutí řízení zrychlení pro první vrstvu."
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:838
+msgid "Head diameter: "
+msgstr "Průměr hrotu:"
 
-#: src/libslic3r/PrintConfig.cpp:827
-msgid ""
-"Heated build plate temperature for the first layer. Set this to zero to "
-"disable bed temperature control commands in the output."
-msgstr ""
-"Teplota vyhřívané tiskové podložky pro první vrstvu. Nastavením tuto hodnoty "
-"na nulu vypnete příkazy pro řízení teploty ve vrstvě ve výstupu."
+#: src/slic3r/GUI/Tab.cpp:3483
+msgid "Head penetration should not be greater than the head width."
+msgstr "Průnik podpěry do modelu by neměl být větší než je tloušťka hrotu podpěry."
 
-#: src/libslic3r/PrintConfig.cpp:837
-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."
-msgstr ""
-"Nastavením kladné hodnoty zvolíte manuální šířku vytla�ování pro první "
-"vrstvu. Toto můžete použít k vytla�ování tlustší extruze pro lepší "
-"přilnavost. Pokud je vyjádřeno jako procenty (například 120%), bude "
-"vypo�teno z výšky první vrstvy. Pokud je nastavena na nulu, použije se "
-"výchozí šířka vytla�ování."
+#: src/libslic3r/PrintConfig.cpp:822
+msgid "Heated build plate temperature for the first layer. Set this to zero to disable bed temperature control commands in the output."
+msgstr "Teplota vyhřívané tiskové podložky pro první vrstvu. Nastavením tuto hodnoty na nulu vypnete příkazy pro řízení teploty ve vrstvě ve výstupu."
 
-#: src/libslic3r/PrintConfig.cpp:848
-msgid "First layer height"
-msgstr "Výška první vrstvy"
-
-#: src/libslic3r/PrintConfig.cpp:850
-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 ""
-"Při tisku s velmi nízkými výškami vrstev můžete stále vytisknout tlustší "
-"spodní vrstvu pro zlepšení přilnavosti a toleranci pro nedokonale "
-"zkalibrovanou tiskovou podložku. Může být vyjádřeno jako absolutní hodnota "
-"nebo jako procento (například: 150%) z výchozí výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
-msgid "mm or %"
-msgstr "mm nebo %"
-
-#: src/libslic3r/PrintConfig.cpp:860
-msgid "First layer speed"
-msgstr "Rychlost první vrstvy"
-
-#: src/libslic3r/PrintConfig.cpp:861
-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 ""
-"Pokud je vyjádřena jako absolutní hodnota v mm / s, bude tato rychlost "
-"použita pro všechny pohyby tisku první vrstvy bez ohledu na jejich typ. "
-"Pokud je hodnota vyjádřena procenty (například: 40%), změní v závisloti na "
-"výchozích rychlostech."
-
-#: src/libslic3r/PrintConfig.cpp:872
-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 ""
-"Teplota extruderu pro první vrstvu. Chcete-li během tisku ru�ně ovládat "
-"teplotu, nastavte tuto hodnotu na nulu, aby se ve výstupním souboru zakázaly "
-"příkazy pro řízení teploty."
-
-#: src/libslic3r/PrintConfig.cpp:882
-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 ""
-"Rychlost plnění malých mezer pomocí krátkých cikcak pohybů. Udržujte tuto "
-"hodnotu poměrně nízkou, aby nedošlo k přílišným otřesům a problémům s "
-"rezonancí. Nastavte nulu pro vypnutí vyplnění mezery."
-
-#: src/libslic3r/PrintConfig.cpp:890
-msgid "Verbose G-code"
-msgstr "Komentáře do G-code"
-
-#: src/libslic3r/PrintConfig.cpp:891
-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 ""
-"Aktivací získáte komentovaný soubor G-code, při�emž každý řádek je doplněn "
-"popisným textem. Pokud tisknete z SD karty, dodate�né informace v souboru "
-"můžou zpomalit firmware."
-
-#: src/libslic3r/PrintConfig.cpp:899
-msgid "G-code flavor"
-msgstr "Druh G-code"
-
-#: src/libslic3r/PrintConfig.cpp:900
-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 ""
-"Některé příkazy G/M code, v�etně řízení teploty a jiné, nejsou univerzální. "
-"Vyberte typ firmwaru který používá vaše tiskárna pro dosažení kompatibilního "
-"výstupu. Příkazy typu “No extrusion� zabraňují Slic3ru zcela exportovat "
-"jakoukoliv hodnotu extruze."
-
-#: src/libslic3r/PrintConfig.cpp:924
-msgid "No extrusion"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:929
-msgid "High extruder current on filament swap"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:930
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:939
-msgid ""
-"This is the acceleration your printer will use for infill. Set zero to "
-"disable acceleration control for infill."
-msgstr ""
-"Toto je zrychlení, které vaše tiskárna použije pro výplň. Nastavte nulu, "
-"chcete-li vypnout řízení zrychlení pro výplň."
-
-#: src/libslic3r/PrintConfig.cpp:948
-msgid "Combine infill every"
-msgstr "Kombinovat výplň každou"
-
-#: src/libslic3r/PrintConfig.cpp:950
-msgid ""
-"This feature allows to combine infill and speed up your print by extruding "
-"thicker infill layers while preserving thin perimeters, thus accuracy."
-msgstr ""
-"Tato funkce umožňuje kombinovat výplň a urychlit tisk pomocí extruzí "
-"silnějších výplňových vrstev při zachování tenkých obvodů, a tím i přesnosti."
-
-#: src/libslic3r/PrintConfig.cpp:954
-msgid "Combine infill every n layers"
-msgstr "Kombinovat výplň každou n vrstvu"
-
-#: src/libslic3r/PrintConfig.cpp:960
-msgid "Infill extruder"
-msgstr "Extruder pro výplň"
-
-#: src/libslic3r/PrintConfig.cpp:962
-msgid "The extruder to use when printing infill."
-msgstr "Extruder který se použije pro tisk výplní."
-
-#: src/libslic3r/PrintConfig.cpp:971
-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."
-msgstr ""
-"Nastavením kladné hodnoty upravíte manuálně šířku extruze pro výplň. Pokud "
-"je ponechána nula, použije se standardní šířka extruze, pokud je nastavena, "
-"jinak se použije průměr trysky 1,125 x. Je možné, že budete chtít použít "
-"tlustší extruze, pro zrychlení výplně a zpevnění vašich výtisků. Pokud je "
-"vyjádřeno jako procenty (například 90%), bude vypo�teno z výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:981
-msgid "Infill before perimeters"
-msgstr "Tisknout výplň před tiskem perimetrů"
-
-#: src/libslic3r/PrintConfig.cpp:982
-msgid ""
-"This option will switch the print order of perimeters and infill, making the "
-"latter first."
-msgstr "Tato volba obrátí pořadí tisku obvodů a výplní."
-
-#: src/libslic3r/PrintConfig.cpp:988
-msgid "Only infill where needed"
-msgstr "Výplň pouze kde je potřeba"
-
-#: src/libslic3r/PrintConfig.cpp:990
-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."
-msgstr ""
-"Tato volba omezuje výplň na plochy skute�ně potřebné pro podporu stropů "
-"(bude se chovat jako vnitřní podpůrný materiál). Je-li tato volba zapnuta, "
-"zpomaluje generování G-code kvůli několikanásobným kontrolám."
-
-#: src/libslic3r/PrintConfig.cpp:998
-msgid "Infill/perimeters overlap"
-msgstr "Přesah pro výplň/perimetry"
-
-#: src/libslic3r/PrintConfig.cpp:1000
-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."
-msgstr ""
-"Toto nastavení uplatňuje dodate�né překrytí mezi výplní a obvodem pro lepší "
-"spojení. Teoreticky by to nemělo být potřeba, ale reakce by mohla způsobit "
-"mezery. Pokud je vyjádřeno procenty (například: 15%), vypo�ítá se z šířky "
-"extruze perimetrů."
-
-#: src/libslic3r/PrintConfig.cpp:1012
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr "Rychlost tisku vnitřní výplně. Pro automatické nastavení zadejte nulu."
-
-#: src/libslic3r/PrintConfig.cpp:1020
-msgid "Inherits profile"
-msgstr "Zdědí profil"
-
-#: src/libslic3r/PrintConfig.cpp:1021
-msgid "Name of the profile, from which this profile inherits."
-msgstr "Název profilu, ze kterého tento profil zdědí."
-
-#: src/libslic3r/PrintConfig.cpp:1032
-msgid "Interface shells"
-msgstr "Mezilehlé stěny"
-
-#: src/libslic3r/PrintConfig.cpp:1033
-msgid ""
-"Force the generation of solid shells between adjacent materials/volumes. "
-"Useful for multi-extruder prints with translucent materials or manual "
-"soluble support material."
-msgstr ""
-"Vynucení vytváření pevných skořepin mezi sousedními materiály/objemy. "
-"Užite�né pro tisk s více extrudery s průsvitnými materiály nebo ru�ně "
-"rozpustným podpůrným materiálem."
-
-#: src/libslic3r/PrintConfig.cpp:1043
-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/libslic3r/PrintConfig.cpp:1054
-msgid "Supports remaining times"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1055
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1063
-msgid "Supports silent mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1064
-msgid "Set silent mode for the G-code flavor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1087
-msgid "Maximum feedrate %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1089
-msgid "Maximum feedrate of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1097
-msgid "Maximum acceleration %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1099
-msgid "Maximum acceleration of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1107
-msgid "Maximum jerk %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1109
-msgid "Maximum jerk of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
-msgid "Minimum feedrate when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
-msgid "Minimum travel feedrate"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
-msgid "Maximum acceleration when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
-msgid "Maximum acceleration when retracting"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
-msgid "Max"
-msgstr "Maximum"
-
-#: src/libslic3r/PrintConfig.cpp:1164
-msgid "This setting represents the maximum speed of your fan."
-msgstr "Toto nastavení vyjadřuje maximální rychlost ventilátoru."
-
-#: src/libslic3r/PrintConfig.cpp:1174
-#, no-c-format
-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."
-msgstr ""
-"Toto je největší možná výška vrstvy pro tento extruder, který se používá k "
-"zakrytí výšky proměnné vrstvy a výšky podpůrné vrstvy. Maximální doporu�ená "
-"výška vrstvy �iní 75% šířky vytla�ování, aby se dosáhlo přiměřené "
-"přilnavosti mezi vrstvami. Pokud je nastavena hodnota 0, je výška vrstvy "
-"omezena na 75% průměru trysky."
-
-#: src/libslic3r/PrintConfig.cpp:1185
-msgid "Max print speed"
-msgstr "Maximální rychlost tisku"
-
-#: src/libslic3r/PrintConfig.cpp:1186
-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."
-msgstr ""
-"Pokud jsou všechna ostatní nastavení rychlosti na hodnotě nula, Slic3r "
-"automaticky vypo�ítá optimální rychlost pro udržení konstantního tlaku v "
-"extruderu. Toto experimentální nastavení slouží k nastavení nejvyšší "
-"rychlosti tisku, kterou chcete povolit."
-
-#: src/libslic3r/PrintConfig.cpp:1197
-msgid ""
-"This experimental setting is used to set the maximum volumetric speed your "
-"extruder supports."
-msgstr ""
-"Toto experimentální nastavení slouží k nastavení maximální objemové "
-"rychlosti, kterou váš extruder podporuje."
-
-#: src/libslic3r/PrintConfig.cpp:1206
-msgid "Max volumetric slope positive"
-msgstr "Maximální pozitivní objemový sklon"
-
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
-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."
-msgstr ""
-"Toto experimentální nastavení se používá k omezení rychlosti změny "
-"objemového průtoku. Hodnota 1,8mm³/s² zajišťuje, že změna objemového průtoku "
-"z 1,8 mm³/s (šířka extruze 0,45 mm, výška extruze 0,2 mm, rychlost posuvu 20 "
-"mm/s) na 5,4 mm³/s (rychlost posuvu 60 mm/s) potrvá nejméně 2 sekundy."
-
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
-msgid "mm³/s²"
-msgstr "mm³/s²"
-
-#: src/libslic3r/PrintConfig.cpp:1218
-msgid "Max volumetric slope negative"
-msgstr "Maximální negativní objemový sklon"
-
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
-msgid "Min"
-msgstr "Minimum"
-
-#: src/libslic3r/PrintConfig.cpp:1231
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr ""
-"Toto nastavení představuje minimální hodnotu PWM, kterou ventilátor "
-"potřebuje, aby pracoval."
-
-#: src/libslic3r/PrintConfig.cpp:1241
-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."
-msgstr ""
-"Nejmenší tisknutelná výška vrstvy pro tento extruder. Omezuje rozlišení pro "
-"výšku proměnné vrstvy. Typické hodnoty jsou mezi 0,05 mm a 0,1 mm."
-
-#: src/libslic3r/PrintConfig.cpp:1250
-msgid "Min print speed"
-msgstr "Minimální rychlost tisku"
-
-#: src/libslic3r/PrintConfig.cpp:1251
-msgid "Slic3r will not scale speed down below this speed."
-msgstr "Slic3r nebude měnit rychlost pod tuto rychlost."
-
-#: src/libslic3r/PrintConfig.cpp:1259
-msgid "Minimal filament extrusion length"
-msgstr "Minimální délka extruze filamentu"
-
-#: src/libslic3r/PrintConfig.cpp:1260
-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."
-msgstr ""
-"Nevygenerovat méně, než po�et obrysových smy�ek, potřebných ke spotřebování "
-"specifikovaného množství filamentu na spodní vrstvu. U strojů s více "
-"extrudery platí toto minimum pro každý extruder."
-
-#: src/libslic3r/PrintConfig.cpp:1270
-msgid "Configuration notes"
-msgstr "Konfigura�ní poznámky"
-
-#: src/libslic3r/PrintConfig.cpp:1271
-msgid ""
-"You can put here your personal notes. This text will be added to the G-code "
-"header comments."
-msgstr ""
-"Zde můžete zadat své osobní poznámky. Tento text bude přidán do komentáře "
-"záhlaví G code."
-
-#: src/libslic3r/PrintConfig.cpp:1281
-msgid "Nozzle diameter"
-msgstr "Průměr trysky"
-
-#: src/libslic3r/PrintConfig.cpp:1282
-msgid ""
-"This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
-msgstr "Průměr trysky extruderu (například: 0.5, 0.35 atd.)"
-
-#: src/libslic3r/PrintConfig.cpp:1288
-msgid "Host Type"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1289
-msgid ""
-"Slic3r can upload G-code files to a printer host. This field must contain "
-"the kind of the host."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr "Název hosta, IP nebo URL"
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
-msgid "Only retract when crossing perimeters"
-msgstr "Provést retrakci pouze při přejíždění perimetrů"
-
-#: src/libslic3r/PrintConfig.cpp:1326
-msgid ""
-"Disables retraction when the travel path does not exceed the upper layer's "
-"perimeters (and thus any ooze will be probably invisible)."
-msgstr ""
-"Vypne retrakce, pokud dráha nepřekro�í perimetr vrchní vrstvy (a proto bude "
-"pravděpodobně jakékoliv odkapávání neviditelné)."
-
-#: src/libslic3r/PrintConfig.cpp:1334
-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 ""
-"Tato volba sníží teplotu neaktivních extruderů, aby u nich nedošlo k "
-"vytékání."
-
-#: src/libslic3r/PrintConfig.cpp:1342
-msgid "Output filename format"
-msgstr "Formát názvu výstupního souboru"
-
-#: src/libslic3r/PrintConfig.cpp:1343
-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 ""
-"V této šabloně můžete použít všechny možnosti konfigurace jako proměnné. "
-"Můžete například použít: [layer_height], [fill_density] etc. Také můžete "
-"použít [timestamp], [year], [month], [day], [hour], [minute], [second], "
-"[version], [input_filename], [input_filename_base]."
-
-#: src/libslic3r/PrintConfig.cpp:1353
-msgid "Detect bridging perimeters"
-msgstr "Detekovat perimetry přemostění"
-
-#: src/libslic3r/PrintConfig.cpp:1355
-msgid ""
-"Experimental option to adjust flow for overhangs (bridge flow will be used), "
-"to apply bridge speed to them and enable fan."
-msgstr ""
-"Experimentální volba pro nastavení průtoku pro přesahy (použije se průtok "
-"jako u mostů), aplikuje se na ně rychlost mostu a spustí se ventilátor."
-
-#: src/libslic3r/PrintConfig.cpp:1362
-msgid "Filament parking position"
-msgstr "Parkovací pozice filamentu"
-
-#: src/libslic3r/PrintConfig.cpp:1363
-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 ""
-"Vzdálenost špi�ky extruderu od místa, kde je zaparkován filament při "
-"vytažení. Měla by se shodovat s hodnotou ve firmware tiskárny. "
-
-#: src/libslic3r/PrintConfig.cpp:1372
-msgid "Extra loading distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1373
-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:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
-msgid "Perimeters"
-msgstr "Perimetry"
-
-#: src/libslic3r/PrintConfig.cpp:1383
-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 ""
-"Jedná se o akceleraci, kterou vaše tiskárna použije pro perimetry. Vysoká "
-"hodnota, jako je 9000, obvykle dává dobré výsledky, pokud je váš hardware v "
-"pořádku. Nastavte nulu pro vypnutí řízení zrychlení pro perimetry."
-
-#: src/libslic3r/PrintConfig.cpp:1392
-msgid "Perimeter extruder"
-msgstr "Extruder pro perimetry"
-
-#: src/libslic3r/PrintConfig.cpp:1394
-msgid ""
-"The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr ""
-"Extruder, který se používá při tisku perimetrů a límce. První extruder je 1."
-
-#: src/libslic3r/PrintConfig.cpp:1404
-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."
-msgstr ""
-"Nastavením na kladnou hodnotu nastavíte manuálně šířku vytla�ování "
-"perimetrů. Chcete-li získat přesnější povrchy, můžete použít ten�í extruze. "
-"Pokud je ponechána nula, použije se standardní šířka extruze, pokud je "
-"nastavena, jinak se použije průměr trysky 1,125 x. Pokud je vyjádřeno "
-"procenty (například 200%), vypo�te se z výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:1417
-msgid ""
-"Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr ""
-"Rychlost pro perimetry (obrysy, neboli svislé stěny). Zadejte nulu pro "
-"automatické nastavení."
-
-#: src/libslic3r/PrintConfig.cpp:1427
-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 ""
-"Tato volba nastavuje po�et perimetrů, které je třeba vygenerovat pro každou "
-"vrstvu. Slic3r může toto �íslo automaticky zvýšit, pokud detekuje šikmé "
-"plochy, které se tisknou lépe s vyšším po�tem obvodů, pokud je zapnuta "
-"možnost Extra perimetry."
-
-#: src/libslic3r/PrintConfig.cpp:1431
-msgid "(minimum)"
-msgstr "(minimálně)"
-
-#: src/libslic3r/PrintConfig.cpp:1439
-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."
-msgstr ""
-"Pokud chcete zpracovat výstupní G-code pomocí vlastních skriptů, sta�í zde "
-"uvést jejich absolutní cesty. Oddělte více skriptů středníkem. Skripty "
-"předají absolutní cestu k souboru G-code jako první argument a mohou "
-"přistupovat k nastavení konfigurace Slic3ru �tením proměnných prostředí."
-
-#: src/libslic3r/PrintConfig.cpp:1452
-msgid "Printer type"
-msgstr "Typ tiskárny"
-
-#: src/libslic3r/PrintConfig.cpp:1453
-msgid "Type of the printer."
-msgstr "Typ tiskárny."
-
-#: src/libslic3r/PrintConfig.cpp:1457
-msgid "Printer notes"
-msgstr "Poznámky o tiskárně"
-
-#: src/libslic3r/PrintConfig.cpp:1458
-msgid "You can put your notes regarding the printer here."
-msgstr "Zde můžete uvést poznámky týkající se tiskárny."
-
-#: src/libslic3r/PrintConfig.cpp:1467
-msgid "Printer vendor"
-msgstr "Prodejce tiskárny"
-
-#: src/libslic3r/PrintConfig.cpp:1468
-msgid "Name of the printer vendor."
-msgstr "Název prodejce tiskárny."
-
-#: src/libslic3r/PrintConfig.cpp:1472
-msgid "Printer variant"
-msgstr "Varianta tiskárny"
-
-#: src/libslic3r/PrintConfig.cpp:1473
-msgid ""
-"Name of the printer variant. For example, the printer variants may be "
-"differentiated by a nozzle diameter."
-msgstr ""
-"Název varianty tiskárny. Varianty tiskárny mohou být například rozlišeny "
-"podle průměru trysky."
-
-#: src/libslic3r/PrintConfig.cpp:1483
-msgid "Raft layers"
-msgstr "Vrstev raftu"
-
-#: src/libslic3r/PrintConfig.cpp:1485
-msgid ""
-"The object will be raised by this number of layers, and support material "
-"will be generated under it."
-msgstr ""
-"Objekt se zvýší tímto po�tem vrstev a pod ním bude vytvořen podpůrný "
-"materiál."
-
-#: src/libslic3r/PrintConfig.cpp:1494
-msgid "Resolution"
-msgstr "Rozlišení"
-
-#: src/libslic3r/PrintConfig.cpp:1495
-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 ""
-"Minimální rozlišení detailů, které se používají pro zjednodušení vstupního "
-"souboru pro urychlení slicovací úlohy a snížení využití paměti. Modely s "
-"vysokým rozlišením �asto obsahují více detailů než tiskárny dokážou "
-"vykreslit. Nastavte na nulu, chcete-li zakázat jakékoli zjednodušení a "
-"použít vstup v plném rozlišení."
-
-#: src/libslic3r/PrintConfig.cpp:1506
-msgid "Minimum travel after retraction"
-msgstr "Minimální rychloposun po retrakci"
-
-#: src/libslic3r/PrintConfig.cpp:1507
-msgid ""
-"Retraction is not triggered when travel moves are shorter than this length."
-msgstr ""
-"Retrakce není spuštěna, pokud jsou rychloposuny pojezdu kratší než tato "
-"délka."
-
-#: src/libslic3r/PrintConfig.cpp:1514
-msgid "Retract amount before wipe"
-msgstr "Délka retrakce před o�ištěním"
-
-#: src/libslic3r/PrintConfig.cpp:1515
-msgid ""
-"With bowden extruders, it may be wise to do some amount of quick retract "
-"before doing the wipe movement."
-msgstr ""
-"U bowdenových extrudérů může být vhodné provést rychlé retrakce než se "
-"spustí o�ištění."
-
-#: src/libslic3r/PrintConfig.cpp:1523
-msgid "Retract on layer change"
-msgstr "Retrakce při změně vrstvy"
-
-#: src/libslic3r/PrintConfig.cpp:1524
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr "Tato možnost vyvolá retrakci, kdykoli je proveden pohyb Z."
-
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
-msgid "Length"
-msgstr "Vzdálenost"
-
-#: src/libslic3r/PrintConfig.cpp:1531
-msgid "Retraction Length"
-msgstr "Vzdálenost retrakce"
-
-#: src/libslic3r/PrintConfig.cpp:1532
-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 ""
-"Při spuštění retrakce se filament zatáhne zpět o zadané množství (délka se "
-"měří na surovém filamentu, než vstoupí do extruderu)."
-
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
-msgid "mm (zero to disable)"
-msgstr "mm (nula pro vypnutí)"
-
-#: src/libslic3r/PrintConfig.cpp:1540
-msgid "Retraction Length (Toolchange)"
-msgstr "Vzdálenost retrakce (při změně nástroje)"
-
-#: src/libslic3r/PrintConfig.cpp:1541
-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 ""
-"Při výměně nástroje se spustí retrakce a filament se zatáhne zpět o zadané "
-"množství (délka se měří na surovém filamentu, než vstoupí do extruderu)."
-
-#: src/libslic3r/PrintConfig.cpp:1550
-msgid "Lift Z"
-msgstr "Zvednout Z"
-
-#: src/libslic3r/PrintConfig.cpp:1551
-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 ""
-"Zadáním kladné hodnoty, se Z rychle přizvedne při každém vyvolání retrakce. "
-"Při použití více extruderů bude použito pouze nastavení pro první extruder."
-
-#: src/libslic3r/PrintConfig.cpp:1559
-msgid "Above Z"
-msgstr "Nad Z"
-
-#: src/libslic3r/PrintConfig.cpp:1560
-msgid "Only lift Z above"
-msgstr "Zvednout Z pouze nad"
-
-#: src/libslic3r/PrintConfig.cpp:1561
-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 ""
-"Zadáním kladné hodnoty se zdvih Z uskute�ní pouze nad zadanou absolutní "
-"hodnotou Z. Toto nastavení můžete zvolit pro přesko�ení přizvednutí u "
-"prvních vrstev."
-
-#: src/libslic3r/PrintConfig.cpp:1569
-msgid "Below Z"
-msgstr "Pod Z"
-
-#: src/libslic3r/PrintConfig.cpp:1570
-msgid "Only lift Z below"
-msgstr "Zvednout Z pouze pod"
-
-#: src/libslic3r/PrintConfig.cpp:1571
-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 ""
-"Zadáním kladné hodnoty se zdvih Z uskute�ní pouze pod zadanou absolutní "
-"hodnotou Z. Toto nastavení můžete zvolit pro přesko�ení přizvednutí u "
-"prvních vrstev."
-
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
-msgid "Extra length on restart"
-msgstr "Extra vzdálenost při návratu"
-
-#: src/libslic3r/PrintConfig.cpp:1581
-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 ""
-"Když je retrakce kompenzována po rychloposunu, extruder vytla�uje toto další "
-"množství filamentu. Toto nastavení je zřídkakdy potřeba."
-
-#: src/libslic3r/PrintConfig.cpp:1590
-msgid ""
-"When the retraction is compensated after changing tool, the extruder will "
-"push this additional amount of filament."
-msgstr ""
-"Když je retrakce kompenzována po změně nástroje, extruder vytla�uje toto "
-"další množství filamentu."
-
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
-msgid "Retraction Speed"
-msgstr "Rychlost retrakce"
-
-#: src/libslic3r/PrintConfig.cpp:1600
-msgid "The speed for retractions (it only applies to the extruder motor)."
-msgstr "Rychlost retrakce (toto nastavení platí pouze pro motor extruderu)."
-
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
-msgid "Deretraction Speed"
-msgstr "Rychlost deretrakce"
-
-#: src/libslic3r/PrintConfig.cpp:1609
-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 ""
-"Rychlost vtla�ení filamentu do extruderu po retrakci (vztahuje se pouze na "
-"motor extruderu). Pokud je ponecháno na nulu, použije se rychlost retrakce."
-
-#: src/libslic3r/PrintConfig.cpp:1617
-msgid "Seam position"
-msgstr "Pozice Å¡vu"
-
-#: src/libslic3r/PrintConfig.cpp:1619
-msgid "Position of perimeters starting points."
-msgstr "Pozice za�átku perimetrů."
-
-#: src/libslic3r/PrintConfig.cpp:1626
-msgid "Random"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1627
-msgid "Nearest"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1628
-msgid "Aligned"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr "Zezadu"
-
-#: src/libslic3r/PrintConfig.cpp:1636
-msgid "Direction"
-msgstr "Směr"
-
-#: src/libslic3r/PrintConfig.cpp:1638
-msgid "Preferred direction of the seam"
-msgstr "Preferovaný směr švu"
-
-#: src/libslic3r/PrintConfig.cpp:1639
-msgid "Seam preferred direction"
-msgstr "Preferovaný směr švu"
-
-#: src/libslic3r/PrintConfig.cpp:1647
-msgid "Jitter"
-msgstr "Rozkmit (Jitter)"
-
-#: src/libslic3r/PrintConfig.cpp:1649
-msgid "Seam preferred direction jitter"
-msgstr "Seam preferred direction jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1650
-msgid "Preferred direction of the seam - jitter"
-msgstr "Preferovaný směr švu - rozkmit"
-
-#: src/libslic3r/PrintConfig.cpp:1661
-msgid "USB/serial port for printer connection."
-msgstr "USB/sériový port pro připojení tiskárny."
-
-#: src/libslic3r/PrintConfig.cpp:1669
-msgid "Serial port speed"
-msgstr "Rychlost sériového portu"
-
-#: src/libslic3r/PrintConfig.cpp:1670
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr "Rychlost (baud) USB/sériového portu pro připojení tiskárny."
-
-#: src/libslic3r/PrintConfig.cpp:1679
-msgid "Distance from object"
-msgstr "Vzdálenost od objektu"
-
-#: src/libslic3r/PrintConfig.cpp:1680
-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 ""
-"Vzdálenost mezi obrysem a objektem (objekty). Nastavte tuto hodnotu na nulu, "
-"pro slou�ení obrysu s předmětem (předměty) a tvorbu límce pro dosažení lepší "
-"přilnavosti."
-
-#: src/libslic3r/PrintConfig.cpp:1688
-msgid "Skirt height"
-msgstr "Výška obrysu"
-
-#: src/libslic3r/PrintConfig.cpp:1689
-msgid ""
-"Height of skirt expressed in layers. Set this to a tall value to use skirt "
-"as a shield against drafts."
-msgstr ""
-"Výška obrysu vyjádřená ve vrstvách. Nastavte tuto hodnotu vysokou, pro "
-"použití obrysu jako stínění proti průvanu."
-
-#: src/libslic3r/PrintConfig.cpp:1697
-msgid "Loops (minimum)"
-msgstr "Smy�ek (minimálně)"
-
-#: src/libslic3r/PrintConfig.cpp:1698
-msgid "Skirt Loops"
-msgstr "Po�et obrysových smy�ek"
-
-#: src/libslic3r/PrintConfig.cpp:1699
-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 ""
-"Po�et obrysových smy�ek. Je-li nastavena možnost Minimální délka extruze, "
-"po�et obrysových smy�ek může být větší než po�et zde nakonfigurovaných. "
-"Nastavte tuto hodnotu na nulu, pro úplné deaktivování."
-
-#: src/libslic3r/PrintConfig.cpp:1708
-msgid "Slow down if layer print time is below"
-msgstr "Zpomalit tisk pokud je doba tisku kratší než"
-
-#: src/libslic3r/PrintConfig.cpp:1709
-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 ""
-"Pokud je doba tisku vrstvy odhadnuta kratší než tento po�et sekund, rychlost "
-"tisku se zpomalí, aby se prodloužila doba tisku této vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:1720
-msgid "Small perimeters"
-msgstr "Malé perimetry"
-
-#: src/libslic3r/PrintConfig.cpp:1722
-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 ""
-"Toto oddělené nastavení ovlivní rychlost perimetrů o poloměru <= 6,5 mm "
-"(obvykle díry). Pokud je vyjádřeno jako procentní podíl (například: 80%), "
-"vypo�te se z výše uvedeného nastavení rychlosti perimetrů. Pro automatické "
-"nastavení zadejte nulu."
-
-#: src/libslic3r/PrintConfig.cpp:1732
-msgid "Solid infill threshold area"
-msgstr "Prahová hodnota plochy pro plnou výplň"
-
-#: src/libslic3r/PrintConfig.cpp:1734
-msgid ""
-"Force solid infill for regions having a smaller area than the specified "
-"threshold."
-msgstr ""
-"Vynucení plné výplně pro oblasti, které mají menší plochu, než je stanovená "
-"prahová hodnota."
-
-#: src/libslic3r/PrintConfig.cpp:1735
-msgid "mm²"
-msgstr "mm²"
-
-#: src/libslic3r/PrintConfig.cpp:1742
-msgid "Solid infill extruder"
-msgstr "Extruder pro plnou výplň"
-
-#: src/libslic3r/PrintConfig.cpp:1744
-msgid "The extruder to use when printing solid infill."
-msgstr "Extruder který bude použit při tisku plných výplní."
-
-#: src/libslic3r/PrintConfig.cpp:1751
-msgid "Solid infill every"
-msgstr "Plná výplň každou"
-
-#: src/libslic3r/PrintConfig.cpp:1753
-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."
-msgstr ""
-"Tato funkce umožňuje vynucení plné vrstvy za každý daný po�et vrstev. Pro "
-"vypnutí nastavte nulu. Můžete nastavit libovolnou hodnotu (například 9999); "
-"Slic3r automaticky zvolí maximální po�et vrstev, které se budou kombinovat "
-"podle průměru trysky a výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:1766
-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."
-msgstr ""
-"Zadejte kladnou hodnotu, chcete-li nastavit manuálně šířku extruze pro výplň "
-"plných povrchů. Pokud je ponechána nula, použije se standardní šířka "
-"extruze, pokud je nastavena, jinak se použije průměr trysky 1,125 x. Pokud "
-"je vyjádřena procenty (například 90%), bude vypo�tena z výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:1777
-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 ""
-"Rychlost tisku plných oblastí (vrchní / spodní / vnitřní vodorovné stěny). "
-"Může být vyjádřeno procenty (například: 80%) oproti výchozí rychlosti "
-"vyplnění. Pro automatické nastavení zadejte nulu."
-
-#: src/libslic3r/PrintConfig.cpp:1789
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr "Po�et plných vstev generovaných na vrchních a spodních površích."
-
-#: src/libslic3r/PrintConfig.cpp:1796
-msgid "Spiral vase"
-msgstr "Spirálová váza"
-
-#: src/libslic3r/PrintConfig.cpp:1797
-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 ""
-"Tato funkce zvýší postupně Z při tisku jednovrstvého objektu, aby se "
-"odstranil jakýkoli viditelný šev. Tato volba vyžaduje jediný obvod, žádnou "
-"výplň, žádné vrchní plné vrstvy a žádný podpůrný materiál. Můžete stále "
-"nastavit libovolný po�et spodních plných vrstev, stejně jako obrysové "
-"smy�ky / límec. Při tisku více než jednoho objektu nebude toto nastavení "
-"fungovat."
-
-#: src/libslic3r/PrintConfig.cpp:1806
-msgid "Temperature variation"
-msgstr "Temperature variation"
-
-#: src/libslic3r/PrintConfig.cpp:1807
-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 ""
-"Teplotní rozdíl, který se použije v případě, že extruder není aktivní. "
-"Umožňuje “obětní� obrysy v plné výšce objektu, na kterém jsou trysky "
-"periodicky o�ištěny."
-
-#: src/libslic3r/PrintConfig.cpp:1818
-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 ""
-"Tento spouštěcí postup je vložen na za�átku, poté, co vyhřívaná tisková "
-"podložka dosáhla cílové teploty a extruder se právě za�al ohřívat a předtím, "
-"než dosáhl cílové teploty extruder . Pokud Slic3r detekuje M104 nebo M190 ve "
-"vašich vlastních kódech, takové příkazy nebudou automaticky předkládány, "
-"takže máte možnost upravit pořadí příkazů pro vytápění a další vlastní akce. "
-"Pro všechny nastavení Slic3ru můžete použít zástupné proměnné, takže můžete "
-"zadat příkaz “M109 S [first_layer_temperature]� kdekoli chcete."
-
-#: src/libslic3r/PrintConfig.cpp:1834
-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 ""
-"Tento postup spuštění je vložen na za�átku, po každém spuštění G-code "
-"tiskárny. Toto slouží k přepsání nastavení pro konkrétní filament. Pokud "
-"Slic3r detekuje M104, M109, M140 nebo M190 ve vašich vlastních kódech, "
-"takové příkazy nebudou automaticky předkládány, takže máte možnost "
-"přizpůsobit pořadí příkazů k ohřevu a další vlastní akce. Pro všechny "
-"nastavení Slic3ru můžete použít zástupné proměnné, takže můžete zadat příkaz "
-"“M109 S [first_layer_temperature]� kdekoli chcete. Pokud máte více "
-"extruderů, G-code se zpracovává v pořadí extruderů."
-
-#: src/libslic3r/PrintConfig.cpp:1850
-msgid "Single Extruder Multi Material"
-msgstr "MultiMaterial tisk s jedním extrudérem"
-
-#: src/libslic3r/PrintConfig.cpp:1851
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr "Tiskárna přepíná několik filamentů v jednou hot endu."
-
-#: src/libslic3r/PrintConfig.cpp:1857
-msgid "Prime all printing extruders"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1858
-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:1864
-msgid "Generate support material"
-msgstr "Generovat podpory"
-
-#: src/libslic3r/PrintConfig.cpp:1866
-msgid "Enable support material generation."
-msgstr "Zapne generování podpor."
-
-#: src/libslic3r/PrintConfig.cpp:1871
-msgid "Auto generated supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1873
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1880
-msgid "XY separation between an object and its support"
-msgstr "XY vzdálenost mezi objektem a podporami"
-
-#: src/libslic3r/PrintConfig.cpp:1882
-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 ""
-"XY vzdálenost mezi objektem a podporami. Pokud je vyjádřeno procenty "
-"(například 50%), bude vypo�ítána z šířky perimetru."
-
-#: src/libslic3r/PrintConfig.cpp:1893
-msgid "Pattern angle"
-msgstr "Úhel vzoru"
-
-#: src/libslic3r/PrintConfig.cpp:1895
-msgid ""
-"Use this setting to rotate the support material pattern on the horizontal "
-"plane."
-msgstr "Toto nastavení použijte pro horizontální oto�ení vzoru."
-
-#: src/libslic3r/PrintConfig.cpp:1906
-msgid ""
-"Only create support if it lies on a build plate. Don't create support on a "
-"print."
-msgstr ""
-"Podpory vytvářet pouze v případě, že leží na tiskové podložce. Nevytváří "
-"podpory na výtisky."
-
-#: src/libslic3r/PrintConfig.cpp:1913
-msgid "Contact Z distance"
-msgstr "Mezera mezi podporami a objektem v ose Z"
-
-#: src/libslic3r/PrintConfig.cpp:1915
-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 ""
-"Vertikální vzdálenost mezi objektem a podporami. Nastavením tohoto parametru "
-"na hodnotu 0 se také zabrání tomu, aby Slic3r použil parametry průtoku a "
-"rychlosti pro mosty při tisku první vrstvy objektu."
-
-#: src/libslic3r/PrintConfig.cpp:1923
-msgid "soluble"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1924
-msgid "detachable"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1929
-msgid "Enforce support for the first"
-msgstr "Zesílit podpory pro prvních"
-
-#: src/libslic3r/PrintConfig.cpp:1931
-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 ""
-"Vygeneruje podpory pro zadaný po�et vrstev po�ítaných od spodního okraje, "
-"bez ohledu na to, zda jsou povoleny standartní podpory nebo nikoliv a bez "
-"ohledu na jakýkoli prah úhlu. To je užite�né pro získání větší přilnavosti "
-"předmětů s velmi tenkou nebo špatnou stopou na tiskové podložce."
-
-#: src/libslic3r/PrintConfig.cpp:1937
-msgid "Enforce support for the first n layers"
-msgstr "Vynucení podpor pro prvních n vrstev"
-
-#: src/libslic3r/PrintConfig.cpp:1943
-msgid "Support material/raft/skirt extruder"
-msgstr "Extruder pro podpory/raft/obrys"
-
-#: src/libslic3r/PrintConfig.cpp:1945
-msgid ""
-"The extruder to use when printing support material, raft and skirt (1+, 0 to "
-"use the current extruder to minimize tool changes)."
-msgstr ""
-"Extruder, který se používá při tisku podpor, raftu a obrysu (1+, 0 pro "
-"použití aktuálního extruderu pro co nejméně změn nástroje)."
-
-#: src/libslic3r/PrintConfig.cpp:1955
-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."
-msgstr ""
-"Zadejte kladnou hodnotu, chcete-li nastavit manuálně šířku extruze pro "
-"podpory. Pokud je ponechána nula, použije se výchozí šířka extruze, pokud je "
-"nastavena, jinak se použije průměr trysky. Pokud je vyjádřena procenty "
-"(například 90%), bude vypo�tena z výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:1964
-msgid "Interface loops"
-msgstr "Kontaktní smy�ky"
-
-#: src/libslic3r/PrintConfig.cpp:1966
-msgid ""
-"Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr ""
-"Zakrýt smy�kami horní kontaktní vrstvu podpor. Ve výchozím nastavení "
-"zakázáno."
-
-#: src/libslic3r/PrintConfig.cpp:1972
-msgid "Support material/raft interface extruder"
-msgstr "Extruder pro kontaktní podpory/raft"
-
-#: src/libslic3r/PrintConfig.cpp:1974
-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 ""
-"Extruder, který se použije při tisku kontaktních vrstev podpor (1+, 0 pro "
-"použití aktuálního extruderu, aby se minimalizovaly změny nástroje). To "
-"ovlivňuje i raft."
-
-#: src/libslic3r/PrintConfig.cpp:1982
-msgid "Interface layers"
-msgstr "Kontaktní vrstvy"
-
-#: src/libslic3r/PrintConfig.cpp:1984
-msgid ""
-"Number of interface layers to insert between the object(s) and support "
-"material."
-msgstr "Po�et interface vrstev vložených mezi objekt (objekty) a podpory."
-
-#: src/libslic3r/PrintConfig.cpp:1992
-msgid "Interface pattern spacing"
-msgstr "Rozte� kontaktních vrstev"
-
-#: src/libslic3r/PrintConfig.cpp:1994
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr ""
-"Rozte� linií kontaktních vrstev. Nastavte nulu pro získání plných "
-"kontaktních vrstev."
-
-#: src/libslic3r/PrintConfig.cpp:2004
-msgid ""
-"Speed for printing support material interface layers. If expressed as "
-"percentage (for example 50%) it will be calculated over support material "
-"speed."
-msgstr ""
-"Rychlost tisku podpůrných interface vrstev. Pokud je vyjádřen procentní "
-"podíl (například 50%), vypo�ítá se podle rychlosti tisku podpor."
-
-#: src/libslic3r/PrintConfig.cpp:2013
-msgid "Pattern"
-msgstr "Vzor"
-
-#: src/libslic3r/PrintConfig.cpp:2015
-msgid "Pattern used to generate support material."
-msgstr "Vzor použitý pro generování podpor."
-
-#: src/libslic3r/PrintConfig.cpp:2022
-msgid "Rectilinear grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2028
-msgid "Pattern spacing"
-msgstr "Rozte� podpor"
-
-#: src/libslic3r/PrintConfig.cpp:2030
-msgid "Spacing between support material lines."
-msgstr "Rozte� linií podpor."
-
-#: src/libslic3r/PrintConfig.cpp:2040
-msgid "Speed for printing support material."
-msgstr "Rychlost tisku podpor."
-
-#: src/libslic3r/PrintConfig.cpp:2047
-msgid "Synchronize with object layers"
-msgstr "Synchronizovat s vrstvami objektu"
-
-#: src/libslic3r/PrintConfig.cpp:2049
-msgid ""
-"Synchronize support layers with the object print layers. This is useful with "
-"multi-material printers, where the extruder switch is expensive."
-msgstr ""
-"Synchronizování vrstev podpor s vrstvami objektu. Toto je velmi užite�né u "
-"multi-materiálových tiskáren, kde je přepínání extruderů drahé."
-
-#: src/libslic3r/PrintConfig.cpp:2056
-msgid "Overhang threshold"
-msgstr "Mezní úhel převisu"
-
-#: src/libslic3r/PrintConfig.cpp:2058
-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 ""
-"Podpory nebudou vytvořeny pro převisy, jejichž úhel sklonu (90° = "
-"vertikální) je nad danou prahovou hodnotou. Jinými slovy, tato hodnota "
-"představuje největší horizontální sklon (měřený od horizontální roviny), "
-"který můžete tisknout bez podpůrného materiálu. Nastavte na nulu pro "
-"automatickou detekci (doporu�eno)."
-
-#: src/libslic3r/PrintConfig.cpp:2071
-msgid "With sheath around the support"
-msgstr "S pouzdrem okolo podpor"
-
-#: src/libslic3r/PrintConfig.cpp:2073
-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 ""
-"Přidá pouzdro (jednu obvodovou �áru) kolem podpor. Díky tomu je podpora "
-"spolehlivější, ale také obtížnější na odstranění."
-
-#: src/libslic3r/PrintConfig.cpp:2081
-msgid ""
-"Extruder temperature for layers after the first one. Set this to zero to "
-"disable temperature control commands in the output."
-msgstr ""
-"Teplota extruderu pro následující vrstvy po vrstvě první. Nastavte tuto "
-"hodnotu na nulu, abyste zakázali příkazy pro řízení teploty na výstupu."
-
-#: src/libslic3r/PrintConfig.cpp:2084
-msgid "Temperature"
-msgstr "Teplota"
-
-#: src/libslic3r/PrintConfig.cpp:2090
-msgid "Detect thin walls"
-msgstr "Detekovat tenké zdi"
-
-#: src/libslic3r/PrintConfig.cpp:2092
-msgid ""
-"Detect single-width walls (parts where two extrusions don't fit and we need "
-"to collapse them into a single trace)."
-msgstr ""
-"Detekuje stěny o tlošťce jedné �áry (�ásti, kam se dvě �áry nemohou vejít a "
-"je potřeba slou�it je do �áry jedné)."
-
-#: src/libslic3r/PrintConfig.cpp:2099
-msgid "Threads"
-msgstr "Vlákna"
-
-#: src/libslic3r/PrintConfig.cpp:2100
-msgid ""
-"Threads are used to parallelize long-running tasks. Optimal threads number "
-"is slightly above the number of available cores/processors."
-msgstr ""
-"Vlákna jsou používána pro paralelizaci �asově náro�nějších úloh. Optimální "
-"po�et vláken je mírně nad po�tem dostupných jader/procesorů."
-
-#: src/libslic3r/PrintConfig.cpp:2112
-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 ""
-"Tento vlastní kód je vložen těsně před každou změnou extruderu. Můžete "
-"použít zástupné proměnné pro všechna nastavení Slic3ru, stejně jako "
-"[previous_extruder] a [next_extruder]."
-
-#: src/libslic3r/PrintConfig.cpp:2125
-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."
-msgstr ""
-"Zadejte kladnou hodnotu, chcete-li nastavit manuálně šířku extruze pro výplň "
-"vrchních ploch. Možná budete chtít použít ten�í extruzi, abyste vyplnili "
-"všechny úzké oblasti a získali hladší povrch. Pokud je ponechána nula, "
-"použije se výchozí šířka extruze, pokud je nastavena, jinak se použije "
-"průměr trysky. Pokud je vyjádřena procenty (například 90%), bude vypo�tena z "
-"výšky vrstvy."
-
-#: src/libslic3r/PrintConfig.cpp:2137
-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."
-msgstr ""
-"Rychlost tisku vrchních plných vrstev (vztahuje se pouze na nejvyšší horní "
-"vrstvy a nikoli na jejich vnitřní plné vrstvy). Rychlost lze zpomalit, "
-"abyste získali hez�í povrchovou úpravu. Může být vyjádřena procenty "
-"(například: 80%) z rychlosti plné výplně materiálu výše. Pro automatické "
-"nastavení zadejte nulu."
-
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "Horních"
-
-#: src/libslic3r/PrintConfig.cpp:2151
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "Po�et vrchních generovaných plných vrstev."
-
-#: src/libslic3r/PrintConfig.cpp:2153
-msgid "Top solid layers"
-msgstr "Vrchních plných vrstev"
-
-#: src/libslic3r/PrintConfig.cpp:2159
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr "Rychlost posunů (přejezdy mezi body extruze)."
-
-#: src/libslic3r/PrintConfig.cpp:2168
-msgid "Use firmware retraction"
-msgstr "Použít retrakce z firmwaru"
-
-#: src/libslic3r/PrintConfig.cpp:2169
-msgid ""
-"This experimental setting uses G10 and G11 commands to have the firmware "
-"handle the retraction. This is only supported in recent Marlin."
-msgstr ""
-"Toto experimentální nastavení používá příkazy G10 a G11, aby si firmware "
-"poradil s retrakcí. Toto je podporováno pouze v posledních verzích firmwaru "
-"Marlin."
-
-#: src/libslic3r/PrintConfig.cpp:2176
-msgid "Use relative E distances"
-msgstr "Použít relativní E vzdálenosti"
-
-#: src/libslic3r/PrintConfig.cpp:2177
-msgid ""
-"If your firmware requires relative E values, check this, otherwise leave it "
-"unchecked. Most firmwares use absolute values."
-msgstr ""
-"Pokud váš firmware vyžaduje relativní hodnoty E, zaškrtněte toto, jinak "
-"nechte nezaškrtnuté. Většina firmwarů používá absolutní hodnoty."
-
-#: src/libslic3r/PrintConfig.cpp:2184
-msgid "Use volumetric E"
-msgstr "Použít volumetrickou hodnotu E"
-
-#: src/libslic3r/PrintConfig.cpp:2185
-msgid ""
-"This experimental setting uses outputs the E values in cubic millimeters "
-"instead of linear millimeters. If your firmware doesn't already know "
-"filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] "
-"T0' in your start G-code in order to turn volumetric mode on and use the "
-"filament diameter associated to the filament selected in Slic3r. This is "
-"only supported in recent Marlin."
-msgstr ""
-"Toto experimentální nastavení používá výstupní hodnoty E v kubických "
-"milimetrech místo lineárních milimetrů. Pokud firmware dosud nezná průměr "
-"(průměry) filamentu, můžete v po�áte�ním G-code zadat příkazy jako “M200 D "
-"[filament_diameter_0] T0�, pro se zapnutí volumetrického režimu a použití "
-"průměru filamentu přidruženého k vybranému filamentu ve Slic3ru. Toto je "
-"podporováno pouze v posledních verzích firmwaru Marlin."
-
-#: src/libslic3r/PrintConfig.cpp:2196
-msgid "Enable variable layer height feature"
-msgstr "Zapnout variabilní výšku vrstev"
-
-#: src/libslic3r/PrintConfig.cpp:2197
-msgid ""
-"Some printers or printer setups may have difficulties printing with a "
-"variable layer height. Enabled by default."
-msgstr ""
-"Některé tiskárny nebo nastavení tiskárny mohou mít potíže s tiskem s "
-"proměnnou výškou vrstvy. Ve výchozím nastavení je zapnuto."
-
-#: src/libslic3r/PrintConfig.cpp:2204
-msgid "Wipe while retracting"
-msgstr "O�istit při retrakci"
-
-#: src/libslic3r/PrintConfig.cpp:2205
-msgid ""
-"This flag will move the nozzle while retracting to minimize the possible "
-"blob on leaky extruders."
-msgstr ""
-"Toto nastavení přemístí trysku při retrakci, aby se minimalizovalo možné "
-"vytékání materiálu."
-
-#: src/libslic3r/PrintConfig.cpp:2213
-msgid ""
-"Multi material printers may need to prime or purge extruders on tool "
-"changes. Extrude the excess material into the wipe tower."
-msgstr ""
-"Multimateriálové tiskárny mohou potřebovat, aby při výměně nástrojů "
-"vy�istili extrudery. Vytla�í přebyte�ný materiál do �istící věže."
-
-#: src/libslic3r/PrintConfig.cpp:2220
-msgid "Purging volumes - load/unload volumes"
-msgstr "Objemy �ištění - zaváděné / vyjmuté objemy"
-
-#: src/libslic3r/PrintConfig.cpp:2221
-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 ""
-"Tento vektor ukládá potřebné objemy pro změnu z/na každý extruder používaný "
-"na �istící veži. Tyto hodnoty jsou použity pro zjednodušení vytvoření "
-"celkových objemů �ištění níže. "
-
-#: src/libslic3r/PrintConfig.cpp:2228
-msgid "Purging volumes - matrix"
-msgstr "Objemy �ištění - matice"
-
-#: src/libslic3r/PrintConfig.cpp:2229
-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 ""
-"Tato matice popisuje objemy (v kubických milimetrech) nutné k vy�ištění "
-"nového filamentu na �istící věži pro danou dvojici nástrojů. "
-
-#: src/libslic3r/PrintConfig.cpp:2239
-msgid "Position X"
-msgstr "Pozice X"
-
-#: src/libslic3r/PrintConfig.cpp:2240
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr "X souřadnice levého předního rohu �istící věže"
-
-#: src/libslic3r/PrintConfig.cpp:2247
-msgid "Position Y"
-msgstr "Pozice Y"
-
-#: src/libslic3r/PrintConfig.cpp:2248
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr "Y souřadnice levého předního rohu �istící věže"
-
-#: src/libslic3r/PrintConfig.cpp:2256
-msgid "Width of a wipe tower"
-msgstr "Šířka �istící věže"
-
-#: src/libslic3r/PrintConfig.cpp:2263
-msgid "Wipe tower rotation angle"
-msgstr "Úhel nato�ení �istící věže"
-
-#: src/libslic3r/PrintConfig.cpp:2264
-msgid "Wipe tower rotation angle with respect to x-axis "
-msgstr "Úhel nato�ení �istící věže s ohledem na osu X "
-
-#: src/libslic3r/PrintConfig.cpp:2265
-msgid "degrees"
-msgstr "stupňů"
-
-#: src/libslic3r/PrintConfig.cpp:2272
-msgid "Wipe into this object's infill"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2273
-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:2281
-msgid "Wipe into this object"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2282
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2289
-msgid "Maximal bridging distance"
-msgstr "Maximální vzdálenost přemostění"
-
-#: src/libslic3r/PrintConfig.cpp:2290
-msgid "Maximal distance between supports on sparse infill sections. "
-msgstr "Maximální vzdálenost mezi podporami u �ástí s řídkou výplní. "
-
-#: src/libslic3r/PrintConfig.cpp:2297
-msgid "XY Size Compensation"
-msgstr "Kompenzace XY rozměrů"
-
-#: src/libslic3r/PrintConfig.cpp:2299
-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 ""
-"Objekt bude roztažen / smrštěn v rovině XY nastavenou hodnotou (negativní = "
-"směrem dovnitř, pozitivní = směrem ven). To může být užite�né pro jemné "
-"doladění otvorů."
-
-#: src/libslic3r/PrintConfig.cpp:2308
-msgid "Z offset"
-msgstr "Odsazení Z"
-
-#: src/libslic3r/PrintConfig.cpp:2309
-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)."
-msgstr ""
-"Tato hodnota bude přidána (nebo ode�tena) ze všech souřadnic Z ve výstupním "
-"G-code. Používá se ke kompenzování špatné pozice endstopu Z. Například pokud "
-"endstop 0 skute�ně ponechá trysku 0,3 mm daleko od tiskové podložky, "
-"nastavte hodnotu -0,3 (nebo dola�te svůj koncový doraz)."
-
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
-msgid "Display width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2374
-msgid "Width of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2380
-msgid "Display height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2381
-msgid "Height of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2387
-msgid "Number of pixels in"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2389
-msgid "Number of pixels in X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2396
-msgid "Number of pixels in Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2402
-msgid "Display orientation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2403
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2410
-msgid "Landscape"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2411
-msgid "Portrait"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
-msgid "Printer scaling correction"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
-msgid "Initial layer height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
-msgid "Initial exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
-msgid "SLA print material notes"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2459
-msgid "You can put your notes regarding the SLA print material here."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
-msgid "Default SLA material profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2487
-msgid "Generate supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2489
-msgid "Generate supports for the models"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2494
-msgid "Support head front diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2496
-msgid "Diameter of the pointing side of the head"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2503
-msgid "Support head penetration"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2505
-msgid "How much the pinhead has to penetrate the model surface"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2512
-msgid "Support head width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2514
-msgid "Width from the back sphere center to the front sphere center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2521
-msgid "Support pillar diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2523
-msgid "Diameter in mm of the support pillars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2530
-msgid "Support pillar connection mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2531
-msgid ""
-"Controls the bridge type between two neigboring 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:2540
-msgid "Zig-Zag"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2541
-msgid "Cross"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2542
-msgid "Dynamic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2546
-msgid "Pillar widening factor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2548
-msgid ""
-"Merging bridges or pillars into another pillars can increase the radius. "
-"Zero means no increase, one means full increase."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2557
-msgid "Support base diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2559
-msgid "Diameter in mm of the pillar base"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2566
-msgid "Support base height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2568
-msgid "The height of the pillar base cone"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2575
-msgid "Critical angle"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2577
-msgid "The default angle for connecting support sticks and junctions."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2584
-msgid "Max bridge length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2586
-msgid "The max length of a bridge"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2593
-msgid "Object elevation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2595
-msgid "How much the supports should lift up the supported object."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
-msgid "Use pad"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2631
-msgid "Add a pad underneath the supported model"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2636
-msgid "Pad wall thickness"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2645
-msgid "Pad wall height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2654
-msgid "Max merge distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2663
-msgid "Pad edge radius"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3023
-msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:176
-msgid "Mixed"
-msgstr "Smíšený"
+#: src/slic3r/GUI/GUI_Preview.cpp:213 src/libslic3r/PrintConfig.cpp:468
+msgid "Height"
+msgstr "Výška"
 
 #: src/libslic3r/GCode/PreviewData.cpp:396
 msgid "Height (mm)"
 msgstr "Výška (mm)"
 
-#: src/libslic3r/GCode/PreviewData.cpp:398
-msgid "Width (mm)"
-msgstr "Šířka (mm)"
+#: src/libslic3r/PrintConfig.cpp:1618
+msgid "Height of skirt expressed in layers. Set this to a tall value to use skirt as a shield against drafts."
+msgstr "Výška obrysu vyjádřená ve vrstvách. Nastavte tuto hodnotu vysokou, pro použití obrysu jako stínění proti průvanu."
+
+#: src/libslic3r/PrintConfig.cpp:2209
+msgid "Height of the display"
+msgstr "Výška displeje"
+
+#: src/libslic3r/PrintConfig.cpp:225
+msgid "Heights at which a filament change is to occur. "
+msgstr "Výšky, při kterých má dojít ke změně filamentu."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:300
+#, possible-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 "Zdravím, vítejte v %s! Tento %s vám pomůže se základní konfigurací; jen několik nastavení a budete připraveni k tisku."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:290
+#, possible-c-format
+msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
+msgstr "Zdravím, vítejte ve Slic3r Prusa Edition! Tento %s vám pomůže se základní konfigurací; jen několik nastavení a budete připraveni k tisku."
+
+#: src/libslic3r/PrintConfig.cpp:2976
+msgid "Help"
+msgstr "Nápověda"
+
+#: src/libslic3r/PrintConfig.cpp:2982
+msgid "Help (FFF options)"
+msgstr "Nápověda (pro FFF)"
+
+#: src/libslic3r/PrintConfig.cpp:2987
+msgid "Help (SLA options)"
+msgstr "Nápověda (pro SLA)"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:225
+msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
+msgstr "Zde můžete upravit požadovaný objem �ištění (mm³) pro kteroukoliv dvojici extruderů."
+
+#: src/libslic3r/PrintConfig.cpp:925
+msgid "High extruder current on filament swap"
+msgstr "Zvýšený proud do extruderového motoru při výměně filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:400 src/libslic3r/PrintConfig.cpp:806
+msgid "Hilbert Curve"
+msgstr "Hilbertova křivka"
+
+#: src/slic3r/GUI/Plater.cpp:873
+msgid "Hold Shift to Slice & Export G-code"
+msgstr "Stiskni Shift pro Slicování & Export G-codu"
+
+#: src/libslic3r/PrintConfig.cpp:803 src/libslic3r/PrintConfig.cpp:1924
+msgid "Honeycomb"
+msgstr "Plástev"
+
+#: src/slic3r/GUI/Tab.cpp:1013
+msgid "Horizontal shells"
+msgstr "Vodorovné stěny"
+
+#: src/libslic3r/PrintConfig.cpp:209
+msgid "Horizontal width of the brim that will be printed around each object on the first layer."
+msgstr "Šírka límce který bude vytištěn v první vrstvě okolo každého objektu."
+
+#: src/libslic3r/PrintConfig.cpp:1267
+msgid "Host Type"
+msgstr "Typ tiskového serveru"
+
+#: src/slic3r/GUI/BonjourDialog.cpp:73
+msgid "Hostname"
+msgstr "Název serveru"
+
+#: src/libslic3r/PrintConfig.cpp:81
+msgid "Hostname, IP or URL"
+msgstr "Název serveru, IP nebo URL"
+
+#: src/slic3r/GUI/Tab.cpp:136
+msgid "Hover the cursor over buttons to find more information \nor click this button."
+msgstr "Pro více informací přeje�te kurzorem nad tla�ítky\nnebo na tla�ítko klikněte."
+
+#: src/libslic3r/PrintConfig.cpp:2380
+msgid "How much the pinhead has to penetrate the model surface"
+msgstr "Jak moc hrot podpěry pronikne do povrchu modelu"
+
+#: src/libslic3r/PrintConfig.cpp:2491
+msgid "How much the supports should lift up the supported object."
+msgstr "O jakou vzdálenost mají podpěry zvednout objekt."
+
+#: src/libslic3r/PrintConfig.cpp:95
+msgid "HTTPS CA File"
+msgstr "Soubor HTTPS CA"
+
+#: src/slic3r/GUI/Tab.cpp:1731
+msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
+msgstr "Soubor HTTPS CA je volitelný. Je nutný pouze pokud použijte HTTPS certifikát s vlastním podpisem."
+
+#: src/slic3r/GUI/Tab.cpp:1773
+#, possible-c-format
+msgid "HTTPS CA File:\n    \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n    \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Soubor HTTPS CA:\nV tomto systému používá %s certifikáty HTTPS ze systému Certificate Store nebo Keychain. Chcete-li použít vlastní soubor CA, importujte soubor CA do Certificate Store / Keychain."
+
+#: src/slic3r/GUI/Tab.cpp:1725
+msgid "HTTPS CA File:\n\tOn this system, Slic3r uses HTTPS certificates from the system Certificate Store or Keychain.\n\tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
+msgstr "Soubor HTTPS CA:\nV tomto systému používá Slic3r certifikáty HTTPS ze systému Certificate Store nebo Keychain. Chcete-li použít vlastní soubor CA, importujte soubor CA do Certificate Store / Keychain."
+
+#: src/libslic3r/PrintConfig.cpp:1787
+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 "Pokud je zaškrtnuto, budou podpěry generovány automaticky na základě prahové hodnoty převisu. Pokud není zaškrtnuto, bude podpěra generována pouze v místech, kde je umístěn objekt pro \"Vynucení podpěr\"."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:413
+#, possible-c-format
+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."
+msgstr "Pokud je povoleno, kontroluje %s nově dostupné verze. V případě, že je nová verze k dispozici, zobrazí se notifikace při dalším startu programu (nikdy během užívání aplikace). Tento systém slouží pouze pro upozornění uživatele, nedochází k automatické instalaci."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:423
+#, possible-c-format
+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."
+msgstr "Pokud je povoleno, stáhne %s na pozadí aktualizace vestavěných systémových přednastavení. Tyto aktualizace jsou staženy do do�asného umístění. Pokud je k dispozici nové přednastavení, zobrazí se upozornění při startu programu."
+
+#: src/libslic3r/PrintConfig.cpp:1774
+msgid "If enabled, all printing extruders will be primed at the front edge of the print bed at the start of the print."
+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."
+
+#: src/slic3r/GUI/Preferences.cpp:63
+msgid "If enabled, Slic3r checks for new versions of "
+msgstr "Pokud je povoleno, Slic3r kontroluje dostupnost nové verze"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:401 src/slic3r/GUI/Preferences.cpp:61
+msgid "If enabled, Slic3r checks for new versions of Slic3r PE 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 "Pokud je povoleno, kontroluje Slic3r nově dostupné verze Slic3r PE. V případě, že je nová verze k dispozici, zobrazí se notifikace při dalším startu programu (nikdy během užívání aplikace). Tento systém slouží pouze pro upozornění uživatele, nedochází k automatické instalaci."
+
+#: src/slic3r/GUI/Preferences.cpp:71
+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 "Pokud je povoleno, stáhne Slic3r na pozadí aktualizace vestavěných systémových přednastavení. Tyto aktualizace jsou staženy do do�asného umístění. Pokud je k dispozici nové přednastavení, zobrazí se upozornění při startu programu."
+
+#: src/slic3r/GUI/Preferences.cpp:105
+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 "Pokud je tato volba povolena, bude 3D scéna vykreslena v rozlišení Retina. Pokud dochází k potížím s výkonem, zkuste tuto volbu vypnout."
+
+#: src/slic3r/GUI/PresetHints.cpp:28
+#, possible-c-format
+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 "Pokud je odhadovaný �as vrstvy nižší než ~% ds, bude ventilátor pracovat na %d%% a rychlost tisku bude snížena tak, aby na tuto vrstvu nebylo použito méně než %ds (rychlost však nikdy nebude snížena pod %dmm/s)."
+
+#: src/libslic3r/PrintConfig.cpp:853
+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 "Pokud je vyjádřena jako absolutní hodnota v mm / s, bude tato rychlost použita pro všechny pohyby tisku první vrstvy bez ohledu na jejich typ. Pokud je hodnota vyjádřena procenty (například: 40%), změní v závislosti na výchozích rychlostech."
+
+#: src/libslic3r/PrintConfig.cpp:540
+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 "Pokud je doba tisku vrstvy odhadnuta jako kratší než tato nastavená hodnota ve vteřinách, ventilátor bude aktivován a jeho rychlost bude vypo�tena interpolací minimální a maximální rychlosti."
+
+#: src/libslic3r/PrintConfig.cpp:1636
+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 "Pokud je doba tisku vrstvy odhadnuta kratší než tento po�et sekund, rychlost tisku se zpomalí, aby se prodloužila doba tisku této vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:534
+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 "Pokud je tato funkce zapnutá, ventilátor nebude nikdy vypnut a bude udržován v chodu alespoň rychlostí která je nastavena jako minimální rychlost. Užite�né pro PLA, škodlivé pro ABS."
+
+#: src/slic3r/GUI/Preferences.cpp:46
+msgid "If this is enabled, Slic3r will auto-center objects around the print bed center."
+msgstr "Pokud je tato možnost povolena, Slic3r bude automaticky centrovat objekty kolem středu tiskové plochy."
+
+#: src/slic3r/GUI/Preferences.cpp:54
+msgid "If this is enabled, Slic3r will pre-process objects as soon as they're loaded in order to save time when exporting G-code."
+msgstr "Pokud je tato možnost povolena, Slic3r předprojektuje objekty, jakmile budou na�teny, aby šetřil �as při exportu G-code."
+
+#: src/slic3r/GUI/Preferences.cpp:38
+msgid "If this is enabled, Slic3r will prompt the last output directory instead of the one containing the input files."
+msgstr "Pokud je tato volba povolena, Slic3r vyvolá poslední výstupní adresář namísto toho, který obsahuje vstupní soubory."
+
+#: src/slic3r/GUI/Preferences.cpp:95
+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 "Pokud máte problémy s vykreslováním způsobené chybným ovlada�em OpenGL 2.0, můžete se pokusit zaškrtnout toto polí�ko. Tím se vypnou úpravy výšky hladiny a vyhlazení, takže je lepší upgradovat grafický ovlada�."
+
+#: src/libslic3r/PrintConfig.cpp:1492
+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 "Zadáním kladné hodnoty, se Z rychle přizvedne při každém vyvolání retrakce. Při použití více extruderů bude použito pouze nastavení pro první extruder."
+
+#: src/libslic3r/PrintConfig.cpp:1501
+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 "Zadáním kladné hodnoty se zdvih Z uskute�ní pouze nad zadanou absolutní hodnotou Z. Toto nastavení můžete zvolit pro přesko�ení přizvednutí u prvních vrstev."
+
+#: src/libslic3r/PrintConfig.cpp:1510
+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 "Zadáním kladné hodnoty se zdvih Z uskute�ní pouze pod zadanou absolutní hodnotou Z. Toto nastavení můžete zvolit pro přesko�ení přizvednutí u prvních vrstev."
+
+#: src/libslic3r/PrintConfig.cpp:1384
+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."
+msgstr "Pokud chcete zpracovat výstupní G-code pomocí vlastních skriptů, sta�í zde uvést jejich absolutní cesty. Oddělte více skriptů středníkem. Skripty předají absolutní cestu k souboru G-code jako první argument a mohou přistupovat k nastavení konfigurace Slic3ru �tením proměnných prostředí."
+
+#: src/libslic3r/PrintConfig.cpp:498
+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)."
+msgstr "Pokud firmware nezpracovává umístění extruderu správně, potřebujete aby to vzal G-code v úvahu. Toto nastavení umožňuje ur�it odsazení každého extruderu vzhledem k prvnímu. O�ekávají se pozitivní souřadnice (budou ode�teny od souřadnice XY)."
+
+#: src/libslic3r/PrintConfig.cpp:2068
+msgid "If your firmware requires relative E values, check this, otherwise leave it unchecked. Most firmwares use absolute values."
+msgstr "Pokud váš firmware vyžaduje relativní hodnoty E, zaškrtněte toto, jinak nechte nezaškrtnuté. Většina firmwarů používá absolutní hodnoty."
+
+#: src/libslic3r/PrintConfig.cpp:3096
+msgid "Ignore non-existent config files"
+msgstr "Ignorovat neexistující konfigura�ní soubory"
+
+#: src/slic3r/GUI/MainFrame.cpp:352
+msgid "Import &Config"
+msgstr "Importovat Konfigura&ci"
+
+#: src/slic3r/GUI/MainFrame.cpp:357
+msgid "Import Config &Bundle"
+msgstr "Importovat Konfigura�ní &Balík"
+
+#: src/slic3r/GUI/MainFrame.cpp:354
+msgid "Import Config from &project"
+msgstr "Na�íst konfiguraci z &projektu"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:383
+msgid "Import of the repaired 3mf file failed"
+msgstr "Import opraveného 3MF souboru selhal"
+
+#: src/slic3r/GUI/MainFrame.cpp:349
+msgid "Import STL/OBJ/AM&F/3MF"
+msgstr "Importovat STL/OBJ/AM&F/3MF"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
+msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
+msgstr "Nahrát soubor STL/OBJ/AMF/3MF bez konfigurace (zachová stávající tiskovou plochu)"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2416
+#, possible-c-format
+msgid "In this mode you can select only other %s Items%s"
+msgstr "V tomto režimu můžete vybrat pouze jinou/jiný %s %s"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:132
+msgid "Incompatible bundles:"
+msgstr "Nekompatibilní balíky:"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:70
+#, possible-c-format
+msgid "Incompatible with this %s"
+msgstr "Nekompatibilní s tímto %s"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69
+msgid "Incompatible with this Slic3r"
+msgstr "Nekompatibilní s tímto Slic3rem"
+
+#: src/slic3r/GUI/Plater.cpp:2813 src/slic3r/GUI/Plater.cpp:2825
+#: src/slic3r/GUI/Plater.cpp:2897
+msgid "Increase copies"
+msgstr "Přidat kopie"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:29 src/slic3r/GUI/GUI_ObjectList.cpp:69
+#: src/slic3r/GUI/GUI_ObjectList.cpp:510 src/slic3r/GUI/Plater.cpp:439
+#: src/slic3r/GUI/Tab.cpp:1030 src/slic3r/GUI/Tab.cpp:1031
+#: src/slic3r/GUI/Tab.cpp:1360 src/libslic3r/PrintConfig.cpp:167
+#: src/libslic3r/PrintConfig.cpp:389 src/libslic3r/PrintConfig.cpp:729
+#: src/libslic3r/PrintConfig.cpp:743 src/libslic3r/PrintConfig.cpp:780
+#: src/libslic3r/PrintConfig.cpp:933 src/libslic3r/PrintConfig.cpp:943
+#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:979
+#: src/libslic3r/PrintConfig.cpp:998 src/libslic3r/PrintConfig.cpp:1659
+#: src/libslic3r/PrintConfig.cpp:1676
+msgid "Infill"
+msgstr "Výplň"
+
+#: src/slic3r/GUI/PresetHints.cpp:171
+msgid "infill"
+msgstr "výplň"
+
+#: src/libslic3r/PrintConfig.cpp:972
+msgid "Infill before perimeters"
+msgstr "Tisknout výplň před tiskem perimetrů"
+
+#: src/libslic3r/PrintConfig.cpp:953
+msgid "Infill extruder"
+msgstr "Extruder pro výplň"
+
+#: src/libslic3r/PrintConfig.cpp:987
+msgid "Infill/perimeters overlap"
+msgstr "Přesah pro výplň/perimetry"
+
+#: src/libslic3r/Print.cpp:1476
+msgid "Infilling layers"
+msgstr "Generování výplně vrstev"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2424
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2497 src/slic3r/GUI/Plater.cpp:118
+msgid "Info"
+msgstr "Info"
+
+#: src/libslic3r/PrintConfig.cpp:1008
+msgid "Inherits profile"
+msgstr "Zdědí profil"
+
+#: src/libslic3r/PrintConfig.cpp:2317 src/libslic3r/PrintConfig.cpp:2318
+msgid "Initial exposure time"
+msgstr "Doba po�áte�ního osvitu"
+
+#: src/libslic3r/PrintConfig.cpp:2295 src/libslic3r/PrintConfig.cpp:2296
+msgid "Initial layer height"
+msgstr "Výška první vrstvy"
+
+#: src/slic3r/GUI/Field.cpp:155
+msgid "Input value is out of range"
+msgstr "Zadaná hodnota je mimo rozsah"
+
+#: src/slic3r/GUI/GUI_App.cpp:661
+msgid "Inspect / activate configuration snapshots"
+msgstr "Zkontrolovat / aktivovat zálohy konfigurace"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1887
+msgid "Instance manipulation"
+msgstr "Manipulace s instancí objektu"
+
+#: src/slic3r/GUI/wxExtensions.cpp:358
+msgid "Instances"
+msgstr "Instance"
+
+#: src/slic3r/GUI/wxExtensions.cpp:365
+#, possible-c-format
+msgid "Instance_%d"
+msgstr "Instance_%d"
+
+#: src/libslic3r/PrintConfig.cpp:1886
+msgid "Interface layers"
+msgstr "Kontaktní vrstvy"
+
+#: src/libslic3r/PrintConfig.cpp:1870
+msgid "Interface loops"
+msgstr "Kontaktní smy�ky"
+
+#: src/libslic3r/PrintConfig.cpp:1895
+msgid "Interface pattern spacing"
+msgstr "Rozte� kontaktních vrstev"
+
+#: src/libslic3r/PrintConfig.cpp:1022
+msgid "Interface shells"
+msgstr "Mezilehlé stěny"
+
+#: src/libslic3r/Zipper.cpp:87
+msgid "internal error"
+msgstr "interní chyba"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/GCode/PreviewData.cpp:166
+msgid "Internal infill"
+msgstr "Vnitřní výplň"
+
+#: xs/src/slic3r/Utils/OctoPrint.cpp:120
+msgid "Invalid API key"
+msgstr "Neplatný API klí�"
+
+#: src/slic3r/GUI/Plater.cpp:2397
+msgid "Invalid data"
+msgstr "Neplatná data"
+
+#: src/libslic3r/Zipper.cpp:83
+msgid "invalid filename"
+msgstr "neplatný název souboru"
+
+#: src/slic3r/GUI/Tab.cpp:3484
+msgid "Invalid Head penetration"
+msgstr "Neplatný průnik podpěry do modelu"
+
+#: src/libslic3r/Zipper.cpp:51
+msgid "invalid header or archive is corrupted"
+msgstr "neplatná hlavi�ka nebo je archiv poškozen"
+
+#: src/slic3r/GUI/Field.cpp:150 src/slic3r/GUI/Field.cpp:173
+msgid "Invalid numeric input."
+msgstr "Neplatný �íselný vstup."
+
+#: src/libslic3r/Zipper.cpp:81
+msgid "invalid parameter"
+msgstr "neplatný parametr"
+
+#: src/slic3r/GUI/Tab.cpp:3497
+msgid "Invalid pinhead diameter"
+msgstr "Neplatný průměr hrotu"
+
+#: lib/Slic3r/GUI/Plater.pm:1042
+msgid "Invalid rotation angle entered"
+msgstr "Zadán neplatný úhel nato�ení"
+
+#: lib/Slic3r/GUI/Plater.pm:1133 lib/Slic3r/GUI/Plater.pm:1137
+#: lib/Slic3r/GUI/Plater.pm:1158 lib/Slic3r/GUI/Plater.pm:1163
+msgid "Invalid scaling value entered"
+msgstr "Zadána neplatná hodnota pro úpravu rozměru"
+
+#: src/slic3r/GUI/Tab.cpp:2779
+msgid "is not compatible with print profile"
+msgstr "není kompatibilní s tiskovým profilem"
+
+#: src/slic3r/GUI/Tab.cpp:2778
+msgid "is not compatible with printer"
+msgstr "není kompatibilní s tiskárnou"
+
+#: src/slic3r/GUI/MainFrame.cpp:519
+msgid "Iso"
+msgstr "Izometrické"
+
+#: src/slic3r/GUI/MainFrame.cpp:519
+msgid "Iso View"
+msgstr "Izometrické zobrazení"
+
+#: src/slic3r/GUI/Tab.cpp:914
+msgid "It can't be deleted or modified. "
+msgstr "Nelze smazat nebo upravit. "
+
+#: src/libslic3r/PrintConfig.cpp:926
+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."
+msgstr "Může být užite�né zvýšit proud motoru extruderu během sekvence výměny filamentu, aby se umožnily vysoké rychlosti zavádění filamentu a aby se překonal odpor při zavádění filamentu s ošklivě tvarovanou špi�kou."
+
+#: src/slic3r/GUI/Tab.cpp:907
+msgid "It's a default preset."
+msgstr "Je to výchozí přednastavení."
+
+#: src/slic3r/GUI/Tab.cpp:908
+msgid "It's a system preset."
+msgstr "Jedná se o systémové přednastavení."
+
+#: src/slic3r/GUI/GUI.cpp:142 src/slic3r/GUI/Tab.cpp:2796
+msgid "It's impossible to print multi-part object(s) with SLA technology."
+msgstr "SLA technologií nelze tisknout vícedílné objekty."
+
+#: src/slic3r/GUI/Tab.cpp:2177
+msgid "Jerk limits"
+msgstr "Ryv limity"
+
+#: src/libslic3r/PrintConfig.cpp:1579
+msgid "Jitter"
+msgstr "Rozkmit (Jitter)"
+
+#: src/libslic3r/PrintConfig.cpp:533
+msgid "Keep fan always on"
+msgstr "Ventilátor vždy zapnutý"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:194
+msgid "Keep lower part"
+msgstr "Zachovat spodní �ást"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:193
+msgid "Keep upper part"
+msgstr "Zachovat horní �ást"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:13 src/slic3r/GUI/MainFrame.cpp:566
+msgid "Keyboard Shortcuts"
+msgstr "Klávesové zkratky"
+
+#: src/libslic3r/PrintConfig.cpp:917
+msgid "Label objects"
+msgstr "Ozna�ování objektů"
+
+#: src/libslic3r/PrintConfig.cpp:2234
+msgid "Landscape"
+msgstr "Orientace na šířku"
+
+#: src/slic3r/GUI/GUI_App.cpp:524
+msgid "Language"
+msgstr "Jazyk"
+
+#: lib/Slic3r/GUI/Plater.pm:265
+msgid "Layer Editing"
+msgstr "Vyhlazení vrstev"
+
+#: lib/Slic3r/GUI/Plater.pm:280
+msgid "Layer editing"
+msgstr "Vyhlazení vrstev"
+
+#: src/slic3r/GUI/Tab.cpp:998 src/libslic3r/PrintConfig.cpp:55
+msgid "Layer height"
+msgstr "Výška vrstvy"
+
+#: src/libslic3r/Print.cpp:1332
+msgid "Layer height can't be greater than nozzle diameter"
+msgstr "Výška vrstvy nemůže být větší než je průměr trysky"
+
+#: src/slic3r/GUI/Tab.cpp:2260
+msgid "Layer height limits"
+msgstr "Výškové limity vrstvy"
+
+#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:946
+#: src/libslic3r/PrintConfig.cpp:1435 src/libslic3r/PrintConfig.cpp:1620
+#: src/libslic3r/PrintConfig.cpp:1681 src/libslic3r/PrintConfig.cpp:1844
+#: src/libslic3r/PrintConfig.cpp:1889
+msgid "layers"
+msgstr "vrstva(y)"
+
+#: src/slic3r/GUI/Tab.cpp:3302 src/slic3r/GUI/Tab.cpp:3393
+msgid "Layers"
+msgstr "Vrstvy"
+
+#: src/slic3r/GUI/Tab.cpp:997 src/slic3r/GUI/Tab.cpp:3391
+msgid "Layers and perimeters"
+msgstr "Vrstvy a perimetry"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:28 src/slic3r/GUI/GUI_ObjectList.cpp:68
+#: src/slic3r/GUI/GUI_ObjectList.cpp:509 src/libslic3r/PrintConfig.cpp:56
+#: src/libslic3r/PrintConfig.cpp:150 src/libslic3r/PrintConfig.cpp:381
+#: src/libslic3r/PrintConfig.cpp:438 src/libslic3r/PrintConfig.cpp:446
+#: src/libslic3r/PrintConfig.cpp:842 src/libslic3r/PrintConfig.cpp:1026
+#: src/libslic3r/PrintConfig.cpp:1305 src/libslic3r/PrintConfig.cpp:1371
+#: src/libslic3r/PrintConfig.cpp:1552 src/libslic3r/PrintConfig.cpp:1987
+#: src/libslic3r/PrintConfig.cpp:2044
+msgid "Layers and Perimeters"
+msgstr "Vrstvy a perimetry"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:189
+msgid "Layers Slider Shortcuts"
+msgstr "Posuvníky"
+
+#. TRN To be shown in Print Settings "Bottom solid layers"
+#: rc/libslic3r/PrintConfig.cpp:149
+msgctxt "Layers"
+msgid "Bottom"
+msgstr "Spodní"
+
+#. TRN To be shown in Print Settings "Top solid layers"
+#: src/libslic3r/PrintConfig.cpp:2043
+msgctxt "Layers"
+msgid "Top"
+msgstr "Vrchní"
+
+#: src/slic3r/GUI/MainFrame.cpp:527
+msgid "Left"
+msgstr "Zleva"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:597
+msgid "Left mouse click - add point"
+msgstr "Kliknutí levým tla�ítkem myši - přidání bodu"
+
+#: src/slic3r/GUI/MainFrame.cpp:527
+msgid "Left View"
+msgstr "Pohled zleva"
+
+#: src/libslic3r/PrintConfig.cpp:1473 src/libslic3r/PrintConfig.cpp:1481
+msgid "Length"
+msgstr "Vzdálenost"
+
+#: src/libslic3r/PrintConfig.cpp:292
+msgid "Length of the cooling tube to limit space for cooling moves inside it "
+msgstr "Délka kovové trubi�ky ur�ené pro ochlazení a zformování filamentu po vytažení z extruderu "
+
+#: src/libslic3r/PrintConfig.cpp:1491
+msgid "Lift Z"
+msgstr "Zvednout Z"
+
+#: src/libslic3r/PrintConfig.cpp:801
+msgid "Line"
+msgstr "Čára"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1050
+msgid "Load"
+msgstr "Na�íst"
+
+#: src/slic3r/GUI/MainFrame.cpp:349
+msgid "Load a model"
+msgstr "Na�íst model"
+
+#: src/libslic3r/PrintConfig.cpp:3116
+msgid "Load and store settings at the given directory. This is useful for maintaining different profiles or including configurations from a network storage."
+msgstr "Na�těte a uložte nastavení z/do daného adresáře. To je užite�né pro udržování různých profilů nebo  konfigurací ze síťového úložiště."
+
+#: src/libslic3r/PrintConfig.cpp:3100
+msgid "Load config file"
+msgstr "Na�íst konfigura�ní soubor"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
+msgid "Load Config from .ini/amf/3mf/gcode"
+msgstr "Na�íst konfiguraci z .ini/amf/3mf/gcode"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
+msgid "Load Config from .ini/amf/3mf/gcode and merge"
+msgstr "Na�íst konfiguraci z .ini/amf/3mf/gcode a slou�it"
+
+#: src/slic3r/GUI/MainFrame.cpp:354
+msgid "Load configuration from project file"
+msgstr "Na�íst konfiguraci z projektu"
+
+#: src/libslic3r/PrintConfig.cpp:3101
+msgid "Load configuration from the specified file. It can be used more than once to load options from multiple files."
+msgstr "Na�íst konfiguraci ze zadaného souboru. Může být použito vícekrát než jednou pro na�tení  z více souborů."
+
+#: src/slic3r/GUI/MainFrame.cpp:352
+msgid "Load exported configuration file"
+msgstr "Na�íst exportovaný konfigura�ní soubor"
+
+#: src/slic3r/GUI/MainFrame.cpp:357
+msgid "Load presets from a bundle"
+msgstr "Na�íst přednastavení z balíku"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:97
+msgid "Load shape from STL..."
+msgstr "Na�íst tvar ze souboru STL…"
+
+#: lib/Slic3r/GUI/Plater.pm:779
+msgid "Loaded "
+msgstr "Na�teno "
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:235
+msgid "loaded"
+msgstr "zaváděn"
+
+#: src/slic3r/GUI/Plater.cpp:1782
+msgid "Loaded"
+msgstr "Na�teno"
+
+#: src/slic3r/GUI/Plater.cpp:1590
+msgid "Loading"
+msgstr "Na�ítání"
+
+#: src/slic3r/GUI/GUI_App.cpp:339
+msgid "Loading of a current presets"
+msgstr "Na�ítání aktuálních předvoleb"
+
+#: src/slic3r/GUI/GUI_App.cpp:407
+msgid "Loading of a mode view"
+msgstr "Na�ítání režimu zobrazení"
+
+#: src/slic3r/GUI/GUI_App.cpp:399
+msgid "Loading of current presets"
+msgstr "Na�ítání aktuálních předvoleb"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:251
+#: src/slic3r/Utils/FixModelByWin10.cpp:378
+msgid "Loading repaired model"
+msgstr "Na�ítaní opraveného modelu"
+
+#: src/libslic3r/PrintConfig.cpp:575
+msgid "Loading speed"
+msgstr "Rychlost zavádění"
+
+#: src/libslic3r/PrintConfig.cpp:583
+msgid "Loading speed at the start"
+msgstr "Po�áte�ní rychlost zavádění"
+
+#: lib/Slic3r/GUI/Plater.pm:713
+msgid "Loading…"
+msgstr "Na�ítání…"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:851
+msgid "Lock supports under new islands"
+msgstr "Ukotvi podpěry pod novými ostrůvky"
+
+#: src/slic3r/GUI/Tab.cpp:3103
+msgid "LOCKED LOCK icon indicates that the settings are the same as the system values for the current option group"
+msgstr "Ikona ZAMKNUTÉHO Z�MKU indikuje, že nastavení jsou stejná jako systémové hodnoty pro aktuální skupinu nastavení"
+
+#: src/slic3r/GUI/Tab.cpp:3119
+msgid "LOCKED LOCK icon indicates that the value is the same as the system value."
+msgstr "Ikona ZAMKNUTÉHO Z�MKU indikuje, že hodnota je shodná se systémovou hodnotou."
+
+#: src/slic3r/GUI/Tab.cpp:3064
+msgid "LOCKED LOCK;indicates that the settings are the same as the system values for the current option group"
+msgstr "ZAMKNUT� Z�MEK; indikuje, že nastavení jsou stejná jako systémové hodnoty pro aktuální skupinu nastavení"
+
+#: src/libslic3r/PrintConfig.cpp:3119
+msgid "Logging level"
+msgstr "Úroveň logování"
+
+#: src/libslic3r/PrintConfig.cpp:1625
+msgid "Loops (minimum)"
+msgstr "Smy�ek (minimálně)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:172
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:174
+msgid "Lower Layer"
+msgstr "Nižší vrstva"
+
+#: src/slic3r/GUI/Tab.cpp:2136 src/slic3r/GUI/Tab.cpp:2209
+#: src/libslic3r/PrintConfig.cpp:1077 src/libslic3r/PrintConfig.cpp:1087
+#: src/libslic3r/PrintConfig.cpp:1097 src/libslic3r/PrintConfig.cpp:1110
+#: src/libslic3r/PrintConfig.cpp:1121 src/libslic3r/PrintConfig.cpp:1132
+#: src/libslic3r/PrintConfig.cpp:1143
+msgid "Machine limits"
+msgstr "Limity stroje"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:129
+msgid "Main Shortcuts"
+msgstr "Hlavní"
+
+#: src/slic3r/GUI/Plater.cpp:143
+msgid "Manifold"
+msgstr "Model OK"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:908
+msgid "Manual editing"
+msgstr "Manuální úprava"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:675
+msgid "Manual editing [M]"
+msgstr "Ru�ní úprava [M]"
+
+#: src/slic3r/GUI/MainFrame.cpp:604
+msgid "Mate&rial Settings Tab"
+msgstr "Panel nastavení mate&riálu"
+
+#: src/slic3r/GUI/Tab.cpp:3300
+msgid "Material"
+msgstr "Materiál"
+
+#: src/slic3r/GUI/Tab.hpp:391
+msgid "Material Settings"
+msgstr "Nastavení materiálu"
+
+#: src/slic3r/GUI/Plater.cpp:140
+msgid "Materials"
+msgstr "Materiálů"
+
+#: src/libslic3r/PrintConfig.cpp:1152 src/libslic3r/PrintConfig.cpp:1161
+msgid "Max"
+msgstr "Maximum"
+
+#: src/libslic3r/PrintConfig.cpp:2470
+msgid "Max bridge length"
+msgstr "Maximální délka mostu"
+
+#: src/libslic3r/PrintConfig.cpp:2546
+msgid "Max merge distance"
+msgstr "Maximální vzdálenost pro slou�ení"
+
+#: src/libslic3r/PrintConfig.cpp:2479
+msgid "Max pillar linking distance"
+msgstr "Max. vzdálenost propojení podpěr"
+
+#: src/libslic3r/PrintConfig.cpp:64
+msgid "Max print height"
+msgstr "Maximální výška tisku"
+
+#: src/libslic3r/PrintConfig.cpp:1172
+msgid "Max print speed"
+msgstr "Maximální rychlost tisku"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:55
+msgid "max slic3r version"
+msgstr "max verze slic3ru"
+
+#: src/libslic3r/PrintConfig.cpp:1203
+msgid "Max volumetric slope negative"
+msgstr "Maximální negativní objemový sklon"
+
+#: src/libslic3r/PrintConfig.cpp:1192
+msgid "Max volumetric slope positive"
+msgstr "Maximální pozitivní objemový sklon"
+
+#: src/libslic3r/PrintConfig.cpp:565 src/libslic3r/PrintConfig.cpp:1182
+msgid "Max volumetric speed"
+msgstr "Maximální objemová rychlost"
+
+#: src/libslic3r/PrintConfig.cpp:2167
+msgid "Maximal bridging distance"
+msgstr "Maximální vzdálenost přemostění"
+
+#: src/libslic3r/PrintConfig.cpp:2168
+msgid "Maximal distance between supports on sparse infill sections. "
+msgstr "Maximální vzdálenost mezi podpěrami u �ástí s řídkou výplní. "
+
+#: src/libslic3r/PrintConfig.cpp:1086
+msgid "Maximum acceleration %1%"
+msgstr "Maximální zrychlení %1%"
+
+#: src/libslic3r/PrintConfig.cpp:1088
+msgid "Maximum acceleration of the %1% axis"
+msgstr "Maximální zrychlení osy %1%"
+
+#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
+msgid "Maximum acceleration when extruding"
+msgstr "Maximální zrychlení při extruzi"
+
+#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
+msgid "Maximum acceleration when retracting"
+msgstr "Maximální zrychlení při retrakci"
+
+#: src/slic3r/GUI/Tab.cpp:2170
+msgid "Maximum accelerations"
+msgstr "Maximální zrychlení"
+
+#: src/libslic3r/PrintConfig.cpp:1076
+msgid "Maximum feedrate %1%"
+msgstr "Maximální rychlost posuvu %1%"
+
+#: src/libslic3r/PrintConfig.cpp:1078
+msgid "Maximum feedrate of the %1% axis"
+msgstr "Maximální rychlost posuvu osy %1%"
+
+#: src/slic3r/GUI/Tab.cpp:2165
+msgid "Maximum feedrates"
+msgstr "Maximální rychlosti posuvu"
+
+#: src/libslic3r/PrintConfig.cpp:1096
+msgid "Maximum jerk %1%"
+msgstr "Maximální ryv (jerk) %1%"
+
+#: src/libslic3r/PrintConfig.cpp:1098
+msgid "Maximum jerk of the %1% axis"
+msgstr "Maximální ryv (jerk) osy %1%"
+
+#: src/libslic3r/PrintConfig.cpp:566
+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 "Maximální povolený objem průtoku pro tento filament. Omezuje maximální rychlost průtoku pro tisk až na minimální rychlost průtoku pro tisk a filament. Zadejte nulu pro nastavení bez omezení."
+
+#: src/libslic3r/PrintConfig.cpp:3053
+msgid "Merge"
+msgstr "Slou�it"
+
+#: src/libslic3r/PrintConfig.cpp:2432
+msgid "Merging bridges or pillars into another pillars can increase the radius. Zero means no increase, one means full increase."
+msgstr "Slou�ení mostů nebo podpěr do jiných podpěr může zvýšit poloměr. Hodnota 0 znamená žádné zvýšení, hodnota 1 znamená maximální zvýšení."
+
+#: src/libslic3r/SLAPrint.cpp:71
+msgid "Merging slices and calculating statistics"
+msgstr "Slu�ování tiskových vrstev a výpo�et statistik"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:248
+msgid "Mesh repair failed."
+msgstr "Oprava meshe selhala."
+
+#: src/libslic3r/PrintConfig.cpp:3120
+msgid "Messages with severity lower or eqal to the loglevel will be printed out. 0:trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
+msgstr "Zprávy se závažností nižší nebo rovnou úrovni logování budou vypsány. 0: trace, 1: debug, 2: info, 3: warning, 4: error, 5: fatal"
+
+#: src/libslic3r/PrintConfig.cpp:1215 src/libslic3r/PrintConfig.cpp:1224
+msgid "Min"
+msgstr "Minimum"
+
+#: src/libslic3r/PrintConfig.cpp:1233
+msgid "Min print speed"
+msgstr "Minimální rychlost tisku"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
+msgid "min slic3r version"
+msgstr "min verze slic3ru"
+
+#: src/libslic3r/PrintConfig.cpp:2507
+msgid "Minimal distance of the support points"
+msgstr "Minimální vzdálenost podpěrných bodů"
+
+#: src/libslic3r/PrintConfig.cpp:1241
+msgid "Minimal filament extrusion length"
+msgstr "Minimální délka extruze filamentu"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:877
+msgid "Minimal points distance: "
+msgstr "Minimální vzdálenost bodů:"
+
+#: src/libslic3r/PrintConfig.cpp:635
+msgid "Minimal purge on wipe tower"
+msgstr "Minimální vytla�ený objem na �istící věži"
+
+#: src/libslic3r/PrintConfig.cpp:1442
+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 "Minimální rozlišení detailů, které se používají pro zjednodušení vstupního souboru pro urychlení slicovací úlohy a snížení využití paměti. Modely s vysokým rozlišením �asto obsahují více detailů než tiskárny dokážou vykreslit. Nastavte na nulu, chcete-li zakázat jakékoli zjednodušení a použít vstup v plném rozlišení."
+
+#: src/libslic3r/PrintConfig.cpp:1109 src/libslic3r/PrintConfig.cpp:1111
+msgid "Minimum feedrate when extruding"
+msgstr "Minimální rychlosti posuvu během extruze"
+
+#: src/slic3r/GUI/Tab.cpp:2182
+msgid "Minimum feedrates"
+msgstr "Minimální rychlosti posuvu"
+
+#: src/libslic3r/PrintConfig.cpp:1452
+msgid "Minimum travel after retraction"
+msgstr "Minimální dráha extruderu po retrakci"
+
+#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
+msgid "Minimum travel feedrate"
+msgstr "Minimální rychlost při přesunu"
+
+#: src/slic3r/GUI/Plater.cpp:2946
+msgid "Mirror"
+msgstr "Zrcadlit"
+
+#: src/slic3r/GUI/Plater.cpp:2946
+msgid "Mirror the selected object"
+msgstr "Zrcadlit vybraný objekt"
+
+#: src/slic3r/GUI/Plater.cpp:2939
+msgid "Mirror the selected object along the X axis"
+msgstr "Zrcadlit rozměr vybraného objektu podél osy X"
+
+#: src/slic3r/GUI/Plater.cpp:2941
+msgid "Mirror the selected object along the Y axis"
+msgstr "Zrcadlit rozměr vybraného objektu podél osy Y"
+
+#: src/slic3r/GUI/Plater.cpp:2943
+msgid "Mirror the selected object along the Z axis"
+msgstr "Zrcadlit rozměr vybraného objektu podél osy Z"
+
+#: src/slic3r/Utils/OctoPrint.cpp:69
+#, possible-c-format
+msgid "Mismatched type of print host: %s"
+msgstr "Nesprávný typ tiskového serveru: % s"
+
+#: src/libslic3r/GCode/PreviewData.cpp:176
+msgid "Mixed"
+msgstr "Smíšený"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:87 src/slic3r/GUI/ConfigWizard.cpp:118
+#: src/slic3r/GUI/ConfigWizard.cpp:561 src/slic3r/GUI/ConfigWizard.cpp:575
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:150
+#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/libslic3r/PrintConfig.cpp:59 src/libslic3r/PrintConfig.cpp:66
+#: src/libslic3r/PrintConfig.cpp:75 src/libslic3r/PrintConfig.cpp:210
+#: src/libslic3r/PrintConfig.cpp:285 src/libslic3r/PrintConfig.cpp:293
+#: src/libslic3r/PrintConfig.cpp:343 src/libslic3r/PrintConfig.cpp:353
+#: src/libslic3r/PrintConfig.cpp:473 src/libslic3r/PrintConfig.cpp:484
+#: src/libslic3r/PrintConfig.cpp:502 src/libslic3r/PrintConfig.cpp:680
+#: src/libslic3r/PrintConfig.cpp:1166 src/libslic3r/PrintConfig.cpp:1227
+#: src/libslic3r/PrintConfig.cpp:1245 src/libslic3r/PrintConfig.cpp:1263
+#: src/libslic3r/PrintConfig.cpp:1315 src/libslic3r/PrintConfig.cpp:1325
+#: src/libslic3r/PrintConfig.cpp:1446 src/libslic3r/PrintConfig.cpp:1454
+#: src/libslic3r/PrintConfig.cpp:1495 src/libslic3r/PrintConfig.cpp:1503
+#: src/libslic3r/PrintConfig.cpp:1513 src/libslic3r/PrintConfig.cpp:1521
+#: src/libslic3r/PrintConfig.cpp:1529 src/libslic3r/PrintConfig.cpp:1612
+#: src/libslic3r/PrintConfig.cpp:1828 src/libslic3r/PrintConfig.cpp:1898
+#: src/libslic3r/PrintConfig.cpp:1932 src/libslic3r/PrintConfig.cpp:2125
+#: src/libslic3r/PrintConfig.cpp:2132 src/libslic3r/PrintConfig.cpp:2139
+#: src/libslic3r/PrintConfig.cpp:2169 src/libslic3r/PrintConfig.cpp:2179
+#: src/libslic3r/PrintConfig.cpp:2189 src/libslic3r/PrintConfig.cpp:2297
+#: src/libslic3r/PrintConfig.cpp:2372 src/libslic3r/PrintConfig.cpp:2381
+#: src/libslic3r/PrintConfig.cpp:2390 src/libslic3r/PrintConfig.cpp:2400
+#: src/libslic3r/PrintConfig.cpp:2444 src/libslic3r/PrintConfig.cpp:2454
+#: src/libslic3r/PrintConfig.cpp:2473 src/libslic3r/PrintConfig.cpp:2483
+#: src/libslic3r/PrintConfig.cpp:2492 src/libslic3r/PrintConfig.cpp:2510
+#: src/libslic3r/PrintConfig.cpp:2525 src/libslic3r/PrintConfig.cpp:2539
+#: src/libslic3r/PrintConfig.cpp:2552 src/libslic3r/PrintConfig.cpp:2562
+msgid "mm"
+msgstr "mm"
+
+#: src/libslic3r/PrintConfig.cpp:1477 src/libslic3r/PrintConfig.cpp:1486
+msgid "mm (zero to disable)"
+msgstr "mm (nula pro vypnutí)"
+
+#: src/libslic3r/PrintConfig.cpp:847 src/libslic3r/PrintConfig.cpp:992
+#: src/libslic3r/PrintConfig.cpp:1797
+msgid "mm or %"
+msgstr "mm nebo %"
+
+#: src/libslic3r/PrintConfig.cpp:528
+msgid "mm or % (leave 0 for auto)"
+msgstr "mm nebo % (pro automatické ponechte 0)"
+
+#: src/libslic3r/PrintConfig.cpp:420 src/libslic3r/PrintConfig.cpp:835
+#: src/libslic3r/PrintConfig.cpp:967 src/libslic3r/PrintConfig.cpp:1354
+#: src/libslic3r/PrintConfig.cpp:1692 src/libslic3r/PrintConfig.cpp:1865
+#: src/libslic3r/PrintConfig.cpp:2023
+msgid "mm or % (leave 0 for default)"
+msgstr "mm nebo % (ponechte 0 jako výchozí)"
+
+#: src/libslic3r/PrintConfig.cpp:201 src/libslic3r/PrintConfig.cpp:577
+#: src/libslic3r/PrintConfig.cpp:585 src/libslic3r/PrintConfig.cpp:594
+#: src/libslic3r/PrintConfig.cpp:602 src/libslic3r/PrintConfig.cpp:629
+#: src/libslic3r/PrintConfig.cpp:648 src/libslic3r/PrintConfig.cpp:874
+#: src/libslic3r/PrintConfig.cpp:1001 src/libslic3r/PrintConfig.cpp:1079
+#: src/libslic3r/PrintConfig.cpp:1099 src/libslic3r/PrintConfig.cpp:1112
+#: src/libslic3r/PrintConfig.cpp:1123 src/libslic3r/PrintConfig.cpp:1176
+#: src/libslic3r/PrintConfig.cpp:1235 src/libslic3r/PrintConfig.cpp:1363
+#: src/libslic3r/PrintConfig.cpp:1537 src/libslic3r/PrintConfig.cpp:1546
+#: src/libslic3r/PrintConfig.cpp:1941 src/libslic3r/PrintConfig.cpp:2053
+msgid "mm/s"
+msgstr "mm/s"
+
+#: src/libslic3r/PrintConfig.cpp:430 src/libslic3r/PrintConfig.cpp:856
+#: src/libslic3r/PrintConfig.cpp:1651 src/libslic3r/PrintConfig.cpp:1702
+#: src/libslic3r/PrintConfig.cpp:1908 src/libslic3r/PrintConfig.cpp:2035
+msgid "mm/s or %"
+msgstr "mm/s nebo %"
+
+#: src/libslic3r/PrintConfig.cpp:160 src/libslic3r/PrintConfig.cpp:303
+#: src/libslic3r/PrintConfig.cpp:815 src/libslic3r/PrintConfig.cpp:936
+#: src/libslic3r/PrintConfig.cpp:1089 src/libslic3r/PrintConfig.cpp:1134
+#: src/libslic3r/PrintConfig.cpp:1145 src/libslic3r/PrintConfig.cpp:1334
+msgid "mm/s²"
+msgstr "mm/s²"
+
+#: src/libslic3r/PrintConfig.cpp:1661
+msgid "mm²"
+msgstr "mm²"
+
+#: src/libslic3r/PrintConfig.cpp:640
+msgid "mm³"
+msgstr "mm³"
+
+#: src/libslic3r/PrintConfig.cpp:569 src/libslic3r/PrintConfig.cpp:1185
+msgid "mm³/s"
+msgstr "mm³/s"
+
+#: src/libslic3r/PrintConfig.cpp:1197 src/libslic3r/PrintConfig.cpp:1208
+msgid "mm³/s²"
+msgstr "mm³/s²"
+
+#: src/slic3r/GUI/GUI_App.cpp:681
+msgid "Mode"
+msgstr "Režim"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:58
+msgid "model"
+msgstr "model"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:340
+msgid "Model fixing"
+msgstr "Opravování modelu"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
+msgid "Model Repair by the Netfabb service"
+msgstr "Oprava modelu službou Netfabb"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:406
+msgid "Model repair canceled"
+msgstr "Oprava modelu byla zrušena"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
+msgid "Model repair failed: \n"
+msgstr "Oprava modelu selhala:\n"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:400
+msgid "Model repair finished"
+msgstr "Oprava modelu byla dokon�ena"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
+msgid "Model repaired successfully"
+msgstr "Model byl úspěšně opraven"
+
+#: src/slic3r/GUI/Preset.cpp:207
+msgid "modified"
+msgstr "upraveno"
+
+#: src/slic3r/GUI/Tab.cpp:1100
+msgid "Modifiers"
+msgstr "Modifikátory"
+
+#: src/libslic3r/PrintConfig.cpp:719
+msgid "money/kg"
+msgstr "korun/kg"
+
+#: lib/Slic3r/GUI/Plater.pm:255
+msgid "More"
+msgstr "Více"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1238
+msgid "Move clipping plane"
+msgstr "Posunout řezovou rovinu"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:183
+msgid "Move current slider thumb Down"
+msgstr "Posunout aktivní posuvník dolů"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+msgid "Move current slider thumb Up"
+msgstr "Posunout aktivní posuvník nahoru"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+msgid "Move current slider thump Down"
+msgstr "Posunout aktivní posuvník dolů"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
+msgid "Move current slider thump Up"
+msgstr "Posunout aktivní posuvník nahoru"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1231
+msgid "Move point"
+msgstr "Posunout bod"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:51
+msgid "Move [M]"
+msgstr "Přesunout [M]"
+
+#: src/libslic3r/PrintConfig.cpp:2100
+msgid "Multi material printers may need to prime or purge extruders on tool changes. Extrude the excess material into the wipe tower."
+msgstr "Multimateriálové tiskárny mohou potřebovat, aby při výměně nástrojů vy�istili extrudery. Vytla�í přebyte�ný materiál do �istící věže."
+
+#: src/slic3r/GUI/Plater.cpp:1661 src/slic3r/GUI/Plater.cpp:1769
+msgid "Multi-part object detected"
+msgstr "Detekován objekt obsahující více �ástí"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:400 src/slic3r/GUI/FirmwareDialog.cpp:436
+#, possible-c-format
+msgid "Multiple %s devices found. Please only connect one at a time for flashing."
+msgstr "Bylo nalezeno více zařízení %s . Během flashování mějte připojené pouze jedno."
+
+#: src/slic3r/GUI/Tab.cpp:1118
+msgid "Multiple Extruders"
+msgstr "Více Extruderů"
+
+#: src/slic3r/GUI/Plater.cpp:1766
+msgid "Multiple objects were loaded for a multi-material printer.\nInstead of considering them as multiple objects, should I consider\nthese files to represent a single object having multiple parts?\n"
+msgstr "Bylo nahráno více objektů pro multi materiálovou tiskárnu.\nMají být vloženy jako jeden objekt obsahující více �ástí, \nnamísto vložení několika objektů?\n"
+
+#: src/libslic3r/PrintConfig.cpp:3050
+msgid "Multiply copies by creating a grid."
+msgstr "Vynásobí kopie vytvořením mřížky."
+
+#: src/libslic3r/PrintConfig.cpp:3045
+msgid "Multiply copies by this factor."
+msgstr "Vynásobí kopie tímto �íslem."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:176
+msgid "Name"
+msgstr "Název"
+
+#: src/libslic3r/PrintConfig.cpp:1418
+msgid "Name of the printer variant. For example, the printer variants may be differentiated by a nozzle diameter."
+msgstr "Název varianty tiskárny. Varianty tiskárny mohou být například rozlišeny podle průměru trysky."
+
+#: src/libslic3r/PrintConfig.cpp:1412
+msgid "Name of the printer vendor."
+msgstr "Název prodejce tiskárny."
+
+#: src/libslic3r/PrintConfig.cpp:1009
+msgid "Name of the profile, from which this profile inherits."
+msgstr "Název profilu, ze kterého tento profil zdědí."
+
+#: src/libslic3r/PrintConfig.cpp:1560
+msgid "Nearest"
+msgstr "Nejbližší"
+
+#: src/slic3r/GUI/BonjourDialog.cpp:55
+msgid "Network lookup"
+msgstr "Hledání v síti"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:30
+#, possible-c-format
+msgid "New version of %s is available"
+msgstr "Je dostupná nová verze %s"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:29
+msgid "New version of Slic3r PE is available"
+msgstr "Je dostupná nová verze Slic3r PE"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:47
+msgid "New version:"
+msgstr "Nová verze:"
+
+#: src/libslic3r/PrintConfig.cpp:912
+msgid "No extrusion"
+msgstr "Žádná extruze"
+
+#: src/slic3r/GUI/MainFrame.cpp:635
+msgid "No previously sliced file."
+msgstr "Žádné dříve slicované soubory."
+
+#: src/slic3r/GUI/RammingChart.cpp:23
+msgid "NO RAMMING AT ALL"
+msgstr "Ž�DN� RAPIDN� EXTRUZE"
+
+#: src/libslic3r/PrintConfig.cpp:2509
+msgid "No support points will be placed closer than this threshold."
+msgstr "Žádné podpůrné body nebudou umístěny blíže než je tento práh."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:190 src/slic3r/GUI/Plater.cpp:422
+#: src/libslic3r/GCode/PreviewData.cpp:162
+msgid "None"
+msgstr "Žádné"
+
+#: src/slic3r/GUI/Plater.cpp:1073
+msgid "normal mode"
+msgstr "normální režim"
+
+#: src/libslic3r/Zipper.cpp:49
+msgid "not a ZIP archive"
+msgstr "není ZIP archiv"
+
+#: src/slic3r/Utils/OctoPrint.cpp:90
+msgid "Note: OctoPrint version at least 1.1.0 is required."
+msgstr "Poznámka: Je vyžadován OctoPrint ve verzi alespoň 1.1.0."
+
+#: src/slic3r/GUI/Tab.cpp:1193 src/slic3r/GUI/Tab.cpp:1194
+#: src/slic3r/GUI/Tab.cpp:1576 src/slic3r/GUI/Tab.cpp:1577
+#: src/slic3r/GUI/Tab.cpp:1985 src/slic3r/GUI/Tab.cpp:1986
+#: src/slic3r/GUI/Tab.cpp:2079 src/slic3r/GUI/Tab.cpp:2080
+#: src/slic3r/GUI/Tab.cpp:3328 src/slic3r/GUI/Tab.cpp:3329
+msgid "Notes"
+msgstr "Poznámky"
+
+#: src/slic3r/GUI/GUI.cpp:277
+msgid "Notice"
+msgstr "Oznámení"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:118
+msgid "nozzle"
+msgstr "tryska"
+
+#: src/libslic3r/PrintConfig.cpp:1261
+msgid "Nozzle diameter"
+msgstr "Průměr trysky"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:560
+msgid "Nozzle Diameter:"
+msgstr "Průměr trysky:"
+
+#: src/libslic3r/PrintConfig.cpp:618
+msgid "Number of cooling moves"
+msgstr "Po�et chladících pohybů"
+
+#: src/slic3r/GUI/Tab.cpp:1845
+msgid "Number of extruders of the printer."
+msgstr "Po�et extrudérů tiskárny."
+
+#: src/libslic3r/PrintConfig.cpp:1888
+msgid "Number of interface layers to insert between the object(s) and support material."
+msgstr "Po�et interface vrstev vložených mezi objekt (objekty) a podpěry."
+
+#: src/libslic3r/PrintConfig.cpp:1627
+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 "Po�et obrysových smy�ek. Je-li nastavena možnost Minimální délka extruze, po�et obrysových smy�ek může být větší než po�et zde nakonfigurovaných. Nastavte tuto hodnotu na nulu, pro úplné deaktivování."
+
+#: src/libslic3r/PrintConfig.cpp:2214
+msgid "Number of pixels in"
+msgstr "Po�et pixelů v ose"
+
+#: src/libslic3r/PrintConfig.cpp:2216
+msgid "Number of pixels in X"
+msgstr "Po�et pixelů v ose X"
+
+#: src/libslic3r/PrintConfig.cpp:2222
+msgid "Number of pixels in Y"
+msgstr "Po�et pixelů v ose Y"
+
+#: src/libslic3r/PrintConfig.cpp:151
+msgid "Number of solid layers to generate on bottom surfaces."
+msgstr "Po�et plných vrstev."
+
+#: src/libslic3r/PrintConfig.cpp:1711
+msgid "Number of solid layers to generate on top and bottom surfaces."
+msgstr "Po�et plných vrstev generovaných na vrchních a spodních površích."
+
+#: src/libslic3r/PrintConfig.cpp:2045
+msgid "Number of solid layers to generate on top surfaces."
+msgstr "Po�et vrchních generovaných plných vrstev."
+
+#: src/libslic3r/PrintConfig.cpp:2303
+msgid "Number of the layers needed for the exposure time fade from initial exposure time to the exposure time"
+msgstr "Po�et vrstev potřebných pro přechod z po�áte�ní doby osvitu na dobu osvitu."
+
+#: src/slic3r/GUI/Plater.cpp:218
+msgid "Number of tool changes"
+msgstr "Po�et změn nástroje"
+
+#: src/libslic3r/PrintConfig.cpp:2489
+msgid "Object elevation"
+msgstr "Nadzvednutí objektu"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1858
+msgid "Object manipulation"
+msgstr "Manipulace s objektem"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:27
+msgid "Object Manipulation"
+msgstr "Manipulace s objektem"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:78
+msgid "Object name"
+msgstr "Jméno objektu"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2412
+msgid "Object or Instance"
+msgstr "Objekt nebo Instanci"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1868
+msgid "Object Settings to modify"
+msgstr "Změna nastavení objektu"
+
+#: src/slic3r/GUI/Plater.cpp:1875
+msgid "Object too large?"
+msgstr "Objekt moc velký?"
+
+#: src/libslic3r/PrintConfig.cpp:2161
+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 "Objekty budou použity k vy�ištění barvy filamentu v trysce po změně extruderu, aby se ušetřil materiál, který by jinak skon�il v �istící věži. Výsledkem budou objekty s náhodně mixovanými barvami."
+
+#: src/slic3r/GUI/Plater.cpp:1018
+msgid "object(s)"
+msgstr "objekt(y)"
+
+#: src/slic3r/GUI/Plater.cpp:1043 src/slic3r/GUI/Plater.cpp:1058
+msgid "objects"
+msgstr "objekty"
+
+#: xs/src/libslic3r/PrintConfig.cpp:2006
+msgid "Objects will be used to wipe 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 "Objekty budou použity k vy�ištění barvy filamentu v trysce po změně extruderu, aby se ušetřil materiál, který by jinak skon�il v �istící věži. Výsledkem budou objekty s náhodně mixovanými barvami."
+
+#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:808
+msgid "Octagram Spiral"
+msgstr "Octagram Spiral"
+
+#: xs/src/slic3r/GUI/Tab.cpp:1520 xs/src/slic3r/Utils/OctoPrint.cpp:110
+msgid "OctoPrint upload"
+msgstr "OctoPrint nahrávání"
+
+#: lib/Slic3r/GUI/Plater.pm:1576
+msgid "OctoPrint upload finished."
+msgstr "Nahrávání do OctoPrintu dokon�eno."
+
+#: src/slic3r/GUI/BonjourDialog.cpp:76
+msgid "OctoPrint version"
+msgstr "Verze OctoPrintu"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2419
+msgid "of a current Object"
+msgstr "sou�asného Objektu"
+
+#: src/libslic3r/Print.cpp:1285
+msgid "One or more object were assigned an extruder that the printer does not have."
+msgstr "Jeden nebo více objektů bylo přiřazeno extruderu, který tiskárna nemá."
+
+#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:2425
+msgid "Only create support if it lies on a build plate. Don't create support on a print."
+msgstr "Podpěry vytvářet pouze v případě, že leží na tiskové podložce. Nevytváří podpěry na výtisky."
+
+#: src/libslic3r/PrintConfig.cpp:978
+msgid "Only infill where needed"
+msgstr "Výplň pouze kde je potřeba"
+
+#: src/slic3r/GUI/Tab.cpp:2271
+msgid "Only lift Z"
+msgstr "Pouze zvednout Z"
+
+#: src/libslic3r/PrintConfig.cpp:1500
+msgid "Only lift Z above"
+msgstr "Zvednout Z pouze nad"
+
+#: src/libslic3r/PrintConfig.cpp:1509
+msgid "Only lift Z below"
+msgstr "Zvednout Z pouze pod"
+
+#: src/libslic3r/PrintConfig.cpp:1279
+msgid "Only retract when crossing perimeters"
+msgstr "Provést retrakci pouze při přejíždění perimetrů"
+
+#: src/slic3r/GUI/Tab.cpp:1126
+msgid "Ooze prevention"
+msgstr "Prevence odkapávání"
+
+#: lib/Slic3r/GUI/MainFrame.pm:215
+msgid "Open a model"
+msgstr "Otevřít model"
+
+#: src/slic3r/GUI/MainFrame.cpp:339
+msgid "Open a project file"
+msgstr "Otevřít soubor s projektem"
+
+#: src/slic3r/GUI/Tab.cpp:1745
+msgid "Open CA certificate file"
+msgstr "Otevřít soubor s certifikátem CA"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
+msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
+msgstr "Otevřít soubor STL/OBJ/AMF/3MF s konfigurací (smaže tiskovou plochu)"
+
+#: lib/Slic3r/GUI/MainFrame.pm:215
+msgid "Open STL/OBJ/AMF/3MF…\tCtrl+O"
+msgstr "Otevřít STL/OBJ/AMF/3MF… Ctrl+O"
+
+#: src/slic3r/GUI/MainFrame.cpp:554
+#, possible-c-format
+msgid "Open the %s manual in your browser"
+msgstr "Otevřít návod k %s v prohlíže�i"
+
+#: src/slic3r/GUI/MainFrame.cpp:551
+#, possible-c-format
+msgid "Open the %s website in your browser"
+msgstr "Otevřít webovou stránku %s v prohlíže�i"
+
+#: lib/Slic3r/GUI/Plater.pm:2296
+msgid "Open the 3D cutting tool"
+msgstr "Otevřete nástroj 3D řezání"
+
+#: lib/Slic3r/GUI/Plater.pm:2300
+msgid "Open the object editor dialog"
+msgstr "Otevře dialogové okno editoru objektů"
+
+#: src/slic3r/GUI/MainFrame.cpp:544
+msgid "Open the Prusa Edition releases page in your browser"
+msgstr "Otevřít stránku vydání Prusa Edice ve vašem prohlíže�i"
+
+#: src/slic3r/GUI/MainFrame.cpp:542
+msgid "Open the Prusa3D drivers download page in your browser"
+msgstr "Otevřít stránku pro stahování Prusa 3D ovlada�ů ve vašem prohlíže�i"
+
+#: src/slic3r/GUI/MainFrame.cpp:470
+msgid "Open the Slic3r manual in your browser"
+msgstr "Otevřít Slic3r návod ve vašem prohlíže�i"
+
+#: src/slic3r/GUI/MainFrame.cpp:468
+msgid "Open the Slic3r website in your browser"
+msgstr "Otevřít webovou stránku Slic3ru ve vašem prohlíže�i"
+
+#: src/slic3r/GUI/Plater.cpp:2994
+msgid "Optimize orientation"
+msgstr "Optimalizovat orientaci"
+
+#: src/slic3r/GUI/Plater.cpp:2994
+msgid "Optimize the rotation of the object for better print results."
+msgstr "Optimalizujte rotaci objektu pro lepší výsledky tisku."
+
+#: src/libslic3r/PrintConfig.cpp:112
+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 "Optimalizovat rychloposuny do pořadí aby se minimalizovalo přejíždění perimetrů. Nejvíce užite�né u Bowdenových extruderů které trpí na vytékání filamentu. Toto nastavení zpomaluje tisk i generování G-code."
+
+#: src/slic3r/GUI/Tab.cpp:1070
+msgid "Options for support material and raft"
+msgstr "Volby pro podpěry a raft"
+
+#: src/slic3r/GUI/Plater.cpp:2251
+msgid "Orientation found."
+msgstr "Orientace nalezena."
+
+#: src/slic3r/GUI/Plater.cpp:2185
+msgid "Orientation search canceled"
+msgstr "Hledávání optimální orientace bylo zrušeno"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:79
+msgid "Origin"
+msgstr "Po�átek"
+
+#: src/slic3r/GUI/Tab.cpp:1165
+msgid "Other"
+msgstr "Ostatní"
+
+#: src/libslic3r/PrintConfig.cpp:119 src/libslic3r/PrintConfig.cpp:1977
+msgid "Other layers"
+msgstr "Ostatní vrstvy"
+
+#: xs/src/slic3r/GUI/ConfigWizard.cpp:252
+msgid "Other vendors"
+msgstr "Ostatní výrobci"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:438
+msgid "Other Vendors"
+msgstr "Ostatní výrobci"
+
+#: src/slic3r/GUI/Tab.cpp:1180 src/slic3r/GUI/Tab.cpp:3440
+msgid "Output file"
+msgstr "Výstupní soubor"
+
+#: src/libslic3r/PrintConfig.cpp:3104
+msgid "Output File"
+msgstr "Výstupní soubor"
+
+#: src/libslic3r/PrintConfig.cpp:1294
+msgid "Output filename format"
+msgstr "Formát názvu výstupního souboru"
+
+#: src/libslic3r/PrintConfig.cpp:2992
+msgid "Output Model Info"
+msgstr "Info o výstupním modelu"
+
+#: src/slic3r/GUI/Tab.cpp:1168 src/slic3r/GUI/Tab.cpp:3439
+msgid "Output options"
+msgstr "Možnosti výstupu"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:229 src/libslic3r/GCode/PreviewData.cpp:165
+msgid "Overhang perimeter"
+msgstr "Perimetr převisu"
+
+#: src/libslic3r/PrintConfig.cpp:1955
+msgid "Overhang threshold"
+msgstr "Mezní úhel převisu"
+
+#: src/slic3r/GUI/Tab.cpp:1153
+msgid "Overlap"
+msgstr "Překrytí"
+
+#: src/slic3r/GUI/MainFrame.cpp:478
+msgid "P&rint Settings Tab"
+msgstr "Panel nastavení tisku"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:79 src/slic3r/GUI/GUI_ObjectList.cpp:520
+#: src/slic3r/GUI/Tab.cpp:3425 src/slic3r/GUI/Tab.cpp:3426
+#: src/libslic3r/PrintConfig.cpp:2516 src/libslic3r/PrintConfig.cpp:2523
+#: src/libslic3r/PrintConfig.cpp:2537 src/libslic3r/PrintConfig.cpp:2547
+#: src/libslic3r/PrintConfig.cpp:2560 src/libslic3r/PrintConfig.cpp:2569
+msgid "Pad"
+msgstr "Podložka"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:39
+msgid "Pad and Support"
+msgstr "Podložka a Podppěry"
+
+#: src/libslic3r/PrintConfig.cpp:2559
+msgid "Pad edge radius"
+msgstr "Poloměr hrany podložky"
+
+#: src/libslic3r/PrintConfig.cpp:2532
+msgid "Pad wall height"
+msgstr "Výška bo�nice podložky"
+
+#: src/libslic3r/PrintConfig.cpp:2568
+msgid "Pad wall slope"
+msgstr "Sklon bo�nice podložky"
+
+#: src/libslic3r/PrintConfig.cpp:2522
+msgid "Pad wall thickness"
+msgstr "Tloušťka stěny podložky"
+
+#: src/slic3r/GUI/Field.cpp:108
+msgid "parameter name"
+msgstr "název parametru"
+
+#: src/slic3r/GUI/Field.cpp:184
+msgid "Parameter validation"
+msgstr "Validace parametru"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2412
+msgid "Part"
+msgstr "Část"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1881
+msgid "Part manipulation"
+msgstr "Manipulace s �ástmi"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1872
+msgid "Part Settings to modify"
+msgstr "Změna nastavení �ásti"
+
+#: src/slic3r/GUI/MainFrame.cpp:456
+msgid "Paste clipboard"
+msgstr "Vložit ze schránky"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+msgid "Paste from clipboard"
+msgstr "Vložit ze schránky"
+
+#: src/libslic3r/PrintConfig.cpp:1915
+msgid "Pattern"
+msgstr "Vzor"
+
+#: src/libslic3r/PrintConfig.cpp:1805
+msgid "Pattern angle"
+msgstr "Úhel vzoru"
+
+#: src/libslic3r/PrintConfig.cpp:1929
+msgid "Pattern spacing"
+msgstr "Rozte� podpěr"
+
+#: src/libslic3r/PrintConfig.cpp:1917
+msgid "Pattern used to generate support material."
+msgstr "Vzor použitý pro generování podpěr."
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:36
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:198
+msgid "Perform cut"
+msgstr "Provést řez"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:227 src/libslic3r/GCode/PreviewData.cpp:163
+msgid "Perimeter"
+msgstr "Perimetr"
+
+#: src/libslic3r/PrintConfig.cpp:1339
+msgid "Perimeter extruder"
+msgstr "Extruder pro perimetry"
+
+#: src/slic3r/GUI/PresetHints.cpp:162
+msgid "perimeters"
+msgstr "perimetry"
+
+#: src/libslic3r/PrintConfig.cpp:1330 src/libslic3r/PrintConfig.cpp:1348
+#: src/libslic3r/PrintConfig.cpp:1360 src/libslic3r/PrintConfig.cpp:1370
+msgid "Perimeters"
+msgstr "Perimetry"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:440
+#, possible-c-format
+msgid "Pick another vendor supported by %s:"
+msgstr "Vyberte si jiného prodejce podporovaného v %s:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:423
+msgid "Pick another vendor supported by Slic3r PE:"
+msgstr "Vyberte si jiného prodejce podporovaného v Slic3r PE:"
+
+#: src/libslic3r/PrintConfig.cpp:2430
+msgid "Pillar widening factor"
+msgstr "Koeficient rozšiřování podpěry"
+
+#: src/slic3r/GUI/Tab.cpp:3496
+msgid "Pinhead diameter should be smaller than the pillar diameter."
+msgstr "Průměr hrotu by měl být menší než průměr podpěry."
+
+#: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:32
+msgid "Place on face [F]"
+msgstr "Umístit plochou na podložku [F]"
+
+#: src/slic3r/GUI/Plater.cpp:2897
+msgid "Place one more copy of the selected object"
+msgstr "Přidá jednu kopii vybraného objektu"
+
+#: src/slic3r/GUI/MainFrame.cpp:161
+msgid "Plater"
+msgstr "Podložka"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+msgid "Plater Shortcuts"
+msgstr "Podložka"
+
+#: src/slic3r/GUI/GUI.cpp:143
+msgid "Please check and fix your object list."
+msgstr "Zkontrolujte a opravte seznam objektů."
+
+#: src/slic3r/GUI/Tab.cpp:2797
+msgid "Please check your object list before preset changing."
+msgstr "Před změnou nastavení zkontrolujte prosím seznam objektů."
+
+#: lib/Slic3r/GUI/Plater.pm:1897
+msgid "Please install the OpenGL modules to use this feature (see build instructions)."
+msgstr "Pro použití této funkce prosím nainstalujte OpenGL moduly (viz instrukce vlastního sestavení)."
+
+#: src/slic3r/GUI/GUI_App.cpp:742
+msgid "Please, check your changes before."
+msgstr "Prosím, nejdříve zkontrolujte provedené změny."
+
+#: src/libslic3r/PrintConfig.cpp:2235
+msgid "Portrait"
+msgstr "Orientace na výšku"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:150
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:193
+msgid "Position"
+msgstr "Pozice"
+
+#: src/slic3r/GUI/Tab.cpp:2265
+msgid "Position (for multi-extruder printers)"
+msgstr "Pozice (pro tiskárny s více extrudery)"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:177
+msgid "Position (mm)"
+msgstr "Pozice (mm)"
+
+#: src/libslic3r/PrintConfig.cpp:1553
+msgid "Position of perimeters starting points."
+msgstr "Pozice za�átku perimetrů."
+
+#: src/libslic3r/PrintConfig.cpp:2123
+msgid "Position X"
+msgstr "Pozice X"
+
+#: src/libslic3r/PrintConfig.cpp:2130
+msgid "Position Y"
+msgstr "Pozice Y"
+
+#: src/slic3r/GUI/Tab.cpp:1187 src/libslic3r/PrintConfig.cpp:1383
+msgid "Post-processing scripts"
+msgstr "Postproduk�ní skripty"
+
+#: src/slic3r/GUI/MainFrame.cpp:489
+msgid "Pre&view"
+msgstr "Náhled"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:121 src/slic3r/GUI/Preferences.cpp:10
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: src/libslic3r/PrintConfig.cpp:1571
+msgid "Preferred direction of the seam"
+msgstr "Preferovaný směr švu"
+
+#: src/libslic3r/PrintConfig.cpp:1582
+msgid "Preferred direction of the seam - jitter"
+msgstr "Preferovaný směr švu - rozkmit"
+
+#: src/slic3r/GUI/Tab.cpp:2758
+#, possible-c-format
+msgid "Preset (%s)"
+msgstr "Přednastavení (%s)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:148
+msgid "Press to scale or rotate selected objects\naround their own center"
+msgstr "Stisknutím změníte velikost nebo oto�íte vybranými objekty kolem vlastního středu"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
+msgid "Press to select multiple object or move multiple object with mouse"
+msgstr "Stisknutím vyberte více objektů nebo přesuňte více objektů pomocí myši"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
+#, no-c-format
+msgid "Press to snap by 5% in Gizmo scale\nor by 1mm in Gizmo move"
+msgstr "Stiskněte pro změnu velikosti s krokem 5%\nnebo pro posun s krokem 1mm"
+
+#: src/slic3r/GUI/Tab.cpp:2288
+msgid "Preview"
+msgstr "Náhled"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+msgid "Preview Shortcuts"
+msgstr "Náhled"
+
+#: src/slic3r/GUI/MainFrame.cpp:641
+msgid "Previously sliced file ("
+msgstr "Dříve slicovaný soubor ("
+
+#: src/libslic3r/PrintConfig.cpp:1773
+msgid "Prime all printing extruders"
+msgstr "Příprava všech tiskových extruderů"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1274
+msgid "print"
+msgstr "tisk"
+
+#: src/slic3r/GUI/MainFrame.cpp:510
+msgid "Print &Host Upload Queue"
+msgstr "Fronta na&hrávání do tiskového serveru"
+
+#: src/libslic3r/PrintConfig.cpp:439
+msgid "Print contour perimeters from the outermost one to the innermost one instead of the default inverse order."
+msgstr "Tisk obrysových perimetrů od vnějších po vnitřní namísto opa�ného výchozího pořadí."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:541
+msgid "Print Diameters"
+msgstr "Průměry tisku"
+
+#: src/slic3r/GUI/Tab.cpp:1917 src/slic3r/GUI/Tab.cpp:2074
+msgid "Print Host upload"
+msgstr "Nahrání do tiskového serveru"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
+#: src/slic3r/GUI/PrintHostDialogs.cpp:135
+msgid "Print host upload queue"
+msgstr "Fronta nahrávaní do tiskového serveru"
+
+#: src/slic3r/GUI/Tab.hpp:317 src/slic3r/GUI/Tab.hpp:405
+msgid "Print Settings"
+msgstr "Nastavení tisku"
+
+#: src/slic3r/GUI/Plater.cpp:681
+msgid "Print settings"
+msgstr "Nastavení tisku"
+
+#: src/slic3r/GUI/Tab.cpp:1520
+msgid "Print speed override"
+msgstr "Přepsání rychlosti tisku"
+
+#: src/slic3r/GUI/MainFrame.cpp:483
+msgid "Print&er Settings Tab"
+msgstr "Panel nastavení tiskárny"
+
+#: src/slic3r/GUI/Plater.cpp:685
+msgid "Printer"
+msgstr "Tiskárna"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:48 src/slic3r/GUI/Preset.cpp:1278
+msgid "printer"
+msgstr "tiskárna"
+
+#: src/libslic3r/PrintConfig.cpp:2274 src/libslic3r/PrintConfig.cpp:2275
+msgid "Printer absolute correction"
+msgstr "Absolutní korekce tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:2282 src/libslic3r/PrintConfig.cpp:2283
+msgid "Printer gamma correction"
+msgstr "Gamma korekce tiskárny"
+
+#: src/slic3r/GUI/Tab.cpp:926
+msgid "printer model"
+msgstr "model tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:1402
+msgid "Printer notes"
+msgstr "Poznámky o tiskárně"
+
+#: src/libslic3r/PrintConfig.cpp:2266 src/libslic3r/PrintConfig.cpp:2267
+#: src/libslic3r/PrintConfig.cpp:2268
+msgid "Printer scaling correction"
+msgstr "Korekce měřítka tisku"
+
+#: src/slic3r/GUI/Tab.hpp:368
+msgid "Printer Settings"
+msgstr "Nastavení tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:42 src/libslic3r/PrintConfig.cpp:43
+msgid "Printer technology"
+msgstr "Technologie tisku"
+
+#: src/libslic3r/PrintConfig.cpp:1396
+msgid "Printer type"
+msgstr "Typ tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:1417
+msgid "Printer variant"
+msgstr "Varianta tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:1411
+msgid "Printer vendor"
+msgstr "Prodejce tiskárny"
+
+#: src/libslic3r/Print.cpp:1294
+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 "Tisk s více extrudery různých průměrů trysek. Má-li být podpěra tisknuta aktuálním extruderem (support_material_extruder == 0 nebo support_material_interface_extruder == 0), musí mít všechny trysky stejný průměr."
+
+#: lib/Slic3r/GUI/Plater.pm:324
+msgid "Print…"
+msgstr "Tisk…"
+
+#: src/slic3r/GUI/MainFrame.cpp:704
+msgid "Processing "
+msgstr "Zpracovávám "
+
+#: lib/Slic3r/GUI/Plater.pm:713 lib/Slic3r/GUI/Plater.pm:727
+msgid "Processing input file\n"
+msgstr "Zpracovávám vstupní soubor\n"
+
+#: src/slic3r/GUI/Plater.cpp:1600
+#, possible-c-format
+msgid "Processing input file %s\n"
+msgstr "Zpracovávám vstupní soubor %s\n"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2160
+msgid "Processing small holes"
+msgstr "Zpracování malých otvorů"
+
+#: src/slic3r/GUI/Tab.cpp:1201 src/slic3r/GUI/Tab.cpp:1585
+#: src/slic3r/GUI/Tab.cpp:1993 src/slic3r/GUI/Tab.cpp:2087
+#: src/slic3r/GUI/Tab.cpp:3337 src/slic3r/GUI/Tab.cpp:3446
+msgid "Profile dependencies"
+msgstr "Profilové závislosti"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:779
+msgid "Progress:"
+msgstr "Průběh:"
+
+#: src/slic3r/GUI/MainFrame.cpp:542
+msgid "Prusa 3D &Drivers"
+msgstr "Prusa 3&D Ovlada�e"
+
+#: lib/Slic3r/GUI/MainFrame.pm:338
+msgid "Prusa 3D Drivers"
+msgstr "Prusa 3D Ovlada�e"
+
+#: src/slic3r/GUI/MainFrame.cpp:544
+msgid "Prusa Edition &Releases"
+msgstr "Vydání P&rusa Edice"
+
+#: lib/Slic3r/GUI/MainFrame.pm:341
+msgid "Prusa Edition Releases"
+msgstr "Vydání Prusa Edice"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1109
+msgid "Prusa FFF Technology Printers"
+msgstr "Prusa tiskárny technologie FFF"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1112
+msgid "Prusa MSLA Technology Printers"
+msgstr "Prusa tiskárny technologie MSLA"
+
+#: src/libslic3r/PrintConfig.cpp:2153
+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 "Vy�ištění trysky po výměně filamentu se provede uvnitř výplní tohoto objektu. Tím se snižuje množství odpadu, ale může to mít za následek delší dobu tisku v důsledku dodate�ných pohybů."
+
+#: xs/src/libslic3r/PrintConfig.cpp:1996
+msgid "Purging into infill"
+msgstr "Čištění do výplně"
+
+#: xs/src/libslic3r/PrintConfig.cpp:2005
+msgid "Purging into objects"
+msgstr "Čištění do objektů"
+
+#: src/slic3r/GUI/Plater.cpp:456
+msgid "Purging volumes"
+msgstr "Objemy �ištění"
+
+#: src/libslic3r/PrintConfig.cpp:2106
+msgid "Purging volumes - load/unload volumes"
+msgstr "Objemy �ištění - zaváděné / vyjmuté objemy"
+
+#: src/libslic3r/PrintConfig.cpp:2113
+msgid "Purging volumes - matrix"
+msgstr "Objemy �ištění - matice"
+
+#: lib/Slic3r/GUI/MainFrame.pm:232
+msgid "Q&uick Slice…\tCtrl+U"
+msgstr "R&ychlé Slicování…\tCtrl+U"
+
+#: src/slic3r/GUI/Tab.cpp:1019
+msgid "Quality (slower slicing)"
+msgstr "Kvalita (pomalejší slicing)"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:854 src/slic3r/GUI/GUI_ObjectList.cpp:1139
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1145
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1377
+#, possible-c-format
+msgid "Quick Add Settings (%s)"
+msgstr "Rychlé přidání nastavení (%s)"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
+msgid "Quick slice"
+msgstr "Rychlé slicování"
+
+#: src/slic3r/GUI/MainFrame.cpp:383
+msgid "Quick Slice"
+msgstr "Rychlé Slicování"
+
+#: lib/Slic3r/GUI/MainFrame.pm:238
+msgid "Quick Slice and Save &As…\tCtrl+Alt+U"
+msgstr "Rychlé Slicování a Uložit &jako…\tCtrl+Alt+U"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
+msgid "Quick slice and Save as"
+msgstr "Rychlé Slicování a Uložit jako"
+
+#: src/slic3r/GUI/MainFrame.cpp:389
+msgid "Quick Slice and Save As"
+msgstr "Rychlé Slicování a Uložit jako"
+
+#: src/slic3r/GUI/MainFrame.cpp:409
+#, possible-c-format
+msgid "Quit %s"
+msgstr "Ukon�it %s"
+
+#: src/slic3r/GUI/MainFrame.cpp:340
+msgid "Quit Slic3r"
+msgstr "Ukon�it Slic3r"
+
+#: src/libslic3r/PrintConfig.cpp:479
+msgid "Radius"
+msgstr "Rádius"
+
+#: src/slic3r/GUI/Tab.cpp:1066
+msgid "Raft"
+msgstr "Raft"
+
+#: src/libslic3r/PrintConfig.cpp:1431
+msgid "Raft layers"
+msgstr "Vrstev raftu"
+
+#: xs/src/slic3r/GUI/Tab.cpp:1299
+msgid "Ramming"
+msgstr "Rapidní extruze"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:14
+msgid "Ramming customization"
+msgstr "Přizpůsobení rapidní extruze"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:40
+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\nThis 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\nToto 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:90
+msgid "Ramming line spacing"
+msgstr "Rozestup linek při rapidní extruzi"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:88
+msgid "Ramming line width"
+msgstr "Šířka linky při rapidní extruzi"
+
+#: src/libslic3r/PrintConfig.cpp:662
+msgid "Ramming parameters"
+msgstr "Parametry rapidní extruze"
+
+#: src/slic3r/GUI/Tab.cpp:1545
+msgid "Ramming settings"
+msgstr "Nastavení rapidní extruze"
+
+#: src/libslic3r/PrintConfig.cpp:1559
+msgid "Random"
+msgstr "Náhodný"
+
+#: src/libslic3r/SLAPrint.cpp:72
+msgid "Rasterizing layers"
+msgstr "Rasterizace vrstev"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:151
+msgid "Re-configure"
+msgstr "Přenastavit"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:783
+msgid "Ready"
+msgstr "Připraveno"
+
+#: src/slic3r/GUI/Plater.cpp:2406
+msgid "Ready to slice"
+msgstr "Připraven ke slicování"
+
+#: src/slic3r/GUI/MainFrame.cpp:526 src/libslic3r/PrintConfig.cpp:1562
+msgid "Rear"
+msgstr "Zezadu"
+
+#: src/slic3r/GUI/MainFrame.cpp:526
+msgid "Rear View"
+msgstr "Pohled zezadu"
+
+#: src/slic3r/GUI/PresetHints.cpp:264
+#, possible-c-format
+msgid "Recommended object thin wall thickness for layer height %.2f and "
+msgstr "Doporu�ená tloušťka stěny objektu pro výšku vrstvy %.2f a"
+
+#: src/slic3r/GUI/PresetHints.cpp:247
+msgid "Recommended object thin wall thickness: Not available due to invalid layer height."
+msgstr "Doporu�ená tloušťka stěny objektu: Není k dispozici kvůli neplatné výšce vrstvy."
+
+#: src/slic3r/GUI/GUI_App.cpp:386 src/slic3r/GUI/GUI_App.cpp:395
+msgid "Recreating"
+msgstr "Obnovení"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:68
+msgid "Rectangular"
+msgstr "Obdélníkový"
+
+#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:796
+#: src/libslic3r/PrintConfig.cpp:1922
+msgid "Rectilinear"
+msgstr "Přímo�ará"
+
+#: src/libslic3r/PrintConfig.cpp:1923
+msgid "Rectilinear grid"
+msgstr "Přímo�ará mřížka"
+
+#: src/slic3r/GUI/Tab.cpp:1037
+msgid "Reducing printing time"
+msgstr "Zkracování tiskového �asu"
+
+#: src/slic3r/GUI/Plater.cpp:2924
+msgid "Reload from Disk"
+msgstr "Znovu na�íst z Disku"
+
+#: src/slic3r/GUI/Plater.cpp:2924
+msgid "Reload the selected file from Disk"
+msgstr "Znovu na�íst vybraný objekt z Disku"
+
+#: src/slic3r/GUI/Preferences.cpp:36
+msgid "Remember output directory"
+msgstr "Pamatovat si výstupní složku"
+
+#: src/slic3r/GUI/Tab.cpp:2935
+msgid "remove"
+msgstr "odebrat"
+
+#: src/slic3r/GUI/Tab.cpp:2937
+msgid "Remove"
+msgstr "Odebrat"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:859
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:912
+msgid "Remove all points"
+msgstr "Odebrat všechny body"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:125
+msgid "Remove Instance from selected object"
+msgstr "Odebrat instanci  vybraného objektu"
+
+#: src/slic3r/GUI/Plater.cpp:2899
+msgid "Remove one copy of the selected object"
+msgstr "Odstraní jednu kopii vybraného objektu"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1230
+msgid "Remove point"
+msgstr "Odebrat bod"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1233
+msgid "Remove point from selection"
+msgstr "Odebrat bod z výběru"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:855
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1237
+msgid "Remove selected points"
+msgstr "Odebrat ozna�ené body"
+
+#: src/slic3r/GUI/Plater.cpp:2891 src/slic3r/GUI/Plater.cpp:2909
+msgid "Remove the selected object"
+msgstr "Odstranit vybraný objekt"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:305
+msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
+msgstr "Odstranit uživatelské profily - �istá instalace (nejprve bude provedena záloha)"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1200
+msgid "Rename"
+msgstr "Přejmenovat"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2709
+msgid "Renaming"
+msgstr "Přejmenování"
+
+#: src/libslic3r/PrintConfig.cpp:3125
+msgid "Render with a software renderer"
+msgstr "Vykreslení pomocí softwaru"
+
+#: src/libslic3r/PrintConfig.cpp:3126
+msgid "Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver."
+msgstr "Vykreslení pomocí softwaru. Namísto výchozího ovlada�e OpenGL je na�ten dodaný softwarový renderer MESA."
+
+#: src/slic3r/GUI/MainFrame.cpp:772 src/libslic3r/PrintConfig.cpp:3058
+msgid "Repair"
+msgstr "Oprava"
+
+#: lib/Slic3r/GUI/MainFrame.pm:258
+msgid "Repair STL file…"
+msgstr "Opravit soubor STL…"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:387
+msgid "Repaired 3MF file contains more than one object"
+msgstr "Opravený soubor 3MF obsahuje více než jeden objekt."
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:391
+msgid "Repaired 3MF file contains more than one volume"
+msgstr "Opravený soubor 3MF obsahuje více než jedno těleso."
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:385
+msgid "Repaired 3MF file does not contain any object"
+msgstr "Opravený soubor 3MF neobsahuje žádný objekt"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:389
+msgid "Repaired 3MF file does not contain any volume"
+msgstr "Opravený soubor 3MF neobsahuje žádný objemové těleso"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:242
+msgid "Repairing model by the Netfabb service"
+msgstr "Opravování modelu službou Netfabb"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:113 src/slic3r/GUI/MainFrame.cpp:395
+msgid "Repeat last quick slice"
+msgstr "Opakovat poslední rychlé slicování"
+
+#: src/slic3r/GUI/MainFrame.cpp:395
+msgid "Repeat Last Quick Slice"
+msgstr "Opakovat poslední rychlé slicování"
+
+#: src/slic3r/GUI/MainFrame.cpp:561
+msgid "Report an I&ssue"
+msgstr "Nahlá&sit chybu"
+
+#: lib/Slic3r/GUI/MainFrame.pm:361
+msgid "Report an Issue"
+msgstr "Nahlásit chybu"
+
+#: src/slic3r/GUI/MainFrame.cpp:561
+#, possible-c-format
+msgid "Report an issue on %s"
+msgstr "Nahlásit chybu v programu %s"
+
+#: src/slic3r/GUI/MainFrame.cpp:477
+msgid "Report an issue on the Slic3r Prusa Edition"
+msgstr "Nahlásit chybu ve Slic3eru Prusa Edice"
+
+#: src/slic3r/Utils/PresetUpdater.cpp:590
+#, possible-c-format
+msgid "requires max. %s"
+msgstr "vyžaduje max. %s"
+
+#: src/slic3r/Utils/PresetUpdater.cpp:588
+#, possible-c-format
+msgid "requires min. %s"
+msgstr "vyžaduje min. %s"
+
+#: src/slic3r/Utils/PresetUpdater.cpp:583
+#, possible-c-format
+msgid "requires min. %s and max. %s"
+msgstr "vyžaduje min. %s a max. %s"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:772
+msgid "Rescan"
+msgstr "Skenovat"
+
+#: src/slic3r/GUI/Tab.cpp:1879
+msgid "Rescan serial ports"
+msgstr "Znovu prohledat sériové porty"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1239
+msgid "Reset clipping plane"
+msgstr "Obnovit řezovou rovinu"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:928
+msgid "Reset direction"
+msgstr "Resetovat směr"
+
+#: src/libslic3r/PrintConfig.cpp:1441
+msgid "Resolution"
+msgstr "Rozlišení"
+
+#: src/libslic3r/PrintConfig.cpp:1459
+msgid "Retract amount before wipe"
+msgstr "Délka retrakce před o�ištěním"
+
+#: src/libslic3r/PrintConfig.cpp:1467
+msgid "Retract on layer change"
+msgstr "Retrakce při změně vrstvy"
+
+#: src/slic3r/GUI/Tab.cpp:2268
+msgid "Retraction"
+msgstr "Retrakce"
+
+#: src/libslic3r/PrintConfig.cpp:1453
+msgid "Retraction is not triggered when travel moves are shorter than this length."
+msgstr "Retrakce není spuštěna, pokud jsou rychloposuny pojezdu kratší než tato délka."
+
+#: src/libslic3r/PrintConfig.cpp:1474
+msgid "Retraction Length"
+msgstr "Vzdálenost retrakce"
+
+#: src/libslic3r/PrintConfig.cpp:1482
+msgid "Retraction Length (Toolchange)"
+msgstr "Vzdálenost retrakce (při změně extruderu)"
+
+#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1535
+msgid "Retraction Speed"
+msgstr "Rychlost retrakce"
+
+#: src/slic3r/GUI/Tab.cpp:2284
+msgid "Retraction when tool is disabled (advanced settings for multi-extruder setups)"
+msgstr "Retrakce pro neaktivní extruder (pokro�ilé nastavení pro tiskárny typu MultiMaterial)"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:244
+msgid "Retractions"
+msgstr "Retrakce"
+
+#: src/slic3r/GUI/MainFrame.cpp:528
+msgid "Right"
+msgstr "Zprava"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:279
+msgid "Right button click the icon to change the object settings"
+msgstr "Klepnutím pravým tla�ítkem myši na ikonu změníte nastavení objektu"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:250
+msgid "Right button click the icon to fix STL through Netfabb"
+msgstr "Klepnutím pravým tla�ítkem myši se spustí oprava STL souboru pomocí služby Netfabb"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:598
+msgid "Right mouse click - remove point"
+msgstr "Kliknutí pravým tla�ítkem myši - odebrání bodu"
+
+#: src/slic3r/GUI/MainFrame.cpp:528
+msgid "Right View"
+msgstr "Pohled zprava"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:233
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
+#: src/libslic3r/PrintConfig.cpp:3062
+msgid "Rotate"
+msgstr "Oto�it"
+
+#: lib/Slic3r/GUI/Plater.pm:2228
+msgid "Rotate 45° clockwise"
+msgstr "Oto�it o 45° ve směru hodinových ru�i�ek"
+
+#: lib/Slic3r/GUI/Plater.pm:2231
+msgid "Rotate 45° counter-clockwise"
+msgstr "Oto�it o 45° proti směru hodinových ru�i�ek"
+
+#: lib/Slic3r/GUI/Plater.pm:1042
+msgid "Rotate around "
+msgstr "Oto�it okolo"
+
+#: src/libslic3r/PrintConfig.cpp:3067
+msgid "Rotate around X"
+msgstr "Oto�it okolo osy X"
+
+#: src/libslic3r/PrintConfig.cpp:3072
+msgid "Rotate around Y"
+msgstr "Oto�it okolo osy Y"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:35
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:195
+msgid "Rotate lower part upwards"
+msgstr "Oto�it spodní �ást řezem dolů"
+
+#: lib/Slic3r/GUI/Plater.pm:2228
+msgid "Rotate the selected object by 45° clockwise"
+msgstr "Oto�it vybraný objekt o 45° ve směru hodinových ru�i�ek"
+
+#: lib/Slic3r/GUI/Plater.pm:2231
+msgid "Rotate the selected object by 45° counter-clockwise"
+msgstr "Oto�it vybraný objekt o 45° proti směru hodinových ru�i�ek"
+
+#: lib/Slic3r/GUI/Plater.pm:2236
+msgid "Rotate the selected object by an arbitrary angle"
+msgstr "Oto�it vybraným objektem o libovolný úhel"
+
+#: lib/Slic3r/GUI/Plater.pm:2238
+msgid "Rotate the selected object by an arbitrary angle around X axis"
+msgstr "Oto�it vybraným objektem o libovolný úhel kolem osy X"
+
+#: lib/Slic3r/GUI/Plater.pm:2241
+msgid "Rotate the selected object by an arbitrary angle around Y axis"
+msgstr "Oto�it vybraným objektem o libovolný úhel kolem osy Y"
+
+#: lib/Slic3r/GUI/Plater.pm:2244
+msgid "Rotate the selected object by an arbitrary angle around Z axis"
+msgstr "Oto�it vybraným objektem o libovolný úhel kolem osy Z"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:458
+msgid "Rotate [R]"
+msgstr "Oto�it [R]"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:151
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:194
+msgid "Rotation"
+msgstr "Otá�ení"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:491
+msgid "Rotation (deg)"
+msgstr "Otá�ení (stupně)"
+
+#: src/libslic3r/PrintConfig.cpp:3068
+msgid "Rotation angle around the X axis in degrees."
+msgstr "Úhel oto�ení kolem osy X ve stupních."
+
+#: src/libslic3r/PrintConfig.cpp:3073
+msgid "Rotation angle around the Y axis in degrees."
+msgstr "Úhel oto�ení kolem osy Y ve stupních."
+
+#: src/libslic3r/PrintConfig.cpp:3063
+msgid "Rotation angle around the Z axis in degrees."
+msgstr "Úhel oto�ení kolem osy Z ve stupních."
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2158
+msgid "Routing supports to model surface"
+msgstr "Směrování podpěr k povrchu modelu"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2157
+msgid "Routing to ground"
+msgstr "Směrování k zemi"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:298 src/slic3r/GUI/GUI_App.cpp:658
+#, possible-c-format
+msgid "Run %s"
+msgstr "Spustit %s"
+
+#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82 src/libslic3r/PrintConfig.cpp:612
+#: src/libslic3r/PrintConfig.cpp:656 src/libslic3r/PrintConfig.cpp:671
+#: src/libslic3r/PrintConfig.cpp:2243 src/libslic3r/PrintConfig.cpp:2252
+#: src/libslic3r/PrintConfig.cpp:2312 src/libslic3r/PrintConfig.cpp:2319
+msgid "s"
+msgstr "s"
+
+#: src/slic3r/GUI/MainFrame.cpp:677 src/slic3r/GUI/Tab.cpp:3239
+msgid "Save "
+msgstr "Uložit "
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1023
+msgid "Save changes?"
+msgstr "Uložit změny?"
+
+#: src/libslic3r/PrintConfig.cpp:2997
+msgid "Save config file"
+msgstr "Uložit konfigura�ní soubor"
+
+#: src/slic3r/GUI/MainFrame.cpp:786
+msgid "Save configuration as:"
+msgstr "Uložit konfiguraci jako:"
+
+#: src/libslic3r/PrintConfig.cpp:2998
+msgid "Save configuration to the specified file."
+msgstr "Uložit konfiguraci do zadaného souboru."
+
+#: src/slic3r/GUI/Tab.cpp:130
+msgid "Save current "
+msgstr "Uložit stávající "
+
+#: src/slic3r/GUI/MainFrame.cpp:341
+msgid "Save current project file"
+msgstr "Uložit stávající projekt"
+
+#: src/slic3r/GUI/MainFrame.cpp:343
+msgid "Save current project file as"
+msgstr "Uložit stávající projekt jako"
+
+#: src/slic3r/GUI/Plater.cpp:1938
+msgid "Save file as:"
+msgstr "Uložit soubor jako:"
+
+#: src/slic3r/GUI/Plater.cpp:3433
+msgid "Save G-code file as:"
+msgstr "Uložit G-code jako:"
+
+#: src/slic3r/GUI/MainFrame.cpp:757
+msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
+msgstr "Uložit soubor OBJ (méně náchylný na chyby souřadnic než STL) jako:"
+
+#: src/slic3r/GUI/Tab.hpp:417
+msgid "Save preset"
+msgstr "Uložit přednastavení"
+
+#: src/slic3r/GUI/MainFrame.cpp:843
+msgid "Save presets bundle as:"
+msgstr "Uložit balík přednastavení jako:"
+
+#: src/slic3r/GUI/MainFrame.cpp:343
+msgid "Save Project &as"
+msgstr "Uložit Projekt j&ako"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
+msgid "Save project (3MF)"
+msgstr "Uložit projekt (3MF)"
+
+#: src/slic3r/GUI/Plater.cpp:3433
+msgid "Save SL1 file as:"
+msgstr "Uložit SL1 soubor jako:"
+
+#: src/slic3r/GUI/MainFrame.cpp:692
+msgid "Save zip file as:"
+msgstr "Uložit ZIP soubor jako:"
+
+#: 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 "Ukládání meshe do 3MF kontejneru selhalo."
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:152
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:234
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
+#: src/libslic3r/PrintConfig.cpp:3077
+msgid "Scale"
+msgstr "Měřítko"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:276
+msgid "Scale (%)"
+msgstr "Měřítko (%)"
+
+#: lib/Slic3r/GUI/Plater.pm:1133 lib/Slic3r/GUI/Plater.pm:1137
+msgid "Scale along "
+msgstr "Upravit rozměr podél "
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:195
+msgid "Scale factors"
+msgstr "Měřítka"
+
+#: lib/Slic3r/GUI/Plater.pm:2262 lib/Slic3r/GUI/Plater.pm:2278
+msgid "Scale the selected object along a single axis"
+msgstr "Změnit rozměr vybraného objektu podél jedné osy"
+
+#: lib/Slic3r/GUI/Plater.pm:2267 lib/Slic3r/GUI/Plater.pm:2283
+msgid "Scale the selected object along the X axis"
+msgstr "Změnit rozměr vybraného objektu podél osy X"
+
+#: lib/Slic3r/GUI/Plater.pm:2264 lib/Slic3r/GUI/Plater.pm:2280
+msgid "Scale the selected object along the XYZ axes"
+msgstr "Změnit rozměr vybraného objektu podél os XYZ"
+
+#: lib/Slic3r/GUI/Plater.pm:2270 lib/Slic3r/GUI/Plater.pm:2286
+msgid "Scale the selected object along the Y axis"
+msgstr "Změnit rozměr vybraného objektu podél osy Y"
+
+#: lib/Slic3r/GUI/Plater.pm:2273 lib/Slic3r/GUI/Plater.pm:2289
+msgid "Scale the selected object along the Z axis"
+msgstr "Změnit rozměr vybraného objektu podél osy Z"
+
+#: src/libslic3r/PrintConfig.cpp:3086
+msgid "Scale to Fit"
+msgstr "Změnit měřítko, aby se objekt vešel do tiskového prostoru"
+
+#: src/libslic3r/PrintConfig.cpp:3087
+msgid "Scale to fit the given volume."
+msgstr "Změnit velikost, aby se objekt vešel do zadaného tiskového prostoru."
+
+#: lib/Slic3r/GUI/Plater.pm:2278
+msgid "Scale to size"
+msgstr "Upravit do rozměru"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:51
+msgid "Scale [S]"
+msgstr "Upravit velikost [S]"
+
+#: lib/Slic3r/GUI/Plater.pm:260 lib/Slic3r/GUI/Plater.pm:276
+msgid "Scale…"
+msgstr "Velikost…"
+
+#: src/libslic3r/PrintConfig.cpp:3078
+msgid "Scaling factor or percentage."
+msgstr "Procentuální měřítko."
+
+#: src/libslic3r/PrintConfig.cpp:1551
+msgid "Seam position"
+msgstr "Pozice Å¡vu"
+
+#: src/libslic3r/PrintConfig.cpp:1572
+msgid "Seam preferred direction"
+msgstr "Preferovaný směr švu"
+
+#: src/libslic3r/PrintConfig.cpp:1581
+msgid "Seam preferred direction jitter"
+msgstr "Seam preferred direction jitter"
+
+#: src/slic3r/GUI/BonjourDialog.cpp:218
+msgid "Searching for devices"
+msgstr "Hledám zařízení"
+
+#: src/slic3r/GUI/Plater.cpp:2190
+msgid "Searching for optimal orientation"
+msgstr "Hledání optimální orientace"
+
+#: lib/Slic3r/GUI/MainFrame.pm:300
+msgid "Select &Controller Tab\tCtrl+T"
+msgstr "Zobrazit panel Ovlada�\tCtrl+T"
+
+#: lib/Slic3r/GUI/MainFrame.pm:311
+msgid "Select &Filament Settings Tab\tCtrl+3"
+msgstr "Zobrazit panel Nastavení filamentu\tCtrl+3"
+
+#: lib/Slic3r/GUI/MainFrame.pm:294
+msgid "Select &Plater Tab\tCtrl+1"
+msgstr "Zobrazit panel Podložka\tCtrl+1"
+
+#: xs/src/slic3r/GUI/ConfigWizard.cpp:108
+msgid "Select all"
+msgstr "Vybrat vše"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
+msgid "Select All objects"
+msgstr "Vybrat všechny objekty"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1236
+msgid "Select all points"
+msgstr "Vybrat všechny body"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1089
+msgid "Select all standard printers"
+msgstr "Vybrat všechny standardní tiskárny"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1234
+msgid "Select by rectangle"
+msgstr "Ozna�it obdélníkovým výběrem myši"
+
+#: src/slic3r/GUI/MainFrame.cpp:806 src/slic3r/GUI/MainFrame.cpp:870
+msgid "Select configuration to load:"
+msgstr "Zvolte konfiguraci k na�tení:"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2834
+msgid "Select extruder number for selected objects and/or parts"
+msgstr "Vyberte �íslo extruderu pro vybrané objekty a / nebo �ásti"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2847
+msgid "Select extruder number:"
+msgstr "Vyberte �íslo extruderu:"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:117
+msgid "Select Filament Settings Tab"
+msgstr "Zobrazit panel Nastavení filamentu"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:127
+msgid "Select multiple object/Move multiple object"
+msgstr "Vybrat více objektů/Přesunout více objektů"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1251
+msgid "Select new extruder for the object/part"
+msgstr "Vyberte nový extruder pro objekt/�ást"
+
+#: xs/src/slic3r/GUI/ConfigWizard.cpp:109
+msgid "Select none"
+msgstr "Odzna�it vše"
+
+#: lib/Slic3r/GUI/MainFrame.pm:308
+msgid "Select P&rint Settings Tab\tCtrl+2"
+msgstr "Zobrazit panel Nastavení tisku\tCtrl+2"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
+msgid "Select Plater Tab"
+msgstr "Zobrazit panel Podložka"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
+msgid "Select Print Settings Tab"
+msgstr "Zobrazit panel Nastavení tisku"
+
+#: lib/Slic3r/GUI/MainFrame.pm:314
+msgid "Select Print&er Settings Tab\tCtrl+4"
+msgstr "Zobrazit panel Nastavení tiskárny\tCtrl+4"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
+msgid "Select Printer Settings Tab"
+msgstr "Zobrazit panel Nastavení tiskárny"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:917
+msgid "Select showing settings"
+msgstr "Zvolte nastavení zobrazení "
+
+#: src/slic3r/GUI/GUI_App.cpp:524
+msgid "Select the language"
+msgstr "Výběr jazyka"
+
+#: src/slic3r/GUI/Tab.cpp:57
+msgid "Select the print profiles this profile is compatible with."
+msgstr "Vyberte tiskové profily, s nimiž je tento profil kompatibilní."
+
+#: src/slic3r/GUI/Tab.cpp:51
+msgid "Select the printers this profile is compatible with."
+msgstr "Vyberte tiskárny, s nimiž je tento profil kompatibilní."
+
+#: src/slic3r/GUI/MainFrame.cpp:744
+msgid "Select the STL file to repair:"
+msgstr "Vyberte STL soubor k opravÄ›:"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2545
+msgid "Select type of part"
+msgstr "Vyberte typ sou�ásti"
+
+#: src/slic3r/GUI/Plater.cpp:421
+msgid "Select what kind of support do you need"
+msgstr "Vyberte typ podpěr, které potřebujete"
+
+#: src/slic3r/GUI/MainFrame.cpp:444
+msgid "Selects all objects"
+msgstr "Vybrat všechny objekty"
+
+#: src/slic3r/GUI/Plater.cpp:3822
+msgid "Send G-code"
+msgstr "Odeslat G-code"
+
+#: xs/src/slic3r/Utils/OctoPrint.cpp:33
+msgid "Send G-Code to printer"
+msgstr "Odeslat G-code do tiskárny"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:33
+msgid "Send G-Code to printer host"
+msgstr "Odeslat G-Code do tiskového serveru"
+
+#: src/slic3r/GUI/Plater.cpp:731 src/slic3r/GUI/Plater.cpp:3822
+msgid "Send to printer"
+msgstr "Odeslat do tiskárny"
+
+#: xs/src/slic3r/Utils/OctoPrint.cpp:111 lib/Slic3r/GUI/Plater.pm:1558
+msgid "Sending G-code file to the OctoPrint server..."
+msgstr "Odesílání souboru G-code na server OctoPrint…"
+
+#: src/slic3r/GUI/Tab.cpp:1169
+msgid "Sequential printing"
+msgstr "Sekven�ní tisk"
+
+#: src/slic3r/GUI/Tab.cpp:1874 src/libslic3r/PrintConfig.cpp:1591
+msgid "Serial port"
+msgstr "Sériový port"
+
+#: src/libslic3r/PrintConfig.cpp:1599
+msgid "Serial port speed"
+msgstr "Rychlost sériového portu"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:769
+msgid "Serial port:"
+msgstr "Sériový port:"
+
+#: src/slic3r/GUI/BonjourDialog.cpp:74
+msgid "Service name"
+msgstr "Název služby"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1192
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1331
+msgid "Set as a Separated Object"
+msgstr "Změnit na oddělený objekt"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1331
+msgid "Set as a Separated Objects"
+msgstr "Převést na oddělené objekty"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2833
+msgid "Set extruder for selected items"
+msgstr "Zvolte extruder pro vybrané položky"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:185
+msgid "Set lower thumb to current slider thumb"
+msgstr "Aktivovat spodní ukazatel aktivního posuvníku"
+
+#: src/slic3r/GUI/Plater.cpp:2901
+msgid "Set number of copies"
+msgstr "Zadat po�et kopií"
+
+#: lib/Slic3r/GUI/Plater.pm:2224
+msgid "Set number of copies…"
+msgstr "Zadat po�et kopií…"
+
+#: src/libslic3r/PrintConfig.cpp:1053
+msgid "Set silent mode for the G-code flavor"
+msgstr "Nastavit přiznak G-codu pro tichý režim"
+
+#: src/libslic3r/PrintConfig.cpp:2228
+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 "Nastavte skute�nou orientaci LCD displeje uvnitř SLA tiskárny. Režim Orientace na výšku převrátí význam parametrů šířky a výšky a výstupní obrazy budou oto�eny o 90 stupňů."
+
+#: src/slic3r/GUI/ConfigWizard.cpp:527
+msgid "Set the shape of your printer's bed."
+msgstr "Nastavte tvar a rozměry vaší tiskové podložky."
+
+#: src/libslic3r/PrintConfig.cpp:524
+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 "Nastavením kladné hodnoty povolíte manuální šířku extruze. Pokud je hodnota ponechána na nule, Slic3r odvozuje šířku extruze z průměru trysky (viz nápovědy pro šířku extruze perimetru, šířku extruze výplně apod.). Pokud je hodnota vyjádřena procenty (například: 230%), vypo�ítá se z výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:417
+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 "Nastavením na kladnou hodnotu, definuje šířku manuální extruze pro vnější obvod. Pokud je ponechána nula, použije se výchozí šířka extruze, pokud je nastavena, jinak se použije průměr trysky 1,125 x. Pokud je hodnota vyjádřena jako procento (například 200%), vypo�ítá se podle výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:831
+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."
+msgstr "Nastavením kladné hodnoty zvolíte manuální šířku vytla�ování pro první vrstvu. Toto můžete použít k vytla�ování tlustší extruze pro lepší přilnavost. Pokud je vyjádřeno jako procenty (například 120%), bude vypo�teno z výšky první vrstvy. Pokud je nastavena na nulu, použije se výchozí šířka vytla�ování."
+
+#: src/libslic3r/PrintConfig.cpp:1689
+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."
+msgstr "Zadejte kladnou hodnotu, chcete-li nastavit manuálně šířku extruze pro výplň plných povrchů. Pokud je ponechána nula, použije se standardní šířka extruze, pokud je nastavena, jinak se použije průměr trysky 1,125 x. Pokud je vyjádřena procenty (například 90%), bude vypo�tena z výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:2019
+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."
+msgstr "Zadejte kladnou hodnotu, chcete-li nastavit manuálně šířku extruze pro výplň vrchních ploch. Možná budete chtít použít ten�í extruzi, abyste vyplnili všechny úzké oblasti a získali hladší povrch. Pokud je ponechána nula, použije se výchozí šířka extruze, pokud je nastavena, jinak se použije průměr trysky. Pokud je vyjádřena procenty (například 90%), bude vypo�tena z výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:963
+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."
+msgstr "Nastavením kladné hodnoty upravíte manuálně šířku extruze pro výplň. Pokud je ponechána nula, použije se standardní šířka extruze, pokud je nastavena, jinak se použije průměr trysky 1,125 x. Je možné, že budete chtít použít tlustší extruze, pro zrychlení výplně a zpevnění vašich výtisků. Pokud je vyjádřeno jako procenty (například 90%), bude vypo�teno z výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:1350
+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."
+msgstr "Nastavením na kladnou hodnotu nastavíte manuálně šířku vytla�ování perimetrů. Chcete-li získat přesnější povrchy, můžete použít ten�í extruze. Pokud je ponechána nula, použije se standardní šířka extruze, pokud je nastavena, jinak se použije průměr trysky 1,125 x. Pokud je vyjádřeno procenty (například 200%), vypo�te se z výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:1862
+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."
+msgstr "Zadejte kladnou hodnotu, chcete-li nastavit manuálně šířku extruze pro podpěry. Pokud je ponechána nula, použije se výchozí šířka extruze, pokud je nastavena, jinak se použije průměr trysky. Pokud je vyjádřena procenty (například 90%), bude vypo�tena z výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:480
+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."
+msgstr "Zadejte horizontální rádius kolizního prostoru okolo extruderu. Pokud tryska není v centru tohoto rádiusu, zvolte nejdelší vzdálenost. Toto nastavení slouží ke kontrole kolizí a zobrazení grafického náhledu na podložce."
+
+#: src/libslic3r/PrintConfig.cpp:65
+msgid "Set this to the maximum height that can be reached by your extruder while printing."
+msgstr "Nastavte tuto hodnotu na maximální výšku, která může být dosažena extruderem během tisku."
+
+#: src/libslic3r/PrintConfig.cpp:469
+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."
+msgstr "Zadejte vertikální vzdálenost mezi tryskou a (obvykle) ty�emi osy X. Jinými slovy, je to výška kolizního prostoru okolo extruderu a představuje maximální hloubku, které může extruder dosáhnout před kolizí s jinými, již vytištěnými, objekty."
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:184
+msgid "Set upper thumb to current slider thumb"
+msgstr "Aktivovat horní ukazatel aktivního posuvníku"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:143
+msgid "Settings"
+msgstr "Nastavení"
+
+#: lib/Slic3r/GUI/Plater.pm:264 lib/Slic3r/GUI/Plater.pm:279
+#: lib/Slic3r/GUI/Plater.pm:2300
+msgid "Settings…"
+msgstr "Nastavení…"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:60
+msgid "Shape"
+msgstr "Tvar"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:246
+msgid "Shells"
+msgstr "Skořápky"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:599
+msgid "Shift + Left (+ drag) - select point(s)"
+msgstr "Shift + Levé tla�ítko (klik nebo tažení) - výběr bodu(ů)"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:221
+msgid "Show"
+msgstr "Zobrazit"
+
+#: src/slic3r/GUI/MainFrame.cpp:559
+msgid "Show &Configuration Folder"
+msgstr "Otevřít adresář nastavení"
+
+#: src/slic3r/GUI/MainFrame.cpp:563
+msgid "Show about dialog"
+msgstr "Zobrazit okno o Slic3ru"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
+msgid "Show advanced settings"
+msgstr "Zobrazit rozšířená nastavení"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:158
+msgid "Show error message"
+msgstr "Zobrazit chybovou hlášku"
+
+#: src/slic3r/GUI/Preferences.cpp:84
+msgid "Show incompatible print and filament presets"
+msgstr "Zobrazit nekompatibilní přednastavení tisku a filamentu"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
+msgid "Show keyboard shortcuts list"
+msgstr "Zobrazit přehled klávesových zkratek"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
+msgid "Show simplified settings"
+msgstr "Zobrazit jednoduché nastavení"
+
+#: src/slic3r/GUI/MainFrame.cpp:557
+msgid "Show system information"
+msgstr "Zobrazit systémové informace"
+
+#: src/slic3r/GUI/MainFrame.cpp:487
+msgid "Show the 3D editing view"
+msgstr "Zobrazit 3D editaci"
+
+#: src/slic3r/GUI/MainFrame.cpp:489
+msgid "Show the 3D slices preview"
+msgstr "Zobrazit 3D náhled vrstev"
+
+#: src/slic3r/GUI/MainFrame.cpp:480
+msgid "Show the filament settings"
+msgstr "Zobrazit nastavení filamentu"
+
+#: src/libslic3r/PrintConfig.cpp:2983
+msgid "Show the full list of print/G-code configuration options."
+msgstr "Zobrazit kompletní seznam možností konfigurace tisku / G-codu."
+
+#: src/libslic3r/PrintConfig.cpp:2988
+msgid "Show the full list of SLA print configuration options."
+msgstr "Zobrazit kompletní seznam možností konfigurace SLA tisku."
+
+#: src/slic3r/GUI/MainFrame.cpp:566
+msgid "Show the list of the keyboard shortcuts"
+msgstr "Zobrazit seznam klávesových zkratek"
+
+#: src/slic3r/GUI/MainFrame.cpp:471
+msgid "Show the plater"
+msgstr "Zobrazit podložku"
+
+#: src/slic3r/GUI/MainFrame.cpp:478
+msgid "Show the print settings"
+msgstr "Zobrazit nastavení tisku"
+
+#: lib/Slic3r/GUI/MainFrame.pm:300
+msgid "Show the printer controller"
+msgstr "Zobrazit ovlada� tiskárny"
+
+#: src/slic3r/GUI/MainFrame.cpp:483
+msgid "Show the printer settings"
+msgstr "Zobrazit nastavení tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:2977
+msgid "Show this help."
+msgstr "Zobrazí tuto nápovědu."
+
+#: src/slic3r/GUI/MainFrame.cpp:559
+msgid "Show user configuration folder (datadir)"
+msgstr "Zobrazit uživatelský adresář konfigurace (datadir)"
+
+#: src/slic3r/GUI/Tab.cpp:2157
+msgid "Silent"
+msgstr "Tichý"
+
+#: src/slic3r/GUI/Plater.cpp:1077
+msgid "silent mode"
+msgstr "tichý režim"
+
+#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/wxExtensions.cpp:2459
+msgid "Simple"
+msgstr "Jednoduchý"
+
+#: src/slic3r/GUI/GUI_App.cpp:674
+msgid "Simple View Mode"
+msgstr "Jednoduchý režim"
+
+#: src/slic3r/GUI/Tab.cpp:2231 src/slic3r/GUI/Tab.cpp:2239
+msgid "Single extruder MM setup"
+msgstr "Nastavení jednoho extruderu MM"
+
+#: src/libslic3r/PrintConfig.cpp:1767
+msgid "Single Extruder Multi Material"
+msgstr "MultiMaterial tisk s jedním extrudérem"
+
+#: src/slic3r/GUI/Tab.cpp:2240
+msgid "Single extruder multimaterial parameters"
+msgstr "Parametry jednoho multi materiálového extruderu"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:72
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:153 src/slic3r/GUI/Plater.cpp:137
+#: src/slic3r/GUI/Tab.cpp:2257
+msgid "Size"
+msgstr "Rozměr"
+
+#: src/slic3r/GUI/Tab.cpp:1813 src/slic3r/GUI/Tab.cpp:2014
+msgid "Size and coordinates"
+msgstr "Rozměry a po�átek"
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:73
+msgid "Size in X and Y of the rectangular plate."
+msgstr "Rozměr obdélníkové tiskové podložky v ose X a Y."
+
+#: src/slic3r/GUI/GUI_Preview.cpp:235 src/slic3r/GUI/Tab.cpp:1050
+#: src/libslic3r/GCode/PreviewData.cpp:171
+msgid "Skirt"
+msgstr "Obrys"
+
+#: src/slic3r/GUI/Tab.cpp:1049
+msgid "Skirt and brim"
+msgstr "Obrys a límec"
+
+#: src/libslic3r/PrintConfig.cpp:1617
+msgid "Skirt height"
+msgstr "Výška obrysu"
+
+#: src/libslic3r/PrintConfig.cpp:1626
+msgid "Skirt Loops"
+msgstr "Po�et obrysových smy�ek"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1200
+msgid "SLA gizmo keyboard shortcuts"
+msgstr "Klávesové zkratky pro SLA gizma"
+
+#: src/slic3r/GUI/Plater.cpp:684 src/slic3r/GUI/Preset.cpp:1277
+msgid "SLA material"
+msgstr "SLA materiál"
+
+#: src/slic3r/GUI/Plater.cpp:683 src/slic3r/GUI/Preset.cpp:1276
+msgid "SLA print"
+msgstr "SLA tisk"
+
+#: src/libslic3r/PrintConfig.cpp:2331
+msgid "SLA print material notes"
+msgstr "Poznámky pro SLA materiál"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:995
+msgid "SLA Support Points [L]"
+msgstr "SLA Podpěrné Body [L]"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1055
+msgid "Slab"
+msgstr "Deska"
+
+#: src/slic3r/GUI/MainFrame.cpp:470
+msgid "Slic3r &Manual"
+msgstr "Slic3r návod"
+
+#: src/slic3r/GUI/MainFrame.cpp:468
+msgid "Slic3r &Website"
+msgstr "Slic3r &Webová stránka"
+
+#: src/libslic3r/PrintConfig.cpp:1268
+msgid "Slic3r can upload G-code files to a printer host. This field must contain the kind of the host."
+msgstr "Slic3r může nahrát soubory G-code do tiskového serveru. Toto pole musí obsahovat druh tiskového serveru."
+
+#: src/libslic3r/PrintConfig.cpp:89
+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 může nahrát soubory do tiskového serveru. Toto pole by mělo obsahovat klí� API požadovaný pro ověření."
+
+#: src/libslic3r/PrintConfig.cpp:82
+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."
+msgstr "Slic3r může nahrát soubory G-code do tiskového serveru. Toto pole by mělo obsahovat název serveru (hostname), IP adresu nebo URL tiskového serveru."
+
+#: xs/src/libslic3r/PrintConfig.cpp:1110
+msgid "Slic3r can upload G-code files to OctoPrint. This field should contain the API Key required for authentication."
+msgstr "Slic3r může nahrát soubory G-code do OctoPrintu. Toto pole by mělo obsahovat klí� API požadovaný pro ověření."
+
+#: xs/src/libslic3r/PrintConfig.cpp:1124
+msgid "Slic3r can upload G-code files to OctoPrint. This field should contain the hostname, IP address or URL of the OctoPrint instance."
+msgstr "Slic3r může nahrát soubory G-code do OctoPrintu. Toto pole by mělo obsahovat název hosta (hostname), IP adresu nebo URL instance OctoPrint."
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
+msgid "Slic3r configuration is incompatible"
+msgstr "Konfigurace Slic3ru není kompatibilní"
+
+#: lib/Slic3r/GUI/Plater.pm:1021
+msgid "Slic3r Error"
+msgstr "Chyba Slic3ru"
+
+#: src/slic3r/GUI/MsgDialog.cpp:71
+msgid "Slic3r error"
+msgstr "Chyba Slic3ru"
+
+#: src/slic3r/GUI/MsgDialog.cpp:71
+msgid "Slic3r has encountered an error"
+msgstr "Došlo k chybě Slic3ru"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
+msgid "Slic3r incompatibility"
+msgstr "Nekompatibilita Slic3ru"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:168
+#, possible-c-format
+msgid "Slic3r PE now uses an updated configuration structure.\n\nSo 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.\nAn inheriting preset may either inherit a particular value from its parent or override it with a customized value.\n\nPlease proceed with the %s that follows to set up the new presets and to choose whether to enable automatic preset updates."
+msgstr "Slic3r PE nyní používá aktualizovanou konfigura�ní strukturu.\n\nByly 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í.\nNově 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\nProsím postupujte dle %s, který následuje pro nastavení nových přednastavení a vyberte si, zdali chcete jejich automatickou aktualizaci."
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:13
+msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
+msgstr "Slic3r Prusa Edition - Klávesové zkratky"
+
+#: src/slic3r/GUI/SysInfoDialog.cpp:44
+msgid "Slic3r Prusa Edition - System Information"
+msgstr "Slic3r Prusa Edition - Systémové informace"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
+msgid "slic3r version"
+msgstr "verze slic3ru"
+
+#: src/slic3r/GUI/GUI_App.cpp:623
+msgid "Slic3r View Mode"
+msgstr "Režim zobrazení Slic3ru"
+
+#: src/libslic3r/PrintConfig.cpp:1234
+msgid "Slic3r will not scale speed down below this speed."
+msgstr "Slic3r nebude měnit rychlost pod tuto rychlost."
+
+#: src/libslic3r/PrintConfig.cpp:2970
+msgid "Slice"
+msgstr "Slicovat"
+
+#: src/slic3r/GUI/MainFrame.cpp:383
+msgid "Slice a file into a G-code"
+msgstr "Slicovat soubor do G-code"
+
+#: src/slic3r/GUI/MainFrame.cpp:389
+msgid "Slice a file into a G-code, save as"
+msgstr "Slicovat soubor do G-code, uložit jako"
+
+#: lib/Slic3r/GUI/MainFrame.pm:251
+msgid "Slice file to a multi-layer SVG"
+msgstr "Slicovat soubor do více-vrstvého SVG"
+
+#: src/libslic3r/PrintConfig.cpp:71
+msgid "Slice gap closing radius"
+msgstr "Poloměr uzavření mezery v tiskové vrstvě"
+
+#: src/slic3r/GUI/Plater.cpp:734 src/slic3r/GUI/Plater.cpp:2412
+#: src/slic3r/GUI/Plater.cpp:3618
+msgid "Slice now"
+msgstr "Slicovat"
+
+#: src/libslic3r/PrintConfig.cpp:2944
+msgid "Slice the model and export SLA printing layers as PNG."
+msgstr "Naslicuje model a exportuje SLA tiskové vrstvy jako PNG soubory."
+
+#: src/libslic3r/PrintConfig.cpp:2965
+msgid "Slice the model and export toolpaths as G-code."
+msgstr "Naslicujte model a exportujte cesty jako G-code."
+
+#: src/libslic3r/PrintConfig.cpp:2971
+msgid "Slice the model as FFF or SLA based on the printer_technology configuration value."
+msgstr "Slicovat model jako FFF nebo SLA tisk na základě konfigura�ní hodnoty printer_technology."
+
+#: lib/Slic3r/GUI/MainFrame.pm:251
+msgid "Slice to SV&G…\tCtrl+G"
+msgstr "Slicovat do SV&G…\tCtrl+G"
+
+#: src/slic3r/GUI/Plater.cpp:193
+msgid "Sliced Info"
+msgstr "Informace o slicování"
+
+#: src/slic3r/GUI/MainFrame.cpp:704 src/slic3r/GUI/Plater.cpp:2412
+#: src/slic3r/GUI/Plater.cpp:3615 src/slic3r/GUI/Tab.cpp:1159
+#: src/slic3r/GUI/Tab.cpp:3436
+msgid "Slicing"
+msgstr "Slicování"
+
+#: lib/Slic3r/GUI/Plater.pm:1391
+msgid "Slicing cancelled"
+msgstr "Slicování zrušeno"
+
+#: src/libslic3r/SLAPrint.cpp:1459
+msgid "Slicing done"
+msgstr "Slicování dokon�eno"
+
+#: src/slic3r/GUI/MainFrame.cpp:729
+msgid "Slicing Done!"
+msgstr "Slicování dokon�eno!"
+
+#. TRN To be shown at the status bar on SLA slicing error.
+#: src/libslic3r/SLAPrint.cpp:709
+msgid "Slicing had to be stopped due to an internal error."
+msgstr "Slicování muselo být zastaveno kvůli vnitřní chybě."
+
+#: src/libslic3r/SLAPrint.cpp:55
+msgid "Slicing model"
+msgstr "Slicovaný model"
+
+#: src/libslic3r/SLAPrint.cpp:59
+msgid "Slicing supports"
+msgstr "Slicování podpěr"
+
+#: lib/Slic3r/GUI/MainFrame.pm:483
+msgid "Slicing…"
+msgstr "Slicování…"
+
+#: src/libslic3r/PrintConfig.cpp:2249
+msgid "Slow"
+msgstr "Pomalý"
+
+#: src/libslic3r/PrintConfig.cpp:1635
+msgid "Slow down if layer print time is below"
+msgstr "Zpomalit tisk pokud je doba tisku kratší než"
+
+#: src/libslic3r/PrintConfig.cpp:2250
+msgid "Slow tilt"
+msgstr "Pomalý náklon"
+
+#: src/libslic3r/PrintConfig.cpp:1646
+msgid "Small perimeters"
+msgstr "Malé perimetry"
+
+#: src/slic3r/GUI/GUI_App.cpp:697
+msgid "Snapshot name"
+msgstr "Název zálohy"
+
+#: src/slic3r/GUI/PresetHints.cpp:181
+msgid "solid infill"
+msgstr "plná výplň"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/PrintConfig.cpp:1687
+#: src/libslic3r/PrintConfig.cpp:1697 src/libslic3r/GCode/PreviewData.cpp:167
+msgid "Solid infill"
+msgstr "Plná výplň"
+
+#: src/libslic3r/PrintConfig.cpp:1675
+msgid "Solid infill every"
+msgstr "Plná výplň každou"
+
+#: src/libslic3r/PrintConfig.cpp:1667
+msgid "Solid infill extruder"
+msgstr "Extruder pro plnou výplň"
+
+#: src/libslic3r/PrintConfig.cpp:1658
+msgid "Solid infill threshold area"
+msgstr "Prahová hodnota plochy pro plnou výplň"
+
+#: src/slic3r/GUI/Tab.cpp:1014 src/libslic3r/PrintConfig.cpp:1710
+msgid "Solid layers"
+msgstr "Plných vrstev"
+
+#: src/libslic3r/PrintConfig.cpp:1832
+msgid "soluble"
+msgstr "rozpustný"
+
+#: src/libslic3r/PrintConfig.cpp:711
+msgid "Soluble material"
+msgstr "Rozpustný materiál"
+
+#: src/libslic3r/PrintConfig.cpp:712
+msgid "Soluble material is most likely used for a soluble support."
+msgstr "Rozpustný materiál je převážně používán pro tisk rozpustných podpěr."
+
+#: src/libslic3r/PrintConfig.cpp:889
+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 "Některé příkazy G/M code, v�etně řízení teploty a jiné, nejsou univerzální. Vyberte typ firmwaru který používá vaše tiskárna pro dosažení kompatibilního výstupu. Příkazy typu “No extrusion� zabraňují Slic3ru zcela exportovat jakoukoliv hodnotu extruze."
+
+#: src/slic3r/GUI/GLCanvas3D.cpp:721
+msgid "Some objects are not visible when editing supports"
+msgstr "Některé objekty nejsou při úpravách podpěr viditelné"
+
+#: src/libslic3r/Print.cpp:1162
+msgid "Some objects are too close; your extruder will collide with them."
+msgstr "Některé objekty jsou příliš blízko; Extruder do nich narazí."
+
+#: src/libslic3r/Print.cpp:1177
+msgid "Some objects are too tall and cannot be printed without extruder collisions."
+msgstr "Některé objekty jsou příliš vysoké a nelze je tisknout bez kolizí extruderu."
+
+#: src/libslic3r/PrintConfig.cpp:2548
+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 "Některé objekty mohou být na několika menších podložkách namísto jedné velké. Tento parametr definuje, jak daleko může být střed dvou menších podložek. Pokud budou blíže, budou slou�eny do jedné podložky."
+
+#: src/libslic3r/PrintConfig.cpp:2086
+msgid "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default."
+msgstr "Některé tiskárny nebo nastavení tiskárny mohou mít potíže s tiskem s proměnnou výškou vrstvy. Ve výchozím nastavení je zapnuto."
+
+#: src/libslic3r/PrintConfig.cpp:1897
+msgid "Spacing between interface lines. Set zero to get a solid interface."
+msgstr "Rozte� linií kontaktních vrstev. Nastavte nulu pro získání plných kontaktních vrstev."
+
+#: src/libslic3r/PrintConfig.cpp:1931
+msgid "Spacing between support material lines."
+msgstr "Rozte� linií podpěr."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:71 src/slic3r/GUI/GUI_ObjectList.cpp:512
+#: src/slic3r/GUI/GUI_Preview.cpp:215 src/slic3r/GUI/Tab.cpp:1084
+#: src/libslic3r/PrintConfig.cpp:199 src/libslic3r/PrintConfig.cpp:426
+#: src/libslic3r/PrintConfig.cpp:871 src/libslic3r/PrintConfig.cpp:999
+#: src/libslic3r/PrintConfig.cpp:1361 src/libslic3r/PrintConfig.cpp:1598
+#: src/libslic3r/PrintConfig.cpp:1647 src/libslic3r/PrintConfig.cpp:1698
+#: src/libslic3r/PrintConfig.cpp:2029
+msgid "Speed"
+msgstr "Rychlost"
+
+#: src/libslic3r/PrintConfig.cpp:1600
+msgid "Speed (baud) of USB/serial port for printer connection."
+msgstr "Rychlost (baud) USB/sériového portu pro připojení tiskárny."
 
 #: src/libslic3r/GCode/PreviewData.cpp:400
 msgid "Speed (mm/s)"
 msgstr "Rychlost (mm/s)"
 
+#: src/libslic3r/PrintConfig.cpp:872
+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 "Rychlost plnění malých mezer pomocí krátkých cikcak pohybů. Udržujte tuto hodnotu poměrně nízkou, aby nedošlo k přílišným otřesům a problémům s rezonancí. Nastavte nulu pro vypnutí vyplnění mezery."
+
+#: src/slic3r/GUI/Tab.cpp:1097
+msgid "Speed for non-print moves"
+msgstr "Netiskové rychlosti"
+
+#: src/libslic3r/PrintConfig.cpp:1362
+msgid "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
+msgstr "Rychlost pro perimetry (obrysy, neboli svislé stěny). Zadejte nulu pro automatické nastavení."
+
+#: src/slic3r/GUI/Tab.cpp:1085
+msgid "Speed for print moves"
+msgstr "Rychlosti pohybů tiskárny"
+
+#: src/libslic3r/PrintConfig.cpp:200
+msgid "Speed for printing bridges."
+msgstr "Rychlost pro vytváření mostů."
+
+#: src/libslic3r/PrintConfig.cpp:1699
+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 "Rychlost tisku plných oblastí (vrchní / spodní / vnitřní vodorovné stěny). Může být vyjádřeno procenty (například: 80%) oproti výchozí rychlosti vyplnění. Pro automatické nastavení zadejte nulu."
+
+#: src/libslic3r/PrintConfig.cpp:1906
+msgid "Speed for printing support material interface layers. If expressed as percentage (for example 50%) it will be calculated over support material speed."
+msgstr "Rychlost tisku podpěrných interface vrstev. Pokud je vyjádřen procentní podíl (například 50%), vypo�ítá se podle rychlosti tisku podpěr."
+
+#: src/libslic3r/PrintConfig.cpp:1940
+msgid "Speed for printing support material."
+msgstr "Rychlost tisku podpěr."
+
+#: src/libslic3r/PrintConfig.cpp:1000
+msgid "Speed for printing the internal fill. Set to zero for auto."
+msgstr "Rychlost tisku vnitřní výplně. Pro automatické nastavení zadejte nulu."
+
+#: src/libslic3r/PrintConfig.cpp:2030
+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."
+msgstr "Rychlost tisku vrchních plných vrstev (vztahuje se pouze na nejvyšší horní vrstvy a nikoli na jejich vnitřní plné vrstvy). Rychlost lze zpomalit, abyste získali hez�í povrchovou úpravu. Může být vyjádřena procenty (například: 80%) z rychlosti plné výplně materiálu výše. Pro automatické nastavení zadejte nulu."
+
+#: src/libslic3r/PrintConfig.cpp:2052
+msgid "Speed for travel moves (jumps between distant extrusion points)."
+msgstr "Rychlost posunů (přejezdy mezi body extruze)."
+
+#: src/libslic3r/PrintConfig.cpp:627
+msgid "Speed of the first cooling move"
+msgstr "Rychlost prvního pohybu chlazení"
+
+#: src/libslic3r/PrintConfig.cpp:646
+msgid "Speed of the last cooling move"
+msgstr "Rychlost posledního pohybu chlazení"
+
+#: src/libslic3r/PrintConfig.cpp:584
+msgid "Speed used at the very beginning of loading phase. "
+msgstr "Rychlost použitá na samém po�átku zaváděcí fáze"
+
+#: src/libslic3r/PrintConfig.cpp:576
+msgid "Speed used for loading the filament on the wipe tower. "
+msgstr "Rychlost použitá pro zavádění filamentu na �istící věž. "
+
+#: src/libslic3r/PrintConfig.cpp:592
+msgid "Speed used for unloading the filament on the wipe tower (does not affect  initial part of unloading just after ramming). "
+msgstr "Rychlost vysouvání filamentu při výměně na �istící věži (úvodní �ást vysunutí okamžitě po rapidní extruzi není ovlivněna). "
+
+#: src/libslic3r/PrintConfig.cpp:601
+msgid "Speed used for unloading the tip of the filament immediately after ramming. "
+msgstr "Rychlost použitá při vysouvání špi�ky filamentu bezprostředně po rapidní extruzi."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1055
+msgid "Sphere"
+msgstr "Koule"
+
+#: src/slic3r/GUI/Tab.cpp:1254
+msgid "Spiral Vase"
+msgstr "Spirálová váza"
+
+#: src/libslic3r/PrintConfig.cpp:1717
+msgid "Spiral vase"
+msgstr "Spirálová váza"
+
+#: src/slic3r/GUI/Plater.cpp:2971 src/slic3r/GUI/Plater.cpp:2988
+#: src/slic3r/GUI/Plater.cpp:3008 src/libslic3r/PrintConfig.cpp:3082
+msgid "Split"
+msgstr "Rozdělit"
+
+#: src/slic3r/GUI/Plater.cpp:2971
+msgid "Split the selected object"
+msgstr "Rozdělit vybraný objekt"
+
+#: src/slic3r/GUI/Plater.cpp:2966 src/slic3r/GUI/Plater.cpp:2988
+msgid "Split the selected object into individual objects"
+msgstr "Rozdělit vybraný objekt na jednotlivé objekty"
+
+#: lib/Slic3r/GUI/Plater.pm:2293
+msgid "Split the selected object into individual parts"
+msgstr "Rozdělit vybraný objekt na jednotlivé �ásti"
+
+#: src/slic3r/GUI/Plater.cpp:2968 src/slic3r/GUI/Plater.cpp:3008
+msgid "Split the selected object into individual sub-parts"
+msgstr "Rozdělit vybraný objekt na jednotlivé díl�í �ásti"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1110
+msgid "Split to parts"
+msgstr "Rozdělit na �ásti"
+
+#: src/libslic3r/PrintConfig.cpp:799
+msgid "Stars"
+msgstr "Hvězdy"
+
+#: src/slic3r/GUI/Tab.cpp:1564 src/slic3r/GUI/Tab.cpp:1949
+#: src/libslic3r/PrintConfig.cpp:1736 src/libslic3r/PrintConfig.cpp:1751
+msgid "Start G-code"
+msgstr "Za�átek G-code"
+
+#: src/slic3r/GUI/MainFrame.cpp:403
+msgid "Start new slicing process"
+msgstr "Zahájit nový slicovací proces"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:35
+msgid "Start printing after upload"
+msgstr "Spustit tisk po nahrání"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2153
+msgid "Starting"
+msgstr "Spuštění"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:782
+msgid "Status:"
+msgstr "Stav:"
+
+#: lib/Slic3r/GUI/Plater.pm:1659 lib/Slic3r/GUI/Plater.pm:1701
+msgid "STL file exported to "
+msgstr "Soubor STL byl exportován do "
+
+#: src/slic3r/GUI/Plater.cpp:3545
+#, possible-c-format
+msgid "STL file exported to %s"
+msgstr "Soubor STL exportován do %s"
+
+#: src/slic3r/GUI/Tab.cpp:1716 src/slic3r/GUI/Tab.cpp:1901
+msgid "Success!"
+msgstr "Úspěch!"
+
+#: src/slic3r/GUI/PresetHints.cpp:200
+msgid "support"
+msgstr "podpěry"
+
+#: xs/src/slic3r/GUI/GUI.cpp:859
+msgid "Support"
+msgstr "Podpěra"
+
+#: src/libslic3r/PrintConfig.cpp:2441
+msgid "Support base diameter"
+msgstr "Průměr podpěrné základny"
+
+#: src/libslic3r/PrintConfig.cpp:2451
+msgid "Support base height"
+msgstr "Výška podpěrné základny"
+
+#: src/slic3r/GUI/Tab.cpp:1316
+msgid "Support Generator"
+msgstr "Generátor Podpěr"
+
+#: src/slic3r/GUI/Tab.cpp:3401
+msgid "Support head"
+msgstr "Hrot podpěry"
+
+#: src/libslic3r/PrintConfig.cpp:2369
+msgid "Support head front diameter"
+msgstr "Délka hrotu podpěry"
+
+#: src/libslic3r/PrintConfig.cpp:2378
+msgid "Support head penetration"
+msgstr "Průnik podpěry do modelu"
+
+#: src/libslic3r/PrintConfig.cpp:2387
+msgid "Support head width"
+msgstr "Tloušťka hrotu podpěry"
+
+#: src/slic3r/GUI/PresetHints.cpp:210
+msgid "support interface"
+msgstr "kontaktní vrstva podpěr"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:30 src/slic3r/GUI/GUI_ObjectList.cpp:70
+#: src/slic3r/GUI/GUI_ObjectList.cpp:511 src/slic3r/GUI/GUI_Preview.cpp:236
+#: src/slic3r/GUI/Tab.cpp:1059 src/slic3r/GUI/Tab.cpp:1060
+#: src/libslic3r/PrintConfig.cpp:334 src/libslic3r/PrintConfig.cpp:1432
+#: src/libslic3r/PrintConfig.cpp:1780 src/libslic3r/PrintConfig.cpp:1786
+#: src/libslic3r/PrintConfig.cpp:1794 src/libslic3r/PrintConfig.cpp:1806
+#: src/libslic3r/PrintConfig.cpp:1816 src/libslic3r/PrintConfig.cpp:1824
+#: src/libslic3r/PrintConfig.cpp:1839 src/libslic3r/PrintConfig.cpp:1860
+#: src/libslic3r/PrintConfig.cpp:1871 src/libslic3r/PrintConfig.cpp:1887
+#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:1905
+#: src/libslic3r/PrintConfig.cpp:1916 src/libslic3r/PrintConfig.cpp:1930
+#: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1939
+#: src/libslic3r/PrintConfig.cpp:1948 src/libslic3r/PrintConfig.cpp:1956
+#: src/libslic3r/PrintConfig.cpp:1970 src/libslic3r/GCode/PreviewData.cpp:172
+msgid "Support material"
+msgstr "Podpěry"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/PrintConfig.cpp:1904
+#: src/libslic3r/GCode/PreviewData.cpp:173
+msgid "Support material interface"
+msgstr "Kontaktní vrstvy podpěr"
+
+#: src/libslic3r/PrintConfig.cpp:1957
+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 "Podpěry nebudou vytvořeny pro převisy, jejichž úhel sklonu (90° = vertikální) je nad danou prahovou hodnotou. Jinými slovy, tato hodnota představuje největší horizontální sklon (měřený od horizontální roviny), který můžete tisknout bez podpěrného materiálu. Nastavte na nulu pro automatickou detekci (doporu�eno)."
+
+#: src/libslic3r/PrintConfig.cpp:1877
+msgid "Support material/raft interface extruder"
+msgstr "Extruder pro kontaktní podpěry/raft"
+
+#: src/libslic3r/PrintConfig.cpp:1851
+msgid "Support material/raft/skirt extruder"
+msgstr "Extruder pro podpěry/raft/obrys"
+
+#: src/slic3r/GUI/Plater.cpp:423 src/libslic3r/PrintConfig.cpp:1815
+#: src/libslic3r/PrintConfig.cpp:2423
+msgid "Support on build plate only"
+msgstr "Pouze na tiskové podložce"
+
+#: src/slic3r/GUI/Tab.cpp:3406
+msgid "Support pillar"
+msgstr "Podpěrný pilíř"
+
+#: src/libslic3r/PrintConfig.cpp:2407
+msgid "Support pillar connection mode"
+msgstr "Propojení podpěr"
+
+#: src/libslic3r/PrintConfig.cpp:2397
+msgid "Support pillar diameter"
+msgstr "Tloušťka podpěry"
+
+#: src/libslic3r/PrintConfig.cpp:2499
+msgid "Support points density"
+msgstr "Hustota podpěrných bodů"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:888
+msgid "Support points density: "
+msgstr "Hustota podpěrných bodů:"
+
+#: xs/src/libslic3r/PrintConfig.cpp:896
+msgid "Support silent mode"
+msgstr "Podpora tichého režimu"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:78 src/slic3r/GUI/GUI_ObjectList.cpp:519
+#: src/slic3r/GUI/Plater.cpp:418 src/slic3r/GUI/Tab.cpp:3397
+#: src/slic3r/GUI/Tab.cpp:3398 src/libslic3r/PrintConfig.cpp:2363
+#: src/libslic3r/PrintConfig.cpp:2370 src/libslic3r/PrintConfig.cpp:2379
+#: src/libslic3r/PrintConfig.cpp:2388 src/libslic3r/PrintConfig.cpp:2398
+#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2431
+#: src/libslic3r/PrintConfig.cpp:2442 src/libslic3r/PrintConfig.cpp:2452
+#: src/libslic3r/PrintConfig.cpp:2461 src/libslic3r/PrintConfig.cpp:2471
+#: src/libslic3r/PrintConfig.cpp:2480 src/libslic3r/PrintConfig.cpp:2490
+#: src/libslic3r/PrintConfig.cpp:2500 src/libslic3r/PrintConfig.cpp:2508
+msgid "Supports"
+msgstr "Podpěry"
+
+#: src/slic3r/GUI/Plater.cpp:1018
+msgid "supports and pad"
+msgstr "podpěry a podložka"
+
+#: src/libslic3r/PrintConfig.cpp:1043
+msgid "Supports remaining times"
+msgstr "Podpora zbývajících tiskových �asů"
+
+#: src/libslic3r/PrintConfig.cpp:1052
+msgid "Supports silent mode"
+msgstr "Podporuje tichý režim"
+
+#: src/slic3r/GUI/Tab.cpp:1313
+msgid "Supports work better, if the following feature is enabled:\n- Detect bridging perimeters\n\nShall I adjust those settings for supports?"
+msgstr "Podpěry fungují lépe, pokud je povolena následující funkce:\n- Zjistit přemosťovací perimetry\n\nMám tyto nastavení pro podpěry upravit?"
+
+#: src/slic3r/GUI/Preferences.cpp:76
+msgid "Suppress \" - default - \" presets"
+msgstr "Potla�it “ - výchozí - “ přednastavení"
+
+#: src/slic3r/GUI/Preferences.cpp:78
+msgid "Suppress \" - default - \" presets in the Print / Filament / Printer selections once there are any other valid presets available."
+msgstr "Potla�it “ - výchozí - “ přednastavení v nabídkách Tisk / Filament / Tiskárna, jakmile budou k dispozici další platné předvolby."
+
+#: src/slic3r/GUI/MainFrame.cpp:677
+msgid "SVG"
+msgstr "SVG"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
+msgid "Switch to 3D"
+msgstr "Přepnout do 3D"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1242
+msgid "Switch to editing mode"
+msgstr "Přepnout do režimu editace"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
+msgid "Switch to Preview"
+msgstr "Přepnout do náhledu"
+
+#: src/slic3r/GUI/wxExtensions.cpp:2412
+#, possible-c-format
+msgid "Switch to the %s mode"
+msgstr "Přepnout do režimu %s"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:327
+msgid "Switching to simple settings will discard changes done in the advanced mode!\n\nDo you want to proceed?"
+msgstr "Přepnutím do jednoduchého nastavení ztratíte změny provedené v pokro�ilém režimu!\n\nOpravdu chcete pokra�ovat?"
+
+#: src/libslic3r/PrintConfig.cpp:1949
+msgid "Synchronize support layers with the object print layers. This is useful with multi-material printers, where the extruder switch is expensive."
+msgstr "Synchronizování vrstev podpěr s vrstvami objektu. Toto je velmi užite�né u multi-materiálových tiskáren, kde je přepínání extruderů drahé."
+
+#: src/libslic3r/PrintConfig.cpp:1947
+msgid "Synchronize with object layers"
+msgstr "Synchronizovat s vrstvami objektu"
+
+#: src/slic3r/GUI/MainFrame.cpp:557
+msgid "System &Info"
+msgstr "&Informace o systému"
+
+#: lib/Slic3r/GUI/MainFrame.pm:355
+msgid "System Info"
+msgstr "Informace o systému"
+
+#: src/slic3r/GUI/SysInfoDialog.cpp:44
+msgid "System Information"
+msgstr "Systémové informace"
+
+#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:970
+#: src/slic3r/GUI/Preset.cpp:1035 src/slic3r/GUI/Preset.cpp:1067
+#: src/slic3r/GUI/PresetBundle.cpp:1488 src/slic3r/GUI/PresetBundle.cpp:1553
+msgid "System presets"
+msgstr "Systémová přednastavení"
+
+#: src/slic3r/GUI/GUI_App.cpp:662
+msgid "Take Configuration &Snapshot"
+msgstr "Prové&st Zálohu Konfigurace"
+
+#: xs/src/slic3r/GUI/GUI.cpp:350
+msgid "Take Configuration Snapshot"
+msgstr "Provést Zálohu Konfigurace"
+
+#: src/slic3r/GUI/GUI_App.cpp:697
+msgid "Taking configuration snapshot"
+msgstr "Ukládání zálohy nastavení"
+
+#: src/slic3r/GUI/Tab.cpp:1478
+msgid "Temperature "
+msgstr "Teplota "
+
+#: src/libslic3r/PrintConfig.cpp:1980
+msgid "Temperature"
+msgstr "Teplota"
+
+#: src/libslic3r/PrintConfig.cpp:1727
+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 "Teplotní rozdíl, který se použije v případě, že extruder není aktivní. Umožňuje “obětní� obrysy v plné výšce objektu, na kterém jsou trysky periodicky o�ištěny."
+
+#: src/libslic3r/PrintConfig.cpp:1726
+msgid "Temperature variation"
+msgstr "Kolísání teploty"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:592
+msgid "Temperatures"
+msgstr "Teploty"
+
+#: src/slic3r/GUI/Tab.cpp:1700 src/slic3r/GUI/Tab.cpp:1888
+msgid "Test"
+msgstr "Test"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:530
+#, possible-c-format
+msgid "The %s device could not have been found"
+msgstr "Zařízení %s nebylo nalezeno"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:417
+#, possible-c-format
+msgid "The %s device was not found.\nIf 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/libslic3r/PrintConfig.cpp:2462
+msgid "The default angle for connecting support sticks and junctions."
+msgstr "Výchozí úhel pro připojení nosných ty�í a spojek."
+
+#: src/libslic3r/PrintConfig.cpp:457
+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 "Extruder, který chcete použít (pokud nejsou zvoleny specifi�tější nastavení extruderu). Tato hodnota přepíše nastavení perimetrového a výplňového exrtuderu, ale ne nastavení extruderu pro podpěry."
+
+#: src/libslic3r/PrintConfig.cpp:955
+msgid "The extruder to use when printing infill."
+msgstr "Extruder který se použije pro tisk výplní."
+
+#: src/libslic3r/PrintConfig.cpp:1341
+msgid "The extruder to use when printing perimeters and brim. First extruder is 1."
+msgstr "Extruder, který se používá při tisku perimetrů a límce. První extruder je 1."
+
+#: src/libslic3r/PrintConfig.cpp:1669
+msgid "The extruder to use when printing solid infill."
+msgstr "Extruder který bude použit při tisku plných výplní."
+
+#: src/libslic3r/PrintConfig.cpp:1879
+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 "Extruder, který se použije při tisku kontaktních vrstev podpěr (1+, 0 pro použití aktuálního extruderu, aby se minimalizovaly změny nástroje). To ovlivňuje i raft."
+
+#: src/libslic3r/PrintConfig.cpp:1853
+msgid "The extruder to use when printing support material, raft and skirt (1+, 0 to use the current extruder to minimize tool changes)."
+msgstr "Extruder, který se používá při tisku podpěr, raftu a obrysu (1+, 0 pro použití aktuálního extruderu pro co nejméně změn nástroje)."
+
+#: src/libslic3r/PrintConfig.cpp:695
+msgid "The filament material type for use in custom G-codes."
+msgstr "Typ filamentu pro použití ve vlastních G-code."
+
+#: src/libslic3r/PrintConfig.cpp:3105
+msgid "The file where the output will be written (if not specified, it will be based on the input file)."
+msgstr "Soubor, do kterého bude zapisován výstup (pokud není zadán, bude vycházet ze vstupního souboru)."
+
+#: src/libslic3r/PrintConfig.cpp:351
+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 "První vrstva bude v rovině XY zmenšena nakonfigurovanou hodnotou, která kompenzuje rozplácnutí první vrstvy."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2726
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2813 src/slic3r/GUI/Tab.cpp:3279
+msgid "the following characters are not allowed:"
+msgstr "následující znaky nejsou povolené:"
+
+#: src/slic3r/GUI/Tab.cpp:3283
+msgid "the following postfix are not allowed:"
+msgstr "následující postfixy nejsou povolené:"
+
+#: src/libslic3r/PrintConfig.cpp:2453
+msgid "The height of the pillar base cone"
+msgstr "Výška ukotvení podpěrného kužele"
+
+#: src/libslic3r/PrintConfig.cpp:2481
+msgid "The max distance of two pillars to get linked with each other. A zero value will prohibit pillar cascading."
+msgstr "Maximální vzdálenost dvou podpůrných pilířů pro vzájemné provázání. Nulová hodnota zakáže provazování."
+
+#: src/libslic3r/PrintConfig.cpp:2472
+msgid "The max length of a bridge"
+msgstr "Maximální délka přemostění."
+
+#: src/libslic3r/PrintConfig.cpp:2176
+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 "Objekt bude roztažen / smrštěn v rovině XY nastavenou hodnotou (negativní = směrem dovnitř, pozitivní = směrem ven). To může být užite�né pro jemné doladění otvorů."
+
+#: src/libslic3r/PrintConfig.cpp:1433
+msgid "The object will be raised by this number of layers, and support material will be generated under it."
+msgstr "Objekt se zvýší tímto po�tem vrstev a pod ním bude vytvořen podpůrný materiál."
+
+#: src/libslic3r/PrintConfig.cpp:2259
+msgid "The percentage of the bed area. \nIf the print area exceeds the specified value, \nthen a slow tilt will be used, otherwise - a fast tilt"
+msgstr "Procentuálně vyjádřená zabraná tisková plocha.\nPokud tisk zabere více než je zadaná hodnota,\nbude použit pomalý náklon. V ostatních případech bude použit rychlý náklon."
+
+#: src/libslic3r/PrintConfig.cpp:1768
+msgid "The printer multiplexes filaments into a single hot end."
+msgstr "Tiskárna přepíná několik filamentů v jednou hot endu."
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:342
+msgid "The selected file contains no geometry."
+msgstr "Vybraný soubor neobsahuje geometrii."
+
+#: src/slic3r/GUI/BedShapeDialog.cpp:346
+msgid "The selected file contains several disjoint areas. This is not supported."
+msgstr "Vybraný soubor obsahuje několik nespojených ploch. Tato možnost není podporována."
+
+#: src/slic3r/GUI/Plater.cpp:2271
+msgid "The selected object can't be split because it contains more than one volume/material."
+msgstr "Vybraný objekt nemůže být rozdělen, protože obsahuje více než jeden objem/materiál."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1737 src/slic3r/GUI/Plater.cpp:2279
+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."
+
+#: src/libslic3r/PrintConfig.cpp:2570
+msgid "The slope of the pad wall relative to the bed plane. 90 degrees means straight walls."
+msgstr "Sklon bo�nic vzhledem k podložce. 90 stupňů znamená kolmé stěny."
+
+#: src/libslic3r/PrintConfig.cpp:1544
+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 "Rychlost vtla�ení filamentu do extruderu po retrakci (vztahuje se pouze na motor extruderu). Pokud je ponecháno na nulu, použije se rychlost retrakce."
+
+#: src/libslic3r/PrintConfig.cpp:1536
+msgid "The speed for retractions (it only applies to the extruder motor)."
+msgstr "Rychlost retrakce (toto nastavení platí pouze pro motor extruderu)."
+
+#: src/slic3r/GUI/Tab.cpp:1247
+#, no-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- no ensure_vertical_shell_thickness\n\nShall I adjust those settings in order to enable Spiral Vase?"
+msgstr "Mód spirálové vázy vyžaduje:\n- jeden perimetr\n- žádné plné vrchní vrstvy\n- 0% hustota výplně\n- žádné podpěry\n- nezjišťování vertikální tloušťky pláště\n\nMám tyto nastavení upravit tak, aby bylo možné mód spirálové vázy zapnout?"
+
+#: src/libslic3r/Print.cpp:1187
+msgid "The Spiral Vase option can only be used when printing a single object."
+msgstr "Možnost \"Spirálová váza\" lze použít pouze při tisku jednoho objektu."
+
+#: src/libslic3r/Print.cpp:1189
+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/slic3r/GUI/Tab.cpp:2900
+msgid "The supplied name is empty. It can't be saved."
+msgstr "Název je prázdný. Nelze uložit."
+
+#: src/slic3r/GUI/Tab.cpp:3287
+msgid "The supplied name is not available."
+msgstr "Zadaný název není dostupný."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2725
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2812 src/slic3r/GUI/Tab.cpp:3278
+#: src/slic3r/GUI/Tab.cpp:3282
+msgid "The supplied name is not valid;"
+msgstr "Zadaný název není platný;"
+
+#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1785
+msgid "The supplied name is not valid; the following characters are not allowed:"
+msgstr "Zadaný název je neplatný; následující znaky nejsou povoleny:"
+
+#: src/libslic3r/Print.cpp:1268
+msgid "The supplied settings will cause an empty print."
+msgstr "Zadané nastavení způsobí prázdný tisk."
+
+#: src/libslic3r/PrintConfig.cpp:2524
+msgid "The thickness of the pad and its optional cavity walls."
+msgstr "Tloušťka podložky a její volitelné duté stěny."
+
+#: src/libslic3r/PrintConfig.cpp:1825
+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 "Vertikální vzdálenost mezi objektem a podpěrami. Nastavením tohoto parametru na hodnotu 0 se také zabrání tomu, aby Slic3r použil parametry průtoku a rychlosti pro mosty při tisku první vrstvy objektu."
+
+#: src/slic3r/GUI/Tab.cpp:2429
+msgid "The Wipe option is not available when using the Firmware Retraction mode.\n\nShall I disable it in order to enable Firmware Retraction?"
+msgstr "Možnost O�istit není k dispozici při použití režimu retrakcí z firmwaru.\n\nMám ji deaktivovat, aby bylo možné povolit retrakce z firmwaru?"
+
+#: src/slic3r/GUI/Tab.cpp:1277
+msgid "The Wipe Tower currently supports the non-soluble supports only\nif 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\nShall I adjust those settings in order to enable the Wipe Tower?"
+msgstr "Čistící věž v sou�asné době podporuje pouze nerozpustné podpěry\npokud jsou vytištěny s aktuálním extrudérem bez spuštění výměny nástroje.\n(jak extruder pro tisk podpěr tak extruder pro tisk kontaktních podpěr je třeba nastavit na 0).\n\nMám tyto nastavení upravit tak, aby bylo možné zapnout Čistící věž?"
+
+#: src/libslic3r/Print.cpp:1306
+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\npokud 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)."
+
+#: xs/src/libslic3r/Print.cpp:617
+msgid "The Wipe Tower is currently only supported for the Marlin and RepRap/Sprinter G-code flavors."
+msgstr "Čistící věž je v sou�asné době možná pouze pro G-cody ur�ené pro Marlin a RepRap/Sprinter."
+
+#: src/libslic3r/Print.cpp:1200
+msgid "The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter and Repetier G-code flavors."
+msgstr "Čistící věž je v sou�asné době možná pouze pro G-cody ur�ené pro Marlin, RepRap/Sprinter a Repetier."
+
+#: src/libslic3r/Print.cpp:1202
+msgid "The Wipe Tower is currently only supported with the relative extruder addressing (use_relative_e_distances=1)."
+msgstr "Čistící věž je v sou�asné době možná pouze v případě relativního adresování exruderu (use_relative_e_distances=1)."
+
+#: src/libslic3r/Print.cpp:1225
+msgid "The Wipe Tower is only supported for multiple objects if they are printed over an equal number of raft layers"
+msgstr "Čistící věž pro více objektů je možná pouze v případě, že objekty mají stejný po�et raft vrstev"
+
+#: src/libslic3r/Print.cpp:1227
+msgid "The Wipe Tower is only supported for multiple objects if they are printed with the same support_material_contact_distance"
+msgstr "Čistící věž pro více objektů je možná pouze v případě, že objekty mají shodný parametr support_material_contact_distance."
+
+#: src/libslic3r/Print.cpp:1229
+msgid "The Wipe Tower is only supported for multiple objects if they are sliced equally."
+msgstr "Čistící věž je při více objektech možná pouze v případě, že objekty jsou slicovány stejně."
+
+#: src/libslic3r/Print.cpp:1223
+msgid "The Wipe Tower is only supported for multiple objects if they have equal layer heigths"
+msgstr "Čistící věž je při více objektech možná pouze v případě, že objekty mají všechny vrstvy stejné výšky."
+
+#: src/libslic3r/Print.cpp:1258
+msgid "The Wipe tower is only supported if all objects have the same layer height profile"
+msgstr "Čistící věž je podporována pouze v případě, že všechny objekty mají stejný výškový profil"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:127
+#, possible-c-format
+msgid "This %s version: %s"
+msgstr "Tento %s verze: %s"
+
+#: src/libslic3r/PrintConfig.cpp:140
+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:1032
+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/libslic3r/PrintConfig.cpp:129
+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 "Tento vlastní kód je vložen pro každou změnu vrstvy, předtím než se pohne Z. Můžete přidávat zástupné proměnné pro veškeré nastavení Slic3ru stejně tak jako [layer_num] a [layer_z]."
+
+#: src/libslic3r/PrintConfig.cpp:2007
+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 "Tento vlastní kód je vložen těsně před každou změnou extruderu. Můžete použít zástupné proměnné pro všechna nastavení Slic3ru, stejně jako [previous_extruder] a [next_extruder]."
+
+#: src/libslic3r/PrintConfig.cpp:370
+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 "Tato ukon�ovací procedura je vložena na konec výstupního souboru, před kone�ným G-code tiskárny. Můžete přidávat zástupné proměnné pro veškeré nastavení Slic3ru. Pokud máte tiskárnu s více extrudery, G-code je zpracován v pořadí extruderů."
+
+#: src/libslic3r/PrintConfig.cpp:360
+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 "Tato ukon�ovací procedura je vložena na konec výstupního souboru. Můžete přidávat zástupné proměnné pro veškeré nastavení Slic3ru."
+
+#: src/libslic3r/PrintConfig.cpp:1193 src/libslic3r/PrintConfig.cpp:1204
+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."
+msgstr "Toto experimentální nastavení se používá k omezení rychlosti změny objemového průtoku. Hodnota 1,8mm³/s² zajišťuje, že změna objemového průtoku z 1,8 mm³/s (šířka extruze 0,45 mm, výška extruze 0,2 mm, rychlost posuvu 20 mm/s) na 5,4 mm³/s (rychlost posuvu 60 mm/s) potrvá nejméně 2 sekundy."
+
+#: src/libslic3r/PrintConfig.cpp:1183
+msgid "This experimental setting is used to set the maximum volumetric speed your extruder supports."
+msgstr "Toto experimentální nastavení slouží k nastavení maximální objemové rychlosti, kterou váš extruder podporuje."
+
+#: src/libslic3r/PrintConfig.cpp:2061
+msgid "This experimental setting uses G10 and G11 commands to have the firmware handle the retraction. This is only supported in recent Marlin."
+msgstr "Toto experimentální nastavení používá příkazy G10 a G11, aby si firmware poradil s retrakcí. Toto je podporováno pouze v posledních verzích firmwaru Marlin."
+
+#: src/libslic3r/PrintConfig.cpp:2075
+msgid "This experimental setting uses outputs the E values in cubic millimeters instead of linear millimeters. If your firmware doesn't already know filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] T0' in your start G-code in order to turn volumetric mode on and use the filament diameter associated to the filament selected in Slic3r. This is only supported in recent Marlin."
+msgstr "Toto experimentální nastavení používá výstupní hodnoty E v kubických milimetrech místo lineárních milimetrů. Pokud firmware dosud nezná průměr (průměry) filamentu, můžete v po�áte�ním G-code zadat příkazy jako “M200 D [filament_diameter_0] T0�, pro se zapnutí volumetrického režimu a použití průměru filamentu přidruženého k vybranému filamentu ve Slic3ru. Toto je podporováno pouze v posledních verzích firmwaru Marlin."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2848
+msgid "This extruder will be set for selected items"
+msgstr "Tento extruder bude nastaven pro vybrané položky"
+
+#: src/libslic3r/PrintConfig.cpp:188
+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 "Tato hodnota ur�uje množství vytla�eného plastu při vytváření mostů. Mírným snížením této hodnoty můžete předejít pronášení i když, přednastavené hodnoty jsou většinou dobré a je lepší experimentovat s chlazením (využitím ventilátoru), než s touto hodnotou."
+
+#: src/libslic3r/PrintConfig.cpp:514
+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."
+msgstr "Tento faktor mění poměrné množství průtoku. Možná bude třeba toto nastavení vyladit, pro dosažení hezkého povrchu a správné šířky jednotlivých stěn. Obvyklé hodnoty jsou mezi 0,9 a 1,1. Pokud si myslíte, že hodnotu potřebujete změnit více, zkontrolujte průměr filamentu a E kroky ve firmwaru."
+
+#: src/libslic3r/PrintConfig.cpp:178
+msgid "This fan speed is enforced during all bridges and overhangs."
+msgstr "Nastavená rychlost ventilátoru je využita vždy při vytváření mostů a přesahů."
+
+#: src/libslic3r/PrintConfig.cpp:944
+msgid "This feature allows to combine infill and speed up your print by extruding thicker infill layers while preserving thin perimeters, thus accuracy."
+msgstr "Tato funkce umožňuje kombinovat výplň a urychlit tisk pomocí extruzí silnějších výplňových vrstev při zachování tenkých obvodů, a tím i přesnosti."
+
+#: src/libslic3r/PrintConfig.cpp:1677
+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."
+msgstr "Tato funkce umožňuje vynucení plné vrstvy za každý daný po�et vrstev. Pro vypnutí nastavte nulu. Můžete nastavit libovolnou hodnotu (například 9999); Slic3r automaticky zvolí maximální po�et vrstev, které se budou kombinovat podle průměru trysky a výšky vrstvy."
+
+#: src/libslic3r/PrintConfig.cpp:1718
+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 "Tato funkce zvýší postupně Z při tisku jednovrstvého objektu, aby se odstranil jakýkoli viditelný šev. Tato volba vyžaduje jediný obvod, žádnou výplň, žádné vrchní plné vrstvy a žádný podpůrný materiál. Můžete stále nastavit libovolný po�et spodních plných vrstev, stejně jako obrysové smy�ky / límec. Při tisku více než jednoho objektu nebude toto nastavení fungovat."
+
+#: src/slic3r/GUI/Plater.cpp:1712
+msgid "This file cannot be loaded in a simple mode. Do you want to switch to an advanced mode?\n"
+msgstr "Tento soubor nelze na�íst v jednoduchém režimu. Chcete přepnout do pokro�ilého režimu?\n"
+
+#: src/slic3r/GUI/Plater.cpp:1650
+msgid "This file cannot be loaded in simple mode. Do you want to switch to expert mode?\n"
+msgstr "Tento soubor nelze na�íst v jednoduchém režimu. Chcete přepnout do expert režimu?\n"
+
+#: src/slic3r/GUI/Plater.cpp:1658
+msgid "This file contains several objects positioned at multiple heights. Instead of considering them as multiple objects, should I consider\nthis file as a single object having multiple parts?\n"
+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í,\nnamísto vložení několika objektů?\n"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:313
+#, possible-c-format
+msgid "This firmware hex file does not match the printer model.\nThe hex file is intended for: %s\nPrinter reported: %s\n\nDo you want to continue and flash this hex file anyway?\nPlease only continue if you are sure this is the right thing to do."
+msgstr "Tento hex soubor s firmware neodpovídá modelu tiskárny.\nSoubor hex je ur�en pro: %s\nTiskárna oznámila: %s\n\nChcete i přesto pokra�ovat a nahrát do tiskárny hex soubor?\nPokra�ujte prosím, pouze pokud jste si jisti, že je to správný soubor."
+
+#: src/libslic3r/PrintConfig.cpp:278
+msgid "This flag enables the automatic cooling logic that adjusts print speed and fan speed according to layer printing time."
+msgstr "Zapne výpo�et automatického chlazení, který upravuje rychlost tisku a ventilátoru v závislosti na délce tisku jedné vrstvy."
+
+#: src/slic3r/GUI/Plater.cpp:448
+msgid "This flag enables the brim that will be printed around each object on the first layer."
+msgstr "Tato vlajka zapíná límec, který bude vytištěn kolem každého objektu při první vrstvě."
+
+#: src/libslic3r/PrintConfig.cpp:1468
+msgid "This flag enforces a retraction whenever a Z move is done."
+msgstr "Tato možnost vyvolá retrakci, kdykoli je proveden pohyb Z."
+
+#: src/libslic3r/PrintConfig.cpp:2093
+msgid "This flag will move the nozzle while retracting to minimize the possible blob on leaky extruders."
+msgstr "Toto nastavení přemístí trysku při retrakci, aby se minimalizovalo možné vytékání materiálu."
+
+#: src/libslic3r/PrintConfig.cpp:2501
+msgid "This is a relative measure of support points density."
+msgstr "Relativní míra hustoty podpěrných bodů."
+
+#: src/libslic3r/PrintConfig.cpp:491 src/libslic3r/PrintConfig.cpp:551
+msgid "This is only used in the Slic3r interface as a visual help."
+msgstr "Toto je v Slic3ru jako názorná pomoc."
+
+#: src/libslic3r/PrintConfig.cpp:300
+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."
+msgstr "Toto je hodnota akcelerace na kterou se tiskárna vrátí po specifických úpravách akcelerace například při tisku (perimetru/výplně). Nastavením na nulu zabráníte návratu rychlostí zcela."
+
+#: src/libslic3r/PrintConfig.cpp:158
+msgid "This is the acceleration your printer will use for bridges. Set zero to disable acceleration control for bridges."
+msgstr "Nastavení akcelerace tiskárny při vytváření mostů. Nastavením na nulu vypnete ovládání akcelerace pro mosty."
+
+#: src/libslic3r/PrintConfig.cpp:813
+msgid "This is the acceleration your printer will use for first layer. Set zero to disable acceleration control for first layer."
+msgstr "Toto je zrychlení, které vaše tiskárna použije pro první vrstvu. Nastavte nulu pro vypnutí řízení zrychlení pro první vrstvu."
+
+#: src/libslic3r/PrintConfig.cpp:934
+msgid "This is the acceleration your printer will use for infill. Set zero to disable acceleration control for infill."
+msgstr "Toto je zrychlení, které vaše tiskárna použije pro výplň. Nastavte nulu, chcete-li vypnout řízení zrychlení pro výplň."
+
+#: src/libslic3r/PrintConfig.cpp:1331
+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 "Jedná se o akceleraci, kterou vaše tiskárna použije pro perimetry. Vysoká hodnota, jako je 9000, obvykle dává dobré výsledky, pokud je váš hardware v pořádku. Nastavte nulu pro vypnutí řízení zrychlení pro perimetry."
+
+#: src/libslic3r/PrintConfig.cpp:1262
+msgid "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
+msgstr "Průměr trysky extruderu (například: 0.5, 0.35 atd.)"
+
+#: src/libslic3r/PrintConfig.cpp:1162
+#, no-c-format
+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."
+msgstr "Toto je největší možná výška vrstvy pro tento extruder, který se používá k zakrytí výšky proměnné vrstvy a výšky podpůrné vrstvy. Maximální doporu�ená výška vrstvy �iní 75% šířky vytla�ování, aby se dosáhlo přiměřené přilnavosti mezi vrstvami. Pokud je nastavena hodnota 0, je výška vrstvy omezena na 75% průměru trysky."
+
+#: src/libslic3r/PrintConfig.cpp:1225
+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."
+msgstr "Nejmenší tisknutelná výška vrstvy pro tento extruder. Omezuje rozlišení pro výšku proměnné vrstvy. Typické hodnoty jsou mezi 0,05 mm a 0,1 mm."
+
+#: src/libslic3r/PrintConfig.cpp:2114
+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 "Tato matice popisuje objemy (v kubických milimetrech) nutné k vy�ištění nového filamentu na �istící věži pro danou dvojici nástrojů. "
+
+#: src/libslic3r/PrintConfig.cpp:1372
+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 "Tato volba nastavuje po�et perimetrů, které je třeba vygenerovat pro každou vrstvu. Slic3r může toto �íslo automaticky zvýšit, pokud detekuje šikmé plochy, které se tisknou lépe s vyšším po�tem obvodů, pokud je zapnuta možnost Extra perimetry."
+
+#: src/libslic3r/PrintConfig.cpp:1287
+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 "Tato volba sníží teplotu neaktivních extruderů, aby u nich nedošlo k vytékání."
+
+#: src/libslic3r/PrintConfig.cpp:980
+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."
+msgstr "Tato volba omezuje výplň na plochy skute�ně potřebné pro podpěru stropů (bude se chovat jako vnitřní podpěrný materiál). Je-li tato volba zapnuta, zpomaluje generování G-code kvůli několikanásobným kontrolám."
+
+#: src/libslic3r/PrintConfig.cpp:973
+msgid "This option will switch the print order of perimeters and infill, making the latter first."
+msgstr "Tato volba obrátí pořadí tisku obvodů a výplní."
+
+#: src/libslic3r/PrintConfig.cpp:427
+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 "Toto oddělené nastavení ovlivní rychlost tisku vnějších perimetrů (těch viditelných). Pokud je hodnota vyjádřena procenty (například: 80%), bude rychlost vypo�ítána z hodnoty rychlosti tisku perimetrů, nastavené výše. Nastavte nulu pro automatický výpo�et."
+
+#: src/libslic3r/PrintConfig.cpp:1648
+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 "Toto oddělené nastavení ovlivní rychlost perimetrů o poloměru <= 6,5 mm (obvykle díry). Pokud je vyjádřeno jako procentní podíl (například: 80%), vypo�te se z výše uvedeného nastavení rychlosti perimetrů. Pro automatické nastavení zadejte nulu."
+
+#: src/libslic3r/PrintConfig.cpp:989
+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."
+msgstr "Toto nastavení uplatňuje dodate�né překrytí mezi výplní a obvodem pro lepší spojení. Teoreticky by to nemělo být potřeba, ale reakce by mohla způsobit mezery. Pokud je vyjádřeno procenty (například: 15%), vypo�ítá se z šířky extruze perimetrů."
+
+#: src/libslic3r/PrintConfig.cpp:57
+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 "Toto nastavení řídí výšku (a tedy výsledný po�et) řezů/vrstev. Ten�í vrstva poskytuje lepší přesnost, ale tiskne se déle."
+
+#: src/libslic3r/PrintConfig.cpp:1153
+msgid "This setting represents the maximum speed of your fan."
+msgstr "Toto nastavení vyjadřuje maximální rychlost ventilátoru."
+
+#: src/libslic3r/PrintConfig.cpp:1216
+msgid "This setting represents the minimum PWM your fan needs to work."
+msgstr "Toto nastavení představuje minimální hodnotu PWM, kterou ventilátor potřebuje, aby pracoval."
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:123
+#, possible-c-format
+msgid "This Slic3r PE version: %s"
+msgstr "Tato verze Slic3r PE: %s"
+
+#: src/libslic3r/PrintConfig.cpp:1752
+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 "Tento postup spuštění je vložen na za�átku, po každém spuštění G-code tiskárny. Toto slouží k přepsání nastavení pro konkrétní filament. Pokud Slic3r detekuje M104, M109, M140 nebo M190 ve vašich vlastních kódech, takové příkazy nebudou automaticky předkládány, takže máte možnost přizpůsobit pořadí příkazů k ohřevu a další vlastní akce. Pro všechny nastavení Slic3ru můžete použít zástupné proměnné, takže můžete zadat příkaz “M109 S [first_layer_temperature]� kdekoli chcete. Pokud máte více extruderů, G-code se zpracovává v pořadí extruderů."
+
+#: src/libslic3r/PrintConfig.cpp:1737
+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 "Tento spouštěcí postup je vložen na za�átku, poté, co vyhřívaná tisková podložka dosáhla cílové teploty a extruder se právě za�al ohřívat a předtím, než dosáhl cílové teploty extruder. Pokud Slic3r detekuje M104 nebo M190 ve vašich vlastních kódech, takové příkazy nebudou automaticky předkládány, takže máte možnost upravit pořadí příkazů pro vytápění a další vlastní akce. Pro všechny nastavení Slic3ru můžete použít zástupné proměnné, takže můžete zadat příkaz “M109 S [first_layer_temperature]� kdekoli chcete."
+
+#: src/libslic3r/PrintConfig.cpp:663
+msgid "This string is edited by RammingDialog and contains ramming specific parameters "
+msgstr "This string is edited by RammingDialog and contains ramming specific parameters "
+
+#: src/libslic3r/PrintConfig.cpp:2185
+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)."
+msgstr "Tato hodnota bude přidána (nebo ode�tena) ze všech souřadnic Z ve výstupním G-code. Používá se ke kompenzování špatné pozice endstopu Z. Například pokud endstop 0 skute�ně ponechá trysku 0,3 mm daleko od tiskové podložky, nastavte hodnotu -0,3 (nebo dola�te svůj koncový doraz)."
+
+#: src/libslic3r/PrintConfig.cpp:2107
+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 "Tento vektor ukládá potřebné objemy pro změnu z/na každý extruder používaný na �istící věži. Tyto hodnoty jsou použity pro zjednodušení vytvoření celkových objemů �ištění níže. "
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:118
+#, possible-c-format
+msgid "This version of %s is not compatible with currently installed configuration bundles.\nThis probably happened as a result of running an older %s after using a newer one.\n\nYou 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.\n"
+msgstr "Tato verze %s není kompatibilní se sou�asně nainstalovanými balí�ky nastavení.\nTato situace nejspíše nastala spuštěním starší verze %s po používání novější verze.\n\nMůž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.\n"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:114
+msgid "This version of Slic3r PE is not compatible with currently installed configuration bundles.\nThis probably happened as a result of running an older Slic3r PE after using a newer one.\n\nYou may either exit Slic3r 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 Slic3r.\n"
+msgstr "Tato verze Slic3r PE není kompatibilní se sou�asně nainstalovanými balí�ky nastavení.\nTato situace nejspíše nastala spuštěním starší verze Slic3r PE po používání novější verze.\n\nMůžete bu� ukon�it Slic3r a zkusit to znovu s novou verzí, nebo můžete znovu spustit výchozí konfiguraci. Před instalací kompatibilního nastavení s touto verzí Slic3ru dojde k vytvoření zálohy sou�asné konfigurace.\n"
+
+#: src/libslic3r/PrintConfig.cpp:2282
+msgid "This will apply a gamm correction to the rasterized 2D polygons."
+msgstr "Aplikuje korekci gamma na rastrové 2D polygony."
+
+#: src/libslic3r/PrintConfig.cpp:2284
+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 "Aplikuje gamma korekci na rastrové 2D polygony. Hodnota nula znamená nastavení prahové hodnoty doprostřed. Toto chování eliminuje antialiasing bez ztráty otvorů v polygonech."
+
+#: src/libslic3r/PrintConfig.cpp:1994
+msgid "Threads"
+msgstr "Vlákna"
+
+#: src/libslic3r/PrintConfig.cpp:1995
+msgid "Threads are used to parallelize long-running tasks. Optimal threads number is slightly above the number of available cores/processors."
+msgstr "Vlákna jsou používána pro paralelizaci �asově náro�nějších úloh. Optimální po�et vláken je mírně nad po�tem dostupných jader/procesorů."
+
+#: src/slic3r/GUI/Tab.cpp:2052
+msgid "Tilt"
+msgstr "Náklon"
+
+#: src/slic3r/GUI/Tab.cpp:2053
+msgid "Tilt time"
+msgstr "Doba náklonu"
+
+#: src/slic3r/GUI/RammingChart.cpp:76
+msgid "Time"
+msgstr "ÄŒas"
+
+#: src/libslic3r/PrintConfig.cpp:655
+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 "Doba, po kterou firmware tiskárny (nebo jednotka Multi Material 2.0) zavádí nový filament během jeho výměny (při provádění kódu T). Tento �as je přidán k celkové době tisku pomocí G-code odhadova�e tiskového �asu."
+
+#: src/libslic3r/PrintConfig.cpp:670
+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."
+msgstr "Doba, po kterou firmware tiskárny (nebo jednotka Multi Material 2.0) vysouvá filament během jeho výměny (při provádění kódu T). Tento �as je přidán k celkové době tisku pomocí G-code odhadova�e tiskového �asu."
+
+#: src/libslic3r/PrintConfig.cpp:2242
+msgid "Time of the fast tilt"
+msgstr "Doba trvání rychlého náklonu"
+
+#: src/libslic3r/PrintConfig.cpp:2251
+msgid "Time of the slow tilt"
+msgstr "Doba trvání pomalého náklonu"
+
+#: src/libslic3r/PrintConfig.cpp:609
+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. "
+msgstr "Doba �ekání po vysunutí filamentu. Může pomoci ke spolehlivé změně extruderu s flexibilními materiály, které potřebují více �asu ke smrštění na původní rozměry. "
+
+#: src/slic3r/GUI/Tab.cpp:916
+msgid "To do that please specify a new name for the preset."
+msgstr "Chcete-li akci provést, prosím nejdříve zadejte nový název přednastavení."
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:37
+msgid "To download, follow the link below."
+msgstr "Pro stažení, klikněte na odkaz níže."
+
+#: src/slic3r/GUI/Plater.cpp:2966
+msgid "To objects"
+msgstr "Objektům"
+
+#: src/slic3r/GUI/Plater.cpp:2968
+msgid "To parts"
+msgstr "Na �ásti"
+
+#: src/libslic3r/Zipper.cpp:37
+msgid "too many files"
+msgstr "příliš mnoho souborů"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/GUI_Preview.cpp:315
+#: src/slic3r/GUI/GUI_Preview.cpp:481 src/slic3r/GUI/GUI_Preview.cpp:537
+#: src/slic3r/GUI/GUI_Preview.cpp:713 src/libslic3r/GCode/PreviewData.cpp:404
+msgid "Tool"
+msgstr "Nástroj"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:240
+msgid "Tool #"
+msgstr "Nástroj #"
+
+#: src/slic3r/GUI/Tab.cpp:1973 src/libslic3r/PrintConfig.cpp:2006
+msgid "Tool change G-code"
+msgstr "G-code pro výměnu nástroje"
+
+#: src/slic3r/GUI/Tab.cpp:1530
+msgid "Toolchange parameters with single extruder MM printers"
+msgstr "Parametry při výměně (Multi Material s jedním extruderem)"
+
+#. TRN To be shown in the main menu View->Top
+#: src/slic3r/GUI/MainFrame.cpp:522
+msgid "Top"
+msgstr "Shora"
+
+#: src/libslic3r/PrintConfig.cpp:388
+msgid "Top fill pattern"
+msgstr "Vzor výplně horní vrstvy"
+
+#: src/slic3r/GUI/PresetHints.cpp:189
+msgid "top solid infill"
+msgstr "vrchní plná výplň"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/PrintConfig.cpp:2017
+#: src/libslic3r/PrintConfig.cpp:2028 src/libslic3r/GCode/PreviewData.cpp:168
+msgid "Top solid infill"
+msgstr "Vrchní plné výplně"
+
+#: src/libslic3r/PrintConfig.cpp:2046
+msgid "Top solid layers"
+msgstr "Vrchních plných vrstev"
+
+#: src/slic3r/GUI/MainFrame.cpp:522
+msgid "Top View"
+msgstr "Pohled svrchu"
+
+#: xs/src/libslic3r/PrintConfig.cpp:283
+msgid "Top/bottom fill pattern"
+msgstr "Vzor výplně horní/spodní vrstvy"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:247
+msgid "Total purging volume is calculated by summing two values below, depending on which tools are loaded/unloaded."
+msgstr "Celkový objem �ištění je spo�ítán jako sou�et dvou hodnot níže v závislosti na tom, které extrudery jsou zavedeny/vyjmuty."
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:84
+msgid "Total rammed volume"
+msgstr "Celkový objem rapidní extruze"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82
+msgid "Total ramming time"
+msgstr "Celkový �as rapidní extruze"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
+msgid "Translate"
+msgstr "Posunout"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/PrintConfig.cpp:2051
+msgid "Travel"
+msgstr "Rychloposun"
+
+#: src/libslic3r/PrintConfig.cpp:798
+msgid "Triangles"
+msgstr "Trojúhelníky"
+
+#: src/libslic3r/PrintConfig.cpp:3059
+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 "Pokuste se opravit nemanifoldní meshe (tato možnost je implicitně přidána vždy, když potřebujeme řezat model)."
+
+#: src/libslic3r/PrintConfig.cpp:1397
+msgid "Type of the printer."
+msgstr "Typ tiskárny."
+
+#: src/libslic3r/Zipper.cpp:35
+msgid "undefined error"
+msgstr "nedefinovaná chyba"
+
+#: src/libslic3r/Zipper.cpp:59
+msgid "unexpected decompressed size"
+msgstr "neo�ekávaná dekomprimovaná velikost"
+
+#: lib/Slic3r/GUI/Plater.pm:2264 lib/Slic3r/GUI/Plater.pm:2280
+msgid "Uniformly…"
+msgstr "Souměrně…"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:27
+msgid "Unknown"
+msgstr "Neznámý"
+
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:154
+msgid "Unknown error occured"
+msgstr "Došlo k neznámé chybě"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:234
+msgid "unloaded"
+msgstr "vyjmuto"
+
+#: src/libslic3r/PrintConfig.cpp:591
+msgid "Unloading speed"
+msgstr "Rychlost vysunutí"
+
+#: src/libslic3r/PrintConfig.cpp:600
+msgid "Unloading speed at the start"
+msgstr "Po�áte�ní rychlost vysouvání filamentu "
+
+#: src/slic3r/GUI/Tab.cpp:3105
+msgid "UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system values for the current option group.\nClick to reset all settings for current option group to the system values."
+msgstr "Ikona ODEMKNUTÉHO Z�MKU indikuje, že některá nastavení byla změněna a nejsou shodná se systémový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:3120
+msgid "UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system value.\nClick to reset current value to the system value."
+msgstr "Ikona ODEMKNUTÉHO Z�MKU indikuje, že se hodnota změnila a není shodná se systémovou hodnotou.\nKlikněte pro reset sou�asné hodnoty na systémovou hodnotu."
+
+#: src/slic3r/GUI/Tab.cpp:3067
+msgid "UNLOCKED LOCK;indicates that some settings were changed and are not equal to the system values for the current option group.\nClick the UNLOCKED LOCK icon to reset all settings for current option group to the system values."
+msgstr "ODEMKNUT� Z�MEK;indikuje, že některá nastavení byla změněna a nejsou shodná se systémovými hodnotami pro danou skupinu nastavení.\nKlikněte na ikonu ODEMKNUTÉHO Z�MKU pro reset všech nastavení aktuální skupiny nastavení na systémové hodnoty."
+
+#: src/slic3r/GUI/GUI_Preview.cpp:245
+msgid "Unretractions"
+msgstr "Deretrakce"
+
+#: src/slic3r/GUI/Tab.cpp:2785
+msgid "Unsaved Changes"
+msgstr "Neuložené Změny"
+
+#: src/slic3r/GUI/GUI_App.cpp:790
+msgid "Unsaved Presets"
+msgstr "Neuložená přednastavení"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:154
+msgid "Unselect gizmo, keep object selection"
+msgstr "Zrušit gizmo, zachovat výběr objektů"
+
+#: src/libslic3r/Zipper.cpp:63
+msgid "unsupported central directory size"
+msgstr "nepodporovaná velikost centrálního adresáře"
+
+#: src/libslic3r/Zipper.cpp:43
+msgid "unsupported encryption"
+msgstr "nepodporované šifrování"
+
+#: src/libslic3r/Zipper.cpp:45
+msgid "unsupported feature"
+msgstr "nepodporovaná funkce"
+
+#: src/libslic3r/Zipper.cpp:41
+msgid "unsupported method"
+msgstr "nepodporovaná metoda"
+
+#: src/libslic3r/Zipper.cpp:53
+msgid "unsupported multidisk archive"
+msgstr "nepodporovaný multidisk archiv"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2414
+msgid "Unsupported selection"
+msgstr "Nepodporovaný výběr"
+
+#: src/libslic3r/GCode/PreviewData.cpp:495
+#, possible-c-format
+msgid "up to %.2f mm"
+msgstr "do % .2f mm"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:30
+msgid "Update available"
+msgstr "Je dostupná aktualizace"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:419 src/slic3r/GUI/Preferences.cpp:69
+msgid "Update built-in Presets automatically"
+msgstr "Aktualizovat vestavěné přednastavení automaticky"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:401
+msgid "Updates"
+msgstr "Aktualizace"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:426
+msgid "Updates are never applied without user's consent and never overwrite user's customized settings."
+msgstr "Aktualizace nejsou nikdy nainstalovány bez vědomí uživatele a nikdy nepřepíšou upravená uživatelská nastavení."
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
+msgid "Upgrade"
+msgstr "Aktualizovat"
+
+#: src/slic3r/GUI/GUI_App.cpp:685
+msgid "Upload a firmware image into an Arduino based printer"
+msgstr "Nahrát firmware do tiskárny s Arduinem"
+
+#: xs/src/slic3r/Utils/OctoPrint.cpp:33
+msgid "Upload to OctoPrint with the following filename:"
+msgstr "Nahrát do OctoPrintu s následujícím názvem:"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:33
+msgid "Upload to Printer Host with the following filename:"
+msgstr "Nahrát soubor do tiskového serveru se jménem:"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:229
+msgid "Uploading"
+msgstr "Nahrávání"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:171
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:173
+msgid "Upper Layer"
+msgstr "Vyšší vrstva"
+
+#: src/slic3r/GUI/Tab.cpp:1873
+msgid "USB/Serial connection"
+msgstr "USB/Sériové připojení"
+
+#: src/libslic3r/PrintConfig.cpp:1592
+msgid "USB/serial port for printer connection."
+msgstr "USB/sériový port pro připojení tiskárny."
+
+#: src/libslic3r/PrintConfig.cpp:2060
+msgid "Use firmware retraction"
+msgstr "Použít retrakce z firmwaru"
+
+#: src/slic3r/GUI/PrintHostDialogs.cpp:42
+msgid "Use forward slashes ( / ) as a directory separator if needed."
+msgstr "Pokud je to nutné, použijte pro oddělení složek lomítko ( / )."
+
+#: src/slic3r/GUI/Preferences.cpp:93
+msgid "Use legacy OpenGL 1.1 rendering"
+msgstr "Použijte historické OpenGL 1.1 vykreslování"
+
+#: src/libslic3r/PrintConfig.cpp:2515
+msgid "Use pad"
+msgstr "Použít podložku"
+
+#: src/libslic3r/PrintConfig.cpp:2067
+msgid "Use relative E distances"
+msgstr "Použít relativní E vzdálenosti"
+
+#: src/slic3r/GUI/Preferences.cpp:103
+msgid "Use Retina resolution for the 3D scene"
+msgstr "Pro 3D scénu použít rozlišení Retina"
+
+#: src/libslic3r/PrintConfig.cpp:508
+msgid "Use this option to set the axis letter associated to your printer's extruder (usually E but some printers use A)."
+msgstr "Touto volbou nastavíte písmeno osy přidružené k extruderu tiskárny (obvykle E, ale některé tiskárny používají A)."
+
+#: src/libslic3r/PrintConfig.cpp:1807
+msgid "Use this setting to rotate the support material pattern on the horizontal plane."
+msgstr "Toto nastavení použijte pro horizontální oto�ení vzoru."
+
+#: src/libslic3r/PrintConfig.cpp:2074
+msgid "Use volumetric E"
+msgstr "Použít volumetrickou hodnotu E"
+
+#: src/slic3r/GUI/Plater.cpp:214
+msgid "Used Filament (g)"
+msgstr "Použito Filamentu (g)"
+
+#: src/slic3r/GUI/Plater.cpp:212 src/slic3r/GUI/Plater.cpp:1041
+msgid "Used Filament (m)"
+msgstr "Použito Filamentu (m)"
+
+#: src/slic3r/GUI/Plater.cpp:213
+msgid "Used Filament (mm³)"
+msgstr "Použito Filamentu (mm³)"
+
+#: src/slic3r/GUI/Plater.cpp:1015
+msgid "Used Material (ml)"
+msgstr "Použitý materiál (ml)"
+
+#: src/slic3r/GUI/Plater.cpp:215
+msgid "Used Material (unit)"
+msgstr "Použito materiálu (jednotka)"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:24
+msgid "User"
+msgstr "Uživatel"
+
+#: src/slic3r/GUI/Preset.cpp:974 src/slic3r/GUI/Preset.cpp:1071
+#: src/slic3r/GUI/PresetBundle.cpp:1558
+msgid "User presets"
+msgstr "Uživatelská přednastavení"
+
+#: src/libslic3r/Zipper.cpp:93
+msgid "validation failed"
+msgstr "Validace selhala"
+
+#: src/slic3r/GUI/ButtonsDescription.cpp:41
+msgid "Value is the same as the system value"
+msgstr "Hodnota je shodná se systémovou hodnotou"
+
+#: src/slic3r/GUI/ButtonsDescription.cpp:58
+msgid "Value was changed and is not equal to the system value or the last saved preset"
+msgstr "Hodnota byla změněna a není shodná se systémovou hodnotou nebo naposled uloženým přednastavením"
+
+#: src/slic3r/GUI/Tab.cpp:2150
+msgid "Values in this column are for Full Power mode"
+msgstr "Hodnoty v tomto sloupci jsou ur�eny pro režim plného výkonu (normal režim)"
+
+#: src/slic3r/GUI/Tab.cpp:2156
+msgid "Values in this column are for Silent mode"
+msgstr "Hodnoty v tomto sloupci jsou pro tichý režim"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:58
+msgid "variants"
+msgstr "varianty"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52 src/slic3r/GUI/Tab.cpp:921
+msgid "vendor"
+msgstr "prodejce"
+
+#: src/libslic3r/PrintConfig.cpp:880
+msgid "Verbose G-code"
+msgstr "Komentáře do G-code"
+
+#: lib/Slic3r/GUI/MainFrame.pm:66
+msgid "Version "
+msgstr "Verze "
+
+#: src/slic3r/GUI/AboutDialog.cpp:67 src/slic3r/GUI/MainFrame.cpp:53
+msgid "Version"
+msgstr "Verze"
+
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
+msgid "version"
+msgstr "verze"
+
+#: src/slic3r/GUI/Tab.cpp:1002
+msgid "Vertical shells"
+msgstr "Svislé stěny"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:209
+msgid "View"
+msgstr "Zobrazení"
+
+#: src/libslic3r/SLAPrint.cpp:857 src/libslic3r/SLAPrint.cpp:867
+#: src/libslic3r/SLAPrint.cpp:915
+msgid "Visualizing supports"
+msgstr "Vizualizace podpěr"
+
+#: src/slic3r/GUI/Plater.cpp:138
+msgid "Volume"
+msgstr "Obsah"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:248
+msgid "Volume to purge (mm³) when the filament is being"
+msgstr "Objem k vy�ištění (mm³) pokud je filament"
+
+#: src/slic3r/GUI/PresetHints.cpp:216
+msgid "Volumetric"
+msgstr "Volumetrický"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:216
+msgid "Volumetric flow rate"
+msgstr "Objemový průtok"
+
 #: src/libslic3r/GCode/PreviewData.cpp:402
 msgid "Volumetric flow rate (mm3/s)"
 msgstr "Objemový průtok (mm3/s)"
 
-#: src/libslic3r/GCode/PreviewData.cpp:491
-msgid "Default print color"
-msgstr ""
+#: src/slic3r/GUI/RammingChart.cpp:81
+msgid "Volumetric speed"
+msgstr "Objemová rychlost"
 
-#: src/libslic3r/GCode/PreviewData.cpp:495
-#, c-format
-msgid "up to %.2f mm"
-msgstr ""
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:1168 src/slic3r/GUI/GUI.cpp:283
+#: src/slic3r/GUI/WipeTowerDialog.cpp:44 src/slic3r/GUI/WipeTowerDialog.cpp:328
+msgid "Warning"
+msgstr "Varování"
 
-#: src/libslic3r/GCode/PreviewData.cpp:499
-#, c-format
-msgid "above %.2f mm"
-msgstr ""
+#: src/slic3r/GUI/ConfigWizard.cpp:294
+msgid "Welcome"
+msgstr "Vítejte"
 
-#: src/libslic3r/GCode/PreviewData.cpp:504
-#, c-format
-msgid "%.2f - %.2f mm"
-msgstr ""
+#: src/slic3r/GUI/ConfigWizard.cpp:294
+#, possible-c-format
+msgid "Welcome to the %s %s"
+msgstr "Vítejte v %s %s"
 
-#~ msgid ""
-#~ "\n"
-#~ "Non-positive value."
-#~ msgstr ""
-#~ "\n"
-#~ "Nezáporná hodnota."
+#: src/slic3r/GUI/ConfigWizard.cpp:284
+#, possible-c-format
+msgid "Welcome to the Slic3r %s"
+msgstr "Vítejte v Slic3r %s"
 
-#~ msgid ""
-#~ "\n"
-#~ "Not a numeric value."
-#~ msgstr ""
-#~ "\n"
-#~ "Ne�íselná hodnota."
+#: lib/Slic3r/GUI/Plater/2D.pm:131
+msgid "What do you want to print today? â„¢"
+msgstr "Co chcete dnes tisknout? â„¢"
 
-#~ msgid " preset\n"
-#~ msgstr " přednastavení\n"
+#: src/slic3r/GUI/Preferences.cpp:86
+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 "Pokud je zaškrtnuto, přednastavení tisku a filamentu se zobrazují v editoru přednastavení, i když jsou ozna�eny jako nekompatibilní s aktivní tiskárnou"
 
-#~ msgid " preset"
-#~ msgstr " přednastavení"
+#: src/slic3r/GUI/PresetHints.cpp:221
+msgid "when printing "
+msgstr "při tisku "
 
-#~ msgid "&Load Config Bundle"
-#~ msgstr "&Na�íst Konfigura�ní Balík"
+#: src/libslic3r/PrintConfig.cpp:216
+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 "Připnutí překrývajících se objektů jeden k druhému při Multimateriálovém tisku. (Druhá �ást se připne k první, třetí �ást k první a druhé, atd)."
 
-#~ msgid "&Load Config"
-#~ msgstr "&Na�íst Konfiguraci"
+#: src/libslic3r/PrintConfig.cpp:217
+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 "Připnutí překrývajících se objektů jeden k druhému při Multimateriálovém tisku. (Druhá �ást se připne k první, třetí �ást k první a druhé, atd)."
 
-#~ msgid "&Object"
-#~ msgstr "&Objekt"
+#: src/libslic3r/PrintConfig.cpp:269
+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."
+msgstr "Při tisku více objektů nebo kopií tiskárna kompletně dokon�í jeden objekt, předtím než za�ne tisknout druhý (za�íná od spodní vrstvy). Tato vlastnost je výhodná z důvodů snížení rizika zni�ených výtisků. Slic3r by měl varovat při možné kolizi extruderu s objektem a zabránit mu, přesto doporu�ujeme obezřetnost."
 
-#~ msgid "&Plater"
-#~ msgstr "&Podložka"
+#: src/libslic3r/PrintConfig.cpp:843
+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 "Při tisku s velmi nízkými výškami vrstev můžete stále vytisknout tlustší spodní vrstvu pro zlepšení přilnavosti a toleranci pro nedokonale zkalibrovanou tiskovou podložku. Může být vyjádřeno jako absolutní hodnota nebo jako procento (například: 150%) z výchozí výšky vrstvy."
 
-#~ msgid ""
-#~ "Disable communication with the printer over a serial / USB cable. This "
-#~ "simplifies the user interface in case the printer is never attached to "
-#~ "the computer."
-#~ msgstr ""
-#~ "Zakázat komunikaci s tiskárnou přes sériový / USB kabel. To zjednodušuje "
-#~ "uživatelské rozhraní v případě, že tiskárna není nikdy připojena k "
-#~ "po�íta�i."
+#: src/libslic3r/PrintConfig.cpp:1483
+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 "Při výměně nástroje se spustí retrakce a filament se zatáhne zpět o zadané množství (délka se měří na surovém filamentu, než vstoupí do extruderu)."
 
-#~ msgid "Disable USB/serial connection"
-#~ msgstr "Vypnout USB/sériové připojení"
+#: src/libslic3r/PrintConfig.cpp:1475
+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 "Při spuštění retrakce se filament zatáhne zpět o zadané množství (délka se měří na surovém filamentu, než vstoupí do extruderu)."
 
-#~ msgid "Drag your objects here"
-#~ msgstr "Přetáhněte své objekty sem"
+#: src/libslic3r/PrintConfig.cpp:1322
+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 "Když je hodnota nastavena na nulu, vzdálenost o kterou se filament posune během zavádění, je stejná, jako zpětný posun během vysouvání filamentu. Je-li hodnota kladná, je filament posunut více,. Je-li hodnota záporná, posun při zavádění je kratší než při vysouvání."
 
-#~ msgid "Error while uploading to the OctoPrint server"
-#~ msgstr "Chyba při nahrávání na server OctoPrint"
+#: src/libslic3r/PrintConfig.cpp:1173
+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."
+msgstr "Pokud jsou všechna ostatní nastavení rychlosti na hodnotě nula, Slic3r automaticky vypo�ítá optimální rychlost pro udržení konstantního tlaku v extruderu. Toto experimentální nastavení slouží k nastavení nejvyšší rychlosti tisku, kterou chcete povolit."
 
-#~ msgid "Export cancelled"
-#~ msgstr "Export zrušen"
+#: src/libslic3r/PrintConfig.cpp:1527
+msgid "When the retraction is compensated after changing tool, the extruder will push this additional amount of filament."
+msgstr "Když je retrakce kompenzována po změně nástroje, extruder vytla�uje toto další množství filamentu."
 
-#~ msgid "File added to print queue"
-#~ msgstr "Soubor byl přidán do tiskové fronty"
+#: src/libslic3r/PrintConfig.cpp:1519
+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 "Když je retrakce kompenzována po rychloposunu, extruder vytla�uje toto další množství filamentu. Toto nastavení je zřídkakdy potřeba."
 
-#~ msgid "G-code file exported to "
-#~ msgstr "Soubor G-code byl exportován do "
+#: src/slic3r/GUI/Tab.cpp:3108
+msgid "WHITE BULLET icon indicates a non system preset."
+msgstr "Ikona B�LÉ TEČKY indikuje nesystémové přednastavení."
 
-#~ msgid "Invalid API key"
-#~ msgstr "Neplatný API klí�"
+#: src/slic3r/GUI/Tab.cpp:3111
+msgid "WHITE BULLET icon indicates that the settings are the same as in the last saved preset for the current option group."
+msgstr "Ikona B�LÉ TEČKY indikuje, že nastavení jsou shodná s naposledy uloženým přednastavením pro danou skupinu nastavení."
 
-#~ msgid "Load shape from STL"
-#~ msgstr "Na�íst tvar ze souboru STL"
+#: src/slic3r/GUI/Tab.cpp:3126
+msgid "WHITE BULLET icon indicates that the value is the same as in the last saved preset."
+msgstr "Ikona B�LÉ TEČKY indikuje, že je hodnota shodná s naposledy uloženým přednastavením."
 
-#~ msgid "OctoPrint upload"
-#~ msgstr "OctoPrint nahrávání"
+#: src/slic3r/GUI/Tab.cpp:3073
+msgid "WHITE BULLET;for the left button: \tindicates a non-system preset,\nfor the right button: \tindicates that the settings hasn't been modified."
+msgstr "B�L� TEČKA;pro levé tla�ítko: indikuje nesystémové přednastavení,\npro pravé tla�ítko: indikuje, že nastavení nebylo změněno."
 
-#~ msgid "OctoPrint upload finished."
-#~ msgstr "Nahrávání do OctoPrintu dokon�eno."
+#: src/slic3r/GUI/GUI_Preview.cpp:214 src/libslic3r/PrintConfig.cpp:2137
+msgid "Width"
+msgstr "Šířka"
 
-#~ msgid ""
-#~ "Please install the OpenGL modules to use this feature (see build "
-#~ "instructions)."
-#~ msgstr ""
-#~ "Pro použití této funkce prosím nainstalujte OpenGL moduly (viz instrukce "
-#~ "vlastního sestavení)."
+#: src/libslic3r/GCode/PreviewData.cpp:398
+msgid "Width (mm)"
+msgstr "Šířka (mm)"
 
-#~ msgid ""
-#~ "Slic3r can upload G-code files to OctoPrint. This field should contain "
-#~ "the API Key required for authentication."
-#~ msgstr ""
-#~ "Slic3r může nahrát soubory G-code do OctoPrintu. Toto pole by mělo "
-#~ "obsahovat klí� API požadovaný pro ověření."
+#: src/libslic3r/PrintConfig.cpp:2389
+msgid "Width from the back sphere center to the front sphere center"
+msgstr "Šířka od středu zadní koule ke středu přední koule"
 
-#~ msgid ""
-#~ "Slic3r can upload G-code files to OctoPrint. This field should contain "
-#~ "the hostname, IP address or URL of the OctoPrint instance."
-#~ msgstr ""
-#~ "Slic3r může nahrát soubory G-code do OctoPrintu. Toto pole by mělo "
-#~ "obsahovat název hosta (hostname), IP adresu nebo URL instance OctoPrint."
+#: src/libslic3r/PrintConfig.cpp:2138
+msgid "Width of a wipe tower"
+msgstr "Šířka �istící věže"
 
-#~ msgid "What do you want to print today? â„¢"
-#~ msgstr "Co chcete dnes tisknout? â„¢"
+#: src/libslic3r/PrintConfig.cpp:2203
+msgid "Width of the display"
+msgstr "Šířka displeje"
+
+#: src/slic3r/GUI/PresetHints.cpp:43
+#, possible-c-format
+msgid "will always run at %d%% "
+msgstr "bude vždy běžet na %d%% "
+
+#: src/slic3r/GUI/PresetHints.cpp:52
+msgid "will be turned off."
+msgstr "bude vypnut."
+
+#: src/libslic3r/PrintConfig.cpp:2276
+msgid "Will inflate or deflate the sliced 2D polygons according to the sign of the correction."
+msgstr "Vytvoří offset každé vrstvy v rovině XY. Kladná hodnota - offset směrem ven, plocha polygonu se zvětší. Záporná hodnota - offset směrem dovnitř, plocha polygonu se zmenší."
+
+#: src/libslic3r/PrintConfig.cpp:2160
+msgid "Wipe into this object"
+msgstr "Vy�istit do tohoto objektu"
+
+#: src/libslic3r/PrintConfig.cpp:2152
+msgid "Wipe into this object's infill"
+msgstr "Vy�ištění do výplně tohoto objektu"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/Tab.cpp:1130
+#: src/libslic3r/GCode/PreviewData.cpp:174
+msgid "Wipe tower"
+msgstr "Čistící věž"
+
+#: src/slic3r/GUI/Tab.cpp:1281 src/slic3r/GUI/Tab.cpp:1298
+msgid "Wipe Tower"
+msgstr "Čistící věž"
+
+#: src/slic3r/GUI/Plater.cpp:1043 src/slic3r/GUI/Plater.cpp:1058
+msgid "wipe tower"
+msgstr "�istící věž"
+
+#: src/slic3r/GUI/WipeTowerDialog.cpp:141
+msgid "Wipe tower - Purging volume adjustment"
+msgstr "Čistící věž - Úprava objemu �ištění"
+
+#: src/libslic3r/PrintConfig.cpp:2144
+msgid "Wipe tower rotation angle"
+msgstr "Úhel nato�ení �istící věže"
+
+#: src/libslic3r/PrintConfig.cpp:2145
+msgid "Wipe tower rotation angle with respect to x-axis "
+msgstr "Úhel nato�ení �istící věže s ohledem na osu X "
+
+#: src/libslic3r/PrintConfig.cpp:2092
+msgid "Wipe while retracting"
+msgstr "O�istit při retrakci"
+
+#: xs/src/libslic3r/PrintConfig.cpp:1997
+msgid "Wiping after toolchange will be preferentially done inside infills. This lowers the amount of waste but may result in longer print time  due to additional travel moves."
+msgstr "Čištění po výměně extruderu bude přednostně prováděno do vnitřních výplní. Tím se snižuje množství odpadu, ale může to mít za následek delší dobu tisku v důsledku dodate�ných pohybů."
+
+#: src/libslic3r/PrintConfig.cpp:1460
+msgid "With bowden extruders, it may be wise to do some amount of quick retract before doing the wipe movement."
+msgstr "U bowdenových extrudérů může být vhodné provést rychlé retrakce než se spustí o�ištění."
+
+#: src/libslic3r/PrintConfig.cpp:1969
+msgid "With sheath around the support"
+msgstr "Pouzdro okolo podpěr"
+
+#: src/slic3r/GUI/UpdateDialogs.cpp:76
+msgid "Would you like to install it?\n\nNote 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\nUpdated configuration bundles:"
+msgstr "Přejete si spustit instalaci?\n\nNejprve bude provedena kompletní záloha nastavení. V případě problémů s novou verzí ji bude možné kdykoliv obnovit.\n\nAktualizované balí�ky nastavení:"
+
+#: src/libslic3r/Zipper.cpp:95
+msgid "write calledback failed"
+msgstr "zpětné volání se nezdařilo"
+
+#: src/libslic3r/PrintConfig.cpp:2993
+msgid "Write information about the model to the console."
+msgstr "Vypsat informace o modelu do konsole."
+
+#: src/slic3r/Utils/Duet.cpp:148
+msgid "Wrong password"
+msgstr "Chybné heslo"
+
+#: src/libslic3r/PrintConfig.cpp:2124
+msgid "X coordinate of the left front corner of a wipe tower"
+msgstr "X souřadnice levého předního rohu �istící věže"
+
+#: src/libslic3r/PrintConfig.cpp:1793
+msgid "XY separation between an object and its support"
+msgstr "XY vzdálenost mezi objektem a podpěrami"
+
+#: src/libslic3r/PrintConfig.cpp:1795
+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 "XY vzdálenost mezi objektem a podpěrami. Pokud je vyjádřeno procenty (například 50%), bude vypo�ítána z šířky perimetru."
+
+#: src/libslic3r/PrintConfig.cpp:2174
+msgid "XY Size Compensation"
+msgstr "Kompenzace XY rozměrů"
+
+#: src/libslic3r/PrintConfig.cpp:2131
+msgid "Y coordinate of the left front corner of a wipe tower"
+msgstr "Y souřadnice levého předního rohu �istící věže"
+
+#: src/slic3r/GUI/Plater.cpp:992
+msgid "Yes"
+msgstr "Ano"
+
+#: src/libslic3r/PrintConfig.cpp:1252
+msgid "You can put here your personal notes. This text will be added to the G-code header comments."
+msgstr "Zde můžete zadat své osobní poznámky. Tento text bude přidán do komentáře záhlaví G code."
+
+#: src/libslic3r/PrintConfig.cpp:557
+msgid "You can put your notes regarding the filament here."
+msgstr "Zde můžete vložit poznámky týkající se filamentu."
+
+#: src/libslic3r/PrintConfig.cpp:1403
+msgid "You can put your notes regarding the printer here."
+msgstr "Zde můžete uvést poznámky týkající se tiskárny."
+
+#: src/libslic3r/PrintConfig.cpp:2332
+msgid "You can put your notes regarding the SLA print material here."
+msgstr "Zde můžete vkládat své poznámky týkající se tiskového materiálu SLA."
+
+#: src/libslic3r/PrintConfig.cpp:324
+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 "Nastavením po�tu prvních vrstev s vypnutým chlazením pro nezhoršování přilnavosti."
+
+#: src/libslic3r/PrintConfig.cpp:1295
+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 "V této šabloně můžete použít všechny možnosti konfigurace jako proměnné. Můžete například použít: [layer_height], [fill_density] etc. Také můžete použít [timestamp], [year], [month], [day], [hour], [minute], [second], [version], [input_filename], [input_filename_base]."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
+msgid "You can't change a type of the last solid part of the object."
+msgstr "Nelze změnit typ poslední plné �ásti objektu."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1711
+msgid "You can't delete the last intance from object."
+msgstr "Nelze smazat poslední instanci z objektu."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1694
+msgid "You can't delete the last solid part from object."
+msgstr "Nelze smazat poslední �ást z objektu."
+
+#: src/slic3r/GUI/Plater.cpp:1746
+#, possible-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 "Nemůžete přidat objekt(y) z %s, protože jeden nebo některé z nich je(jsou) vícedílné"
+
+#: src/slic3r/GUI/GUI_App.cpp:789
+msgid "You have unsaved changes "
+msgstr "Máte neuložené změny "
+
+#: src/slic3r/GUI/Preferences.cpp:130
+#, 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/Preferences.cpp:126
+msgid "You need to restart Slic3r to make the changes effective."
+msgstr "Chcete-li provést změny, musíte restartovat aplikaci Slic3r."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2415
+#, possible-c-format
+msgid "You started your selection with %s Item."
+msgstr "Za�ali jste výběr s položkou %s."
+
+#: src/slic3r/GUI/MainFrame.cpp:772
+msgid "Your file was repaired."
+msgstr "Váš soubor byl opraven."
+
+#: src/slic3r/GUI/Plater.cpp:1874
+msgid "Your object appears to be too large, so it was automatically scaled down to fit your print bed."
+msgstr "Váš objekt se zdá být příliš velký, takže byl automaticky zmenšen, aby se vešel na tiskovou podložku."
+
+#: src/libslic3r/PrintConfig.cpp:2184
+msgid "Z offset"
+msgstr "Odsazení Z"
+
+#: src/libslic3r/PrintConfig.cpp:2416
+msgid "Zig-Zag"
+msgstr "Zig-Zag"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:152
+msgid "Zoom in"
+msgstr "Přiblížit"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:153
+msgid "Zoom out"
+msgstr "Oddálit"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:150
+msgid "Zoom to all objects in scene, if none selected"
+msgstr "Pohled na všechny objekty ve scéně, pokud žádný není vybraný"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
+msgid "Zoom to Bed"
+msgstr "Pohled na tiskovou plochu"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:151
+msgid "Zoom to selected object"
+msgstr "Pohled na vybraný objekt"
+
+#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:733
+#: src/libslic3r/PrintConfig.cpp:1570 src/libslic3r/PrintConfig.cpp:1580
+#: src/libslic3r/PrintConfig.cpp:1808 src/libslic3r/PrintConfig.cpp:1962
+#: src/libslic3r/PrintConfig.cpp:2146 src/libslic3r/PrintConfig.cpp:2463
+msgid "°"
+msgstr "°"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:613 src/slic3r/GUI/ConfigWizard.cpp:627
+msgid "°C"
+msgstr "°C"
diff --git a/resources/localization/de_DE/Slic3rPE.mo b/resources/localization/de_DE/Slic3rPE.mo
deleted file mode 100644
index 523edac01..000000000
Binary files a/resources/localization/de_DE/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/de_DE/Slic3rPE_de.po b/resources/localization/de_DE/Slic3rPE_de.po
deleted file mode 100644
index 8d4d49460..000000000
--- a/resources/localization/de_DE/Slic3rPE_de.po
+++ /dev/null
@@ -1,7082 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
-
-#: src/slic3r/GUI/AboutDialog.cpp:33
-msgid "About Slic3r"
-msgstr "Ãœber Slic3r"
-
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
-msgid "Version"
-msgstr "Version"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:43
-msgid "Shape"
-msgstr "Form"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
-msgid "Rectangular"
-msgstr "Rechteckig"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
-msgid "Size"
-msgstr "Grösse"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
-msgid "Size in X and Y of the rectangular plate."
-msgstr "Grösse der rechteckigen Platte in X und Y."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
-msgid "Origin"
-msgstr "Nullpunkt"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
-msgid ""
-"Distance of the 0,0 G-code coordinate from the front left corner of the "
-"rectangle."
-msgstr ""
-"Abstand der 0,0 G-Code-Koordinate von der linken vorderen Ecke des Rechtecks."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
-msgid "Circular"
-msgstr "Kreisförmig"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
-msgid "mm"
-msgstr "mm"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
-msgid "Diameter"
-msgstr "Durchmesser"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
-msgid ""
-"Diameter of the print bed. It is assumed that origin (0,0) is located in the "
-"center."
-msgstr ""
-"Durchmesser des Druckbettes. Es wird angenommen, dass der Ursprung (0,0) "
-"sich im Mittelpunkt befindet."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
-#: src/libslic3r/GCode/PreviewData.cpp:175
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
-msgid "Load shape from STL..."
-msgstr ""
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Wählen Sie eine Datei als Druckbettkontur aus (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
-msgid "Error! "
-msgstr "Fehler! "
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr "Die ausgewählte Datei enthält keine Geometrie."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
-msgid ""
-"The selected file contains several disjoint areas. This is not supported."
-msgstr ""
-"Die ausgewählte Datei enthält mehrere nicht zusammenhängende Bereiche. Dies "
-"wird nicht unterstützt."
-
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape"
-msgstr "Druckbrettprofil"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:54
-msgid "Network lookup"
-msgstr "Network Lookup"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:67
-msgid "Address"
-msgstr "Adresse"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:68
-msgid "Hostname"
-msgstr "Hostname"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:69
-msgid "Service name"
-msgstr "Name des Dienstes"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:70
-msgid "OctoPrint version"
-msgstr "OctoPrint Version"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:188
-msgid "Searching for devices"
-msgstr "Es wird nach Geräten gesucht"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:195
-msgid "Finished"
-msgstr "Fertig"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:15
-msgid "Buttons And Text Colors Description"
-msgstr "Schaltflächen und Textfarben Beschreibung"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:40
-msgid "Value is the same as the system value"
-msgstr "Der Wert ist gleich wie die Systemeinstellung"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:57
-msgid ""
-"Value was changed and is not equal to the system value or the last saved "
-"preset"
-msgstr ""
-"Der Wert wurde geändert und ist nicht gleich wie die Systemeinstellung oder "
-"die letzte abgespeicherte Voreinstellung"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
-msgid "Upgrade"
-msgstr "Aktualisieren"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
-msgid "Downgrade"
-msgstr "Downgrade"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
-msgid "Before roll back"
-msgstr "Vor dem Zurückwechseln"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
-msgid "User"
-msgstr "Benutzer"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
-msgid "Active: "
-msgstr "Aktiv: "
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "slic3r version"
-msgstr "Slic3r Version"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
-msgid "print"
-msgstr "Druck"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "filaments"
-msgstr "Filamente"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
-msgid "printer"
-msgstr "Drucker"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
-msgid "vendor"
-msgstr "Hersteller"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
-msgid "version"
-msgstr "Version"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
-msgid "min slic3r version"
-msgstr "Min. Slic3r Version"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
-msgid "max slic3r version"
-msgstr "Max. Slic3r Version"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "model"
-msgstr "Modell"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "variants"
-msgstr "Varianten"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
-msgid "Incompatible with this Slic3r"
-msgstr "Nicht kompatibel mit diesem Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
-msgid "Activate"
-msgstr "Aktivieren"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
-msgid "Configuration Snapshots"
-msgstr "Konfigurations-Momentaufnahmen"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:92
-msgid "nozzle"
-msgstr "Düse"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
-msgstr "Standard"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
-msgstr "Alles auswählen"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "Auswahl aufheben"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-#, c-format
-msgid "Welcome to the Slic3r %s"
-msgstr "Willkommen in Slic3r %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-msgid "Welcome"
-msgstr "Willkommen"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
-#, c-format
-msgid "Run %s"
-msgstr "%s ausführen"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:234
-#, c-format
-msgid ""
-"Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
-"configuration; just a few settings and you will be ready to print."
-msgstr ""
-"Hallo, willkommen bei Slic3r Prusa Edition! Dieses %s hilft Ihnen bei der "
-"Erstkonfiguration; nur ein paar Einstellungen und Sie sind bereit zum "
-"Drucken."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:238
-msgid ""
-"Remove user profiles - install from scratch (a snapshot will be taken "
-"beforehand)"
-msgstr ""
-"Benutzerprofile entfernen - von Grund auf neu installieren (eine "
-"Momentaufnahme wird vorab erstellt)"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr "Andere Hersteller"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr "Benutzerdefiniertes Setup"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Automatic updates"
-msgstr "Automatische Updates"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Updates"
-msgstr "Updates"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
-msgid "Check for application updates"
-msgstr "Nach Updates suchen"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
-msgid ""
-"If enabled, Slic3r checks for new versions of Slic3r PE 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 ""
-"Falls aktiviert, sucht Slic3r online nach neuen Versionen von Slic3r PE. "
-"Falls eine neue Version verfügbar ist, wird eine Mitteilung beim nächsten "
-"Programmstart angezeigt (aber nie während der Programmausführung). Dies "
-"dient nur der Mitteilung; es findet keine automatische Installation statt."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
-msgid "Update built-in Presets automatically"
-msgstr "Eingebaute Voreinstellungen automatisch aktualisieren"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
-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 ""
-"Wenn aktiviert, lädt Slic3r Updates der eingebauten Systemvoreinstellungen "
-"im Hintergrund herunter. Diese Updates werden in einen separaten temporären "
-"Speicherort heruntergeladen. Wenn eine neue Voreinstellungsversion verfügbar "
-"wird, wird sie beim Programmstart angeboten."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:308
-msgid ""
-"Updates are never applied without user's consent and never overwrite user's "
-"customized settings."
-msgstr ""
-"Updates werden niemals ohne das Einverständnis des Benutzers ausgeführt, und "
-"werden niemals die vom Benutzer geänderten Einstellungen überschreiben."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:313
-msgid ""
-"Additionally a backup snapshot of the whole configuration is created before "
-"an update is applied."
-msgstr ""
-"Zusätzlich wird ein Momentaufnahme der gesamten Konfiguration als Sicherung "
-"erstellt, bevor ein Update durchgeführt wird."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:320
-msgid "Other Vendors"
-msgstr "Andere Hersteller"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:322
-msgid "Pick another vendor supported by Slic3r PE:"
-msgstr "Wählen Sie einen anderen von Slic3r PE unterstützten Hersteller:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381
-msgid "Firmware Type"
-msgstr "Firmware Typ"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
-msgid "Firmware"
-msgstr "Firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:385
-msgid "Choose the type of firmware used by your printer."
-msgstr "Wählen Sie den Typ der von Ihrem Drucker verwendeten Firmware."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape and Size"
-msgstr "Bettform und -größe"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:422
-msgid "Set the shape of your printer's bed."
-msgstr "Stellen Sie die Konturen Ihres Druckerbettes ein."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Filament and Nozzle Diameters"
-msgstr "Filament- und Düsendurchmesser"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Print Diameters"
-msgstr "Druckdurchmesser"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:452
-msgid "Enter the diameter of your printer's hot end nozzle."
-msgstr "Geben Sie den Durchmesser der Hotenddüse ein."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:455
-msgid "Nozzle Diameter:"
-msgstr "Düsendurchmesser:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:465
-msgid "Enter the diameter of your filament."
-msgstr "Geben Sie den Durchmesser des Filaments ein."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:466
-msgid ""
-"Good precision is required, so use a caliper and do multiple measurements "
-"along the filament, then compute the average."
-msgstr ""
-"Eine hohe Genauigkeit ist erforderlich, also verwenden Sie einen "
-"Messschieber und führen Sie mehrere Messungen entlang des Filaments durch, "
-"um dann den Mittelwert zu berechnen."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:469
-msgid "Filament Diameter:"
-msgstr "Filamentdurchmesser:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Extruder and Bed Temperatures"
-msgstr "Extruder- und Druckbetttemperatur"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Temperatures"
-msgstr "Temperaturen"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:503
-msgid "Enter the temperature needed for extruding your filament."
-msgstr ""
-"Geben Sie die Temperatur ein, die für die Extrusion Ihres Filaments benötigt "
-"wird."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:504
-msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
-msgstr "Ein Daumenwert ist 160 bis 230 °C für PLA, und 215 bis 250 °C für ABS."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:507
-msgid "Extrusion Temperature:"
-msgstr "Extrusionstemperatur:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
-msgid "°C"
-msgstr "°C"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:517
-msgid ""
-"Enter the bed temperature needed for getting your filament to stick to your "
-"heated bed."
-msgstr ""
-"Geben Sie die Betttemperatur ein, die erforderlich ist, damit Ihr Filament "
-"an Ihrem beheizten Bett haftet."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:518
-msgid ""
-"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
-"no heated bed."
-msgstr ""
-"Ein Daumenwert ist 60 °C für PLA und 110 °C für ABS. Auf 0 setzen, falls "
-"kein beheiztes Bett vorhanden ist."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:521
-msgid "Bed Temperature:"
-msgstr "Betttemperatur:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:833
-msgid "< &Back"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:834
-msgid "&Next >"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:835
-msgid "&Finish"
-msgstr "&Beenden"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:906
-msgid "Configuration Wizard"
-msgstr "Konfigurations-Assistent"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:907
-msgid "Configuration &Wizard"
-msgstr "Konfigurations-&Assistent"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:909
-msgid "Configuration Assistant"
-msgstr "Konfigurations-Assistent"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:910
-msgid "Configuration &Assistant"
-msgstr "Konfigurations-&Assistent"
-
-#: src/slic3r/GUI/Field.cpp:109
-msgid "default value"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:112
-msgid "parameter name"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:140
-#, c-format
-msgid "%s doesn't support percentage"
-msgstr "%s akzeptiert keine Prozentangaben"
-
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:153
-msgid "Input value is out of range"
-msgstr "Der Eingabewert ist nicht im gültigen Bereich"
-
-#: src/slic3r/GUI/Field.cpp:176
-#, c-format
-msgid ""
-"Do you mean %d%% instead of %d %s?\n"
-"Select YES if you want to change this value to %d%%, \n"
-"or NO if you are sure that %d %s is a correct value."
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:179
-msgid "Parameter validation"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
-msgid "Flash!"
-msgstr "Flash!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
-msgid "Flashing in progress. Please do not disconnect the printer!"
-msgstr "Es wird geflashed. Bitte nicht den Drucker abklemmen!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
-msgid "Flashing succeeded!"
-msgstr "Flashen erfolgreich!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
-msgid "Flashing failed. Please see the avrdude log below."
-msgstr "Flashen misslungen. Bitte überprüfen Sie das Avrdude log unterhalb."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
-msgid "Flashing cancelled."
-msgstr "Flashen abgebrochen."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
-#, 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 ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
-msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
-#, c-format
-msgid "Error accessing port at %s: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
-msgid "Firmware flasher"
-msgstr "Firmware Flasher"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
-msgid "Firmware image:"
-msgstr "Firmware Image:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
-msgid "Serial port:"
-msgstr "Serieller Port:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
-msgid "Autodetected"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
-msgid "Rescan"
-msgstr "Rescan"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
-msgid "Progress:"
-msgstr "Fortschritt:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
-msgid "Status:"
-msgstr "Status:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
-msgid "Ready"
-msgstr "Fertig"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr "Fortgeschritten: Avrdude Output Log"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
-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:810
-msgid "Confirmation"
-msgstr "Bestätigung"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
-msgid "Cancelling..."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
-msgid "Detected object outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
-msgid "Detected toolpath outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "Drehen"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "Skalieren"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
-msgid "Rotate lower part upwards"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
-msgid "Perform cut"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2276
-msgid "Cut object:"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
-msgid "Cut"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2466
-msgid "Keep upper part"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2467
-msgid "Keep lower part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "Hinweis"
-
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr "Versuch, unreferenzierte Skalare freizugeben"
-
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
-msgid "Warning"
-msgstr "Warnung"
-
-#: src/slic3r/GUI/GUI_App.cpp:377
-msgid "Choose one file (3MF):"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:389
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Wählen Sie eine oder mehrere Dateien (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/GUI_App.cpp:451
-msgid "Array of language names and identifiers should have the same size."
-msgstr ""
-"Felder mit Sprachnamen und Bezeichnern sollten die gleiche Größe haben."
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Select the language"
-msgstr "Wählen Sie die Sprache aus"
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Language"
-msgstr "Spache"
-
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
-msgid "Default"
-msgstr "Standard"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "&Configuration Snapshots"
-msgstr "&Konfigurations-Momentaufnahmen"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "Inspect / activate configuration snapshots"
-msgstr "Inspiziere / aktiviere Konfigurations-Momentaufnahmen"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Take Configuration &Snapshot"
-msgstr "Erfassen einer Konfigurations-Momentauf&nahme"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Capture a configuration snapshot"
-msgstr "Erfassen einer Konfigurations-Momentaufnahme"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "&Preferences"
-msgstr "&Einstellungen"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "Application preferences"
-msgstr "Anwendungseinstellungen"
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
-msgid "Advanced"
-msgstr "Erweiterte Einstellungen"
-
-#: src/slic3r/GUI/GUI_App.cpp:617
-msgid "Advanced View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Slic3r View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:622
-msgid "Change Application &Language"
-msgstr "Wechsel der Anwendungs&sprache"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Flash printer &firmware"
-msgstr "Flashe Drucker &Firmware"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr "Lade ein Firmware Image zu einem Arduino basierten Drucker hoch"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Taking configuration snapshot"
-msgstr "Ich erfasse eine Momentaufnahme der Konfiguration"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Snapshot name"
-msgstr "Name der Momentaufnahme"
-
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "Anwendung wird neu gestartet"
-
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "Achtung!"
-
-#: src/slic3r/GUI/GUI_App.cpp:691
-msgid "&Configuration"
-msgstr "&Konfiguration"
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid "You have unsaved changes "
-msgstr "Sie haben nicht gespeicherte Änderungen "
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid ". Discard changes and continue anyway?"
-msgstr ". Änderungen verwerfen und fortfahren?"
-
-#: src/slic3r/GUI/GUI_App.cpp:712
-msgid "Unsaved Presets"
-msgstr "Nicht abgespeicherte Voreinstellungen"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
-msgid "Layers and Perimeters"
-msgstr "Schichten und Konturen"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
-msgid "Infill"
-msgstr "Infill"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
-msgid "Support material"
-msgstr "Stützmaterial"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "Geschwindigkeit"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
-msgid "Extruders"
-msgstr "Extruder"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
-msgid "Extrusion Width"
-msgstr "Extrusionsbreite"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
-msgid "Supports"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
-msgid "Pad"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
-msgid "Name"
-msgstr "Name"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
-msgid "Right button click the icon to change the object settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
-#, c-format
-msgid "Auto-repaired (%d errors):\n"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
-msgid "degenerate facets"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
-msgid "edges fixed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
-msgid "facets removed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
-msgid "facets added"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
-msgid "facets reversed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
-msgid "backwards edges"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
-msgid "Right button click the icon to fix STL through Netfabb"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
-msgid "Extruder"
-msgstr "Extruder"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
-msgid "Select showing settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
-msgid "Load"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
-msgid "Box"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Cylinder"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Sphere"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Slab"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
-msgid "Split to parts"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
-msgid "Add settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
-msgid "Change type"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
-msgid "You can't delete the last solid part from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
-msgid "You can't delete the last intance from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
-msgid ""
-"The selected object couldn't be split because it contains only one part."
-msgstr ""
-"Das ausgewählte Objekt konnte nicht getrennt werden, da es nur aus einem "
-"Teil besteht."
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
-msgid "Group manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
-msgid "Object manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
-msgid "Object Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
-msgid "Part Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
-msgid "Part manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
-msgid "Instance manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
-msgid "You can't change a type of the last solid part of the object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
-msgid "Select type of part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
-msgid "The supplied name is not valid;"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
-msgid "the following characters are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
-msgid "Object Manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
-msgid "Object name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
-msgid "Position"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
-msgid "Rotation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
-msgid "Scale factors"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
-msgid "Translate"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:235
-msgid "View"
-msgstr "Ansicht"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:394
-msgid "Feature type"
-msgstr "Merkmalstyp"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
-msgid "Height"
-msgstr "Höhe"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
-msgid "Width"
-msgstr "Breite"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:242
-msgid "Volumetric flow rate"
-msgstr "Volumetrische Flussrate"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
-msgid "Tool"
-msgstr "Werkzeug"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:406
-msgid "Color Print"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:247
-msgid "Show"
-msgstr "Anzeigen"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
-msgid "Feature types"
-msgstr "Merkmalstypen"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
-msgid "Perimeter"
-msgstr "Aussenschicht"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
-msgid "External perimeter"
-msgstr "Aussenschicht"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
-msgid "Overhang perimeter"
-msgstr "Überhängende Aussenschicht"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
-msgid "Internal infill"
-msgstr "Internes Infill"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
-msgid "Solid infill"
-msgstr "Stabiles Infill"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
-msgid "Top solid infill"
-msgstr "Oberes stabiles Infill"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
-msgid "Bridge infill"
-msgstr "Überbrückungs-Infill"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
-#: src/libslic3r/GCode/PreviewData.cpp:170
-msgid "Gap fill"
-msgstr "Lückenfüllung"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
-#: src/libslic3r/GCode/PreviewData.cpp:171
-msgid "Skirt"
-msgstr "Schürze"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
-#: src/libslic3r/GCode/PreviewData.cpp:173
-msgid "Support material interface"
-msgstr "Schnittstelle zum Stützmaterial"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
-#: src/libslic3r/GCode/PreviewData.cpp:174
-msgid "Wipe tower"
-msgstr "Reinigungssäule"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
-msgid "Travel"
-msgstr "Eilgang"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:270
-msgid "Retractions"
-msgstr "Einzüge"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:271
-msgid "Unretractions"
-msgstr "Wiedereinzüge"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:272
-msgid "Shells"
-msgstr "Konturhüllen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
-msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
-msgid "Export G-code"
-msgstr "Export G-Code"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
-msgid "Save project (3MF)"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "(Re)slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Quick slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat last quick slice"
-msgstr "Letzten Quick Slice wiederholen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
-msgid "Select Plater Tab"
-msgstr "Reiter \"Druckplatte\" auswählen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Quick slice and Save as"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Select Print Settings Tab"
-msgstr "Reiter \"Druckeinstellungen\" auswählen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
-msgid "Select Filament Settings Tab"
-msgstr "Reiter \"Filamenteinstellungen\" auswählen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
-msgid "Select Printer Settings Tab"
-msgstr "Reiter \"Druckereinstellungen\" auswählen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
-msgid "Switch to 3D"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
-msgid "Switch to Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
-msgid "Print host upload queue"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
-msgid "Camera view "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
-msgid "Add Instance to selected object "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
-msgid "Remove Instance from selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
-msgid "Show keyboard shortcuts list"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
-msgid "Select multiple object/Move multiple object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
-msgid "Arrange"
-msgstr "Anordnen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
-msgid "Select All objects"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
-msgid "Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
-msgid "Delete All"
-msgstr "Alle löschen"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
-msgid "Gizmo move"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
-msgid "Gizmo scale"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
-msgid "Gizmo rotate"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Gizmo cut"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Gizmo Place face on bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Gizmo SLA support points"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Zoom to Bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Zoom to all objects in scene, if none selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Zoom to selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Zoom in"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Zoom out"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Unselect gizmo, keep object selection"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
-msgid "Plater Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Arrow Up"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Upper Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Arrow Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Lower Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
-msgid "Preview Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:53
-msgid ""
-" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
-msgstr ""
-" - Denken Sie an die Überprüfung von Updates auf http://github.com/prusa3d/"
-"slic3r/releases"
-
-#: src/slic3r/GUI/MainFrame.cpp:130
-msgid "Plater"
-msgstr "Druckplatte"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "Ö&ffne"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "Open a project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "Save current project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save current project file as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Import STL/OBJ/AM&F/3MF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Load a model"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Import &Config"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Load exported configuration file"
-msgstr "Laden einer exportierten Konfigurationsdatei"
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Import Config from &project"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Load configuration from project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Import Config &Bundle"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Load presets from a bundle"
-msgstr "Lade Voreinstellungen aus einer Sammlung"
-
-#: src/slic3r/GUI/MainFrame.cpp:256
-msgid "&Import"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export &G-code"
-msgstr "Export &G-Code"
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export current plate as G-code"
-msgstr "Exportiere die aktuelle Plattenbelegung als G-Code"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export plate as &STL"
-msgstr "Exportiere die Plattenbelegung als &STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export current plate as STL"
-msgstr "Exportiere die aktuelle Plattenbelegung als STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export plate as &AMF"
-msgstr "Exportiere die Plattenbelegung als &AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export current plate as AMF"
-msgstr "Exportiere die aktuelle Plattenbelegung als AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export &Config"
-msgstr "Exportiere &Konfiguration"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export current configuration to file"
-msgstr "Exportiere die aktuelle Konfiguration in eine Datei"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export Config &Bundle"
-msgstr "Konfigurations&samlung exportieren"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export all presets to file"
-msgstr "Exportiere alle Voreinstellungen in eine Datei"
-
-#: src/slic3r/GUI/MainFrame.cpp:271
-msgid "&Export"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Slice a file into a G-code"
-msgstr "Datei zu G-Code slicen"
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Quick Slice and Save As"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Slice a file into a G-code, save as"
-msgstr "Datei zu G-Code slicen, speichern als"
-
-#: src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat Last Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "(Re)Slice &Now"
-msgstr "(Re)Slice &jetzt"
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "Start new slicing process"
-msgstr "Neuen Slicing-Prozess starten"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "&Repair STL file"
-msgstr "STL-Datei &reparieren"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "Automatically repair an STL file"
-msgstr "Repariere automatisch die STL Datei"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "&Quit"
-msgstr "&Beenden"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "Quit Slic3r"
-msgstr "Slic3r beenden"
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "&Select all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "Selects all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "&Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "Deletes the current selection"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Delete &all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Deletes all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "&Plater Tab"
-msgstr "\"Druck&platte\" auswählen"
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "Show the plater"
-msgstr "Druckplatte anzeigen"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "P&rint Settings Tab"
-msgstr "\"D&ruckeinstellungen\" auswählen"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "Show the print settings"
-msgstr "Druckeinstellungen anzeigen"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "&Filament Settings Tab"
-msgstr "\"&Filamenteinstellungen\" auswählen"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "Show the filament settings"
-msgstr "Filamenteinstellungen anzeigen"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Print&er Settings Tab"
-msgstr "\"Druck&ereinstellungen\" auswählen"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Show the printer settings"
-msgstr "Druckereinstellungen anzeigen"
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "3&D"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "Show the 3D editing view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Pre&view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Show the 3D slices preview"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Print &Host Upload Queue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Display the Print Host Upload Queue window"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr "&Iso"
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "Iso View"
-msgstr "Iso Ansicht"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr "Von &oben"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "Top View"
-msgstr "Ansicht von oben"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr "Von &Unten"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "Bottom View"
-msgstr "Ansicht von Unten"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr "&Front"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "Front View"
-msgstr "Frontalansicht"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr "&Hinten"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "Rear View"
-msgstr "Ansicht von Hinten"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr "&Links"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "Left View"
-msgstr "Anicht von Links"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr "&Rechts"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "Right View"
-msgstr "Ansicht von rechts"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Prusa 3D &Drivers"
-msgstr "Prusa 3D &Treiber"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr "Download-Seite für die Prusa3D-Treiber in Ihrem Browser öffnen"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
-msgstr "Prusa Edition &Release"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
-msgstr "Seite mit den Prusa Edition-Releases in Ihrem Browser öffnen"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
-msgstr "Slic3r &Website"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
-msgstr "Slic3r-Website in Ihrem Browser öffnen"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr "Slic3r &Handbuch"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr "Slic3r-Handbuch in Ihrem Browser öffnen"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "System &Info"
-msgstr "System&informationen"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "Show system information"
-msgstr "Systeminformationen anzeigen"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show &Configuration Folder"
-msgstr "Zeige Konfigurationsordner (&C)"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show user configuration folder (datadir)"
-msgstr "Zeige User Konfiguration Ordner (datadir)"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an I&ssue"
-msgstr "Einen F&ehler melden"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
-msgstr "Einen Fehler in der Slic3r Prusa Edition melden"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
-msgstr "&Ãœber Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "Show about dialog"
-msgstr "\"Ãœber\"-Dialog anzeigen"
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "Show the list of the keyboard shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:439
-msgid "&File"
-msgstr "&Datei"
-
-#: src/slic3r/GUI/MainFrame.cpp:440
-msgid "&Edit"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:441
-msgid "&Window"
-msgstr "&Fenster"
-
-#: src/slic3r/GUI/MainFrame.cpp:442
-msgid "&View"
-msgstr "&Anzeige"
-
-#: src/slic3r/GUI/MainFrame.cpp:445
-msgid "&Help"
-msgstr "&Hilfe"
-
-#: src/slic3r/GUI/MainFrame.cpp:472
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Wählen Sie eine Datei zum Slicen (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/MainFrame.cpp:486
-msgid "No previously sliced file."
-msgstr "Keine vorher gesclicete Datei."
-
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
-msgid "Error"
-msgstr "Fehler"
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid "Previously sliced file ("
-msgstr "Vorher geslicete Datei ("
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid ") not found."
-msgstr ") nicht gefunden."
-
-#: src/slic3r/GUI/MainFrame.cpp:493
-msgid "File Not Found"
-msgstr "Datei nicht gefunden"
-
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
-msgid "Save "
-msgstr "Speichern "
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "SVG"
-msgstr "SVG"
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "G-code"
-msgstr "G-Code"
-
-# Context: L('Save ') . ($params{export_svg} ? L('SVG') : L('G-code')) . L(' file as:'), e.g. "Save G-Code file as:"
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid " file as:"
-msgstr " Datei als:"
-
-#: src/slic3r/GUI/MainFrame.cpp:548
-msgid "Save zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Slicing"
-msgstr "Der Slice wird berechnet"
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Processing "
-msgstr "Berechnung "
-
-#: src/slic3r/GUI/MainFrame.cpp:583
-msgid " was successfully sliced."
-msgstr " wurde erfolgreich gesliced."
-
-#: src/slic3r/GUI/MainFrame.cpp:585
-msgid "Slicing Done!"
-msgstr "Der Slice ist beendet!"
-
-#: src/slic3r/GUI/MainFrame.cpp:600
-msgid "Select the STL file to repair:"
-msgstr "Geben Sie die STL-Datei an, die repariert werden soll:"
-
-#: src/slic3r/GUI/MainFrame.cpp:614
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr ""
-"Speichern als OBJ-Datei (weniger anfällig für Koordinatenfehler als STL):"
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Your file was repaired."
-msgstr "Ihre Datei wurde repariert."
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Repair"
-msgstr "Reparieren"
-
-#: src/slic3r/GUI/MainFrame.cpp:643
-msgid "Save configuration as:"
-msgstr "Konfiguration speichern unter:"
-
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
-msgid "Select configuration to load:"
-msgstr "Konfiguration zum Laden auswählen:"
-
-#: src/slic3r/GUI/MainFrame.cpp:700
-msgid "Save presets bundle as:"
-msgstr "Sichern der Voreinstellungssammlung unter:"
-
-#: src/slic3r/GUI/MainFrame.cpp:751
-#, c-format
-msgid "%d presets successfully imported."
-msgstr "%d Voreinstellungen erfolgreich importiert."
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r error"
-msgstr "Slic3r Fehler"
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r has encountered an error"
-msgstr "Slic3r ist auf einen Fehler gestoßen"
-
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "Info"
-
-#: src/slic3r/GUI/Plater.cpp:126
-msgid "Volume"
-msgstr "Volumen"
-
-#: src/slic3r/GUI/Plater.cpp:127
-msgid "Facets"
-msgstr "Flächen"
-
-#: src/slic3r/GUI/Plater.cpp:128
-msgid "Materials"
-msgstr "Material"
-
-#: src/slic3r/GUI/Plater.cpp:131
-msgid "Manifold"
-msgstr "Hülle ok"
-
-#: src/slic3r/GUI/Plater.cpp:174
-msgid "Sliced Info"
-msgstr "Slice-Info"
-
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
-msgid "Used Filament (m)"
-msgstr "Verbrauchtes Filament (m)"
-
-#: src/slic3r/GUI/Plater.cpp:194
-msgid "Used Filament (mm³)"
-msgstr "Verbrauchtes Filament (mm³)"
-
-#: src/slic3r/GUI/Plater.cpp:195
-msgid "Used Filament (g)"
-msgstr "Verbrauchtes Filament (g)"
-
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
-msgid "Cost"
-msgstr "Preis"
-
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
-msgid "Estimated printing time"
-msgstr "Erwartete Druckzeit"
-
-#: src/slic3r/GUI/Plater.cpp:198
-msgid "Number of tool changes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr "Stützen"
-
-#: src/slic3r/GUI/Plater.cpp:364
-msgid "Select what kind of support do you need"
-msgstr "Wählen Sie aus, welche Art von Unterstützung Sie benötigen"
-
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "Kein"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
-msgid "Support on build plate only"
-msgstr "Stützmaterial nur auf dem Druckbrett"
-
-#: src/slic3r/GUI/Plater.cpp:367
-msgid "Everywhere"
-msgstr "Ãœberall"
-
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
-msgid "Brim"
-msgstr "Rand"
-
-#: src/slic3r/GUI/Plater.cpp:381
-msgid ""
-"This flag enables the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Dieses Kontrollkästchen aktiviert den Rand (Brim), der um jedes Objekt auf "
-"der ersten Ebene gedruckt wird."
-
-#: src/slic3r/GUI/Plater.cpp:390
-msgid "Purging volumes"
-msgstr "Reinigungsvolumen"
-
-#: src/slic3r/GUI/Plater.cpp:556
-msgid "Print settings"
-msgstr "Druckeinstellungen"
-
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
-msgid "Filament"
-msgstr "Filament"
-
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
-msgid "SLA print"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
-msgid "SLA material"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:560
-msgid "Printer"
-msgstr "Drucker"
-
-#: src/slic3r/GUI/Plater.cpp:588
-msgid "Send to printer"
-msgstr "Zum Drucker senden"
-
-#: src/slic3r/GUI/Plater.cpp:607
-msgid "Slice now"
-msgstr "Jetzt slicen"
-
-#: src/slic3r/GUI/Plater.cpp:787
-#, c-format
-msgid "%d (%d shells)"
-msgstr "%d (%d  Konturhüllen)"
-
-#: src/slic3r/GUI/Plater.cpp:792
-#, c-format
-msgid "Auto-repaired (%d errors)"
-msgstr "Auto-Reparatur (%d Fehler)"
-
-#: src/slic3r/GUI/Plater.cpp:795
-#, c-format
-msgid ""
-"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
-"facets reversed, %d backwards edges"
-msgstr ""
-"%d degenerierte Flächen, %d Kanten korrigiert, %d Flächen entfernt, %d "
-"Flächen hinzugefügt, %d Flächen umgekehrt, %d rückwärtige Kanten"
-
-#: src/slic3r/GUI/Plater.cpp:805
-msgid "Yes"
-msgstr "Ja"
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "wipe tower"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:855
-msgid "normal mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:859
-msgid "silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1304
-msgid "Loading"
-msgstr "Laden"
-
-#: src/slic3r/GUI/Plater.cpp:1314
-#, c-format
-msgid "Processing input file %s\n"
-msgstr "Eingabe Datei wird verarbeitet %s\n"
-
-#: src/slic3r/GUI/Plater.cpp:1366
-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 ""
-"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?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
-msgid "Multi-part object detected"
-msgstr "Objekt mit mehreren Teilen erkannt"
-
-#: src/slic3r/GUI/Plater.cpp:1388
-#, 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 ""
-
-#: src/slic3r/GUI/Plater.cpp:1408
-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 ""
-"Für einen Multimaterialdrucker wurden mehrere Objekte geladen.\n"
-"Soll ich, anstatt sie als mehrere Objekte zu betrachten, \n"
-"diese Dateien als ein einzelnes Objekt mit mehreren Teilen behandeln?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1424
-msgid "Loaded"
-msgstr "Geladen"
-
-#: src/slic3r/GUI/Plater.cpp:1492
-msgid ""
-"Your object appears to be too large, so it was automatically scaled down to "
-"fit your print bed."
-msgstr ""
-"Ihr Objekt scheint zu gross zu sein. Es wurde deshalb automatisch "
-"verkleinert, um auf Ihre Druckplatte zu passen."
-
-#: src/slic3r/GUI/Plater.cpp:1493
-msgid "Object too large?"
-msgstr "Objekt zu groß?"
-
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr "Export Druckkonfiguration"
-
-#: src/slic3r/GUI/Plater.cpp:1538
-msgid "Save file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1702
-msgid "Arranging canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1705
-msgid "Arranging"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1736
-msgid "Could not arrange model objects! Some geometries may be invalid."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1740
-msgid "Arranging done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1782
-msgid "Orientation search canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1787
-msgid "Searching for optimal orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1797
-msgid "Orientation found."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1818
-msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
-msgstr ""
-"Das ausgewählte Objekt konnte nicht getrennt werden, weil es aus mehr als "
-"einem Volumen/Material besteht."
-
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
-msgid "Cancelling"
-msgstr "Abbrechen"
-
-#: src/slic3r/GUI/Plater.cpp:1962
-msgid "Another export job is currently running."
-msgstr "Ein anderer Exportjob läuft zur Zeit."
-
-#: src/slic3r/GUI/Plater.cpp:2215
-msgid "Export failed"
-msgstr "Export ist fehlgeschlagen"
-
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "Löschen"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "Ausgewähltes Objekt entfernen"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Increase copies"
-msgstr "Erhöhe  Anzahl"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Place one more copy of the selected object"
-msgstr "Eine weitere Kopie des ausgewählten Objekts positionieren"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Decrease copies"
-msgstr "Verringere Anzahl"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Remove one copy of the selected object"
-msgstr "Eine Kopie des ausgewählten Objekts entfernen"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Set number of copies"
-msgstr "Anzahl der Kopien angeben"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Change the number of copies of the selected object"
-msgstr "Ändere die Anzahl der Kopien der ausgewählten Objekte"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload from Disk"
-msgstr "Von Festplatte neu laden"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload the selected file from Disk"
-msgstr "Ausgewählte Datei von Festplatte neu laden"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
-msgstr "Exportiere das Objekt als STL"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "Exportiere dieses einzelne Objekt als STL Datei"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Along X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Mirror the selected object along the X axis"
-msgstr "Ausgewähltes Objekt entlang der X-Achse spiegeln"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Along Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Mirror the selected object along the Y axis"
-msgstr "Ausgewähltes Objekt entlang der Y-Achse spiegeln"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Along Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Mirror the selected object along the Z axis"
-msgstr "Ausgewähltes Objekt entlang der Z-Achse spiegeln"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror"
-msgstr "Spiegeln"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror the selected object"
-msgstr "Ausgewähltes Objekt spiegeln"
-
-#: src/slic3r/GUI/Plater.cpp:2400
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
-msgid "Split the selected object into individual objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
-msgid "Split the selected object into individual sub-parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
-msgid "Split"
-msgstr "Trennen"
-
-#: src/slic3r/GUI/Plater.cpp:2405
-msgid "Split the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save G-code file as:"
-msgstr "Speichere G-Code Datei als:"
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2845
-#, c-format
-msgid "STL file exported to %s"
-msgstr "Die STL-Datei wurde exportiert zu %s"
-
-#: src/slic3r/GUI/Plater.cpp:2861
-#, c-format
-msgid "AMF file exported to %s"
-msgstr "AMF Datei exportiert nach %s"
-
-#: src/slic3r/GUI/Plater.cpp:2864
-#, c-format
-msgid "Error exporting AMF file %s"
-msgstr "Fehler beim Exportieren der AMF Datei %s"
-
-#: src/slic3r/GUI/Plater.cpp:2891
-#, c-format
-msgid "3MF file exported to %s"
-msgstr "3MF Datei exportiert nach %s"
-
-#: src/slic3r/GUI/Plater.cpp:2894
-#, c-format
-msgid "Error exporting 3MF file %s"
-msgstr "Fehler beim Exportieren der 3MF Datei %s"
-
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
-msgid "General"
-msgstr "Allgemein"
-
-#: src/slic3r/GUI/Preferences.cpp:34
-msgid "Remember output directory"
-msgstr "Ausgabeverzeichnis merken"
-
-#: src/slic3r/GUI/Preferences.cpp:36
-msgid ""
-"If this is enabled, Slic3r will prompt the last output directory instead of "
-"the one containing the input files."
-msgstr ""
-"Wenn diese Option aktiviert ist, öffnet Slic3r das letzte Ausgabeverzeichnis "
-"anstelle des Verzeichnisses, in dem sich die Eingabedateien befinden."
-
-#: src/slic3r/GUI/Preferences.cpp:42
-msgid "Auto-center parts"
-msgstr "Teile automatisch zentrieren"
-
-#: src/slic3r/GUI/Preferences.cpp:44
-msgid ""
-"If this is enabled, Slic3r will auto-center objects around the print bed "
-"center."
-msgstr ""
-"Wenn diese Option aktiviert ist, zentriert Slic3r Objekte automatisch um die "
-"Mitte des Druckbettes."
-
-#: src/slic3r/GUI/Preferences.cpp:50
-msgid "Background processing"
-msgstr "Hintergrundberechnung"
-
-#: src/slic3r/GUI/Preferences.cpp:52
-msgid ""
-"If this is enabled, Slic3r will pre-process objects as soon as they're "
-"loaded in order to save time when exporting G-code."
-msgstr ""
-"Wenn diese Option aktiviert ist, wird Slic3r Objekte vorverarbeiten, sobald "
-"sie geladen werden, um Zeit beim Export von G-Code zu sparen."
-
-#: src/slic3r/GUI/Preferences.cpp:74
-msgid "Suppress \" - default - \" presets"
-msgstr "\"Standard\"-Einstellungen unterdrücken"
-
-#: src/slic3r/GUI/Preferences.cpp:76
-msgid ""
-"Suppress \" - default - \" presets in the Print / Filament / Printer "
-"selections once there are any other valid presets available."
-msgstr ""
-"\"Standard\"-Einstellungen in den Auswahlen für Druck / Filament / Drucker "
-"unterdrücken, falls andere gültige Voreinstellungen vorhanden sind."
-
-#: src/slic3r/GUI/Preferences.cpp:82
-msgid "Show incompatible print and filament presets"
-msgstr "Inkompatible Druck- und Filamenteinstellungen anzeigen"
-
-#: src/slic3r/GUI/Preferences.cpp:84
-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 ""
-"Falls angekreuzt, werden Voreinstellungen für Druck und Filament im "
-"Voreinstellungseditor auch dann angezeigt, wenn sie als inkompatibel zum "
-"aktiven Drucker gekennzeichnet wurden"
-
-#: src/slic3r/GUI/Preferences.cpp:90
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr "Älteres OpenGL 1.1-Rendering verwenden"
-
-#: src/slic3r/GUI/Preferences.cpp:92
-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 ""
-"Wenn Sie Rendering-Probleme haben, die durch einen fehlerhaften OpenGL 2.0-"
-"Treiber verursacht wurden, können Sie versuchen, dieses Kontrollkästchen zu "
-"aktivieren. Dies deaktiviert die Bearbeitung der Ebenenhöhe und das Anti-"
-"Aliasing, so dass es wahrscheinlich sinnvoller ist, den Grafiktreiber zu "
-"aktualisieren."
-
-#: src/slic3r/GUI/Preferences.cpp:115
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr "Sie müssen Slic3r neu starten, damit die Änderungen wirksam werden."
-
-#: src/slic3r/GUI/Preset.cpp:170
-msgid "modified"
-msgstr ""
-
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
-msgid "System presets"
-msgstr "Systemvoreinstellungen"
-
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
-msgid "User presets"
-msgstr "Benutzerdefinierte Voreinstellungen"
-
-#: src/slic3r/GUI/Preset.cpp:1157
-msgid "filament"
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:28
-#, c-format
-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 ""
-"Wenn die geschätzte Schichtzeit unter ~%ds liegt, läuft der Lüfter mit %d%% "
-"und die Druckgeschwindigkeit wird reduziert, so dass nicht weniger als %ds "
-"für diese Schicht verwendet werden (die Geschwindigkeit wird jedoch nie "
-"unter %dmm/s reduziert)."
-
-#: src/slic3r/GUI/PresetHints.cpp:32
-#, c-format
-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"
-"Falls die erwartete Schichtdruckzeit größer, aber noch unterhalb von ~%d "
-"Sekunden ist,  wird der Lüfter mit einer sich proportional verringernden  "
-"Geschwindigkeit zwischen %d%% und %d%% laufen."
-
-#: src/slic3r/GUI/PresetHints.cpp:36
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-"\n"
-"Während der übrigen Schichten, Ventilator "
-
-#: src/slic3r/GUI/PresetHints.cpp:38
-msgid "Fan "
-msgstr "Ventilator "
-
-#: src/slic3r/GUI/PresetHints.cpp:43
-#, c-format
-msgid "will always run at %d%% "
-msgstr "wird immer mit %d%% laufen "
-
-#: src/slic3r/GUI/PresetHints.cpp:46
-#, c-format
-msgid "except for the first %d layers"
-msgstr "außer für die ersten %d Schichten"
-
-#: src/slic3r/GUI/PresetHints.cpp:50
-msgid "except for the first layer"
-msgstr "außer für die erste Schicht"
-
-#: src/slic3r/GUI/PresetHints.cpp:52
-msgid "will be turned off."
-msgstr "wird abgeschaltet."
-
-#: src/slic3r/GUI/PresetHints.cpp:153
-msgid "external perimeters"
-msgstr "Aussenschichten"
-
-#: src/slic3r/GUI/PresetHints.cpp:162
-msgid "perimeters"
-msgstr "Aussenschichten"
-
-#: src/slic3r/GUI/PresetHints.cpp:171
-msgid "infill"
-msgstr "Infill"
-
-#: src/slic3r/GUI/PresetHints.cpp:181
-msgid "solid infill"
-msgstr "Stabiles Infill"
-
-#: src/slic3r/GUI/PresetHints.cpp:189
-msgid "top solid infill"
-msgstr "Oberes stabiles Infill"
-
-#: src/slic3r/GUI/PresetHints.cpp:200
-msgid "support"
-msgstr "Stützen"
-
-#: src/slic3r/GUI/PresetHints.cpp:210
-msgid "support interface"
-msgstr "Schnittstelle zu den Stützen"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "First layer volumetric"
-msgstr "Volumenparameter der ersten Schicht"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Bridging volumetric"
-msgstr "Überbrückungvolumen"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Volumetric"
-msgstr "Volumetrisch"
-
-#: src/slic3r/GUI/PresetHints.cpp:217
-msgid " flow rate is maximized "
-msgstr " die Durchflussmenge ist am Maximum "
-
-#: src/slic3r/GUI/PresetHints.cpp:220
-msgid "by the print profile maximum"
-msgstr "mit dem Maximum des Druckerprofils"
-
-#: src/slic3r/GUI/PresetHints.cpp:221
-msgid "when printing "
-msgstr "während dem Druck "
-
-#: src/slic3r/GUI/PresetHints.cpp:222
-msgid " with a volumetric rate "
-msgstr " mit einer Volumenrate von "
-
-#: src/slic3r/GUI/PresetHints.cpp:226
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr "%3.2f mm³/s"
-
-#: src/slic3r/GUI/PresetHints.cpp:228
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr " mit einer Filamentgeschwindigkeit von %3.2f mm³/s."
-
-#: src/slic3r/GUI/PresetHints.cpp:247
-msgid ""
-"Recommended object thin wall thickness: Not available due to invalid layer "
-"height."
-msgstr ""
-"Empfohlene Stärke der dünnen Wände des Objekts:  Nicht verfügbar wegen "
-"unzulässiger Schichthöhe."
-
-#: src/slic3r/GUI/PresetHints.cpp:264
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr ""
-"Empfohlene Stärke der dünnen Wände des Objekts für die Schichthöhe %.2f und "
-
-#: src/slic3r/GUI/PresetHints.cpp:271
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr "%d Linien: %.2lf mm"
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Send G-Code to printer host"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Upload to Printer Host with the following filename:"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
-msgid "Start printing after upload"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
-msgid "Use forward slashes ( / ) as a directory separator if needed."
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
-msgid "Cancel selected"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
-msgid "Show error message"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
-msgid "Enqueued"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
-msgid "Uploading"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
-msgid "Completed"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
-msgid "Error uploading to print host:"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:23
-msgid "NO RAMMING AT ALL"
-msgstr "ÃœBERHAUPT KEIN RAMMEN"
-
-#: src/slic3r/GUI/RammingChart.cpp:76
-msgid "Time"
-msgstr "Zeit"
-
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
-msgid "s"
-msgstr "s"
-
-#: src/slic3r/GUI/RammingChart.cpp:81
-msgid "Volumetric speed"
-msgstr "Volumengeschwindigkeit"
-
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
-msgid "Slic3r Prusa Edition - System Information"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
-msgid "Compatible printers"
-msgstr "Kompatible Drucker"
-
-#: src/slic3r/GUI/Tab.cpp:50
-msgid "Select the printers this profile is compatible with."
-msgstr "Wählen Sie die Drucker aus, die mit diesem Profil kompatibel sind."
-
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
-msgid "Compatible print profiles"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:56
-msgid "Select the print profiles this profile is compatible with."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:118
-msgid "Save current "
-msgstr "Aktuell sichern "
-
-#: src/slic3r/GUI/Tab.cpp:119
-msgid "Delete this preset"
-msgstr "Lösche diese Voreinstellung"
-
-#: src/slic3r/GUI/Tab.cpp:131
-msgid ""
-"Hover the cursor over buttons to find more information \n"
-"or click this button."
-msgstr ""
-"Bewegen Sie den Mauszeiger über die Schaltflächen, um weitere Informationen "
-"zu erhalten,\n"
-"oder klicken Sie auf diese Schaltfläche."
-
-#: src/slic3r/GUI/Tab.cpp:824
-msgid "It's a default preset."
-msgstr "Dies ist eine Standard-Voreinstellung."
-
-#: src/slic3r/GUI/Tab.cpp:825
-msgid "It's a system preset."
-msgstr "Dies ist eine Systemvoreinstellung."
-
-#: src/slic3r/GUI/Tab.cpp:826
-msgid "Current preset is inherited from "
-msgstr "Aktuelle Voreinstellung ist abgeleitet von "
-
-#: src/slic3r/GUI/Tab.cpp:831
-msgid "It can't be deleted or modified. "
-msgstr "Es ist keine Löschung oder Änderung möglich. "
-
-#: src/slic3r/GUI/Tab.cpp:832
-msgid ""
-"Any modifications should be saved as a new preset inherited from this one. "
-msgstr ""
-"Alle Änderungen sollten als neues Preset gespeichert werden, das von diesem "
-"vererbt wurde. "
-
-#: src/slic3r/GUI/Tab.cpp:833
-msgid "To do that please specify a new name for the preset."
-msgstr ""
-"Zur Ausführung geben Sie bitte einen neuen Namen für die Voreinstellung ein."
-
-#: src/slic3r/GUI/Tab.cpp:837
-msgid "Additional information:"
-msgstr "Weitere Informationen:"
-
-#: src/slic3r/GUI/Tab.cpp:843
-msgid "printer model"
-msgstr "Druckermodell"
-
-#: src/slic3r/GUI/Tab.cpp:851
-msgid "default print profile"
-msgstr "Standard-Druckprofil"
-
-#: src/slic3r/GUI/Tab.cpp:854
-msgid "default filament profile"
-msgstr "Standard-Filamentprofil"
-
-#: src/slic3r/GUI/Tab.cpp:868
-msgid "default SLA material profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:872
-msgid "default SLA print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
-msgid "Layers and perimeters"
-msgstr "Schichten und Umfänge"
-
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
-msgid "Layer height"
-msgstr "Schichthöhe"
-
-#: src/slic3r/GUI/Tab.cpp:924
-msgid "Vertical shells"
-msgstr "Vertikale Konturhüllen"
-
-#: src/slic3r/GUI/Tab.cpp:935
-msgid "Horizontal shells"
-msgstr "Horizontale Konturhüllen"
-
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
-msgid "Solid layers"
-msgstr "Kompakte Schichten"
-
-#: src/slic3r/GUI/Tab.cpp:941
-msgid "Quality (slower slicing)"
-msgstr "Qualität (langsameres Slicen)"
-
-#: src/slic3r/GUI/Tab.cpp:958
-msgid "Reducing printing time"
-msgstr "Druckzeit wird verkürzt"
-
-#: src/slic3r/GUI/Tab.cpp:970
-msgid "Skirt and brim"
-msgstr "Schürze und Rand"
-
-#: src/slic3r/GUI/Tab.cpp:987
-msgid "Raft"
-msgstr "Raft"
-
-#: src/slic3r/GUI/Tab.cpp:991
-msgid "Options for support material and raft"
-msgstr "Optionen für Stützmaterial und Raft"
-
-#: src/slic3r/GUI/Tab.cpp:1006
-msgid "Speed for print moves"
-msgstr "Geschwindigkeit für Druckbewegungen"
-
-#: src/slic3r/GUI/Tab.cpp:1018
-msgid "Speed for non-print moves"
-msgstr "Geschwindigkeit für Bewegungen zwischen den Druckvorgängen"
-
-#: src/slic3r/GUI/Tab.cpp:1021
-msgid "Modifiers"
-msgstr "Veränderer"
-
-#: src/slic3r/GUI/Tab.cpp:1024
-msgid "Acceleration control (advanced)"
-msgstr "Beschleunigungskontrolle (fortgeschritten)"
-
-#: src/slic3r/GUI/Tab.cpp:1031
-msgid "Autospeed (advanced)"
-msgstr "Automatische Geschindigkeit (fortgeschritten)"
-
-#: src/slic3r/GUI/Tab.cpp:1037
-msgid "Multiple Extruders"
-msgstr "Mehrere Extruder"
-
-#: src/slic3r/GUI/Tab.cpp:1045
-msgid "Ooze prevention"
-msgstr "Vermeidung von Nachsickern (Ooze)"
-
-#: src/slic3r/GUI/Tab.cpp:1062
-msgid "Extrusion width"
-msgstr "Extrusionbreite"
-
-#: src/slic3r/GUI/Tab.cpp:1072
-msgid "Overlap"
-msgstr "Ãœberlappung"
-
-#: src/slic3r/GUI/Tab.cpp:1075
-msgid "Flow"
-msgstr "Fluss"
-
-#: src/slic3r/GUI/Tab.cpp:1078
-msgid "Other"
-msgstr "Sonstige"
-
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
-msgid "Output options"
-msgstr "Ausgabeoptionen"
-
-#: src/slic3r/GUI/Tab.cpp:1086
-msgid "Sequential printing"
-msgstr "Sequentielles Drucken"
-
-#: src/slic3r/GUI/Tab.cpp:1088
-msgid "Extruder clearance (mm)"
-msgstr "Extruder Abstand (mm)"
-
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
-msgid "Output file"
-msgstr "Ausgabedatei"
-
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
-msgid "Post-processing scripts"
-msgstr "Nachbearbeitungs Script"
-
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
-msgid "Notes"
-msgstr "Anmerkungen"
-
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
-msgid "Dependencies"
-msgstr "Abhängigkeiten"
-
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
-msgid "Profile dependencies"
-msgstr "Profil Abhängigkeiten"
-
-#: src/slic3r/GUI/Tab.cpp:1161
-#, no-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"
-"- no ensure_vertical_shell_thickness\n"
-"\n"
-"Shall I adjust those settings in order to enable Spiral Vase?"
-msgstr ""
-"Der Spiralvasen-Modus erfordert:\n"
-"- eine Aussenschicht\n"
-"- keine stabilen Schichten oben\n"
-"- 0% Fülldichte\n"
-"- keine Stützen\n"
-"- kein ensure_vertical_shell_thickness\n"
-"\n"
-"Soll ich diese Einstellungen anpassen, um den Spiralvasen-Modus zu "
-"aktivieren?"
-
-#: src/slic3r/GUI/Tab.cpp:1168
-msgid "Spiral Vase"
-msgstr "Spiralvase"
-
-#: src/slic3r/GUI/Tab.cpp:1191
-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 ""
-"Die Reinigungssäule unterstützt zur Zeit nichtlösliche Stützen nur, falls "
-"sie mit dem aktuellen Extruder ohne einen Werkzeugwechsel gedruckt werden "
-"(sowohl support_material_extruder wie auch "
-"support_material_interface_extruder müssen auf Null gesetzt werden).\n"
-"\n"
-"Soll ich diese Einstellungen anpassen, um die Reinigungssäule zu aktivieren?"
-
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
-msgid "Wipe Tower"
-msgstr "Reinigungssäule"
-
-#: src/slic3r/GUI/Tab.cpp:1209
-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 ""
-"Damit der Reinigungsturm mit den löslichen Trägermaterialien arbeiten kann, "
-"müssen die Stützschichten mit den Objektschichten synchronisiert werden. "
-"Soll ich Unterstützungsschichten synchronisieren, um den Reinigungsturm zu "
-"aktivieren?"
-
-#: src/slic3r/GUI/Tab.cpp:1227
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters\n"
-"\n"
-"Shall I adjust those settings for supports?"
-msgstr ""
-"Stützen funktionieren besser, falls die folgende Option aktiviert ist:\n"
-"- Aussenschichten von Überbrückungen erkennen\n"
-"\n"
-"Soll ich diese Einstellung für die Stützen anpassen?"
-
-#: src/slic3r/GUI/Tab.cpp:1230
-msgid "Support Generator"
-msgstr "Generator für die Stützen"
-
-# Used in context: _("The ") + str_fill_pattern + _(" infill pattern is not supposed to work at 100% density.\n")
-#: src/slic3r/GUI/Tab.cpp:1272
-msgid "The "
-msgstr "Der/Die "
-
-#: src/slic3r/GUI/Tab.cpp:1272
-#, no-c-format
-msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
-"\n"
-"Shall I switch to rectilinear fill pattern?"
-msgstr ""
-" Infillmuster ist nicht empfohlen für 100% Füllvolumen.\n"
-"\n"
-"Soll auf das rechtlineare Füllmuster umgestellt werden?"
-
-#: src/slic3r/GUI/Tab.cpp:1388
-msgid "Temperature "
-msgstr "Temperatur "
-
-#: src/slic3r/GUI/Tab.cpp:1394
-msgid "Bed"
-msgstr "Druckbett"
-
-#: src/slic3r/GUI/Tab.cpp:1399
-msgid "Cooling"
-msgstr "Kühlung"
-
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
-msgid "Enable"
-msgstr "Aktivieren"
-
-#: src/slic3r/GUI/Tab.cpp:1411
-msgid "Fan settings"
-msgstr "Ventilator Einstellungen"
-
-#: src/slic3r/GUI/Tab.cpp:1412
-msgid "Fan speed"
-msgstr "Ventilatorgeschwindigkeit"
-
-#: src/slic3r/GUI/Tab.cpp:1420
-msgid "Cooling thresholds"
-msgstr "Kühlungsschwellwerte"
-
-#: src/slic3r/GUI/Tab.cpp:1426
-msgid "Filament properties"
-msgstr "Filament Eigenschaften"
-
-#: src/slic3r/GUI/Tab.cpp:1430
-msgid "Print speed override"
-msgstr "Korrektur der Druckgeschwindigkeit"
-
-#: src/slic3r/GUI/Tab.cpp:1440
-msgid "Toolchange parameters with single extruder MM printers"
-msgstr "Werkzeugwechsel-Parameter für MM-Drucker mit einem Extruder"
-
-#: src/slic3r/GUI/Tab.cpp:1455
-msgid "Ramming settings"
-msgstr "Einstellungen für das Rammen"
-
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
-msgid "Custom G-code"
-msgstr "Benutzerdefinierter G-Code"
-
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
-msgid "Start G-code"
-msgstr "Start G-Code"
-
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
-msgid "End G-code"
-msgstr "G-Code am Ende"
-
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
-msgid " Browse "
-msgstr " Suchen "
-
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
-msgid "Test"
-msgstr "Test"
-
-#: src/slic3r/GUI/Tab.cpp:1615
-msgid "Could not get a valid Printer Host reference"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
-msgid "Success!"
-msgstr "Erfolg!"
-
-#: src/slic3r/GUI/Tab.cpp:1636
-msgid ""
-"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
-"signed certificate."
-msgstr ""
-"HTTPS-CA-Datei ist optional. Sie wird nur benötigt, wenn Sie HTTPS mit einem "
-"selbstsignierten Zertifikat verwenden."
-
-#: src/slic3r/GUI/Tab.cpp:1648
-msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-msgstr "Zertifikatsdatei (*.crt, *.pem)|*.crt;*.pem|alle Dateien|*.*"
-
-#: src/slic3r/GUI/Tab.cpp:1649
-msgid "Open CA certificate file"
-msgstr "Open CA Zertifikat Datei"
-
-#: src/slic3r/GUI/Tab.cpp:1676
-msgid ""
-"HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
-msgid "Size and coordinates"
-msgstr "Grösse und Koordinaten"
-
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
-msgid " Set "
-msgstr " Setzen "
-
-#: src/slic3r/GUI/Tab.cpp:1740
-msgid "Capabilities"
-msgstr "Fähigkeiten"
-
-#: src/slic3r/GUI/Tab.cpp:1745
-msgid "Number of extruders of the printer."
-msgstr "Anzahl der Extruder des Druckers."
-
-#: src/slic3r/GUI/Tab.cpp:1773
-msgid "USB/Serial connection"
-msgstr "USB/Serielle Verbindung"
-
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
-msgid "Serial port"
-msgstr "Serieller Port"
-
-#: src/slic3r/GUI/Tab.cpp:1779
-msgid "Rescan serial ports"
-msgstr "Serielle Schnittstellen nochmals abfragen"
-
-#: src/slic3r/GUI/Tab.cpp:1801
-msgid "Connection to printer works correctly."
-msgstr "Verbindung zum Drucker funktioniert einwandfrei."
-
-#: src/slic3r/GUI/Tab.cpp:1804
-msgid "Connection failed."
-msgstr "Verbindung ist fehlgeschlagen."
-
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
-msgid "Print Host upload"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
-msgid "Before layer change G-code"
-msgstr "G-Code vor dem Schichtwechsel"
-
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
-msgid "After layer change G-code"
-msgstr "G-Code am Schichtende"
-
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
-msgid "Tool change G-code"
-msgstr "G-Code für Werkzeugwechsel"
-
-#: src/slic3r/GUI/Tab.cpp:1877
-msgid "Between objects G-code (for sequential printing)"
-msgstr "G-Code zwischen Objekten (Sequentielles Drucken)"
-
-#: src/slic3r/GUI/Tab.cpp:1938
-msgid "Display"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
-msgid "Corrections"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
-msgid "Machine limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2025
-msgid "Values in this column are for Full Power mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2026
-msgid "Full Power"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2031
-msgid "Values in this column are for Silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2032
-msgid "Silent"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2040
-msgid "Maximum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2045
-msgid "Maximum accelerations"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2052
-msgid "Jerk limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2057
-msgid "Minimum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
-msgid "Single extruder MM setup"
-msgstr "Einzelner Extruder MM Setup"
-
-#: src/slic3r/GUI/Tab.cpp:2104
-msgid "Single extruder multimaterial parameters"
-msgstr "Einzelner Extruder Multimaterial Parameter"
-
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
-#, c-format
-msgid "Extruder %d"
-msgstr "Extruder %d"
-
-#: src/slic3r/GUI/Tab.cpp:2125
-msgid "Layer height limits"
-msgstr "Schichthöhen Grenzen"
-
-#: src/slic3r/GUI/Tab.cpp:2130
-msgid "Position (for multi-extruder printers)"
-msgstr "Position (für Multi-Extruder-Drucker)"
-
-#: src/slic3r/GUI/Tab.cpp:2133
-msgid "Retraction"
-msgstr "Einzug"
-
-#: src/slic3r/GUI/Tab.cpp:2136
-msgid "Only lift Z"
-msgstr "Nur Z anheben"
-
-#: src/slic3r/GUI/Tab.cpp:2149
-msgid ""
-"Retraction when tool is disabled (advanced settings for multi-extruder "
-"setups)"
-msgstr ""
-"Einzug, wenn das Werkzeug deaktiviert ist (weiterführende Einstellungen für "
-"Multi-Extruder-Einrichtungen)"
-
-#: src/slic3r/GUI/Tab.cpp:2153
-msgid "Preview"
-msgstr "Vorschau"
-
-#: src/slic3r/GUI/Tab.cpp:2284
-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 ""
-"Die Reinigungsoption ist nicht verfügbar, wenn der Firmware-Einzug verwendet "
-"wird.\n"
-"\n"
-"Soll ich sie ausschalten, um den Firmware-Einzug zu aktivieren?"
-
-#: src/slic3r/GUI/Tab.cpp:2286
-msgid "Firmware Retraction"
-msgstr "Firmware Einzug"
-
-#: src/slic3r/GUI/Tab.cpp:2565
-#, c-format
-msgid "Default preset (%s)"
-msgstr "Standard Voreinstellung (%s)"
-
-#: src/slic3r/GUI/Tab.cpp:2566
-#, c-format
-msgid "Preset (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2583
-msgid "has the following unsaved changes:"
-msgstr "hat die folgenden ungesicherten Änderungen:"
-
-#: src/slic3r/GUI/Tab.cpp:2586
-msgid "is not compatible with printer"
-msgstr "ist mit dem Drucker nicht kompatibel"
-
-#: src/slic3r/GUI/Tab.cpp:2587
-msgid "is not compatible with print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2589
-msgid "and it has the following unsaved changes:"
-msgstr "und hat die folgenden ungesicherten Änderungen:"
-
-#: src/slic3r/GUI/Tab.cpp:2592
-msgid "Discard changes and continue anyway?"
-msgstr "Änderungen verwerfen und fortfahren?"
-
-#: src/slic3r/GUI/Tab.cpp:2593
-msgid "Unsaved Changes"
-msgstr "Nicht abgespeicherte Änderungen"
-
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
-msgid "Please check your object list before preset changing."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2699
-msgid "The supplied name is empty. It can't be saved."
-msgstr "Der angegebene Name ist leer. Die Speicherung kann nicht erfolgen."
-
-#: src/slic3r/GUI/Tab.cpp:2704
-msgid "Cannot overwrite a system profile."
-msgstr "Systemprofil kann nicht überschrieben werden."
-
-#: src/slic3r/GUI/Tab.cpp:2708
-msgid "Cannot overwrite an external profile."
-msgstr "Ein externes Profil kann nicht überschrieben werden."
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "remove"
-msgstr "Entfernen"
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "delete"
-msgstr "löschen"
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid "Are you sure you want to "
-msgstr "Wollen Sie wirklich "
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid " the selected preset?"
-msgstr " die ausgewählte Voreinstellung?"
-
-#: src/slic3r/GUI/Tab.cpp:2736
-msgid "Remove"
-msgstr "Entfernen"
-
-#: src/slic3r/GUI/Tab.cpp:2737
-msgid " Preset"
-msgstr " Voreinstellung"
-
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "Alle"
-
-#: src/slic3r/GUI/Tab.cpp:2869
-msgid ""
-"LOCKED LOCK;indicates that the settings are the same as the system values "
-"for the current option group"
-msgstr ""
-"GESCHLOSSENES SCHLOSS;zeigt an, dass die Einstellungen mit den Systemwerten "
-"der aktuellen Optionsgruppe übereinstimmen"
-
-#: src/slic3r/GUI/Tab.cpp:2872
-msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
-"the system values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group "
-"to the system values."
-msgstr ""
-"GEÖFFNETES SCHLOSS;Zeigt an, dass einige Einstellungen geändert wurden und "
-"nicht mehr mit den Systemeinstellungen für die aktuelle Gruppe von Optionen "
-"identisch sind.\n"
-"Klicken Sie auf das Symbol mit dem GEÖFFNETEN SCHLOSS, um alle Einstellungen "
-"für die aktuelle Optionsgruppe auf die Systemeinstellungen zurückzusetzen."
-
-#: src/slic3r/GUI/Tab.cpp:2878
-msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr ""
-"WEISSER PUNKT;Beim linken Knopf: zeigt eine Nicht-Systemeinstellung an. Beim "
-"rechten Knopf: zeigt an, dass die Einstellung nicht geändert wurde."
-
-#: src/slic3r/GUI/Tab.cpp:2882
-msgid ""
-"BACK ARROW;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 ""
-"BACK ARROW; 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/Tab.cpp:2908
-msgid ""
-"LOCKED LOCK icon indicates that the settings are the same as the system "
-"values for the current option group"
-msgstr ""
-"GESCHLOSSENES SCHLOSS-Symbol zeigt an, dass die Einstellungen mit den "
-"Systemwerten der aktuellen Optionsgruppe übereinstimmen"
-
-#: src/slic3r/GUI/Tab.cpp:2910
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not "
-"equal to the system values for the current option group.\n"
-"Click to reset all settings for current option group to the system values."
-msgstr ""
-"Das Symbol GEÖFFNETES SCHLOSS zeigt an, dass einige Einstellungen geändert "
-"wurden und nicht mehr mit den Systemeinstellungen für die aktuelle "
-"Optionsgruppe identisch sind.\n"
-"Klicken Sie, um alle Einstellungen für die aktuelle Optionsgruppe auf die "
-"Systemeinstellungen zurückzusetzen."
-
-#: src/slic3r/GUI/Tab.cpp:2913
-msgid "WHITE BULLET icon indicates a non system preset."
-msgstr ""
-"Das Symbol mit dem WEISSEN PUNKT zeigt eine Nicht-Systemeinstellung an."
-
-#: src/slic3r/GUI/Tab.cpp:2916
-msgid ""
-"WHITE BULLET icon indicates that the settings are the same as in the last "
-"saved preset for the current option group."
-msgstr ""
-"Das Symbol WEISSER PUNKT zeigt an, dass die Einstellungen dieselben sind wie "
-"in der zuletzt gespeicherten Voreinstellung für die aktuelle Optionsgruppe."
-
-#: src/slic3r/GUI/Tab.cpp:2918
-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:2924
-msgid ""
-"LOCKED LOCK icon indicates that the value is the same as the system value."
-msgstr ""
-"GESCHLOSSENES SCHLOSS-Symbol zeigt an, dass der Wert mit dem Systemwert "
-"übereinstimmt."
-
-#: src/slic3r/GUI/Tab.cpp:2925
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
-"the system value.\n"
-"Click to reset current value to the system value."
-msgstr ""
-"Das Symbol GEÖFFNETES SCHLOSS zeigt an, dass der Wert geändert wurde und "
-"nicht  mit der Systemeinstellung identisch ist.\n"
-"Klicken Sie, um den aktuellen Wert auf die Systemeinstellung zurückzusetzen."
-
-#: src/slic3r/GUI/Tab.cpp:2931
-msgid ""
-"WHITE BULLET icon indicates that the value is the same as in the last saved "
-"preset."
-msgstr ""
-"Das Symbol WEISSER PUNKT zeigt an, dass der Wert identisch ist mit "
-"demjenigen in der zuletzt gespeicherten Voreinstellung."
-
-#: src/slic3r/GUI/Tab.cpp:2932
-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."
-
-# Used in this context: _("Save ") + title + _(" as:")
-#: src/slic3r/GUI/Tab.cpp:3031
-msgid " as:"
-msgstr " als:"
-
-#: src/slic3r/GUI/Tab.cpp:3075
-msgid "the following postfix are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3079
-msgid "The supplied name is not available."
-msgstr "Der angegebene Name ist nicht verfügbar."
-
-#: src/slic3r/GUI/Tab.cpp:3092
-msgid "Material"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
-msgid "Layers"
-msgstr "Schichten"
-
-#: src/slic3r/GUI/Tab.cpp:3098
-msgid "Exposure"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3183
-msgid "Support head"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3188
-msgid "Support pillar"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3196
-msgid "Connection of the support sticks and junctions"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3200
-msgid "Automatic generation"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
-msgid "Print Settings"
-msgstr "Druckeinstellungen"
-
-#: src/slic3r/GUI/Tab.hpp:311
-msgid "Filament Settings"
-msgstr "Filamenteinstellungen"
-
-#: src/slic3r/GUI/Tab.hpp:344
-msgid "Printer Settings"
-msgstr "Druckereinstellungen"
-
-#: src/slic3r/GUI/Tab.hpp:367
-msgid "Material Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:393
-msgid "Save preset"
-msgstr "Sichern der Voreinstellung"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "Update available"
-msgstr "Ein Update ist verfügbar"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "New version of Slic3r PE is available"
-msgstr "Eine neue Version von Slic3r PE ist verfügbar"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
-msgid "To download, follow the link below."
-msgstr "Zum Herunterladen folgen Sie dem untenstehenden Link."
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
-msgid "Current version:"
-msgstr "Aktuelle Version:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
-msgid "New version:"
-msgstr "Neue Version:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
-msgid "Don't notify about new releases any more"
-msgstr "Keine Benachrichtigung mehr über neue Releases"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
-msgid "Configuration update"
-msgstr "Konfigurationsupdate"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
-msgid "Configuration update is available"
-msgstr "Konfigurationsupdate ist verfügbar"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
-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"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"Möchten Sie dies installieren?\n"
-"\n"
-"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/UpdateDialogs.cpp:109
-msgid "Slic3r incompatibility"
-msgstr "Slic3r-Inkompatibilität"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r configuration is incompatible"
-msgstr "Slic3r Konfiguration ist nicht kompatibel"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed "
-"configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using "
-"a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-"Diese Version von Slic3r PE ist nicht kompatibel zu den aktuell "
-"installierten Konfigurationssammlungen.\n"
-"Dies wurde wahrscheinlich dadurch verursacht, dass Sie eine ältere Slic3r PE "
-"Version benutzt haben, nachdem Sie eine neuere ausgeführt hatten.\n"
-"\n"
-"Sie können Slic3r 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 Slic3r-Version kompatiblen "
-"Dateien installiert werden.\n"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
-#, c-format
-msgid "This Slic3r PE version: %s"
-msgstr "Diese Slic3r PE Version: %s"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
-msgid "Incompatible bundles:"
-msgstr "Inkompatible Konfigurationssammlungen:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
-msgid "Exit Slic3r"
-msgstr "Slic3r beenden"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
-msgid "Re-configure"
-msgstr "Neu konfigurieren"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
-#, c-format
-msgid ""
-"Slic3r PE 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 ""
-"Slic3r PE 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/UpdateDialogs.cpp:182
-msgid "For more information please visit our wiki page:"
-msgstr "Für weitere Informationen besuchen Sie bitte unsere Wiki-Seite:"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
-msgid "Ramming customization"
-msgstr "Einstellungen für das Rammen"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
-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:78
-msgid "Total ramming time"
-msgstr "Gesamte Rammdauer"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
-msgid "Total rammed volume"
-msgstr "Gesamtes Rammvolumen"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
-msgid "Ramming line width"
-msgstr "Breite der Rammlinie"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
-msgid "Ramming line spacing"
-msgstr "Abstand der Rammlinien"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
-msgid "Wipe tower - Purging volume adjustment"
-msgstr "Reinigungsturm - Anpassung des Reinigungsvolumens"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
-msgid ""
-"Here you can adjust required purging volume (mm³) for any given pair of "
-"tools."
-msgstr ""
-"Hier können Sie das erforderliche Reinigungsvolumen (mm³) für ein beliebiges "
-"Werkzeugpaar einstellen."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
-msgid "Extruder changed to"
-msgstr "Extruder geändert auf"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
-msgid "unloaded"
-msgstr "entladen wird"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
-msgid "loaded"
-msgstr "geladen wird"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
-msgid "Tool #"
-msgstr "Werkzeug #"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
-msgid ""
-"Total purging volume is calculated by summing two values below, depending on "
-"which tools are loaded/unloaded."
-msgstr ""
-"Das gesamte Reinigungsvolumen wird durch die Addition folgender zwei Werte "
-"berechnet, je nachdem welche Werkzeuge geladen/entladen sind."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
-msgid "Volume to purge (mm³) when the filament is being"
-msgstr "Volumen zum Reinigen (mm³) wenn das Filament ist"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
-msgid "From"
-msgstr "Von"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
-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"
-"\n"
-"Wollen Sie fortfahren?"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show simplified settings"
-msgstr "Vereinfachte Einstellungen anzeigen"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show advanced settings"
-msgstr "Ausführliche Einstellungen anzeigen"
-
-#: src/slic3r/Utils/OctoPrint.cpp:65
-#, c-format
-msgid "Mismatched type of print host: %s"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:80
-msgid "Connection to OctoPrint works correctly."
-msgstr "Verbindung zu Octoprint funktioniert einwandfrei."
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Could not connect to OctoPrint"
-msgstr "Ich konnte keine Verbindung zu OctoPrint herstellen"
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr "Hinweis: Es ist mindestens die OctoPrint-Version 1.1.0 erforderlich."
-
-#: src/slic3r/Utils/OctoPrint.cpp:181
-msgid "Connection to Prusa SLA works correctly."
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:186
-msgid "Could not connect to Prusa SLA"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:571
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr "benötigt min. %s und max. %s"
-
-#: src/slic3r/Utils/PresetUpdater.cpp:576
-#, c-format
-msgid "requires min. %s"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:578
-#, c-format
-msgid "requires max. %s"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:235
-msgid "Failed loading the input model."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:248
-msgid "Mesh repair failed."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the 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 ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
-msgid "Model fixing"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
-msgid "Exporting model..."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
-msgid "Export of a temporary 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
-msgid "Import of the repaired 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
-msgid "Model repair finished"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
-msgid "Model repair canceled"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-msgid "Model repaired successfully"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model Repair by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model repair failed: \n"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1175
-msgid "All objects are outside of the print volume."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1201
-msgid "Some objects are too close; your extruder will collide with them."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1216
-msgid ""
-"Some objects are too tall and cannot be printed without extruder collisions."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1226
-msgid "The Spiral Vase option can only be used when printing a single object."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1228
-msgid ""
-"The Spiral Vase option can only be used when printing single material "
-"objects."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1234
-msgid ""
-"All extruders must have the same diameter for single extruder multimaterial "
-"printer."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1239
-msgid ""
-"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
-"and Repetier G-code flavors."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1241
-msgid ""
-"The Wipe Tower is currently only supported with the relative extruder "
-"addressing (use_relative_e_distances=1)."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1253
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1255
-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:1257
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are printed "
-"with the same support_material_contact_distance"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1259
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are sliced "
-"equally."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1281
-msgid ""
-"The Wipe tower is only supported if all objects have the same layer height "
-"profile"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1290
-msgid "The supplied settings will cause an empty print."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1307
-msgid ""
-"One or more object were assigned an extruder that the printer does not have."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1316
-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 ""
-
-#: src/libslic3r/Print.cpp:1324
-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:1328
-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 ""
-
-#: src/libslic3r/Print.cpp:1335
-msgid "first_layer_height"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1350
-msgid "First layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1354
-msgid "Layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
-msgid "Printer technology"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:41
-msgid "Bed shape"
-msgstr "Druckbettkontur"
-
-#: src/libslic3r/PrintConfig.cpp:48
-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 ""
-"Diese Einstellung bestimmt die Höhe (und damit die Gesamtanzahl) der "
-"Scheiben/Schichten.  Dünnere Schichten ergeben eine bessere Genauigkeit, "
-"benötigen aber mehr Zeit zum drucken."
-
-#: src/libslic3r/PrintConfig.cpp:56
-msgid "Max print height"
-msgstr "Max. Druckhöhe"
-
-#: src/libslic3r/PrintConfig.cpp:57
-msgid ""
-"Set this to the maximum height that can be reached by your extruder while "
-"printing."
-msgstr ""
-"Stellen Sie hier die maximale Höhe ein, die Ihr Extruder beim Drucken "
-"erreichen kann."
-
-#: src/libslic3r/PrintConfig.cpp:73
-msgid "Avoid crossing perimeters"
-msgstr "Kreuzen der Kontur vermeiden"
-
-#: src/libslic3r/PrintConfig.cpp:74
-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 ""
-"Optimieren Sie die Verfahrbewegungen, um das Ãœberschreiten von Konturen zu "
-"minimieren. Dies ist vor allem bei Bowdenextrudern nützlich, die unter "
-"sickerndem Material leiden. Diese Funktion verlangsamt sowohl den Druck als "
-"auch die Generierung des G-Codes."
-
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
-msgid "Other layers"
-msgstr "Andere Schichten"
-
-#: src/libslic3r/PrintConfig.cpp:83
-msgid ""
-"Bed temperature for layers after the first one. Set this to zero to disable "
-"bed temperature control commands in the output."
-msgstr ""
-"Druckbett-Temperatur für Schichten nach der ersten Schicht. Setzen Sie "
-"diesen Wert auf Null, um die Befehle zur Steuerung der Betttemperatur im "
-"Output zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:86
-msgid "Bed temperature"
-msgstr "Druckbetttemperatur"
-
-#: src/libslic3r/PrintConfig.cpp:93
-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 Slic3r-Einstellungen sowie [layer_num] und [layer_z] verwenden können."
-
-#: src/libslic3r/PrintConfig.cpp:104
-msgid "Between objects G-code"
-msgstr "G-Code zwischen Objekten"
-
-#: src/libslic3r/PrintConfig.cpp:105
-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 Slic3r-Einstellungen verwenden können, so dass Sie einen \"M109 "
-"S[first_layer_temperature]\"-Befehl an beliebiger Stelle platzieren können."
-
-#: src/libslic3r/PrintConfig.cpp:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "Unten"
-
-#: src/libslic3r/PrintConfig.cpp:116
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "Anzahl der zu erzeugenden festen Schichten auf der Bodenfläche."
-
-#: src/libslic3r/PrintConfig.cpp:118
-msgid "Bottom solid layers"
-msgstr "Kompakte Basisschichten"
-
-#: src/libslic3r/PrintConfig.cpp:123
-msgid "Bridge"
-msgstr "Überbrückung"
-
-#: src/libslic3r/PrintConfig.cpp:124
-msgid ""
-"This is the acceleration your printer will use for bridges. Set zero to "
-"disable acceleration control for bridges."
-msgstr ""
-"Die Beschleunigung, die Ihr Drucker für Brücken verwendet.  Setzen Sie dies "
-"auf Null, um die Beschleunigungskontrolle bei Brücken zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
-msgid "mm/s²"
-msgstr "mm/s²"
-
-#: src/libslic3r/PrintConfig.cpp:133
-msgid "Bridging angle"
-msgstr "Überbrückungswinkel"
-
-#: src/libslic3r/PrintConfig.cpp:135
-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 ""
-"Überbrückungswinkel Übersteuerung. Wird der Wert auf Null gesetzt, wird der "
-"Überbrückungswinkel automatisch berechnet. Andernfalls wird der angegebene "
-"Winkel für alle Brücken verwendet. Verwenden Sie 180° für den Nullwinkel."
-
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
-msgid "°"
-msgstr "°"
-
-#: src/libslic3r/PrintConfig.cpp:145
-msgid "Bridges fan speed"
-msgstr "Brückenventilatorgeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:146
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr ""
-"Die Lüftergeschwindigkeit, die für Überbrückungen und Überhänge benutzt wird."
-
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
-msgid "%"
-msgstr "%"
-
-#: src/libslic3r/PrintConfig.cpp:155
-msgid "Bridge flow ratio"
-msgstr "Brückenflussverhältnis"
-
-#: src/libslic3r/PrintConfig.cpp:157
-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 ""
-"Diese Einstellung beeinflusst den Materialausstoss bei Brücken. Sie können "
-"den Wert leicht verringern, um die Extrusionsfäden zu strecken und ein "
-"Durchhängen zu vermeiden. Die Standardwerte sind aber normalerweise "
-"ausreichend und Sie sollten zuerst mit der Lüftergeschwindigkeit "
-"experimentieren, bevor Sie diesen Wert verändern."
-
-#: src/libslic3r/PrintConfig.cpp:168
-msgid "Bridges"
-msgstr "Überbrückungen"
-
-#: src/libslic3r/PrintConfig.cpp:170
-msgid "Speed for printing bridges."
-msgstr "Brückendruckgeschwindigkeit."
-
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
-msgid "mm/s"
-msgstr "mm/s"
-
-#: src/libslic3r/PrintConfig.cpp:178
-msgid "Brim width"
-msgstr "Randbreite"
-
-#: src/libslic3r/PrintConfig.cpp:179
-msgid ""
-"Horizontal width of the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Horizontalbreite des Randes, der um jedes Objekt auf der Bodenschicht "
-"gedruckt wird."
-
-#: src/libslic3r/PrintConfig.cpp:187
-msgid "Clip multi-part objects"
-msgstr "Beschneiden von Objekten aus mehreren Teilen"
-
-#: src/libslic3r/PrintConfig.cpp:188
-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 ""
-"Wenn Multi-Material-Objekte gedruckt werden, wird Slic3r mit diesen "
-"Einstellungen einen überlappenden Teil des Objekts durch den anderen "
-"einschränken (zweiter Teil wird durch den ersten Teil eingeschränkt, dritter "
-"Teil wird durch den ersten und zweiten eingeschränkt usw.)."
-
-#: src/libslic3r/PrintConfig.cpp:196
-msgid "Colorprint height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:197
-msgid "Heights at which a filament change is to occur. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:207
-msgid "Compatible printers condition"
-msgstr "Kompatible Druckerbedingung"
-
-#: src/libslic3r/PrintConfig.cpp:208
-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."
-msgstr ""
-"Ein boolescher Ausdruck, der die Konfigurationswerte eines aktiven "
-"Druckerprofils verwendet. Wenn dieser Ausdruck als wahr bewertet wird, wird "
-"dieses Profil als kompatibel mit dem aktiven Druckerprofil angesehen."
-
-#: src/libslic3r/PrintConfig.cpp:220
-msgid "Compatible print profiles condition"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:221
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:235
-msgid "Complete individual objects"
-msgstr "Kompatible Einzelobjekte"
-
-#: src/libslic3r/PrintConfig.cpp:236
-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."
-msgstr ""
-"Wenn mehrere Objekte oder Kopien gedruckt werden, wird bei dieser "
-"Einstellung jedes Objekt vollständig gedruckt, bevor das nächste (angefangen "
-"mit der Bodenschicht) begonnen wird. Diese Einstellung ist nützlich, um "
-"Fehldrucke zu vermeiden. Slic3r sollte vor Extruderkollisionen warnen und "
-"diese verhindern, aber seien Sie trotzdem aufmerksam."
-
-#: src/libslic3r/PrintConfig.cpp:245
-msgid "Enable auto cooling"
-msgstr "Automatische Kühlung aktivieren"
-
-#: src/libslic3r/PrintConfig.cpp:246
-msgid ""
-"This flag enables the automatic cooling logic that adjusts print speed and "
-"fan speed according to layer printing time."
-msgstr ""
-"Diese Einstellung aktiviert the Logik, die die Druckgeschwindigkeit und "
-"Lüftergeschwindigkeit automatisch gemäß der Schichtdruckdauer regelt."
-
-#: src/libslic3r/PrintConfig.cpp:252
-msgid "Cooling tube position"
-msgstr "Position des Kühlschlauchs"
-
-#: src/libslic3r/PrintConfig.cpp:253
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
-msgstr "Abstand des Mittelpunktes des Kühlrohres von der Extruderspitze "
-
-#: src/libslic3r/PrintConfig.cpp:261
-msgid "Cooling tube length"
-msgstr "Länge des Kühlschlauchs"
-
-#: src/libslic3r/PrintConfig.cpp:262
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
-msgstr ""
-"Länge des Kühlschlauchs, um den Raum für Kühlbewegungen im Inneren zu "
-"begrenzen "
-
-#: src/libslic3r/PrintConfig.cpp:271
-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."
-msgstr ""
-"Dies ist der Beschleunigungswert, auf den Ihr Drucker zurückgesetzt wird, "
-"nachdem aufgabenspezifische Beschleunigungswerte (Aussenschichten/Infill) "
-"verwendet wurden. Setzen Sie dies auf Null, um ein Zurückstellen der "
-"Beschleunigungswerte zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:281
-msgid "Default filament profile"
-msgstr "Standard-Filamentprofil"
-
-#: src/libslic3r/PrintConfig.cpp:282
-msgid ""
-"Default filament profile associated with the current printer profile. On "
-"selection of the current printer profile, this filament profile will be "
-"activated."
-msgstr ""
-"Standard-Filamentprofil, das dem aktuellen Druckerprofil zugeordnet ist. Bei "
-"Auswahl des aktuellen Druckerprofils wird dieses Filamentprofil aktiviert."
-
-#: src/libslic3r/PrintConfig.cpp:287
-msgid "Default print profile"
-msgstr "Standard-Druckprofil"
-
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
-msgid ""
-"Default print profile associated with the current printer profile. On "
-"selection of the current printer profile, this print profile will be "
-"activated."
-msgstr ""
-"Standarddruckprofil, das dem aktuellen Druckerprofil zugeordnet ist. Bei "
-"Auswahl des aktuellen Druckerprofils wird dieses Druckprofil aktiviert."
-
-#: src/libslic3r/PrintConfig.cpp:293
-msgid "Disable fan for the first"
-msgstr "Ventilator für die Ersten"
-
-#: src/libslic3r/PrintConfig.cpp:294
-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 ""
-"Sie können einen positiven Wert eingeben, um den Lüfter vollständig für die "
-"ersten Schichten auszuschalten, damit er die Haftung nicht beeinträchtigt."
-
-#: src/libslic3r/PrintConfig.cpp:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
-msgid "layers"
-msgstr "Schichten"
-
-#: src/libslic3r/PrintConfig.cpp:304
-msgid "Don't support bridges"
-msgstr "Brücken nicht unterstützen"
-
-#: src/libslic3r/PrintConfig.cpp:306
-msgid ""
-"Experimental option for preventing support material from being generated "
-"under bridged areas."
-msgstr ""
-"Experimentelle Option zur Verhinderung der Bildung von Trägermaterial unter "
-"Überbrückungsflächen."
-
-#: src/libslic3r/PrintConfig.cpp:313
-msgid "Distance between copies"
-msgstr "Abstand zwischen Kopien"
-
-#: src/libslic3r/PrintConfig.cpp:314
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "Abstand für die automatische Druckplattenbelegung."
-
-#: src/libslic3r/PrintConfig.cpp:322
-msgid "Elephant foot compensation"
-msgstr "Elefantenfuss Kompensation"
-
-#: src/libslic3r/PrintConfig.cpp:324
-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 ""
-"Die erste Schicht wird in der XY-Ebene um den vorgegebenen Wert verkleinert, "
-"um das Ausquetschen in der ersten Schicht (\"Elephant Foot\"-Effekt) zu "
-"kompensieren."
-
-#: src/libslic3r/PrintConfig.cpp:334
-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 ""
-"Dieser G-Code wird am Ende der Ausgabedatei angehängt. Sie können "
-"Platzhaltervariablen für alle Slic3r-Einstellungen verwenden."
-
-#: src/libslic3r/PrintConfig.cpp:345
-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 ""
-"Diese Endprozedur wird am Ende der Ausgabedatei vor dem DruckerEnde G-Code "
-"eingefügt. Beachten Sie, dass Sie Platzhaltervariablen für alle Slic3r-"
-"Einstellungen verwenden können. Wenn Sie über mehrere Extruder verfügen, "
-"wird der G-Code in der Extruderreihenfolge verarbeitet."
-
-#: src/libslic3r/PrintConfig.cpp:356
-msgid "Ensure vertical shell thickness"
-msgstr "Stelle die vertikale Hüllenstärke  sicher"
-
-#: src/libslic3r/PrintConfig.cpp:358
-msgid ""
-"Add solid infill near sloping surfaces to guarantee the vertical shell "
-"thickness (top+bottom solid layers)."
-msgstr ""
-"Fügen Sie stabiles Infill in der Nähe von schrägen Flächen hinzu, um die "
-"vertikale Schalenstärke zu gewährleisten (obere und untere massive "
-"Schichten)."
-
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "Boden- und Deckenfüllmuster"
-
-#: src/libslic3r/PrintConfig.cpp:367
-msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
-msgstr ""
-"Füllmuster für die obere und untere Füllung. Dies wirkt sich nur auf die "
-"äußere sichtbare Schicht aus, nicht aber auf die angrenzenden soliden "
-"Konturen."
-
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
-msgid "Rectilinear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
-msgid "Concentric"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
-msgid "Hilbert Curve"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
-msgid "Archimedean Chords"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
-msgid "Octagram Spiral"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
-msgid "External perimeters"
-msgstr "Aussenschichten"
-
-#: src/libslic3r/PrintConfig.cpp:388
-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 ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"für externe Aussenschichten anzugeben. Falls auf Null belassen, wird die "
-"Standard-Extrusionsbreite verwendet (falls angeben), ansonsten wird der "
-"Durchmesser der Druckdüse x 1,125 verwendet. Falls als Prozentwert (z.B. "
-"200%) angegeben, wird dieser ausgehend von der Schichthöhe berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
-msgid "mm or % (leave 0 for default)"
-msgstr "mm oder % (für Standardwert auf Null belassen)"
-
-#: src/libslic3r/PrintConfig.cpp:399
-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 ""
-"Diese separate Einstellung wirkt sich auf die Geschwindigkeit der äusseren "
-"(sichtbaren) Aussenschichten aus. Als Prozentwert eingegeben (z.B. 80%), "
-"wird sie ausgehend von der obigen Geschwindigkeitseinstellung für "
-"Aussenschichten berechnet. Für die automatische Berechnung auf Null setzen."
-
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
-msgid "mm/s or %"
-msgstr "mm/s oder %"
-
-#: src/libslic3r/PrintConfig.cpp:409
-msgid "External perimeters first"
-msgstr "Aussenkonturen zuerst drucken"
-
-#: src/libslic3r/PrintConfig.cpp:411
-msgid ""
-"Print contour perimeters from the outermost one to the innermost one instead "
-"of the default inverse order."
-msgstr ""
-"Drucken Sie Konturumfänge von der äußersten zur innersten Kontur anstatt der "
-"standardmäßigen umgekehrten Reihenfolge."
-
-#: src/libslic3r/PrintConfig.cpp:418
-msgid "Extra perimeters if needed"
-msgstr "Extra Konturen wenn notwendig"
-
-#: src/libslic3r/PrintConfig.cpp:420
-#, no-c-format
-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 ""
-"Fügen Sie bei Bedarf weitere Perimeter hinzu, um Spalten in schrägen Wänden "
-"zu vermeiden. Slic3r fügt immer wieder Perimeter hinzu, bis mehr als 70% der "
-"unmittelbar darüber liegenden Schleife unterstützt werden."
-
-#: src/libslic3r/PrintConfig.cpp:431
-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 ""
-"Der Extruder, der verwendet werden soll, falls keine sonstigen "
-"Extrudereinstellungen angegeben wurden. Dies übersteuert die Angaben für die "
-"Aussenschicht- und Infill-Extruder, aber nicht die Angabe des Extruders für "
-"die Stützen."
-
-#: src/libslic3r/PrintConfig.cpp:444
-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."
-msgstr ""
-"Stellen Sie dies auf den vertikalen Abstand zwischen Ihrer Düsenspitze und "
-"(in der Regel) den X-Wagenstangen ein. Mit anderen Worten, das ist die Höhe "
-"des Abstandszylinders um Ihren Extruder herum und stellt die maximale Tiefe "
-"dar, die der Extruder vor der Kollision mit anderen Druckobjekten sehen kann."
-
-#: src/libslic3r/PrintConfig.cpp:455
-msgid "Radius"
-msgstr "Radius"
-
-#: src/libslic3r/PrintConfig.cpp:456
-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."
-msgstr ""
-"Stellen Sie dies auf den Freiraumradius um Ihren Extruder ein. Wenn der "
-"Extruder nicht zentriert ist, wählen Sie  zur Sicherheit den größten Wert. "
-"Diese Einstellung wird verwendet, um Kollisionen zu prüfen und die grafische "
-"Vorschau auf der  Druckplatte anzuzeigen."
-
-#: src/libslic3r/PrintConfig.cpp:467
-msgid "Extruder Color"
-msgstr "Extruder Farbe"
-
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr ""
-"Dies wird nur als visuelles Hilfsmittel in der Slic3r-Benutzeroberfläche "
-"verwendet."
-
-#: src/libslic3r/PrintConfig.cpp:475
-msgid "Extruder offset"
-msgstr "Extruder Offset"
-
-#: src/libslic3r/PrintConfig.cpp:476
-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)."
-msgstr ""
-"Wenn Ihre Firmware die Verschiebung des Extruders nicht beherrscht, "
-"benötigen Sie den G-Code, um sie zu berücksichtigen. Mit dieser Option "
-"können Sie die Verschiebung jedes Extruders in Bezug auf den ersten Extruder "
-"festlegen. Es erwartet positive Koordinaten (sie werden von der XY-"
-"Koordinate subtrahiert)."
-
-#: src/libslic3r/PrintConfig.cpp:486
-msgid "Extrusion axis"
-msgstr "Extrusionsachse"
-
-#: src/libslic3r/PrintConfig.cpp:487
-msgid ""
-"Use this option to set the axis letter associated to your printer's extruder "
-"(usually E but some printers use A)."
-msgstr ""
-"Verwenden Sie diese Einstellung, um den Buchstaben der Achse anzugeben, die "
-"mit Ihrem Extruder verknüpft ist (normalerweise E, aber bei manchen Druckern "
-"ist dies A)."
-
-#: src/libslic3r/PrintConfig.cpp:493
-msgid "Extrusion multiplier"
-msgstr "Extrusionsfaktor"
-
-#: src/libslic3r/PrintConfig.cpp:494
-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."
-msgstr ""
-"Dieser Faktor ändert die Extrusionsmenge proportional. Sie müssen diese "
-"Einstellung möglicherweise anpassen, um schöne Oberflächen und korrekte "
-"Hüllendicken zu erhalten. Die üblichen Werte bewegen sich zwischen 0,9 und "
-"1,1. Falls Sie grössere Anpassungen eingeben müssen, kontrollieren Sie auch "
-"den Filamentdurchmesser und die E-Schritte in Ihrer Firmware."
-
-#: src/libslic3r/PrintConfig.cpp:503
-msgid "Default extrusion width"
-msgstr "Standardextrusionsbreite"
-
-#: src/libslic3r/PrintConfig.cpp:505
-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 ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"zuzulassen. Falls auf Null belassen, wird Slic3r die Extrusionsbreiten vom "
-"Durchmesser der Druckdüse ableiten (siehe die Hilfstexte für die "
-"Extrusionsbreite für Aussenschichten, Infill usw.). Falls als Prozentwert (z."
-"B. 230%) angegeben, wird dieser ausgehend von der Schichthöhe berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:509
-msgid "mm or % (leave 0 for auto)"
-msgstr "mm oder % (für automatischen Wert auf Null belassen)"
-
-#: src/libslic3r/PrintConfig.cpp:515
-msgid "Keep fan always on"
-msgstr "Ventilator ständig laufen lassen"
-
-#: src/libslic3r/PrintConfig.cpp:516
-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 ""
-"Wenn diese Option aktiviert ist, wird der Lüfter niemals deaktiviert und "
-"läuft mindestens mit seiner Minimaldrehzahl weiter. Sinnvoll für PLA, "
-"ungeignet für ABS."
-
-#: src/libslic3r/PrintConfig.cpp:522
-msgid "Enable fan if layer print time is below"
-msgstr "Ventilator anschalten wenn die Schichtdruckzeit geringer ist als"
-
-#: src/libslic3r/PrintConfig.cpp:523
-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 ""
-"Wenn die Druckzeit der Ebenen unter dieser Anzahl von Sekunden liegt, wird "
-"der Lüfter aktiviert und seine Geschwindigkeit durch Interpolation der "
-"minimalen und maximalen Geschwindigkeiten berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
-msgid "approximate seconds"
-msgstr "ungefähre Sekunden"
-
-#: src/libslic3r/PrintConfig.cpp:534
-msgid "Color"
-msgstr "Farbe"
-
-#: src/libslic3r/PrintConfig.cpp:541
-msgid "Filament notes"
-msgstr "Filament Bemerkungen"
-
-#: src/libslic3r/PrintConfig.cpp:542
-msgid "You can put your notes regarding the filament here."
-msgstr "Sie können Ihre Notizen zum Filament hier eingeben."
-
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
-msgid "Max volumetric speed"
-msgstr "Maximale Volumengeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:552
-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 ""
-"Maximale volumetrische Geschwindigkeit, die für dieses Filament zulässig "
-"ist. Begrenzt die maximale volumetrische Geschwindigkeit eines Drucks auf "
-"das Minimum von Druck- und Filament-Volumengeschwindigkeit. Wird auf Null "
-"gesetzt, wenn es keine Begrenzung gibt."
-
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
-msgid "mm³/s"
-msgstr "mm³/s"
-
-#: src/libslic3r/PrintConfig.cpp:562
-msgid "Loading speed"
-msgstr "Ladegeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:563
-msgid "Speed used for loading the filament on the wipe tower. "
-msgstr ""
-"Geschwindigkeit, mit der Filament auf dem Reinigungsturm geladen wird. "
-
-#: src/libslic3r/PrintConfig.cpp:571
-msgid "Loading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:572
-msgid "Speed used at the very beginning of loading phase. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:580
-msgid "Unloading speed"
-msgstr "Entladegeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:581
-msgid ""
-"Speed used for unloading the filament on the wipe tower (does not affect  "
-"initial part of unloading just after ramming). "
-msgstr ""
-"Geschwindigkeit, mit der Filament auf dem Reinigungsturm entladen wird "
-"(betrifft nicht den ersten Teil des Entladens direkt nach dem Rammen). "
-
-#: src/libslic3r/PrintConfig.cpp:590
-msgid "Unloading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:591
-msgid ""
-"Speed used for unloading the tip of the filament immediately after ramming. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:599
-msgid "Delay after unloading"
-msgstr "Verzögerung nach dem Entladen"
-
-#: src/libslic3r/PrintConfig.cpp:600
-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. "
-msgstr ""
-"Wartezeit, nachdem das Filament entladen wurde. Dies kann zu zuverlässigeren "
-"Werkzeugwechseln beitragen bei flexiblen Materialien, die mehr Zeit zum "
-"Schrumpfen auf ihre ursprüngliche Grösse brauchen. "
-
-#: src/libslic3r/PrintConfig.cpp:610
-msgid "Number of cooling moves"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:611
-msgid ""
-"Filament is cooled by being moved back and forth in the cooling tubes. "
-"Specify desired number of these moves "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:620
-msgid "Speed of the first cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:621
-msgid "Cooling moves are gradually accelerating beginning at this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:629
-msgid "Minimal purge on wipe tower"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:630
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:635
-msgid "mm³"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:641
-msgid "Speed of the last cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:642
-msgid "Cooling moves are gradually accelerating towards this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:650
-msgid "Filament load time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:651
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:659
-msgid "Ramming parameters"
-msgstr "Rammparameter"
-
-#: src/libslic3r/PrintConfig.cpp:660
-msgid ""
-"This string is edited by RammingDialog and contains ramming specific "
-"parameters "
-msgstr ""
-"Diese Zeichenfolge wird vom RammDialog angepasst und enthält für das Rammen "
-"spezifische Parameter "
-
-#: src/libslic3r/PrintConfig.cpp:667
-msgid "Filament unload time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:668
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:677
-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."
-msgstr ""
-"Geben Sie hier Ihren Filamentdurchmesser ein. Eine hohe Genauigkeit ist "
-"erforderlich, also verwenden Sie einen Messschieber und führen Sie mehrere "
-"Messungen entlang des Filaments durch, um dann den Mittelwert zu berechnen."
-
-#: src/libslic3r/PrintConfig.cpp:685
-msgid "Density"
-msgstr "Dichte"
-
-#: src/libslic3r/PrintConfig.cpp:686
-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."
-msgstr ""
-"Geben Sie hier Ihre Filamentdichte ein. Dies dient ausschließlich "
-"statistischen Zwecken. Ein vernünftiger Weg ist es, eine bekannte "
-"Filamentlänge zu wiegen und das Verhältnis von Länge zu Volumen zu "
-"berechnen. Besser ist es, das Volumen direkt durch Verdrängung zu berechnen."
-
-#: src/libslic3r/PrintConfig.cpp:689
-msgid "g/cm³"
-msgstr "g/cm³"
-
-#: src/libslic3r/PrintConfig.cpp:695
-msgid "Filament type"
-msgstr "Filament Typ"
-
-#: src/libslic3r/PrintConfig.cpp:696
-msgid "The filament material type for use in custom G-codes."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:712
-msgid "Soluble material"
-msgstr "Lösliches Material"
-
-#: src/libslic3r/PrintConfig.cpp:713
-msgid "Soluble material is most likely used for a soluble support."
-msgstr "Lösliches Material wird meistens für lösliche Stützen verwendet."
-
-#: src/libslic3r/PrintConfig.cpp:719
-msgid ""
-"Enter your filament cost per kg here. This is only for statistical "
-"information."
-msgstr ""
-"Geben Sie hier Ihre Filamentkosten pro kg ein. Dies dient ausschließlich "
-"statistischen Zwecken."
-
-#: src/libslic3r/PrintConfig.cpp:720
-msgid "money/kg"
-msgstr "Kosten/kg"
-
-#: src/libslic3r/PrintConfig.cpp:729
-msgid "Fill angle"
-msgstr "Füllwinkel"
-
-#: src/libslic3r/PrintConfig.cpp:731
-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."
-msgstr ""
-"Standard-Grundwinkel für die Ausrichtung der Füllung. Hierfür werden "
-"Kreuzschraffuren verwendet. Brücken werden mit der besten Richtung gefüllt, "
-"die Slic3r erkennen kann, so dass diese Einstellung sie nicht beeinflusst."
-
-#: src/libslic3r/PrintConfig.cpp:744
-msgid "Fill density"
-msgstr "Fülldichte"
-
-#: src/libslic3r/PrintConfig.cpp:746
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "Infilldichte.  Als Prozentwert von 0% - 100% ausgedrückt."
-
-#: src/libslic3r/PrintConfig.cpp:782
-msgid "Fill pattern"
-msgstr "Füllmuster"
-
-#: src/libslic3r/PrintConfig.cpp:784
-msgid "Fill pattern for general low-density infill."
-msgstr "Füllmuster für allgemeines Infill mit niedriger Dichte."
-
-#: src/libslic3r/PrintConfig.cpp:801
-msgid "Grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:802
-msgid "Triangles"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:803
-msgid "Stars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:804
-msgid "Cubic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:805
-msgid "Line"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
-msgid "Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:808
-msgid "3D Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:809
-msgid "Gyroid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
-msgid "First layer"
-msgstr "Erste Schicht"
-
-#: src/libslic3r/PrintConfig.cpp:817
-msgid ""
-"This is the acceleration your printer will use for first layer. Set zero to "
-"disable acceleration control for first layer."
-msgstr ""
-"Die Beschleunigung, die Ihr Drucker für die erste Schicht verwendet.  Setzen "
-"Sie dies auf Null, um die Beschleunigungskontrolle bei der ersten Schicht zu "
-"deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:827
-msgid ""
-"Heated build plate temperature for the first layer. Set this to zero to "
-"disable bed temperature control commands in the output."
-msgstr ""
-"Druckbetttemperatur für die erste Schicht. Setzen Sie diesen Wert auf Null, "
-"um die Befehle zur Steuerung der Betttemperatur im Ausgang zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:837
-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."
-msgstr ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"für die erste Druckschicht anzugeben. Sie können damit eine dickere "
-"Extrusion für bessere Haftung erzwingen. Falls auf Null belassen, wird die "
-"Standard-Extrusionsbreite verwendet. Falls als Prozentwert (z.B. 120%) "
-"angegeben, wird dieser ausgehend von der Schichthöhe berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:848
-msgid "First layer height"
-msgstr "Höhe der ersten Schicht"
-
-#: src/libslic3r/PrintConfig.cpp:850
-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 ""
-"Wenn mit sehr kleinen Schichthöhen gedruckt wird, möchten Sie vielleicht "
-"trotzdem eine dickere Bodenschicht drucken, um die Haftung sowie die "
-"Toleranz bei nicht perfekt ebenen Druckplatten zu verbessern. Dieser Wert "
-"kann als Absolutwert oder als Prozentwert (z.B. 150%) der "
-"Standardschichthöhe angegeben werden."
-
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
-msgid "mm or %"
-msgstr "mm oder %"
-
-#: src/libslic3r/PrintConfig.cpp:860
-msgid "First layer speed"
-msgstr "Druckgeschwindigkeit der ersten Schicht"
-
-#: src/libslic3r/PrintConfig.cpp:861
-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 ""
-"Wird diese Geschwindigkeit als Absolutwert in mm/s angegeben, so wird sie "
-"auf alle Druckbewegungen der ersten Lage angewendet, unabhängig von ihrem "
-"Typ. In Prozent ausgedrückt (z.B. 40%) skaliert es die voreingestellten "
-"Geschwindigkeiten."
-
-#: src/libslic3r/PrintConfig.cpp:872
-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 ""
-"Extrudertemperatur für die erste Schicht. Wenn Sie die Temperatur während "
-"des Druckvorgangs manuell regeln möchten, setzen Sie diesen Wert auf Null, "
-"um die Temperatursteuerbefehle in der Ausgabedatei zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:882
-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ässigen 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:890
-msgid "Verbose G-code"
-msgstr "Ausführlicher G-Code"
-
-#: src/libslic3r/PrintConfig.cpp:891
-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 ""
-"Aktivieren Sie diese Option, um eine kommentierte G-Code-Datei zu erhalten, "
-"wobei jede Zeile durch einen beschreibenden Text erklärt wird. Wenn Sie von "
-"einer SD-Karte drucken, kann die zusätzliche Dateigröße dazu führen, dass "
-"Ihre Firmware langsamer wird."
-
-#: src/libslic3r/PrintConfig.cpp:899
-msgid "G-code flavor"
-msgstr "G-Code Typ"
-
-#: src/libslic3r/PrintConfig.cpp:900
-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 ""
-"Einige G/M-Code-Befehle, einschließlich Temperatursteuerung und andere, sind "
-"nicht universell. Stellen Sie diese Option auf die Firmware Ihres Druckers "
-"ein, um eine kompatible Ausgabe zu erhalten. Die Eigenschaft \"Keine "
-"Extrusion\" verhindert, dass Slic3r überhaupt einen Extrusionswert "
-"exportiert."
-
-#: src/libslic3r/PrintConfig.cpp:924
-msgid "No extrusion"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:929
-msgid "High extruder current on filament swap"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:930
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:939
-msgid ""
-"This is the acceleration your printer will use for infill. Set zero to "
-"disable acceleration control for infill."
-msgstr ""
-"Diese Stellung bestimmt die Beschleunigung des Druckers für Infill.  Setzen "
-"Sie dies auf Null, um die Beschleunigungskontrolle für Infill zu "
-"deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:948
-msgid "Combine infill every"
-msgstr "Infill kombinieren alle"
-
-#: src/libslic3r/PrintConfig.cpp:950
-msgid ""
-"This feature allows to combine infill and speed up your print by extruding "
-"thicker infill layers while preserving thin perimeters, thus accuracy."
-msgstr ""
-"Diese Einstellung erlaubt es, Infill zu kombinieren und die Druckdauer zu "
-"verringern, indem dickere Infill-Schichten gedruckt werden, während "
-"gleichzeitig dünne Aussenschichten und damit die Genauigkeit erhalten "
-"bleiben."
-
-#: src/libslic3r/PrintConfig.cpp:954
-msgid "Combine infill every n layers"
-msgstr "Kombiniere das Infill all n Schichten"
-
-#: src/libslic3r/PrintConfig.cpp:960
-msgid "Infill extruder"
-msgstr "Infill Extruder"
-
-#: src/libslic3r/PrintConfig.cpp:962
-msgid "The extruder to use when printing infill."
-msgstr "Extruder der beim Infill benutzt wird."
-
-#: src/libslic3r/PrintConfig.cpp:971
-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."
-msgstr ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"für den Infill anzugeben. Falls auf Null belassen, wird die Standard-"
-"Extrusionsbreite verwendet (falls angeben), ansonsten wird der Durchmesser "
-"der Druckdüse x 1,125 verwendet. Dickere Extrusionsbreiten sind vorteilhaft, "
-"um den Infill zu beschleunigen und um die Teile stärker zu machen. Falls als "
-"Prozentwert (z.B. 90%) angegeben, wird dieser ausgehend von der Schichthöhe "
-"berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:981
-msgid "Infill before perimeters"
-msgstr "Infill vor Kontur"
-
-#: src/libslic3r/PrintConfig.cpp:982
-msgid ""
-"This option will switch the print order of perimeters and infill, making the "
-"latter first."
-msgstr ""
-"Diese Einstellungen kehrt die Druckreihenfolge von Aussenschichten und "
-"Infill um, sodass der Infill zuerst gedruckt wird."
-
-#: src/libslic3r/PrintConfig.cpp:988
-msgid "Only infill where needed"
-msgstr "Infill nur wo es notwendig ist drucken"
-
-#: src/libslic3r/PrintConfig.cpp:990
-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."
-msgstr ""
-"Diese Einstellung beschränkt den Infill auf die Bereiche, die tatsächlich "
-"für das Stützen von Decken benötigt werden (der Infill dient hier als "
-"internes Stützmaterial). Falls aktiviert, kann dies die Erstellung des G-"
-"Codes wegen zusätzlichen Kontrollschritten verlangsamen."
-
-#: src/libslic3r/PrintConfig.cpp:998
-msgid "Infill/perimeters overlap"
-msgstr "Infill/Kontur Ãœberlappung"
-
-#: src/libslic3r/PrintConfig.cpp:1000
-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."
-msgstr ""
-"Diese Einstellung fügt eine zusätzliche Überlappung zwischen Aussenschichten "
-"und Infill ein, um die Haftung zu verbessern. Theoretisch sollte dies nicht "
-"notwendig sein, doch vorhandenes Getriebespiel könnte Lücken erzeugen.  Als "
-"Prozentwert eingegeben (z.B. 15%) wird sie ausgehend von der "
-"Extrusionsbreite für die Aussenschicht ausgerechnet."
-
-#: src/libslic3r/PrintConfig.cpp:1012
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr "Druckgeschwindigkeit für den Infill. Für Automatik auf Null setzen."
-
-#: src/libslic3r/PrintConfig.cpp:1020
-msgid "Inherits profile"
-msgstr "Ãœbernimmt Profil"
-
-#: src/libslic3r/PrintConfig.cpp:1021
-msgid "Name of the profile, from which this profile inherits."
-msgstr "Name des Profils, von dem dieses Profil abgeleitet wurde."
-
-#: src/libslic3r/PrintConfig.cpp:1032
-msgid "Interface shells"
-msgstr "Schnittstellenshells"
-
-#: src/libslic3r/PrintConfig.cpp:1033
-msgid ""
-"Force the generation of solid shells between adjacent materials/volumes. "
-"Useful for multi-extruder prints with translucent materials or manual "
-"soluble support material."
-msgstr ""
-"Erzwingt die Erzeugung von festen Schalen zwischen benachbarten Materialien/"
-"Volumina. Geeignet für Multiextruderdrucke mit transluzenten Materialien "
-"oder manuell löslichen Trägermaterialien."
-
-#: src/libslic3r/PrintConfig.cpp:1043
-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:1054
-msgid "Supports remaining times"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1055
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1063
-msgid "Supports silent mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1064
-msgid "Set silent mode for the G-code flavor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1087
-msgid "Maximum feedrate %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1089
-msgid "Maximum feedrate of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1097
-msgid "Maximum acceleration %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1099
-msgid "Maximum acceleration of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1107
-msgid "Maximum jerk %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1109
-msgid "Maximum jerk of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
-msgid "Minimum feedrate when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
-msgid "Minimum travel feedrate"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
-msgid "Maximum acceleration when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
-msgid "Maximum acceleration when retracting"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
-msgid "Max"
-msgstr "Max"
-
-#: src/libslic3r/PrintConfig.cpp:1164
-msgid "This setting represents the maximum speed of your fan."
-msgstr "Diese Einstellung bestimmt die maximale Geschwindigkeit Ihres Lüfters."
-
-#: src/libslic3r/PrintConfig.cpp:1174
-#, no-c-format
-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."
-msgstr ""
-"Dies ist die höchste druckbare Schichthöhe für diesen Extruder, mit der die "
-"variable Schichthöhe und Stützschichthöhe abgedeckt wird. Die maximale "
-"empfohlene Schichthöhe beträgt 75% der Extrusionsbreite, um eine angemessene "
-"Zwischenlagenhaftung zu erreichen. Bei Einstellung auf 0 ist die Lagenhöhe "
-"auf 75% des Düsendurchmessers begrenzt."
-
-#: src/libslic3r/PrintConfig.cpp:1185
-msgid "Max print speed"
-msgstr "Maximale Druckgeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:1186
-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."
-msgstr ""
-"Wenn andere Geschwindigkeitseinstellungen auf Null gesetzt wurden, wird "
-"Slic3r die optimale Geschwindigkeit automatisch berechnen, um den "
-"Extruderdruck konstant zu halten. Diese experimentelle Einstellung erlaubt "
-"Ihnen, die höchste zulässige Druckgeschwindigkeit anzugeben."
-
-#: src/libslic3r/PrintConfig.cpp:1197
-msgid ""
-"This experimental setting is used to set the maximum volumetric speed your "
-"extruder supports."
-msgstr ""
-"Diese experimentelle Einstellung gibt die maximale volumetrische "
-"Geschwindigkeit an, die von Ihrem Extruder unterstützt wird."
-
-#: src/libslic3r/PrintConfig.cpp:1206
-msgid "Max volumetric slope positive"
-msgstr "Max. volumetrische Steigung positiv"
-
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
-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."
-msgstr ""
-"Diese experimentelle Einstellung beschränkt die Änderungsgeschwindigkeit der "
-"Extrusionsmenge. Ein Wert von 1.8 mm³/s² gewährleistet, dass eine Änderung "
-"der Extrusionsmenge von 1.8 mm³/s (0.45mm Extrusionsbreite, 0.2mm "
-"Extrusionshöhe, Vorschub 20 mm/s) zu 5.4 mm³/s (Vorschub 60 mm/s) mindestens "
-"2 Sekunden dauern wird."
-
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
-msgid "mm³/s²"
-msgstr "mm³/s²"
-
-#: src/libslic3r/PrintConfig.cpp:1218
-msgid "Max volumetric slope negative"
-msgstr "Max. volumetrische Steigung negativ"
-
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
-msgid "Min"
-msgstr "Min"
-
-#: src/libslic3r/PrintConfig.cpp:1231
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr ""
-"Diese Einstellung gibt den minimalen PWM-Wert an, den Ihr Lüfter für den "
-"Betrieb benötigt."
-
-#: src/libslic3r/PrintConfig.cpp:1241
-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."
-msgstr ""
-"Dies ist die niedrigste druckbare Schichthöhe für diesen Extruder und "
-"begrenzt die Auflösung bei variabler Schichthöhe. Typische Werte liegen "
-"zwischen 0,05 mm und 0,1 mm."
-
-#: src/libslic3r/PrintConfig.cpp:1250
-msgid "Min print speed"
-msgstr "Minimale Druckgeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:1251
-msgid "Slic3r will not scale speed down below this speed."
-msgstr ""
-"Slic3r wird die Geschwindigkeit nicht unterhalb dieser Geschwindigkeit "
-"skalieren."
-
-#: src/libslic3r/PrintConfig.cpp:1259
-msgid "Minimal filament extrusion length"
-msgstr "Minimale Filament Extrusionlänge"
-
-#: src/libslic3r/PrintConfig.cpp:1260
-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."
-msgstr ""
-"Erzeugt nicht weniger als die Anzahl der Schürzenschleifen, die benötigt "
-"wird, um die angegebene Menge an Filament auf der unteren Schicht zu "
-"verbrauchen. Bei Multiextruder-Maschinen gilt dieses Minimum für jeden "
-"Extruder."
-
-#: src/libslic3r/PrintConfig.cpp:1270
-msgid "Configuration notes"
-msgstr "Konfigurationsnotizen"
-
-#: src/libslic3r/PrintConfig.cpp:1271
-msgid ""
-"You can put here your personal notes. This text will be added to the G-code "
-"header comments."
-msgstr ""
-"Sie können hier Ihre persönlichen Notizen eingeben.  Der Text wird dem "
-"Header vom G-Code hinzugefügt."
-
-#: src/libslic3r/PrintConfig.cpp:1281
-msgid "Nozzle diameter"
-msgstr "Düsendurchmesser"
-
-#: src/libslic3r/PrintConfig.cpp:1282
-msgid ""
-"This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
-msgstr "Durchmesser der Extruderdüse (z.B.: 0.5, 0.35 usw.)"
-
-#: src/libslic3r/PrintConfig.cpp:1288
-msgid "Host Type"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1289
-msgid ""
-"Slic3r can upload G-code files to a printer host. This field must contain "
-"the kind of the host."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr "Hostname, IP oder URL"
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
-msgid "Only retract when crossing perimeters"
-msgstr "Nur bei Umfangsüberquerungen einziehen"
-
-#: src/libslic3r/PrintConfig.cpp:1326
-msgid ""
-"Disables retraction when the travel path does not exceed the upper layer's "
-"perimeters (and thus any ooze will be probably invisible)."
-msgstr ""
-"Deaktiviert den Einzug, wenn der Verfahrweg die Perimeter der oberen Schicht "
-"nicht überschreitet (und somit ist der Auslauf wahrscheinlich unsichtbar)."
-
-#: src/libslic3r/PrintConfig.cpp:1334
-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 ""
-"Mit dieser Option wird die Temperatur der inaktiven Extruder gesenkt, um ein "
-"Materialnachsickern zu verhindern. Es aktiviert automatisch eine hohe "
-"Schürze und bewegt die Extruder bei Temperaturänderungen ausserhalb dieser "
-"Schürze."
-
-#: src/libslic3r/PrintConfig.cpp:1342
-msgid "Output filename format"
-msgstr "Ausgabe Dateinamen Format"
-
-#: src/libslic3r/PrintConfig.cpp:1343
-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 ""
-"Sie können alle Konfigurationsoptionen als Variablen in dieser Vorlage "
-"benutzen.   Zum Beispiel: [layer_height], [fill_density] usw. Sie können "
-"auch [timestamp], [year], [month], [day], [hour], [minute], [second], "
-"[version], [input_filename], und [input_filename_base] benutzen."
-
-#: src/libslic3r/PrintConfig.cpp:1353
-msgid "Detect bridging perimeters"
-msgstr "Umfangbrücken entdecken"
-
-#: src/libslic3r/PrintConfig.cpp:1355
-msgid ""
-"Experimental option to adjust flow for overhangs (bridge flow will be used), "
-"to apply bridge speed to them and enable fan."
-msgstr ""
-"Experimentelle Option zur Anpassung des Durchflusses für Überhänge "
-"(Brückenvolumenfluss wird verwendet), zur Anwendung der "
-"Brückengeschwindigkeit und zur Aktivierung des Lüfters."
-
-#: src/libslic3r/PrintConfig.cpp:1362
-msgid "Filament parking position"
-msgstr "Filament Parkposition"
-
-#: src/libslic3r/PrintConfig.cpp:1363
-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 ""
-"Abstand der Extruderspitze von der Position, an der das Filament beim "
-"Entladen abgestellt wird. Dies sollte mit dem Wert in der Drucker-Firmware "
-"übereinstimmen. "
-
-#: src/libslic3r/PrintConfig.cpp:1372
-msgid "Extra loading distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1373
-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:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
-msgid "Perimeters"
-msgstr "Konturen"
-
-#: src/libslic3r/PrintConfig.cpp:1383
-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 ""
-"Dies ist die Beschleunigung, die der Drucker für Aussenschichten benutzen "
-"wird. Ein hoher Wert wie 9000 ergibt üblicherweise gute Resultate falls Ihre "
-"Hardware mithalten kann. Setzen Sie dies auf Null, um die "
-"Beschleunigungskontrolle bei Aussenschichten zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:1392
-msgid "Perimeter extruder"
-msgstr "Umfang Extruder"
-
-#: src/libslic3r/PrintConfig.cpp:1394
-msgid ""
-"The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr ""
-"Extruder der beim Umfang und Rand Drucken benutzt werden soll. Der erste "
-"Extruder ist 1."
-
-#: src/libslic3r/PrintConfig.cpp:1404
-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."
-msgstr ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"für Aussenschichten anzugeben. Dünnere Extrusionsbreiten sind vorteilhaft, "
-"um genauere Oberflächen zu erhalten. Falls auf Null belassen, wird die "
-"Standard-Extrusionsbreite verwendet (falls angeben), ansonsten wird der "
-"Durchmesser der Druckdüse x 1,125 verwendet. Falls als Prozentwert (z.B. "
-"200%) angegeben, wird dieser ausgehend von der Schichthöhe berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:1417
-msgid ""
-"Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr ""
-"Geschwindigkeit für Aussenschichten (Konturen, bzw. vertikale Hüllen). Für "
-"Automatik auf Null setzen."
-
-#: src/libslic3r/PrintConfig.cpp:1427
-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 ""
-"Diese Stellung bestimmt die Anzahl der Aussenschichten, die für jede Schicht "
-"erzeugt werden.  Slic3r kann diese Zahl automatisch vergrössern, wenn es "
-"schräge Oberflächen erkennt, die sich mit einer höheren Zahl von "
-"Aussenschichten besser drucken lassen, wenn die \"Zusätzliche "
-"Aussenschichten falls notwendig\" Option aktiviert ist."
-
-#: src/libslic3r/PrintConfig.cpp:1431
-msgid "(minimum)"
-msgstr "(Minimum)"
-
-#: src/libslic3r/PrintConfig.cpp:1439
-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."
-msgstr ""
-"Wenn Sie den Ausgabe-G-Code durch eigene Skripte verarbeiten wollen, geben "
-"Sie hier einfach die absoluten Pfade an. Trennen Sie mehrere Skripte durch "
-"ein Semikolon. Skripten werden als erstes Argument die absoluten Pfad zur G-"
-"Code-Datei übergeben, und sie können auf die Slic3r-"
-"Konfigurationseinstellungen zugreifen, indem sie Umgebungsvariablen lesen."
-
-#: src/libslic3r/PrintConfig.cpp:1452
-msgid "Printer type"
-msgstr "Druckertyp"
-
-#: src/libslic3r/PrintConfig.cpp:1453
-msgid "Type of the printer."
-msgstr "Druckertyp."
-
-#: src/libslic3r/PrintConfig.cpp:1457
-msgid "Printer notes"
-msgstr "Drucker Anmerkungen"
-
-#: src/libslic3r/PrintConfig.cpp:1458
-msgid "You can put your notes regarding the printer here."
-msgstr "Sie können Ihre Bemerkungen zum Drucker hier eingeben."
-
-#: src/libslic3r/PrintConfig.cpp:1467
-msgid "Printer vendor"
-msgstr "Druckerhersteller"
-
-#: src/libslic3r/PrintConfig.cpp:1468
-msgid "Name of the printer vendor."
-msgstr "Name des Druckerherstellers."
-
-#: src/libslic3r/PrintConfig.cpp:1472
-msgid "Printer variant"
-msgstr "Druckervariante"
-
-#: src/libslic3r/PrintConfig.cpp:1473
-msgid ""
-"Name of the printer variant. For example, the printer variants may be "
-"differentiated by a nozzle diameter."
-msgstr ""
-"Name der Druckervariante. Beispielsweise können die Druckervarianten durch "
-"einen Düsendurchmesser unterschieden werden."
-
-#: src/libslic3r/PrintConfig.cpp:1483
-msgid "Raft layers"
-msgstr "Raft Schichten"
-
-#: src/libslic3r/PrintConfig.cpp:1485
-msgid ""
-"The object will be raised by this number of layers, and support material "
-"will be generated under it."
-msgstr ""
-"Das Objekt wird um diese Anzahl von Schichten angehoben, und darunter wird "
-"Trägermaterial erzeugt."
-
-#: src/libslic3r/PrintConfig.cpp:1494
-msgid "Resolution"
-msgstr "Auflösung"
-
-#: src/libslic3r/PrintConfig.cpp:1495
-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 ""
-"Minimale Detailauflösung, die verwendet wird, um die Eingabedatei zu "
-"vereinfachen, um den Slicingjob zu beschleunigen und den Speicherverbrauch "
-"zu reduzieren. Hochauflösende Modelle weisen oft mehr Details auf, als der "
-"Drucker wiedergeben kann. Setzen Sie den Wert auf Null, um die Vereinfachung "
-"zu deaktivieren und die volle Auflösung des Eingangsdatei zu verwenden."
-
-#: src/libslic3r/PrintConfig.cpp:1506
-msgid "Minimum travel after retraction"
-msgstr "Minimalbewegung nach Einziehen"
-
-#: src/libslic3r/PrintConfig.cpp:1507
-msgid ""
-"Retraction is not triggered when travel moves are shorter than this length."
-msgstr ""
-"Der Einzug wird nicht ausgelöst, wenn die Fahrbewegungen kürzer als diese "
-"Länge sind."
-
-#: src/libslic3r/PrintConfig.cpp:1514
-msgid "Retract amount before wipe"
-msgstr "Einzugslänge vor einer Reinigung"
-
-#: src/libslic3r/PrintConfig.cpp:1515
-msgid ""
-"With bowden extruders, it may be wise to do some amount of quick retract "
-"before doing the wipe movement."
-msgstr ""
-"Bei Bowden-Extrudern kann es ratsam sein, vor der Reinigungsbewegung einen "
-"kurzen Einzug auszuführen."
-
-#: src/libslic3r/PrintConfig.cpp:1523
-msgid "Retract on layer change"
-msgstr "Bei Schichtwechsel Einziehen"
-
-#: src/libslic3r/PrintConfig.cpp:1524
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr "Diese Stellung erzwingt einen Einzug bei jeder Z-Bewegung."
-
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
-msgid "Length"
-msgstr "Länge"
-
-#: src/libslic3r/PrintConfig.cpp:1531
-msgid "Retraction Length"
-msgstr "Einzugslänge"
-
-#: src/libslic3r/PrintConfig.cpp:1532
-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 ""
-"Wenn der Einzug ausgelöst wird, wird das Filament um diese Länge "
-"eingezogen.  (Die Länge wird am unverarbeiteten Filament vor dem Extruder "
-"gemessen)."
-
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
-msgid "mm (zero to disable)"
-msgstr "mm (Null eingeben zum deaktivieren)"
-
-#: src/libslic3r/PrintConfig.cpp:1540
-msgid "Retraction Length (Toolchange)"
-msgstr "Einzugslänge (Werkzeugwechsel)"
-
-#: src/libslic3r/PrintConfig.cpp:1541
-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 ""
-"Wenn der Einzug vor dem Werkzeugwechsel ausgelöst wird, wird das Filament um "
-"diese Länge eingezogen. (Die Länge wird am unverarbeiteten Filament vor dem "
-"Extruder gemessen)."
-
-#: src/libslic3r/PrintConfig.cpp:1550
-msgid "Lift Z"
-msgstr "Z Hebung"
-
-#: src/libslic3r/PrintConfig.cpp:1551
-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 ""
-"Wenn Sie diesen Wert auf einen positiven Wert setzen, wird Z bei jedem "
-"Auslösen eines Einzugs schnell angehoben. Bei Verwendung mehrerer Extruder "
-"wird nur die Einstellung für den ersten Extruder berücksichtigt."
-
-#: src/libslic3r/PrintConfig.cpp:1559
-msgid "Above Z"
-msgstr "Ãœber Z"
-
-#: src/libslic3r/PrintConfig.cpp:1560
-msgid "Only lift Z above"
-msgstr "Z nur Anheben über"
-
-#: src/libslic3r/PrintConfig.cpp:1561
-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 ""
-"Wenn Sie diesen Wert auf einen positiven Wert setzen, erfolgt der Z-Hub nur "
-"oberhalb des angegebenen absoluten Z-Wertes. Sie können diese Einstellung "
-"für das Auslassen von Z-Hüben auf den ersten Ebenen einstellen."
-
-#: src/libslic3r/PrintConfig.cpp:1569
-msgid "Below Z"
-msgstr "Unter Z"
-
-#: src/libslic3r/PrintConfig.cpp:1570
-msgid "Only lift Z below"
-msgstr "Z anheben nur unter"
-
-#: src/libslic3r/PrintConfig.cpp:1571
-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 ""
-"Wenn Sie diesen Wert auf einen positiven Wert setzen, erfolgt der Z-Hub nur "
-"unterhalb des angegebenen absoluten Z-Wertes. Sie können diese Einstellung "
-"so einstellen, dass der Z-Hub auf die ersten Lagen begrenzt wird."
-
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
-msgid "Extra length on restart"
-msgstr "Extra Länge bei Neustart"
-
-#: src/libslic3r/PrintConfig.cpp:1581
-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 ""
-"Wenn der Einzug nach der Zwischenbewegung kompensiert wurde, wird der "
-"Extruder diese zusätzliche Menge an Filament ausgeben. Diese Einstellung "
-"wird selten benötigt."
-
-#: src/libslic3r/PrintConfig.cpp:1590
-msgid ""
-"When the retraction is compensated after changing tool, the extruder will "
-"push this additional amount of filament."
-msgstr ""
-"Wenn der Einzug nach dem Werkzeugwechsel kompensiert wurde, wird der "
-"Extruder diese zusätzliche Menge an Filament ausgeben."
-
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
-msgid "Retraction Speed"
-msgstr "Einzugsgeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:1600
-msgid "The speed for retractions (it only applies to the extruder motor)."
-msgstr "Die Einzugsgeschwindigkeit (sie betrifft nur den Extruderantrieb)."
-
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
-msgid "Deretraction Speed"
-msgstr "Wiedereinzugsgeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:1609
-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 ""
-"Die Geschwindigkeit, mit der ein Filament nach dem Einzug wieder in den "
-"Extruder vorgeschoben wird. Falls Null, wird die Einzugsgeschwindigkeit "
-"verwendet."
-
-#: src/libslic3r/PrintConfig.cpp:1617
-msgid "Seam position"
-msgstr "Nahtposition"
-
-#: src/libslic3r/PrintConfig.cpp:1619
-msgid "Position of perimeters starting points."
-msgstr "Position des Startpunktes des Umfangs."
-
-#: src/libslic3r/PrintConfig.cpp:1626
-msgid "Random"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1627
-msgid "Nearest"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1628
-msgid "Aligned"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1636
-msgid "Direction"
-msgstr "Richtung"
-
-#: src/libslic3r/PrintConfig.cpp:1638
-msgid "Preferred direction of the seam"
-msgstr "Bevorzugte Richtung für die Naht"
-
-#: src/libslic3r/PrintConfig.cpp:1639
-msgid "Seam preferred direction"
-msgstr "Bevorzugte Richtung für Nähte"
-
-#: src/libslic3r/PrintConfig.cpp:1647
-msgid "Jitter"
-msgstr "Jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1649
-msgid "Seam preferred direction jitter"
-msgstr "Bevorzugte Zitterrichtung für Nähte"
-
-#: src/libslic3r/PrintConfig.cpp:1650
-msgid "Preferred direction of the seam - jitter"
-msgstr "Bevorzugte Zitterrichtung für die Naht"
-
-#: src/libslic3r/PrintConfig.cpp:1661
-msgid "USB/serial port for printer connection."
-msgstr "USB-/serielle Schnittstelle für den Druckeranschluss."
-
-#: src/libslic3r/PrintConfig.cpp:1669
-msgid "Serial port speed"
-msgstr "Serielle Portgeschwindigkeit"
-
-#: src/libslic3r/PrintConfig.cpp:1670
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr ""
-"Geschwindigkeit (baud) des USB/seriellen Ports für den Drucker Anschluß."
-
-#: src/libslic3r/PrintConfig.cpp:1679
-msgid "Distance from object"
-msgstr "Abstand vom Objekt"
-
-#: src/libslic3r/PrintConfig.cpp:1680
-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 ""
-"Distanz zwischen Schürze und Objekt.  Auf Null stellen um die Schürze an das "
-"Objekt zu verbinden und einen Rand für bessere Haftung zu generieren."
-
-#: src/libslic3r/PrintConfig.cpp:1688
-msgid "Skirt height"
-msgstr "Schürzenhöhe"
-
-#: src/libslic3r/PrintConfig.cpp:1689
-msgid ""
-"Height of skirt expressed in layers. Set this to a tall value to use skirt "
-"as a shield against drafts."
-msgstr ""
-"Höhe der Schürze in Schichten.  Eine hohe Schürze kann gegen Zugluft "
-"schützen."
-
-#: src/libslic3r/PrintConfig.cpp:1697
-msgid "Loops (minimum)"
-msgstr "Schleifen (minimal)"
-
-#: src/libslic3r/PrintConfig.cpp:1698
-msgid "Skirt Loops"
-msgstr "Schleifen für die Schürze"
-
-#: src/libslic3r/PrintConfig.cpp:1699
-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 ""
-"Anzahl der Schleifen für die Schürze. Wenn die Option Minimale "
-"Extrusionslänge gesetzt ist, kann die Anzahl der Schleifen größer sein als "
-"die hier konfigurierte. Setzen Sie diesen Wert auf Null, um die Schürze "
-"komplett zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:1708
-msgid "Slow down if layer print time is below"
-msgstr "Langsamer drucken wenn die Schichtdruckzeit geringer ist als"
-
-#: src/libslic3r/PrintConfig.cpp:1709
-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 ""
-"Wenn die Druckzeit der Ebene unter dieser Anzahl von Sekunden liegt, wird "
-"die Geschwindigkeit des Druckvorgangs verringert, um die Zeitdauer auf "
-"diesen Wert zu verlängern."
-
-#: src/libslic3r/PrintConfig.cpp:1720
-msgid "Small perimeters"
-msgstr "Dünne Aussenschichten"
-
-#: src/libslic3r/PrintConfig.cpp:1722
-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 ""
-"Diese separate Einstellung wirkt sich auf die Geschwindigkeit von "
-"Aussenschichten mit einem Radius <= 6,5 mm (üblicherweise Bohrungen) aus. "
-"Als Prozentwert eingegeben (z.B. 80%), wird sie ausgehend von der obigen "
-"Geschwindigkeitseinstellung für Aussenschichten berechnet. Für eine "
-"automatische Berechnung setzen Sie dies auf Null."
-
-#: src/libslic3r/PrintConfig.cpp:1732
-msgid "Solid infill threshold area"
-msgstr "Massives Infill Flächen Schwellwert"
-
-#: src/libslic3r/PrintConfig.cpp:1734
-msgid ""
-"Force solid infill for regions having a smaller area than the specified "
-"threshold."
-msgstr ""
-"Feste Füllung für Bereiche, die eine kleinere Fläche als die angegebene "
-"Schwelle aufweisen."
-
-#: src/libslic3r/PrintConfig.cpp:1735
-msgid "mm²"
-msgstr "mm²"
-
-#: src/libslic3r/PrintConfig.cpp:1742
-msgid "Solid infill extruder"
-msgstr "Massives Infill Extruder"
-
-#: src/libslic3r/PrintConfig.cpp:1744
-msgid "The extruder to use when printing solid infill."
-msgstr "Der Extruder der beim Drucken von solidem Infill benutzt werden soll."
-
-#: src/libslic3r/PrintConfig.cpp:1751
-msgid "Solid infill every"
-msgstr "Massives Infill alle"
-
-#: src/libslic3r/PrintConfig.cpp:1753
-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."
-msgstr ""
-"Diese Einstellung erzwingt eine stabile Schicht nach einer vorgegebenen "
-"Anzahl von Schichten. Null deaktiviert diese Einstellung. Sie können jeden "
-"Wert eingeben (z.B. 9999); Slic3r wird automatisch die grösstmögliche Anzahl "
-"von Schichten wählen, die in Abhängigkeit von Düsendurchmesser und "
-"Schichthöhe kombiniert werden können."
-
-#: src/libslic3r/PrintConfig.cpp:1766
-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."
-msgstr ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"für den Infill bei stabilen Flächen anzugeben. Falls auf Null belassen, wird "
-"die Standard-Extrusionsbreite verwendet (falls angeben), ansonsten wird der "
-"Durchmesser der Druckdüse x 1,125 verwendet. Falls als Prozentwert (z.B. "
-"90%) angegeben, wird dieser ausgehend von der Schichthöhe berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:1777
-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 stabile Bereiche (obere/untere/innenliegende "
-"waagrechte Hüllen). Sie kann als Prozentwert (z.B. 80%) der oben "
-"eingegebenen standardmässigen Infill-Geschwindigkeit angegeben werden. Für "
-"Automatik auf Null setzen."
-
-#: src/libslic3r/PrintConfig.cpp:1789
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr ""
-"Anzahl der zu erzeugenden festen Schichten auf der Ober- und Unterseite."
-
-#: src/libslic3r/PrintConfig.cpp:1796
-msgid "Spiral vase"
-msgstr "Spiralvasenmodus"
-
-#: src/libslic3r/PrintConfig.cpp:1797
-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 ""
-"Dieses Verfahren erhöht die Z-Position allmählich, während eine einfache "
-"Hülle gedruckt wird, um jeglichen sichtbaren Saum zu vermeiden. Diese Option "
-"setzt eine einzige Aussenschicht, keinen Infill, keine stabilen "
-"Deckenschichten und keine Stützen voraus. Sie können immer noch eine "
-"beliebige Anzahl von Bodenschichten sowie Schleifen für Schürzen und Rand "
-"einstellen. Die Methode funktioniert nicht, wenn mehr als ein Objekt "
-"gedruckt wird."
-
-#: src/libslic3r/PrintConfig.cpp:1806
-msgid "Temperature variation"
-msgstr "Temperaturen"
-
-#: src/libslic3r/PrintConfig.cpp:1807
-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 ""
-"Der anzuwendende Temperaturunterschied, wenn kein Extruder aktiv ist. Dies "
-"aktiviert eine \"Wegwerf-\"Schürze über die ganze Druckhöhe, auf der die "
-"Düsen periodisch gereinigt werden."
-
-#: src/libslic3r/PrintConfig.cpp:1818
-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 ""
-"Dieser Startvorgang wird am Anfang eingefügt, nachdem das Heizbett die "
-"Zieltemperatur erreicht hat und der Extruder gerade erst mit dem Aufheizen "
-"begonnen hat, und bevor der Extruder fertig aufgeheizt ist. Falls Slic3r "
-"M104 oder M190 in Ihren benutzerdefinierten Codes erkennt, werden solche "
-"Befehle nicht automatisch vorangestellt, sodass Sie die Reihenfolge der "
-"Heizbefehle und anderer benutzerdefinierter Aktionen anpassen können. "
-"Beachten Sie, dass Sie Platzhaltervariablen für alle Slic3r-Einstellungen "
-"verwenden können, sodass Sie einen \"M109 S[first_layer_temperature]\"-"
-"Befehl an beliebiger Stelle platzieren können."
-
-#: src/libslic3r/PrintConfig.cpp:1834
-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 ""
-"Dieser Startvorgang wird am Anfang nach dem G-Code für den Druckerstart "
-"eingefügt. Damit können Einstellungen für ein bestimmtes Filament "
-"übersteuert werden. Falls Slic3r M104, M109, M140 oder M190 in Ihren "
-"benutzerdefinierten Codes erkennt, werden solche Befehle nicht automatisch "
-"vorangestellt, sodass Sie die Reihenfolge der Heizbefehle und anderer "
-"benutzerdefinierter Aktionen anpassen können. Beachten Sie, dass Sie "
-"Platzhaltervariablen für alle Slic3r-Einstellungen verwenden können, sodass "
-"Sie einen \"M109 S[first_layer_temperature]\"-Befehl an beliebiger Stelle "
-"platzieren können. Falls Sie mehrere Extruder haben, wird der G-Code in der "
-"Reihenfolge der Extruder ausgeführt."
-
-#: src/libslic3r/PrintConfig.cpp:1850
-msgid "Single Extruder Multi Material"
-msgstr "Einzelner Extruder mit Multi-Material"
-
-#: src/libslic3r/PrintConfig.cpp:1851
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr "Der Drucker multiplext mehrere Filamente in einem Hotend."
-
-#: src/libslic3r/PrintConfig.cpp:1857
-msgid "Prime all printing extruders"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1858
-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:1864
-msgid "Generate support material"
-msgstr "Generiere Stützstrukturen"
-
-#: src/libslic3r/PrintConfig.cpp:1866
-msgid "Enable support material generation."
-msgstr "Aktiviert Generierung von Stützstrukturen."
-
-#: src/libslic3r/PrintConfig.cpp:1871
-msgid "Auto generated supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1873
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1880
-msgid "XY separation between an object and its support"
-msgstr "XY-Abstand zwischen einem Objekt und seinen Stützen"
-
-#: src/libslic3r/PrintConfig.cpp:1882
-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 ""
-"XY-Abstand zwischen einem Objekt und seinen Stützen. Falls in Prozenten "
-"angegeben (z.B. 50%), wird der Abstand von der Breite der Aussenschicht "
-"ausgehend berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:1893
-msgid "Pattern angle"
-msgstr "Muster Winkel"
-
-#: src/libslic3r/PrintConfig.cpp:1895
-msgid ""
-"Use this setting to rotate the support material pattern on the horizontal "
-"plane."
-msgstr ""
-"Verwenden Sie diese Einstellung, um das Muster für das Stützmaterial auf der "
-"horizontalen Ebene zu drehen."
-
-#: src/libslic3r/PrintConfig.cpp:1906
-msgid ""
-"Only create support if it lies on a build plate. Don't create support on a "
-"print."
-msgstr ""
-"Nur dann Stützen schaffen, wenn sie auf der Druckplattform aufbauen. "
-"Erstellt keine Stützstrukturen, die auf dem Ausdruck gründen würden."
-
-#: src/libslic3r/PrintConfig.cpp:1913
-msgid "Contact Z distance"
-msgstr "Kontakt Z-Abstand"
-
-#: src/libslic3r/PrintConfig.cpp:1915
-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 ""
-"Der vertikale Abstand zwischen Objekt und Trägermaterialschnittstelle. Wenn "
-"Sie diesen Wert auf 0 setzen, wird Slic3r auch verhindern, dass Bridge-Flow "
-"und -Geschwindigkeit für die erste Objektschicht verwendet werden."
-
-#: src/libslic3r/PrintConfig.cpp:1923
-msgid "soluble"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1924
-msgid "detachable"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1929
-msgid "Enforce support for the first"
-msgstr "Erzwinge Stützstrukturen bei den ersten"
-
-#: src/libslic3r/PrintConfig.cpp:1931
-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 ""
-"Generiere Stützmaterial für die angegebene Anzahl von Schichten, die von "
-"unten gezählt werden, unabhängig davon, ob normales Stützmaterial aktiviert "
-"ist oder nicht und unabhängig von einer Winkelschwelle. Dies ist nützlich, "
-"um die Haftung von Objekten mit einem sehr dünnen oder schlechten Standfuß "
-"auf der Bauplatte zu erhöhen."
-
-#: src/libslic3r/PrintConfig.cpp:1937
-msgid "Enforce support for the first n layers"
-msgstr "Erzwinge Stützmaterial bei den ersten n Schichten"
-
-#: src/libslic3r/PrintConfig.cpp:1943
-msgid "Support material/raft/skirt extruder"
-msgstr "Stützmaterial/Raft/Schürzen Extruder"
-
-#: src/libslic3r/PrintConfig.cpp:1945
-msgid ""
-"The extruder to use when printing support material, raft and skirt (1+, 0 to "
-"use the current extruder to minimize tool changes)."
-msgstr ""
-"Der Extruder, der für den Druck von Stützmaterial, Raft und Schürze "
-"verwendet wird (1+, oder Null um den aktuellen Extruder für die Minimierung "
-"von Werkzeugwechseln zu verwenden)."
-
-#: src/libslic3r/PrintConfig.cpp:1955
-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."
-msgstr ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"für das Stützmaterial anzugeben. Falls auf Null belassen, wird die Standard-"
-"Extrusionsbreite verwendet (falls angeben), ansonsten wird der Durchmesser "
-"der Druckdüse verwendet. Als Prozentwert (z.B. 90%) angegeben, wird dieser "
-"ausgehend von der Schichthöhe berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:1964
-msgid "Interface loops"
-msgstr "Kontaktschleifen"
-
-#: src/libslic3r/PrintConfig.cpp:1966
-msgid ""
-"Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr ""
-"Decken Sie die obere Kontaktschicht der Stützen mit Schleifen ab. "
-"Standardmäßig deaktiviert."
-
-#: src/libslic3r/PrintConfig.cpp:1972
-msgid "Support material/raft interface extruder"
-msgstr "Stützmaterial/Raft Schnittstellen Extruder"
-
-#: src/libslic3r/PrintConfig.cpp:1974
-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 ""
-"Der Extruder, der für den Druck von Schnittstellen zum Stützmaterial "
-"verwendet wird (1+, oder Null um den aktuellen Extruder für die Minimierung "
-"von Werkzeugwechseln zu verwenden). Dies betrifft auch den Raft."
-
-#: src/libslic3r/PrintConfig.cpp:1982
-msgid "Interface layers"
-msgstr "Schnittstellen Schichten"
-
-#: src/libslic3r/PrintConfig.cpp:1984
-msgid ""
-"Number of interface layers to insert between the object(s) and support "
-"material."
-msgstr ""
-"Anzahl der Schnittstellenschichten, die zwischen Objekt(en) und "
-"Trägermaterial eingefügt werden sollen."
-
-#: src/libslic3r/PrintConfig.cpp:1992
-msgid "Interface pattern spacing"
-msgstr "Schnittstellenmuster Abstand"
-
-#: src/libslic3r/PrintConfig.cpp:1994
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr ""
-"Abstand zwischen den Schnittstellenlinien. Auf Null stellen, um ein solides "
-"Interface zu erhalten."
-
-#: src/libslic3r/PrintConfig.cpp:2004
-msgid ""
-"Speed for printing support material interface layers. If expressed as "
-"percentage (for example 50%) it will be calculated over support material "
-"speed."
-msgstr ""
-"Geschwindigkeit für den Druck von Trägermaterial-Schnittstellenschichten. "
-"Wenn es als Prozentsatz (z.B. 50%) ausgedrückt wird, wird es über die "
-"Geschwindigkeit des Trägermaterials berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:2013
-msgid "Pattern"
-msgstr "Muster"
-
-#: src/libslic3r/PrintConfig.cpp:2015
-msgid "Pattern used to generate support material."
-msgstr "Unterstützungsmaterialmuster."
-
-#: src/libslic3r/PrintConfig.cpp:2022
-msgid "Rectilinear grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2028
-msgid "Pattern spacing"
-msgstr "Muster Abstand"
-
-#: src/libslic3r/PrintConfig.cpp:2030
-msgid "Spacing between support material lines."
-msgstr "Abstand zwischen Stützmateriallinien."
-
-#: src/libslic3r/PrintConfig.cpp:2040
-msgid "Speed for printing support material."
-msgstr "Druckgeschwindigkeit des Stützmaterials."
-
-#: src/libslic3r/PrintConfig.cpp:2047
-msgid "Synchronize with object layers"
-msgstr "Mit Objektschichten synchronisieren"
-
-#: src/libslic3r/PrintConfig.cpp:2049
-msgid ""
-"Synchronize support layers with the object print layers. This is useful with "
-"multi-material printers, where the extruder switch is expensive."
-msgstr ""
-"Stützschichten mit den Druckschichten des Objekts synchronisieren. Dies ist "
-"nützlich bei Multi-Material-Druckern, bei denen der Wechsel des Extruders "
-"kostenaufwendig ist."
-
-#: src/libslic3r/PrintConfig.cpp:2056
-msgid "Overhang threshold"
-msgstr "Ãœberhangsschwellwert"
-
-#: src/libslic3r/PrintConfig.cpp:2058
-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 ""
-"Für Überhänge, deren Neigungswinkel (90° = vertikal) oberhalb der "
-"vorgegebenen Schwelle liegt, wird kein Stützmaterial erzeugt. Mit anderen "
-"Worten, dieser Wert stellt die größte horizontale Steigung (gemessen von der "
-"horizontalen Ebene) dar, die Sie ohne Trägermaterial drucken können. Für die "
-"automatische Erkennung auf Null setzen (empfohlen)."
-
-#: src/libslic3r/PrintConfig.cpp:2071
-msgid "With sheath around the support"
-msgstr "Mit Umhüllung der Stützen"
-
-#: src/libslic3r/PrintConfig.cpp:2073
-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 ""
-"Fügen Sie eine Sheath (eine einzelne Druckkontur) um die Basisschicht herum "
-"hinzu. Das macht das Stützmaterial zuverlässiger, aber auch schwieriger zu "
-"entfernen."
-
-#: src/libslic3r/PrintConfig.cpp:2081
-msgid ""
-"Extruder temperature for layers after the first one. Set this to zero to "
-"disable temperature control commands in the output."
-msgstr ""
-"Extrudertemperatur für Schichten nach der ersten Schicht. Setzen Sie diesen "
-"Wert auf Null, um die Temperaturregelbefehle im Ausgabedatei zu deaktivieren."
-
-#: src/libslic3r/PrintConfig.cpp:2084
-msgid "Temperature"
-msgstr "Temperatur"
-
-#: src/libslic3r/PrintConfig.cpp:2090
-msgid "Detect thin walls"
-msgstr "Dünne Wände erkennen"
-
-#: src/libslic3r/PrintConfig.cpp:2092
-msgid ""
-"Detect single-width walls (parts where two extrusions don't fit and we need "
-"to collapse them into a single trace)."
-msgstr ""
-"Erkennen von Wänden mit einfacher Breite (Teile, bei denen zwei Extrusionen "
-"nicht passen und wir sie in eine einzige Druckspur zusammenfassen müssen)."
-
-#: src/libslic3r/PrintConfig.cpp:2099
-msgid "Threads"
-msgstr "Threads"
-
-#: src/libslic3r/PrintConfig.cpp:2100
-msgid ""
-"Threads are used to parallelize long-running tasks. Optimal threads number "
-"is slightly above the number of available cores/processors."
-msgstr ""
-"Threads werden benutzt, um mehrere zeitaufwendige Berechnungen gleichzeitig "
-"auszuführen. Die optimale Anzahl beträgt etwas mehr als die Anzahl der "
-"verfügbaren Kerne/Prozessoren."
-
-#: src/libslic3r/PrintConfig.cpp:2112
-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 ""
-"Dieser Code wird unmittelbar vor jedem Extruderwechsel eingefügt. Beachten "
-"Sie, dass Sie Platzhaltervariablen für alle Slic3r-Einstellungen sowie für "
-"[previous_extruder] und [next_extruder] verwenden können."
-
-#: src/libslic3r/PrintConfig.cpp:2125
-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."
-msgstr ""
-"Setzen Sie dies auf einen Nicht-Nullwert, um eine manuelle Extrusionsbreite "
-"für die oberen Aussenflächen anzugeben. Dünnere Extrusionsbreiten sind "
-"vorteilhaft, um Engstellen auszufüllen und um eine schönere Oberfläche zu "
-"erhalten. Falls auf Null belassen, wird die Standard-Extrusionsbreite "
-"verwendet (falls angeben), ansonsten wird der Durchmesser der Druckdüse "
-"verwendet. Falls als Prozentwert (z.B. 90%) angegeben, wird dieser ausgehend "
-"von der Schichthöhe berechnet."
-
-#: src/libslic3r/PrintConfig.cpp:2137
-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."
-msgstr ""
-"Druckgeschwindigkeit für die oberen stabilen Schichten (betrifft nur die "
-"obersten Aussenschichten und nicht deren innenliegende stabilen Schichten). "
-"Wir empfehlen, diesen Wert zu reduzieren, um eine schönere Oberfläche zu "
-"erhalten. Dies kann als Prozentwert (z.B. 80%) der oben eingegebenen "
-"Geschwindigkeit für stabiles Infill angegeben werden. Für Automatik auf Null "
-"setzen."
-
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "Decke"
-
-#: src/libslic3r/PrintConfig.cpp:2151
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "Anzahl der zu erzeugenden festen Schichten auf der Oberseite."
-
-#: src/libslic3r/PrintConfig.cpp:2153
-msgid "Top solid layers"
-msgstr "Obere stabile Schichten"
-
-#: src/libslic3r/PrintConfig.cpp:2159
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr "Bewegungsgeschwindigkeit (zwischen weit entfernten Extrusionsorten)."
-
-#: src/libslic3r/PrintConfig.cpp:2168
-msgid "Use firmware retraction"
-msgstr "Firmware-Einzug aktivieren"
-
-#: src/libslic3r/PrintConfig.cpp:2169
-msgid ""
-"This experimental setting uses G10 and G11 commands to have the firmware "
-"handle the retraction. This is only supported in recent Marlin."
-msgstr ""
-"Diese experimentelle Einstellung benutzt G10 und G11 Befehle, damit die "
-"Druckerfirmware den Einzug übernimmt. Dies wird nur von neueren Marlin-"
-"Versionen unterstützt."
-
-#: src/libslic3r/PrintConfig.cpp:2176
-msgid "Use relative E distances"
-msgstr "Relative Abstände für Extrusion benutzen"
-
-#: src/libslic3r/PrintConfig.cpp:2177
-msgid ""
-"If your firmware requires relative E values, check this, otherwise leave it "
-"unchecked. Most firmwares use absolute values."
-msgstr ""
-"Wenn Ihre Firmware relative E-Werte benötigt, diese Option aktivieren, "
-"ansonsten lassen Sie sie unmarkiert. Die meisten Firmwares verwenden "
-"absolute Werte."
-
-#: src/libslic3r/PrintConfig.cpp:2184
-msgid "Use volumetric E"
-msgstr "Volumetrisches E benutzen"
-
-#: src/libslic3r/PrintConfig.cpp:2185
-msgid ""
-"This experimental setting uses outputs the E values in cubic millimeters "
-"instead of linear millimeters. If your firmware doesn't already know "
-"filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] "
-"T0' in your start G-code in order to turn volumetric mode on and use the "
-"filament diameter associated to the filament selected in Slic3r. This is "
-"only supported in recent Marlin."
-msgstr ""
-"Diese experimentelle Einstellung generiert E-Koordinaten in Kubikmillimetern "
-"stat in linearen Millimetern.  Wenn die Firmware den Filamentdurchmesser "
-"noch nicht kennt, können Sie Befehle wie 'M200 D[filament_diameter_0] T0' in "
-"den Start-G-Code eingeben, um den volumetrischen Modus zu aktivieren und den "
-"in Slic3r angegebenen Filamentdurchmesser zu benutzen. Dies wird nur von "
-"neueren Marlin-Versionen unterstützt."
-
-#: src/libslic3r/PrintConfig.cpp:2196
-msgid "Enable variable layer height feature"
-msgstr "Variable Schichthöhen aktivieren"
-
-#: src/libslic3r/PrintConfig.cpp:2197
-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ässig aktiviert."
-
-#: src/libslic3r/PrintConfig.cpp:2204
-msgid "Wipe while retracting"
-msgstr "Während Einzug reinigen"
-
-#: src/libslic3r/PrintConfig.cpp:2205
-msgid ""
-"This flag will move the nozzle while retracting to minimize the possible "
-"blob on leaky extruders."
-msgstr ""
-"Diese Einstellung wird die Düse während dem Einzug bewegen, um mögliche "
-"Tropfen bei einem undichten Extruder zu minimieren."
-
-#: src/libslic3r/PrintConfig.cpp:2213
-msgid ""
-"Multi material printers may need to prime or purge extruders on tool "
-"changes. Extrude the excess material into the wipe tower."
-msgstr ""
-"Multi-Material-Drucker müssen eventuell Extruder bei Werkzeugwechseln vor- "
-"oder nachspülen. Extrudieren Sie das überschüssige Material in den "
-"Reinigungsturm."
-
-#: src/libslic3r/PrintConfig.cpp:2220
-msgid "Purging volumes - load/unload volumes"
-msgstr "Reinigungsvolumen - Lade-/Entladevolumen"
-
-#: src/libslic3r/PrintConfig.cpp:2221
-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 ""
-"Dieser Vektor speichert die erforderlichen Volumina für den Wechsel von/zu "
-"jedem am Reinigungsturm verwendeten Werkzeug. Diese Werte werden verwendet, "
-"um die Erstellung des vollen Reinigungsvolumens zu vereinfachen. "
-
-#: src/libslic3r/PrintConfig.cpp:2228
-msgid "Purging volumes - matrix"
-msgstr "Reinigungsvolumen - Matrix"
-
-#: src/libslic3r/PrintConfig.cpp:2229
-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 ""
-"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. "
-
-#: src/libslic3r/PrintConfig.cpp:2239
-msgid "Position X"
-msgstr "X-Position"
-
-#: src/libslic3r/PrintConfig.cpp:2240
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr "X-Koordinate der linken vorderen Ecke der Reinigungssäule"
-
-#: src/libslic3r/PrintConfig.cpp:2247
-msgid "Position Y"
-msgstr "Y-Position"
-
-#: src/libslic3r/PrintConfig.cpp:2248
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr "Y-Koordinate der linken vorderen Ecke der Reinigungssäule"
-
-#: src/libslic3r/PrintConfig.cpp:2256
-msgid "Width of a wipe tower"
-msgstr "Breite der Reinigungssäule"
-
-#: src/libslic3r/PrintConfig.cpp:2263
-msgid "Wipe tower rotation angle"
-msgstr "Rotationswinkel des Reinigungsturms"
-
-#: src/libslic3r/PrintConfig.cpp:2264
-msgid "Wipe tower rotation angle with respect to x-axis "
-msgstr "Rotationswinkel des Reinigungsturms bezogen auf die X-Achse "
-
-#: src/libslic3r/PrintConfig.cpp:2265
-msgid "degrees"
-msgstr "Grad"
-
-#: src/libslic3r/PrintConfig.cpp:2272
-msgid "Wipe into this object's infill"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2273
-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:2281
-msgid "Wipe into this object"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2282
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2289
-msgid "Maximal bridging distance"
-msgstr "Maximaler Überbrückungsabstand"
-
-#: src/libslic3r/PrintConfig.cpp:2290
-msgid "Maximal distance between supports on sparse infill sections. "
-msgstr "Maximalabstand zwischen Stützen auf spärlichen Infill-Abschnitten. "
-
-#: src/libslic3r/PrintConfig.cpp:2297
-msgid "XY Size Compensation"
-msgstr "XY-Grössenausgleich"
-
-#: src/libslic3r/PrintConfig.cpp:2299
-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 ""
-"Das Objekt wird in der XY-Ebene um den konfigurierten Wert (negativ = "
-"einwärts, positiv = auswärts) vergrößert/verkleinert. Dies kann bei der "
-"Feinabstimmung von Lochgrößen hilfreich sein."
-
-#: src/libslic3r/PrintConfig.cpp:2308
-msgid "Z offset"
-msgstr "Z-Abstand"
-
-#: src/libslic3r/PrintConfig.cpp:2309
-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)."
-msgstr ""
-"Dieser Wert wird zu allen Z-Koordinaten im ausgegebenen G-Code hinzuaddiert "
-"oder davon abgezogen. Damit kann eine fehlerhafte Z-Endanschlagsposition "
-"kompensiert werden: wenn z.B. bei Ihrem Nullwert die Druckdüse sich beim "
-"Endanschlag 0.3mm über der Druckplatte befindet, setzen Sie diesen Wert auf "
-"-0.3 (oder stellen Sie Ihren Endanschlag neu ein)."
-
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
-msgid "Display width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2374
-msgid "Width of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2380
-msgid "Display height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2381
-msgid "Height of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2387
-msgid "Number of pixels in"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2389
-msgid "Number of pixels in X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2396
-msgid "Number of pixels in Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2402
-msgid "Display orientation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2403
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2410
-msgid "Landscape"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2411
-msgid "Portrait"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
-msgid "Printer scaling correction"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
-msgid "Initial layer height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
-msgid "Initial exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
-msgid "SLA print material notes"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2459
-msgid "You can put your notes regarding the SLA print material here."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
-msgid "Default SLA material profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2487
-msgid "Generate supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2489
-msgid "Generate supports for the models"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2494
-msgid "Support head front diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2496
-msgid "Diameter of the pointing side of the head"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2503
-msgid "Support head penetration"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2505
-msgid "How much the pinhead has to penetrate the model surface"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2512
-msgid "Support head width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2514
-msgid "Width from the back sphere center to the front sphere center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2521
-msgid "Support pillar diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2523
-msgid "Diameter in mm of the support pillars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2530
-msgid "Support pillar connection mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2531
-msgid ""
-"Controls the bridge type between two neigboring 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:2540
-msgid "Zig-Zag"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2541
-msgid "Cross"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2542
-msgid "Dynamic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2546
-msgid "Pillar widening factor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2548
-msgid ""
-"Merging bridges or pillars into another pillars can increase the radius. "
-"Zero means no increase, one means full increase."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2557
-msgid "Support base diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2559
-msgid "Diameter in mm of the pillar base"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2566
-msgid "Support base height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2568
-msgid "The height of the pillar base cone"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2575
-msgid "Critical angle"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2577
-msgid "The default angle for connecting support sticks and junctions."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2584
-msgid "Max bridge length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2586
-msgid "The max length of a bridge"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2593
-msgid "Object elevation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2595
-msgid "How much the supports should lift up the supported object."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
-msgid "Use pad"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2631
-msgid "Add a pad underneath the supported model"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2636
-msgid "Pad wall thickness"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2645
-msgid "Pad wall height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2654
-msgid "Max merge distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2663
-msgid "Pad edge radius"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3023
-msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:176
-msgid "Mixed"
-msgstr "Gemischt"
-
-#: src/libslic3r/GCode/PreviewData.cpp:396
-msgid "Height (mm)"
-msgstr "Höhe (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:398
-msgid "Width (mm)"
-msgstr "Breite (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:400
-msgid "Speed (mm/s)"
-msgstr "Geschwindigkeit (mm/s)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:402
-msgid "Volumetric flow rate (mm3/s)"
-msgstr "Volumetrische Flussrate (mm3/s)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:491
-msgid "Default print color"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:495
-#, c-format
-msgid "up to %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:499
-#, c-format
-msgid "above %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:504
-#, c-format
-msgid "%.2f - %.2f mm"
-msgstr ""
diff --git a/resources/localization/en_US/Slic3rPE_en.po b/resources/localization/en_US/PrusaSlicer_en.po
similarity index 65%
rename from resources/localization/en_US/Slic3rPE_en.po
rename to resources/localization/en_US/PrusaSlicer_en.po
index ddf8ebe4c..9e5335586 100644
--- a/resources/localization/en_US/Slic3rPE_en.po
+++ b/resources/localization/en_US/PrusaSlicer_en.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: 2019-01-17 15:05+0100\n"
+"POT-Creation-Date: 2019-04-09 14:34+0200\n"
+"PO-Revision-Date: 2019-04-09 15:04+0200\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Language-Team: \n"
 "X-Generator: Poedit 2.0.8\n"
 
-#: src/slic3r/GUI/AboutDialog.cpp:33
+#: src/slic3r/GUI/AboutDialog.cpp:35
 msgid "About Slic3r"
 msgstr "About Slic3r"
 
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
+#: src/slic3r/GUI/AboutDialog.cpp:64 src/slic3r/GUI/MainFrame.cpp:52
 msgid "Version"
 msgstr "Version"
 
@@ -29,25 +29,25 @@ msgstr "Version"
 msgid "Shape"
 msgstr "Shape"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
+#: src/slic3r/GUI/BedShapeDialog.cpp:51
 msgid "Rectangular"
 msgstr "Rectangular"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
+#: src/slic3r/GUI/BedShapeDialog.cpp:55
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:118 src/slic3r/GUI/Plater.cpp:136
+#: src/slic3r/GUI/Tab.cpp:2185
 msgid "Size"
 msgstr "Size"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
+#: src/slic3r/GUI/BedShapeDialog.cpp:56
 msgid "Size in X and Y of the rectangular plate."
 msgstr "Size in X and Y of the rectangular plate."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
+#: src/slic3r/GUI/BedShapeDialog.cpp:62
 msgid "Origin"
 msgstr "Origin"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
+#: src/slic3r/GUI/BedShapeDialog.cpp:63
 msgid ""
 "Distance of the 0,0 G-code coordinate from the front left corner of the "
 "rectangle."
@@ -55,47 +55,47 @@ msgstr ""
 "Distance of the 0,0 G-code coordinate from the front left corner of the "
 "rectangle."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
+#: src/slic3r/GUI/BedShapeDialog.cpp:67
 msgid "Circular"
 msgstr "Circular"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
+#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/slic3r/GUI/ConfigWizard.cpp:111
+#: src/slic3r/GUI/ConfigWizard.cpp:544 src/slic3r/GUI/ConfigWizard.cpp:558
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:115
+#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/libslic3r/PrintConfig.cpp:59 src/libslic3r/PrintConfig.cpp:66
+#: src/libslic3r/PrintConfig.cpp:75 src/libslic3r/PrintConfig.cpp:209
+#: src/libslic3r/PrintConfig.cpp:284 src/libslic3r/PrintConfig.cpp:292
+#: src/libslic3r/PrintConfig.cpp:342 src/libslic3r/PrintConfig.cpp:352
+#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:483
+#: src/libslic3r/PrintConfig.cpp:501 src/libslic3r/PrintConfig.cpp:679
+#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1226
+#: src/libslic3r/PrintConfig.cpp:1244 src/libslic3r/PrintConfig.cpp:1262
+#: src/libslic3r/PrintConfig.cpp:1314 src/libslic3r/PrintConfig.cpp:1324
+#: src/libslic3r/PrintConfig.cpp:1445 src/libslic3r/PrintConfig.cpp:1453
+#: src/libslic3r/PrintConfig.cpp:1494 src/libslic3r/PrintConfig.cpp:1502
+#: src/libslic3r/PrintConfig.cpp:1512 src/libslic3r/PrintConfig.cpp:1520
+#: src/libslic3r/PrintConfig.cpp:1528 src/libslic3r/PrintConfig.cpp:1611
+#: src/libslic3r/PrintConfig.cpp:1827 src/libslic3r/PrintConfig.cpp:1897
+#: src/libslic3r/PrintConfig.cpp:1931 src/libslic3r/PrintConfig.cpp:2123
+#: src/libslic3r/PrintConfig.cpp:2130 src/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2167 src/libslic3r/PrintConfig.cpp:2177
+#: src/libslic3r/PrintConfig.cpp:2187 src/libslic3r/PrintConfig.cpp:2293
+#: src/libslic3r/PrintConfig.cpp:2368 src/libslic3r/PrintConfig.cpp:2377
+#: src/libslic3r/PrintConfig.cpp:2386 src/libslic3r/PrintConfig.cpp:2396
+#: src/libslic3r/PrintConfig.cpp:2440 src/libslic3r/PrintConfig.cpp:2450
+#: src/libslic3r/PrintConfig.cpp:2469 src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:2488 src/libslic3r/PrintConfig.cpp:2506
+#: src/libslic3r/PrintConfig.cpp:2521 src/libslic3r/PrintConfig.cpp:2532
+#: src/libslic3r/PrintConfig.cpp:2545 src/libslic3r/PrintConfig.cpp:2555
 msgid "mm"
 msgstr "mm"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
+#: src/slic3r/GUI/BedShapeDialog.cpp:71 src/libslic3r/PrintConfig.cpp:676
 msgid "Diameter"
 msgstr "Diameter"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
+#: src/slic3r/GUI/BedShapeDialog.cpp:72
 msgid ""
 "Diameter of the print bed. It is assumed that origin (0,0) is located in the "
 "center."
@@ -103,66 +103,66 @@ msgstr ""
 "Diameter of the print bed. It is assumed that origin (0,0) is located in the "
 "center."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
+#: src/slic3r/GUI/BedShapeDialog.cpp:76 src/slic3r/GUI/GUI_Preview.cpp:239
 #: src/libslic3r/GCode/PreviewData.cpp:175
 msgid "Custom"
 msgstr "Custom"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
+#: src/slic3r/GUI/BedShapeDialog.cpp:80
 msgid "Load shape from STL..."
 msgstr "Load shape from STL..."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
+#: src/slic3r/GUI/BedShapeDialog.cpp:126
 msgid "Settings"
 msgstr "Settings"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
+#: src/slic3r/GUI/BedShapeDialog.cpp:299
 msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
+#: src/slic3r/GUI/BedShapeDialog.cpp:316 src/slic3r/GUI/GUI_ObjectList.cpp:1252
 msgid "Error! "
 msgstr "Error! "
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
+#: src/slic3r/GUI/BedShapeDialog.cpp:325
 msgid "The selected file contains no geometry."
 msgstr "The selected file contains no geometry."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
+#: src/slic3r/GUI/BedShapeDialog.cpp:329
 msgid ""
 "The selected file contains several disjoint areas. This is not supported."
 msgstr ""
 "The selected file contains several disjoint areas. This is not supported."
 
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:507
 msgid "Bed Shape"
 msgstr "Bed Shape"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:54
+#: src/slic3r/GUI/BonjourDialog.cpp:55
 msgid "Network lookup"
 msgstr "Network lookup"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:67
+#: src/slic3r/GUI/BonjourDialog.cpp:72
 msgid "Address"
 msgstr "Address"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:68
+#: src/slic3r/GUI/BonjourDialog.cpp:73
 msgid "Hostname"
 msgstr "Hostname"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:69
+#: src/slic3r/GUI/BonjourDialog.cpp:74
 msgid "Service name"
 msgstr "Service name"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:70
+#: src/slic3r/GUI/BonjourDialog.cpp:76
 msgid "OctoPrint version"
 msgstr "OctoPrint version"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:188
+#: src/slic3r/GUI/BonjourDialog.cpp:218
 msgid "Searching for devices"
 msgstr "Searching for devices"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:195
+#: src/slic3r/GUI/BonjourDialog.cpp:225
 msgid "Finished"
 msgstr "Finished"
 
@@ -182,113 +182,118 @@ msgstr ""
 "Value was changed and is not equal to the system value or the last saved "
 "preset"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:17
 msgid "Upgrade"
 msgstr "Upgrade"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:19
 msgid "Downgrade"
 msgstr "Downgrade"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:21
 msgid "Before roll back"
 msgstr "Before roll back"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:23
 msgid "User"
 msgstr "User"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:26
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:38
 msgid "Active: "
 msgstr "Active: "
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44
 msgid "slic3r version"
 msgstr "slic3r version"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45 src/slic3r/GUI/Preset.cpp:1250
 msgid "print"
 msgstr "print"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46
 msgid "filaments"
 msgstr "filaments"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:47 src/slic3r/GUI/Preset.cpp:1254
 msgid "printer"
 msgstr "printer"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Tab.cpp:872
 msgid "vendor"
 msgstr "vendor"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
 msgid "version"
 msgstr "version"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
 msgid "min slic3r version"
 msgstr "min slic3r version"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:54
 msgid "max slic3r version"
 msgstr "max slic3r version"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57
 msgid "model"
 msgstr "model"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57
 msgid "variants"
 msgstr "variants"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69
 msgid "Incompatible with this Slic3r"
 msgstr "Incompatible with this Slic3r"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:72
 msgid "Activate"
 msgstr "Activate"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:98
 msgid "Configuration Snapshots"
 msgstr "Configuration Snapshots"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:92
+#: src/slic3r/GUI/ConfigWizard.cpp:111
 msgid "nozzle"
 msgstr "nozzle"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "(default)"
-msgstr "(default)"
+#: src/slic3r/GUI/ConfigWizard.cpp:115
+msgid "Alternate nozzles:"
+msgstr "Alternate nozzles:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
-msgstr "Select all"
+#: src/slic3r/GUI/ConfigWizard.cpp:181
+msgid "All standard"
+msgstr "All standard"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "Select none"
+#: src/slic3r/GUI/ConfigWizard.cpp:182 src/slic3r/GUI/Tab.cpp:2909
+msgid "All"
+msgstr "All"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:183 src/slic3r/GUI/Plater.cpp:414
+#: src/libslic3r/GCode/PreviewData.cpp:162
+msgid "None"
+msgstr "None"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:284
 #, c-format
 msgid "Welcome to the Slic3r %s"
 msgstr "Welcome to the Slic3r %s"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:284
 msgid "Welcome"
 msgstr "Welcome"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
+#: src/slic3r/GUI/ConfigWizard.cpp:288 src/slic3r/GUI/GUI_App.cpp:600
 #, c-format
 msgid "Run %s"
 msgstr "Run %s"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:234
+#: src/slic3r/GUI/ConfigWizard.cpp:290
 #, c-format
 msgid ""
 "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
@@ -297,7 +302,7 @@ msgstr ""
 "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
 "configuration; just a few settings and you will be ready to print."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:238
+#: src/slic3r/GUI/ConfigWizard.cpp:294
 msgid ""
 "Remove user profiles - install from scratch (a snapshot will be taken "
 "beforehand)"
@@ -305,27 +310,40 @@ msgstr ""
 "Remove user profiles - install from scratch (a snapshot will be taken "
 "beforehand)"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr "Other vendors"
+#: src/slic3r/GUI/ConfigWizard.cpp:325
+#, c-format
+msgid "%s Family"
+msgstr "%s Family"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr "Custom setup"
+#: src/slic3r/GUI/ConfigWizard.cpp:362
+msgid "Custom Printer Setup"
+msgstr "Custom Printer Setup"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:362
+msgid "Custom Printer"
+msgstr "Custom Printer"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:364
+msgid "Define a custom printer profile"
+msgstr "Define a custom printer profile"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:366
+msgid "Custom profile name:"
+msgstr "Custom profile name:"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:390
 msgid "Automatic updates"
 msgstr "Automatic updates"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:390
 msgid "Updates"
 msgstr "Updates"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
+#: src/slic3r/GUI/ConfigWizard.cpp:398 src/slic3r/GUI/Preferences.cpp:59
 msgid "Check for application updates"
 msgstr "Check for application updates"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
+#: src/slic3r/GUI/ConfigWizard.cpp:401 src/slic3r/GUI/Preferences.cpp:61
 msgid ""
 "If enabled, Slic3r checks for new versions of Slic3r PE online. When a new "
 "version becomes available a notification is displayed at the next "
@@ -337,11 +355,11 @@ msgstr ""
 "application startup (never during program usage). This is only a "
 "notification mechanisms, no automatic installation is done."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
+#: src/slic3r/GUI/ConfigWizard.cpp:405 src/slic3r/GUI/Preferences.cpp:67
 msgid "Update built-in Presets automatically"
 msgstr "Update built-in Presets automatically"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
+#: src/slic3r/GUI/ConfigWizard.cpp:408 src/slic3r/GUI/Preferences.cpp:69
 msgid ""
 "If enabled, Slic3r downloads updates of built-in system presets in the "
 "background. These updates are downloaded into a separate temporary location. "
@@ -353,7 +371,7 @@ msgstr ""
 "When a new preset version becomes available it is offered at application "
 "startup."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:308
+#: src/slic3r/GUI/ConfigWizard.cpp:409
 msgid ""
 "Updates are never applied without user's consent and never overwrite user's "
 "customized settings."
@@ -361,7 +379,7 @@ msgstr ""
 "Updates are never applied without user's consent and never overwrite user's "
 "customized settings."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:313
+#: src/slic3r/GUI/ConfigWizard.cpp:414
 msgid ""
 "Additionally a backup snapshot of the whole configuration is created before "
 "an update is applied."
@@ -369,55 +387,55 @@ msgstr ""
 "Additionally a backup snapshot of the whole configuration is created before "
 "an update is applied."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:320
+#: src/slic3r/GUI/ConfigWizard.cpp:421
 msgid "Other Vendors"
 msgstr "Other Vendors"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:322
+#: src/slic3r/GUI/ConfigWizard.cpp:423
 msgid "Pick another vendor supported by Slic3r PE:"
 msgstr "Pick another vendor supported by Slic3r PE:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381
+#: src/slic3r/GUI/ConfigWizard.cpp:469
 msgid "Firmware Type"
 msgstr "Firmware Type"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
+#: src/slic3r/GUI/ConfigWizard.cpp:469 src/slic3r/GUI/Tab.cpp:1870
 msgid "Firmware"
 msgstr "Firmware"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:385
+#: src/slic3r/GUI/ConfigWizard.cpp:473
 msgid "Choose the type of firmware used by your printer."
 msgstr "Choose the type of firmware used by your printer."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/ConfigWizard.cpp:507
 msgid "Bed Shape and Size"
 msgstr "Bed Shape and Size"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:422
+#: src/slic3r/GUI/ConfigWizard.cpp:510
 msgid "Set the shape of your printer's bed."
 msgstr "Set the shape of your printer's bed."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:524
 msgid "Filament and Nozzle Diameters"
 msgstr "Filament and Nozzle Diameters"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:524
 msgid "Print Diameters"
 msgstr "Print Diameters"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:452
+#: src/slic3r/GUI/ConfigWizard.cpp:540
 msgid "Enter the diameter of your printer's hot end nozzle."
 msgstr "Enter the diameter of your printer's hot end nozzle."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:455
+#: src/slic3r/GUI/ConfigWizard.cpp:543
 msgid "Nozzle Diameter:"
 msgstr "Nozzle Diameter:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:465
+#: src/slic3r/GUI/ConfigWizard.cpp:553
 msgid "Enter the diameter of your filament."
 msgstr "Enter the diameter of your filament."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:466
+#: src/slic3r/GUI/ConfigWizard.cpp:554
 msgid ""
 "Good precision is required, so use a caliper and do multiple measurements "
 "along the filament, then compute the average."
@@ -425,35 +443,35 @@ msgstr ""
 "Good precision is required, so use a caliper and do multiple measurements "
 "along the filament, then compute the average."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:469
+#: src/slic3r/GUI/ConfigWizard.cpp:557
 msgid "Filament Diameter:"
 msgstr "Filament Diameter:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:575
 msgid "Extruder and Bed Temperatures"
 msgstr "Extruder and Bed Temperatures"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:575
 msgid "Temperatures"
 msgstr "Temperatures"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:503
+#: src/slic3r/GUI/ConfigWizard.cpp:591
 msgid "Enter the temperature needed for extruding your filament."
 msgstr "Enter the temperature needed for extruding your filament."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:504
+#: src/slic3r/GUI/ConfigWizard.cpp:592
 msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
 msgstr "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:507
+#: src/slic3r/GUI/ConfigWizard.cpp:595
 msgid "Extrusion Temperature:"
 msgstr "Extrusion Temperature:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
+#: src/slic3r/GUI/ConfigWizard.cpp:596 src/slic3r/GUI/ConfigWizard.cpp:610
 msgid "°C"
 msgstr "°C"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:517
+#: src/slic3r/GUI/ConfigWizard.cpp:605
 msgid ""
 "Enter the bed temperature needed for getting your filament to stick to your "
 "heated bed."
@@ -461,7 +479,7 @@ msgstr ""
 "Enter the bed temperature needed for getting your filament to stick to your "
 "heated bed."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:518
+#: src/slic3r/GUI/ConfigWizard.cpp:606
 msgid ""
 "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
 "no heated bed."
@@ -469,64 +487,78 @@ msgstr ""
 "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
 "no heated bed."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:521
+#: src/slic3r/GUI/ConfigWizard.cpp:609
 msgid "Bed Temperature:"
 msgstr "Bed Temperature:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:833
+#: src/slic3r/GUI/ConfigWizard.cpp:1001
+msgid "Select all standard printers"
+msgstr "Select all standard printers"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1004
 msgid "< &Back"
 msgstr "< &Back"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:834
+#: src/slic3r/GUI/ConfigWizard.cpp:1005
 msgid "&Next >"
 msgstr "&Next >"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:835
+#: src/slic3r/GUI/ConfigWizard.cpp:1006
 msgid "&Finish"
 msgstr "&Finish"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:906
+#: src/slic3r/GUI/ConfigWizard.cpp:1007 src/slic3r/GUI/FirmwareDialog.cpp:142
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:37
+#: src/slic3r/GUI/ProgressStatusBar.cpp:28
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1021
+msgid "Prusa FFF Technology Printers"
+msgstr "Prusa FFF Technology Printers"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1024
+msgid "Prusa MSLA Technology Printers"
+msgstr "Prusa MSLA Technology Printers"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1111
 msgid "Configuration Wizard"
 msgstr "Configuration Wizard"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:907
+#: src/slic3r/GUI/ConfigWizard.cpp:1112
 msgid "Configuration &Wizard"
 msgstr "Configuration &Wizard"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:909
+#: src/slic3r/GUI/ConfigWizard.cpp:1114
 msgid "Configuration Assistant"
 msgstr "Configuration Assistant"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:910
+#: src/slic3r/GUI/ConfigWizard.cpp:1115
 msgid "Configuration &Assistant"
 msgstr "Configuration &Assistant"
 
-#: src/slic3r/GUI/Field.cpp:109
+#: src/slic3r/GUI/Field.cpp:112
 msgid "default value"
 msgstr "default value"
 
-#: src/slic3r/GUI/Field.cpp:112
+#: src/slic3r/GUI/Field.cpp:115
 msgid "parameter name"
 msgstr "parameter name"
 
-#: src/slic3r/GUI/Field.cpp:140
+#: src/slic3r/GUI/Field.cpp:143
 #, c-format
 msgid "%s doesn't support percentage"
 msgstr "%s doesn't support percentage"
 
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
-msgstr ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
+#: src/slic3r/GUI/Field.cpp:157 src/slic3r/GUI/Field.cpp:180
+msgid "Invalid numeric input."
+msgstr "Invalid numeric input."
 
-#: src/slic3r/GUI/Field.cpp:153
+#: src/slic3r/GUI/Field.cpp:162
 msgid "Input value is out of range"
 msgstr "Input value is out of range"
 
-#: src/slic3r/GUI/Field.cpp:176
+#: src/slic3r/GUI/Field.cpp:188
 #, c-format
 msgid ""
 "Do you mean %d%% instead of %d %s?\n"
@@ -537,40 +569,35 @@ msgstr ""
 "Select YES if you want to change this value to %d%%, \n"
 "or NO if you are sure that %d %s is a correct value."
 
-#: src/slic3r/GUI/Field.cpp:179
+#: src/slic3r/GUI/Field.cpp:191
 msgid "Parameter validation"
 msgstr "Parameter validation"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
+#: src/slic3r/GUI/FirmwareDialog.cpp:141
 msgid "Flash!"
 msgstr "Flash!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr "Cancel"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
+#: src/slic3r/GUI/FirmwareDialog.cpp:143
 msgid "Flashing in progress. Please do not disconnect the printer!"
 msgstr "Flashing in progress. Please do not disconnect the printer!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
+#: src/slic3r/GUI/FirmwareDialog.cpp:187
+msgid "Flashing failed: "
+msgstr "Flashing failed: "
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:268
 msgid "Flashing succeeded!"
 msgstr "Flashing succeeded!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
+#: src/slic3r/GUI/FirmwareDialog.cpp:269
 msgid "Flashing failed. Please see the avrdude log below."
 msgstr "Flashing failed. Please see the avrdude log below."
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
+#: src/slic3r/GUI/FirmwareDialog.cpp:270
 msgid "Flashing cancelled."
 msgstr "Flashing cancelled."
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr "Flashing failed: %s"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
+#: src/slic3r/GUI/FirmwareDialog.cpp:308
 #, c-format
 msgid ""
 "This firmware hex file does not match the printer model.\n"
@@ -587,60 +614,81 @@ msgstr ""
 "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."
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
+#: src/slic3r/GUI/FirmwareDialog.cpp:395 src/slic3r/GUI/FirmwareDialog.cpp:431
+#, c-format
 msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
+"Multiple %s devices found. Please only connect one at a time for flashing."
 msgstr ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
+"Multiple %s devices found. Please only connect one at a time for flashing."
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
-msgstr "The device could not have been found"
+#: src/slic3r/GUI/FirmwareDialog.cpp:412
+#, 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 ""
+"The %s device was not found.\n"
+"If the device is connected, please press the Reset button next to the USB "
+"connector ..."
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
+#: src/slic3r/GUI/FirmwareDialog.cpp:525
+#, c-format
+msgid "The %s device could not have been found"
+msgstr "The %s device could not have been found"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:603
 #, c-format
 msgid "Error accessing port at %s: %s"
 msgstr "Error accessing port at %s: %s"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
+#: src/slic3r/GUI/FirmwareDialog.cpp:605
+#, c-format
+msgid "Error: %s"
+msgstr "Error: %s"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:735
 msgid "Firmware flasher"
 msgstr "Firmware flasher"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
+#: src/slic3r/GUI/FirmwareDialog.cpp:762
 msgid "Firmware image:"
 msgstr "Firmware image:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
+#: src/slic3r/GUI/FirmwareDialog.cpp:766
 msgid "Serial port:"
 msgstr "Serial port:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
+#: src/slic3r/GUI/FirmwareDialog.cpp:768
 msgid "Autodetected"
 msgstr "Autodetected"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
+#: src/slic3r/GUI/FirmwareDialog.cpp:769
 msgid "Rescan"
 msgstr "Rescan"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
+#: src/slic3r/GUI/FirmwareDialog.cpp:776
 msgid "Progress:"
 msgstr "Progress:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
+#: src/slic3r/GUI/FirmwareDialog.cpp:779
 msgid "Status:"
 msgstr "Status:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
+#: src/slic3r/GUI/FirmwareDialog.cpp:780
 msgid "Ready"
 msgstr "Ready"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr "Advanced: avrdude output log"
+#: src/slic3r/GUI/FirmwareDialog.cpp:800
+msgid "Advanced: Output log"
+msgstr "Advanced: Output log"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
+#: src/slic3r/GUI/FirmwareDialog.cpp:811
+#: src/slic3r/GUI/PrintHostDialogs.cpp:161
+msgid "Close"
+msgstr "Close"
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:859
 msgid ""
 "Are you sure you want to cancel firmware flashing?\n"
 "This could leave your printer in an unusable state!"
@@ -648,158 +696,251 @@ msgstr ""
 "Are you sure you want to cancel firmware flashing?\n"
 "This could leave your printer in an unusable state!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
+#: src/slic3r/GUI/FirmwareDialog.cpp:860
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
+#: src/slic3r/GUI/FirmwareDialog.cpp:863
 msgid "Cancelling..."
 msgstr "Cancelling..."
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
+#: src/slic3r/GUI/GLCanvas3D.cpp:709
 msgid "Detected object outside print volume"
 msgstr "Detected object outside print volume"
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
+#: src/slic3r/GUI/GLCanvas3D.cpp:710
 msgid "Detected toolpath outside print volume"
 msgstr "Detected toolpath outside print volume"
 
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "Rotate"
+#: src/slic3r/GUI/GLCanvas3D.cpp:711
+msgid "Some objects are not visible when editing supports"
+msgstr "Some objects are not visible when editing supports"
 
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
-msgstr "Rotation (deg)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:713
+msgid ""
+"Detected object outside print volume\n"
+"Resolve a clash to continue slicing/export process correctly"
+msgstr ""
+"Detected object outside print volume\n"
+"Resolve a clash to continue slicing/export process correctly"
 
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "Scale"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
-msgstr "Scale (%)"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr "Move"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr "Position (mm)"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr "Displacement (mm)"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr "Place on face"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr "Left mouse click - add point"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr "Right mouse click - remove point"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr "Generate points automatically"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr "Remove all points"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr "SLA Support Points"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:35
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:195
 msgid "Rotate lower part upwards"
 msgstr "Rotate lower part upwards"
 
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:36
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:198
 msgid "Perform cut"
 msgstr "Perform cut"
 
-#: src/slic3r/GUI/GLGizmo.cpp:2276
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:43
 msgid "Cut object:"
 msgstr "Cut object:"
 
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:88
+msgid "Cut [C]"
+msgstr "Cut [C]"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:188 src/libslic3r/PrintConfig.cpp:3006
 msgid "Cut"
 msgstr "Cut"
 
-#: src/slic3r/GUI/GLGizmo.cpp:2466
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:193
 msgid "Keep upper part"
 msgstr "Keep upper part"
 
-#: src/slic3r/GUI/GLGizmo.cpp:2467
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:194
 msgid "Keep lower part"
 msgstr "Keep lower part"
 
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "Notice"
+#: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:32
+msgid "Place on face [F]"
+msgstr "Place on face [F]"
 
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr "Attempt to free unreferenced scalar"
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:51
+msgid "Move [M]"
+msgstr "Move [M]"
 
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:176
+msgid "Position (mm)"
+msgstr "Position (mm)"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:176
+msgid "Displacement (mm)"
+msgstr "Displacement (mm)"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:458
+msgid "Rotate [R]"
+msgstr "Rotate [R]"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:491
+msgid "Rotation (deg)"
+msgstr "Rotation (deg)"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:51
+msgid "Scale [S]"
+msgstr "Scale [S]"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:276
+msgid "Scale (%)"
+msgstr "Scale (%)"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:597
+msgid "Left mouse click - add point"
+msgstr "Left mouse click - add point"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:598
+msgid "Right mouse click - remove point"
+msgstr "Right mouse click - remove point"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:599
+msgid "Shift + Left (+ drag) - select point(s)"
+msgstr "Shift + Left (+ drag) - select point(s)"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:606
+msgid "Head diameter: "
+msgstr "Head diameter: "
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:618
+msgid "Lock supports under new islands"
+msgstr "Lock supports under new islands"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:622
+msgid "Remove selected points"
+msgstr "Remove selected points"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:626
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:679
+msgid "Remove all points"
+msgstr "Remove all points"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:631
+msgid "Apply changes"
+msgstr "Apply changes"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:636
+msgid "Discard changes"
+msgstr "Discard changes"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:644
+msgid "Minimal points distance: "
+msgstr "Minimal points distance: "
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:655
+msgid "Support points density: "
+msgstr "Support points density: "
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:669
+msgid "Auto-generate points [A]"
+msgstr "Auto-generate points [A]"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:675
+msgid "Manual editing [M]"
+msgstr "Manual editing [M]"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:738
+msgid "SLA Support Points [L]"
+msgstr "SLA Support Points [L]"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:767
+msgid "Do you want to save your manually edited support points ?\n"
+msgstr "Do you want to save your manually edited support points ?\n"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:768
+msgid "Save changes?"
+msgstr "Save changes?"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:897
+msgid ""
+"Autogeneration will erase all manually edited points.\n"
+"\n"
+"Are you sure you want to do it?\n"
+msgstr ""
+"Autogeneration will erase all manually edited points.\n"
+"\n"
+"Are you sure you want to do it?\n"
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:899 src/slic3r/GUI/GUI.cpp:288
+#: src/slic3r/GUI/WipeTowerDialog.cpp:44 src/slic3r/GUI/WipeTowerDialog.cpp:328
 msgid "Warning"
 msgstr "Warning"
 
-#: src/slic3r/GUI/GUI_App.cpp:377
+#: src/slic3r/GUI/GUI.cpp:147 src/slic3r/GUI/Tab.cpp:2720
+msgid "It's impossible to print multi-part object(s) with SLA technology."
+msgstr "It's impossible to print multi-part object(s) with SLA technology."
+
+#: src/slic3r/GUI/GUI.cpp:148
+msgid "Please check and fix your object list."
+msgstr "Please check and fix your object list."
+
+#: src/slic3r/GUI/GUI.cpp:149 src/slic3r/GUI/GUI_App.cpp:679
+#: src/slic3r/GUI/Tab.cpp:2722
+msgid "Attention!"
+msgstr "Attention!"
+
+#: src/slic3r/GUI/GUI.cpp:282
+msgid "Notice"
+msgstr "Notice"
+
+#: src/slic3r/GUI/GUI_App.cpp:318
+msgid "Changing of an application language"
+msgstr "Changing of an application language"
+
+#: src/slic3r/GUI/GUI_App.cpp:326 src/slic3r/GUI/GUI_App.cpp:335
+msgid "Recreating"
+msgstr "Recreating"
+
+#: src/slic3r/GUI/GUI_App.cpp:339
+msgid "Loading of a current presets"
+msgstr "Loading of a current presets"
+
+#: src/slic3r/GUI/GUI_App.cpp:347
+msgid "Loading of a mode view"
+msgstr "Loading of a mode view"
+
+#: src/slic3r/GUI/GUI_App.cpp:429
 msgid "Choose one file (3MF):"
 msgstr "Choose one file (3MF):"
 
-#: src/slic3r/GUI/GUI_App.cpp:389
+#: src/slic3r/GUI/GUI_App.cpp:441
 msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
 
-#: src/slic3r/GUI/GUI_App.cpp:451
+#: src/slic3r/GUI/GUI_App.cpp:454
 msgid "Array of language names and identifiers should have the same size."
 msgstr "Array of language names and identifiers should have the same size."
 
-#: src/slic3r/GUI/GUI_App.cpp:461
+#: src/slic3r/GUI/GUI_App.cpp:464
 msgid "Select the language"
 msgstr "Select the language"
 
-#: src/slic3r/GUI/GUI_App.cpp:461
+#: src/slic3r/GUI/GUI_App.cpp:464
 msgid "Language"
 msgstr "Language"
 
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
+#: src/slic3r/GUI/GUI_App.cpp:534 src/slic3r/GUI/GUI_ObjectList.cpp:1067
+#: src/libslic3r/PrintConfig.cpp:298
 msgid "Default"
 msgstr "Default"
 
-#: src/slic3r/GUI/GUI_App.cpp:609
+#: src/slic3r/GUI/GUI_App.cpp:603
 msgid "&Configuration Snapshots"
 msgstr "&Configuration Snapshots"
 
-#: src/slic3r/GUI/GUI_App.cpp:609
+#: src/slic3r/GUI/GUI_App.cpp:603
 msgid "Inspect / activate configuration snapshots"
 msgstr "Inspect / activate configuration snapshots"
 
-#: src/slic3r/GUI/GUI_App.cpp:610
+#: src/slic3r/GUI/GUI_App.cpp:604
 msgid "Take Configuration &Snapshot"
 msgstr "Take Configuration &Snapshot"
 
-#: src/slic3r/GUI/GUI_App.cpp:610
+#: src/slic3r/GUI/GUI_App.cpp:604
 msgid "Capture a configuration snapshot"
 msgstr "Capture a configuration snapshot"
 
-#: src/slic3r/GUI/GUI_App.cpp:613
+#: src/slic3r/GUI/GUI_App.cpp:607
 msgid "&Preferences"
 msgstr "&Preferences"
 
@@ -807,7 +948,7 @@ msgstr "&Preferences"
 msgid "Application preferences"
 msgstr "Application preferences"
 
-#: src/slic3r/GUI/GUI_App.cpp:616
+#: src/slic3r/GUI/GUI_App.cpp:616 src/slic3r/GUI/wxExtensions.cpp:2446
 msgid "Simple"
 msgstr "Simple"
 
@@ -815,12 +956,14 @@ msgstr "Simple"
 msgid "Simple View Mode"
 msgstr "Simple View Mode"
 
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
+#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:73
+#: src/slic3r/GUI/Tab.cpp:977 src/slic3r/GUI/Tab.cpp:992
+#: src/slic3r/GUI/Tab.cpp:1090 src/slic3r/GUI/Tab.cpp:1093
+#: src/slic3r/GUI/Tab.cpp:1466 src/slic3r/GUI/Tab.cpp:1890
+#: src/slic3r/GUI/Tab.cpp:3347 src/slic3r/GUI/wxExtensions.cpp:2447
+#: src/libslic3r/PrintConfig.cpp:72 src/libslic3r/PrintConfig.cpp:186
+#: src/libslic3r/PrintConfig.cpp:349 src/libslic3r/PrintConfig.cpp:987
+#: src/libslic3r/PrintConfig.cpp:2173
 msgid "Advanced"
 msgstr "Advanced"
 
@@ -828,7 +971,7 @@ msgstr "Advanced"
 msgid "Advanced View Mode"
 msgstr "Advanced View Mode"
 
-#: src/slic3r/GUI/GUI_App.cpp:618
+#: src/slic3r/GUI/GUI_App.cpp:618 src/slic3r/GUI/wxExtensions.cpp:2448
 msgid "Expert"
 msgstr "Expert"
 
@@ -836,573 +979,716 @@ msgstr "Expert"
 msgid "Expert View Mode"
 msgstr "Expert View Mode"
 
-#: src/slic3r/GUI/GUI_App.cpp:620
+#: src/slic3r/GUI/GUI_App.cpp:623
 msgid "Mode"
 msgstr "Mode"
 
-#: src/slic3r/GUI/GUI_App.cpp:620
+#: src/slic3r/GUI/GUI_App.cpp:623
 msgid "Slic3r View Mode"
 msgstr "Slic3r View Mode"
 
-#: src/slic3r/GUI/GUI_App.cpp:622
+#: src/slic3r/GUI/GUI_App.cpp:625
 msgid "Change Application &Language"
 msgstr "Change Application &Language"
 
-#: src/slic3r/GUI/GUI_App.cpp:624
+#: src/slic3r/GUI/GUI_App.cpp:627
 msgid "Flash printer &firmware"
 msgstr "Flash printer &firmware"
 
-#: src/slic3r/GUI/GUI_App.cpp:624
+#: src/slic3r/GUI/GUI_App.cpp:627
 msgid "Upload a firmware image into an Arduino based printer"
 msgstr "Upload a firmware image into an Arduino based printer"
 
-#: src/slic3r/GUI/GUI_App.cpp:636
+#: src/slic3r/GUI/GUI_App.cpp:639
 msgid "Taking configuration snapshot"
 msgstr "Taking configuration snapshot"
 
-#: src/slic3r/GUI/GUI_App.cpp:636
+#: src/slic3r/GUI/GUI_App.cpp:639
 msgid "Snapshot name"
 msgstr "Snapshot name"
 
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "Application will be restarted"
+#: src/slic3r/GUI/GUI_App.cpp:676
+msgid "Application will be restarted after language change."
+msgstr "Application will be restarted after language change."
 
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "Attention!"
+#: src/slic3r/GUI/GUI_App.cpp:677
+msgid "3D-Scene will be cleaned."
+msgstr "3D-Scene will be cleaned."
 
-#: src/slic3r/GUI/GUI_App.cpp:691
+#: src/slic3r/GUI/GUI_App.cpp:678
+msgid "Please, check your changes before."
+msgstr "Please, check your changes before."
+
+#: src/slic3r/GUI/GUI_App.cpp:706
 msgid "&Configuration"
 msgstr "&Configuration"
 
-#: src/slic3r/GUI/GUI_App.cpp:711
+#: src/slic3r/GUI/GUI_App.cpp:726
 msgid "You have unsaved changes "
 msgstr "You have unsaved changes "
 
-#: src/slic3r/GUI/GUI_App.cpp:711
+#: src/slic3r/GUI/GUI_App.cpp:726
 msgid ". Discard changes and continue anyway?"
 msgstr ". Discard changes and continue anyway?"
 
-#: src/slic3r/GUI/GUI_App.cpp:712
+#: src/slic3r/GUI/GUI_App.cpp:727
 msgid "Unsaved Presets"
 msgstr "Unsaved Presets"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:28 src/slic3r/GUI/GUI_ObjectList.cpp:65
+#: src/libslic3r/PrintConfig.cpp:56 src/libslic3r/PrintConfig.cpp:149
+#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:437
+#: src/libslic3r/PrintConfig.cpp:445 src/libslic3r/PrintConfig.cpp:841
+#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1304
+#: src/libslic3r/PrintConfig.cpp:1370 src/libslic3r/PrintConfig.cpp:1551
+#: src/libslic3r/PrintConfig.cpp:1986 src/libslic3r/PrintConfig.cpp:2042
 msgid "Layers and Perimeters"
 msgstr "Layers and Perimeters"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
+#: src/slic3r/GUI/GUI_ObjectList.cpp:29 src/slic3r/GUI/GUI_ObjectList.cpp:66
+#: src/slic3r/GUI/Plater.cpp:431 src/slic3r/GUI/Tab.cpp:981
+#: src/slic3r/GUI/Tab.cpp:982 src/slic3r/GUI/Tab.cpp:1311
+#: src/libslic3r/PrintConfig.cpp:166 src/libslic3r/PrintConfig.cpp:388
+#: src/libslic3r/PrintConfig.cpp:728 src/libslic3r/PrintConfig.cpp:742
+#: src/libslic3r/PrintConfig.cpp:779 src/libslic3r/PrintConfig.cpp:932
+#: src/libslic3r/PrintConfig.cpp:942 src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:978 src/libslic3r/PrintConfig.cpp:997
+#: src/libslic3r/PrintConfig.cpp:1658 src/libslic3r/PrintConfig.cpp:1675
 msgid "Infill"
 msgstr "Infill"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
+#: src/slic3r/GUI/GUI_ObjectList.cpp:30 src/slic3r/GUI/GUI_ObjectList.cpp:67
+#: src/slic3r/GUI/GUI_Preview.cpp:236 src/slic3r/GUI/Tab.cpp:1010
+#: src/slic3r/GUI/Tab.cpp:1011 src/libslic3r/PrintConfig.cpp:333
+#: src/libslic3r/PrintConfig.cpp:1431 src/libslic3r/PrintConfig.cpp:1779
+#: src/libslic3r/PrintConfig.cpp:1785 src/libslic3r/PrintConfig.cpp:1793
+#: src/libslic3r/PrintConfig.cpp:1805 src/libslic3r/PrintConfig.cpp:1815
+#: src/libslic3r/PrintConfig.cpp:1823 src/libslic3r/PrintConfig.cpp:1838
+#: src/libslic3r/PrintConfig.cpp:1859 src/libslic3r/PrintConfig.cpp:1870
+#: src/libslic3r/PrintConfig.cpp:1886 src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1904 src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:1929 src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1947
+#: src/libslic3r/PrintConfig.cpp:1955 src/libslic3r/PrintConfig.cpp:1969
+#: src/libslic3r/GCode/PreviewData.cpp:172
 msgid "Support material"
 msgstr "Support material"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "Speed"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
+#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_ObjectList.cpp:69
+#: src/slic3r/GUI/Tab.cpp:1070 src/slic3r/GUI/Tab.cpp:1794
+#: src/libslic3r/PrintConfig.cpp:455 src/libslic3r/PrintConfig.cpp:953
+#: src/libslic3r/PrintConfig.cpp:1339 src/libslic3r/PrintConfig.cpp:1667
+#: src/libslic3r/PrintConfig.cpp:1851 src/libslic3r/PrintConfig.cpp:1877
+#: src/libslic3r/PrintConfig.cpp:2149 src/libslic3r/PrintConfig.cpp:2157
 msgid "Extruders"
 msgstr "Extruders"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
+#: src/slic3r/GUI/GUI_ObjectList.cpp:39
+msgid "Pad and Support"
+msgstr "Pad and Support"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:68 src/slic3r/GUI/GUI_Preview.cpp:215
+#: src/slic3r/GUI/Tab.cpp:1035 src/libslic3r/PrintConfig.cpp:198
+#: src/libslic3r/PrintConfig.cpp:425 src/libslic3r/PrintConfig.cpp:870
+#: src/libslic3r/PrintConfig.cpp:998 src/libslic3r/PrintConfig.cpp:1360
+#: src/libslic3r/PrintConfig.cpp:1597 src/libslic3r/PrintConfig.cpp:1646
+#: src/libslic3r/PrintConfig.cpp:1697 src/libslic3r/PrintConfig.cpp:2028
+msgid "Speed"
+msgstr "Speed"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:70 src/libslic3r/PrintConfig.cpp:415
+#: src/libslic3r/PrintConfig.cpp:522 src/libslic3r/PrintConfig.cpp:829
+#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1348
+#: src/libslic3r/PrintConfig.cpp:1687 src/libslic3r/PrintConfig.cpp:1860
+#: src/libslic3r/PrintConfig.cpp:2017
 msgid "Extrusion Width"
 msgstr "Extrusion Width"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
+#: src/slic3r/GUI/GUI_ObjectList.cpp:75 src/slic3r/GUI/Plater.cpp:410
+#: src/slic3r/GUI/Tab.cpp:3309 src/slic3r/GUI/Tab.cpp:3310
+#: src/libslic3r/PrintConfig.cpp:2359 src/libslic3r/PrintConfig.cpp:2366
+#: src/libslic3r/PrintConfig.cpp:2375 src/libslic3r/PrintConfig.cpp:2384
+#: src/libslic3r/PrintConfig.cpp:2394 src/libslic3r/PrintConfig.cpp:2420
+#: src/libslic3r/PrintConfig.cpp:2427 src/libslic3r/PrintConfig.cpp:2438
+#: src/libslic3r/PrintConfig.cpp:2448 src/libslic3r/PrintConfig.cpp:2457
+#: src/libslic3r/PrintConfig.cpp:2467 src/libslic3r/PrintConfig.cpp:2476
+#: src/libslic3r/PrintConfig.cpp:2486 src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2504
 msgid "Supports"
 msgstr "Supports"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
+#: src/slic3r/GUI/GUI_ObjectList.cpp:76 src/slic3r/GUI/Tab.cpp:3337
+#: src/slic3r/GUI/Tab.cpp:3338 src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2519 src/libslic3r/PrintConfig.cpp:2530
+#: src/libslic3r/PrintConfig.cpp:2540 src/libslic3r/PrintConfig.cpp:2553
+#: src/libslic3r/PrintConfig.cpp:2562
 msgid "Pad"
 msgstr "Pad"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
+#: src/slic3r/GUI/GUI_ObjectList.cpp:173
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:45
 msgid "Name"
 msgstr "Name"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
+#: src/slic3r/GUI/GUI_ObjectList.cpp:201
 msgid "Right button click the icon to change the object settings"
 msgstr "Right button click the icon to change the object settings"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
+#: src/slic3r/GUI/GUI_ObjectList.cpp:209
 #, c-format
 msgid "Auto-repaired (%d errors):\n"
 msgstr "Auto-repaired (%d errors):\n"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
+#: src/slic3r/GUI/GUI_ObjectList.cpp:212
 msgid "degenerate facets"
 msgstr "degenerate facets"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
+#: src/slic3r/GUI/GUI_ObjectList.cpp:213
 msgid "edges fixed"
 msgstr "edges fixed"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
+#: src/slic3r/GUI/GUI_ObjectList.cpp:214
 msgid "facets removed"
 msgstr "facets removed"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
+#: src/slic3r/GUI/GUI_ObjectList.cpp:215
 msgid "facets added"
 msgstr "facets added"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:216
 msgid "facets reversed"
 msgstr "facets reversed"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:217
 msgid "backwards edges"
 msgstr "backwards edges"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
+#: src/slic3r/GUI/GUI_ObjectList.cpp:231
 msgid "Right button click the icon to fix STL through Netfabb"
 msgstr "Right button click the icon to fix STL through Netfabb"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
+#: src/slic3r/GUI/GUI_ObjectList.cpp:278 src/slic3r/GUI/Tab.cpp:1430
+#: src/libslic3r/PrintConfig.cpp:454
 msgid "Extruder"
 msgstr "Extruder"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
+#: src/slic3r/GUI/GUI_ObjectList.cpp:683 src/slic3r/GUI/GUI_ObjectList.cpp:963
+#: src/slic3r/GUI/GUI_ObjectList.cpp:969 src/slic3r/GUI/GUI_ObjectList.cpp:1199
+#, c-format
+msgid "Quick Add Settings (%s)"
+msgstr "Quick Add Settings (%s)"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:746
 msgid "Select showing settings"
 msgstr "Select showing settings"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:874
 msgid "Load"
 msgstr "Load"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879 src/slic3r/GUI/GUI_ObjectList.cpp:911
+#: src/slic3r/GUI/GUI_ObjectList.cpp:914
 msgid "Box"
 msgstr "Box"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Cylinder"
 msgstr "Cylinder"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Sphere"
 msgstr "Sphere"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Slab"
 msgstr "Slab"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
+#: src/slic3r/GUI/GUI_ObjectList.cpp:890 src/slic3r/GUI/GUI_ObjectList.cpp:906
 msgid "Add part"
 msgstr "Add part"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
+#: src/slic3r/GUI/GUI_ObjectList.cpp:891
 msgid "Add modifier"
 msgstr "Add modifier"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
+#: src/slic3r/GUI/GUI_ObjectList.cpp:892 src/slic3r/GUI/GUI_ObjectList.cpp:910
 msgid "Add support enforcer"
 msgstr "Add support enforcer"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
+#: src/slic3r/GUI/GUI_ObjectList.cpp:893 src/slic3r/GUI/GUI_ObjectList.cpp:913
 msgid "Add support blocker"
 msgstr "Add support blocker"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
+#: src/slic3r/GUI/GUI_ObjectList.cpp:934
 msgid "Split to parts"
 msgstr "Split to parts"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
+#: src/slic3r/GUI/GUI_ObjectList.cpp:942
 msgid "Add settings"
 msgstr "Add settings"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
 msgid "Change type"
 msgstr "Change type"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1016
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1153
+msgid "Set as a Separated Object"
+msgstr "Set as a Separated Object"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1024
+msgid "Rename"
+msgstr "Rename"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1034
+msgid "Fix through the Netfabb"
+msgstr "Fix through the Netfabb"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1041 src/slic3r/GUI/Plater.cpp:2861
+msgid "Export as STL"
+msgstr "Export as STL"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1048
+msgid "Change extruder"
+msgstr "Change extruder"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1073
+msgid "Select new extruder for the object/part"
+msgstr "Select new extruder for the object/part"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1079 src/slic3r/GUI/Plater.cpp:2825
+#: src/slic3r/GUI/Plater.cpp:2843 src/slic3r/GUI/Tab.cpp:2860
+msgid "Delete"
+msgstr "Delete"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1153
+msgid "Set as a Separated Objects"
+msgstr "Set as a Separated Objects"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1374
+msgid "Generic"
+msgstr "Generic"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1516
 msgid "You can't delete the last solid part from object."
 msgstr "You can't delete the last solid part from object."
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1533
 msgid "You can't delete the last intance from object."
 msgstr "You can't delete the last intance from object."
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1560 src/slic3r/GUI/Plater.cpp:2219
 msgid ""
 "The selected object couldn't be split because it contains only one part."
 msgstr ""
 "The selected object couldn't be split because it contains only one part."
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1676
 msgid "Group manipulation"
 msgstr "Group manipulation"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1688
 msgid "Object manipulation"
 msgstr "Object manipulation"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1698
 msgid "Object Settings to modify"
 msgstr "Object Settings to modify"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1702
 msgid "Part Settings to modify"
 msgstr "Part Settings to modify"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1711
 msgid "Part manipulation"
 msgstr "Part manipulation"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1717
 msgid "Instance manipulation"
 msgstr "Instance manipulation"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2240
+msgid "Object or Instance"
+msgstr "Object or Instance"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2240
+msgid "Part"
+msgstr "Part"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2242
+msgid "Unsupported selection"
+msgstr "Unsupported selection"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2243
+#, c-format
+msgid "You started your selection with %s Item."
+msgstr "You started your selection with %s Item."
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2244
+#, c-format
+msgid "In this mode you can select only other %s Items%s"
+msgstr "In this mode you can select only other %s Items%s"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2247
+msgid "of a current Object"
+msgstr "of a current Object"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2252
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2325 src/slic3r/GUI/Plater.cpp:117
+msgid "Info"
+msgstr "Info"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2366
 msgid "You can't change a type of the last solid part of the object."
 msgstr "You can't change a type of the last solid part of the object."
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2373
 msgid "Select type of part"
 msgstr "Select type of part"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
+msgid "Enter new name"
+msgstr "Enter new name"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
+msgid "Renaming"
+msgstr "Renaming"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2554
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2632 src/slic3r/GUI/Tab.cpp:3191
+#: src/slic3r/GUI/Tab.cpp:3195
 msgid "The supplied name is not valid;"
 msgstr "The supplied name is not valid;"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2555
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2633 src/slic3r/GUI/Tab.cpp:3192
 msgid "the following characters are not allowed:"
 msgstr "the following characters are not allowed:"
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2653
+msgid "Set extruder for selected items"
+msgstr "Set extruder for selected items"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2654
+msgid "Select extruder number for selected objects and/or parts"
+msgstr "Select extruder number for selected objects and/or parts"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2667
+msgid "Select extruder number:"
+msgstr "Select extruder number:"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2668
+msgid "This extruder will be set for selected items"
+msgstr "This extruder will be set for selected items"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:25
 msgid "Object Manipulation"
 msgstr "Object Manipulation"
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:47
 msgid "Object name"
 msgstr "Object name"
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:115
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:160
 msgid "Position"
 msgstr "Position"
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:116
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:161
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:117
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:201
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:221
+#: src/libslic3r/PrintConfig.cpp:3070
+msgid "Scale"
+msgstr "Scale"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:162
 msgid "Scale factors"
 msgstr "Scale factors"
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:200
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:220
+#: src/libslic3r/PrintConfig.cpp:3055
+msgid "Rotate"
+msgstr "Rotate"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:219
 msgid "Translate"
 msgstr "Translate"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:235
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:58
+msgid "Additional Settings"
+msgstr "Additional Settings"
+
+#: src/slic3r/GUI/GUI_Preview.cpp:209
 msgid "View"
 msgstr "View"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:212 src/slic3r/GUI/GUI_Preview.cpp:525
 #: src/libslic3r/GCode/PreviewData.cpp:394
 msgid "Feature type"
 msgstr "Feature type"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
+#: src/slic3r/GUI/GUI_Preview.cpp:213 src/libslic3r/PrintConfig.cpp:467
 msgid "Height"
 msgstr "Height"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
+#: src/slic3r/GUI/GUI_Preview.cpp:214 src/libslic3r/PrintConfig.cpp:2135
 msgid "Width"
 msgstr "Width"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:242
+#: src/slic3r/GUI/GUI_Preview.cpp:216
 msgid "Volumetric flow rate"
 msgstr "Volumetric flow rate"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
+#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/GUI_Preview.cpp:315
+#: src/slic3r/GUI/GUI_Preview.cpp:469 src/slic3r/GUI/GUI_Preview.cpp:525
+#: src/slic3r/GUI/GUI_Preview.cpp:701 src/libslic3r/GCode/PreviewData.cpp:404
 msgid "Tool"
 msgstr "Tool"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/GUI_Preview.cpp:523
 #: src/libslic3r/GCode/PreviewData.cpp:406
 msgid "Color Print"
 msgstr "Color Print"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:247
+#: src/slic3r/GUI/GUI_Preview.cpp:221
 msgid "Show"
 msgstr "Show"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/GUI_Preview.cpp:225
 msgid "Feature types"
 msgstr "Feature types"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
+#: src/slic3r/GUI/GUI_Preview.cpp:227 src/libslic3r/GCode/PreviewData.cpp:163
 msgid "Perimeter"
 msgstr "Perimeter"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
+#: src/slic3r/GUI/GUI_Preview.cpp:228 src/libslic3r/GCode/PreviewData.cpp:164
 msgid "External perimeter"
 msgstr "External perimeter"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
+#: src/slic3r/GUI/GUI_Preview.cpp:229 src/libslic3r/GCode/PreviewData.cpp:165
 msgid "Overhang perimeter"
 msgstr "Overhang perimeter"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
+#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/GCode/PreviewData.cpp:166
 msgid "Internal infill"
 msgstr "Internal infill"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
+#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/PrintConfig.cpp:1686
+#: src/libslic3r/PrintConfig.cpp:1696 src/libslic3r/GCode/PreviewData.cpp:167
 msgid "Solid infill"
 msgstr "Solid infill"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
+#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/PrintConfig.cpp:2016
+#: src/libslic3r/PrintConfig.cpp:2027 src/libslic3r/GCode/PreviewData.cpp:168
 msgid "Top solid infill"
 msgstr "Top solid infill"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
+#: src/slic3r/GUI/GUI_Preview.cpp:233 src/libslic3r/GCode/PreviewData.cpp:169
 msgid "Bridge infill"
 msgstr "Bridge infill"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
+#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/PrintConfig.cpp:869
 #: src/libslic3r/GCode/PreviewData.cpp:170
 msgid "Gap fill"
 msgstr "Gap fill"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
+#: src/slic3r/GUI/GUI_Preview.cpp:235 src/slic3r/GUI/Tab.cpp:1001
 #: src/libslic3r/GCode/PreviewData.cpp:171
 msgid "Skirt"
 msgstr "Skirt"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
+#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/PrintConfig.cpp:1903
 #: src/libslic3r/GCode/PreviewData.cpp:173
 msgid "Support material interface"
 msgstr "Support material interface"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
+#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/Tab.cpp:1081
 #: src/libslic3r/GCode/PreviewData.cpp:174
 msgid "Wipe tower"
 msgstr "Wipe tower"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
+#: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/PrintConfig.cpp:2049
 msgid "Travel"
 msgstr "Travel"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:270
+#: src/slic3r/GUI/GUI_Preview.cpp:244
 msgid "Retractions"
 msgstr "Retractions"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:271
+#: src/slic3r/GUI/GUI_Preview.cpp:245
 msgid "Unretractions"
 msgstr "Unretractions"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:272
+#: src/slic3r/GUI/GUI_Preview.cpp:246
 msgid "Shells"
 msgstr "Shells"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:13
 msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
 msgstr "Slic3r Prusa Edition - Keyboard Shortcuts"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr "Main Shortcuts"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:100
 msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
 msgstr "Open project STL/OBJ/AMF/3MF with config, delete bed"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
 msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
 msgstr "Import STL/OBJ/AMF/3MF without config, keep bed"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
 msgid "Load Config from .ini/amf/3mf/gcode"
 msgstr "Load Config from .ini/amf/3mf/gcode"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:103 src/slic3r/GUI/Plater.cpp:725
+#: src/slic3r/GUI/Plater.cpp:3673 src/libslic3r/PrintConfig.cpp:2957
 msgid "Export G-code"
 msgstr "Export G-code"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:104
 msgid "Save project (3MF)"
 msgstr "Save project (3MF)"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
 msgid "Load Config from .ini/amf/3mf/gcode and merge"
 msgstr "Load Config from .ini/amf/3mf/gcode and merge"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
 msgid "(Re)slice"
 msgstr "(Re)slice"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
 msgid "Quick slice"
 msgstr "Quick slice"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:108 src/slic3r/GUI/MainFrame.cpp:326
 msgid "Repeat last quick slice"
 msgstr "Repeat last quick slice"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
 msgid "Select Plater Tab"
 msgstr "Select Plater Tab"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
 msgid "Quick slice and Save as"
 msgstr "Quick slice and Save as"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
 msgid "Select Print Settings Tab"
 msgstr "Select Print Settings Tab"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
 msgid "Select Filament Settings Tab"
 msgstr "Select Filament Settings Tab"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
 msgid "Select Printer Settings Tab"
 msgstr "Select Printer Settings Tab"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
 msgid "Switch to 3D"
 msgstr "Switch to 3D"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
 msgid "Switch to Preview"
 msgstr "Switch to Preview"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:116 src/slic3r/GUI/Preferences.cpp:10
 msgid "Preferences"
 msgstr "Preferences"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:117
+#: src/slic3r/GUI/PrintHostDialogs.cpp:134
 msgid "Print host upload queue"
 msgstr "Print host upload queue"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
 msgid "Camera view "
 msgstr "Camera view "
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
 msgid "Add Instance to selected object "
 msgstr "Add Instance to selected object "
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
 msgid "Remove Instance from selected object"
 msgstr "Remove Instance from selected object"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
 msgid "Show keyboard shortcuts list"
 msgstr "Show keyboard shortcuts list"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr "Switch between 3D and Preview"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
 msgid "Select multiple object/Move multiple object"
 msgstr "Select multiple object/Move multiple object"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+msgid "Main Shortcuts"
+msgstr "Main Shortcuts"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:130
 msgid "Arrange"
 msgstr "Arrange"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:131
 msgid "Select All objects"
 msgstr "Select All objects"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
 msgid "Delete selected"
 msgstr "Delete selected"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
 msgid "Delete All"
 msgstr "Delete All"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
 msgid "Gizmo move"
 msgstr "Gizmo move"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
 msgid "Gizmo scale"
 msgstr "Gizmo scale"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
 msgid "Gizmo rotate"
 msgstr "Gizmo rotate"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
 msgid "Gizmo cut"
 msgstr "Gizmo cut"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
 msgid "Gizmo Place face on bed"
 msgstr "Gizmo Place face on bed"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
 msgid "Gizmo SLA support points"
 msgstr "Gizmo SLA support points"
 
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#, no-c-format
+msgid ""
+"Press to snap by 5% in Gizmo scale\n"
+"or by 1mm in Gizmo move"
+msgstr ""
+"Press to snap by 5% in Gizmo scale\n"
+"or by 1mm in Gizmo move"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+msgid ""
+"Press to scale or rotate selected objects\n"
+"around their own center"
+msgstr ""
+"Press to scale or rotate selected objects\n"
+"around their own center"
+
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:142
 msgid "Zoom to Bed"
 msgstr "Zoom to Bed"
@@ -1431,591 +1717,637 @@ msgstr "Unselect gizmo, keep object selection"
 msgid "Plater Shortcuts"
 msgstr "Plater Shortcuts"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
 msgid "Arrow Up"
 msgstr "Arrow Up"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
 msgid "Upper Layer"
 msgstr "Upper Layer"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
 msgid "Arrow Down"
 msgstr "Arrow Down"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
 msgid "Lower Layer"
 msgstr "Lower Layer"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
 msgid "Preview Shortcuts"
 msgstr "Preview Shortcuts"
 
-#: src/slic3r/GUI/MainFrame.cpp:53
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
+msgid "Move current slider thump Up"
+msgstr "Move current slider thump Up"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+msgid "Move current slider thump Down"
+msgstr "Move current slider thump Down"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+msgid "Arrow Left"
+msgstr "Arrow Left"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+msgid "Set upper thumb to current slider thumb"
+msgstr "Set upper thumb to current slider thumb"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+msgid "Arrow Right"
+msgstr "Arrow Right"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+msgid "Set lower thumb to current slider thumb"
+msgstr "Set lower thumb to current slider thumb"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
+msgid "Add color change marker for current layer"
+msgstr "Add color change marker for current layer"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:180
+msgid "Delete color change marker for current layer"
+msgstr "Delete color change marker for current layer"
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+msgid "Layers Slider Shortcuts"
+msgstr "Layers Slider Shortcuts"
+
+#: src/slic3r/GUI/MainFrame.cpp:54
 msgid ""
 " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
 msgstr ""
 " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
 
-#: src/slic3r/GUI/MainFrame.cpp:130
+#: src/slic3r/GUI/MainFrame.cpp:160
 msgid "Plater"
 msgstr "Plater"
 
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "&Open"
+#: src/slic3r/GUI/MainFrame.cpp:273
+msgid "&Open Project"
+msgstr "&Open Project"
 
-#: src/slic3r/GUI/MainFrame.cpp:236
+#: src/slic3r/GUI/MainFrame.cpp:273
 msgid "Open a project file"
 msgstr "Open a project file"
 
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
-msgstr "&Save"
+#: src/slic3r/GUI/MainFrame.cpp:275
+msgid "&Save Project"
+msgstr "&Save Project"
 
-#: src/slic3r/GUI/MainFrame.cpp:238
+#: src/slic3r/GUI/MainFrame.cpp:275
 msgid "Save current project file"
 msgstr "Save current project file"
 
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
-msgstr "Save &as"
+#: src/slic3r/GUI/MainFrame.cpp:277
+msgid "Save Project &as"
+msgstr "Save Project &as"
 
-#: src/slic3r/GUI/MainFrame.cpp:240
+#: src/slic3r/GUI/MainFrame.cpp:277
 msgid "Save current project file as"
 msgstr "Save current project file as"
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:283
 msgid "Import STL/OBJ/AM&F/3MF"
 msgstr "Import STL/OBJ/AM&F/3MF"
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:283
 msgid "Load a model"
 msgstr "Load a model"
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:286
 msgid "Import &Config"
 msgstr "Import &Config"
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:286
 msgid "Load exported configuration file"
 msgstr "Load exported configuration file"
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:288
 msgid "Import Config from &project"
 msgstr "Import Config from &project"
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:288
 msgid "Load configuration from project file"
 msgstr "Load configuration from project file"
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:291
 msgid "Import Config &Bundle"
 msgstr "Import Config &Bundle"
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:291
 msgid "Load presets from a bundle"
 msgstr "Load presets from a bundle"
 
-#: src/slic3r/GUI/MainFrame.cpp:256
+#: src/slic3r/GUI/MainFrame.cpp:293
 msgid "&Import"
 msgstr "&Import"
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:296
 msgid "Export &G-code"
 msgstr "Export &G-code"
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:296
 msgid "Export current plate as G-code"
 msgstr "Export current plate as G-code"
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:299
 msgid "Export plate as &STL"
 msgstr "Export plate as &STL"
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:299
 msgid "Export current plate as STL"
 msgstr "Export current plate as STL"
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:301
 msgid "Export plate as &AMF"
 msgstr "Export plate as &AMF"
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:301
 msgid "Export current plate as AMF"
 msgstr "Export current plate as AMF"
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:304
 msgid "Export &Config"
 msgstr "Export &Config"
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:304
 msgid "Export current configuration to file"
 msgstr "Export current configuration to file"
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:306
 msgid "Export Config &Bundle"
 msgstr "Export Config &Bundle"
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:306
 msgid "Export all presets to file"
 msgstr "Export all presets to file"
 
-#: src/slic3r/GUI/MainFrame.cpp:271
+#: src/slic3r/GUI/MainFrame.cpp:308
 msgid "&Export"
 msgstr "&Export"
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:314
 msgid "Quick Slice"
 msgstr "Quick Slice"
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:314
 msgid "Slice a file into a G-code"
 msgstr "Slice a file into a G-code"
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:320
 msgid "Quick Slice and Save As"
 msgstr "Quick Slice and Save As"
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:320
 msgid "Slice a file into a G-code, save as"
 msgstr "Slice a file into a G-code, save as"
 
-#: src/slic3r/GUI/MainFrame.cpp:289
+#: src/slic3r/GUI/MainFrame.cpp:326
 msgid "Repeat Last Quick Slice"
 msgstr "Repeat Last Quick Slice"
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:334
 msgid "(Re)Slice &Now"
 msgstr "(Re)Slice &Now"
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:334
 msgid "Start new slicing process"
 msgstr "Start new slicing process"
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:337
 msgid "&Repair STL file"
 msgstr "&Repair STL file"
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:337
 msgid "Automatically repair an STL file"
 msgstr "Automatically repair an STL file"
 
-#: src/slic3r/GUI/MainFrame.cpp:303
+#: src/slic3r/GUI/MainFrame.cpp:340
 msgid "&Quit"
 msgstr "&Quit"
 
-#: src/slic3r/GUI/MainFrame.cpp:303
+#: src/slic3r/GUI/MainFrame.cpp:340
 msgid "Quit Slic3r"
 msgstr "Quit Slic3r"
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:374
 msgid "&Select all"
 msgstr "&Select all"
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:374
 msgid "Selects all objects"
 msgstr "Selects all objects"
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:377
 msgid "&Delete selected"
 msgstr "&Delete selected"
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:377
 msgid "Deletes the current selection"
 msgstr "Deletes the current selection"
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:379
 msgid "Delete &all"
 msgstr "Delete &all"
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:379
 msgid "Deletes all objects"
 msgstr "Deletes all objects"
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:392
 msgid "&Plater Tab"
 msgstr "&Plater Tab"
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:392
 msgid "Show the plater"
 msgstr "Show the plater"
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:399
 msgid "P&rint Settings Tab"
 msgstr "P&rint Settings Tab"
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:399
 msgid "Show the print settings"
 msgstr "Show the print settings"
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:401
 msgid "&Filament Settings Tab"
 msgstr "&Filament Settings Tab"
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:401
 msgid "Show the filament settings"
 msgstr "Show the filament settings"
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:403
 msgid "Print&er Settings Tab"
 msgstr "Print&er Settings Tab"
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:403
 msgid "Show the printer settings"
 msgstr "Show the printer settings"
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:407
 msgid "3&D"
 msgstr "3&D"
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:407
 msgid "Show the 3D editing view"
 msgstr "Show the 3D editing view"
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:409
 msgid "Pre&view"
 msgstr "Pre&view"
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:409
 msgid "Show the 3D slices preview"
 msgstr "Show the 3D slices preview"
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:430
 msgid "Print &Host Upload Queue"
 msgstr "Print &Host Upload Queue"
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:430
 msgid "Display the Print Host Upload Queue window"
 msgstr "Display the Print Host Upload Queue window"
 
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr "&Iso"
+#: src/slic3r/GUI/MainFrame.cpp:439
+msgid "Iso"
+msgstr "Iso"
 
-#: src/slic3r/GUI/MainFrame.cpp:388
+#: src/slic3r/GUI/MainFrame.cpp:439
 msgid "Iso View"
 msgstr "Iso View"
 
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr "&Top"
+#: src/slic3r/GUI/MainFrame.cpp:441
+msgid "Top"
+msgstr "Top"
 
-#: src/slic3r/GUI/MainFrame.cpp:390
+#: src/libslic3r/PrintConfig.cpp:2041
+msgctxt "Layers"
+msgid "Top"
+msgstr "Top"
+
+#: src/slic3r/GUI/MainFrame.cpp:441
 msgid "Top View"
 msgstr "Top View"
 
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr "&Bottom"
+#: src/slic3r/GUI/MainFrame.cpp:442
+msgid "Bottom"
+msgstr "Bottom"
 
-#: src/slic3r/GUI/MainFrame.cpp:391
+#: src/libslic3r/PrintConfig.cpp:148
+msgctxt "Layers"
+msgid "Bottom"
+msgstr "Bottom"
+
+#: src/slic3r/GUI/MainFrame.cpp:442
 msgid "Bottom View"
 msgstr "Bottom View"
 
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr "&Front"
+#: src/slic3r/GUI/MainFrame.cpp:443
+msgid "Front"
+msgstr "Front"
 
-#: src/slic3r/GUI/MainFrame.cpp:392
+#: src/slic3r/GUI/MainFrame.cpp:443
 msgid "Front View"
 msgstr "Front View"
 
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr "R&ear"
+#: src/slic3r/GUI/MainFrame.cpp:444 src/libslic3r/PrintConfig.cpp:1561
+msgid "Rear"
+msgstr "Rear"
 
-#: src/slic3r/GUI/MainFrame.cpp:393
+#: src/slic3r/GUI/MainFrame.cpp:444
 msgid "Rear View"
 msgstr "Rear View"
 
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr "&Left"
+#: src/slic3r/GUI/MainFrame.cpp:445
+msgid "Left"
+msgstr "Left"
 
-#: src/slic3r/GUI/MainFrame.cpp:394
+#: src/slic3r/GUI/MainFrame.cpp:445
 msgid "Left View"
 msgstr "Left View"
 
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr "&Right"
+#: src/slic3r/GUI/MainFrame.cpp:446
+msgid "Right"
+msgstr "Right"
 
-#: src/slic3r/GUI/MainFrame.cpp:395
+#: src/slic3r/GUI/MainFrame.cpp:446
 msgid "Right View"
 msgstr "Right View"
 
-#: src/slic3r/GUI/MainFrame.cpp:409
+#: src/slic3r/GUI/MainFrame.cpp:460
 msgid "Prusa 3D &Drivers"
 msgstr "Prusa 3D &Drivers"
 
-#: src/slic3r/GUI/MainFrame.cpp:409
+#: src/slic3r/GUI/MainFrame.cpp:460
 msgid "Open the Prusa3D drivers download page in your browser"
 msgstr "Open the Prusa3D drivers download page in your browser"
 
-#: src/slic3r/GUI/MainFrame.cpp:411
+#: src/slic3r/GUI/MainFrame.cpp:462
 msgid "Prusa Edition &Releases"
 msgstr "Prusa Edition &Releases"
 
-#: src/slic3r/GUI/MainFrame.cpp:411
+#: src/slic3r/GUI/MainFrame.cpp:462
 msgid "Open the Prusa Edition releases page in your browser"
 msgstr "Open the Prusa Edition releases page in your browser"
 
-#: src/slic3r/GUI/MainFrame.cpp:417
+#: src/slic3r/GUI/MainFrame.cpp:468
 msgid "Slic3r &Website"
 msgstr "Slic3r &Website"
 
-#: src/slic3r/GUI/MainFrame.cpp:417
+#: src/slic3r/GUI/MainFrame.cpp:468
 msgid "Open the Slic3r website in your browser"
 msgstr "Open the Slic3r website in your browser"
 
-#: src/slic3r/GUI/MainFrame.cpp:419
+#: src/slic3r/GUI/MainFrame.cpp:470
 msgid "Slic3r &Manual"
 msgstr "Slic3r &Manual"
 
-#: src/slic3r/GUI/MainFrame.cpp:419
+#: src/slic3r/GUI/MainFrame.cpp:470
 msgid "Open the Slic3r manual in your browser"
 msgstr "Open the Slic3r manual in your browser"
 
-#: src/slic3r/GUI/MainFrame.cpp:422
+#: src/slic3r/GUI/MainFrame.cpp:473
 msgid "System &Info"
 msgstr "System &Info"
 
-#: src/slic3r/GUI/MainFrame.cpp:422
+#: src/slic3r/GUI/MainFrame.cpp:473
 msgid "Show system information"
 msgstr "Show system information"
 
-#: src/slic3r/GUI/MainFrame.cpp:424
+#: src/slic3r/GUI/MainFrame.cpp:475
 msgid "Show &Configuration Folder"
 msgstr "Show &Configuration Folder"
 
-#: src/slic3r/GUI/MainFrame.cpp:424
+#: src/slic3r/GUI/MainFrame.cpp:475
 msgid "Show user configuration folder (datadir)"
 msgstr "Show user configuration folder (datadir)"
 
-#: src/slic3r/GUI/MainFrame.cpp:426
+#: src/slic3r/GUI/MainFrame.cpp:477
 msgid "Report an I&ssue"
 msgstr "Report an I&ssue"
 
-#: src/slic3r/GUI/MainFrame.cpp:426
+#: src/slic3r/GUI/MainFrame.cpp:477
 msgid "Report an issue on the Slic3r Prusa Edition"
 msgstr "Report an issue on the Slic3r Prusa Edition"
 
-#: src/slic3r/GUI/MainFrame.cpp:428
+#: src/slic3r/GUI/MainFrame.cpp:479
 msgid "&About Slic3r"
 msgstr "&About Slic3r"
 
-#: src/slic3r/GUI/MainFrame.cpp:428
+#: src/slic3r/GUI/MainFrame.cpp:479
 msgid "Show about dialog"
 msgstr "Show about dialog"
 
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr "&Keyboard Shortcuts"
+#: src/slic3r/GUI/MainFrame.cpp:482
+msgid "Keyboard Shortcuts"
+msgstr "Keyboard Shortcuts"
 
-#: src/slic3r/GUI/MainFrame.cpp:431
+#: src/slic3r/GUI/MainFrame.cpp:482
 msgid "Show the list of the keyboard shortcuts"
 msgstr "Show the list of the keyboard shortcuts"
 
-#: src/slic3r/GUI/MainFrame.cpp:439
+#: src/slic3r/GUI/MainFrame.cpp:490
 msgid "&File"
 msgstr "&File"
 
-#: src/slic3r/GUI/MainFrame.cpp:440
+#: src/slic3r/GUI/MainFrame.cpp:491
 msgid "&Edit"
 msgstr "&Edit"
 
-#: src/slic3r/GUI/MainFrame.cpp:441
+#: src/slic3r/GUI/MainFrame.cpp:492
 msgid "&Window"
 msgstr "&Window"
 
-#: src/slic3r/GUI/MainFrame.cpp:442
+#: src/slic3r/GUI/MainFrame.cpp:493
 msgid "&View"
 msgstr "&View"
 
-#: src/slic3r/GUI/MainFrame.cpp:445
+#: src/slic3r/GUI/MainFrame.cpp:496
 msgid "&Help"
 msgstr "&Help"
 
-#: src/slic3r/GUI/MainFrame.cpp:472
+#: src/slic3r/GUI/MainFrame.cpp:524
 msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
 
-#: src/slic3r/GUI/MainFrame.cpp:486
+#: src/slic3r/GUI/MainFrame.cpp:538
 msgid "No previously sliced file."
 msgstr "No previously sliced file."
 
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
+#: src/slic3r/GUI/MainFrame.cpp:539 src/slic3r/GUI/PrintHostDialogs.cpp:219
 msgid "Error"
 msgstr "Error"
 
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:544
 msgid "Previously sliced file ("
 msgstr "Previously sliced file ("
 
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:544
 msgid ") not found."
 msgstr ") not found."
 
-#: src/slic3r/GUI/MainFrame.cpp:493
+#: src/slic3r/GUI/MainFrame.cpp:545
 msgid "File Not Found"
 msgstr "File Not Found"
 
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
+#: src/slic3r/GUI/MainFrame.cpp:580 src/slic3r/GUI/Tab.cpp:3152
 msgid "Save "
 msgstr "Save "
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid "SVG"
 msgstr "SVG"
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid "G-code"
 msgstr "G-code"
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid " file as:"
 msgstr " file as:"
 
-#: src/slic3r/GUI/MainFrame.cpp:548
+#: src/slic3r/GUI/MainFrame.cpp:595
 msgid "Save zip file as:"
 msgstr "Save zip file as:"
 
-#: src/slic3r/GUI/MainFrame.cpp:560
+#: src/slic3r/GUI/MainFrame.cpp:607 src/slic3r/GUI/Plater.cpp:2352
+#: src/slic3r/GUI/Plater.cpp:3467 src/slic3r/GUI/Tab.cpp:1110
+#: src/slic3r/GUI/Tab.cpp:3348
 msgid "Slicing"
 msgstr "Slicing"
 
-#: src/slic3r/GUI/MainFrame.cpp:560
+#: src/slic3r/GUI/MainFrame.cpp:607
 msgid "Processing "
 msgstr "Processing "
 
-#: src/slic3r/GUI/MainFrame.cpp:583
+#: src/slic3r/GUI/MainFrame.cpp:630
 msgid " was successfully sliced."
 msgstr " was successfully sliced."
 
-#: src/slic3r/GUI/MainFrame.cpp:585
+#: src/slic3r/GUI/MainFrame.cpp:632
 msgid "Slicing Done!"
 msgstr "Slicing Done!"
 
-#: src/slic3r/GUI/MainFrame.cpp:600
+#: src/slic3r/GUI/MainFrame.cpp:647
 msgid "Select the STL file to repair:"
 msgstr "Select the STL file to repair:"
 
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:661
 msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
 msgstr "Save OBJ file (less prone to coordinate errors than STL) as:"
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676
 msgid "Your file was repaired."
 msgstr "Your file was repaired."
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676 src/libslic3r/PrintConfig.cpp:3051
 msgid "Repair"
 msgstr "Repair"
 
-#: src/slic3r/GUI/MainFrame.cpp:643
+#: src/slic3r/GUI/MainFrame.cpp:690
 msgid "Save configuration as:"
 msgstr "Save configuration as:"
 
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
+#: src/slic3r/GUI/MainFrame.cpp:710 src/slic3r/GUI/MainFrame.cpp:774
 msgid "Select configuration to load:"
 msgstr "Select configuration to load:"
 
-#: src/slic3r/GUI/MainFrame.cpp:700
+#: src/slic3r/GUI/MainFrame.cpp:747
 msgid "Save presets bundle as:"
 msgstr "Save presets bundle as:"
 
-#: src/slic3r/GUI/MainFrame.cpp:751
+#: src/slic3r/GUI/MainFrame.cpp:798
 #, c-format
 msgid "%d presets successfully imported."
 msgstr "%d presets successfully imported."
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
+#: src/slic3r/GUI/MsgDialog.cpp:71
 msgid "Slic3r error"
 msgstr "Slic3r error"
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
+#: src/slic3r/GUI/MsgDialog.cpp:71
 msgid "Slic3r has encountered an error"
 msgstr "Slic3r has encountered an error"
 
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr "Copy to clipboard"
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "Info"
-
-#: src/slic3r/GUI/Plater.cpp:126
+#: src/slic3r/GUI/Plater.cpp:137
 msgid "Volume"
 msgstr "Volume"
 
-#: src/slic3r/GUI/Plater.cpp:127
+#: src/slic3r/GUI/Plater.cpp:138
 msgid "Facets"
 msgstr "Facets"
 
-#: src/slic3r/GUI/Plater.cpp:128
+#: src/slic3r/GUI/Plater.cpp:139
 msgid "Materials"
 msgstr "Materials"
 
-#: src/slic3r/GUI/Plater.cpp:131
+#: src/slic3r/GUI/Plater.cpp:142
 msgid "Manifold"
 msgstr "Manifold"
 
-#: src/slic3r/GUI/Plater.cpp:174
+#: src/slic3r/GUI/Plater.cpp:188
 msgid "Sliced Info"
 msgstr "Sliced Info"
 
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
+#: src/slic3r/GUI/Plater.cpp:207 src/slic3r/GUI/Plater.cpp:998
 msgid "Used Filament (m)"
 msgstr "Used Filament (m)"
 
-#: src/slic3r/GUI/Plater.cpp:194
+#: src/slic3r/GUI/Plater.cpp:208
 msgid "Used Filament (mm³)"
 msgstr "Used Filament (mm³)"
 
-#: src/slic3r/GUI/Plater.cpp:195
+#: src/slic3r/GUI/Plater.cpp:209
 msgid "Used Filament (g)"
 msgstr "Used Filament (g)"
 
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
+#: src/slic3r/GUI/Plater.cpp:210
+msgid "Used Material (unit)"
+msgstr "Used Material (unit)"
+
+#: src/slic3r/GUI/Plater.cpp:211 src/slic3r/GUI/Plater.cpp:1013
+#: src/libslic3r/PrintConfig.cpp:716
 msgid "Cost"
 msgstr "Cost"
 
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
+#: src/slic3r/GUI/Plater.cpp:212 src/slic3r/GUI/Plater.cpp:985
+#: src/slic3r/GUI/Plater.cpp:1027
 msgid "Estimated printing time"
 msgstr "Estimated printing time"
 
-#: src/slic3r/GUI/Plater.cpp:198
+#: src/slic3r/GUI/Plater.cpp:213
 msgid "Number of tool changes"
 msgstr "Number of tool changes"
 
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr "Support"
+#: src/slic3r/GUI/Plater.cpp:290
+msgid "Click to edit preset"
+msgstr "Click to edit preset"
 
-#: src/slic3r/GUI/Plater.cpp:364
+#: src/slic3r/GUI/Plater.cpp:413
 msgid "Select what kind of support do you need"
 msgstr "Select what kind of support do you need"
 
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "None"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
+#: src/slic3r/GUI/Plater.cpp:415 src/libslic3r/PrintConfig.cpp:1814
+#: src/libslic3r/PrintConfig.cpp:2419
 msgid "Support on build plate only"
 msgstr "Support on build plate only"
 
-#: src/slic3r/GUI/Plater.cpp:367
+#: src/slic3r/GUI/Plater.cpp:416
 msgid "Everywhere"
 msgstr "Everywhere"
 
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
+#: src/slic3r/GUI/Plater.cpp:438 src/slic3r/GUI/Tab.cpp:1007
 msgid "Brim"
 msgstr "Brim"
 
-#: src/slic3r/GUI/Plater.cpp:381
+#: src/slic3r/GUI/Plater.cpp:440
 msgid ""
 "This flag enables the brim that will be printed around each object on the "
 "first layer."
@@ -2023,50 +2355,55 @@ msgstr ""
 "This flag enables the brim that will be printed around each object on the "
 "first layer."
 
-#: src/slic3r/GUI/Plater.cpp:390
+#: src/slic3r/GUI/Plater.cpp:448
 msgid "Purging volumes"
 msgstr "Purging volumes"
 
-#: src/slic3r/GUI/Plater.cpp:556
+#: src/slic3r/GUI/Plater.cpp:673
 msgid "Print settings"
 msgstr "Print settings"
 
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
+#: src/slic3r/GUI/Plater.cpp:674 src/slic3r/GUI/Tab.cpp:1421
+#: src/slic3r/GUI/Tab.cpp:1422
 msgid "Filament"
 msgstr "Filament"
 
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
+#: src/slic3r/GUI/Plater.cpp:675 src/slic3r/GUI/Preset.cpp:1252
 msgid "SLA print"
 msgstr "SLA print"
 
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
+#: src/slic3r/GUI/Plater.cpp:676 src/slic3r/GUI/Preset.cpp:1253
 msgid "SLA material"
 msgstr "SLA material"
 
-#: src/slic3r/GUI/Plater.cpp:560
+#: src/slic3r/GUI/Plater.cpp:677
 msgid "Printer"
 msgstr "Printer"
 
-#: src/slic3r/GUI/Plater.cpp:588
+#: src/slic3r/GUI/Plater.cpp:707 src/slic3r/GUI/Plater.cpp:3674
 msgid "Send to printer"
 msgstr "Send to printer"
 
-#: src/slic3r/GUI/Plater.cpp:607
+#: src/slic3r/GUI/Plater.cpp:727 src/slic3r/GUI/Plater.cpp:2352
+#: src/slic3r/GUI/Plater.cpp:3470
 msgid "Slice now"
 msgstr "Slice now"
 
-#: src/slic3r/GUI/Plater.cpp:787
+#: src/slic3r/GUI/Plater.cpp:860
+msgid "Hold Shift to Slice & Export G-code"
+msgstr "Hold Shift to Slice & Export G-code"
+
+#: src/slic3r/GUI/Plater.cpp:931
 #, c-format
 msgid "%d (%d shells)"
 msgstr "%d (%d shells)"
 
-#: src/slic3r/GUI/Plater.cpp:792
+#: src/slic3r/GUI/Plater.cpp:936
 #, c-format
 msgid "Auto-repaired (%d errors)"
 msgstr "Auto-repaired (%d errors)"
 
-#: src/slic3r/GUI/Plater.cpp:795
+#: src/slic3r/GUI/Plater.cpp:939
 #, c-format
 msgid ""
 "%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
@@ -2075,36 +2412,48 @@ msgstr ""
 "%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
 "facets reversed, %d backwards edges"
 
-#: src/slic3r/GUI/Plater.cpp:805
+#: src/slic3r/GUI/Plater.cpp:949
 msgid "Yes"
 msgstr "Yes"
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:972
+msgid "Used Material (ml)"
+msgstr "Used Material (ml)"
+
+#: src/slic3r/GUI/Plater.cpp:975
+msgid "object(s)"
+msgstr "object(s)"
+
+#: src/slic3r/GUI/Plater.cpp:975
+msgid "supports and pad"
+msgstr "supports and pad"
+
+#: src/slic3r/GUI/Plater.cpp:1000 src/slic3r/GUI/Plater.cpp:1015
 msgid "objects"
 msgstr "objects"
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:1000 src/slic3r/GUI/Plater.cpp:1015
 msgid "wipe tower"
 msgstr "wipe tower"
 
-#: src/slic3r/GUI/Plater.cpp:855
+#: src/slic3r/GUI/Plater.cpp:1030
 msgid "normal mode"
 msgstr "normal mode"
 
-#: src/slic3r/GUI/Plater.cpp:859
+#: src/slic3r/GUI/Plater.cpp:1034
 msgid "silent mode"
 msgstr "silent mode"
 
-#: src/slic3r/GUI/Plater.cpp:1304
+#: src/slic3r/GUI/Plater.cpp:1544
 msgid "Loading"
 msgstr "Loading"
 
-#: src/slic3r/GUI/Plater.cpp:1314
+#: src/slic3r/GUI/Plater.cpp:1554
 #, c-format
 msgid "Processing input file %s\n"
 msgstr "Processing input file %s\n"
 
-#: src/slic3r/GUI/Plater.cpp:1366
+#: src/slic3r/GUI/Plater.cpp:1612
 msgid ""
 "This file contains several objects positioned at multiple heights. Instead "
 "of considering them as multiple objects, should I consider\n"
@@ -2114,11 +2463,23 @@ msgstr ""
 "of considering them as multiple objects, should I consider\n"
 "this file as a single object having multiple parts?\n"
 
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
+#: src/slic3r/GUI/Plater.cpp:1615 src/slic3r/GUI/Plater.cpp:1707
 msgid "Multi-part object detected"
 msgstr "Multi-part object detected"
 
-#: src/slic3r/GUI/Plater.cpp:1388
+#: src/slic3r/GUI/Plater.cpp:1650
+msgid ""
+"This file cannot be loaded in simple mode. Do you want to switch to expert "
+"mode?\n"
+msgstr ""
+"This file cannot be loaded in simple mode. Do you want to switch to expert "
+"mode?\n"
+
+#: src/slic3r/GUI/Plater.cpp:1651
+msgid "Detected advanced data"
+msgstr "Detected advanced data"
+
+#: src/slic3r/GUI/Plater.cpp:1684
 #, c-format
 msgid ""
 "You can't to add the object(s) from %s because of one or some of them "
@@ -2127,7 +2488,7 @@ msgstr ""
 "You can't to add the object(s) from %s because of one or some of them "
 "is(are) multi-part"
 
-#: src/slic3r/GUI/Plater.cpp:1408
+#: src/slic3r/GUI/Plater.cpp:1704
 msgid ""
 "Multiple objects were loaded for a multi-material printer.\n"
 "Instead of considering them as multiple objects, should I consider\n"
@@ -2137,11 +2498,11 @@ msgstr ""
 "Instead of considering them as multiple objects, should I consider\n"
 "these files to represent a single object having multiple parts?\n"
 
-#: src/slic3r/GUI/Plater.cpp:1424
+#: src/slic3r/GUI/Plater.cpp:1720
 msgid "Loaded"
 msgstr "Loaded"
 
-#: src/slic3r/GUI/Plater.cpp:1492
+#: src/slic3r/GUI/Plater.cpp:1812
 msgid ""
 "Your object appears to be too large, so it was automatically scaled down to "
 "fit your print bed."
@@ -2149,47 +2510,51 @@ msgstr ""
 "Your object appears to be too large, so it was automatically scaled down to "
 "fit your print bed."
 
-#: src/slic3r/GUI/Plater.cpp:1493
+#: src/slic3r/GUI/Plater.cpp:1813
 msgid "Object too large?"
 msgstr "Object too large?"
 
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr "Export print config"
+#: src/slic3r/GUI/Plater.cpp:1863
+msgid "Export STL file:"
+msgstr "Export STL file:"
 
-#: src/slic3r/GUI/Plater.cpp:1538
+#: src/slic3r/GUI/Plater.cpp:1870
+msgid "Export AMF file:"
+msgstr "Export AMF file:"
+
+#: src/slic3r/GUI/Plater.cpp:1876
 msgid "Save file as:"
 msgstr "Save file as:"
 
-#: src/slic3r/GUI/Plater.cpp:1702
+#: src/slic3r/GUI/Plater.cpp:2042
 msgid "Arranging canceled"
 msgstr "Arranging canceled"
 
-#: src/slic3r/GUI/Plater.cpp:1705
+#: src/slic3r/GUI/Plater.cpp:2045
 msgid "Arranging"
 msgstr "Arranging"
 
-#: src/slic3r/GUI/Plater.cpp:1736
+#: src/slic3r/GUI/Plater.cpp:2079
 msgid "Could not arrange model objects! Some geometries may be invalid."
 msgstr "Could not arrange model objects! Some geometries may be invalid."
 
-#: src/slic3r/GUI/Plater.cpp:1740
+#: src/slic3r/GUI/Plater.cpp:2083
 msgid "Arranging done."
 msgstr "Arranging done."
 
-#: src/slic3r/GUI/Plater.cpp:1782
+#: src/slic3r/GUI/Plater.cpp:2124
 msgid "Orientation search canceled"
 msgstr "Orientation search canceled"
 
-#: src/slic3r/GUI/Plater.cpp:1787
+#: src/slic3r/GUI/Plater.cpp:2129
 msgid "Searching for optimal orientation"
 msgstr "Searching for optimal orientation"
 
-#: src/slic3r/GUI/Plater.cpp:1797
+#: src/slic3r/GUI/Plater.cpp:2190
 msgid "Orientation found."
 msgstr "Orientation found."
 
-#: src/slic3r/GUI/Plater.cpp:1818
+#: src/slic3r/GUI/Plater.cpp:2211
 msgid ""
 "The selected object can't be split because it contains more than one volume/"
 "material."
@@ -2197,170 +2562,179 @@ msgstr ""
 "The selected object can't be split because it contains more than one volume/"
 "material."
 
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
+#: src/slic3r/GUI/Plater.cpp:2337
+msgid "Invalid data"
+msgstr "Invalid data"
+
+#: src/slic3r/GUI/Plater.cpp:2346
+msgid "Ready to slice"
+msgstr "Ready to slice"
+
+#: src/slic3r/GUI/Plater.cpp:2379 src/slic3r/GUI/PrintHostDialogs.cpp:220
 msgid "Cancelling"
 msgstr "Cancelling"
 
-#: src/slic3r/GUI/Plater.cpp:1962
+#: src/slic3r/GUI/Plater.cpp:2396
 msgid "Another export job is currently running."
 msgstr "Another export job is currently running."
 
-#: src/slic3r/GUI/Plater.cpp:2215
+#: src/slic3r/GUI/Plater.cpp:2656
 msgid "Export failed"
 msgstr "Export failed"
 
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
+#: src/slic3r/GUI/Plater.cpp:2661 src/slic3r/GUI/PrintHostDialogs.cpp:221
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "Delete"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "Remove the selected object"
-
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2747 src/slic3r/GUI/Plater.cpp:2759
+#: src/slic3r/GUI/Plater.cpp:2831
 msgid "Increase copies"
 msgstr "Increase copies"
 
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2825 src/slic3r/GUI/Plater.cpp:2843
+msgid "Remove the selected object"
+msgstr "Remove the selected object"
+
+#: src/slic3r/GUI/Plater.cpp:2831
 msgid "Place one more copy of the selected object"
 msgstr "Place one more copy of the selected object"
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2833
 msgid "Decrease copies"
 msgstr "Decrease copies"
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2833
 msgid "Remove one copy of the selected object"
 msgstr "Remove one copy of the selected object"
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2835
 msgid "Set number of copies"
 msgstr "Set number of copies"
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2835
 msgid "Change the number of copies of the selected object"
 msgstr "Change the number of copies of the selected object"
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2858
 msgid "Reload from Disk"
 msgstr "Reload from Disk"
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2858
 msgid "Reload the selected file from Disk"
 msgstr "Reload the selected file from Disk"
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
-msgstr "Export object as STL"
+#: src/slic3r/GUI/Plater.cpp:2861
+msgid "Export the selected object as STL file"
+msgstr "Export the selected object as STL file"
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "Export this single object as STL file"
-
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2873
 msgid "Along X axis"
 msgstr "Along X axis"
 
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2873
 msgid "Mirror the selected object along the X axis"
 msgstr "Mirror the selected object along the X axis"
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2875
 msgid "Along Y axis"
 msgstr "Along Y axis"
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2875
 msgid "Mirror the selected object along the Y axis"
 msgstr "Mirror the selected object along the Y axis"
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2877
 msgid "Along Z axis"
 msgstr "Along Z axis"
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2877
 msgid "Mirror the selected object along the Z axis"
 msgstr "Mirror the selected object along the Z axis"
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2880
 msgid "Mirror"
 msgstr "Mirror"
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2880
 msgid "Mirror the selected object"
 msgstr "Mirror the selected object"
 
-#: src/slic3r/GUI/Plater.cpp:2400
+#: src/slic3r/GUI/Plater.cpp:2898
 msgid "To objects"
 msgstr "To objects"
 
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
+#: src/slic3r/GUI/Plater.cpp:2898 src/slic3r/GUI/Plater.cpp:2920
 msgid "Split the selected object into individual objects"
 msgstr "Split the selected object into individual objects"
 
-#: src/slic3r/GUI/Plater.cpp:2402
+#: src/slic3r/GUI/Plater.cpp:2900
 msgid "To parts"
 msgstr "To parts"
 
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:2900 src/slic3r/GUI/Plater.cpp:2940
 msgid "Split the selected object into individual sub-parts"
 msgstr "Split the selected object into individual sub-parts"
 
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:2903 src/slic3r/GUI/Plater.cpp:2920
+#: src/slic3r/GUI/Plater.cpp:2940 src/libslic3r/PrintConfig.cpp:3075
 msgid "Split"
 msgstr "Split"
 
-#: src/slic3r/GUI/Plater.cpp:2405
+#: src/slic3r/GUI/Plater.cpp:2903
 msgid "Split the selected object"
 msgstr "Split the selected object"
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:2926
 msgid "Optimize orientation"
 msgstr "Optimize orientation"
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:2926
 msgid "Optimize the rotation of the object for better print results."
 msgstr "Optimize the rotation of the object for better print results."
 
-#: src/slic3r/GUI/Plater.cpp:2795
+#: src/slic3r/GUI/Plater.cpp:3342
 msgid "Save G-code file as:"
 msgstr "Save G-code file as:"
 
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
-msgstr "Save Zip file as:"
+#: src/slic3r/GUI/Plater.cpp:3342
+msgid "Save SL1 file as:"
+msgstr "Save SL1 file as:"
 
-#: src/slic3r/GUI/Plater.cpp:2845
+#: src/slic3r/GUI/Plater.cpp:3397
 #, c-format
 msgid "STL file exported to %s"
 msgstr "STL file exported to %s"
 
-#: src/slic3r/GUI/Plater.cpp:2861
+#: src/slic3r/GUI/Plater.cpp:3413
 #, c-format
 msgid "AMF file exported to %s"
 msgstr "AMF file exported to %s"
 
-#: src/slic3r/GUI/Plater.cpp:2864
+#: src/slic3r/GUI/Plater.cpp:3416
 #, c-format
 msgid "Error exporting AMF file %s"
 msgstr "Error exporting AMF file %s"
 
-#: src/slic3r/GUI/Plater.cpp:2891
+#: src/slic3r/GUI/Plater.cpp:3442
 #, c-format
 msgid "3MF file exported to %s"
 msgstr "3MF file exported to %s"
 
-#: src/slic3r/GUI/Plater.cpp:2894
+#: src/slic3r/GUI/Plater.cpp:3445
 #, c-format
 msgid "Error exporting 3MF file %s"
 msgstr "Error exporting 3MF file %s"
 
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
+#: src/slic3r/GUI/Plater.cpp:3673
+msgid "Export"
+msgstr "Export"
+
+#: src/slic3r/GUI/Plater.cpp:3674
+msgid "Send G-code"
+msgstr "Send G-code"
+
+#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1762
+#: src/slic3r/GUI/Tab.cpp:1963
 msgid "General"
 msgstr "General"
 
@@ -2424,11 +2798,11 @@ msgstr ""
 "When checked, the print and filament presets are shown in the preset editor "
 "even if they are marked as incompatible with the active printer"
 
-#: src/slic3r/GUI/Preferences.cpp:90
+#: src/slic3r/GUI/Preferences.cpp:91
 msgid "Use legacy OpenGL 1.1 rendering"
 msgstr "Use legacy OpenGL 1.1 rendering"
 
-#: src/slic3r/GUI/Preferences.cpp:92
+#: src/slic3r/GUI/Preferences.cpp:93
 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 "
@@ -2438,26 +2812,42 @@ msgstr ""
 "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."
 
-#: src/slic3r/GUI/Preferences.cpp:115
+#: src/slic3r/GUI/Preferences.cpp:101
+msgid "Use Retina resolution for the 3D scene"
+msgstr "Use Retina resolution for the 3D scene"
+
+#: src/slic3r/GUI/Preferences.cpp:103
+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 ""
+"If enabled, the 3D scene will be rendered in Retina resolution. If you are "
+"experiencing 3D performance problems, disabling this option may help."
+
+#: src/slic3r/GUI/Preferences.cpp:126
 msgid "You need to restart Slic3r to make the changes effective."
 msgstr "You need to restart Slic3r to make the changes effective."
 
-#: src/slic3r/GUI/Preset.cpp:170
+#: src/slic3r/GUI/Preset.cpp:207
 msgid "modified"
 msgstr "modified"
 
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
+#: src/slic3r/GUI/Preset.cpp:918 src/slic3r/GUI/Preset.cpp:958
+#: src/slic3r/GUI/Preset.cpp:1011 src/slic3r/GUI/Preset.cpp:1043
+#: src/slic3r/GUI/PresetBundle.cpp:1484 src/slic3r/GUI/PresetBundle.cpp:1537
 msgid "System presets"
 msgstr "System presets"
 
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
+#: src/slic3r/GUI/Preset.cpp:962 src/slic3r/GUI/Preset.cpp:1047
+#: src/slic3r/GUI/PresetBundle.cpp:1542
 msgid "User presets"
 msgstr "User presets"
 
-#: src/slic3r/GUI/Preset.cpp:1157
+#: src/slic3r/GUI/Preset.cpp:991 src/slic3r/GUI/Tab.cpp:247
+msgid "Add a new printer"
+msgstr "Add a new printer"
+
+#: src/slic3r/GUI/Preset.cpp:1251
 msgid "filament"
 msgstr "filament"
 
@@ -2597,48 +2987,44 @@ msgstr "Recommended object thin wall thickness for layer height %.2f and "
 msgid "%d lines: %.2lf mm"
 msgstr "%d lines: %.2lf mm"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
+#: src/slic3r/GUI/PrintHostDialogs.cpp:32
 msgid "Send G-Code to printer host"
 msgstr "Send G-Code to printer host"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
+#: src/slic3r/GUI/PrintHostDialogs.cpp:32
 msgid "Upload to Printer Host with the following filename:"
 msgstr "Upload to Printer Host with the following filename:"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
+#: src/slic3r/GUI/PrintHostDialogs.cpp:34
 msgid "Start printing after upload"
 msgstr "Start printing after upload"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
+#: src/slic3r/GUI/PrintHostDialogs.cpp:41
 msgid "Use forward slashes ( / ) as a directory separator if needed."
 msgstr "Use forward slashes ( / ) as a directory separator if needed."
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
+#: src/slic3r/GUI/PrintHostDialogs.cpp:157
 msgid "Cancel selected"
 msgstr "Cancel selected"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
+#: src/slic3r/GUI/PrintHostDialogs.cpp:159
 msgid "Show error message"
 msgstr "Show error message"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr "Close"
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
+#: src/slic3r/GUI/PrintHostDialogs.cpp:198
+#: src/slic3r/GUI/PrintHostDialogs.cpp:217
 msgid "Enqueued"
 msgstr "Enqueued"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
+#: src/slic3r/GUI/PrintHostDialogs.cpp:218
 msgid "Uploading"
 msgstr "Uploading"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
+#: src/slic3r/GUI/PrintHostDialogs.cpp:222
 msgid "Completed"
 msgstr "Completed"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
+#: src/slic3r/GUI/PrintHostDialogs.cpp:260
 msgid "Error uploading to print host:"
 msgstr "Error uploading to print host:"
 
@@ -2651,10 +3037,10 @@ msgid "Time"
 msgstr "Time"
 
 #: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82 src/libslic3r/PrintConfig.cpp:611
+#: src/libslic3r/PrintConfig.cpp:655 src/libslic3r/PrintConfig.cpp:670
+#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2250
+#: src/libslic3r/PrintConfig.cpp:2308 src/libslic3r/PrintConfig.cpp:2315
 msgid "s"
 msgstr "s"
 
@@ -2662,35 +3048,35 @@ msgstr "s"
 msgid "Volumetric speed"
 msgstr "Volumetric speed"
 
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
+#: src/slic3r/GUI/SysInfoDialog.cpp:44
 msgid "Slic3r Prusa Edition - System Information"
 msgstr "Slic3r Prusa Edition - System Information"
 
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
+#: src/slic3r/GUI/Tab.cpp:50 src/libslic3r/PrintConfig.cpp:228
 msgid "Compatible printers"
 msgstr "Compatible printers"
 
-#: src/slic3r/GUI/Tab.cpp:50
+#: src/slic3r/GUI/Tab.cpp:51
 msgid "Select the printers this profile is compatible with."
 msgstr "Select the printers this profile is compatible with."
 
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
+#: src/slic3r/GUI/Tab.cpp:56 src/libslic3r/PrintConfig.cpp:243
 msgid "Compatible print profiles"
 msgstr "Compatible print profiles"
 
-#: src/slic3r/GUI/Tab.cpp:56
+#: src/slic3r/GUI/Tab.cpp:57
 msgid "Select the print profiles this profile is compatible with."
 msgstr "Select the print profiles this profile is compatible with."
 
-#: src/slic3r/GUI/Tab.cpp:118
+#: src/slic3r/GUI/Tab.cpp:132
 msgid "Save current "
 msgstr "Save current "
 
-#: src/slic3r/GUI/Tab.cpp:119
+#: src/slic3r/GUI/Tab.cpp:133
 msgid "Delete this preset"
 msgstr "Delete this preset"
 
-#: src/slic3r/GUI/Tab.cpp:131
+#: src/slic3r/GUI/Tab.cpp:145
 msgid ""
 "Hover the cursor over buttons to find more information \n"
 "or click this button."
@@ -2698,181 +3084,181 @@ msgstr ""
 "Hover the cursor over buttons to find more information \n"
 "or click this button."
 
-#: src/slic3r/GUI/Tab.cpp:824
+#: src/slic3r/GUI/Tab.cpp:858
 msgid "It's a default preset."
 msgstr "It's a default preset."
 
-#: src/slic3r/GUI/Tab.cpp:825
+#: src/slic3r/GUI/Tab.cpp:859
 msgid "It's a system preset."
 msgstr "It's a system preset."
 
-#: src/slic3r/GUI/Tab.cpp:826
+#: src/slic3r/GUI/Tab.cpp:860
 msgid "Current preset is inherited from "
 msgstr "Current preset is inherited from "
 
-#: src/slic3r/GUI/Tab.cpp:831
+#: src/slic3r/GUI/Tab.cpp:865
 msgid "It can't be deleted or modified. "
 msgstr "It can't be deleted or modified. "
 
-#: src/slic3r/GUI/Tab.cpp:832
+#: src/slic3r/GUI/Tab.cpp:866
 msgid ""
 "Any modifications should be saved as a new preset inherited from this one. "
 msgstr ""
 "Any modifications should be saved as a new preset inherited from this one. "
 
-#: src/slic3r/GUI/Tab.cpp:833
+#: src/slic3r/GUI/Tab.cpp:867
 msgid "To do that please specify a new name for the preset."
 msgstr "To do that please specify a new name for the preset."
 
-#: src/slic3r/GUI/Tab.cpp:837
+#: src/slic3r/GUI/Tab.cpp:871
 msgid "Additional information:"
 msgstr "Additional information:"
 
-#: src/slic3r/GUI/Tab.cpp:843
+#: src/slic3r/GUI/Tab.cpp:877
 msgid "printer model"
 msgstr "printer model"
 
-#: src/slic3r/GUI/Tab.cpp:851
+#: src/slic3r/GUI/Tab.cpp:885
 msgid "default print profile"
 msgstr "default print profile"
 
-#: src/slic3r/GUI/Tab.cpp:854
+#: src/slic3r/GUI/Tab.cpp:888
 msgid "default filament profile"
 msgstr "default filament profile"
 
-#: src/slic3r/GUI/Tab.cpp:868
+#: src/slic3r/GUI/Tab.cpp:902
 msgid "default SLA material profile"
 msgstr "default SLA material profile"
 
-#: src/slic3r/GUI/Tab.cpp:872
+#: src/slic3r/GUI/Tab.cpp:906
 msgid "default SLA print profile"
 msgstr "default SLA print profile"
 
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
+#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:3303
 msgid "Layers and perimeters"
 msgstr "Layers and perimeters"
 
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
+#: src/slic3r/GUI/Tab.cpp:949 src/libslic3r/PrintConfig.cpp:55
 msgid "Layer height"
 msgstr "Layer height"
 
-#: src/slic3r/GUI/Tab.cpp:924
+#: src/slic3r/GUI/Tab.cpp:953
 msgid "Vertical shells"
 msgstr "Vertical shells"
 
-#: src/slic3r/GUI/Tab.cpp:935
+#: src/slic3r/GUI/Tab.cpp:964
 msgid "Horizontal shells"
 msgstr "Horizontal shells"
 
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:965 src/libslic3r/PrintConfig.cpp:1709
 msgid "Solid layers"
 msgstr "Solid layers"
 
-#: src/slic3r/GUI/Tab.cpp:941
+#: src/slic3r/GUI/Tab.cpp:970
 msgid "Quality (slower slicing)"
 msgstr "Quality (slower slicing)"
 
-#: src/slic3r/GUI/Tab.cpp:958
+#: src/slic3r/GUI/Tab.cpp:988
 msgid "Reducing printing time"
 msgstr "Reducing printing time"
 
-#: src/slic3r/GUI/Tab.cpp:970
+#: src/slic3r/GUI/Tab.cpp:1000
 msgid "Skirt and brim"
 msgstr "Skirt and brim"
 
-#: src/slic3r/GUI/Tab.cpp:987
+#: src/slic3r/GUI/Tab.cpp:1017
 msgid "Raft"
 msgstr "Raft"
 
-#: src/slic3r/GUI/Tab.cpp:991
+#: src/slic3r/GUI/Tab.cpp:1021
 msgid "Options for support material and raft"
 msgstr "Options for support material and raft"
 
-#: src/slic3r/GUI/Tab.cpp:1006
+#: src/slic3r/GUI/Tab.cpp:1036
 msgid "Speed for print moves"
 msgstr "Speed for print moves"
 
-#: src/slic3r/GUI/Tab.cpp:1018
+#: src/slic3r/GUI/Tab.cpp:1048
 msgid "Speed for non-print moves"
 msgstr "Speed for non-print moves"
 
-#: src/slic3r/GUI/Tab.cpp:1021
+#: src/slic3r/GUI/Tab.cpp:1051
 msgid "Modifiers"
 msgstr "Modifiers"
 
-#: src/slic3r/GUI/Tab.cpp:1024
+#: src/slic3r/GUI/Tab.cpp:1054
 msgid "Acceleration control (advanced)"
 msgstr "Acceleration control (advanced)"
 
-#: src/slic3r/GUI/Tab.cpp:1031
+#: src/slic3r/GUI/Tab.cpp:1061
 msgid "Autospeed (advanced)"
 msgstr "Autospeed (advanced)"
 
-#: src/slic3r/GUI/Tab.cpp:1037
+#: src/slic3r/GUI/Tab.cpp:1069
 msgid "Multiple Extruders"
 msgstr "Multiple Extruders"
 
-#: src/slic3r/GUI/Tab.cpp:1045
+#: src/slic3r/GUI/Tab.cpp:1077
 msgid "Ooze prevention"
 msgstr "Ooze prevention"
 
-#: src/slic3r/GUI/Tab.cpp:1062
+#: src/slic3r/GUI/Tab.cpp:1094
 msgid "Extrusion width"
 msgstr "Extrusion width"
 
-#: src/slic3r/GUI/Tab.cpp:1072
+#: src/slic3r/GUI/Tab.cpp:1104
 msgid "Overlap"
 msgstr "Overlap"
 
-#: src/slic3r/GUI/Tab.cpp:1075
+#: src/slic3r/GUI/Tab.cpp:1107
 msgid "Flow"
 msgstr "Flow"
 
-#: src/slic3r/GUI/Tab.cpp:1078
+#: src/slic3r/GUI/Tab.cpp:1116
 msgid "Other"
 msgstr "Other"
 
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
+#: src/slic3r/GUI/Tab.cpp:1119 src/slic3r/GUI/Tab.cpp:3351
 msgid "Output options"
 msgstr "Output options"
 
-#: src/slic3r/GUI/Tab.cpp:1086
+#: src/slic3r/GUI/Tab.cpp:1120
 msgid "Sequential printing"
 msgstr "Sequential printing"
 
-#: src/slic3r/GUI/Tab.cpp:1088
+#: src/slic3r/GUI/Tab.cpp:1122
 msgid "Extruder clearance (mm)"
 msgstr "Extruder clearance (mm)"
 
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
+#: src/slic3r/GUI/Tab.cpp:1131 src/slic3r/GUI/Tab.cpp:3352
 msgid "Output file"
 msgstr "Output file"
 
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
+#: src/slic3r/GUI/Tab.cpp:1138 src/libslic3r/PrintConfig.cpp:1382
 msgid "Post-processing scripts"
 msgstr "Post-processing scripts"
 
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
+#: src/slic3r/GUI/Tab.cpp:1144 src/slic3r/GUI/Tab.cpp:1145
+#: src/slic3r/GUI/Tab.cpp:1527 src/slic3r/GUI/Tab.cpp:1528
+#: src/slic3r/GUI/Tab.cpp:1935 src/slic3r/GUI/Tab.cpp:1936
+#: src/slic3r/GUI/Tab.cpp:2027 src/slic3r/GUI/Tab.cpp:2028
+#: src/slic3r/GUI/Tab.cpp:3240 src/slic3r/GUI/Tab.cpp:3241
 msgid "Notes"
 msgstr "Notes"
 
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
+#: src/slic3r/GUI/Tab.cpp:1151 src/slic3r/GUI/Tab.cpp:1535
+#: src/slic3r/GUI/Tab.cpp:1942 src/slic3r/GUI/Tab.cpp:2034
+#: src/slic3r/GUI/Tab.cpp:3248 src/slic3r/GUI/Tab.cpp:3357
 msgid "Dependencies"
 msgstr "Dependencies"
 
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
+#: src/slic3r/GUI/Tab.cpp:1152 src/slic3r/GUI/Tab.cpp:1536
+#: src/slic3r/GUI/Tab.cpp:1943 src/slic3r/GUI/Tab.cpp:2035
+#: src/slic3r/GUI/Tab.cpp:3249 src/slic3r/GUI/Tab.cpp:3358
 msgid "Profile dependencies"
 msgstr "Profile dependencies"
 
-#: src/slic3r/GUI/Tab.cpp:1161
+#: src/slic3r/GUI/Tab.cpp:1198
 #, no-c-format
 msgid ""
 "The Spiral Vase mode requires:\n"
@@ -2893,11 +3279,11 @@ msgstr ""
 "\n"
 "Shall I adjust those settings in order to enable Spiral Vase?"
 
-#: src/slic3r/GUI/Tab.cpp:1168
+#: src/slic3r/GUI/Tab.cpp:1205
 msgid "Spiral Vase"
 msgstr "Spiral Vase"
 
-#: src/slic3r/GUI/Tab.cpp:1191
+#: src/slic3r/GUI/Tab.cpp:1228
 msgid ""
 "The Wipe Tower currently supports the non-soluble supports only\n"
 "if they are printed with the current extruder without triggering a tool "
@@ -2915,11 +3301,11 @@ msgstr ""
 "\n"
 "Shall I adjust those settings in order to enable the Wipe Tower?"
 
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
+#: src/slic3r/GUI/Tab.cpp:1232 src/slic3r/GUI/Tab.cpp:1249
 msgid "Wipe Tower"
 msgstr "Wipe Tower"
 
-#: src/slic3r/GUI/Tab.cpp:1209
+#: src/slic3r/GUI/Tab.cpp:1246
 msgid ""
 "For the Wipe Tower to work with the soluble supports, the support layers\n"
 "need to be synchronized with the object layers.\n"
@@ -2931,7 +3317,7 @@ msgstr ""
 "\n"
 "Shall I synchronize support layers in order to enable the Wipe Tower?"
 
-#: src/slic3r/GUI/Tab.cpp:1227
+#: src/slic3r/GUI/Tab.cpp:1264
 msgid ""
 "Supports work better, if the following feature is enabled:\n"
 "- Detect bridging perimeters\n"
@@ -2943,15 +3329,15 @@ msgstr ""
 "\n"
 "Shall I adjust those settings for supports?"
 
-#: src/slic3r/GUI/Tab.cpp:1230
+#: src/slic3r/GUI/Tab.cpp:1267
 msgid "Support Generator"
 msgstr "Support Generator"
 
-#: src/slic3r/GUI/Tab.cpp:1272
+#: src/slic3r/GUI/Tab.cpp:1309
 msgid "The "
 msgstr "The "
 
-#: src/slic3r/GUI/Tab.cpp:1272
+#: src/slic3r/GUI/Tab.cpp:1309
 #, no-c-format
 msgid ""
 " infill pattern is not supposed to work at 100% density.\n"
@@ -2962,82 +3348,82 @@ msgstr ""
 "\n"
 "Shall I switch to rectilinear fill pattern?"
 
-#: src/slic3r/GUI/Tab.cpp:1388
+#: src/slic3r/GUI/Tab.cpp:1429
 msgid "Temperature "
 msgstr "Temperature "
 
-#: src/slic3r/GUI/Tab.cpp:1394
+#: src/slic3r/GUI/Tab.cpp:1435
 msgid "Bed"
 msgstr "Bed"
 
-#: src/slic3r/GUI/Tab.cpp:1399
+#: src/slic3r/GUI/Tab.cpp:1440
 msgid "Cooling"
 msgstr "Cooling"
 
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
+#: src/slic3r/GUI/Tab.cpp:1441 src/libslic3r/PrintConfig.cpp:1285
+#: src/libslic3r/PrintConfig.cpp:2097
 msgid "Enable"
 msgstr "Enable"
 
-#: src/slic3r/GUI/Tab.cpp:1411
+#: src/slic3r/GUI/Tab.cpp:1452
 msgid "Fan settings"
 msgstr "Fan settings"
 
-#: src/slic3r/GUI/Tab.cpp:1412
+#: src/slic3r/GUI/Tab.cpp:1453
 msgid "Fan speed"
 msgstr "Fan speed"
 
-#: src/slic3r/GUI/Tab.cpp:1420
+#: src/slic3r/GUI/Tab.cpp:1461
 msgid "Cooling thresholds"
 msgstr "Cooling thresholds"
 
-#: src/slic3r/GUI/Tab.cpp:1426
+#: src/slic3r/GUI/Tab.cpp:1467
 msgid "Filament properties"
 msgstr "Filament properties"
 
-#: src/slic3r/GUI/Tab.cpp:1430
+#: src/slic3r/GUI/Tab.cpp:1471
 msgid "Print speed override"
 msgstr "Print speed override"
 
-#: src/slic3r/GUI/Tab.cpp:1440
+#: src/slic3r/GUI/Tab.cpp:1481
 msgid "Toolchange parameters with single extruder MM printers"
 msgstr "Toolchange parameters with single extruder MM printers"
 
-#: src/slic3r/GUI/Tab.cpp:1455
+#: src/slic3r/GUI/Tab.cpp:1496
 msgid "Ramming settings"
 msgstr "Ramming settings"
 
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
+#: src/slic3r/GUI/Tab.cpp:1514 src/slic3r/GUI/Tab.cpp:1898
 msgid "Custom G-code"
 msgstr "Custom G-code"
 
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
+#: src/slic3r/GUI/Tab.cpp:1515 src/slic3r/GUI/Tab.cpp:1899
+#: src/libslic3r/PrintConfig.cpp:1735 src/libslic3r/PrintConfig.cpp:1750
 msgid "Start G-code"
 msgstr "Start G-code"
 
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
+#: src/slic3r/GUI/Tab.cpp:1521 src/slic3r/GUI/Tab.cpp:1905
+#: src/libslic3r/PrintConfig.cpp:358 src/libslic3r/PrintConfig.cpp:368
 msgid "End G-code"
 msgstr "End G-code"
 
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
+#: src/slic3r/GUI/Tab.cpp:1632 src/slic3r/GUI/Tab.cpp:1689
 msgid " Browse "
 msgstr " Browse "
 
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:1651 src/slic3r/GUI/Tab.cpp:1838
 msgid "Test"
 msgstr "Test"
 
-#: src/slic3r/GUI/Tab.cpp:1615
+#: src/slic3r/GUI/Tab.cpp:1662
 msgid "Could not get a valid Printer Host reference"
 msgstr "Could not get a valid Printer Host reference"
 
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1668 src/slic3r/GUI/Tab.cpp:1851
 msgid "Success!"
 msgstr "Success!"
 
-#: src/slic3r/GUI/Tab.cpp:1636
+#: src/slic3r/GUI/Tab.cpp:1683
 msgid ""
 "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
 "signed certificate."
@@ -3045,15 +3431,15 @@ msgstr ""
 "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
 "signed certificate."
 
-#: src/slic3r/GUI/Tab.cpp:1648
+#: src/slic3r/GUI/Tab.cpp:1696
 msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
 msgstr "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
 
-#: src/slic3r/GUI/Tab.cpp:1649
+#: src/slic3r/GUI/Tab.cpp:1697
 msgid "Open CA certificate file"
 msgstr "Open CA certificate file"
 
-#: src/slic3r/GUI/Tab.cpp:1676
+#: src/slic3r/GUI/Tab.cpp:1725
 msgid ""
 "HTTPS CA File:\n"
 "\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
@@ -3067,141 +3453,149 @@ msgstr ""
 "\tTo use a custom CA file, please import your CA file into Certificate "
 "Store / Keychain."
 
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
+#: src/slic3r/GUI/Tab.cpp:1763 src/slic3r/GUI/Tab.cpp:1964
 msgid "Size and coordinates"
 msgstr "Size and coordinates"
 
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
+#: src/slic3r/GUI/Tab.cpp:1767 src/slic3r/GUI/Tab.cpp:1968
+#: src/slic3r/GUI/Tab.cpp:2911
 msgid " Set "
 msgstr " Set "
 
-#: src/slic3r/GUI/Tab.cpp:1740
+#: src/slic3r/GUI/Tab.cpp:1790
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/slic3r/GUI/Tab.cpp:1745
+#: src/slic3r/GUI/Tab.cpp:1795
 msgid "Number of extruders of the printer."
 msgstr "Number of extruders of the printer."
 
-#: src/slic3r/GUI/Tab.cpp:1773
+#: src/slic3r/GUI/Tab.cpp:1823
 msgid "USB/Serial connection"
 msgstr "USB/Serial connection"
 
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
+#: src/slic3r/GUI/Tab.cpp:1824 src/libslic3r/PrintConfig.cpp:1590
 msgid "Serial port"
 msgstr "Serial port"
 
-#: src/slic3r/GUI/Tab.cpp:1779
+#: src/slic3r/GUI/Tab.cpp:1829
 msgid "Rescan serial ports"
 msgstr "Rescan serial ports"
 
-#: src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1851
 msgid "Connection to printer works correctly."
 msgstr "Connection to printer works correctly."
 
-#: src/slic3r/GUI/Tab.cpp:1804
+#: src/slic3r/GUI/Tab.cpp:1854
 msgid "Connection failed."
 msgstr "Connection failed."
 
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
+#: src/slic3r/GUI/Tab.cpp:1867 src/slic3r/GUI/Tab.cpp:2022
 msgid "Print Host upload"
 msgstr "Print Host upload"
 
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
+#: src/slic3r/GUI/Tab.cpp:1911 src/libslic3r/PrintConfig.cpp:128
 msgid "Before layer change G-code"
 msgstr "Before layer change G-code"
 
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
+#: src/slic3r/GUI/Tab.cpp:1917 src/libslic3r/PrintConfig.cpp:1030
 msgid "After layer change G-code"
 msgstr "After layer change G-code"
 
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
+#: src/slic3r/GUI/Tab.cpp:1923 src/libslic3r/PrintConfig.cpp:2005
 msgid "Tool change G-code"
 msgstr "Tool change G-code"
 
-#: src/slic3r/GUI/Tab.cpp:1877
+#: src/slic3r/GUI/Tab.cpp:1929
 msgid "Between objects G-code (for sequential printing)"
 msgstr "Between objects G-code (for sequential printing)"
 
-#: src/slic3r/GUI/Tab.cpp:1938
+#: src/slic3r/GUI/Tab.cpp:1990
 msgid "Display"
 msgstr "Display"
 
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
+#: src/slic3r/GUI/Tab.cpp:2001
+msgid "Tilt"
+msgstr "Tilt"
+
+#: src/slic3r/GUI/Tab.cpp:2002
+msgid "Tilt time"
+msgstr "Tilt time"
+
+#: src/slic3r/GUI/Tab.cpp:2008 src/slic3r/GUI/Tab.cpp:3223
 msgid "Corrections"
 msgstr "Corrections"
 
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
+#: src/slic3r/GUI/Tab.cpp:2074 src/slic3r/GUI/Tab.cpp:2136
+#: src/libslic3r/PrintConfig.cpp:1076 src/libslic3r/PrintConfig.cpp:1086
+#: src/libslic3r/PrintConfig.cpp:1096 src/libslic3r/PrintConfig.cpp:1109
+#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1131
+#: src/libslic3r/PrintConfig.cpp:1142
 msgid "Machine limits"
 msgstr "Machine limits"
 
-#: src/slic3r/GUI/Tab.cpp:2025
+#: src/slic3r/GUI/Tab.cpp:2088
 msgid "Values in this column are for Full Power mode"
 msgstr "Values in this column are for Full Power mode"
 
-#: src/slic3r/GUI/Tab.cpp:2026
+#: src/slic3r/GUI/Tab.cpp:2089
 msgid "Full Power"
 msgstr "Full Power"
 
-#: src/slic3r/GUI/Tab.cpp:2031
+#: src/slic3r/GUI/Tab.cpp:2094
 msgid "Values in this column are for Silent mode"
 msgstr "Values in this column are for Silent mode"
 
-#: src/slic3r/GUI/Tab.cpp:2032
+#: src/slic3r/GUI/Tab.cpp:2095
 msgid "Silent"
 msgstr "Silent"
 
-#: src/slic3r/GUI/Tab.cpp:2040
+#: src/slic3r/GUI/Tab.cpp:2103
 msgid "Maximum feedrates"
 msgstr "Maximum feedrates"
 
-#: src/slic3r/GUI/Tab.cpp:2045
+#: src/slic3r/GUI/Tab.cpp:2108
 msgid "Maximum accelerations"
 msgstr "Maximum accelerations"
 
-#: src/slic3r/GUI/Tab.cpp:2052
+#: src/slic3r/GUI/Tab.cpp:2115
 msgid "Jerk limits"
 msgstr "Jerk limits"
 
-#: src/slic3r/GUI/Tab.cpp:2057
+#: src/slic3r/GUI/Tab.cpp:2120
 msgid "Minimum feedrates"
 msgstr "Minimum feedrates"
 
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
+#: src/slic3r/GUI/Tab.cpp:2158 src/slic3r/GUI/Tab.cpp:2166
 msgid "Single extruder MM setup"
 msgstr "Single extruder MM setup"
 
-#: src/slic3r/GUI/Tab.cpp:2104
+#: src/slic3r/GUI/Tab.cpp:2167
 msgid "Single extruder multimaterial parameters"
 msgstr "Single extruder multimaterial parameters"
 
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
+#: src/slic3r/GUI/Tab.cpp:2181 src/libslic3r/GCode/PreviewData.cpp:475
 #, c-format
 msgid "Extruder %d"
 msgstr "Extruder %d"
 
-#: src/slic3r/GUI/Tab.cpp:2125
+#: src/slic3r/GUI/Tab.cpp:2188
 msgid "Layer height limits"
 msgstr "Layer height limits"
 
-#: src/slic3r/GUI/Tab.cpp:2130
+#: src/slic3r/GUI/Tab.cpp:2193
 msgid "Position (for multi-extruder printers)"
 msgstr "Position (for multi-extruder printers)"
 
-#: src/slic3r/GUI/Tab.cpp:2133
+#: src/slic3r/GUI/Tab.cpp:2196
 msgid "Retraction"
 msgstr "Retraction"
 
-#: src/slic3r/GUI/Tab.cpp:2136
+#: src/slic3r/GUI/Tab.cpp:2199
 msgid "Only lift Z"
 msgstr "Only lift Z"
 
-#: src/slic3r/GUI/Tab.cpp:2149
+#: src/slic3r/GUI/Tab.cpp:2212
 msgid ""
 "Retraction when tool is disabled (advanced settings for multi-extruder "
 "setups)"
@@ -3209,11 +3603,11 @@ msgstr ""
 "Retraction when tool is disabled (advanced settings for multi-extruder "
 "setups)"
 
-#: src/slic3r/GUI/Tab.cpp:2153
+#: src/slic3r/GUI/Tab.cpp:2216
 msgid "Preview"
 msgstr "Preview"
 
-#: src/slic3r/GUI/Tab.cpp:2284
+#: src/slic3r/GUI/Tab.cpp:2352
 msgid ""
 "The Wipe option is not available when using the Firmware Retraction mode.\n"
 "\n"
@@ -3223,93 +3617,89 @@ msgstr ""
 "\n"
 "Shall I disable it in order to enable Firmware Retraction?"
 
-#: src/slic3r/GUI/Tab.cpp:2286
+#: src/slic3r/GUI/Tab.cpp:2354
 msgid "Firmware Retraction"
 msgstr "Firmware Retraction"
 
-#: src/slic3r/GUI/Tab.cpp:2565
+#: src/slic3r/GUI/Tab.cpp:2681
 #, c-format
 msgid "Default preset (%s)"
 msgstr "Default preset (%s)"
 
-#: src/slic3r/GUI/Tab.cpp:2566
+#: src/slic3r/GUI/Tab.cpp:2682
 #, c-format
 msgid "Preset (%s)"
 msgstr "Preset (%s)"
 
-#: src/slic3r/GUI/Tab.cpp:2583
+#: src/slic3r/GUI/Tab.cpp:2699
 msgid "has the following unsaved changes:"
 msgstr "has the following unsaved changes:"
 
-#: src/slic3r/GUI/Tab.cpp:2586
+#: src/slic3r/GUI/Tab.cpp:2702
 msgid "is not compatible with printer"
 msgstr "is not compatible with printer"
 
-#: src/slic3r/GUI/Tab.cpp:2587
+#: src/slic3r/GUI/Tab.cpp:2703
 msgid "is not compatible with print profile"
 msgstr "is not compatible with print profile"
 
-#: src/slic3r/GUI/Tab.cpp:2589
+#: src/slic3r/GUI/Tab.cpp:2705
 msgid "and it has the following unsaved changes:"
 msgstr "and it has the following unsaved changes:"
 
-#: src/slic3r/GUI/Tab.cpp:2592
+#: src/slic3r/GUI/Tab.cpp:2708
 msgid "Discard changes and continue anyway?"
 msgstr "Discard changes and continue anyway?"
 
-#: src/slic3r/GUI/Tab.cpp:2593
+#: src/slic3r/GUI/Tab.cpp:2709
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
 
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr "It's impossible to print multi-part object(s) with SLA technology."
-
-#: src/slic3r/GUI/Tab.cpp:2605
+#: src/slic3r/GUI/Tab.cpp:2721
 msgid "Please check your object list before preset changing."
 msgstr "Please check your object list before preset changing."
 
-#: src/slic3r/GUI/Tab.cpp:2699
+#: src/slic3r/GUI/Tab.cpp:2801
+msgid "Copy"
+msgstr "Copy"
+
+#: src/slic3r/GUI/Tab.cpp:2823
 msgid "The supplied name is empty. It can't be saved."
 msgstr "The supplied name is empty. It can't be saved."
 
-#: src/slic3r/GUI/Tab.cpp:2704
+#: src/slic3r/GUI/Tab.cpp:2828
 msgid "Cannot overwrite a system profile."
 msgstr "Cannot overwrite a system profile."
 
-#: src/slic3r/GUI/Tab.cpp:2708
+#: src/slic3r/GUI/Tab.cpp:2832
 msgid "Cannot overwrite an external profile."
 msgstr "Cannot overwrite an external profile."
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2858
 msgid "remove"
 msgstr "remove"
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2858
 msgid "delete"
 msgstr "delete"
 
-#: src/slic3r/GUI/Tab.cpp:2735
+#: src/slic3r/GUI/Tab.cpp:2859
 msgid "Are you sure you want to "
 msgstr "Are you sure you want to "
 
-#: src/slic3r/GUI/Tab.cpp:2735
+#: src/slic3r/GUI/Tab.cpp:2859
 msgid " the selected preset?"
 msgstr " the selected preset?"
 
-#: src/slic3r/GUI/Tab.cpp:2736
+#: src/slic3r/GUI/Tab.cpp:2860
 msgid "Remove"
 msgstr "Remove"
 
-#: src/slic3r/GUI/Tab.cpp:2737
+#: src/slic3r/GUI/Tab.cpp:2861
 msgid " Preset"
 msgstr " Preset"
 
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "All"
-
-#: src/slic3r/GUI/Tab.cpp:2869
+#: src/slic3r/GUI/Tab.cpp:2989
 msgid ""
 "LOCKED LOCK;indicates that the settings are the same as the system values "
 "for the current option group"
@@ -3317,7 +3707,7 @@ msgstr ""
 "LOCKED LOCK;indicates that the settings are the same as the system values "
 "for the current option group"
 
-#: src/slic3r/GUI/Tab.cpp:2872
+#: src/slic3r/GUI/Tab.cpp:2992
 msgid ""
 "UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
 "the system values for the current option group.\n"
@@ -3329,7 +3719,7 @@ msgstr ""
 "Click the UNLOCKED LOCK icon to reset all settings for current option group "
 "to the system values."
 
-#: src/slic3r/GUI/Tab.cpp:2878
+#: src/slic3r/GUI/Tab.cpp:2998
 msgid ""
 "WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
 "for the right button: \tindicates that the settings hasn't been modified."
@@ -3337,7 +3727,7 @@ msgstr ""
 "WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
 "for the right button: \tindicates that the settings hasn't been modified."
 
-#: src/slic3r/GUI/Tab.cpp:2882
+#: src/slic3r/GUI/Tab.cpp:3002
 msgid ""
 "BACK ARROW;indicates that the settings were changed and are not equal to the "
 "last saved preset for the current option group.\n"
@@ -3349,7 +3739,7 @@ msgstr ""
 "Click the BACK ARROW icon to reset all settings for the current option group "
 "to the last saved preset."
 
-#: src/slic3r/GUI/Tab.cpp:2908
+#: src/slic3r/GUI/Tab.cpp:3028
 msgid ""
 "LOCKED LOCK icon indicates that the settings are the same as the system "
 "values for the current option group"
@@ -3357,7 +3747,7 @@ msgstr ""
 "LOCKED LOCK icon indicates that the settings are the same as the system "
 "values for the current option group"
 
-#: src/slic3r/GUI/Tab.cpp:2910
+#: src/slic3r/GUI/Tab.cpp:3030
 msgid ""
 "UNLOCKED LOCK icon indicates that some settings were changed and are not "
 "equal to the system values for the current option group.\n"
@@ -3367,11 +3757,11 @@ msgstr ""
 "equal to the system values for the current option group.\n"
 "Click to reset all settings for current option group to the system values."
 
-#: src/slic3r/GUI/Tab.cpp:2913
+#: src/slic3r/GUI/Tab.cpp:3033
 msgid "WHITE BULLET icon indicates a non system preset."
 msgstr "WHITE BULLET icon indicates a non system preset."
 
-#: src/slic3r/GUI/Tab.cpp:2916
+#: src/slic3r/GUI/Tab.cpp:3036
 msgid ""
 "WHITE BULLET icon indicates that the settings are the same as in the last "
 "saved preset for the current option group."
@@ -3379,7 +3769,7 @@ msgstr ""
 "WHITE BULLET icon indicates that the settings are the same as in the last "
 "saved preset for the current option group."
 
-#: src/slic3r/GUI/Tab.cpp:2918
+#: src/slic3r/GUI/Tab.cpp:3038
 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"
@@ -3391,13 +3781,13 @@ msgstr ""
 "Click to reset all settings for the current option group to the last saved "
 "preset."
 
-#: src/slic3r/GUI/Tab.cpp:2924
+#: src/slic3r/GUI/Tab.cpp:3044
 msgid ""
 "LOCKED LOCK icon indicates that the value is the same as the system value."
 msgstr ""
 "LOCKED LOCK icon indicates that the value is the same as the system value."
 
-#: src/slic3r/GUI/Tab.cpp:2925
+#: src/slic3r/GUI/Tab.cpp:3045
 msgid ""
 "UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
 "the system value.\n"
@@ -3407,7 +3797,7 @@ msgstr ""
 "the system value.\n"
 "Click to reset current value to the system value."
 
-#: src/slic3r/GUI/Tab.cpp:2931
+#: src/slic3r/GUI/Tab.cpp:3051
 msgid ""
 "WHITE BULLET icon indicates that the value is the same as in the last saved "
 "preset."
@@ -3415,7 +3805,7 @@ msgstr ""
 "WHITE BULLET icon indicates that the value is the same as in the last saved "
 "preset."
 
-#: src/slic3r/GUI/Tab.cpp:2932
+#: src/slic3r/GUI/Tab.cpp:3052
 msgid ""
 "BACK ARROW icon indicates that the value was changed and is not equal to the "
 "last saved preset.\n"
@@ -3425,99 +3815,115 @@ msgstr ""
 "last saved preset.\n"
 "Click to reset current value to the last saved preset."
 
-#: src/slic3r/GUI/Tab.cpp:3031
+#: src/slic3r/GUI/Tab.cpp:3152
 msgid " as:"
 msgstr " as:"
 
-#: src/slic3r/GUI/Tab.cpp:3075
+#: src/slic3r/GUI/Tab.cpp:3196
 msgid "the following postfix are not allowed:"
 msgstr "the following postfix are not allowed:"
 
-#: src/slic3r/GUI/Tab.cpp:3079
+#: src/slic3r/GUI/Tab.cpp:3200
 msgid "The supplied name is not available."
 msgstr "The supplied name is not available."
 
-#: src/slic3r/GUI/Tab.cpp:3092
+#: src/slic3r/GUI/Tab.cpp:3213
 msgid "Material"
 msgstr "Material"
 
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
+#: src/slic3r/GUI/Tab.cpp:3215 src/slic3r/GUI/Tab.cpp:3305
 msgid "Layers"
 msgstr "Layers"
 
-#: src/slic3r/GUI/Tab.cpp:3098
+#: src/slic3r/GUI/Tab.cpp:3219
 msgid "Exposure"
 msgstr "Exposure"
 
-#: src/slic3r/GUI/Tab.cpp:3183
+#: src/slic3r/GUI/Tab.cpp:3313
 msgid "Support head"
 msgstr "Support head"
 
-#: src/slic3r/GUI/Tab.cpp:3188
+#: src/slic3r/GUI/Tab.cpp:3318
 msgid "Support pillar"
 msgstr "Support pillar"
 
-#: src/slic3r/GUI/Tab.cpp:3196
+#: src/slic3r/GUI/Tab.cpp:3328
 msgid "Connection of the support sticks and junctions"
 msgstr "Connection of the support sticks and junctions"
 
-#: src/slic3r/GUI/Tab.cpp:3200
+#: src/slic3r/GUI/Tab.cpp:3333
 msgid "Automatic generation"
 msgstr "Automatic generation"
 
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
+#: src/slic3r/GUI/Tab.cpp:3395
+msgid "Head penetration should not be greater than the head width."
+msgstr "Head penetration should not be greater than the head width."
+
+#: src/slic3r/GUI/Tab.cpp:3396
+msgid "Invalid Head penetration"
+msgstr "Invalid Head penetration"
+
+#: src/slic3r/GUI/Tab.cpp:3408
+msgid "Pinhead diameter should be smaller than the pillar diameter."
+msgstr "Pinhead diameter should be smaller than the pillar diameter."
+
+#: src/slic3r/GUI/Tab.cpp:3409
+msgid "Invalid pinhead diameter"
+msgstr "Invalid pinhead diameter"
+
+#: src/slic3r/GUI/Tab.hpp:307 src/slic3r/GUI/Tab.hpp:395
 msgid "Print Settings"
 msgstr "Print Settings"
 
-#: src/slic3r/GUI/Tab.hpp:311
+#: src/slic3r/GUI/Tab.hpp:325
 msgid "Filament Settings"
 msgstr "Filament Settings"
 
-#: src/slic3r/GUI/Tab.hpp:344
+#: src/slic3r/GUI/Tab.hpp:358
 msgid "Printer Settings"
 msgstr "Printer Settings"
 
-#: src/slic3r/GUI/Tab.hpp:367
+#: src/slic3r/GUI/Tab.hpp:381
 msgid "Material Settings"
 msgstr "Material Settings"
 
-#: src/slic3r/GUI/Tab.hpp:393
+#: src/slic3r/GUI/Tab.hpp:407
 msgid "Save preset"
 msgstr "Save preset"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
+#: src/slic3r/GUI/UpdateDialogs.cpp:29
 msgid "Update available"
 msgstr "Update available"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
+#: src/slic3r/GUI/UpdateDialogs.cpp:29
 msgid "New version of Slic3r PE is available"
 msgstr "New version of Slic3r PE is available"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
+#: src/slic3r/GUI/UpdateDialogs.cpp:36
 msgid "To download, follow the link below."
 msgstr "To download, follow the link below."
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
+#: src/slic3r/GUI/UpdateDialogs.cpp:44
 msgid "Current version:"
 msgstr "Current version:"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
+#: src/slic3r/GUI/UpdateDialogs.cpp:46
 msgid "New version:"
 msgstr "New version:"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
+#: src/slic3r/GUI/UpdateDialogs.cpp:54
 msgid "Don't notify about new releases any more"
 msgstr "Don't notify about new releases any more"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
+#: src/slic3r/GUI/UpdateDialogs.cpp:72 src/slic3r/GUI/UpdateDialogs.cpp:164
 msgid "Configuration update"
 msgstr "Configuration update"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
+#: src/slic3r/GUI/UpdateDialogs.cpp:72
 msgid "Configuration update is available"
 msgstr "Configuration update is available"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
+#: src/slic3r/GUI/UpdateDialogs.cpp:75
 msgid ""
 "Would you like to install it?\n"
 "\n"
@@ -3533,15 +3939,15 @@ msgstr ""
 "\n"
 "Updated configuration bundles:"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
 msgid "Slic3r incompatibility"
 msgstr "Slic3r incompatibility"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
 msgid "Slic3r configuration is incompatible"
 msgstr "Slic3r configuration is incompatible"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
+#: src/slic3r/GUI/UpdateDialogs.cpp:114
 msgid ""
 "This version of Slic3r PE is not compatible with currently installed "
 "configuration bundles.\n"
@@ -3561,24 +3967,24 @@ msgstr ""
 "run the initial configuration. Doing so will create a backup snapshot of the "
 "existing configuration before installing files compatible with this Slic3r.\n"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
+#: src/slic3r/GUI/UpdateDialogs.cpp:123
 #, c-format
 msgid "This Slic3r PE version: %s"
 msgstr "This Slic3r PE version: %s"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
+#: src/slic3r/GUI/UpdateDialogs.cpp:128
 msgid "Incompatible bundles:"
 msgstr "Incompatible bundles:"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
+#: src/slic3r/GUI/UpdateDialogs.cpp:144
 msgid "Exit Slic3r"
 msgstr "Exit Slic3r"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
+#: src/slic3r/GUI/UpdateDialogs.cpp:147
 msgid "Re-configure"
 msgstr "Re-configure"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
+#: src/slic3r/GUI/UpdateDialogs.cpp:168
 #, c-format
 msgid ""
 "Slic3r PE now uses an updated configuration structure.\n"
@@ -3605,15 +4011,15 @@ msgstr ""
 "Please proceed with the %s that follows to set up the new presets and to "
 "choose whether to enable automatic preset updates."
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:182
+#: src/slic3r/GUI/UpdateDialogs.cpp:184
 msgid "For more information please visit our wiki page:"
 msgstr "For more information please visit our wiki page:"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
+#: src/slic3r/GUI/WipeTowerDialog.cpp:14
 msgid "Ramming customization"
 msgstr "Ramming customization"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
+#: src/slic3r/GUI/WipeTowerDialog.cpp:40
 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 "
@@ -3635,27 +4041,27 @@ msgstr ""
 "This is an expert-level setting, incorrect adjustment will likely lead to "
 "jams, extruder wheel grinding into filament etc."
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82
 msgid "Total ramming time"
 msgstr "Total ramming time"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
+#: src/slic3r/GUI/WipeTowerDialog.cpp:84
 msgid "Total rammed volume"
 msgstr "Total rammed volume"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/slic3r/GUI/WipeTowerDialog.cpp:88
 msgid "Ramming line width"
 msgstr "Ramming line width"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
+#: src/slic3r/GUI/WipeTowerDialog.cpp:90
 msgid "Ramming line spacing"
 msgstr "Ramming line spacing"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
+#: src/slic3r/GUI/WipeTowerDialog.cpp:141
 msgid "Wipe tower - Purging volume adjustment"
 msgstr "Wipe tower - Purging volume adjustment"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
+#: src/slic3r/GUI/WipeTowerDialog.cpp:225
 msgid ""
 "Here you can adjust required purging volume (mm³) for any given pair of "
 "tools."
@@ -3663,23 +4069,23 @@ msgstr ""
 "Here you can adjust required purging volume (mm³) for any given pair of "
 "tools."
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
+#: src/slic3r/GUI/WipeTowerDialog.cpp:226
 msgid "Extruder changed to"
 msgstr "Extruder changed to"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
+#: src/slic3r/GUI/WipeTowerDialog.cpp:234
 msgid "unloaded"
 msgstr "unloaded"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
+#: src/slic3r/GUI/WipeTowerDialog.cpp:235
 msgid "loaded"
 msgstr "loaded"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
+#: src/slic3r/GUI/WipeTowerDialog.cpp:240
 msgid "Tool #"
 msgstr "Tool #"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
+#: src/slic3r/GUI/WipeTowerDialog.cpp:247
 msgid ""
 "Total purging volume is calculated by summing two values below, depending on "
 "which tools are loaded/unloaded."
@@ -3687,15 +4093,15 @@ msgstr ""
 "Total purging volume is calculated by summing two values below, depending on "
 "which tools are loaded/unloaded."
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
+#: src/slic3r/GUI/WipeTowerDialog.cpp:248
 msgid "Volume to purge (mm³) when the filament is being"
 msgstr "Volume to purge (mm³) when the filament is being"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
+#: src/slic3r/GUI/WipeTowerDialog.cpp:262
 msgid "From"
 msgstr "From"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
+#: src/slic3r/GUI/WipeTowerDialog.cpp:327
 msgid ""
 "Switching to simple settings will discard changes done in the advanced "
 "mode!\n"
@@ -3707,75 +4113,105 @@ msgstr ""
 "\n"
 "Do you want to proceed?"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show simplified settings"
 msgstr "Show simplified settings"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show advanced settings"
 msgstr "Show advanced settings"
 
-#: src/slic3r/Utils/OctoPrint.cpp:65
+#: src/slic3r/GUI/wxExtensions.cpp:2398
+#, c-format
+msgid "Switch to the %s mode"
+msgstr "Switch to the %s mode"
+
+#: src/slic3r/GUI/wxExtensions.cpp:2399
+#, c-format
+msgid "Current mode is %s"
+msgstr "Current mode is %s"
+
+#: src/slic3r/Utils/Duet.cpp:51
+msgid "Connection to Duet works correctly."
+msgstr "Connection to Duet works correctly."
+
+#: src/slic3r/Utils/Duet.cpp:56
+msgid "Could not connect to Duet"
+msgstr "Could not connect to Duet"
+
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:154
+msgid "Unknown error occured"
+msgstr "Unknown error occured"
+
+#: src/slic3r/Utils/Duet.cpp:148
+msgid "Wrong password"
+msgstr "Wrong password"
+
+#: src/slic3r/Utils/Duet.cpp:151
+msgid "Could not get resources to create a new connection"
+msgstr "Could not get resources to create a new connection"
+
+#: src/slic3r/Utils/OctoPrint.cpp:69
 #, c-format
 msgid "Mismatched type of print host: %s"
 msgstr "Mismatched type of print host: %s"
 
-#: src/slic3r/Utils/OctoPrint.cpp:80
+#: src/slic3r/Utils/OctoPrint.cpp:84
 msgid "Connection to OctoPrint works correctly."
 msgstr "Connection to OctoPrint works correctly."
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Could not connect to OctoPrint"
 msgstr "Could not connect to OctoPrint"
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Note: OctoPrint version at least 1.1.0 is required."
 msgstr "Note: OctoPrint version at least 1.1.0 is required."
 
-#: src/slic3r/Utils/OctoPrint.cpp:181
+#: src/slic3r/Utils/OctoPrint.cpp:195
 msgid "Connection to Prusa SLA works correctly."
 msgstr "Connection to Prusa SLA works correctly."
 
-#: src/slic3r/Utils/OctoPrint.cpp:186
+#: src/slic3r/Utils/OctoPrint.cpp:200
 msgid "Could not connect to Prusa SLA"
 msgstr "Could not connect to Prusa SLA"
 
-#: src/slic3r/Utils/PresetUpdater.cpp:571
+#: src/slic3r/Utils/PresetUpdater.cpp:583
 #, c-format
 msgid "requires min. %s and max. %s"
 msgstr "requires min. %s and max. %s"
 
-#: src/slic3r/Utils/PresetUpdater.cpp:576
+#: src/slic3r/Utils/PresetUpdater.cpp:588
 #, c-format
 msgid "requires min. %s"
 msgstr "requires min. %s"
 
-#: src/slic3r/Utils/PresetUpdater.cpp:578
+#: src/slic3r/Utils/PresetUpdater.cpp:590
 #, c-format
 msgid "requires max. %s"
 msgstr "requires max. %s"
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
-msgstr "Exporting the source model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:359
+msgid "Exporting source model"
+msgstr "Exporting source model"
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:235
 msgid "Failed loading the input model."
 msgstr "Failed loading the input model."
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
-msgstr "Repairing the model by the Netfabb service"
+msgid "Repairing model by the Netfabb service"
+msgstr "Repairing model by the Netfabb service"
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:248
 msgid "Mesh repair failed."
 msgstr "Mesh repair failed."
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the repaired model"
-msgstr "Loading the repaired model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:378
+msgid "Loading repaired model"
+msgstr "Loading repaired model"
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:263
 #: src/slic3r/Utils/FixModelByWin10.cpp:270
@@ -3783,110 +4219,294 @@ msgstr "Loading the repaired model"
 msgid "Saving mesh into the 3MF container failed."
 msgstr "Saving mesh into the 3MF container failed."
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
+#: src/slic3r/Utils/FixModelByWin10.cpp:340
 msgid "Model fixing"
 msgstr "Model fixing"
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
+#: src/slic3r/Utils/FixModelByWin10.cpp:341
 msgid "Exporting model..."
 msgstr "Exporting model..."
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
+#: src/slic3r/Utils/FixModelByWin10.cpp:368
 msgid "Export of a temporary 3mf file failed"
 msgstr "Export of a temporary 3mf file failed"
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
+#: src/slic3r/Utils/FixModelByWin10.cpp:383
 msgid "Import of the repaired 3mf file failed"
 msgstr "Import of the repaired 3mf file failed"
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
+#: src/slic3r/Utils/FixModelByWin10.cpp:385
+msgid "Repaired 3MF file does not contain any object"
+msgstr "Repaired 3MF file does not contain any object"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:387
+msgid "Repaired 3MF file contains more than one object"
+msgstr "Repaired 3MF file contains more than one object"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:389
+msgid "Repaired 3MF file does not contain any volume"
+msgstr "Repaired 3MF file does not contain any volume"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:391
+msgid "Repaired 3MF file contains more than one volume"
+msgstr "Repaired 3MF file contains more than one volume"
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:400
 msgid "Model repair finished"
 msgstr "Model repair finished"
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
+#: src/slic3r/Utils/FixModelByWin10.cpp:406
 msgid "Model repair canceled"
 msgstr "Model repair canceled"
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
 msgid "Model repaired successfully"
 msgstr "Model repaired successfully"
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model Repair by the Netfabb service"
 msgstr "Model Repair by the Netfabb service"
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model repair failed: \n"
 msgstr "Model repair failed: \n"
 
-#: src/libslic3r/Print.cpp:1175
+#: src/libslic3r/Zipper.cpp:35
+msgid "undefined error"
+msgstr "undefined error"
+
+#: src/libslic3r/Zipper.cpp:37
+msgid "too many files"
+msgstr "too many files"
+
+#: src/libslic3r/Zipper.cpp:39
+msgid "file too large"
+msgstr "file too large"
+
+#: src/libslic3r/Zipper.cpp:41
+msgid "unsupported method"
+msgstr "unsupported method"
+
+#: src/libslic3r/Zipper.cpp:43
+msgid "unsupported encryption"
+msgstr "unsupported encryption"
+
+#: src/libslic3r/Zipper.cpp:45
+msgid "unsupported feature"
+msgstr "unsupported feature"
+
+#: src/libslic3r/Zipper.cpp:47
+msgid "failed finding central directory"
+msgstr "failed finding central directory"
+
+#: src/libslic3r/Zipper.cpp:49
+msgid "not a ZIP archive"
+msgstr "not a ZIP archive"
+
+#: src/libslic3r/Zipper.cpp:51
+msgid "invalid header or archive is corrupted"
+msgstr "invalid header or archive is corrupted"
+
+#: src/libslic3r/Zipper.cpp:53
+msgid "unsupported multidisk archive"
+msgstr "unsupported multidisk archive"
+
+#: src/libslic3r/Zipper.cpp:55
+msgid "decompression failed or archive is corrupted"
+msgstr "decompression failed or archive is corrupted"
+
+#: src/libslic3r/Zipper.cpp:57
+msgid "compression failed"
+msgstr "compression failed"
+
+#: src/libslic3r/Zipper.cpp:59
+msgid "unexpected decompressed size"
+msgstr "unexpected decompressed size"
+
+#: src/libslic3r/Zipper.cpp:61
+msgid "CRC-32 check failed"
+msgstr "CRC-32 check failed"
+
+#: src/libslic3r/Zipper.cpp:63
+msgid "unsupported central directory size"
+msgstr "unsupported central directory size"
+
+#: src/libslic3r/Zipper.cpp:65
+msgid "allocation failed"
+msgstr "allocation failed"
+
+#: src/libslic3r/Zipper.cpp:67
+msgid "file open failed"
+msgstr "file open failed"
+
+#: src/libslic3r/Zipper.cpp:69
+msgid "file create failed"
+msgstr "file create failed"
+
+#: src/libslic3r/Zipper.cpp:71
+msgid "file write failed"
+msgstr "file write failed"
+
+#: src/libslic3r/Zipper.cpp:73
+msgid "file read failed"
+msgstr "file read failed"
+
+#: src/libslic3r/Zipper.cpp:75
+msgid "file close failed"
+msgstr "file close failed"
+
+#: src/libslic3r/Zipper.cpp:77
+msgid "file seek failed"
+msgstr "file seek failed"
+
+#: src/libslic3r/Zipper.cpp:79
+msgid "file stat failed"
+msgstr "file stat failed"
+
+#: src/libslic3r/Zipper.cpp:81
+msgid "invalid parameter"
+msgstr "invalid parameter"
+
+#: src/libslic3r/Zipper.cpp:83
+msgid "invalid filename"
+msgstr "invalid filename"
+
+#: src/libslic3r/Zipper.cpp:85
+msgid "buffer too small"
+msgstr "buffer too small"
+
+#: src/libslic3r/Zipper.cpp:87
+msgid "internal error"
+msgstr "internal error"
+
+#: src/libslic3r/Zipper.cpp:89
+msgid "file not found"
+msgstr "file not found"
+
+#: src/libslic3r/Zipper.cpp:91
+msgid "archive is too large"
+msgstr "archive is too large"
+
+#: src/libslic3r/Zipper.cpp:93
+msgid "validation failed"
+msgstr "validation failed"
+
+#: src/libslic3r/Zipper.cpp:95
+msgid "write calledback failed"
+msgstr "write calledback failed"
+
+#: src/libslic3r/Zipper.cpp:105
+msgid "Error with zip archive"
+msgstr "Error with zip archive"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2153
+msgid "Starting"
+msgstr "Starting"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2154
+msgid "Filtering"
+msgstr "Filtering"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2155
+msgid "Generate pinheads"
+msgstr "Generate pinheads"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2156
+msgid "Classification"
+msgstr "Classification"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2157
+msgid "Routing to ground"
+msgstr "Routing to ground"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2158
+msgid "Routing supports to model surface"
+msgstr "Routing supports to model surface"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2159
+msgid "Cascading pillars"
+msgstr "Cascading pillars"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2160
+msgid "Processing small holes"
+msgstr "Processing small holes"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2161
+msgid "Done"
+msgstr "Done"
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2162
+msgid "Abort"
+msgstr "Abort"
+
+#: src/libslic3r/Print.cpp:1136
 msgid "All objects are outside of the print volume."
 msgstr "All objects are outside of the print volume."
 
-#: src/libslic3r/Print.cpp:1201
+#: src/libslic3r/Print.cpp:1165
 msgid "Some objects are too close; your extruder will collide with them."
 msgstr "Some objects are too close; your extruder will collide with them."
 
-#: src/libslic3r/Print.cpp:1216
+#: src/libslic3r/Print.cpp:1180
 msgid ""
 "Some objects are too tall and cannot be printed without extruder collisions."
 msgstr ""
 "Some objects are too tall and cannot be printed without extruder collisions."
 
-#: src/libslic3r/Print.cpp:1226
+#: src/libslic3r/Print.cpp:1190
 msgid "The Spiral Vase option can only be used when printing a single object."
 msgstr "The Spiral Vase option can only be used when printing a single object."
 
+#: src/libslic3r/Print.cpp:1192
+msgid ""
+"The Spiral Vase option can only be used when printing single material "
+"objects."
+msgstr ""
+"The Spiral Vase option can only be used when printing single material "
+"objects."
+
+#: src/libslic3r/Print.cpp:1198
+msgid ""
+"All extruders must have the same diameter for single extruder multimaterial "
+"printer."
+msgstr ""
+"All extruders must have the same diameter for single extruder multimaterial "
+"printer."
+
+#: src/libslic3r/Print.cpp:1203
+msgid ""
+"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
+"and Repetier G-code flavors."
+msgstr ""
+"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
+"and Repetier G-code flavors."
+
+#: src/libslic3r/Print.cpp:1205
+msgid ""
+"The Wipe Tower is currently only supported with the relative extruder "
+"addressing (use_relative_e_distances=1)."
+msgstr ""
+"The Wipe Tower is currently only supported with the relative extruder "
+"addressing (use_relative_e_distances=1)."
+
+#: src/libslic3r/Print.cpp:1226
+msgid ""
+"The Wipe Tower is only supported for multiple objects if they have equal "
+"layer heigths"
+msgstr ""
+"The Wipe Tower is only supported for multiple objects if they have equal "
+"layer heigths"
+
 #: src/libslic3r/Print.cpp:1228
 msgid ""
-"The Spiral Vase option can only be used when printing single material "
-"objects."
-msgstr ""
-"The Spiral Vase option can only be used when printing single material "
-"objects."
-
-#: src/libslic3r/Print.cpp:1234
-msgid ""
-"All extruders must have the same diameter for single extruder multimaterial "
-"printer."
-msgstr ""
-"All extruders must have the same diameter for single extruder multimaterial "
-"printer."
-
-#: src/libslic3r/Print.cpp:1239
-msgid ""
-"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
-"and Repetier G-code flavors."
-msgstr ""
-"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
-"and Repetier G-code flavors."
-
-#: src/libslic3r/Print.cpp:1241
-msgid ""
-"The Wipe Tower is currently only supported with the relative extruder "
-"addressing (use_relative_e_distances=1)."
-msgstr ""
-"The Wipe Tower is currently only supported with the relative extruder "
-"addressing (use_relative_e_distances=1)."
-
-#: src/libslic3r/Print.cpp:1253
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
-msgstr ""
-"The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
-
-#: src/libslic3r/Print.cpp:1255
-msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "over an equal number of raft layers"
 msgstr ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "over an equal number of raft layers"
 
-#: src/libslic3r/Print.cpp:1257
+#: src/libslic3r/Print.cpp:1230
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "with the same support_material_contact_distance"
@@ -3894,7 +4514,7 @@ msgstr ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "with the same support_material_contact_distance"
 
-#: src/libslic3r/Print.cpp:1259
+#: src/libslic3r/Print.cpp:1232
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are sliced "
 "equally."
@@ -3902,7 +4522,7 @@ msgstr ""
 "The Wipe Tower is only supported for multiple objects if they are sliced "
 "equally."
 
-#: src/libslic3r/Print.cpp:1281
+#: src/libslic3r/Print.cpp:1261
 msgid ""
 "The Wipe tower is only supported if all objects have the same layer height "
 "profile"
@@ -3910,69 +4530,126 @@ msgstr ""
 "The Wipe tower is only supported if all objects have the same layer height "
 "profile"
 
-#: src/libslic3r/Print.cpp:1290
+#: src/libslic3r/Print.cpp:1271
 msgid "The supplied settings will cause an empty print."
 msgstr "The supplied settings will cause an empty print."
 
-#: src/libslic3r/Print.cpp:1307
+#: src/libslic3r/Print.cpp:1288
 msgid ""
 "One or more object were assigned an extruder that the printer does not have."
 msgstr ""
 "One or more object were assigned an extruder that the printer does not have."
 
+#: src/libslic3r/Print.cpp:1297
+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 ""
+"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."
+
+#: src/libslic3r/Print.cpp:1305
+msgid ""
+"For the Wipe Tower to work with the soluble supports, the support layers "
+"need to be synchronized with the object layers."
+msgstr ""
+"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:1309
+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 ""
+"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)."
+
 #: src/libslic3r/Print.cpp:1316
-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 ""
-"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."
-
-#: src/libslic3r/Print.cpp:1324
-msgid ""
-"For the Wipe Tower to work with the soluble supports, the support layers "
-"need to be synchronized with the object layers."
-msgstr ""
-"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:1328
-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 ""
-"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)."
-
-#: src/libslic3r/Print.cpp:1335
 msgid "first_layer_height"
 msgstr "first_layer_height"
 
-#: src/libslic3r/Print.cpp:1350
+#: src/libslic3r/Print.cpp:1331
 msgid "First layer height can't be greater than nozzle diameter"
 msgstr "First layer height can't be greater than nozzle diameter"
 
-#: src/libslic3r/Print.cpp:1354
+#: src/libslic3r/Print.cpp:1335
 msgid "Layer height can't be greater than nozzle diameter"
 msgstr "Layer height can't be greater than nozzle diameter"
 
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
+#: src/libslic3r/SLAPrint.cpp:55
+msgid "Slicing model"
+msgstr "Slicing model"
+
+#: src/libslic3r/SLAPrint.cpp:56 src/libslic3r/SLAPrint.cpp:801
+msgid "Generating support points"
+msgstr "Generating support points"
+
+#: src/libslic3r/SLAPrint.cpp:57
+msgid "Generating support tree"
+msgstr "Generating support tree"
+
+#: src/libslic3r/SLAPrint.cpp:58
+msgid "Generating pad"
+msgstr "Generating pad"
+
+#: src/libslic3r/SLAPrint.cpp:59
+msgid "Slicing supports"
+msgstr "Slicing supports"
+
+#: src/libslic3r/SLAPrint.cpp:71
+msgid "Merging slices and calculating statistics"
+msgstr "Merging slices and calculating statistics"
+
+#: src/libslic3r/SLAPrint.cpp:72
+msgid "Rasterizing layers"
+msgstr "Rasterizing layers"
+
+#: src/libslic3r/SLAPrint.cpp:605
+msgid ""
+"Cannot proceed without support points! Add support points or disable support "
+"generation."
+msgstr ""
+"Cannot proceed without support points! Add support points or disable support "
+"generation."
+
+#: src/libslic3r/SLAPrint.cpp:617
+msgid "Elevation is too low for object."
+msgstr "Elevation is too low for object."
+
+#: src/libslic3r/SLAPrint.cpp:699
+msgid "Slicing had to be stopped due to an internal error."
+msgstr "Slicing had to be stopped due to an internal error."
+
+#: src/libslic3r/SLAPrint.cpp:849 src/libslic3r/SLAPrint.cpp:859
+#: src/libslic3r/SLAPrint.cpp:907
+msgid "Visualizing supports"
+msgstr "Visualizing supports"
+
+#: src/libslic3r/SLAPrint.cpp:1449
+msgid "Slicing done"
+msgstr "Slicing done"
+
+#: src/libslic3r/PrintBase.cpp:65
+msgid "Failed processing of the output_filename_format template."
+msgstr "Failed processing of the output_filename_format template."
+
+#: src/libslic3r/PrintConfig.cpp:42 src/libslic3r/PrintConfig.cpp:43
 msgid "Printer technology"
 msgstr "Printer technology"
 
-#: src/libslic3r/PrintConfig.cpp:41
+#: src/libslic3r/PrintConfig.cpp:50
 msgid "Bed shape"
 msgstr "Bed shape"
 
-#: src/libslic3r/PrintConfig.cpp:48
+#: src/libslic3r/PrintConfig.cpp:57
 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."
@@ -3980,11 +4657,11 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:56
+#: src/libslic3r/PrintConfig.cpp:64
 msgid "Max print height"
 msgstr "Max print height"
 
-#: src/libslic3r/PrintConfig.cpp:57
+#: src/libslic3r/PrintConfig.cpp:65
 msgid ""
 "Set this to the maximum height that can be reached by your extruder while "
 "printing."
@@ -3992,11 +4669,49 @@ msgstr ""
 "Set this to the maximum height that can be reached by your extruder while "
 "printing."
 
+#: src/libslic3r/PrintConfig.cpp:71
+msgid "Slice gap closing radius"
+msgstr "Slice gap closing radius"
+
 #: src/libslic3r/PrintConfig.cpp:73
+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 ""
+"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."
+
+#: src/libslic3r/PrintConfig.cpp:81
+msgid "Hostname, IP or URL"
+msgstr "Hostname, IP or URL"
+
+#: src/libslic3r/PrintConfig.cpp:82
+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."
+msgstr ""
+"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."
+
+#: src/libslic3r/PrintConfig.cpp:88
+msgid "API Key / Password"
+msgstr "API Key / Password"
+
+#: src/libslic3r/PrintConfig.cpp:89
+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 can upload G-code files to a printer host. This field should contain "
+"the API Key or the password required for authentication."
+
+#: src/libslic3r/PrintConfig.cpp:111
 msgid "Avoid crossing perimeters"
 msgstr "Avoid crossing perimeters"
 
-#: src/libslic3r/PrintConfig.cpp:74
+#: src/libslic3r/PrintConfig.cpp:112
 msgid ""
 "Optimize travel moves in order to minimize the crossing of perimeters. This "
 "is mostly useful with Bowden extruders which suffer from oozing. This "
@@ -4006,11 +4721,11 @@ msgstr ""
 "is mostly useful with Bowden extruders which suffer from oozing. This "
 "feature slows down both the print and the G-code generation."
 
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
+#: src/libslic3r/PrintConfig.cpp:119 src/libslic3r/PrintConfig.cpp:1976
 msgid "Other layers"
 msgstr "Other layers"
 
-#: src/libslic3r/PrintConfig.cpp:83
+#: src/libslic3r/PrintConfig.cpp:120
 msgid ""
 "Bed temperature for layers after the first one. Set this to zero to disable "
 "bed temperature control commands in the output."
@@ -4018,11 +4733,11 @@ msgstr ""
 "Bed temperature for layers after the first one. Set this to zero to disable "
 "bed temperature control commands in the output."
 
-#: src/libslic3r/PrintConfig.cpp:86
+#: src/libslic3r/PrintConfig.cpp:122
 msgid "Bed temperature"
 msgstr "Bed temperature"
 
-#: src/libslic3r/PrintConfig.cpp:93
+#: src/libslic3r/PrintConfig.cpp:129
 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 "
@@ -4032,11 +4747,11 @@ msgstr ""
 "Note that you can use placeholder variables for all Slic3r settings as well "
 "as [layer_num] and [layer_z]."
 
-#: src/libslic3r/PrintConfig.cpp:104
+#: src/libslic3r/PrintConfig.cpp:139
 msgid "Between objects G-code"
 msgstr "Between objects G-code"
 
-#: src/libslic3r/PrintConfig.cpp:105
+#: src/libslic3r/PrintConfig.cpp:140
 msgid ""
 "This code is inserted between objects when using sequential printing. By "
 "default extruder and bed temperature are reset using non-wait command; "
@@ -4052,24 +4767,19 @@ msgstr ""
 "variables for all Slic3r settings, so you can put a \"M109 "
 "S[first_layer_temperature]\" command wherever you want."
 
-#: src/libslic3r/PrintConfig.cpp:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "Bottom"
-
-#: src/libslic3r/PrintConfig.cpp:116
+#: src/libslic3r/PrintConfig.cpp:150
 msgid "Number of solid layers to generate on bottom surfaces."
 msgstr "Number of solid layers to generate on bottom surfaces."
 
-#: src/libslic3r/PrintConfig.cpp:118
+#: src/libslic3r/PrintConfig.cpp:151
 msgid "Bottom solid layers"
 msgstr "Bottom solid layers"
 
-#: src/libslic3r/PrintConfig.cpp:123
+#: src/libslic3r/PrintConfig.cpp:156
 msgid "Bridge"
 msgstr "Bridge"
 
-#: src/libslic3r/PrintConfig.cpp:124
+#: src/libslic3r/PrintConfig.cpp:157
 msgid ""
 "This is the acceleration your printer will use for bridges. Set zero to "
 "disable acceleration control for bridges."
@@ -4077,18 +4787,18 @@ msgstr ""
 "This is the acceleration your printer will use for bridges. Set zero to "
 "disable acceleration control for bridges."
 
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
+#: src/libslic3r/PrintConfig.cpp:159 src/libslic3r/PrintConfig.cpp:302
+#: src/libslic3r/PrintConfig.cpp:814 src/libslic3r/PrintConfig.cpp:935
+#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1133
+#: src/libslic3r/PrintConfig.cpp:1144 src/libslic3r/PrintConfig.cpp:1333
 msgid "mm/s²"
 msgstr "mm/s²"
 
-#: src/libslic3r/PrintConfig.cpp:133
+#: src/libslic3r/PrintConfig.cpp:165
 msgid "Bridging angle"
 msgstr "Bridging angle"
 
-#: src/libslic3r/PrintConfig.cpp:135
+#: src/libslic3r/PrintConfig.cpp:167
 msgid ""
 "Bridging angle override. If left to zero, the bridging angle will be "
 "calculated automatically. Otherwise the provided angle will be used for all "
@@ -4098,32 +4808,33 @@ msgstr ""
 "calculated automatically. Otherwise the provided angle will be used for all "
 "bridges. Use 180° for zero angle."
 
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
+#: src/libslic3r/PrintConfig.cpp:170 src/libslic3r/PrintConfig.cpp:732
+#: src/libslic3r/PrintConfig.cpp:1569 src/libslic3r/PrintConfig.cpp:1579
+#: src/libslic3r/PrintConfig.cpp:1807 src/libslic3r/PrintConfig.cpp:1961
+#: src/libslic3r/PrintConfig.cpp:2459
 msgid "°"
 msgstr "°"
 
-#: src/libslic3r/PrintConfig.cpp:145
+#: src/libslic3r/PrintConfig.cpp:176
 msgid "Bridges fan speed"
 msgstr "Bridges fan speed"
 
-#: src/libslic3r/PrintConfig.cpp:146
+#: src/libslic3r/PrintConfig.cpp:177
 msgid "This fan speed is enforced during all bridges and overhangs."
 msgstr "This fan speed is enforced during all bridges and overhangs."
 
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
+#: src/libslic3r/PrintConfig.cpp:178 src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1216
+#: src/libslic3r/PrintConfig.cpp:1461 src/libslic3r/PrintConfig.cpp:2258
+#: src/libslic3r/PrintConfig.cpp:2498
 msgid "%"
 msgstr "%"
 
-#: src/libslic3r/PrintConfig.cpp:155
+#: src/libslic3r/PrintConfig.cpp:185
 msgid "Bridge flow ratio"
 msgstr "Bridge flow ratio"
 
-#: src/libslic3r/PrintConfig.cpp:157
+#: src/libslic3r/PrintConfig.cpp:187
 msgid ""
 "This factor affects the amount of plastic for bridging. You can decrease it "
 "slightly to pull the extrudates and prevent sagging, although default "
@@ -4135,32 +4846,32 @@ msgstr ""
 "settings are usually good and you should experiment with cooling (use a fan) "
 "before tweaking this."
 
-#: src/libslic3r/PrintConfig.cpp:168
+#: src/libslic3r/PrintConfig.cpp:197
 msgid "Bridges"
 msgstr "Bridges"
 
-#: src/libslic3r/PrintConfig.cpp:170
+#: src/libslic3r/PrintConfig.cpp:199
 msgid "Speed for printing bridges."
 msgstr "Speed for printing bridges."
 
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
+#: src/libslic3r/PrintConfig.cpp:200 src/libslic3r/PrintConfig.cpp:576
+#: src/libslic3r/PrintConfig.cpp:584 src/libslic3r/PrintConfig.cpp:593
+#: src/libslic3r/PrintConfig.cpp:601 src/libslic3r/PrintConfig.cpp:628
+#: src/libslic3r/PrintConfig.cpp:647 src/libslic3r/PrintConfig.cpp:873
+#: src/libslic3r/PrintConfig.cpp:1000 src/libslic3r/PrintConfig.cpp:1078
+#: src/libslic3r/PrintConfig.cpp:1098 src/libslic3r/PrintConfig.cpp:1111
+#: src/libslic3r/PrintConfig.cpp:1122 src/libslic3r/PrintConfig.cpp:1175
+#: src/libslic3r/PrintConfig.cpp:1234 src/libslic3r/PrintConfig.cpp:1362
+#: src/libslic3r/PrintConfig.cpp:1536 src/libslic3r/PrintConfig.cpp:1545
+#: src/libslic3r/PrintConfig.cpp:1940 src/libslic3r/PrintConfig.cpp:2051
 msgid "mm/s"
 msgstr "mm/s"
 
-#: src/libslic3r/PrintConfig.cpp:178
+#: src/libslic3r/PrintConfig.cpp:207
 msgid "Brim width"
 msgstr "Brim width"
 
-#: src/libslic3r/PrintConfig.cpp:179
+#: src/libslic3r/PrintConfig.cpp:208
 msgid ""
 "Horizontal width of the brim that will be printed around each object on the "
 "first layer."
@@ -4168,11 +4879,11 @@ msgstr ""
 "Horizontal width of the brim that will be printed around each object on the "
 "first layer."
 
-#: src/libslic3r/PrintConfig.cpp:187
+#: src/libslic3r/PrintConfig.cpp:215
 msgid "Clip multi-part objects"
 msgstr "Clip multi-part objects"
 
-#: src/libslic3r/PrintConfig.cpp:188
+#: src/libslic3r/PrintConfig.cpp:216
 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 "
@@ -4182,19 +4893,19 @@ msgstr ""
 "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)."
 
-#: src/libslic3r/PrintConfig.cpp:196
+#: src/libslic3r/PrintConfig.cpp:223
 msgid "Colorprint height"
 msgstr "Colorprint height"
 
-#: src/libslic3r/PrintConfig.cpp:197
+#: src/libslic3r/PrintConfig.cpp:224
 msgid "Heights at which a filament change is to occur. "
 msgstr "Heights at which a filament change is to occur. "
 
-#: src/libslic3r/PrintConfig.cpp:207
+#: src/libslic3r/PrintConfig.cpp:234
 msgid "Compatible printers condition"
 msgstr "Compatible printers condition"
 
-#: src/libslic3r/PrintConfig.cpp:208
+#: src/libslic3r/PrintConfig.cpp:235
 msgid ""
 "A boolean expression using the configuration values of an active printer "
 "profile. If this expression evaluates to true, this profile is considered "
@@ -4204,11 +4915,11 @@ msgstr ""
 "profile. If this expression evaluates to true, this profile is considered "
 "compatible with the active printer profile."
 
-#: src/libslic3r/PrintConfig.cpp:220
+#: src/libslic3r/PrintConfig.cpp:249
 msgid "Compatible print profiles condition"
 msgstr "Compatible print profiles condition"
 
-#: src/libslic3r/PrintConfig.cpp:221
+#: src/libslic3r/PrintConfig.cpp:250
 msgid ""
 "A boolean expression using the configuration values of an active print "
 "profile. If this expression evaluates to true, this profile is considered "
@@ -4218,11 +4929,11 @@ msgstr ""
 "profile. If this expression evaluates to true, this profile is considered "
 "compatible with the active print profile."
 
-#: src/libslic3r/PrintConfig.cpp:235
+#: src/libslic3r/PrintConfig.cpp:267
 msgid "Complete individual objects"
 msgstr "Complete individual objects"
 
-#: src/libslic3r/PrintConfig.cpp:236
+#: src/libslic3r/PrintConfig.cpp:268
 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). "
@@ -4234,11 +4945,11 @@ msgstr ""
 "This feature is useful to avoid the risk of ruined prints. Slic3r should "
 "warn and prevent you from extruder collisions, but beware."
 
-#: src/libslic3r/PrintConfig.cpp:245
+#: src/libslic3r/PrintConfig.cpp:276
 msgid "Enable auto cooling"
 msgstr "Enable auto cooling"
 
-#: src/libslic3r/PrintConfig.cpp:246
+#: src/libslic3r/PrintConfig.cpp:277
 msgid ""
 "This flag enables the automatic cooling logic that adjusts print speed and "
 "fan speed according to layer printing time."
@@ -4246,24 +4957,24 @@ msgstr ""
 "This flag enables the automatic cooling logic that adjusts print speed and "
 "fan speed according to layer printing time."
 
-#: src/libslic3r/PrintConfig.cpp:252
+#: src/libslic3r/PrintConfig.cpp:282
 msgid "Cooling tube position"
 msgstr "Cooling tube position"
 
-#: src/libslic3r/PrintConfig.cpp:253
+#: src/libslic3r/PrintConfig.cpp:283
 msgid "Distance of the center-point of the cooling tube from the extruder tip "
 msgstr ""
 "Distance of the center-point of the cooling tube from the extruder tip "
 
-#: src/libslic3r/PrintConfig.cpp:261
+#: src/libslic3r/PrintConfig.cpp:290
 msgid "Cooling tube length"
 msgstr "Cooling tube length"
 
-#: src/libslic3r/PrintConfig.cpp:262
+#: src/libslic3r/PrintConfig.cpp:291
 msgid "Length of the cooling tube to limit space for cooling moves inside it "
 msgstr "Length of the cooling tube to limit space for cooling moves inside it "
 
-#: src/libslic3r/PrintConfig.cpp:271
+#: src/libslic3r/PrintConfig.cpp:299
 msgid ""
 "This is the acceleration your printer will be reset to after the role-"
 "specific acceleration values are used (perimeter/infill). Set zero to "
@@ -4273,11 +4984,11 @@ msgstr ""
 "specific acceleration values are used (perimeter/infill). Set zero to "
 "prevent resetting acceleration at all."
 
-#: src/libslic3r/PrintConfig.cpp:281
+#: src/libslic3r/PrintConfig.cpp:308
 msgid "Default filament profile"
 msgstr "Default filament profile"
 
-#: src/libslic3r/PrintConfig.cpp:282
+#: src/libslic3r/PrintConfig.cpp:309
 msgid ""
 "Default filament profile associated with the current printer profile. On "
 "selection of the current printer profile, this filament profile will be "
@@ -4287,12 +4998,12 @@ msgstr ""
 "selection of the current printer profile, this filament profile will be "
 "activated."
 
-#: src/libslic3r/PrintConfig.cpp:287
+#: src/libslic3r/PrintConfig.cpp:315
 msgid "Default print profile"
 msgstr "Default print profile"
 
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:316 src/libslic3r/PrintConfig.cpp:2337
+#: src/libslic3r/PrintConfig.cpp:2348
 msgid ""
 "Default print profile associated with the current printer profile. On "
 "selection of the current printer profile, this print profile will be "
@@ -4302,11 +5013,11 @@ msgstr ""
 "selection of the current printer profile, this print profile will be "
 "activated."
 
-#: src/libslic3r/PrintConfig.cpp:293
+#: src/libslic3r/PrintConfig.cpp:322
 msgid "Disable fan for the first"
 msgstr "Disable fan for the first"
 
-#: src/libslic3r/PrintConfig.cpp:294
+#: src/libslic3r/PrintConfig.cpp:323
 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."
@@ -4314,18 +5025,18 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
+#: src/libslic3r/PrintConfig.cpp:325 src/libslic3r/PrintConfig.cpp:945
+#: src/libslic3r/PrintConfig.cpp:1434 src/libslic3r/PrintConfig.cpp:1619
+#: src/libslic3r/PrintConfig.cpp:1680 src/libslic3r/PrintConfig.cpp:1843
+#: src/libslic3r/PrintConfig.cpp:1888
 msgid "layers"
 msgstr "layers"
 
-#: src/libslic3r/PrintConfig.cpp:304
+#: src/libslic3r/PrintConfig.cpp:332
 msgid "Don't support bridges"
 msgstr "Don't support bridges"
 
-#: src/libslic3r/PrintConfig.cpp:306
+#: src/libslic3r/PrintConfig.cpp:334
 msgid ""
 "Experimental option for preventing support material from being generated "
 "under bridged areas."
@@ -4333,19 +5044,19 @@ msgstr ""
 "Experimental option for preventing support material from being generated "
 "under bridged areas."
 
-#: src/libslic3r/PrintConfig.cpp:313
+#: src/libslic3r/PrintConfig.cpp:340
 msgid "Distance between copies"
 msgstr "Distance between copies"
 
-#: src/libslic3r/PrintConfig.cpp:314
+#: src/libslic3r/PrintConfig.cpp:341
 msgid "Distance used for the auto-arrange feature of the plater."
 msgstr "Distance used for the auto-arrange feature of the plater."
 
-#: src/libslic3r/PrintConfig.cpp:322
+#: src/libslic3r/PrintConfig.cpp:348
 msgid "Elephant foot compensation"
 msgstr "Elephant foot compensation"
 
-#: src/libslic3r/PrintConfig.cpp:324
+#: src/libslic3r/PrintConfig.cpp:350
 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."
@@ -4353,7 +5064,7 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:334
+#: src/libslic3r/PrintConfig.cpp:359
 msgid ""
 "This end procedure is inserted at the end of the output file. Note that you "
 "can use placeholder variables for all Slic3r settings."
@@ -4361,7 +5072,7 @@ msgstr ""
 "This end procedure is inserted at the end of the output file. Note that you "
 "can use placeholder variables for all Slic3r settings."
 
-#: src/libslic3r/PrintConfig.cpp:345
+#: src/libslic3r/PrintConfig.cpp:369
 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 "
@@ -4373,11 +5084,11 @@ msgstr ""
 "Slic3r settings. If you have multiple extruders, the gcode is processed in "
 "extruder order."
 
-#: src/libslic3r/PrintConfig.cpp:356
+#: src/libslic3r/PrintConfig.cpp:379
 msgid "Ensure vertical shell thickness"
 msgstr "Ensure vertical shell thickness"
 
-#: src/libslic3r/PrintConfig.cpp:358
+#: src/libslic3r/PrintConfig.cpp:381
 msgid ""
 "Add solid infill near sloping surfaces to guarantee the vertical shell "
 "thickness (top+bottom solid layers)."
@@ -4385,44 +5096,56 @@ msgstr ""
 "Add solid infill near sloping surfaces to guarantee the vertical shell "
 "thickness (top+bottom solid layers)."
 
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "Top/bottom fill pattern"
+#: src/libslic3r/PrintConfig.cpp:387
+msgid "Top fill pattern"
+msgstr "Top fill pattern"
 
-#: src/libslic3r/PrintConfig.cpp:367
+#: src/libslic3r/PrintConfig.cpp:389
 msgid ""
-"Fill pattern for top/bottom infill. This only affects the external 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 ""
-"Fill pattern for top/bottom infill. This only affects the external 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."
 
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
+#: src/libslic3r/PrintConfig.cpp:397 src/libslic3r/PrintConfig.cpp:795
+#: src/libslic3r/PrintConfig.cpp:1921
 msgid "Rectilinear"
 msgstr "Rectilinear"
 
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
+#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:801
 msgid "Concentric"
 msgstr "Concentric"
 
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
+#: src/libslic3r/PrintConfig.cpp:399 src/libslic3r/PrintConfig.cpp:805
 msgid "Hilbert Curve"
 msgstr "Hilbert Curve"
 
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
+#: src/libslic3r/PrintConfig.cpp:400 src/libslic3r/PrintConfig.cpp:806
 msgid "Archimedean Chords"
 msgstr "Archimedean Chords"
 
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
+#: src/libslic3r/PrintConfig.cpp:401 src/libslic3r/PrintConfig.cpp:807
 msgid "Octagram Spiral"
 msgstr "Octagram Spiral"
 
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
+#: src/libslic3r/PrintConfig.cpp:408
+msgid "Bottom fill pattern"
+msgstr "Bottom fill pattern"
+
+#: src/libslic3r/PrintConfig.cpp:409
+msgid ""
+"Fill pattern for bottom infill. This only affects the bottom external "
+"visible layer, and not its adjacent solid shells."
+msgstr ""
+"Fill pattern for bottom infill. This only affects the bottom external "
+"visible layer, and not its adjacent solid shells."
+
+#: src/libslic3r/PrintConfig.cpp:414 src/libslic3r/PrintConfig.cpp:424
 msgid "External perimeters"
 msgstr "External perimeters"
 
-#: src/libslic3r/PrintConfig.cpp:388
+#: src/libslic3r/PrintConfig.cpp:416
 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, "
@@ -4434,14 +5157,14 @@ msgstr ""
 "otherwise 1.125 x nozzle diameter will be used. If expressed as percentage "
 "(for example 200%), it will be computed over layer height."
 
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
+#: src/libslic3r/PrintConfig.cpp:419 src/libslic3r/PrintConfig.cpp:834
+#: src/libslic3r/PrintConfig.cpp:966 src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1691 src/libslic3r/PrintConfig.cpp:1864
+#: src/libslic3r/PrintConfig.cpp:2022
 msgid "mm or % (leave 0 for default)"
 msgstr "mm or % (leave 0 for default)"
 
-#: src/libslic3r/PrintConfig.cpp:399
+#: src/libslic3r/PrintConfig.cpp:426
 msgid ""
 "This separate setting will affect the speed of external perimeters (the "
 "visible ones). If expressed as percentage (for example: 80%) it will be "
@@ -4451,17 +5174,17 @@ msgstr ""
 "visible ones). If expressed as percentage (for example: 80%) it will be "
 "calculated on the perimeters speed setting above. Set to zero for auto."
 
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
+#: src/libslic3r/PrintConfig.cpp:429 src/libslic3r/PrintConfig.cpp:855
+#: src/libslic3r/PrintConfig.cpp:1650 src/libslic3r/PrintConfig.cpp:1701
+#: src/libslic3r/PrintConfig.cpp:1907 src/libslic3r/PrintConfig.cpp:2034
 msgid "mm/s or %"
 msgstr "mm/s or %"
 
-#: src/libslic3r/PrintConfig.cpp:409
+#: src/libslic3r/PrintConfig.cpp:436
 msgid "External perimeters first"
 msgstr "External perimeters first"
 
-#: src/libslic3r/PrintConfig.cpp:411
+#: src/libslic3r/PrintConfig.cpp:438
 msgid ""
 "Print contour perimeters from the outermost one to the innermost one instead "
 "of the default inverse order."
@@ -4469,11 +5192,11 @@ msgstr ""
 "Print contour perimeters from the outermost one to the innermost one instead "
 "of the default inverse order."
 
-#: src/libslic3r/PrintConfig.cpp:418
+#: src/libslic3r/PrintConfig.cpp:444
 msgid "Extra perimeters if needed"
 msgstr "Extra perimeters if needed"
 
-#: src/libslic3r/PrintConfig.cpp:420
+#: src/libslic3r/PrintConfig.cpp:446
 #, no-c-format
 msgid ""
 "Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r "
@@ -4484,7 +5207,7 @@ msgstr ""
 "keeps adding perimeters, until more than 70% of the loop immediately above "
 "is supported."
 
-#: src/libslic3r/PrintConfig.cpp:431
+#: src/libslic3r/PrintConfig.cpp:456
 msgid ""
 "The extruder to use (unless more specific extruder settings are specified). "
 "This value overrides perimeter and infill extruders, but not the support "
@@ -4494,7 +5217,7 @@ msgstr ""
 "This value overrides perimeter and infill extruders, but not the support "
 "extruders."
 
-#: src/libslic3r/PrintConfig.cpp:444
+#: src/libslic3r/PrintConfig.cpp:468
 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 "
@@ -4506,11 +5229,11 @@ msgstr ""
 "cylinder around your extruder, and it represents the maximum depth the "
 "extruder can peek before colliding with other printed objects."
 
-#: src/libslic3r/PrintConfig.cpp:455
+#: src/libslic3r/PrintConfig.cpp:478
 msgid "Radius"
 msgstr "Radius"
 
-#: src/libslic3r/PrintConfig.cpp:456
+#: src/libslic3r/PrintConfig.cpp:479
 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 "
@@ -4520,19 +5243,19 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:467
+#: src/libslic3r/PrintConfig.cpp:489
 msgid "Extruder Color"
 msgstr "Extruder Color"
 
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
+#: src/libslic3r/PrintConfig.cpp:490 src/libslic3r/PrintConfig.cpp:550
 msgid "This is only used in the Slic3r interface as a visual help."
 msgstr "This is only used in the Slic3r interface as a visual help."
 
-#: src/libslic3r/PrintConfig.cpp:475
+#: src/libslic3r/PrintConfig.cpp:496
 msgid "Extruder offset"
 msgstr "Extruder offset"
 
-#: src/libslic3r/PrintConfig.cpp:476
+#: src/libslic3r/PrintConfig.cpp:497
 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 "
@@ -4544,11 +5267,11 @@ msgstr ""
 "of each extruder with respect to the first one. It expects positive "
 "coordinates (they will be subtracted from the XY coordinate)."
 
-#: src/libslic3r/PrintConfig.cpp:486
+#: src/libslic3r/PrintConfig.cpp:506
 msgid "Extrusion axis"
 msgstr "Extrusion axis"
 
-#: src/libslic3r/PrintConfig.cpp:487
+#: src/libslic3r/PrintConfig.cpp:507
 msgid ""
 "Use this option to set the axis letter associated to your printer's extruder "
 "(usually E but some printers use A)."
@@ -4556,11 +5279,11 @@ msgstr ""
 "Use this option to set the axis letter associated to your printer's extruder "
 "(usually E but some printers use A)."
 
-#: src/libslic3r/PrintConfig.cpp:493
+#: src/libslic3r/PrintConfig.cpp:512
 msgid "Extrusion multiplier"
 msgstr "Extrusion multiplier"
 
-#: src/libslic3r/PrintConfig.cpp:494
+#: src/libslic3r/PrintConfig.cpp:513
 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. "
@@ -4572,11 +5295,11 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:503
+#: src/libslic3r/PrintConfig.cpp:521
 msgid "Default extrusion width"
 msgstr "Default extrusion width"
 
-#: src/libslic3r/PrintConfig.cpp:505
+#: src/libslic3r/PrintConfig.cpp:523
 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 "
@@ -4590,15 +5313,15 @@ msgstr ""
 "expressed as percentage (for example: 230%), it will be computed over layer "
 "height."
 
-#: src/libslic3r/PrintConfig.cpp:509
+#: src/libslic3r/PrintConfig.cpp:527
 msgid "mm or % (leave 0 for auto)"
 msgstr "mm or % (leave 0 for auto)"
 
-#: src/libslic3r/PrintConfig.cpp:515
+#: src/libslic3r/PrintConfig.cpp:532
 msgid "Keep fan always on"
 msgstr "Keep fan always on"
 
-#: src/libslic3r/PrintConfig.cpp:516
+#: src/libslic3r/PrintConfig.cpp:533
 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."
@@ -4606,11 +5329,11 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:522
+#: src/libslic3r/PrintConfig.cpp:538
 msgid "Enable fan if layer print time is below"
 msgstr "Enable fan if layer print time is below"
 
-#: src/libslic3r/PrintConfig.cpp:523
+#: src/libslic3r/PrintConfig.cpp:539
 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 "
@@ -4620,27 +5343,27 @@ msgstr ""
 "enabled and its speed will be calculated by interpolating the minimum and "
 "maximum speeds."
 
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
+#: src/libslic3r/PrintConfig.cpp:541 src/libslic3r/PrintConfig.cpp:1637
 msgid "approximate seconds"
 msgstr "approximate seconds"
 
-#: src/libslic3r/PrintConfig.cpp:534
+#: src/libslic3r/PrintConfig.cpp:549
 msgid "Color"
 msgstr "Color"
 
-#: src/libslic3r/PrintConfig.cpp:541
+#: src/libslic3r/PrintConfig.cpp:555
 msgid "Filament notes"
 msgstr "Filament notes"
 
-#: src/libslic3r/PrintConfig.cpp:542
+#: src/libslic3r/PrintConfig.cpp:556
 msgid "You can put your notes regarding the filament here."
 msgstr "You can put your notes regarding the filament here."
 
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
+#: src/libslic3r/PrintConfig.cpp:564 src/libslic3r/PrintConfig.cpp:1181
 msgid "Max volumetric speed"
 msgstr "Max volumetric speed"
 
-#: src/libslic3r/PrintConfig.cpp:552
+#: src/libslic3r/PrintConfig.cpp:565
 msgid ""
 "Maximum volumetric speed allowed for this filament. Limits the maximum "
 "volumetric speed of a print to the minimum of print and filament volumetric "
@@ -4650,31 +5373,31 @@ msgstr ""
 "volumetric speed of a print to the minimum of print and filament volumetric "
 "speed. Set to zero for no limit."
 
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
+#: src/libslic3r/PrintConfig.cpp:568 src/libslic3r/PrintConfig.cpp:1184
 msgid "mm³/s"
 msgstr "mm³/s"
 
-#: src/libslic3r/PrintConfig.cpp:562
+#: src/libslic3r/PrintConfig.cpp:574
 msgid "Loading speed"
 msgstr "Loading speed"
 
-#: src/libslic3r/PrintConfig.cpp:563
+#: src/libslic3r/PrintConfig.cpp:575
 msgid "Speed used for loading the filament on the wipe tower. "
 msgstr "Speed used for loading the filament on the wipe tower. "
 
-#: src/libslic3r/PrintConfig.cpp:571
+#: src/libslic3r/PrintConfig.cpp:582
 msgid "Loading speed at the start"
 msgstr "Loading speed at the start"
 
-#: src/libslic3r/PrintConfig.cpp:572
+#: src/libslic3r/PrintConfig.cpp:583
 msgid "Speed used at the very beginning of loading phase. "
 msgstr "Speed used at the very beginning of loading phase. "
 
-#: src/libslic3r/PrintConfig.cpp:580
+#: src/libslic3r/PrintConfig.cpp:590
 msgid "Unloading speed"
 msgstr "Unloading speed"
 
-#: src/libslic3r/PrintConfig.cpp:581
+#: src/libslic3r/PrintConfig.cpp:591
 msgid ""
 "Speed used for unloading the filament on the wipe tower (does not affect  "
 "initial part of unloading just after ramming). "
@@ -4682,21 +5405,21 @@ msgstr ""
 "Speed used for unloading the filament on the wipe tower (does not affect  "
 "initial part of unloading just after ramming). "
 
-#: src/libslic3r/PrintConfig.cpp:590
+#: src/libslic3r/PrintConfig.cpp:599
 msgid "Unloading speed at the start"
 msgstr "Unloading speed at the start"
 
-#: src/libslic3r/PrintConfig.cpp:591
+#: src/libslic3r/PrintConfig.cpp:600
 msgid ""
 "Speed used for unloading the tip of the filament immediately after ramming. "
 msgstr ""
 "Speed used for unloading the tip of the filament immediately after ramming. "
 
-#: src/libslic3r/PrintConfig.cpp:599
+#: src/libslic3r/PrintConfig.cpp:607
 msgid "Delay after unloading"
 msgstr "Delay after unloading"
 
-#: src/libslic3r/PrintConfig.cpp:600
+#: src/libslic3r/PrintConfig.cpp:608
 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 "
@@ -4706,11 +5429,11 @@ msgstr ""
 "toolchanges with flexible materials that may need more time to shrink to "
 "original dimensions. "
 
-#: src/libslic3r/PrintConfig.cpp:610
+#: src/libslic3r/PrintConfig.cpp:617
 msgid "Number of cooling moves"
 msgstr "Number of cooling moves"
 
-#: src/libslic3r/PrintConfig.cpp:611
+#: src/libslic3r/PrintConfig.cpp:618
 msgid ""
 "Filament is cooled by being moved back and forth in the cooling tubes. "
 "Specify desired number of these moves "
@@ -4718,19 +5441,19 @@ msgstr ""
 "Filament is cooled by being moved back and forth in the cooling tubes. "
 "Specify desired number of these moves "
 
-#: src/libslic3r/PrintConfig.cpp:620
+#: src/libslic3r/PrintConfig.cpp:626
 msgid "Speed of the first cooling move"
 msgstr "Speed of the first cooling move"
 
-#: src/libslic3r/PrintConfig.cpp:621
+#: src/libslic3r/PrintConfig.cpp:627
 msgid "Cooling moves are gradually accelerating beginning at this speed. "
 msgstr "Cooling moves are gradually accelerating beginning at this speed. "
 
-#: src/libslic3r/PrintConfig.cpp:629
+#: src/libslic3r/PrintConfig.cpp:634
 msgid "Minimal purge on wipe tower"
 msgstr "Minimal purge on wipe tower"
 
-#: src/libslic3r/PrintConfig.cpp:630
+#: src/libslic3r/PrintConfig.cpp:635
 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 "
@@ -4744,23 +5467,23 @@ msgstr ""
 "object, Slic3r will always prime this amount of material into the wipe tower "
 "to produce successive infill or sacrificial object extrusions reliably."
 
-#: src/libslic3r/PrintConfig.cpp:635
+#: src/libslic3r/PrintConfig.cpp:639
 msgid "mm³"
 msgstr "mm³"
 
-#: src/libslic3r/PrintConfig.cpp:641
+#: src/libslic3r/PrintConfig.cpp:645
 msgid "Speed of the last cooling move"
 msgstr "Speed of the last cooling move"
 
-#: src/libslic3r/PrintConfig.cpp:642
+#: src/libslic3r/PrintConfig.cpp:646
 msgid "Cooling moves are gradually accelerating towards this speed. "
 msgstr "Cooling moves are gradually accelerating towards this speed. "
 
-#: src/libslic3r/PrintConfig.cpp:650
+#: src/libslic3r/PrintConfig.cpp:653
 msgid "Filament load time"
 msgstr "Filament load time"
 
-#: src/libslic3r/PrintConfig.cpp:651
+#: src/libslic3r/PrintConfig.cpp:654
 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 "
@@ -4770,11 +5493,11 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:659
+#: src/libslic3r/PrintConfig.cpp:661
 msgid "Ramming parameters"
 msgstr "Ramming parameters"
 
-#: src/libslic3r/PrintConfig.cpp:660
+#: src/libslic3r/PrintConfig.cpp:662
 msgid ""
 "This string is edited by RammingDialog and contains ramming specific "
 "parameters "
@@ -4782,11 +5505,11 @@ msgstr ""
 "This string is edited by RammingDialog and contains ramming specific "
 "parameters "
 
-#: src/libslic3r/PrintConfig.cpp:667
+#: src/libslic3r/PrintConfig.cpp:668
 msgid "Filament unload time"
 msgstr "Filament unload time"
 
-#: src/libslic3r/PrintConfig.cpp:668
+#: src/libslic3r/PrintConfig.cpp:669
 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 "
@@ -4806,11 +5529,11 @@ msgstr ""
 "caliper and do multiple measurements along the filament, then compute the "
 "average."
 
-#: src/libslic3r/PrintConfig.cpp:685
+#: src/libslic3r/PrintConfig.cpp:684
 msgid "Density"
 msgstr "Density"
 
-#: src/libslic3r/PrintConfig.cpp:686
+#: src/libslic3r/PrintConfig.cpp:685
 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 "
@@ -4822,27 +5545,27 @@ msgstr ""
 "the length to volume. Better is to calculate the volume directly through "
 "displacement."
 
-#: src/libslic3r/PrintConfig.cpp:689
+#: src/libslic3r/PrintConfig.cpp:688
 msgid "g/cm³"
 msgstr "g/cm³"
 
-#: src/libslic3r/PrintConfig.cpp:695
+#: src/libslic3r/PrintConfig.cpp:693
 msgid "Filament type"
 msgstr "Filament type"
 
-#: src/libslic3r/PrintConfig.cpp:696
+#: src/libslic3r/PrintConfig.cpp:694
 msgid "The filament material type for use in custom G-codes."
 msgstr "The filament material type for use in custom G-codes."
 
-#: src/libslic3r/PrintConfig.cpp:712
+#: src/libslic3r/PrintConfig.cpp:710
 msgid "Soluble material"
 msgstr "Soluble material"
 
-#: src/libslic3r/PrintConfig.cpp:713
+#: src/libslic3r/PrintConfig.cpp:711
 msgid "Soluble material is most likely used for a soluble support."
 msgstr "Soluble material is most likely used for a soluble support."
 
-#: src/libslic3r/PrintConfig.cpp:719
+#: src/libslic3r/PrintConfig.cpp:717
 msgid ""
 "Enter your filament cost per kg here. This is only for statistical "
 "information."
@@ -4850,15 +5573,15 @@ msgstr ""
 "Enter your filament cost per kg here. This is only for statistical "
 "information."
 
-#: src/libslic3r/PrintConfig.cpp:720
+#: src/libslic3r/PrintConfig.cpp:718
 msgid "money/kg"
 msgstr "money/kg"
 
-#: src/libslic3r/PrintConfig.cpp:729
+#: src/libslic3r/PrintConfig.cpp:727
 msgid "Fill angle"
 msgstr "Fill angle"
 
-#: src/libslic3r/PrintConfig.cpp:731
+#: src/libslic3r/PrintConfig.cpp:729
 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, "
@@ -4868,60 +5591,60 @@ msgstr ""
 "this. Bridges will be infilled using the best direction Slic3r can detect, "
 "so this setting does not affect them."
 
-#: src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:741
 msgid "Fill density"
 msgstr "Fill density"
 
-#: src/libslic3r/PrintConfig.cpp:746
+#: src/libslic3r/PrintConfig.cpp:743
 msgid "Density of internal infill, expressed in the range 0% - 100%."
 msgstr "Density of internal infill, expressed in the range 0% - 100%."
 
-#: src/libslic3r/PrintConfig.cpp:782
+#: src/libslic3r/PrintConfig.cpp:778
 msgid "Fill pattern"
 msgstr "Fill pattern"
 
-#: src/libslic3r/PrintConfig.cpp:784
+#: src/libslic3r/PrintConfig.cpp:780
 msgid "Fill pattern for general low-density infill."
 msgstr "Fill pattern for general low-density infill."
 
-#: src/libslic3r/PrintConfig.cpp:801
+#: src/libslic3r/PrintConfig.cpp:796
 msgid "Grid"
 msgstr "Grid"
 
-#: src/libslic3r/PrintConfig.cpp:802
+#: src/libslic3r/PrintConfig.cpp:797
 msgid "Triangles"
 msgstr "Triangles"
 
-#: src/libslic3r/PrintConfig.cpp:803
+#: src/libslic3r/PrintConfig.cpp:798
 msgid "Stars"
 msgstr "Stars"
 
-#: src/libslic3r/PrintConfig.cpp:804
+#: src/libslic3r/PrintConfig.cpp:799
 msgid "Cubic"
 msgstr "Cubic"
 
-#: src/libslic3r/PrintConfig.cpp:805
+#: src/libslic3r/PrintConfig.cpp:800
 msgid "Line"
 msgstr "Line"
 
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
+#: src/libslic3r/PrintConfig.cpp:802 src/libslic3r/PrintConfig.cpp:1923
 msgid "Honeycomb"
 msgstr "Honeycomb"
 
-#: src/libslic3r/PrintConfig.cpp:808
+#: src/libslic3r/PrintConfig.cpp:803
 msgid "3D Honeycomb"
 msgstr "3D Honeycomb"
 
-#: src/libslic3r/PrintConfig.cpp:809
+#: src/libslic3r/PrintConfig.cpp:804
 msgid "Gyroid"
 msgstr "Gyroid"
 
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
+#: src/libslic3r/PrintConfig.cpp:811 src/libslic3r/PrintConfig.cpp:820
+#: src/libslic3r/PrintConfig.cpp:828 src/libslic3r/PrintConfig.cpp:861
 msgid "First layer"
 msgstr "First layer"
 
-#: src/libslic3r/PrintConfig.cpp:817
+#: src/libslic3r/PrintConfig.cpp:812
 msgid ""
 "This is the acceleration your printer will use for first layer. Set zero to "
 "disable acceleration control for first layer."
@@ -4929,7 +5652,7 @@ msgstr ""
 "This is the acceleration your printer will use for first layer. Set zero to "
 "disable acceleration control for first layer."
 
-#: src/libslic3r/PrintConfig.cpp:827
+#: src/libslic3r/PrintConfig.cpp:821
 msgid ""
 "Heated build plate temperature for the first layer. Set this to zero to "
 "disable bed temperature control commands in the output."
@@ -4937,7 +5660,7 @@ msgstr ""
 "Heated build plate temperature for the first layer. Set this to zero to "
 "disable bed temperature control commands in the output."
 
-#: src/libslic3r/PrintConfig.cpp:837
+#: src/libslic3r/PrintConfig.cpp:830
 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 "
@@ -4949,11 +5672,11 @@ msgstr ""
 "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/libslic3r/PrintConfig.cpp:848
+#: src/libslic3r/PrintConfig.cpp:840
 msgid "First layer height"
 msgstr "First layer height"
 
-#: src/libslic3r/PrintConfig.cpp:850
+#: src/libslic3r/PrintConfig.cpp:842
 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 "
@@ -4965,16 +5688,16 @@ msgstr ""
 "plates. This can be expressed as an absolute value or as a percentage (for "
 "example: 150%) over the default layer height."
 
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
+#: src/libslic3r/PrintConfig.cpp:846 src/libslic3r/PrintConfig.cpp:991
+#: src/libslic3r/PrintConfig.cpp:1796
 msgid "mm or %"
 msgstr "mm or %"
 
-#: src/libslic3r/PrintConfig.cpp:860
+#: src/libslic3r/PrintConfig.cpp:851
 msgid "First layer speed"
 msgstr "First layer speed"
 
-#: src/libslic3r/PrintConfig.cpp:861
+#: src/libslic3r/PrintConfig.cpp:852
 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 "
@@ -4984,7 +5707,7 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:872
+#: src/libslic3r/PrintConfig.cpp:862
 msgid ""
 "Extruder temperature for first layer. If you want to control temperature "
 "manually during print, set this to zero to disable temperature control "
@@ -4994,7 +5717,7 @@ msgstr ""
 "manually during print, set this to zero to disable temperature control "
 "commands in the output file."
 
-#: src/libslic3r/PrintConfig.cpp:882
+#: src/libslic3r/PrintConfig.cpp:871
 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 "
@@ -5004,11 +5727,11 @@ msgstr ""
 "low to avoid too much shaking and resonance issues. Set zero to disable gaps "
 "filling."
 
-#: src/libslic3r/PrintConfig.cpp:890
+#: src/libslic3r/PrintConfig.cpp:879
 msgid "Verbose G-code"
 msgstr "Verbose G-code"
 
-#: src/libslic3r/PrintConfig.cpp:891
+#: src/libslic3r/PrintConfig.cpp:880
 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 "
@@ -5018,11 +5741,11 @@ msgstr ""
 "descriptive text. If you print from SD card, the additional weight of the "
 "file could make your firmware slow down."
 
-#: src/libslic3r/PrintConfig.cpp:899
+#: src/libslic3r/PrintConfig.cpp:887
 msgid "G-code flavor"
 msgstr "G-code flavor"
 
-#: src/libslic3r/PrintConfig.cpp:900
+#: src/libslic3r/PrintConfig.cpp:888
 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 "
@@ -5034,15 +5757,15 @@ msgstr ""
 "output. The \"No extrusion\" flavor prevents Slic3r from exporting any "
 "extrusion value at all."
 
-#: src/libslic3r/PrintConfig.cpp:924
+#: src/libslic3r/PrintConfig.cpp:911
 msgid "No extrusion"
 msgstr "No extrusion"
 
-#: src/libslic3r/PrintConfig.cpp:929
+#: src/libslic3r/PrintConfig.cpp:924
 msgid "High extruder current on filament swap"
 msgstr "High extruder current on filament swap"
 
-#: src/libslic3r/PrintConfig.cpp:930
+#: src/libslic3r/PrintConfig.cpp:925
 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 "
@@ -5052,7 +5775,7 @@ msgstr ""
 "filament exchange sequence to allow for rapid ramming feed rates and to "
 "overcome resistance when loading a filament with an ugly shaped tip."
 
-#: src/libslic3r/PrintConfig.cpp:939
+#: src/libslic3r/PrintConfig.cpp:933
 msgid ""
 "This is the acceleration your printer will use for infill. Set zero to "
 "disable acceleration control for infill."
@@ -5060,11 +5783,11 @@ msgstr ""
 "This is the acceleration your printer will use for infill. Set zero to "
 "disable acceleration control for infill."
 
-#: src/libslic3r/PrintConfig.cpp:948
+#: src/libslic3r/PrintConfig.cpp:941
 msgid "Combine infill every"
 msgstr "Combine infill every"
 
-#: src/libslic3r/PrintConfig.cpp:950
+#: src/libslic3r/PrintConfig.cpp:943
 msgid ""
 "This feature allows to combine infill and speed up your print by extruding "
 "thicker infill layers while preserving thin perimeters, thus accuracy."
@@ -5072,19 +5795,19 @@ msgstr ""
 "This feature allows to combine infill and speed up your print by extruding "
 "thicker infill layers while preserving thin perimeters, thus accuracy."
 
-#: src/libslic3r/PrintConfig.cpp:954
+#: src/libslic3r/PrintConfig.cpp:946
 msgid "Combine infill every n layers"
 msgstr "Combine infill every n layers"
 
-#: src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:952
 msgid "Infill extruder"
 msgstr "Infill extruder"
 
-#: src/libslic3r/PrintConfig.cpp:962
+#: src/libslic3r/PrintConfig.cpp:954
 msgid "The extruder to use when printing infill."
 msgstr "The extruder to use when printing infill."
 
-#: src/libslic3r/PrintConfig.cpp:971
+#: src/libslic3r/PrintConfig.cpp:962
 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 "
@@ -5098,11 +5821,11 @@ msgstr ""
 "up the infill and make your parts stronger. If expressed as percentage (for "
 "example 90%) it will be computed over layer height."
 
-#: src/libslic3r/PrintConfig.cpp:981
+#: src/libslic3r/PrintConfig.cpp:971
 msgid "Infill before perimeters"
 msgstr "Infill before perimeters"
 
-#: src/libslic3r/PrintConfig.cpp:982
+#: src/libslic3r/PrintConfig.cpp:972
 msgid ""
 "This option will switch the print order of perimeters and infill, making the "
 "latter first."
@@ -5110,11 +5833,11 @@ msgstr ""
 "This option will switch the print order of perimeters and infill, making the "
 "latter first."
 
-#: src/libslic3r/PrintConfig.cpp:988
+#: src/libslic3r/PrintConfig.cpp:977
 msgid "Only infill where needed"
 msgstr "Only infill where needed"
 
-#: src/libslic3r/PrintConfig.cpp:990
+#: src/libslic3r/PrintConfig.cpp:979
 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 "
@@ -5124,11 +5847,11 @@ msgstr ""
 "ceilings (it will act as internal support material). If enabled, slows down "
 "the G-code generation due to the multiple checks involved."
 
-#: src/libslic3r/PrintConfig.cpp:998
+#: src/libslic3r/PrintConfig.cpp:986
 msgid "Infill/perimeters overlap"
 msgstr "Infill/perimeters overlap"
 
-#: src/libslic3r/PrintConfig.cpp:1000
+#: src/libslic3r/PrintConfig.cpp:988
 msgid ""
 "This setting applies an additional overlap between infill and perimeters for "
 "better bonding. Theoretically this shouldn't be needed, but backlash might "
@@ -5140,23 +5863,23 @@ msgstr ""
 "cause gaps. If expressed as percentage (example: 15%) it is calculated over "
 "perimeter extrusion width."
 
-#: src/libslic3r/PrintConfig.cpp:1012
+#: src/libslic3r/PrintConfig.cpp:999
 msgid "Speed for printing the internal fill. Set to zero for auto."
 msgstr "Speed for printing the internal fill. Set to zero for auto."
 
-#: src/libslic3r/PrintConfig.cpp:1020
+#: src/libslic3r/PrintConfig.cpp:1007
 msgid "Inherits profile"
 msgstr "Inherits profile"
 
-#: src/libslic3r/PrintConfig.cpp:1021
+#: src/libslic3r/PrintConfig.cpp:1008
 msgid "Name of the profile, from which this profile inherits."
 msgstr "Name of the profile, from which this profile inherits."
 
-#: src/libslic3r/PrintConfig.cpp:1032
+#: src/libslic3r/PrintConfig.cpp:1021
 msgid "Interface shells"
 msgstr "Interface shells"
 
-#: src/libslic3r/PrintConfig.cpp:1033
+#: src/libslic3r/PrintConfig.cpp:1022
 msgid ""
 "Force the generation of solid shells between adjacent materials/volumes. "
 "Useful for multi-extruder prints with translucent materials or manual "
@@ -5166,7 +5889,7 @@ msgstr ""
 "Useful for multi-extruder prints with translucent materials or manual "
 "soluble support material."
 
-#: src/libslic3r/PrintConfig.cpp:1043
+#: src/libslic3r/PrintConfig.cpp:1031
 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 "
@@ -5178,11 +5901,11 @@ msgstr ""
 "use placeholder variables for all Slic3r settings as well as [layer_num] and "
 "[layer_z]."
 
-#: src/libslic3r/PrintConfig.cpp:1054
+#: src/libslic3r/PrintConfig.cpp:1042
 msgid "Supports remaining times"
 msgstr "Supports remaining times"
 
-#: src/libslic3r/PrintConfig.cpp:1055
+#: src/libslic3r/PrintConfig.cpp:1043
 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. "
@@ -5194,63 +5917,63 @@ msgstr ""
 "As of now only the Prusa i3 MK3 firmware recognizes M73. Also the i3 MK3 "
 "firmware supports M73 Qxx Sxx for the silent mode."
 
-#: src/libslic3r/PrintConfig.cpp:1063
+#: src/libslic3r/PrintConfig.cpp:1051
 msgid "Supports silent mode"
 msgstr "Supports silent mode"
 
-#: src/libslic3r/PrintConfig.cpp:1064
+#: src/libslic3r/PrintConfig.cpp:1052
 msgid "Set silent mode for the G-code flavor"
 msgstr "Set silent mode for the G-code flavor"
 
-#: src/libslic3r/PrintConfig.cpp:1087
+#: src/libslic3r/PrintConfig.cpp:1075
 msgid "Maximum feedrate %1%"
 msgstr "Maximum feedrate %1%"
 
-#: src/libslic3r/PrintConfig.cpp:1089
+#: src/libslic3r/PrintConfig.cpp:1077
 msgid "Maximum feedrate of the %1% axis"
 msgstr "Maximum feedrate of the %1% axis"
 
-#: src/libslic3r/PrintConfig.cpp:1097
+#: src/libslic3r/PrintConfig.cpp:1085
 msgid "Maximum acceleration %1%"
 msgstr "Maximum acceleration %1%"
 
-#: src/libslic3r/PrintConfig.cpp:1099
+#: src/libslic3r/PrintConfig.cpp:1087
 msgid "Maximum acceleration of the %1% axis"
 msgstr "Maximum acceleration of the %1% axis"
 
-#: src/libslic3r/PrintConfig.cpp:1107
+#: src/libslic3r/PrintConfig.cpp:1095
 msgid "Maximum jerk %1%"
 msgstr "Maximum jerk %1%"
 
-#: src/libslic3r/PrintConfig.cpp:1109
+#: src/libslic3r/PrintConfig.cpp:1097
 msgid "Maximum jerk of the %1% axis"
 msgstr "Maximum jerk of the %1% axis"
 
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
+#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1110
 msgid "Minimum feedrate when extruding"
 msgstr "Minimum feedrate when extruding"
 
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
+#: src/libslic3r/PrintConfig.cpp:1119 src/libslic3r/PrintConfig.cpp:1121
 msgid "Minimum travel feedrate"
 msgstr "Minimum travel feedrate"
 
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
+#: src/libslic3r/PrintConfig.cpp:1130 src/libslic3r/PrintConfig.cpp:1132
 msgid "Maximum acceleration when extruding"
 msgstr "Maximum acceleration when extruding"
 
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
+#: src/libslic3r/PrintConfig.cpp:1141 src/libslic3r/PrintConfig.cpp:1143
 msgid "Maximum acceleration when retracting"
 msgstr "Maximum acceleration when retracting"
 
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
+#: src/libslic3r/PrintConfig.cpp:1151 src/libslic3r/PrintConfig.cpp:1160
 msgid "Max"
 msgstr "Max"
 
-#: src/libslic3r/PrintConfig.cpp:1164
+#: src/libslic3r/PrintConfig.cpp:1152
 msgid "This setting represents the maximum speed of your fan."
 msgstr "This setting represents the maximum speed of your fan."
 
-#: src/libslic3r/PrintConfig.cpp:1174
+#: src/libslic3r/PrintConfig.cpp:1161
 #, no-c-format
 msgid ""
 "This is the highest printable layer height for this extruder, used to cap "
@@ -5263,11 +5986,11 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:1185
+#: src/libslic3r/PrintConfig.cpp:1171
 msgid "Max print speed"
 msgstr "Max print speed"
 
-#: src/libslic3r/PrintConfig.cpp:1186
+#: src/libslic3r/PrintConfig.cpp:1172
 msgid ""
 "When setting other speed settings to 0 Slic3r will autocalculate the optimal "
 "speed in order to keep constant extruder pressure. This experimental setting "
@@ -5277,7 +6000,7 @@ msgstr ""
 "speed in order to keep constant extruder pressure. This experimental setting "
 "is used to set the highest print speed you want to allow."
 
-#: src/libslic3r/PrintConfig.cpp:1197
+#: src/libslic3r/PrintConfig.cpp:1182
 msgid ""
 "This experimental setting is used to set the maximum volumetric speed your "
 "extruder supports."
@@ -5285,11 +6008,11 @@ msgstr ""
 "This experimental setting is used to set the maximum volumetric speed your "
 "extruder supports."
 
-#: src/libslic3r/PrintConfig.cpp:1206
+#: src/libslic3r/PrintConfig.cpp:1191
 msgid "Max volumetric slope positive"
 msgstr "Max volumetric slope positive"
 
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
+#: src/libslic3r/PrintConfig.cpp:1192 src/libslic3r/PrintConfig.cpp:1203
 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 "
@@ -5301,23 +6024,23 @@ msgstr ""
 "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/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
+#: src/libslic3r/PrintConfig.cpp:1196 src/libslic3r/PrintConfig.cpp:1207
 msgid "mm³/s²"
 msgstr "mm³/s²"
 
-#: src/libslic3r/PrintConfig.cpp:1218
+#: src/libslic3r/PrintConfig.cpp:1202
 msgid "Max volumetric slope negative"
 msgstr "Max volumetric slope negative"
 
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
+#: src/libslic3r/PrintConfig.cpp:1214 src/libslic3r/PrintConfig.cpp:1223
 msgid "Min"
 msgstr "Min"
 
-#: src/libslic3r/PrintConfig.cpp:1231
+#: src/libslic3r/PrintConfig.cpp:1215
 msgid "This setting represents the minimum PWM your fan needs to work."
 msgstr "This setting represents the minimum PWM your fan needs to work."
 
-#: src/libslic3r/PrintConfig.cpp:1241
+#: src/libslic3r/PrintConfig.cpp:1224
 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 "
@@ -5327,19 +6050,19 @@ msgstr ""
 "resolution for variable layer height. Typical values are between 0.05 mm and "
 "0.1 mm."
 
-#: src/libslic3r/PrintConfig.cpp:1250
+#: src/libslic3r/PrintConfig.cpp:1232
 msgid "Min print speed"
 msgstr "Min print speed"
 
-#: src/libslic3r/PrintConfig.cpp:1251
+#: src/libslic3r/PrintConfig.cpp:1233
 msgid "Slic3r will not scale speed down below this speed."
 msgstr "Slic3r will not scale speed down below this speed."
 
-#: src/libslic3r/PrintConfig.cpp:1259
+#: src/libslic3r/PrintConfig.cpp:1240
 msgid "Minimal filament extrusion length"
 msgstr "Minimal filament extrusion length"
 
-#: src/libslic3r/PrintConfig.cpp:1260
+#: src/libslic3r/PrintConfig.cpp:1241
 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 "
@@ -5349,11 +6072,11 @@ msgstr ""
 "specified amount of filament on the bottom layer. For multi-extruder "
 "machines, this minimum applies to each extruder."
 
-#: src/libslic3r/PrintConfig.cpp:1270
+#: src/libslic3r/PrintConfig.cpp:1250
 msgid "Configuration notes"
 msgstr "Configuration notes"
 
-#: src/libslic3r/PrintConfig.cpp:1271
+#: src/libslic3r/PrintConfig.cpp:1251
 msgid ""
 "You can put here your personal notes. This text will be added to the G-code "
 "header comments."
@@ -5361,21 +6084,21 @@ msgstr ""
 "You can put here your personal notes. This text will be added to the G-code "
 "header comments."
 
-#: src/libslic3r/PrintConfig.cpp:1281
+#: src/libslic3r/PrintConfig.cpp:1260
 msgid "Nozzle diameter"
 msgstr "Nozzle diameter"
 
-#: src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1261
 msgid ""
 "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
 msgstr ""
 "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
 
-#: src/libslic3r/PrintConfig.cpp:1288
+#: src/libslic3r/PrintConfig.cpp:1266
 msgid "Host Type"
 msgstr "Host Type"
 
-#: src/libslic3r/PrintConfig.cpp:1289
+#: src/libslic3r/PrintConfig.cpp:1267
 msgid ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
@@ -5383,35 +6106,11 @@ msgstr ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
 
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr "API Key / Password"
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 can upload G-code files to a printer host. This field should contain "
-"the API Key or the password required for authentication."
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr "Hostname, IP or URL"
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-"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."
-
-#: src/libslic3r/PrintConfig.cpp:1325
+#: src/libslic3r/PrintConfig.cpp:1278
 msgid "Only retract when crossing perimeters"
 msgstr "Only retract when crossing perimeters"
 
-#: src/libslic3r/PrintConfig.cpp:1326
+#: src/libslic3r/PrintConfig.cpp:1279
 msgid ""
 "Disables retraction when the travel path does not exceed the upper layer's "
 "perimeters (and thus any ooze will be probably invisible)."
@@ -5419,7 +6118,7 @@ msgstr ""
 "Disables retraction when the travel path does not exceed the upper layer's "
 "perimeters (and thus any ooze will be probably invisible)."
 
-#: src/libslic3r/PrintConfig.cpp:1334
+#: src/libslic3r/PrintConfig.cpp:1286
 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 "
@@ -5429,11 +6128,11 @@ msgstr ""
 "oozing. It will enable a tall skirt automatically and move extruders outside "
 "such skirt when changing temperatures."
 
-#: src/libslic3r/PrintConfig.cpp:1342
+#: src/libslic3r/PrintConfig.cpp:1293
 msgid "Output filename format"
 msgstr "Output filename format"
 
-#: src/libslic3r/PrintConfig.cpp:1343
+#: src/libslic3r/PrintConfig.cpp:1294
 msgid ""
 "You can use all configuration options as variables inside this template. For "
 "example: [layer_height], [fill_density] etc. You can also use [timestamp], "
@@ -5445,11 +6144,11 @@ msgstr ""
 "[year], [month], [day], [hour], [minute], [second], [version], "
 "[input_filename], [input_filename_base]."
 
-#: src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1303
 msgid "Detect bridging perimeters"
 msgstr "Detect bridging perimeters"
 
-#: src/libslic3r/PrintConfig.cpp:1355
+#: src/libslic3r/PrintConfig.cpp:1305
 msgid ""
 "Experimental option to adjust flow for overhangs (bridge flow will be used), "
 "to apply bridge speed to them and enable fan."
@@ -5457,11 +6156,11 @@ msgstr ""
 "Experimental option to adjust flow for overhangs (bridge flow will be used), "
 "to apply bridge speed to them and enable fan."
 
-#: src/libslic3r/PrintConfig.cpp:1362
+#: src/libslic3r/PrintConfig.cpp:1311
 msgid "Filament parking position"
 msgstr "Filament parking position"
 
-#: src/libslic3r/PrintConfig.cpp:1363
+#: src/libslic3r/PrintConfig.cpp:1312
 msgid ""
 "Distance of the extruder tip from the position where the filament is parked "
 "when unloaded. This should match the value in printer firmware. "
@@ -5469,11 +6168,11 @@ msgstr ""
 "Distance of the extruder tip from the position where the filament is parked "
 "when unloaded. This should match the value in printer firmware. "
 
-#: src/libslic3r/PrintConfig.cpp:1372
+#: src/libslic3r/PrintConfig.cpp:1320
 msgid "Extra loading distance"
 msgstr "Extra loading distance"
 
-#: src/libslic3r/PrintConfig.cpp:1373
+#: src/libslic3r/PrintConfig.cpp:1321
 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 "
@@ -5485,12 +6184,12 @@ msgstr ""
 "positive, it is loaded further,  if negative, the loading move is shorter "
 "than unloading. "
 
-#: src/libslic3r/PrintConfig.cpp:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
+#: src/libslic3r/PrintConfig.cpp:1329 src/libslic3r/PrintConfig.cpp:1347
+#: src/libslic3r/PrintConfig.cpp:1359 src/libslic3r/PrintConfig.cpp:1369
 msgid "Perimeters"
 msgstr "Perimeters"
 
-#: src/libslic3r/PrintConfig.cpp:1383
+#: src/libslic3r/PrintConfig.cpp:1330
 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 "
@@ -5500,17 +6199,17 @@ msgstr ""
 "like 9000 usually gives good results if your hardware is up to the job. Set "
 "zero to disable acceleration control for perimeters."
 
-#: src/libslic3r/PrintConfig.cpp:1392
+#: src/libslic3r/PrintConfig.cpp:1338
 msgid "Perimeter extruder"
 msgstr "Perimeter extruder"
 
-#: src/libslic3r/PrintConfig.cpp:1394
+#: src/libslic3r/PrintConfig.cpp:1340
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
 msgstr ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
 
-#: src/libslic3r/PrintConfig.cpp:1404
+#: src/libslic3r/PrintConfig.cpp:1349
 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 "
@@ -5524,13 +6223,13 @@ msgstr ""
 "nozzle diameter will be used. If expressed as percentage (for example 200%) "
 "it will be computed over layer height."
 
-#: src/libslic3r/PrintConfig.cpp:1417
+#: src/libslic3r/PrintConfig.cpp:1361
 msgid ""
 "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
 msgstr ""
 "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
 
-#: src/libslic3r/PrintConfig.cpp:1427
+#: src/libslic3r/PrintConfig.cpp:1371
 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 "
@@ -5542,11 +6241,11 @@ msgstr ""
 "surfaces which benefit from a higher number of perimeters if the Extra "
 "Perimeters option is enabled."
 
-#: src/libslic3r/PrintConfig.cpp:1431
+#: src/libslic3r/PrintConfig.cpp:1375
 msgid "(minimum)"
 msgstr "(minimum)"
 
-#: src/libslic3r/PrintConfig.cpp:1439
+#: src/libslic3r/PrintConfig.cpp:1383
 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. "
@@ -5560,35 +6259,35 @@ msgstr ""
 "argument, and they can access the Slic3r config settings by reading "
 "environment variables."
 
-#: src/libslic3r/PrintConfig.cpp:1452
+#: src/libslic3r/PrintConfig.cpp:1395
 msgid "Printer type"
 msgstr "Printer type"
 
-#: src/libslic3r/PrintConfig.cpp:1453
+#: src/libslic3r/PrintConfig.cpp:1396
 msgid "Type of the printer."
 msgstr "Type of the printer."
 
-#: src/libslic3r/PrintConfig.cpp:1457
+#: src/libslic3r/PrintConfig.cpp:1401
 msgid "Printer notes"
 msgstr "Printer notes"
 
-#: src/libslic3r/PrintConfig.cpp:1458
+#: src/libslic3r/PrintConfig.cpp:1402
 msgid "You can put your notes regarding the printer here."
 msgstr "You can put your notes regarding the printer here."
 
-#: src/libslic3r/PrintConfig.cpp:1467
+#: src/libslic3r/PrintConfig.cpp:1410
 msgid "Printer vendor"
 msgstr "Printer vendor"
 
-#: src/libslic3r/PrintConfig.cpp:1468
+#: src/libslic3r/PrintConfig.cpp:1411
 msgid "Name of the printer vendor."
 msgstr "Name of the printer vendor."
 
-#: src/libslic3r/PrintConfig.cpp:1472
+#: src/libslic3r/PrintConfig.cpp:1416
 msgid "Printer variant"
 msgstr "Printer variant"
 
-#: src/libslic3r/PrintConfig.cpp:1473
+#: src/libslic3r/PrintConfig.cpp:1417
 msgid ""
 "Name of the printer variant. For example, the printer variants may be "
 "differentiated by a nozzle diameter."
@@ -5596,11 +6295,11 @@ msgstr ""
 "Name of the printer variant. For example, the printer variants may be "
 "differentiated by a nozzle diameter."
 
-#: src/libslic3r/PrintConfig.cpp:1483
+#: src/libslic3r/PrintConfig.cpp:1430
 msgid "Raft layers"
 msgstr "Raft layers"
 
-#: src/libslic3r/PrintConfig.cpp:1485
+#: src/libslic3r/PrintConfig.cpp:1432
 msgid ""
 "The object will be raised by this number of layers, and support material "
 "will be generated under it."
@@ -5608,11 +6307,11 @@ msgstr ""
 "The object will be raised by this number of layers, and support material "
 "will be generated under it."
 
-#: src/libslic3r/PrintConfig.cpp:1494
+#: src/libslic3r/PrintConfig.cpp:1440
 msgid "Resolution"
 msgstr "Resolution"
 
-#: src/libslic3r/PrintConfig.cpp:1495
+#: src/libslic3r/PrintConfig.cpp:1441
 msgid ""
 "Minimum detail resolution, used to simplify the input file for speeding up "
 "the slicing job and reducing memory usage. High-resolution models often "
@@ -5624,21 +6323,21 @@ msgstr ""
 "carry more detail than printers can render. Set to zero to disable any "
 "simplification and use full resolution from input."
 
-#: src/libslic3r/PrintConfig.cpp:1506
+#: src/libslic3r/PrintConfig.cpp:1451
 msgid "Minimum travel after retraction"
 msgstr "Minimum travel after retraction"
 
-#: src/libslic3r/PrintConfig.cpp:1507
+#: src/libslic3r/PrintConfig.cpp:1452
 msgid ""
 "Retraction is not triggered when travel moves are shorter than this length."
 msgstr ""
 "Retraction is not triggered when travel moves are shorter than this length."
 
-#: src/libslic3r/PrintConfig.cpp:1514
+#: src/libslic3r/PrintConfig.cpp:1458
 msgid "Retract amount before wipe"
 msgstr "Retract amount before wipe"
 
-#: src/libslic3r/PrintConfig.cpp:1515
+#: src/libslic3r/PrintConfig.cpp:1459
 msgid ""
 "With bowden extruders, it may be wise to do some amount of quick retract "
 "before doing the wipe movement."
@@ -5646,23 +6345,23 @@ msgstr ""
 "With bowden extruders, it may be wise to do some amount of quick retract "
 "before doing the wipe movement."
 
-#: src/libslic3r/PrintConfig.cpp:1523
+#: src/libslic3r/PrintConfig.cpp:1466
 msgid "Retract on layer change"
 msgstr "Retract on layer change"
 
-#: src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1467
 msgid "This flag enforces a retraction whenever a Z move is done."
 msgstr "This flag enforces a retraction whenever a Z move is done."
 
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
+#: src/libslic3r/PrintConfig.cpp:1472 src/libslic3r/PrintConfig.cpp:1480
 msgid "Length"
 msgstr "Length"
 
-#: src/libslic3r/PrintConfig.cpp:1531
+#: src/libslic3r/PrintConfig.cpp:1473
 msgid "Retraction Length"
 msgstr "Retraction Length"
 
-#: src/libslic3r/PrintConfig.cpp:1532
+#: src/libslic3r/PrintConfig.cpp:1474
 msgid ""
 "When retraction is triggered, filament is pulled back by the specified "
 "amount (the length is measured on raw filament, before it enters the "
@@ -5672,15 +6371,15 @@ msgstr ""
 "amount (the length is measured on raw filament, before it enters the "
 "extruder)."
 
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
+#: src/libslic3r/PrintConfig.cpp:1476 src/libslic3r/PrintConfig.cpp:1485
 msgid "mm (zero to disable)"
 msgstr "mm (zero to disable)"
 
-#: src/libslic3r/PrintConfig.cpp:1540
+#: src/libslic3r/PrintConfig.cpp:1481
 msgid "Retraction Length (Toolchange)"
 msgstr "Retraction Length (Toolchange)"
 
-#: src/libslic3r/PrintConfig.cpp:1541
+#: src/libslic3r/PrintConfig.cpp:1482
 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 "
@@ -5690,11 +6389,11 @@ msgstr ""
 "by the specified amount (the length is measured on raw filament, before it "
 "enters the extruder)."
 
-#: src/libslic3r/PrintConfig.cpp:1550
+#: src/libslic3r/PrintConfig.cpp:1490
 msgid "Lift Z"
 msgstr "Lift Z"
 
-#: src/libslic3r/PrintConfig.cpp:1551
+#: src/libslic3r/PrintConfig.cpp:1491
 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 "
@@ -5704,15 +6403,15 @@ msgstr ""
 "retraction is triggered. When using multiple extruders, only the setting for "
 "the first extruder will be considered."
 
-#: src/libslic3r/PrintConfig.cpp:1559
+#: src/libslic3r/PrintConfig.cpp:1498
 msgid "Above Z"
 msgstr "Above Z"
 
-#: src/libslic3r/PrintConfig.cpp:1560
+#: src/libslic3r/PrintConfig.cpp:1499
 msgid "Only lift Z above"
 msgstr "Only lift Z above"
 
-#: src/libslic3r/PrintConfig.cpp:1561
+#: src/libslic3r/PrintConfig.cpp:1500
 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 "
@@ -5722,15 +6421,15 @@ msgstr ""
 "specified absolute Z. You can tune this setting for skipping lift on the "
 "first layers."
 
-#: src/libslic3r/PrintConfig.cpp:1569
+#: src/libslic3r/PrintConfig.cpp:1507
 msgid "Below Z"
 msgstr "Below Z"
 
-#: src/libslic3r/PrintConfig.cpp:1570
+#: src/libslic3r/PrintConfig.cpp:1508
 msgid "Only lift Z below"
 msgstr "Only lift Z below"
 
-#: src/libslic3r/PrintConfig.cpp:1571
+#: src/libslic3r/PrintConfig.cpp:1509
 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 "
@@ -5740,11 +6439,11 @@ msgstr ""
 "specified absolute Z. You can tune this setting for limiting lift to the "
 "first layers."
 
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
+#: src/libslic3r/PrintConfig.cpp:1517 src/libslic3r/PrintConfig.cpp:1525
 msgid "Extra length on restart"
 msgstr "Extra length on restart"
 
-#: src/libslic3r/PrintConfig.cpp:1581
+#: src/libslic3r/PrintConfig.cpp:1518
 msgid ""
 "When the retraction is compensated after the travel move, the extruder will "
 "push this additional amount of filament. This setting is rarely needed."
@@ -5752,7 +6451,7 @@ msgstr ""
 "When the retraction is compensated after the travel move, the extruder will "
 "push this additional amount of filament. This setting is rarely needed."
 
-#: src/libslic3r/PrintConfig.cpp:1590
+#: src/libslic3r/PrintConfig.cpp:1526
 msgid ""
 "When the retraction is compensated after changing tool, the extruder will "
 "push this additional amount of filament."
@@ -5760,19 +6459,19 @@ msgstr ""
 "When the retraction is compensated after changing tool, the extruder will "
 "push this additional amount of filament."
 
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
+#: src/libslic3r/PrintConfig.cpp:1533 src/libslic3r/PrintConfig.cpp:1534
 msgid "Retraction Speed"
 msgstr "Retraction Speed"
 
-#: src/libslic3r/PrintConfig.cpp:1600
+#: src/libslic3r/PrintConfig.cpp:1535
 msgid "The speed for retractions (it only applies to the extruder motor)."
 msgstr "The speed for retractions (it only applies to the extruder motor)."
 
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
+#: src/libslic3r/PrintConfig.cpp:1541 src/libslic3r/PrintConfig.cpp:1542
 msgid "Deretraction Speed"
 msgstr "Deretraction Speed"
 
-#: src/libslic3r/PrintConfig.cpp:1609
+#: src/libslic3r/PrintConfig.cpp:1543
 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 "
@@ -5782,71 +6481,67 @@ msgstr ""
 "applies to the extruder motor). If left to zero, the retraction speed is "
 "used."
 
-#: src/libslic3r/PrintConfig.cpp:1617
+#: src/libslic3r/PrintConfig.cpp:1550
 msgid "Seam position"
 msgstr "Seam position"
 
-#: src/libslic3r/PrintConfig.cpp:1619
+#: src/libslic3r/PrintConfig.cpp:1552
 msgid "Position of perimeters starting points."
 msgstr "Position of perimeters starting points."
 
-#: src/libslic3r/PrintConfig.cpp:1626
+#: src/libslic3r/PrintConfig.cpp:1558
 msgid "Random"
 msgstr "Random"
 
-#: src/libslic3r/PrintConfig.cpp:1627
+#: src/libslic3r/PrintConfig.cpp:1559
 msgid "Nearest"
 msgstr "Nearest"
 
-#: src/libslic3r/PrintConfig.cpp:1628
+#: src/libslic3r/PrintConfig.cpp:1560
 msgid "Aligned"
 msgstr "Aligned"
 
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr "Rear"
-
-#: src/libslic3r/PrintConfig.cpp:1636
+#: src/libslic3r/PrintConfig.cpp:1568
 msgid "Direction"
 msgstr "Direction"
 
-#: src/libslic3r/PrintConfig.cpp:1638
+#: src/libslic3r/PrintConfig.cpp:1570
 msgid "Preferred direction of the seam"
 msgstr "Preferred direction of the seam"
 
-#: src/libslic3r/PrintConfig.cpp:1639
+#: src/libslic3r/PrintConfig.cpp:1571
 msgid "Seam preferred direction"
 msgstr "Seam preferred direction"
 
-#: src/libslic3r/PrintConfig.cpp:1647
+#: src/libslic3r/PrintConfig.cpp:1578
 msgid "Jitter"
 msgstr "Jitter"
 
-#: src/libslic3r/PrintConfig.cpp:1649
+#: src/libslic3r/PrintConfig.cpp:1580
 msgid "Seam preferred direction jitter"
 msgstr "Seam preferred direction jitter"
 
-#: src/libslic3r/PrintConfig.cpp:1650
+#: src/libslic3r/PrintConfig.cpp:1581
 msgid "Preferred direction of the seam - jitter"
 msgstr "Preferred direction of the seam - jitter"
 
-#: src/libslic3r/PrintConfig.cpp:1661
+#: src/libslic3r/PrintConfig.cpp:1591
 msgid "USB/serial port for printer connection."
 msgstr "USB/serial port for printer connection."
 
-#: src/libslic3r/PrintConfig.cpp:1669
+#: src/libslic3r/PrintConfig.cpp:1598
 msgid "Serial port speed"
 msgstr "Serial port speed"
 
-#: src/libslic3r/PrintConfig.cpp:1670
+#: src/libslic3r/PrintConfig.cpp:1599
 msgid "Speed (baud) of USB/serial port for printer connection."
 msgstr "Speed (baud) of USB/serial port for printer connection."
 
-#: src/libslic3r/PrintConfig.cpp:1679
+#: src/libslic3r/PrintConfig.cpp:1608
 msgid "Distance from object"
 msgstr "Distance from object"
 
-#: src/libslic3r/PrintConfig.cpp:1680
+#: src/libslic3r/PrintConfig.cpp:1609
 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."
@@ -5854,11 +6549,11 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:1688
+#: src/libslic3r/PrintConfig.cpp:1616
 msgid "Skirt height"
 msgstr "Skirt height"
 
-#: src/libslic3r/PrintConfig.cpp:1689
+#: src/libslic3r/PrintConfig.cpp:1617
 msgid ""
 "Height of skirt expressed in layers. Set this to a tall value to use skirt "
 "as a shield against drafts."
@@ -5866,15 +6561,15 @@ msgstr ""
 "Height of skirt expressed in layers. Set this to a tall value to use skirt "
 "as a shield against drafts."
 
-#: src/libslic3r/PrintConfig.cpp:1697
+#: src/libslic3r/PrintConfig.cpp:1624
 msgid "Loops (minimum)"
 msgstr "Loops (minimum)"
 
-#: src/libslic3r/PrintConfig.cpp:1698
+#: src/libslic3r/PrintConfig.cpp:1625
 msgid "Skirt Loops"
 msgstr "Skirt Loops"
 
-#: src/libslic3r/PrintConfig.cpp:1699
+#: src/libslic3r/PrintConfig.cpp:1626
 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 "
@@ -5884,11 +6579,11 @@ msgstr ""
 "set, the number of loops might be greater than the one configured here. Set "
 "this to zero to disable skirt completely."
 
-#: src/libslic3r/PrintConfig.cpp:1708
+#: src/libslic3r/PrintConfig.cpp:1634
 msgid "Slow down if layer print time is below"
 msgstr "Slow down if layer print time is below"
 
-#: src/libslic3r/PrintConfig.cpp:1709
+#: src/libslic3r/PrintConfig.cpp:1635
 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."
@@ -5896,11 +6591,11 @@ msgstr ""
 "If layer print time is estimated below this number of seconds, print moves "
 "speed will be scaled down to extend duration to this value."
 
-#: src/libslic3r/PrintConfig.cpp:1720
+#: src/libslic3r/PrintConfig.cpp:1645
 msgid "Small perimeters"
 msgstr "Small perimeters"
 
-#: src/libslic3r/PrintConfig.cpp:1722
+#: src/libslic3r/PrintConfig.cpp:1647
 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 "
@@ -5910,11 +6605,11 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:1732
+#: src/libslic3r/PrintConfig.cpp:1657
 msgid "Solid infill threshold area"
 msgstr "Solid infill threshold area"
 
-#: src/libslic3r/PrintConfig.cpp:1734
+#: src/libslic3r/PrintConfig.cpp:1659
 msgid ""
 "Force solid infill for regions having a smaller area than the specified "
 "threshold."
@@ -5922,23 +6617,23 @@ msgstr ""
 "Force solid infill for regions having a smaller area than the specified "
 "threshold."
 
-#: src/libslic3r/PrintConfig.cpp:1735
+#: src/libslic3r/PrintConfig.cpp:1660
 msgid "mm²"
 msgstr "mm²"
 
-#: src/libslic3r/PrintConfig.cpp:1742
+#: src/libslic3r/PrintConfig.cpp:1666
 msgid "Solid infill extruder"
 msgstr "Solid infill extruder"
 
-#: src/libslic3r/PrintConfig.cpp:1744
+#: src/libslic3r/PrintConfig.cpp:1668
 msgid "The extruder to use when printing solid infill."
 msgstr "The extruder to use when printing solid infill."
 
-#: src/libslic3r/PrintConfig.cpp:1751
+#: src/libslic3r/PrintConfig.cpp:1674
 msgid "Solid infill every"
 msgstr "Solid infill every"
 
-#: src/libslic3r/PrintConfig.cpp:1753
+#: src/libslic3r/PrintConfig.cpp:1676
 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 "
@@ -5950,7 +6645,7 @@ msgstr ""
 "will automatically choose the maximum possible number of layers to combine "
 "according to nozzle diameter and layer height."
 
-#: src/libslic3r/PrintConfig.cpp:1766
+#: src/libslic3r/PrintConfig.cpp:1688
 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, "
@@ -5962,7 +6657,7 @@ msgstr ""
 "otherwise 1.125 x nozzle diameter will be used. If expressed as percentage "
 "(for example 90%) it will be computed over layer height."
 
-#: src/libslic3r/PrintConfig.cpp:1777
+#: src/libslic3r/PrintConfig.cpp:1698
 msgid ""
 "Speed for printing solid regions (top/bottom/internal horizontal shells). "
 "This can be expressed as a percentage (for example: 80%) over the default "
@@ -5972,15 +6667,15 @@ msgstr ""
 "This can be expressed as a percentage (for example: 80%) over the default "
 "infill speed above. Set to zero for auto."
 
-#: src/libslic3r/PrintConfig.cpp:1789
+#: src/libslic3r/PrintConfig.cpp:1710
 msgid "Number of solid layers to generate on top and bottom surfaces."
 msgstr "Number of solid layers to generate on top and bottom surfaces."
 
-#: src/libslic3r/PrintConfig.cpp:1796
+#: src/libslic3r/PrintConfig.cpp:1716
 msgid "Spiral vase"
 msgstr "Spiral vase"
 
-#: src/libslic3r/PrintConfig.cpp:1797
+#: src/libslic3r/PrintConfig.cpp:1717
 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, "
@@ -5994,11 +6689,11 @@ msgstr ""
 "any number of bottom solid layers as well as skirt/brim loops. It won't work "
 "when printing more than an object."
 
-#: src/libslic3r/PrintConfig.cpp:1806
+#: src/libslic3r/PrintConfig.cpp:1725
 msgid "Temperature variation"
 msgstr "Temperature variation"
 
-#: src/libslic3r/PrintConfig.cpp:1807
+#: src/libslic3r/PrintConfig.cpp:1726
 msgid ""
 "Temperature difference to be applied when an extruder is not active. Enables "
 "a full-height \"sacrificial\" skirt on which the nozzles are periodically "
@@ -6008,7 +6703,7 @@ msgstr ""
 "a full-height \"sacrificial\" skirt on which the nozzles are periodically "
 "wiped."
 
-#: src/libslic3r/PrintConfig.cpp:1818
+#: src/libslic3r/PrintConfig.cpp:1736
 msgid ""
 "This start procedure is inserted at the beginning, after bed has reached the "
 "target temperature and extruder just started heating, and before extruder "
@@ -6026,7 +6721,7 @@ msgstr ""
 "you can use placeholder variables for all Slic3r settings, so you can put a "
 "\"M109 S[first_layer_temperature]\" command wherever you want."
 
-#: src/libslic3r/PrintConfig.cpp:1834
+#: src/libslic3r/PrintConfig.cpp:1751
 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 "
@@ -6046,19 +6741,19 @@ msgstr ""
 "S[first_layer_temperature]\" command wherever you want. If you have multiple "
 "extruders, the gcode is processed in extruder order."
 
-#: src/libslic3r/PrintConfig.cpp:1850
+#: src/libslic3r/PrintConfig.cpp:1766
 msgid "Single Extruder Multi Material"
 msgstr "Single Extruder Multi Material"
 
-#: src/libslic3r/PrintConfig.cpp:1851
+#: src/libslic3r/PrintConfig.cpp:1767
 msgid "The printer multiplexes filaments into a single hot end."
 msgstr "The printer multiplexes filaments into a single hot end."
 
-#: src/libslic3r/PrintConfig.cpp:1857
+#: src/libslic3r/PrintConfig.cpp:1772
 msgid "Prime all printing extruders"
 msgstr "Prime all printing extruders"
 
-#: src/libslic3r/PrintConfig.cpp:1858
+#: src/libslic3r/PrintConfig.cpp:1773
 msgid ""
 "If enabled, all printing extruders will be primed at the front edge of the "
 "print bed at the start of the print."
@@ -6066,19 +6761,19 @@ msgstr ""
 "If enabled, all printing extruders will be primed at the front edge of the "
 "print bed at the start of the print."
 
-#: src/libslic3r/PrintConfig.cpp:1864
+#: src/libslic3r/PrintConfig.cpp:1778
 msgid "Generate support material"
 msgstr "Generate support material"
 
-#: src/libslic3r/PrintConfig.cpp:1866
+#: src/libslic3r/PrintConfig.cpp:1780
 msgid "Enable support material generation."
 msgstr "Enable support material generation."
 
-#: src/libslic3r/PrintConfig.cpp:1871
+#: src/libslic3r/PrintConfig.cpp:1784
 msgid "Auto generated supports"
 msgstr "Auto generated supports"
 
-#: src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:1786
 msgid ""
 "If checked, supports will be generated automatically based on the overhang "
 "threshold value. If unchecked, supports will be generated inside the "
@@ -6088,11 +6783,11 @@ msgstr ""
 "threshold value. If unchecked, supports will be generated inside the "
 "\"Support Enforcer\" volumes only."
 
-#: src/libslic3r/PrintConfig.cpp:1880
+#: src/libslic3r/PrintConfig.cpp:1792
 msgid "XY separation between an object and its support"
 msgstr "XY separation between an object and its support"
 
-#: src/libslic3r/PrintConfig.cpp:1882
+#: src/libslic3r/PrintConfig.cpp:1794
 msgid ""
 "XY separation between an object and its support. If expressed as percentage "
 "(for example 50%), it will be calculated over external perimeter width."
@@ -6100,11 +6795,11 @@ msgstr ""
 "XY separation between an object and its support. If expressed as percentage "
 "(for example 50%), it will be calculated over external perimeter width."
 
-#: src/libslic3r/PrintConfig.cpp:1893
+#: src/libslic3r/PrintConfig.cpp:1804
 msgid "Pattern angle"
 msgstr "Pattern angle"
 
-#: src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1806
 msgid ""
 "Use this setting to rotate the support material pattern on the horizontal "
 "plane."
@@ -6112,7 +6807,7 @@ msgstr ""
 "Use this setting to rotate the support material pattern on the horizontal "
 "plane."
 
-#: src/libslic3r/PrintConfig.cpp:1906
+#: src/libslic3r/PrintConfig.cpp:1816 src/libslic3r/PrintConfig.cpp:2421
 msgid ""
 "Only create support if it lies on a build plate. Don't create support on a "
 "print."
@@ -6120,11 +6815,11 @@ msgstr ""
 "Only create support if it lies on a build plate. Don't create support on a "
 "print."
 
-#: src/libslic3r/PrintConfig.cpp:1913
+#: src/libslic3r/PrintConfig.cpp:1822
 msgid "Contact Z distance"
 msgstr "Contact Z distance"
 
-#: src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:1824
 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 "
@@ -6134,19 +6829,19 @@ msgstr ""
 "this to 0 will also prevent Slic3r from using bridge flow and speed for the "
 "first object layer."
 
-#: src/libslic3r/PrintConfig.cpp:1923
+#: src/libslic3r/PrintConfig.cpp:1831
 msgid "soluble"
 msgstr "soluble"
 
-#: src/libslic3r/PrintConfig.cpp:1924
+#: src/libslic3r/PrintConfig.cpp:1832
 msgid "detachable"
 msgstr "detachable"
 
-#: src/libslic3r/PrintConfig.cpp:1929
+#: src/libslic3r/PrintConfig.cpp:1837
 msgid "Enforce support for the first"
 msgstr "Enforce support for the first"
 
-#: src/libslic3r/PrintConfig.cpp:1931
+#: src/libslic3r/PrintConfig.cpp:1839
 msgid ""
 "Generate support material for the specified number of layers counting from "
 "bottom, regardless of whether normal support material is enabled or not and "
@@ -6158,15 +6853,15 @@ msgstr ""
 "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."
 
-#: src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1844
 msgid "Enforce support for the first n layers"
 msgstr "Enforce support for the first n layers"
 
-#: src/libslic3r/PrintConfig.cpp:1943
+#: src/libslic3r/PrintConfig.cpp:1850
 msgid "Support material/raft/skirt extruder"
 msgstr "Support material/raft/skirt extruder"
 
-#: src/libslic3r/PrintConfig.cpp:1945
+#: src/libslic3r/PrintConfig.cpp:1852
 msgid ""
 "The extruder to use when printing support material, raft and skirt (1+, 0 to "
 "use the current extruder to minimize tool changes)."
@@ -6174,7 +6869,7 @@ msgstr ""
 "The extruder to use when printing support material, raft and skirt (1+, 0 to "
 "use the current extruder to minimize tool changes)."
 
-#: src/libslic3r/PrintConfig.cpp:1955
+#: src/libslic3r/PrintConfig.cpp:1861
 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, "
@@ -6186,21 +6881,21 @@ msgstr ""
 "otherwise nozzle diameter will be used. If expressed as percentage (for "
 "example 90%) it will be computed over layer height."
 
-#: src/libslic3r/PrintConfig.cpp:1964
+#: src/libslic3r/PrintConfig.cpp:1869
 msgid "Interface loops"
 msgstr "Interface loops"
 
-#: src/libslic3r/PrintConfig.cpp:1966
+#: src/libslic3r/PrintConfig.cpp:1871
 msgid ""
 "Cover the top contact layer of the supports with loops. Disabled by default."
 msgstr ""
 "Cover the top contact layer of the supports with loops. Disabled by default."
 
-#: src/libslic3r/PrintConfig.cpp:1972
+#: src/libslic3r/PrintConfig.cpp:1876
 msgid "Support material/raft interface extruder"
 msgstr "Support material/raft interface extruder"
 
-#: src/libslic3r/PrintConfig.cpp:1974
+#: src/libslic3r/PrintConfig.cpp:1878
 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."
@@ -6208,11 +6903,11 @@ msgstr ""
 "The extruder to use when printing support material interface (1+, 0 to use "
 "the current extruder to minimize tool changes). This affects raft too."
 
-#: src/libslic3r/PrintConfig.cpp:1982
+#: src/libslic3r/PrintConfig.cpp:1885
 msgid "Interface layers"
 msgstr "Interface layers"
 
-#: src/libslic3r/PrintConfig.cpp:1984
+#: src/libslic3r/PrintConfig.cpp:1887
 msgid ""
 "Number of interface layers to insert between the object(s) and support "
 "material."
@@ -6220,15 +6915,15 @@ msgstr ""
 "Number of interface layers to insert between the object(s) and support "
 "material."
 
-#: src/libslic3r/PrintConfig.cpp:1992
+#: src/libslic3r/PrintConfig.cpp:1894
 msgid "Interface pattern spacing"
 msgstr "Interface pattern spacing"
 
-#: src/libslic3r/PrintConfig.cpp:1994
+#: src/libslic3r/PrintConfig.cpp:1896
 msgid "Spacing between interface lines. Set zero to get a solid interface."
 msgstr "Spacing between interface lines. Set zero to get a solid interface."
 
-#: src/libslic3r/PrintConfig.cpp:2004
+#: src/libslic3r/PrintConfig.cpp:1905
 msgid ""
 "Speed for printing support material interface layers. If expressed as "
 "percentage (for example 50%) it will be calculated over support material "
@@ -6238,35 +6933,35 @@ msgstr ""
 "percentage (for example 50%) it will be calculated over support material "
 "speed."
 
-#: src/libslic3r/PrintConfig.cpp:2013
+#: src/libslic3r/PrintConfig.cpp:1914
 msgid "Pattern"
 msgstr "Pattern"
 
-#: src/libslic3r/PrintConfig.cpp:2015
+#: src/libslic3r/PrintConfig.cpp:1916
 msgid "Pattern used to generate support material."
 msgstr "Pattern used to generate support material."
 
-#: src/libslic3r/PrintConfig.cpp:2022
+#: src/libslic3r/PrintConfig.cpp:1922
 msgid "Rectilinear grid"
 msgstr "Rectilinear grid"
 
-#: src/libslic3r/PrintConfig.cpp:2028
+#: src/libslic3r/PrintConfig.cpp:1928
 msgid "Pattern spacing"
 msgstr "Pattern spacing"
 
-#: src/libslic3r/PrintConfig.cpp:2030
+#: src/libslic3r/PrintConfig.cpp:1930
 msgid "Spacing between support material lines."
 msgstr "Spacing between support material lines."
 
-#: src/libslic3r/PrintConfig.cpp:2040
+#: src/libslic3r/PrintConfig.cpp:1939
 msgid "Speed for printing support material."
 msgstr "Speed for printing support material."
 
-#: src/libslic3r/PrintConfig.cpp:2047
+#: src/libslic3r/PrintConfig.cpp:1946
 msgid "Synchronize with object layers"
 msgstr "Synchronize with object layers"
 
-#: src/libslic3r/PrintConfig.cpp:2049
+#: src/libslic3r/PrintConfig.cpp:1948
 msgid ""
 "Synchronize support layers with the object print layers. This is useful with "
 "multi-material printers, where the extruder switch is expensive."
@@ -6274,11 +6969,11 @@ msgstr ""
 "Synchronize support layers with the object print layers. This is useful with "
 "multi-material printers, where the extruder switch is expensive."
 
-#: src/libslic3r/PrintConfig.cpp:2056
+#: src/libslic3r/PrintConfig.cpp:1954
 msgid "Overhang threshold"
 msgstr "Overhang threshold"
 
-#: src/libslic3r/PrintConfig.cpp:2058
+#: src/libslic3r/PrintConfig.cpp:1956
 msgid ""
 "Support material will not be generated for overhangs whose slope angle (90° "
 "= vertical) is above the given threshold. In other words, this value "
@@ -6292,11 +6987,11 @@ msgstr ""
 "that you can print without support material. Set to zero for automatic "
 "detection (recommended)."
 
-#: src/libslic3r/PrintConfig.cpp:2071
+#: src/libslic3r/PrintConfig.cpp:1968
 msgid "With sheath around the support"
 msgstr "With sheath around the support"
 
-#: src/libslic3r/PrintConfig.cpp:2073
+#: src/libslic3r/PrintConfig.cpp:1970
 msgid ""
 "Add a sheath (a single perimeter line) around the base support. This makes "
 "the support more reliable, but also more difficult to remove."
@@ -6304,7 +6999,7 @@ msgstr ""
 "Add a sheath (a single perimeter line) around the base support. This makes "
 "the support more reliable, but also more difficult to remove."
 
-#: src/libslic3r/PrintConfig.cpp:2081
+#: src/libslic3r/PrintConfig.cpp:1977
 msgid ""
 "Extruder temperature for layers after the first one. Set this to zero to "
 "disable temperature control commands in the output."
@@ -6312,15 +7007,15 @@ msgstr ""
 "Extruder temperature for layers after the first one. Set this to zero to "
 "disable temperature control commands in the output."
 
-#: src/libslic3r/PrintConfig.cpp:2084
+#: src/libslic3r/PrintConfig.cpp:1979
 msgid "Temperature"
 msgstr "Temperature"
 
-#: src/libslic3r/PrintConfig.cpp:2090
+#: src/libslic3r/PrintConfig.cpp:1985
 msgid "Detect thin walls"
 msgstr "Detect thin walls"
 
-#: src/libslic3r/PrintConfig.cpp:2092
+#: src/libslic3r/PrintConfig.cpp:1987
 msgid ""
 "Detect single-width walls (parts where two extrusions don't fit and we need "
 "to collapse them into a single trace)."
@@ -6328,11 +7023,11 @@ msgstr ""
 "Detect single-width walls (parts where two extrusions don't fit and we need "
 "to collapse them into a single trace)."
 
-#: src/libslic3r/PrintConfig.cpp:2099
+#: src/libslic3r/PrintConfig.cpp:1993
 msgid "Threads"
 msgstr "Threads"
 
-#: src/libslic3r/PrintConfig.cpp:2100
+#: src/libslic3r/PrintConfig.cpp:1994
 msgid ""
 "Threads are used to parallelize long-running tasks. Optimal threads number "
 "is slightly above the number of available cores/processors."
@@ -6340,7 +7035,7 @@ msgstr ""
 "Threads are used to parallelize long-running tasks. Optimal threads number "
 "is slightly above the number of available cores/processors."
 
-#: src/libslic3r/PrintConfig.cpp:2112
+#: src/libslic3r/PrintConfig.cpp:2006
 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 "
@@ -6350,7 +7045,7 @@ msgstr ""
 "you can use placeholder variables for all Slic3r settings as well as "
 "[previous_extruder] and [next_extruder]."
 
-#: src/libslic3r/PrintConfig.cpp:2125
+#: src/libslic3r/PrintConfig.cpp:2018
 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 "
@@ -6364,7 +7059,7 @@ msgstr ""
 "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/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2029
 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 "
@@ -6378,28 +7073,23 @@ msgstr ""
 "percentage (for example: 80%) over the solid infill speed above. Set to zero "
 "for auto."
 
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "Top"
-
-#: src/libslic3r/PrintConfig.cpp:2151
+#: src/libslic3r/PrintConfig.cpp:2043
 msgid "Number of solid layers to generate on top surfaces."
 msgstr "Number of solid layers to generate on top surfaces."
 
-#: src/libslic3r/PrintConfig.cpp:2153
+#: src/libslic3r/PrintConfig.cpp:2044
 msgid "Top solid layers"
 msgstr "Top solid layers"
 
-#: src/libslic3r/PrintConfig.cpp:2159
+#: src/libslic3r/PrintConfig.cpp:2050
 msgid "Speed for travel moves (jumps between distant extrusion points)."
 msgstr "Speed for travel moves (jumps between distant extrusion points)."
 
-#: src/libslic3r/PrintConfig.cpp:2168
+#: src/libslic3r/PrintConfig.cpp:2058
 msgid "Use firmware retraction"
 msgstr "Use firmware retraction"
 
-#: src/libslic3r/PrintConfig.cpp:2169
+#: src/libslic3r/PrintConfig.cpp:2059
 msgid ""
 "This experimental setting uses G10 and G11 commands to have the firmware "
 "handle the retraction. This is only supported in recent Marlin."
@@ -6407,11 +7097,11 @@ msgstr ""
 "This experimental setting uses G10 and G11 commands to have the firmware "
 "handle the retraction. This is only supported in recent Marlin."
 
-#: src/libslic3r/PrintConfig.cpp:2176
+#: src/libslic3r/PrintConfig.cpp:2065
 msgid "Use relative E distances"
 msgstr "Use relative E distances"
 
-#: src/libslic3r/PrintConfig.cpp:2177
+#: src/libslic3r/PrintConfig.cpp:2066
 msgid ""
 "If your firmware requires relative E values, check this, otherwise leave it "
 "unchecked. Most firmwares use absolute values."
@@ -6419,11 +7109,11 @@ msgstr ""
 "If your firmware requires relative E values, check this, otherwise leave it "
 "unchecked. Most firmwares use absolute values."
 
-#: src/libslic3r/PrintConfig.cpp:2184
+#: src/libslic3r/PrintConfig.cpp:2072
 msgid "Use volumetric E"
 msgstr "Use volumetric E"
 
-#: src/libslic3r/PrintConfig.cpp:2185
+#: src/libslic3r/PrintConfig.cpp:2073
 msgid ""
 "This experimental setting uses outputs the E values in cubic millimeters "
 "instead of linear millimeters. If your firmware doesn't already know "
@@ -6439,11 +7129,11 @@ msgstr ""
 "filament diameter associated to the filament selected in Slic3r. This is "
 "only supported in recent Marlin."
 
-#: src/libslic3r/PrintConfig.cpp:2196
+#: src/libslic3r/PrintConfig.cpp:2083
 msgid "Enable variable layer height feature"
 msgstr "Enable variable layer height feature"
 
-#: src/libslic3r/PrintConfig.cpp:2197
+#: src/libslic3r/PrintConfig.cpp:2084
 msgid ""
 "Some printers or printer setups may have difficulties printing with a "
 "variable layer height. Enabled by default."
@@ -6451,11 +7141,11 @@ msgstr ""
 "Some printers or printer setups may have difficulties printing with a "
 "variable layer height. Enabled by default."
 
-#: src/libslic3r/PrintConfig.cpp:2204
+#: src/libslic3r/PrintConfig.cpp:2090
 msgid "Wipe while retracting"
 msgstr "Wipe while retracting"
 
-#: src/libslic3r/PrintConfig.cpp:2205
+#: src/libslic3r/PrintConfig.cpp:2091
 msgid ""
 "This flag will move the nozzle while retracting to minimize the possible "
 "blob on leaky extruders."
@@ -6463,7 +7153,7 @@ msgstr ""
 "This flag will move the nozzle while retracting to minimize the possible "
 "blob on leaky extruders."
 
-#: src/libslic3r/PrintConfig.cpp:2213
+#: src/libslic3r/PrintConfig.cpp:2098
 msgid ""
 "Multi material printers may need to prime or purge extruders on tool "
 "changes. Extrude the excess material into the wipe tower."
@@ -6471,11 +7161,11 @@ msgstr ""
 "Multi material printers may need to prime or purge extruders on tool "
 "changes. Extrude the excess material into the wipe tower."
 
-#: src/libslic3r/PrintConfig.cpp:2220
+#: src/libslic3r/PrintConfig.cpp:2104
 msgid "Purging volumes - load/unload volumes"
 msgstr "Purging volumes - load/unload volumes"
 
-#: src/libslic3r/PrintConfig.cpp:2221
+#: src/libslic3r/PrintConfig.cpp:2105
 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 "
@@ -6485,11 +7175,11 @@ msgstr ""
 "wipe tower. These values are used to simplify creation of the full purging "
 "volumes below. "
 
-#: src/libslic3r/PrintConfig.cpp:2228
+#: src/libslic3r/PrintConfig.cpp:2111
 msgid "Purging volumes - matrix"
 msgstr "Purging volumes - matrix"
 
-#: src/libslic3r/PrintConfig.cpp:2229
+#: src/libslic3r/PrintConfig.cpp:2112
 msgid ""
 "This matrix describes volumes (in cubic milimetres) required to purge the "
 "new filament on the wipe tower for any given pair of tools. "
@@ -6497,43 +7187,43 @@ msgstr ""
 "This matrix describes volumes (in cubic milimetres) required to purge the "
 "new filament on the wipe tower for any given pair of tools. "
 
-#: src/libslic3r/PrintConfig.cpp:2239
+#: src/libslic3r/PrintConfig.cpp:2121
 msgid "Position X"
 msgstr "Position X"
 
-#: src/libslic3r/PrintConfig.cpp:2240
+#: src/libslic3r/PrintConfig.cpp:2122
 msgid "X coordinate of the left front corner of a wipe tower"
 msgstr "X coordinate of the left front corner of a wipe tower"
 
-#: src/libslic3r/PrintConfig.cpp:2247
+#: src/libslic3r/PrintConfig.cpp:2128
 msgid "Position Y"
 msgstr "Position Y"
 
-#: src/libslic3r/PrintConfig.cpp:2248
+#: src/libslic3r/PrintConfig.cpp:2129
 msgid "Y coordinate of the left front corner of a wipe tower"
 msgstr "Y coordinate of the left front corner of a wipe tower"
 
-#: src/libslic3r/PrintConfig.cpp:2256
+#: src/libslic3r/PrintConfig.cpp:2136
 msgid "Width of a wipe tower"
 msgstr "Width of a wipe tower"
 
-#: src/libslic3r/PrintConfig.cpp:2263
+#: src/libslic3r/PrintConfig.cpp:2142
 msgid "Wipe tower rotation angle"
 msgstr "Wipe tower rotation angle"
 
-#: src/libslic3r/PrintConfig.cpp:2264
+#: src/libslic3r/PrintConfig.cpp:2143
 msgid "Wipe tower rotation angle with respect to x-axis "
 msgstr "Wipe tower rotation angle with respect to x-axis "
 
-#: src/libslic3r/PrintConfig.cpp:2265
+#: src/libslic3r/PrintConfig.cpp:2144 src/libslic3r/PrintConfig.cpp:2565
 msgid "degrees"
 msgstr "degrees"
 
-#: src/libslic3r/PrintConfig.cpp:2272
+#: src/libslic3r/PrintConfig.cpp:2150
 msgid "Wipe into this object's infill"
 msgstr "Wipe into this object's infill"
 
-#: src/libslic3r/PrintConfig.cpp:2273
+#: src/libslic3r/PrintConfig.cpp:2151
 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 "
@@ -6543,11 +7233,11 @@ msgstr ""
 "the amount of waste but may result in longer print time  due to additional "
 "travel moves."
 
-#: src/libslic3r/PrintConfig.cpp:2281
+#: src/libslic3r/PrintConfig.cpp:2158
 msgid "Wipe into this object"
 msgstr "Wipe into this object"
 
-#: src/libslic3r/PrintConfig.cpp:2282
+#: src/libslic3r/PrintConfig.cpp:2159
 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. "
@@ -6557,19 +7247,19 @@ msgstr ""
 "that would otherwise end up in the wipe tower and decrease print time. "
 "Colours of the objects will be mixed as a result."
 
-#: src/libslic3r/PrintConfig.cpp:2289
+#: src/libslic3r/PrintConfig.cpp:2165
 msgid "Maximal bridging distance"
 msgstr "Maximal bridging distance"
 
-#: src/libslic3r/PrintConfig.cpp:2290
+#: src/libslic3r/PrintConfig.cpp:2166
 msgid "Maximal distance between supports on sparse infill sections. "
 msgstr "Maximal distance between supports on sparse infill sections. "
 
-#: src/libslic3r/PrintConfig.cpp:2297
+#: src/libslic3r/PrintConfig.cpp:2172
 msgid "XY Size Compensation"
 msgstr "XY Size Compensation"
 
-#: src/libslic3r/PrintConfig.cpp:2299
+#: src/libslic3r/PrintConfig.cpp:2174
 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-"
@@ -6579,11 +7269,11 @@ msgstr ""
 "(negative = inwards, positive = outwards). This might be useful for fine-"
 "tuning hole sizes."
 
-#: src/libslic3r/PrintConfig.cpp:2308
+#: src/libslic3r/PrintConfig.cpp:2182
 msgid "Z offset"
 msgstr "Z offset"
 
-#: src/libslic3r/PrintConfig.cpp:2309
+#: src/libslic3r/PrintConfig.cpp:2183
 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 "
@@ -6595,74 +7285,39 @@ msgstr ""
 "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)."
 
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr "Bed size X"
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr "Dwarf"
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr "Bed size Y"
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr "Picture resolution X"
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr "px"
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr "Picture resolution Y"
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr "Exposure time"
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr "Exposure time first layers"
-
-#: src/libslic3r/PrintConfig.cpp:2373
+#: src/libslic3r/PrintConfig.cpp:2200
 msgid "Display width"
 msgstr "Display width"
 
-#: src/libslic3r/PrintConfig.cpp:2374
+#: src/libslic3r/PrintConfig.cpp:2201
 msgid "Width of the display"
 msgstr "Width of the display"
 
-#: src/libslic3r/PrintConfig.cpp:2380
+#: src/libslic3r/PrintConfig.cpp:2206
 msgid "Display height"
 msgstr "Display height"
 
-#: src/libslic3r/PrintConfig.cpp:2381
+#: src/libslic3r/PrintConfig.cpp:2207
 msgid "Height of the display"
 msgstr "Height of the display"
 
-#: src/libslic3r/PrintConfig.cpp:2387
+#: src/libslic3r/PrintConfig.cpp:2212
 msgid "Number of pixels in"
 msgstr "Number of pixels in"
 
-#: src/libslic3r/PrintConfig.cpp:2389
+#: src/libslic3r/PrintConfig.cpp:2214
 msgid "Number of pixels in X"
 msgstr "Number of pixels in X"
 
-#: src/libslic3r/PrintConfig.cpp:2396
+#: src/libslic3r/PrintConfig.cpp:2220
 msgid "Number of pixels in Y"
 msgstr "Number of pixels in Y"
 
-#: src/libslic3r/PrintConfig.cpp:2402
+#: src/libslic3r/PrintConfig.cpp:2225
 msgid "Display orientation"
 msgstr "Display orientation"
 
-#: src/libslic3r/PrintConfig.cpp:2403
+#: src/libslic3r/PrintConfig.cpp:2226
 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 "
@@ -6672,91 +7327,162 @@ msgstr ""
 "will flip the meaning of display width and height parameters and the output "
 "images will be rotated by 90 degrees."
 
-#: src/libslic3r/PrintConfig.cpp:2410
+#: src/libslic3r/PrintConfig.cpp:2232
 msgid "Landscape"
 msgstr "Landscape"
 
-#: src/libslic3r/PrintConfig.cpp:2411
+#: src/libslic3r/PrintConfig.cpp:2233
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
+#: src/libslic3r/PrintConfig.cpp:2238
+msgid "Fast"
+msgstr "Fast"
+
+#: src/libslic3r/PrintConfig.cpp:2239
+msgid "Fast tilt"
+msgstr "Fast tilt"
+
+#: src/libslic3r/PrintConfig.cpp:2240
+msgid "Time of the fast tilt"
+msgstr "Time of the fast tilt"
+
+#: src/libslic3r/PrintConfig.cpp:2247
+msgid "Slow"
+msgstr "Slow"
+
+#: src/libslic3r/PrintConfig.cpp:2248
+msgid "Slow tilt"
+msgstr "Slow tilt"
+
+#: src/libslic3r/PrintConfig.cpp:2249
+msgid "Time of the slow tilt"
+msgstr "Time of the slow tilt"
+
+#: src/libslic3r/PrintConfig.cpp:2256
+msgid "Area fill"
+msgstr "Area fill"
+
+#: src/libslic3r/PrintConfig.cpp:2257
+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 ""
+"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"
+
+#: src/libslic3r/PrintConfig.cpp:2264 src/libslic3r/PrintConfig.cpp:2265
+#: src/libslic3r/PrintConfig.cpp:2266
 msgid "Printer scaling correction"
 msgstr "Printer scaling correction"
 
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
+#: src/libslic3r/PrintConfig.cpp:2272 src/libslic3r/PrintConfig.cpp:2273
+msgid "Printer absolute correction"
+msgstr "Printer absolute correction"
+
+#: src/libslic3r/PrintConfig.cpp:2274
+msgid ""
+"Will inflate or deflate the sliced 2D polygons according to the sign of the "
+"correction."
+msgstr ""
+"Will inflate or deflate the sliced 2D polygons according to the sign of the "
+"correction."
+
+#: src/libslic3r/PrintConfig.cpp:2280 src/libslic3r/PrintConfig.cpp:2281
+msgid "Printer gamma correction"
+msgstr "Printer gamma correction"
+
+#: src/libslic3r/PrintConfig.cpp:2282
+msgid "This will apply a gamm correction to the rasterized 2D polygons."
+msgstr "This will apply a gamm correction to the rasterized 2D polygons."
+
+#: src/libslic3r/PrintConfig.cpp:2291 src/libslic3r/PrintConfig.cpp:2292
 msgid "Initial layer height"
 msgstr "Initial layer height"
 
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
+#: src/libslic3r/PrintConfig.cpp:2298
+msgid "Faded layers"
+msgstr "Faded layers"
+
+#: src/libslic3r/PrintConfig.cpp:2299
+msgid ""
+"Number of the layers needed for the exposure time fade from initial exposure "
+"time to the exposure time"
+msgstr ""
+"Number of the layers needed for the exposure time fade from initial exposure "
+"time to the exposure time"
+
+#: src/libslic3r/PrintConfig.cpp:2306 src/libslic3r/PrintConfig.cpp:2307
+msgid "Exposure time"
+msgstr "Exposure time"
+
+#: src/libslic3r/PrintConfig.cpp:2313 src/libslic3r/PrintConfig.cpp:2314
 msgid "Initial exposure time"
 msgstr "Initial exposure time"
 
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
-msgstr "Correction for expansion when printing"
+#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2321
+msgid "Correction for expansion"
+msgstr "Correction for expansion"
 
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr "Correction for expansion after curing"
-
-#: src/libslic3r/PrintConfig.cpp:2458
+#: src/libslic3r/PrintConfig.cpp:2327
 msgid "SLA print material notes"
 msgstr "SLA print material notes"
 
-#: src/libslic3r/PrintConfig.cpp:2459
+#: src/libslic3r/PrintConfig.cpp:2328
 msgid "You can put your notes regarding the SLA print material here."
 msgstr "You can put your notes regarding the SLA print material here."
 
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
+#: src/libslic3r/PrintConfig.cpp:2336 src/libslic3r/PrintConfig.cpp:2347
 msgid "Default SLA material profile"
 msgstr "Default SLA material profile"
 
-#: src/libslic3r/PrintConfig.cpp:2487
+#: src/libslic3r/PrintConfig.cpp:2358
 msgid "Generate supports"
 msgstr "Generate supports"
 
-#: src/libslic3r/PrintConfig.cpp:2489
+#: src/libslic3r/PrintConfig.cpp:2360
 msgid "Generate supports for the models"
 msgstr "Generate supports for the models"
 
-#: src/libslic3r/PrintConfig.cpp:2494
+#: src/libslic3r/PrintConfig.cpp:2365
 msgid "Support head front diameter"
 msgstr "Support head front diameter"
 
-#: src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2367
 msgid "Diameter of the pointing side of the head"
 msgstr "Diameter of the pointing side of the head"
 
-#: src/libslic3r/PrintConfig.cpp:2503
+#: src/libslic3r/PrintConfig.cpp:2374
 msgid "Support head penetration"
 msgstr "Support head penetration"
 
-#: src/libslic3r/PrintConfig.cpp:2505
+#: src/libslic3r/PrintConfig.cpp:2376
 msgid "How much the pinhead has to penetrate the model surface"
 msgstr "How much the pinhead has to penetrate the model surface"
 
-#: src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2383
 msgid "Support head width"
 msgstr "Support head width"
 
-#: src/libslic3r/PrintConfig.cpp:2514
+#: src/libslic3r/PrintConfig.cpp:2385
 msgid "Width from the back sphere center to the front sphere center"
 msgstr "Width from the back sphere center to the front sphere center"
 
-#: src/libslic3r/PrintConfig.cpp:2521
+#: src/libslic3r/PrintConfig.cpp:2393
 msgid "Support pillar diameter"
 msgstr "Support pillar diameter"
 
-#: src/libslic3r/PrintConfig.cpp:2523
+#: src/libslic3r/PrintConfig.cpp:2395
 msgid "Diameter in mm of the support pillars"
 msgstr "Diameter in mm of the support pillars"
 
-#: src/libslic3r/PrintConfig.cpp:2530
+#: src/libslic3r/PrintConfig.cpp:2403
 msgid "Support pillar connection mode"
 msgstr "Support pillar connection mode"
 
-#: src/libslic3r/PrintConfig.cpp:2531
+#: src/libslic3r/PrintConfig.cpp:2404
 msgid ""
 "Controls the bridge type between two neigboring pillars. Can be zig-zag, "
 "cross (double zig-zag) or dynamic which will automatically switch between "
@@ -6766,23 +7492,23 @@ msgstr ""
 "cross (double zig-zag) or dynamic which will automatically switch between "
 "the first two depending on the distance of the two pillars."
 
-#: src/libslic3r/PrintConfig.cpp:2540
+#: src/libslic3r/PrintConfig.cpp:2412
 msgid "Zig-Zag"
 msgstr "Zig-Zag"
 
-#: src/libslic3r/PrintConfig.cpp:2541
+#: src/libslic3r/PrintConfig.cpp:2413
 msgid "Cross"
 msgstr "Cross"
 
-#: src/libslic3r/PrintConfig.cpp:2542
+#: src/libslic3r/PrintConfig.cpp:2414
 msgid "Dynamic"
 msgstr "Dynamic"
 
-#: src/libslic3r/PrintConfig.cpp:2546
+#: src/libslic3r/PrintConfig.cpp:2426
 msgid "Pillar widening factor"
 msgstr "Pillar widening factor"
 
-#: src/libslic3r/PrintConfig.cpp:2548
+#: src/libslic3r/PrintConfig.cpp:2428
 msgid ""
 "Merging bridges or pillars into another pillars can increase the radius. "
 "Zero means no increase, one means full increase."
@@ -6790,258 +7516,389 @@ msgstr ""
 "Merging bridges or pillars into another pillars can increase the radius. "
 "Zero means no increase, one means full increase."
 
-#: src/libslic3r/PrintConfig.cpp:2557
+#: src/libslic3r/PrintConfig.cpp:2437
 msgid "Support base diameter"
 msgstr "Support base diameter"
 
-#: src/libslic3r/PrintConfig.cpp:2559
+#: src/libslic3r/PrintConfig.cpp:2439
 msgid "Diameter in mm of the pillar base"
 msgstr "Diameter in mm of the pillar base"
 
-#: src/libslic3r/PrintConfig.cpp:2566
+#: src/libslic3r/PrintConfig.cpp:2447
 msgid "Support base height"
 msgstr "Support base height"
 
-#: src/libslic3r/PrintConfig.cpp:2568
+#: src/libslic3r/PrintConfig.cpp:2449
 msgid "The height of the pillar base cone"
 msgstr "The height of the pillar base cone"
 
-#: src/libslic3r/PrintConfig.cpp:2575
+#: src/libslic3r/PrintConfig.cpp:2456
 msgid "Critical angle"
 msgstr "Critical angle"
 
-#: src/libslic3r/PrintConfig.cpp:2577
+#: src/libslic3r/PrintConfig.cpp:2458
 msgid "The default angle for connecting support sticks and junctions."
 msgstr "The default angle for connecting support sticks and junctions."
 
-#: src/libslic3r/PrintConfig.cpp:2584
+#: src/libslic3r/PrintConfig.cpp:2466
 msgid "Max bridge length"
 msgstr "Max bridge length"
 
-#: src/libslic3r/PrintConfig.cpp:2586
+#: src/libslic3r/PrintConfig.cpp:2468
 msgid "The max length of a bridge"
 msgstr "The max length of a bridge"
 
-#: src/libslic3r/PrintConfig.cpp:2593
+#: src/libslic3r/PrintConfig.cpp:2475
+msgid "Max pillar linking distance"
+msgstr "Max pillar linking distance"
+
+#: src/libslic3r/PrintConfig.cpp:2477
+msgid ""
+"The max distance of two pillars to get linked with each other. A zero value "
+"will prohibit pillar cascading."
+msgstr ""
+"The max distance of two pillars to get linked with each other. A zero value "
+"will prohibit pillar cascading."
+
+#: src/libslic3r/PrintConfig.cpp:2485
 msgid "Object elevation"
 msgstr "Object elevation"
 
-#: src/libslic3r/PrintConfig.cpp:2595
+#: src/libslic3r/PrintConfig.cpp:2487
 msgid "How much the supports should lift up the supported object."
 msgstr "How much the supports should lift up the supported object."
 
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
-msgstr "Density on horizontal surfaces"
+#: src/libslic3r/PrintConfig.cpp:2495
+msgid "Support points density"
+msgstr "Support points density"
 
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
-msgstr ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
+#: src/libslic3r/PrintConfig.cpp:2497
+msgid "This is a relative measure of support points density."
+msgstr "This is a relative measure of support points density."
 
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
-msgstr "points per square dm"
+#: src/libslic3r/PrintConfig.cpp:2503
+msgid "Minimal distance of the support points"
+msgstr "Minimal distance of the support points"
 
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr "Density on surfaces at 45 degrees"
+#: src/libslic3r/PrintConfig.cpp:2505
+msgid "No support points will be placed closer than this threshold."
+msgstr "No support points will be placed closer than this threshold."
 
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr "Minimal support point height"
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-"No support points will be placed lower than this value from the bottom."
-
-#: src/libslic3r/PrintConfig.cpp:2629
+#: src/libslic3r/PrintConfig.cpp:2511
 msgid "Use pad"
 msgstr "Use pad"
 
-#: src/libslic3r/PrintConfig.cpp:2631
+#: src/libslic3r/PrintConfig.cpp:2513
 msgid "Add a pad underneath the supported model"
 msgstr "Add a pad underneath the supported model"
 
-#: src/libslic3r/PrintConfig.cpp:2636
+#: src/libslic3r/PrintConfig.cpp:2518
 msgid "Pad wall thickness"
 msgstr "Pad wall thickness"
 
-#: src/libslic3r/PrintConfig.cpp:2645
+#: src/libslic3r/PrintConfig.cpp:2520
+msgid "The thickness of the pad and its optional cavity walls."
+msgstr "The thickness of the pad and its optional cavity walls."
+
+#: src/libslic3r/PrintConfig.cpp:2528
 msgid "Pad wall height"
 msgstr "Pad wall height"
 
-#: src/libslic3r/PrintConfig.cpp:2654
+#: src/libslic3r/PrintConfig.cpp:2529
+msgid "Defines the cavity depth. Set to zero to disable the cavity."
+msgstr "Defines the cavity depth. Set to zero to disable the cavity."
+
+#: src/libslic3r/PrintConfig.cpp:2539
 msgid "Max merge distance"
 msgstr "Max merge distance"
 
-#: src/libslic3r/PrintConfig.cpp:2663
+#: src/libslic3r/PrintConfig.cpp:2541
+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 ""
+"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."
+
+#: src/libslic3r/PrintConfig.cpp:2552
 msgid "Pad edge radius"
 msgstr "Pad edge radius"
 
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
-msgstr "Cut model at the given Z."
+#: src/libslic3r/PrintConfig.cpp:2561
+msgid "Pad wall slope"
+msgstr "Pad wall slope"
 
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr "Dont arrange"
-
-#: src/libslic3r/PrintConfig.cpp:3023
+#: src/libslic3r/PrintConfig.cpp:2563
 msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
+"The slope of the pad wall relative to the bed plane. 90 degrees means "
+"straight walls."
 msgstr ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
+"The slope of the pad wall relative to the bed plane. 90 degrees means "
+"straight walls."
 
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
-msgstr "User data directory"
+#: src/libslic3r/PrintConfig.cpp:2924
+msgid "Export SVG"
+msgstr "Export SVG"
 
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
-msgstr ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
+#: src/libslic3r/PrintConfig.cpp:2925
+msgid "Export the model(s) as OBJ."
+msgstr "Export the model(s) as OBJ."
 
-#: src/libslic3r/PrintConfig.cpp:3038
+#: src/libslic3r/PrintConfig.cpp:2936
+msgid "Export SLA"
+msgstr "Export SLA"
+
+#: src/libslic3r/PrintConfig.cpp:2937
+msgid "Slice the model and export SLA printing layers as PNG."
+msgstr "Slice the model and export SLA printing layers as PNG."
+
+#: src/libslic3r/PrintConfig.cpp:2942
 msgid "Export 3MF"
 msgstr "Export 3MF"
 
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr "Slice the model and export slices as 3MF."
+#: src/libslic3r/PrintConfig.cpp:2943
+msgid "Export the model(s) as 3MF."
+msgstr "Export the model(s) as 3MF."
 
-#: src/libslic3r/PrintConfig.cpp:3044
+#: src/libslic3r/PrintConfig.cpp:2947
+msgid "Export AMF"
+msgstr "Export AMF"
+
+#: src/libslic3r/PrintConfig.cpp:2948
+msgid "Export the model(s) as AMF."
+msgstr "Export the model(s) as AMF."
+
+#: src/libslic3r/PrintConfig.cpp:2952
+msgid "Export STL"
+msgstr "Export STL"
+
+#: src/libslic3r/PrintConfig.cpp:2953
+msgid "Export the model(s) as STL."
+msgstr "Export the model(s) as STL."
+
+#: src/libslic3r/PrintConfig.cpp:2958
+msgid "Slice the model and export toolpaths as G-code."
+msgstr "Slice the model and export toolpaths as G-code."
+
+#: src/libslic3r/PrintConfig.cpp:2963
 msgid "Slice"
 msgstr "Slice"
 
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr "Slice the model and export gcode."
+#: src/libslic3r/PrintConfig.cpp:2964
+msgid ""
+"Slice the model as FFF or SLA based on the printer_technology configuration "
+"value."
+msgstr ""
+"Slice the model as FFF or SLA based on the printer_technology configuration "
+"value."
 
-#: src/libslic3r/PrintConfig.cpp:3050
+#: src/libslic3r/PrintConfig.cpp:2969
 msgid "Help"
 msgstr "Help"
 
-#: src/libslic3r/PrintConfig.cpp:3051
+#: src/libslic3r/PrintConfig.cpp:2970
 msgid "Show this help."
 msgstr "Show this help."
 
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr "Use GUI"
+#: src/libslic3r/PrintConfig.cpp:2975
+msgid "Help (FFF options)"
+msgstr "Help (FFF options)"
 
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
+#: src/libslic3r/PrintConfig.cpp:2976
+msgid "Show the full list of print/G-code configuration options."
+msgstr "Show the full list of print/G-code configuration options."
 
-#: src/libslic3r/PrintConfig.cpp:3063
+#: src/libslic3r/PrintConfig.cpp:2980
+msgid "Help (SLA options)"
+msgstr "Help (SLA options)"
+
+#: src/libslic3r/PrintConfig.cpp:2981
+msgid "Show the full list of SLA print configuration options."
+msgstr "Show the full list of SLA print configuration options."
+
+#: src/libslic3r/PrintConfig.cpp:2985
 msgid "Output Model Info"
 msgstr "Output Model Info"
 
-#: src/libslic3r/PrintConfig.cpp:3064
+#: src/libslic3r/PrintConfig.cpp:2986
 msgid "Write information about the model to the console."
 msgstr "Write information about the model to the console."
 
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr "Load config file"
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr "Do not use GUI"
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr "Output File"
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr "Rotate around X"
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr "Rotation angle around the X axis in degrees (0-360, default: 0)."
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr "Rotate around Y"
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-
-#: src/libslic3r/PrintConfig.cpp:3105
+#: src/libslic3r/PrintConfig.cpp:2990
 msgid "Save config file"
 msgstr "Save config file"
 
-#: src/libslic3r/PrintConfig.cpp:3106
+#: src/libslic3r/PrintConfig.cpp:2991
 msgid "Save configuration to the specified file."
 msgstr "Save configuration to the specified file."
 
+#: src/libslic3r/PrintConfig.cpp:3001
+msgid "Align XY"
+msgstr "Align XY"
+
+#: src/libslic3r/PrintConfig.cpp:3002
+msgid "Align the model to the given point."
+msgstr "Align the model to the given point."
+
+#: src/libslic3r/PrintConfig.cpp:3007
+msgid "Cut model at the given Z."
+msgstr "Cut model at the given Z."
+
+#: src/libslic3r/PrintConfig.cpp:3028
+msgid "Center"
+msgstr "Center"
+
+#: src/libslic3r/PrintConfig.cpp:3029
+msgid "Center the print around the given center."
+msgstr "Center the print around the given center."
+
+#: src/libslic3r/PrintConfig.cpp:3033
+msgid "Don't arrange"
+msgstr "Don't arrange"
+
+#: src/libslic3r/PrintConfig.cpp:3034
+msgid ""
+"Do not rearrange the given models before merging and keep their original XY "
+"coordinates."
+msgstr ""
+"Do not rearrange the given models before merging and keep their original XY "
+"coordinates."
+
+#: src/libslic3r/PrintConfig.cpp:3037
+msgid "Duplicate"
+msgstr "Duplicate"
+
+#: src/libslic3r/PrintConfig.cpp:3038
+msgid "Multiply copies by this factor."
+msgstr "Multiply copies by this factor."
+
+#: src/libslic3r/PrintConfig.cpp:3042
+msgid "Duplicate by grid"
+msgstr "Duplicate by grid"
+
+#: src/libslic3r/PrintConfig.cpp:3043
+msgid "Multiply copies by creating a grid."
+msgstr "Multiply copies by creating a grid."
+
+#: src/libslic3r/PrintConfig.cpp:3046
+msgid "Merge"
+msgstr "Merge"
+
+#: src/libslic3r/PrintConfig.cpp:3047
+msgid ""
+"Arrange the supplied models in a plate and merge them in a single model in "
+"order to perform actions once."
+msgstr ""
+"Arrange the supplied models in a plate and merge them in a single model in "
+"order to perform actions once."
+
+#: src/libslic3r/PrintConfig.cpp:3052
+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 ""
+"Try to repair any non-manifold meshes (this option is implicitly added "
+"whenever we need to slice the model to perform the requested action)."
+
+#: src/libslic3r/PrintConfig.cpp:3056
+msgid "Rotation angle around the Z axis in degrees."
+msgstr "Rotation angle around the Z axis in degrees."
+
+#: src/libslic3r/PrintConfig.cpp:3060
+msgid "Rotate around X"
+msgstr "Rotate around X"
+
+#: src/libslic3r/PrintConfig.cpp:3061
+msgid "Rotation angle around the X axis in degrees."
+msgstr "Rotation angle around the X axis in degrees."
+
+#: src/libslic3r/PrintConfig.cpp:3065
+msgid "Rotate around Y"
+msgstr "Rotate around Y"
+
+#: src/libslic3r/PrintConfig.cpp:3066
+msgid "Rotation angle around the Y axis in degrees."
+msgstr "Rotation angle around the Y axis in degrees."
+
+#: src/libslic3r/PrintConfig.cpp:3071
+msgid "Scaling factor or percentage."
+msgstr "Scaling factor or percentage."
+
+#: src/libslic3r/PrintConfig.cpp:3076
+msgid ""
+"Detect unconnected parts in the given model(s) and split them into separate "
+"objects."
+msgstr ""
+"Detect unconnected parts in the given model(s) and split them into separate "
+"objects."
+
+#: src/libslic3r/PrintConfig.cpp:3079
+msgid "Scale to Fit"
+msgstr "Scale to Fit"
+
+#: src/libslic3r/PrintConfig.cpp:3080
+msgid "Scale to fit the given volume."
+msgstr "Scale to fit the given volume."
+
+#: src/libslic3r/PrintConfig.cpp:3089
+msgid "Ignore non-existent config files"
+msgstr "Ignore non-existent config files"
+
+#: src/libslic3r/PrintConfig.cpp:3090
+msgid "Do not fail if a file supplied to --load does not exist."
+msgstr "Do not fail if a file supplied to --load does not exist."
+
+#: src/libslic3r/PrintConfig.cpp:3093
+msgid "Load config file"
+msgstr "Load config file"
+
+#: src/libslic3r/PrintConfig.cpp:3094
+msgid ""
+"Load configuration from the specified file. It can be used more than once to "
+"load options from multiple files."
+msgstr ""
+"Load configuration from the specified file. It can be used more than once to "
+"load options from multiple files."
+
+#: src/libslic3r/PrintConfig.cpp:3097
+msgid "Output File"
+msgstr "Output File"
+
+#: src/libslic3r/PrintConfig.cpp:3098
+msgid ""
+"The file where the output will be written (if not specified, it will be "
+"based on the input file)."
+msgstr ""
+"The file where the output will be written (if not specified, it will be "
+"based on the input file)."
+
+#: src/libslic3r/PrintConfig.cpp:3108
+msgid "Data directory"
+msgstr "Data directory"
+
+#: src/libslic3r/PrintConfig.cpp:3109
+msgid ""
+"Load and store settings at the given directory. This is useful for "
+"maintaining different profiles or including configurations from a network "
+"storage."
+msgstr ""
+"Load and store settings at the given directory. This is useful for "
+"maintaining different profiles or including configurations from a network "
+"storage."
+
 #: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr "Scaling factor (default: 1)."
+msgid "Logging level"
+msgstr "Logging level"
 
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr "Print center"
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
-msgstr "Center the print around the given center (default: 100, 100)."
+#: src/libslic3r/PrintConfig.cpp:3113
+msgid ""
+"Messages with severity lower or eqal to the loglevel will be printed out. 0:"
+"trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
+msgstr ""
+"Messages with severity lower or eqal to the loglevel will be printed out. 0:"
+"trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
 
 #: src/libslic3r/GCode/PreviewData.cpp:176
 msgid "Mixed"
diff --git a/resources/localization/en_US/Slic3rPE.mo b/resources/localization/en_US/Slic3rPE.mo
deleted file mode 100644
index 6295b97d2..000000000
Binary files a/resources/localization/en_US/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/es/Slic3rPE.mo b/resources/localization/es/Slic3rPE.mo
deleted file mode 100644
index 1e95d9289..000000000
Binary files a/resources/localization/es/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/es/Slic3rPE_es.po b/resources/localization/es/Slic3rPE_es.po
deleted file mode 100644
index 781162240..000000000
--- a/resources/localization/es/Slic3rPE_es.po
+++ /dev/null
@@ -1,7054 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language-Team: \n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
-
-#: src/slic3r/GUI/AboutDialog.cpp:33
-msgid "About Slic3r"
-msgstr "Acerca de Slic3r"
-
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
-msgid "Version"
-msgstr "Versión"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:43
-msgid "Shape"
-msgstr "Aspecto"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
-msgid "Rectangular"
-msgstr "Rectangular"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
-msgid "Size"
-msgstr "Tamaño"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
-msgid "Size in X and Y of the rectangular plate."
-msgstr "Tamaño en X e Y de la placa rectangular."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
-msgid "Origin"
-msgstr "Origen"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
-msgid ""
-"Distance of the 0,0 G-code coordinate from the front left corner of the "
-"rectangle."
-msgstr ""
-"Distancia de la coordenada del código G de 0,0 de la esquina frontal "
-"izquierda del rectángulo."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
-msgid "Circular"
-msgstr "Circular"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
-msgid "mm"
-msgstr "mm"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
-msgid "Diameter"
-msgstr "Diámetro"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
-msgid ""
-"Diameter of the print bed. It is assumed that origin (0,0) is located in the "
-"center."
-msgstr ""
-"Diámetro de la base de impresión. Se supone que el origen (0,0) está ubicado "
-"en el centro."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
-#: src/libslic3r/GCode/PreviewData.cpp:175
-msgid "Custom"
-msgstr "Personalizado"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
-msgid "Load shape from STL..."
-msgstr ""
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
-msgid "Settings"
-msgstr "Ajustes"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr ""
-"Escoja un archivo para importar la forma de la base de impresión (STL/OBJ/"
-"AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
-msgid "Error! "
-msgstr "¡Error! "
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr "El archivo seleccionado no contiene geometría."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
-msgid ""
-"The selected file contains several disjoint areas. This is not supported."
-msgstr ""
-"El archivo seleccionado contiene varias áreas disjuntas. Esto no es "
-"compatible."
-
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape"
-msgstr "Forma de la base de impresión"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:54
-msgid "Network lookup"
-msgstr "Búsqueda en la red"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:67
-msgid "Address"
-msgstr "Dirección"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:68
-msgid "Hostname"
-msgstr "Nombre del equipo"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:69
-msgid "Service name"
-msgstr "Nombre del servicio"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:70
-msgid "OctoPrint version"
-msgstr "Versión de OctoPrint"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:188
-msgid "Searching for devices"
-msgstr "Buscando dispositivos"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:195
-msgid "Finished"
-msgstr "Terminado"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:15
-msgid "Buttons And Text Colors Description"
-msgstr "Descripción de los botones y de los colores del texto"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:40
-msgid "Value is the same as the system value"
-msgstr "El valor es el mismo que el del sistema"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:57
-msgid ""
-"Value was changed and is not equal to the system value or the last saved "
-"preset"
-msgstr ""
-"El valor ha cambiado y ya no es igual al valor del sistema o al último valor "
-"guardado"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
-msgid "Upgrade"
-msgstr "Actualización"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
-msgid "Downgrade"
-msgstr "Volver a una versión anterior"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
-msgid "Before roll back"
-msgstr "Antes de volver atrás"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
-msgid "User"
-msgstr "Usuario"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
-msgid "Active: "
-msgstr "Activo: "
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "slic3r version"
-msgstr "versión de Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
-msgid "print"
-msgstr "imprimir"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "filaments"
-msgstr "filamentos"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
-msgid "printer"
-msgstr "impresora"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
-msgid "vendor"
-msgstr "fabricante"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
-msgid "version"
-msgstr "versión"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
-msgid "min slic3r version"
-msgstr "mínima versión de Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
-msgid "max slic3r version"
-msgstr "versión máxima de slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "model"
-msgstr "modelo"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "variants"
-msgstr "variantes"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
-msgid "Incompatible with this Slic3r"
-msgstr "Incompatible con este Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
-msgid "Activate"
-msgstr "Activar"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
-msgid "Configuration Snapshots"
-msgstr "Instantáneas de la Configuración"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:92
-msgid "nozzle"
-msgstr "boquilla"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
-msgstr "por defecto"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
-msgstr "Selecciona todo"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "No seleccionar ninguno"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-#, c-format
-msgid "Welcome to the Slic3r %s"
-msgstr "Bienvenido a Slic3r %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-msgid "Welcome"
-msgstr "Bienvenido"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
-#, c-format
-msgid "Run %s"
-msgstr "Ejecutar %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:234
-#, c-format
-msgid ""
-"Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
-"configuration; just a few settings and you will be ready to print."
-msgstr ""
-"Hola, bienvenido a Slic3r  Prusa Edition! Este %s te ayuda con la "
-"configuración inicial; sólo unos pocos ajustes y estarás preparado para "
-"imprimir."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:238
-msgid ""
-"Remove user profiles - install from scratch (a snapshot will be taken "
-"beforehand)"
-msgstr ""
-"Eliminar perfiles de usuario - instalar desde cero (se realizará una "
-"instantánea con anterioridad)"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr "Otras marcas"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr "Configuración personalizada"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Automatic updates"
-msgstr "Actualizaciones automáticas"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Updates"
-msgstr "Actualizaciones"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
-msgid "Check for application updates"
-msgstr "Comprueba si hay actualizaciones de la aplicación"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
-msgid ""
-"If enabled, Slic3r checks for new versions of Slic3r PE 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 ""
-"Si está activado, Slic3r comprueba si hay nuevas versiones de Slic3r PE en "
-"la red. Cuando hay disponible una nueva versión se muestra una notificación "
-"al iniciar la aplicación (nunca durante el uso del programa). Esto es sólo "
-"un mecanismo de notificación, sin que se realice una instalación automática."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
-msgid "Update built-in Presets automatically"
-msgstr "Actualiza los ajustes de fábrica automáticamente"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
-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 ""
-"Si está activado, Slic3r descargará actualizaciones de los ajustes del "
-"sistema mientras lo usamos Estas actualizaciones se descargan a una "
-"ubicación temporal. Cuando hay un nuevo ajuste disponible, este se podrá "
-"incorporar y usar cuando la aplicación se vuelva a iniciar."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:308
-msgid ""
-"Updates are never applied without user's consent and never overwrite user's "
-"customized settings."
-msgstr ""
-"Las actualizaciones nunca se realizan sin el consentimiento del usuario y "
-"nunca sobre-escriben ajustes personalizados del usuario."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:313
-msgid ""
-"Additionally a backup snapshot of the whole configuration is created before "
-"an update is applied."
-msgstr ""
-"Además se realizará una instantánea de toda la configuración antes de "
-"aplicar una actualización."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:320
-msgid "Other Vendors"
-msgstr "Otras Marcas"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:322
-msgid "Pick another vendor supported by Slic3r PE:"
-msgstr "Escoge otro fabricante soportado por Slic3r PE:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381
-msgid "Firmware Type"
-msgstr "Tipo de Firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
-msgid "Firmware"
-msgstr "Firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:385
-msgid "Choose the type of firmware used by your printer."
-msgstr "Selecciona el tipo de firmware que usa tu impresora."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape and Size"
-msgstr "Tamaño y forma de la base"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:422
-msgid "Set the shape of your printer's bed."
-msgstr "Define la forma de la base de impresión de tu impresora."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Filament and Nozzle Diameters"
-msgstr "Filamento y diámetros de boquilla"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Print Diameters"
-msgstr "Diámetros de impresión"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:452
-msgid "Enter the diameter of your printer's hot end nozzle."
-msgstr "Introduce el diámetro de la boquilla del fusor de tu impresora."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:455
-msgid "Nozzle Diameter:"
-msgstr "Diámetro de la boquilla:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:465
-msgid "Enter the diameter of your filament."
-msgstr "Introduce el diámetro de tu filamento."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:466
-msgid ""
-"Good precision is required, so use a caliper and do multiple measurements "
-"along the filament, then compute the average."
-msgstr ""
-"Se necesita buena precisión, así que usa un calibre y realiza varias medidas "
-"a lo largo del filamento, luego calcula la media."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:469
-msgid "Filament Diameter:"
-msgstr "Diámetro del filamento:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Extruder and Bed Temperatures"
-msgstr "Temperaturas del Extrusor y de la Base"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Temperatures"
-msgstr "Temperaturas"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:503
-msgid "Enter the temperature needed for extruding your filament."
-msgstr "Introduce la temperatura necesaria para extruir tu filamento."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:504
-msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
-msgstr ""
-"Una buena aproximación es de 160 a 230 °C para PLA y de 215 a 250 °C para "
-"ABS."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:507
-msgid "Extrusion Temperature:"
-msgstr "Temperatura de Extrusión:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
-msgid "°C"
-msgstr "°C"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:517
-msgid ""
-"Enter the bed temperature needed for getting your filament to stick to your "
-"heated bed."
-msgstr ""
-"Introduce la temperatura de la base necesaria para que adhiera el filamento "
-"a la base calefactable."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:518
-msgid ""
-"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
-"no heated bed."
-msgstr ""
-"Una buena aproximación son unos 60 °C para PLA y 110 °C para  ABS. Deja el "
-"valor a cero si no tienes base calefactable."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:521
-msgid "Bed Temperature:"
-msgstr "Temperatura de la base:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:833
-msgid "< &Back"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:834
-msgid "&Next >"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:835
-msgid "&Finish"
-msgstr "&Terminar"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:906
-msgid "Configuration Wizard"
-msgstr "Asistente de configuración"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:907
-msgid "Configuration &Wizard"
-msgstr "&Asistente de configuración"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:909
-msgid "Configuration Assistant"
-msgstr "Asistente de Configuración"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:910
-msgid "Configuration &Assistant"
-msgstr "&Asistente de configuración"
-
-#: src/slic3r/GUI/Field.cpp:109
-msgid "default value"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:112
-msgid "parameter name"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:140
-#, c-format
-msgid "%s doesn't support percentage"
-msgstr "%s no permite porcentajes"
-
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:153
-msgid "Input value is out of range"
-msgstr "El valor introducido está fuera de rango"
-
-#: src/slic3r/GUI/Field.cpp:176
-#, c-format
-msgid ""
-"Do you mean %d%% instead of %d %s?\n"
-"Select YES if you want to change this value to %d%%, \n"
-"or NO if you are sure that %d %s is a correct value."
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:179
-msgid "Parameter validation"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
-msgid "Flash!"
-msgstr "Flash!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
-msgid "Flashing in progress. Please do not disconnect the printer!"
-msgstr "Flasheo en curso. ¡Por favor no desconecte la impresora!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
-msgid "Flashing succeeded!"
-msgstr "¡Exito al flashear!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
-msgid "Flashing failed. Please see the avrdude log below."
-msgstr "Flasheo fallido. Por favor comprueba el log de avrdude."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
-msgid "Flashing cancelled."
-msgstr "Flasheo cancelado."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
-#, 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 ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
-msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
-#, c-format
-msgid "Error accessing port at %s: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
-msgid "Firmware flasher"
-msgstr "Flasheador de firmware"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
-msgid "Firmware image:"
-msgstr "Imagen del firmware:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
-msgid "Serial port:"
-msgstr "Puerto serie:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
-msgid "Autodetected"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
-msgid "Rescan"
-msgstr "Rescanear"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
-msgid "Progress:"
-msgstr "Progreso:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
-msgid "Status:"
-msgstr "Estado:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
-msgid "Ready"
-msgstr "Listo"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr "Avanzado: salida del log avrdude"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-"¿Estas seguro de cancelar el flaseo del firmware?\n"
-"¡Esto podría dejar tu impresora en un estado inusable!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
-msgid "Confirmation"
-msgstr "Confirmación"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
-msgid "Cancelling..."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
-msgid "Detected object outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
-msgid "Detected toolpath outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "Girar"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "Escalar"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
-msgid "Rotate lower part upwards"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
-msgid "Perform cut"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2276
-msgid "Cut object:"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
-msgid "Cut"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2466
-msgid "Keep upper part"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2467
-msgid "Keep lower part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "Date cuenta"
-
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr "Intento de liberar un escalar no referenciado"
-
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
-msgid "Warning"
-msgstr "Peligro"
-
-#: src/slic3r/GUI/GUI_App.cpp:377
-msgid "Choose one file (3MF):"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:389
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Escoja uno o mas archivos (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/GUI_App.cpp:451
-msgid "Array of language names and identifiers should have the same size."
-msgstr ""
-"La lista de nombres de idioma e identificadores debería tener el mismo "
-"tamaño."
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Select the language"
-msgstr "Seleccione el idioma"
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Language"
-msgstr "Idioma"
-
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
-msgid "Default"
-msgstr "Por defecto"
-
-# xs/src/slic3r/GUI/GUI.cpp:402
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "&Configuration Snapshots"
-msgstr "Instantáneas de la &Configuración"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "Inspect / activate configuration snapshots"
-msgstr "Inspeccionar / activar instantáneas de configuración"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Take Configuration &Snapshot"
-msgstr "Hacer una In&stantánea de la Configuración"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Capture a configuration snapshot"
-msgstr "Captura una instantánea de configuración"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "&Preferences"
-msgstr "&Preferencias"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "Application preferences"
-msgstr "Preferencias de la aplicación"
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: src/slic3r/GUI/GUI_App.cpp:617
-msgid "Advanced View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Slic3r View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:622
-msgid "Change Application &Language"
-msgstr "Cambiar el &Idioma de la Aplicación"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Flash printer &firmware"
-msgstr "Flashear &firmware de la impresora"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr "Cargar una imagen de firmware a una impresora basada en Arduino"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Taking configuration snapshot"
-msgstr "Haciendo una instantánea de la configuración"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Snapshot name"
-msgstr "Nombre de la instantánea"
-
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "El programa se reiniciará"
-
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "¡Atención!"
-
-#: src/slic3r/GUI/GUI_App.cpp:691
-msgid "&Configuration"
-msgstr "&Configuración"
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid "You have unsaved changes "
-msgstr "Tienes cambios sin guardar "
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid ". Discard changes and continue anyway?"
-msgstr ". ¿Descartar los cambios y continuar de todos modos?"
-
-#: src/slic3r/GUI/GUI_App.cpp:712
-msgid "Unsaved Presets"
-msgstr "Ajustes iniciales no guardados"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
-msgid "Layers and Perimeters"
-msgstr "Capas y Perímetros"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
-msgid "Infill"
-msgstr "Relleno"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
-msgid "Support material"
-msgstr "Material de soporte"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "Velocidad"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
-msgid "Extruders"
-msgstr "Extrusores"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
-msgid "Extrusion Width"
-msgstr "Ancho de Extrusión"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
-msgid "Supports"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
-msgid "Pad"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
-msgid "Name"
-msgstr "Nombre"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
-msgid "Right button click the icon to change the object settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
-#, c-format
-msgid "Auto-repaired (%d errors):\n"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
-msgid "degenerate facets"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
-msgid "edges fixed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
-msgid "facets removed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
-msgid "facets added"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
-msgid "facets reversed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
-msgid "backwards edges"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
-msgid "Right button click the icon to fix STL through Netfabb"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
-msgid "Extruder"
-msgstr "Extrusor"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
-msgid "Select showing settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
-msgid "Load"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
-msgid "Box"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Cylinder"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Sphere"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Slab"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
-msgid "Split to parts"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
-msgid "Add settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
-msgid "Change type"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
-msgid "You can't delete the last solid part from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
-msgid "You can't delete the last intance from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
-msgid ""
-"The selected object couldn't be split because it contains only one part."
-msgstr ""
-"El objeto seleccionado no se pudo dividir porque contiene solo una parte."
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
-msgid "Group manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
-msgid "Object manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
-msgid "Object Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
-msgid "Part Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
-msgid "Part manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
-msgid "Instance manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
-msgid "You can't change a type of the last solid part of the object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
-msgid "Select type of part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
-msgid "The supplied name is not valid;"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
-msgid "the following characters are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
-msgid "Object Manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
-msgid "Object name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
-msgid "Position"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
-msgid "Rotation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
-msgid "Scale factors"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
-msgid "Translate"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:235
-msgid "View"
-msgstr "Vista"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:394
-msgid "Feature type"
-msgstr "Tipo de función"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
-msgid "Height"
-msgstr "Altura"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
-msgid "Width"
-msgstr "Ancho"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:242
-msgid "Volumetric flow rate"
-msgstr "Tasa de caudal volumétrico"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
-msgid "Tool"
-msgstr "Herramienta"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:406
-msgid "Color Print"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:247
-msgid "Show"
-msgstr "Mostrar"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
-msgid "Feature types"
-msgstr "Tipos de funciones"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
-msgid "Perimeter"
-msgstr "Perímetro"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
-msgid "External perimeter"
-msgstr "Perímetro externo"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
-msgid "Overhang perimeter"
-msgstr "Perímetro de voladizos"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
-msgid "Internal infill"
-msgstr "Relleno interno"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
-msgid "Solid infill"
-msgstr "Relleno sólido"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
-msgid "Top solid infill"
-msgstr "Relleno sólido superior"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
-msgid "Bridge infill"
-msgstr "Relleno de puente"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
-#: src/libslic3r/GCode/PreviewData.cpp:170
-msgid "Gap fill"
-msgstr "Relleno"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
-#: src/libslic3r/GCode/PreviewData.cpp:171
-msgid "Skirt"
-msgstr "Falda"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
-#: src/libslic3r/GCode/PreviewData.cpp:173
-msgid "Support material interface"
-msgstr "Interfaz del material de soporte"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
-#: src/libslic3r/GCode/PreviewData.cpp:174
-msgid "Wipe tower"
-msgstr "Torre de limpieza"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
-msgid "Travel"
-msgstr "Recorrido"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:270
-msgid "Retractions"
-msgstr "Retracciones"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:271
-msgid "Unretractions"
-msgstr "Desretracciones"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:272
-msgid "Shells"
-msgstr "Carcasas"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
-msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
-msgid "Export G-code"
-msgstr "Exportar código G"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
-msgid "Save project (3MF)"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "(Re)slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Quick slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat last quick slice"
-msgstr "Repetir el último laminado rápido"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
-msgid "Select Plater Tab"
-msgstr "Seleccionar la pestaña Ajustes de la base"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Quick slice and Save as"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Select Print Settings Tab"
-msgstr "Seleccionar la pestaña Ajustes de impresión"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
-msgid "Select Filament Settings Tab"
-msgstr "Seleccionar la pestaña Ajustes de Filamento"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
-msgid "Select Printer Settings Tab"
-msgstr "Selecccionar la pestaña Ajustes de impresora"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
-msgid "Switch to 3D"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
-msgid "Switch to Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
-msgid "Print host upload queue"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
-msgid "Camera view "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
-msgid "Add Instance to selected object "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
-msgid "Remove Instance from selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
-msgid "Show keyboard shortcuts list"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
-msgid "Select multiple object/Move multiple object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
-msgid "Arrange"
-msgstr "Organiza"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
-msgid "Select All objects"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
-msgid "Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
-msgid "Delete All"
-msgstr "Borrar todo"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
-msgid "Gizmo move"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
-msgid "Gizmo scale"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
-msgid "Gizmo rotate"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Gizmo cut"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Gizmo Place face on bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Gizmo SLA support points"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Zoom to Bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Zoom to all objects in scene, if none selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Zoom to selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Zoom in"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Zoom out"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Unselect gizmo, keep object selection"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
-msgid "Plater Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Arrow Up"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Upper Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Arrow Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Lower Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
-msgid "Preview Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:53
-msgid ""
-" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
-msgstr ""
-" - Recuerda comprobar si hay actualizaciones en http://github.com/prusa3d/"
-"slic3r/releases"
-
-#: src/slic3r/GUI/MainFrame.cpp:130
-msgid "Plater"
-msgstr "Plataforma"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "&Abrir"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "Open a project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "Save current project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save current project file as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Import STL/OBJ/AM&F/3MF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Load a model"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Import &Config"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Load exported configuration file"
-msgstr "Cargar archivo de configuración exportado"
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Import Config from &project"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Load configuration from project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Import Config &Bundle"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Load presets from a bundle"
-msgstr "Cargar preajustes de un paquete"
-
-#: src/slic3r/GUI/MainFrame.cpp:256
-msgid "&Import"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export &G-code"
-msgstr "Exportar código &G"
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export current plate as G-code"
-msgstr "Exportar plataforma actual como código G"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export plate as &STL"
-msgstr "Exportar plataforma como &STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export current plate as STL"
-msgstr "Exportar plataforma actual como STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export plate as &AMF"
-msgstr "Exportar plataforma como &AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export current plate as AMF"
-msgstr "Exportar plataforma actual como AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export &Config"
-msgstr "Exportar A&juste"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export current configuration to file"
-msgstr "Exportar la configuración actual al archivo"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export Config &Bundle"
-msgstr "Exportar &Conjunto de Ajustes"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export all presets to file"
-msgstr "Exportar todos los preajustes al archivo"
-
-#: src/slic3r/GUI/MainFrame.cpp:271
-msgid "&Export"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Slice a file into a G-code"
-msgstr "Laminar un archivo en un código G"
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Quick Slice and Save As"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Slice a file into a G-code, save as"
-msgstr "Laminar un archivo en un código G, guárdar como"
-
-#: src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat Last Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "(Re)Slice &Now"
-msgstr "(Re)Laminar A&hora"
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "Start new slicing process"
-msgstr "Comenzar un nuevo proceso de laminado"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "&Repair STL file"
-msgstr "&Reparar el archivo STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "Automatically repair an STL file"
-msgstr "Archivo STL reparado automáticamente"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "&Quit"
-msgstr "&Salir"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "Quit Slic3r"
-msgstr "Salir de Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "&Select all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "Selects all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "&Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "Deletes the current selection"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Delete &all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Deletes all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "&Plater Tab"
-msgstr "La pestaña Ajustes de la &base"
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "Show the plater"
-msgstr "Mostrar la base"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "P&rint Settings Tab"
-msgstr "La pestaña Ajustes de im&presión"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "Show the print settings"
-msgstr "Mostrar los ajustes de impresión"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "&Filament Settings Tab"
-msgstr "La pestaña Ajustes de &Filamento"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "Show the filament settings"
-msgstr "Mostrar los ajustes de filamento"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Print&er Settings Tab"
-msgstr "La pestaña Ajustes de imp&resora"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Show the printer settings"
-msgstr "Mostrar la configuración de la impresora"
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "3&D"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "Show the 3D editing view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Pre&view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Show the 3D slices preview"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Print &Host Upload Queue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Display the Print Host Upload Queue window"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr "Is&o"
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "Iso View"
-msgstr "Vista Iso"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr "&Superior"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "Top View"
-msgstr "Vista superior"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr "&Inferior"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "Bottom View"
-msgstr "Vista inferior"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr "&Frontal"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "Front View"
-msgstr "Vista frontal"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr "&Trasera"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "Rear View"
-msgstr "Vista trasera"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr "Iz&quierda"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "Left View"
-msgstr "Vista izquierda"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr "De&recha"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "Right View"
-msgstr "Vista derecha"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Prusa 3D &Drivers"
-msgstr "Controla&dores de Prusa 3D"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr ""
-"Abrir la página de descarga de los controladores Prusa3D en su navegador"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
-msgstr "&Lanzamientos de la Edición Prusa"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
-msgstr "Abrir la página de lanzamientos de Prusa Edition en su navegador"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
-msgstr "&Website de Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
-msgstr "Abrir el sitio web de Slic3r en su navegador"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr "&Manual de Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr "Abrir el manual de Slic3r en su navegador"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "System &Info"
-msgstr "&Información del Sistema"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "Show system information"
-msgstr "Mostrar la información del sistema"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show &Configuration Folder"
-msgstr "Mostrar carpeta &Configuración"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show user configuration folder (datadir)"
-msgstr "Mostrar carpeta de configuración de usuario (datadir)"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an I&ssue"
-msgstr "Informar de un &problema"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
-msgstr "Informar de un problema de Slic3r Edición Prusa"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
-msgstr "&Acerca de Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "Show about dialog"
-msgstr "Mostrar Acerca de"
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "Show the list of the keyboard shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:439
-msgid "&File"
-msgstr "&Archivo"
-
-#: src/slic3r/GUI/MainFrame.cpp:440
-msgid "&Edit"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:441
-msgid "&Window"
-msgstr "Ve&ntana"
-
-#: src/slic3r/GUI/MainFrame.cpp:442
-msgid "&View"
-msgstr "&Ver"
-
-#: src/slic3r/GUI/MainFrame.cpp:445
-msgid "&Help"
-msgstr "A&yuda"
-
-#: src/slic3r/GUI/MainFrame.cpp:472
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Elija un archivo para laminar (STL / OBJ / AMF / 3MF / PRUSA):"
-
-#: src/slic3r/GUI/MainFrame.cpp:486
-msgid "No previously sliced file."
-msgstr "Ningún archivo previamente laminado."
-
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
-msgid "Error"
-msgstr "Error"
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid "Previously sliced file ("
-msgstr "Archivo anterior laminado ("
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid ") not found."
-msgstr ") no encontrado."
-
-#: src/slic3r/GUI/MainFrame.cpp:493
-msgid "File Not Found"
-msgstr "Archivo no encontrado"
-
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
-msgid "Save "
-msgstr "Guardar "
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "SVG"
-msgstr "SVG"
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "G-code"
-msgstr "Código G"
-
-# Context: L('Save ') . ($params{export_svg} ? L('SVG') : L('G-code')) . L(' file as:'), e.g. "Save G-Code file as:"
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid " file as:"
-msgstr " archivo como:"
-
-#: src/slic3r/GUI/MainFrame.cpp:548
-msgid "Save zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Slicing"
-msgstr "Laminando"
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Processing "
-msgstr "Procesamiento "
-
-#: src/slic3r/GUI/MainFrame.cpp:583
-msgid " was successfully sliced."
-msgstr " fue laminado con éxito."
-
-#: src/slic3r/GUI/MainFrame.cpp:585
-msgid "Slicing Done!"
-msgstr "¡Laminado realizado!"
-
-#: src/slic3r/GUI/MainFrame.cpp:600
-msgid "Select the STL file to repair:"
-msgstr "Seleccione el archivo STL para reparar:"
-
-#: src/slic3r/GUI/MainFrame.cpp:614
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr ""
-"Guardar archivo OBJ (menos propenso a errores de coordinación que STL) como:"
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Your file was repaired."
-msgstr "Tu fichero fue reparado."
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Repair"
-msgstr "Reparar"
-
-#: src/slic3r/GUI/MainFrame.cpp:643
-msgid "Save configuration as:"
-msgstr "Guardar la configuración como:"
-
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
-msgid "Select configuration to load:"
-msgstr "Seleccione la configuración para cargar:"
-
-#: src/slic3r/GUI/MainFrame.cpp:700
-msgid "Save presets bundle as:"
-msgstr "Guarde el conjunto de ajustes iniciales como:"
-
-#: src/slic3r/GUI/MainFrame.cpp:751
-#, c-format
-msgid "%d presets successfully imported."
-msgstr "%d ajustes iniciales importados con éxito."
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r error"
-msgstr "Error de Slic3r"
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r has encountered an error"
-msgstr "Slic3r ha encontrado un error"
-
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "Info"
-
-#: src/slic3r/GUI/Plater.cpp:126
-msgid "Volume"
-msgstr "Volumen"
-
-#: src/slic3r/GUI/Plater.cpp:127
-msgid "Facets"
-msgstr "Facetas"
-
-#: src/slic3r/GUI/Plater.cpp:128
-msgid "Materials"
-msgstr "Materiales"
-
-#: src/slic3r/GUI/Plater.cpp:131
-msgid "Manifold"
-msgstr "Manifold"
-
-#: src/slic3r/GUI/Plater.cpp:174
-msgid "Sliced Info"
-msgstr "Información del laminado"
-
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
-msgid "Used Filament (m)"
-msgstr "Filamento usado (m)"
-
-#: src/slic3r/GUI/Plater.cpp:194
-msgid "Used Filament (mm³)"
-msgstr "Filamento usado (mm³)"
-
-#: src/slic3r/GUI/Plater.cpp:195
-msgid "Used Filament (g)"
-msgstr "Filamento usado (g)"
-
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
-msgid "Cost"
-msgstr "Coste"
-
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
-msgid "Estimated printing time"
-msgstr "Tiempo estimado de impresión"
-
-#: src/slic3r/GUI/Plater.cpp:198
-msgid "Number of tool changes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr "Soporte"
-
-#: src/slic3r/GUI/Plater.cpp:364
-msgid "Select what kind of support do you need"
-msgstr "Selecciona qué clase de soporte necesitas"
-
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "Ninguno"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
-msgid "Support on build plate only"
-msgstr "Soporte en la base solamente"
-
-#: src/slic3r/GUI/Plater.cpp:367
-msgid "Everywhere"
-msgstr "En todos los sitios"
-
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
-msgid "Brim"
-msgstr "Margen"
-
-#: src/slic3r/GUI/Plater.cpp:381
-msgid ""
-"This flag enables the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Esta opción activa el margen que se imprimirá alrededor del objeto en la "
-"primera capa."
-
-#: src/slic3r/GUI/Plater.cpp:390
-msgid "Purging volumes"
-msgstr "Volúmenes de purga"
-
-#: src/slic3r/GUI/Plater.cpp:556
-msgid "Print settings"
-msgstr "Configuración de impresión"
-
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
-msgid "Filament"
-msgstr "Filamento"
-
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
-msgid "SLA print"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
-msgid "SLA material"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:560
-msgid "Printer"
-msgstr "Impresora"
-
-#: src/slic3r/GUI/Plater.cpp:588
-msgid "Send to printer"
-msgstr "Enviar a la impresora"
-
-#: src/slic3r/GUI/Plater.cpp:607
-msgid "Slice now"
-msgstr "Laminar ahora"
-
-#: src/slic3r/GUI/Plater.cpp:787
-#, c-format
-msgid "%d (%d shells)"
-msgstr "%d (%d pieles)"
-
-#: src/slic3r/GUI/Plater.cpp:792
-#, c-format
-msgid "Auto-repaired (%d errors)"
-msgstr "Reparados automáticamente (%d errores)"
-
-#: src/slic3r/GUI/Plater.cpp:795
-#, c-format
-msgid ""
-"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
-"facets reversed, %d backwards edges"
-msgstr ""
-"%d facetas problemáticas, %d aristas corregidas, %d facetas eliminadas, %d "
-"facetas añadidas, %d facetas invertidas, %d aristas  del revés"
-
-#: src/slic3r/GUI/Plater.cpp:805
-msgid "Yes"
-msgstr "Sí"
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "wipe tower"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:855
-msgid "normal mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:859
-msgid "silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1304
-msgid "Loading"
-msgstr "Cargando"
-
-#: src/slic3r/GUI/Plater.cpp:1314
-#, c-format
-msgid "Processing input file %s\n"
-msgstr "Procesando archivo de entrada %s\n"
-
-#: src/slic3r/GUI/Plater.cpp:1366
-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 ""
-"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?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
-msgid "Multi-part object detected"
-msgstr "Objeto de piezas múltiples detectado"
-
-#: src/slic3r/GUI/Plater.cpp:1388
-#, 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 ""
-
-#: src/slic3r/GUI/Plater.cpp:1408
-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 ""
-"Se cargaron varios objetos para una impresora de varios materiales.\n"
-"En lugar de considerarlos como objetos múltiples, ¿debería considerar\n"
-"estos archivos para formar un solo objeto que tiene varias partes?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1424
-msgid "Loaded"
-msgstr "Cargado"
-
-#: src/slic3r/GUI/Plater.cpp:1492
-msgid ""
-"Your object appears to be too large, so it was automatically scaled down to "
-"fit your print bed."
-msgstr ""
-"Tu pieza parece demasiado grande, así que se ha escalado automáticamente "
-"para que pueda caber en la base de impresión."
-
-#: src/slic3r/GUI/Plater.cpp:1493
-msgid "Object too large?"
-msgstr "Objeto demasiado grande?"
-
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr "Exporta la configuración de impresión"
-
-#: src/slic3r/GUI/Plater.cpp:1538
-msgid "Save file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1702
-msgid "Arranging canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1705
-msgid "Arranging"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1736
-msgid "Could not arrange model objects! Some geometries may be invalid."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1740
-msgid "Arranging done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1782
-msgid "Orientation search canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1787
-msgid "Searching for optimal orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1797
-msgid "Orientation found."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1818
-msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
-msgstr ""
-"El objeto seleccionado no se puede dividir porque contiene más de un "
-"volumen / material."
-
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
-msgid "Cancelling"
-msgstr "Cancelando"
-
-#: src/slic3r/GUI/Plater.cpp:1962
-msgid "Another export job is currently running."
-msgstr "Otro trabajo de exportación está aún en marcha."
-
-#: src/slic3r/GUI/Plater.cpp:2215
-msgid "Export failed"
-msgstr "Error al exportar"
-
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "Borra"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "Eliminar el objeto seleccionado"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Increase copies"
-msgstr "Aumentar copias"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Place one more copy of the selected object"
-msgstr "Colocar una copia más del objeto seleccionado"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Decrease copies"
-msgstr "Reducir copias"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Remove one copy of the selected object"
-msgstr "Eliminar una copia del objeto seleccionado"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Set number of copies"
-msgstr "Establecer el número de copias"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Change the number of copies of the selected object"
-msgstr "Cambiar el número de copias del objeto seleccionado"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload from Disk"
-msgstr "Recargar desde el disco"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload the selected file from Disk"
-msgstr "Recargar el archivo seleccionado del disco"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "Exportar este único objeto como archivo STL"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Along X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Mirror the selected object along the X axis"
-msgstr "Duplicar el objeto seleccionado a lo largo del eje X"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Along Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Mirror the selected object along the Y axis"
-msgstr "Duplicar el objeto seleccionado a lo largo del eje Y"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Along Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Mirror the selected object along the Z axis"
-msgstr "Duplicar el objeto seleccionado a lo largo del eje Z"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror"
-msgstr "Duplicar"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror the selected object"
-msgstr "Duplicar el objeto seleccionado"
-
-#: src/slic3r/GUI/Plater.cpp:2400
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
-msgid "Split the selected object into individual objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
-msgid "Split the selected object into individual sub-parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
-msgid "Split"
-msgstr "Dividir"
-
-#: src/slic3r/GUI/Plater.cpp:2405
-msgid "Split the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save G-code file as:"
-msgstr "Guardar archivo Código G como:"
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2845
-#, c-format
-msgid "STL file exported to %s"
-msgstr "Archivo STL exportado a %s"
-
-#: src/slic3r/GUI/Plater.cpp:2861
-#, c-format
-msgid "AMF file exported to %s"
-msgstr "Archivo AMF exportado a %s"
-
-#: src/slic3r/GUI/Plater.cpp:2864
-#, c-format
-msgid "Error exporting AMF file %s"
-msgstr "Error al exportar el archivo AMF %s"
-
-#: src/slic3r/GUI/Plater.cpp:2891
-#, c-format
-msgid "3MF file exported to %s"
-msgstr "Archivo 3MF exportado a %s"
-
-#: src/slic3r/GUI/Plater.cpp:2894
-#, c-format
-msgid "Error exporting 3MF file %s"
-msgstr "Error al exportar el archivo 3MF %s"
-
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
-msgid "General"
-msgstr "General"
-
-#: src/slic3r/GUI/Preferences.cpp:34
-msgid "Remember output directory"
-msgstr "Recordar el directorio de salida"
-
-#: src/slic3r/GUI/Preferences.cpp:36
-msgid ""
-"If this is enabled, Slic3r will prompt the last output directory instead of "
-"the one containing the input files."
-msgstr ""
-"Si esto está habilitado, Slic3r solicitará el último directorio de salida en "
-"lugar del que contiene los archivos de entrada."
-
-#: src/slic3r/GUI/Preferences.cpp:42
-msgid "Auto-center parts"
-msgstr "Piezas auto-centradas"
-
-#: src/slic3r/GUI/Preferences.cpp:44
-msgid ""
-"If this is enabled, Slic3r will auto-center objects around the print bed "
-"center."
-msgstr ""
-"Si esto está habilitado, Slic3r centrará automáticamente los objetos "
-"alrededor del centro de la base de impresión."
-
-#: src/slic3r/GUI/Preferences.cpp:50
-msgid "Background processing"
-msgstr "Procesamiento en segundo plano"
-
-#: src/slic3r/GUI/Preferences.cpp:52
-msgid ""
-"If this is enabled, Slic3r will pre-process objects as soon as they're "
-"loaded in order to save time when exporting G-code."
-msgstr ""
-"Si esto está habilitado, Slic3r preprocesará objetos tan pronto como se "
-"carguen para ahorrar tiempo al exportar el código G."
-
-#: src/slic3r/GUI/Preferences.cpp:74
-msgid "Suppress \" - default - \" presets"
-msgstr "Suprima los ajustes iniciales \"- predeterminado -\""
-
-#: src/slic3r/GUI/Preferences.cpp:76
-msgid ""
-"Suppress \" - default - \" presets in the Print / Filament / Printer "
-"selections once there are any other valid presets available."
-msgstr ""
-"Suprima los ajustes iniciales \"- predeterminado -\" en las selecciones "
-"Imprimir / Filamento / Impresora una vez que haya otros ajustes "
-"preestablecidos disponibles."
-
-#: src/slic3r/GUI/Preferences.cpp:82
-msgid "Show incompatible print and filament presets"
-msgstr "Mostrar impresiones incompatibles y ajustes iniciales de filamentos"
-
-#: src/slic3r/GUI/Preferences.cpp:84
-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 ""
-"Cuando está marcada, los ajustes preestablecidos de impresión y filamento se "
-"muestran en el editor de ajustes preestablecidos, incluso si están marcados "
-"como incompatibles con la impresora activa"
-
-#: src/slic3r/GUI/Preferences.cpp:90
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr "Usar el renderizado OpenGL 1.1"
-
-#: src/slic3r/GUI/Preferences.cpp:92
-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 ""
-"Si tiene problemas de procesamiento causados ​​por un controlador OpenGL 2.0 "
-"defectuoso, puede intentar marcar esta casilla de verificación. Esto "
-"desactivará la edición de altura de capa y el antialiasing, por lo que es "
-"mejor actualizar su controlador de gráficos."
-
-#: src/slic3r/GUI/Preferences.cpp:115
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr "Es necesario reiniciar Slic3r para hacer los cambios efectivos."
-
-#: src/slic3r/GUI/Preset.cpp:170
-msgid "modified"
-msgstr ""
-
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
-msgid "System presets"
-msgstr "Ajustes del sistema"
-
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
-msgid "User presets"
-msgstr "Ajustes de usuario"
-
-#: src/slic3r/GUI/Preset.cpp:1157
-msgid "filament"
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:28
-#, c-format
-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 ""
-"Si el tiempo de capa estimado está por debajo de ~ %ds, el ventilador "
-"funcionará en %d %% y la velocidad de impresión se reducirá de modo que no "
-"se gaste menos de %d s en esa capa (sin embargo, la velocidad nunca se "
-"reducirá por debajo de %d mm/s) ."
-
-#: src/slic3r/GUI/PresetHints.cpp:32
-#, c-format
-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"
-"Si el tiempo estimado de la capa es mayor, pero todavía por debajo de ~%ds, "
-"el ventilador funcionará a una velocidad proporcionalmente menor entre  %d%% "
-"y %d%%."
-
-#: src/slic3r/GUI/PresetHints.cpp:36
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-"\n"
-"Durante las otras capas, ventilador "
-
-#: src/slic3r/GUI/PresetHints.cpp:38
-msgid "Fan "
-msgstr "Ventilador "
-
-#: src/slic3r/GUI/PresetHints.cpp:43
-#, c-format
-msgid "will always run at %d%% "
-msgstr "siempre funcionará al %d %% "
-
-#: src/slic3r/GUI/PresetHints.cpp:46
-#, c-format
-msgid "except for the first %d layers"
-msgstr "a excepción de las %d primeras capas"
-
-#: src/slic3r/GUI/PresetHints.cpp:50
-msgid "except for the first layer"
-msgstr "a excepción de la primera capa"
-
-#: src/slic3r/GUI/PresetHints.cpp:52
-msgid "will be turned off."
-msgstr "será apagada."
-
-#: src/slic3r/GUI/PresetHints.cpp:153
-msgid "external perimeters"
-msgstr "perímetros externos"
-
-#: src/slic3r/GUI/PresetHints.cpp:162
-msgid "perimeters"
-msgstr "perímetros"
-
-#: src/slic3r/GUI/PresetHints.cpp:171
-msgid "infill"
-msgstr "relleno"
-
-#: src/slic3r/GUI/PresetHints.cpp:181
-msgid "solid infill"
-msgstr "relleno sólido"
-
-#: src/slic3r/GUI/PresetHints.cpp:189
-msgid "top solid infill"
-msgstr "relleno  sólido superior"
-
-#: src/slic3r/GUI/PresetHints.cpp:200
-msgid "support"
-msgstr "soporte"
-
-#: src/slic3r/GUI/PresetHints.cpp:210
-msgid "support interface"
-msgstr "interfaz de soporte"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "First layer volumetric"
-msgstr "Primera capa volumétrica"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Bridging volumetric"
-msgstr "Puente volumétrico"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Volumetric"
-msgstr "Volumétrico"
-
-#: src/slic3r/GUI/PresetHints.cpp:217
-msgid " flow rate is maximized "
-msgstr " la tasa de flujo se maximiza "
-
-#: src/slic3r/GUI/PresetHints.cpp:220
-msgid "by the print profile maximum"
-msgstr "por el máximo perfil de impresión"
-
-#: src/slic3r/GUI/PresetHints.cpp:221
-msgid "when printing "
-msgstr "cuando se imprime "
-
-#: src/slic3r/GUI/PresetHints.cpp:222
-msgid " with a volumetric rate "
-msgstr " con una tasa volumétrica "
-
-#: src/slic3r/GUI/PresetHints.cpp:226
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr "%3.2f mm³/seg"
-
-#: src/slic3r/GUI/PresetHints.cpp:228
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr " a una velocidad de filamento de %3.2f mm/s."
-
-#: src/slic3r/GUI/PresetHints.cpp:247
-msgid ""
-"Recommended object thin wall thickness: Not available due to invalid layer "
-"height."
-msgstr ""
-"Grosor recomendado de la pared del objeto recomendado: no disponible debido "
-"a la altura de capa no válida."
-
-#: src/slic3r/GUI/PresetHints.cpp:264
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr ""
-"Espesor de pared delgada del objeto recomendado para una altura de capa %.2f "
-"y "
-
-#: src/slic3r/GUI/PresetHints.cpp:271
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr "%d líneas: %.2lf mm"
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Send G-Code to printer host"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Upload to Printer Host with the following filename:"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
-msgid "Start printing after upload"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
-msgid "Use forward slashes ( / ) as a directory separator if needed."
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
-msgid "Cancel selected"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
-msgid "Show error message"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
-msgid "Enqueued"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
-msgid "Uploading"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
-msgid "Completed"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
-msgid "Error uploading to print host:"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:23
-msgid "NO RAMMING AT ALL"
-msgstr "NO EMPUJAR EN ABSOLUTO"
-
-#: src/slic3r/GUI/RammingChart.cpp:76
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
-msgid "s"
-msgstr "$"
-
-#: src/slic3r/GUI/RammingChart.cpp:81
-msgid "Volumetric speed"
-msgstr "Velocidad volumétrica"
-
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
-msgid "Slic3r Prusa Edition - System Information"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
-msgid "Compatible printers"
-msgstr "Impresoras compatibles"
-
-#: src/slic3r/GUI/Tab.cpp:50
-msgid "Select the printers this profile is compatible with."
-msgstr "Seleccione las impresoras con las que este perfil es compatible."
-
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
-msgid "Compatible print profiles"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:56
-msgid "Select the print profiles this profile is compatible with."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:118
-msgid "Save current "
-msgstr "Guardar actualmente "
-
-#: src/slic3r/GUI/Tab.cpp:119
-msgid "Delete this preset"
-msgstr "Borra este ajuste"
-
-#: src/slic3r/GUI/Tab.cpp:131
-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:824
-msgid "It's a default preset."
-msgstr "Es un valor por defecto."
-
-#: src/slic3r/GUI/Tab.cpp:825
-msgid "It's a system preset."
-msgstr "Es un ajuste del sistema."
-
-#: src/slic3r/GUI/Tab.cpp:826
-msgid "Current preset is inherited from "
-msgstr "El valor actual se ha heredado de "
-
-#: src/slic3r/GUI/Tab.cpp:831
-msgid "It can't be deleted or modified. "
-msgstr "No se puede borrar ni modificar. "
-
-#: src/slic3r/GUI/Tab.cpp:832
-msgid ""
-"Any modifications should be saved as a new preset inherited from this one. "
-msgstr ""
-"Cualquier modificación se almacenará como un nuevo ajuste basado en este. "
-
-#: src/slic3r/GUI/Tab.cpp:833
-msgid "To do that please specify a new name for the preset."
-msgstr "Para hacerlo por favor especifique un nuevo nombre para esos ajustes."
-
-#: src/slic3r/GUI/Tab.cpp:837
-msgid "Additional information:"
-msgstr "Información adicional:"
-
-#: src/slic3r/GUI/Tab.cpp:843
-msgid "printer model"
-msgstr "modelo de impresora"
-
-#: src/slic3r/GUI/Tab.cpp:851
-msgid "default print profile"
-msgstr "perfil de impresión por defecto"
-
-#: src/slic3r/GUI/Tab.cpp:854
-msgid "default filament profile"
-msgstr "perfil de filamento por defecto"
-
-#: src/slic3r/GUI/Tab.cpp:868
-msgid "default SLA material profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:872
-msgid "default SLA print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
-msgid "Layers and perimeters"
-msgstr "Capas y perímetros"
-
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
-msgid "Layer height"
-msgstr "Altura de la capa"
-
-#: src/slic3r/GUI/Tab.cpp:924
-msgid "Vertical shells"
-msgstr "Carcasas verticales"
-
-#: src/slic3r/GUI/Tab.cpp:935
-msgid "Horizontal shells"
-msgstr "Carcasas horizontales"
-
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
-msgid "Solid layers"
-msgstr "Capas sólidas"
-
-#: src/slic3r/GUI/Tab.cpp:941
-msgid "Quality (slower slicing)"
-msgstr "Calidad (laminado más lento)"
-
-#: src/slic3r/GUI/Tab.cpp:958
-msgid "Reducing printing time"
-msgstr "Reduciendo el tiempo de impresión"
-
-#: src/slic3r/GUI/Tab.cpp:970
-msgid "Skirt and brim"
-msgstr "Falda y balsa"
-
-#: src/slic3r/GUI/Tab.cpp:987
-msgid "Raft"
-msgstr "Balsa"
-
-#: src/slic3r/GUI/Tab.cpp:991
-msgid "Options for support material and raft"
-msgstr "Opciones de material de soporte y balsa"
-
-#: src/slic3r/GUI/Tab.cpp:1006
-msgid "Speed for print moves"
-msgstr "Velocidad para movimientos de impresión"
-
-#: src/slic3r/GUI/Tab.cpp:1018
-msgid "Speed for non-print moves"
-msgstr "Velocidad para movimientos sin impresión"
-
-#: src/slic3r/GUI/Tab.cpp:1021
-msgid "Modifiers"
-msgstr "Modificadores"
-
-#: src/slic3r/GUI/Tab.cpp:1024
-msgid "Acceleration control (advanced)"
-msgstr "Control de aceleración (avanzado)"
-
-#: src/slic3r/GUI/Tab.cpp:1031
-msgid "Autospeed (advanced)"
-msgstr "Velocidad automática (avanzado)"
-
-#: src/slic3r/GUI/Tab.cpp:1037
-msgid "Multiple Extruders"
-msgstr "Múltiples Extrusores"
-
-#: src/slic3r/GUI/Tab.cpp:1045
-msgid "Ooze prevention"
-msgstr "Prevención de goteo"
-
-#: src/slic3r/GUI/Tab.cpp:1062
-msgid "Extrusion width"
-msgstr "Ancho de extrusión"
-
-#: src/slic3r/GUI/Tab.cpp:1072
-msgid "Overlap"
-msgstr "Superposición"
-
-#: src/slic3r/GUI/Tab.cpp:1075
-msgid "Flow"
-msgstr "Flujo"
-
-#: src/slic3r/GUI/Tab.cpp:1078
-msgid "Other"
-msgstr "Otro"
-
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
-msgid "Output options"
-msgstr "Opciones de salida"
-
-#: src/slic3r/GUI/Tab.cpp:1086
-msgid "Sequential printing"
-msgstr "Impresión secuencial"
-
-#: src/slic3r/GUI/Tab.cpp:1088
-msgid "Extruder clearance (mm)"
-msgstr "Distancia libre del extrusor (mm)"
-
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
-msgid "Output file"
-msgstr "Archivo de salida"
-
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
-msgid "Post-processing scripts"
-msgstr "Scripts de postprocesamiento"
-
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
-msgid "Notes"
-msgstr "Notas"
-
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
-msgid "Dependencies"
-msgstr "Dependencias"
-
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
-msgid "Profile dependencies"
-msgstr "Dependencias de perfil"
-
-#: src/slic3r/GUI/Tab.cpp:1161
-#, no-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"
-"- no ensure_vertical_shell_thickness\n"
-"\n"
-"Shall I adjust those settings in order to enable Spiral Vase?"
-msgstr ""
-"El modo Vaso requiere: \n"
-"- un perímetro \n"
-"- sin capas sólidas superiores \n"
-"- densidad de relleno del 0% \n"
-"- sin material de soporte \n"
-"- no ensure_vertical_shell_thickness \n"
-"\n"
-"¿Debo ajustar esos ajustes para habilitar el modo Vaso?"
-
-#: src/slic3r/GUI/Tab.cpp:1168
-msgid "Spiral Vase"
-msgstr "Modo Vaso"
-
-#: src/slic3r/GUI/Tab.cpp:1191
-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 ""
-"Actualmente, la Torre de Limpieza solo admite los soportes no solubles si se "
-"imprimen con la extrusora actual sin activar un cambio de herramienta.\n"
-"(ambos support_material_extruder y support_material_interface_extruder deben "
-"configurarse en 0). \n"
-"\n"
-"¿Debo ajustar esos ajustes para habilitar la Torre de Limpieza?"
-
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
-msgid "Wipe Tower"
-msgstr "Torre de limpieza"
-
-#: src/slic3r/GUI/Tab.cpp:1209
-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 ""
-"Para que la Torre de Limpieza funcione con los soportes solubles, las capas "
-"de soporte deben sincronizarse con las capas de objeto. \n"
-" \n"
-" ¿Debería sincronizar las capas de soporte para habilitar la Torre de "
-"Limpieza?"
-
-#: src/slic3r/GUI/Tab.cpp:1227
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters\n"
-"\n"
-"Shall I adjust those settings for supports?"
-msgstr ""
-"Los soportes funcionan mejor, si la siguiente característica está "
-"habilitada: \n"
-"- Detectar perímetros de puente\n"
-"\n"
-"¿Debo ajustar esas configuraciones para los soportes?"
-
-#: src/slic3r/GUI/Tab.cpp:1230
-msgid "Support Generator"
-msgstr "Generador de soportes"
-
-# Used in context: _("The ") + str_fill_pattern + _(" infill pattern is not supposed to work at 100% density.\n")
-#: src/slic3r/GUI/Tab.cpp:1272
-msgid "The "
-msgstr "El "
-
-#: src/slic3r/GUI/Tab.cpp:1272
-#, no-c-format
-msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
-"\n"
-"Shall I switch to rectilinear fill pattern?"
-msgstr ""
-" ese patrón de relleno no está pensado para trabajar al 100% de densidad. \n"
-"\n"
-"¿Debería cambiar a un patrón de relleno rectilíneo?"
-
-#: src/slic3r/GUI/Tab.cpp:1388
-msgid "Temperature "
-msgstr "Temperatura "
-
-#: src/slic3r/GUI/Tab.cpp:1394
-msgid "Bed"
-msgstr "Base"
-
-#: src/slic3r/GUI/Tab.cpp:1399
-msgid "Cooling"
-msgstr "Enfriamiento"
-
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
-msgid "Enable"
-msgstr "Habilitar"
-
-#: src/slic3r/GUI/Tab.cpp:1411
-msgid "Fan settings"
-msgstr "Configuración del ventilador"
-
-#: src/slic3r/GUI/Tab.cpp:1412
-msgid "Fan speed"
-msgstr "Velocidad del ventilador"
-
-#: src/slic3r/GUI/Tab.cpp:1420
-msgid "Cooling thresholds"
-msgstr "Umbrales de enfriamiento"
-
-#: src/slic3r/GUI/Tab.cpp:1426
-msgid "Filament properties"
-msgstr "Propiedades del filamento"
-
-#: src/slic3r/GUI/Tab.cpp:1430
-msgid "Print speed override"
-msgstr "Anular la velocidad de impresión"
-
-#: src/slic3r/GUI/Tab.cpp:1440
-msgid "Toolchange parameters with single extruder MM printers"
-msgstr ""
-"Parámetros del cambio de herramienta para impresoras de un único extrusor MM"
-
-#: src/slic3r/GUI/Tab.cpp:1455
-msgid "Ramming settings"
-msgstr "Ajustes de empuje"
-
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
-msgid "Custom G-code"
-msgstr "Código G personalizado"
-
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
-msgid "Start G-code"
-msgstr "Comenzar el código G"
-
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
-msgid "End G-code"
-msgstr "Código G final"
-
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
-msgid " Browse "
-msgstr " Hojea "
-
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
-msgid "Test"
-msgstr "Test"
-
-#: src/slic3r/GUI/Tab.cpp:1615
-msgid "Could not get a valid Printer Host reference"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
-msgid "Success!"
-msgstr "¡Éxito!"
-
-#: src/slic3r/GUI/Tab.cpp:1636
-msgid ""
-"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
-"signed certificate."
-msgstr ""
-"El archivo HTTPS CA es opcional. Sólo se necesita si vas a usar HTTPS con un "
-"certificado auto-firmado."
-
-#: src/slic3r/GUI/Tab.cpp:1648
-msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-msgstr "Archivos de certificados (*.crt, *.pem)|*.crt;*.pem|Todos|*.*"
-
-#: src/slic3r/GUI/Tab.cpp:1649
-msgid "Open CA certificate file"
-msgstr "Abrir archivo de certificado CA"
-
-#: src/slic3r/GUI/Tab.cpp:1676
-msgid ""
-"HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
-msgid "Size and coordinates"
-msgstr "Tamaño y coordenadas"
-
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
-msgid " Set "
-msgstr " Ajuste "
-
-#: src/slic3r/GUI/Tab.cpp:1740
-msgid "Capabilities"
-msgstr "Capacidades"
-
-#: src/slic3r/GUI/Tab.cpp:1745
-msgid "Number of extruders of the printer."
-msgstr "Número de extrusores de la impresora."
-
-#: src/slic3r/GUI/Tab.cpp:1773
-msgid "USB/Serial connection"
-msgstr "Conexión USB/Serial"
-
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
-msgid "Serial port"
-msgstr "Puerto serial"
-
-#: src/slic3r/GUI/Tab.cpp:1779
-msgid "Rescan serial ports"
-msgstr "Vuelver a examinar los puertos serie"
-
-#: src/slic3r/GUI/Tab.cpp:1801
-msgid "Connection to printer works correctly."
-msgstr "La conexión con la impresora funciona correctamente."
-
-#: src/slic3r/GUI/Tab.cpp:1804
-msgid "Connection failed."
-msgstr "Conexión fallida."
-
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
-msgid "Print Host upload"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
-msgid "Before layer change G-code"
-msgstr "Código G para antes del cambio de capa"
-
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
-msgid "After layer change G-code"
-msgstr "Código G tras  un cambio de capa"
-
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
-msgid "Tool change G-code"
-msgstr "Código G de cambio de herramienta"
-
-#: src/slic3r/GUI/Tab.cpp:1877
-msgid "Between objects G-code (for sequential printing)"
-msgstr "Código G para entre objetos (para impresión secuencial)"
-
-#: src/slic3r/GUI/Tab.cpp:1938
-msgid "Display"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
-msgid "Corrections"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
-msgid "Machine limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2025
-msgid "Values in this column are for Full Power mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2026
-msgid "Full Power"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2031
-msgid "Values in this column are for Silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2032
-msgid "Silent"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2040
-msgid "Maximum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2045
-msgid "Maximum accelerations"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2052
-msgid "Jerk limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2057
-msgid "Minimum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
-msgid "Single extruder MM setup"
-msgstr "Ajuste para MM con un solo extrusor"
-
-#: src/slic3r/GUI/Tab.cpp:2104
-msgid "Single extruder multimaterial parameters"
-msgstr "Parámetros multimaterial para un sólo extrusor"
-
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
-#, c-format
-msgid "Extruder %d"
-msgstr "Extrusor %d"
-
-#: src/slic3r/GUI/Tab.cpp:2125
-msgid "Layer height limits"
-msgstr "Límites de altura de la capa"
-
-#: src/slic3r/GUI/Tab.cpp:2130
-msgid "Position (for multi-extruder printers)"
-msgstr "Posición (para impresoras con múltiples extrusores )"
-
-#: src/slic3r/GUI/Tab.cpp:2133
-msgid "Retraction"
-msgstr "Retracción"
-
-#: src/slic3r/GUI/Tab.cpp:2136
-msgid "Only lift Z"
-msgstr "Solo levantar Z"
-
-#: src/slic3r/GUI/Tab.cpp:2149
-msgid ""
-"Retraction when tool is disabled (advanced settings for multi-extruder "
-"setups)"
-msgstr ""
-"Retracción cuando la herramienta está desactivada (configuraciones avanzadas "
-"para configuraciones de extrusores múltiples )"
-
-#: src/slic3r/GUI/Tab.cpp:2153
-msgid "Preview"
-msgstr "Previsualización"
-
-#: src/slic3r/GUI/Tab.cpp:2284
-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 ""
-"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?"
-
-#: src/slic3r/GUI/Tab.cpp:2286
-msgid "Firmware Retraction"
-msgstr "Retracción del firmware"
-
-#: src/slic3r/GUI/Tab.cpp:2565
-#, c-format
-msgid "Default preset (%s)"
-msgstr "Ajustes por defecto (%s)"
-
-#: src/slic3r/GUI/Tab.cpp:2566
-#, c-format
-msgid "Preset (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2583
-msgid "has the following unsaved changes:"
-msgstr "tiene los siguientes cambios sin guardar:"
-
-#: src/slic3r/GUI/Tab.cpp:2586
-msgid "is not compatible with printer"
-msgstr "no es compatible con la impresora"
-
-#: src/slic3r/GUI/Tab.cpp:2587
-msgid "is not compatible with print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2589
-msgid "and it has the following unsaved changes:"
-msgstr "y tiene los siguientes cambios sin guardar:"
-
-#: src/slic3r/GUI/Tab.cpp:2592
-msgid "Discard changes and continue anyway?"
-msgstr "¿Descartar los cambios y continuar de todos modos?"
-
-#: src/slic3r/GUI/Tab.cpp:2593
-msgid "Unsaved Changes"
-msgstr "Cambios no guardados"
-
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
-msgid "Please check your object list before preset changing."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2699
-msgid "The supplied name is empty. It can't be saved."
-msgstr "El nombre proporcionado está vacío. No se puede guardar."
-
-#: src/slic3r/GUI/Tab.cpp:2704
-msgid "Cannot overwrite a system profile."
-msgstr "No se puede sobre-escribir un perfil del sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2708
-msgid "Cannot overwrite an external profile."
-msgstr "No puedo sobre-escribir un valor externo."
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "remove"
-msgstr "eliminar"
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "delete"
-msgstr "borra"
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid "Are you sure you want to "
-msgstr "¿Está seguro que quiere "
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid " the selected preset?"
-msgstr " el ajuste inicial seleccionado?"
-
-#: src/slic3r/GUI/Tab.cpp:2736
-msgid "Remove"
-msgstr "Eliminar"
-
-#: src/slic3r/GUI/Tab.cpp:2737
-msgid " Preset"
-msgstr " Ajuste inicial"
-
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "Todo"
-
-#: src/slic3r/GUI/Tab.cpp:2869
-msgid ""
-"LOCKED LOCK;indicates that the settings are the same as the system values "
-"for the current option group"
-msgstr ""
-"CANDADO CERRADO;indica que los ajustes son los mismos que los del sistema "
-"para el grupo de opciones actual"
-
-#: src/slic3r/GUI/Tab.cpp:2872
-msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
-"the system values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group "
-"to the system values."
-msgstr ""
-"CANDADO CERRADO;indica que algunos de los ajustes se modificaron y no son "
-"iguales a los valores almacenados para el grupo de opciones actual.\n"
-"Haz clic en el CANDADO CERRADO para devolver los valores del grupo de "
-"opciones actual a los valores del sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2878
-msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr ""
-"El símbolo de VIÑETA BLANCA;para el botón izquierdo: indica un ajuste no "
-"original, para el botón derecho: indica que el ajuste no se ha modificado."
-
-#: src/slic3r/GUI/Tab.cpp:2882
-msgid ""
-"BACK ARROW;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 ""
-"FLECHA ATR�S;indica si los ajustes cambiaron y ya no son iguales a los "
-"ajustes guardados la última vez para el grupo de opciones actual. \n"
-"Haz click en la FLECHA ATR�S para devolver los valores del grupo de opciones "
-"actual a los valores guardados la última vez."
-
-#: src/slic3r/GUI/Tab.cpp:2908
-msgid ""
-"LOCKED LOCK icon indicates that the settings are the same as the system "
-"values for the current option group"
-msgstr ""
-"El símbolo del CANDADO CERRADO indica que los ajustes son los mismos que los "
-"valores del sistema para el grupo de opciones actual"
-
-#: src/slic3r/GUI/Tab.cpp:2910
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not "
-"equal to the system values for the current option group.\n"
-"Click to reset all settings for current option group to the system values."
-msgstr ""
-"El CANDADO ABIERTO indica que algunos de los ajustes cambiaron y que no son "
-"iguales a los valores del sistema para el grupo de opciones actual. \n"
-"Haz clic para restaurar los ajustes del grupo de opciones actual a los "
-"valores del sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2913
-msgid "WHITE BULLET icon indicates a non system preset."
-msgstr "El símbolo de VIÑETA BLANCA indica un ajuste que no es del sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2916
-msgid ""
-"WHITE BULLET icon indicates that the settings are the same as in the last "
-"saved preset for the current option group."
-msgstr ""
-"El símbolo de VIÑETA BLANCA indica que los ajustes son los mismos que los de "
-"la última vez que salvaste los ajustes para el grupo de opciones actual."
-
-#: src/slic3r/GUI/Tab.cpp:2918
-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:2924
-msgid ""
-"LOCKED LOCK icon indicates that the value is the same as the system value."
-msgstr ""
-"El CANDADO CERRADO indica que los valores son los mismos que los del sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2925
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
-"the system value.\n"
-"Click to reset current value to the system value."
-msgstr ""
-"El CANDADO ABIERTO indica que el valor cambió y ya no es igual al valor del "
-"sistema. \n"
-"Haz clic para devolver el valor al valor del sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2931
-msgid ""
-"WHITE BULLET icon indicates that the value is the same as in the last saved "
-"preset."
-msgstr ""
-"El símbolo de VIÑETA BLANCA indica que los valores son los mismos que los de "
-"los ajustes guardados la última vez."
-
-#: src/slic3r/GUI/Tab.cpp:2932
-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"
-"Haz clic para restaurar el valor al último ajuste guardado."
-
-# Used in this context: _("Save ") + title + _(" as:")
-#: src/slic3r/GUI/Tab.cpp:3031
-msgid " as:"
-msgstr " como:"
-
-#: src/slic3r/GUI/Tab.cpp:3075
-msgid "the following postfix are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3079
-msgid "The supplied name is not available."
-msgstr "El nombre proporcionado no está disponible."
-
-#: src/slic3r/GUI/Tab.cpp:3092
-msgid "Material"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
-msgid "Layers"
-msgstr "Capas"
-
-#: src/slic3r/GUI/Tab.cpp:3098
-msgid "Exposure"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3183
-msgid "Support head"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3188
-msgid "Support pillar"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3196
-msgid "Connection of the support sticks and junctions"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3200
-msgid "Automatic generation"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
-msgid "Print Settings"
-msgstr "Configuración de Impresión"
-
-#: src/slic3r/GUI/Tab.hpp:311
-msgid "Filament Settings"
-msgstr "Configuración del filamento"
-
-#: src/slic3r/GUI/Tab.hpp:344
-msgid "Printer Settings"
-msgstr "Configuración de la Impresora"
-
-#: src/slic3r/GUI/Tab.hpp:367
-msgid "Material Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:393
-msgid "Save preset"
-msgstr "Guardar ajuste inicial"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "Update available"
-msgstr "Actualización disponible"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "New version of Slic3r PE is available"
-msgstr "Nueva versión de Slic3r PE disponible"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
-msgid "To download, follow the link below."
-msgstr "Para descargar, sigue el enlace que hay más abajo."
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
-msgid "Current version:"
-msgstr "Versión actual:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
-msgid "New version:"
-msgstr "Nueva versión:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
-msgid "Don't notify about new releases any more"
-msgstr "No quiero recibir avisos de nuevas versiones"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
-msgid "Configuration update"
-msgstr "Actualización de configuración"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
-msgid "Configuration update is available"
-msgstr "Hay disponible una actualización de la Configuración"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
-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"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"¿Te gustaría instalarlo?\n"
-"\n"
-"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/UpdateDialogs.cpp:109
-msgid "Slic3r incompatibility"
-msgstr "Incompatibilidad de Slic3r"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r configuration is incompatible"
-msgstr "La configuración de Slic3r es incompatible"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed "
-"configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using "
-"a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-"Esta versión de Slic3r PE no es compatible con los grupos de configuraciones "
-"instaladas. Esto sucede probablemente por ejecutar una versión de Slic3r PE "
-"después de haber usado una más reciente.\n"
-"\n"
-"Puedes salir de Slic3r 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 Slic3r.\n"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
-#, c-format
-msgid "This Slic3r PE version: %s"
-msgstr "Esta versión de Slic3r: %s"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
-msgid "Incompatible bundles:"
-msgstr "Grupos incompatibles:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
-msgid "Exit Slic3r"
-msgstr "Salir de Slic3r"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
-msgid "Re-configure"
-msgstr "Reconfigurar"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
-#, c-format
-msgid ""
-"Slic3r PE 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 Slic3r PE 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/UpdateDialogs.cpp:182
-msgid "For more information please visit our wiki page:"
-msgstr "Para más información visite por favor la página de nuestra wiki:"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
-msgid "Ramming customization"
-msgstr "Configuración de empuje"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
-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:78
-msgid "Total ramming time"
-msgstr "Tiempo de empuje total"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
-msgid "Total rammed volume"
-msgstr "Volumen total empujado"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
-msgid "Ramming line width"
-msgstr "Ancho de la linea de empuje"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
-msgid "Ramming line spacing"
-msgstr "Espaciado de la linea de empuje"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
-msgid "Wipe tower - Purging volume adjustment"
-msgstr "Torre de limpieza - Ajuste del volumen de purga"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
-msgid ""
-"Here you can adjust required purging volume (mm³) for any given pair of "
-"tools."
-msgstr ""
-"Aquí puedes ajustar el volumende purga requerida (mm³) para cualquier par de "
-"herramientas."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
-msgid "Extruder changed to"
-msgstr "El extrusor cambia a"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
-msgid "unloaded"
-msgstr "descargado"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
-msgid "loaded"
-msgstr "cargado"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
-msgid "Tool #"
-msgstr "Herramienta nº"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
-msgid ""
-"Total purging volume is calculated by summing two values below, depending on "
-"which tools are loaded/unloaded."
-msgstr ""
-"El volumen total de purga se calcula sumando dos valors más abajo, "
-"dependiendo de qué filamentos se carguen/descarguen."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
-msgid "Volume to purge (mm³) when the filament is being"
-msgstr "Volumen a purgar (mm³) cuando el filamento está siendo"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
-msgid "From"
-msgstr "Desde"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
-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"
-"\n"
-"¿Quiere continuar?"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show simplified settings"
-msgstr "Muestra los ajustes simplificados"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show advanced settings"
-msgstr "Mostrar ajustes avanzados"
-
-#: src/slic3r/Utils/OctoPrint.cpp:65
-#, c-format
-msgid "Mismatched type of print host: %s"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:80
-msgid "Connection to OctoPrint works correctly."
-msgstr "La conexión a OctoPrint funciona correctamente."
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Could not connect to OctoPrint"
-msgstr "No puedo conectar con OctoPrint"
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr "Nota: Se necesita al menos la versión 1.1.0 de OctoPrint."
-
-#: src/slic3r/Utils/OctoPrint.cpp:181
-msgid "Connection to Prusa SLA works correctly."
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:186
-msgid "Could not connect to Prusa SLA"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:571
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr "requiere un min. %s y un max. %s"
-
-#: src/slic3r/Utils/PresetUpdater.cpp:576
-#, c-format
-msgid "requires min. %s"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:578
-#, c-format
-msgid "requires max. %s"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:235
-msgid "Failed loading the input model."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:248
-msgid "Mesh repair failed."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the 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 ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
-msgid "Model fixing"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
-msgid "Exporting model..."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
-msgid "Export of a temporary 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
-msgid "Import of the repaired 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
-msgid "Model repair finished"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
-msgid "Model repair canceled"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-msgid "Model repaired successfully"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model Repair by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model repair failed: \n"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1175
-msgid "All objects are outside of the print volume."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1201
-msgid "Some objects are too close; your extruder will collide with them."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1216
-msgid ""
-"Some objects are too tall and cannot be printed without extruder collisions."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1226
-msgid "The Spiral Vase option can only be used when printing a single object."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1228
-msgid ""
-"The Spiral Vase option can only be used when printing single material "
-"objects."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1234
-msgid ""
-"All extruders must have the same diameter for single extruder multimaterial "
-"printer."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1239
-msgid ""
-"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
-"and Repetier G-code flavors."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1241
-msgid ""
-"The Wipe Tower is currently only supported with the relative extruder "
-"addressing (use_relative_e_distances=1)."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1253
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1255
-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:1257
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are printed "
-"with the same support_material_contact_distance"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1259
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are sliced "
-"equally."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1281
-msgid ""
-"The Wipe tower is only supported if all objects have the same layer height "
-"profile"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1290
-msgid "The supplied settings will cause an empty print."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1307
-msgid ""
-"One or more object were assigned an extruder that the printer does not have."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1316
-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 ""
-
-#: src/libslic3r/Print.cpp:1324
-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:1328
-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 ""
-
-#: src/libslic3r/Print.cpp:1335
-msgid "first_layer_height"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1350
-msgid "First layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1354
-msgid "Layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
-msgid "Printer technology"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:41
-msgid "Bed shape"
-msgstr "Forma de la base de impresión"
-
-#: src/libslic3r/PrintConfig.cpp:48
-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 ""
-"Esta configuración controla la altura (y, por tanto, el número total) de las "
-"láminas / capas. Las capas más delgadas brindan una mayor precisión pero "
-"requieren más tiempo para imprimir."
-
-#: src/libslic3r/PrintConfig.cpp:56
-msgid "Max print height"
-msgstr "Máxima altura de impresión"
-
-#: src/libslic3r/PrintConfig.cpp:57
-msgid ""
-"Set this to the maximum height that can be reached by your extruder while "
-"printing."
-msgstr ""
-"Ajusta este valor a la altura máxima que puede alcanzar el extrusor mientras "
-"imprime."
-
-#: src/libslic3r/PrintConfig.cpp:73
-msgid "Avoid crossing perimeters"
-msgstr "Evita cruzar perímetros"
-
-#: src/libslic3r/PrintConfig.cpp:74
-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 ""
-"Optimiza los movimientos de desplazamiento para minimizar el cruce de "
-"perímetros. Esto es principalmente útil con extrusores Bowden que sufren "
-"goteo. Esta característica ralentiza tanto la impresión como la generación "
-"de código G."
-
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
-msgid "Other layers"
-msgstr "Otras capas"
-
-#: src/libslic3r/PrintConfig.cpp:83
-msgid ""
-"Bed temperature for layers after the first one. Set this to zero to disable "
-"bed temperature control commands in the output."
-msgstr ""
-"Temperatura de la base calefactable para las capas después de la primera. "
-"Ajuste esto a cero para deshabilitar los comandos de control de temperatura "
-"de la base calefactable en la salida."
-
-#: src/libslic3r/PrintConfig.cpp:86
-msgid "Bed temperature"
-msgstr "Temperatura de la base"
-
-#: src/libslic3r/PrintConfig.cpp:93
-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]."
-
-#: src/libslic3r/PrintConfig.cpp:104
-msgid "Between objects G-code"
-msgstr "Código G para entre objetos"
-
-#: src/libslic3r/PrintConfig.cpp:105
-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:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "Inferior"
-
-#: src/libslic3r/PrintConfig.cpp:116
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "Número de capas sólidas para generar en las superficies inferiores."
-
-#: src/libslic3r/PrintConfig.cpp:118
-msgid "Bottom solid layers"
-msgstr "Capas sólidas inferiores"
-
-#: src/libslic3r/PrintConfig.cpp:123
-msgid "Bridge"
-msgstr "Puente"
-
-#: src/libslic3r/PrintConfig.cpp:124
-msgid ""
-"This is the acceleration your printer will use for bridges. Set zero to "
-"disable acceleration control for bridges."
-msgstr ""
-"Esta es la aceleración que su impresora usará para los puentes. Establezca "
-"cero para deshabilitar el control de aceleración para puentes."
-
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
-msgid "mm/s²"
-msgstr "mm/s²"
-
-#: src/libslic3r/PrintConfig.cpp:133
-msgid "Bridging angle"
-msgstr "�ngulo de puente"
-
-#: src/libslic3r/PrintConfig.cpp:135
-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 ""
-"Anulación de ángulo de puente. Si se deja en cero, el ángulo de puente se "
-"calculará automáticamente. De lo contrario, el ángulo proporcionado se usará "
-"para todos los puentes. Use 180 ° para ángulo con cero grados."
-
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
-msgid "°"
-msgstr "°"
-
-#: src/libslic3r/PrintConfig.cpp:145
-msgid "Bridges fan speed"
-msgstr "Velocidad del ventilador para puentes"
-
-#: src/libslic3r/PrintConfig.cpp:146
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr ""
-"La velocidad de este ventilador se aplica durante todos los puentes y "
-"voladizos."
-
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
-msgid "%"
-msgstr "%"
-
-#: src/libslic3r/PrintConfig.cpp:155
-msgid "Bridge flow ratio"
-msgstr "Relación de flujo del puente"
-
-#: src/libslic3r/PrintConfig.cpp:157
-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 ""
-"Este factor afecta la cantidad de plástico para formar puentes. Puede "
-"disminuirlo ligeramente para extraer los extruidos y evitar el combado, "
-"aunque la configuración predeterminada suele ser buena y debe experimentar "
-"con la refrigeración (usar un ventilador) antes de ajustar esto."
-
-#: src/libslic3r/PrintConfig.cpp:168
-msgid "Bridges"
-msgstr "Puentes"
-
-#: src/libslic3r/PrintConfig.cpp:170
-msgid "Speed for printing bridges."
-msgstr "Velocidad para imprimir puentes."
-
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
-msgid "mm/s"
-msgstr "mm/s"
-
-#: src/libslic3r/PrintConfig.cpp:178
-msgid "Brim width"
-msgstr "Ancho del margen"
-
-#: src/libslic3r/PrintConfig.cpp:179
-msgid ""
-"Horizontal width of the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Ancho horizontal del borde que se imprimirá alrededor de cada objeto en la "
-"primera capa."
-
-#: src/libslic3r/PrintConfig.cpp:187
-msgid "Clip multi-part objects"
-msgstr "Enlazaar objetos de varias partes"
-
-#: src/libslic3r/PrintConfig.cpp:188
-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 ""
-"Al imprimir objetos multi-material, esta configuración hará que slic3r "
-"recorte las partes del objeto superpuestas una por la otra (la 2da parte "
-"será recortada por la 1ra, la 3ra parte será recortada por la 1ra y 2da, "
-"etc.)."
-
-#: src/libslic3r/PrintConfig.cpp:196
-msgid "Colorprint height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:197
-msgid "Heights at which a filament change is to occur. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:207
-msgid "Compatible printers condition"
-msgstr "Condición de impresoras compatibles"
-
-#: src/libslic3r/PrintConfig.cpp:208
-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."
-msgstr ""
-"Una expresión booleana utilizando valores de configuración de un perfil "
-"existente. Si esta expresión es verdadera, el perfil será considerado "
-"compatible con el perfil de impresión activo."
-
-#: src/libslic3r/PrintConfig.cpp:220
-msgid "Compatible print profiles condition"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:221
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:235
-msgid "Complete individual objects"
-msgstr "Completar objetos individuales"
-
-#: src/libslic3r/PrintConfig.cpp:236
-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."
-msgstr ""
-"Al imprimir múltiples objetos o copias, esta característica completará cada "
-"objeto antes de pasar al siguiente (y comenzará desde la capa inferior). "
-"Esta función es útil para evitar el riesgo de impresiones arruinadas. Slic3r "
-"debería advertirte y evitar las colisiones del extrusor, pero ten cuidado."
-
-#: src/libslic3r/PrintConfig.cpp:245
-msgid "Enable auto cooling"
-msgstr "Habilitar el enfriamiento automático"
-
-#: src/libslic3r/PrintConfig.cpp:246
-msgid ""
-"This flag enables the automatic cooling logic that adjusts print speed and "
-"fan speed according to layer printing time."
-msgstr ""
-"Este indicador habilita la lógica de enfriamiento automático que ajusta la "
-"velocidad de impresión y la velocidad del ventilador según el tiempo de "
-"impresión de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:252
-msgid "Cooling tube position"
-msgstr "Posición del tubo de refrigeración"
-
-#: src/libslic3r/PrintConfig.cpp:253
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
-msgstr ""
-"Distancia desde el centro del tubo de enfriado a la punta del extrusor "
-
-#: src/libslic3r/PrintConfig.cpp:261
-msgid "Cooling tube length"
-msgstr "Longitud del tubo de enfriamiento"
-
-#: src/libslic3r/PrintConfig.cpp:262
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
-msgstr ""
-"Longitud del tubo de enfriado para limitar el espacio para movimientos de "
-"enfriamiento dentro del mismo "
-
-#: src/libslic3r/PrintConfig.cpp:271
-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."
-msgstr ""
-"Esta es la aceleración después de que se usen los valores de aceleración "
-"específicos de cada función (perímetro / relleno). Establezca cero para "
-"evitar restablecer la aceleración."
-
-#: src/libslic3r/PrintConfig.cpp:281
-msgid "Default filament profile"
-msgstr "Perfil de filamento por defecto"
-
-#: src/libslic3r/PrintConfig.cpp:282
-msgid ""
-"Default filament profile associated with the current printer profile. On "
-"selection of the current printer profile, this filament profile will be "
-"activated."
-msgstr ""
-"Perfil de filamento por defecto asociado con el perfil de impresora actual. "
-"Al seleccionar el perfil de impresora actual se activará este perfil de "
-"filamento."
-
-#: src/libslic3r/PrintConfig.cpp:287
-msgid "Default print profile"
-msgstr "Perfil de impresión por defecto"
-
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
-msgid ""
-"Default print profile associated with the current printer profile. On "
-"selection of the current printer profile, this print profile will be "
-"activated."
-msgstr ""
-"Perfil de impresión por defecto asociado con el perfil de impresora actual. "
-"Al seleccionar el perfil de impresora actual se activará este perfil de "
-"impresión."
-
-#: src/libslic3r/PrintConfig.cpp:293
-msgid "Disable fan for the first"
-msgstr "Desactivar ventilador para la primera"
-
-#: src/libslic3r/PrintConfig.cpp:294
-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 ""
-"Puedes configurarlo como un valor positivo para desactivar el ventilador "
-"durante todas las capas iniciales, de manera que no empeora la adhesión."
-
-#: src/libslic3r/PrintConfig.cpp:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
-msgid "layers"
-msgstr "capas"
-
-#: src/libslic3r/PrintConfig.cpp:304
-msgid "Don't support bridges"
-msgstr "No soportar puentes"
-
-#: src/libslic3r/PrintConfig.cpp:306
-msgid ""
-"Experimental option for preventing support material from being generated "
-"under bridged areas."
-msgstr ""
-"Opción experimental para evitar que se genere material de soporte debajo de "
-"las áreas con puente."
-
-#: src/libslic3r/PrintConfig.cpp:313
-msgid "Distance between copies"
-msgstr "Distancia entre copias"
-
-#: src/libslic3r/PrintConfig.cpp:314
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr ""
-"Distancia utilizada para la función de organización automática de la base."
-
-#: src/libslic3r/PrintConfig.cpp:322
-msgid "Elephant foot compensation"
-msgstr "Compensación del pie de elefante"
-
-#: src/libslic3r/PrintConfig.cpp:324
-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 ""
-"La primera capa se contraerá en el plano XY por el valor configurado para "
-"compensar el aplatamiento de la 1ª capa, también conocido como efecto Pie de "
-"Elefante."
-
-#: src/libslic3r/PrintConfig.cpp:334
-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 ""
-"Este procedimiento final se inserta al final del archivo de salida. Tenga en "
-"cuenta que puede usar variables de marcador de posición para todas las "
-"configuraciones de Slic3r."
-
-#: src/libslic3r/PrintConfig.cpp:345
-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 ""
-"Este procedimiento final se inserta al final del archivo de salida, antes "
-"del gcode final. Tenga en cuenta que puede usar variables de marcador de "
-"posición para todas las configuraciones de Slic3r. Si tiene extrusores "
-"múltiples, el gcode se procesa en el orden del extrusor."
-
-#: src/libslic3r/PrintConfig.cpp:356
-msgid "Ensure vertical shell thickness"
-msgstr "Asegurar el espesor de la carcasa vertical"
-
-#: src/libslic3r/PrintConfig.cpp:358
-msgid ""
-"Add solid infill near sloping surfaces to guarantee the vertical shell "
-"thickness (top+bottom solid layers)."
-msgstr ""
-"Añade un relleno completo cerca de las superficies inclinadas para "
-"garantizar el ancho vertical solicitado(capas sólidas arriba+abajo)."
-
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "Patrón de relleno superior/inferior"
-
-#: src/libslic3r/PrintConfig.cpp:367
-msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
-msgstr ""
-"Patrón para el relleno superior / inferior. Esto solo afecta a la capa "
-"externa visible, y no a las capas sólidas adyacentes."
-
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
-msgid "Rectilinear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
-msgid "Concentric"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
-msgid "Hilbert Curve"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
-msgid "Archimedean Chords"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
-msgid "Octagram Spiral"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
-msgid "External perimeters"
-msgstr "Perímetros externos"
-
-#: src/libslic3r/PrintConfig.cpp:388
-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 ""
-"Ajuste este valor distinto de cero para establecer un ancho de extrusión "
-"manual para perímetros externos. Si se deja en cero, se usará el ancho de "
-"extrusión por defecto si se establece, de lo contrario se usará 1.125 x "
-"diámetro de la boquilla. Si se expresa como porcentaje (por ejemplo, 200%), "
-"se computará sobre la altura de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
-msgid "mm or % (leave 0 for default)"
-msgstr "mm o % (dejar 0 por defecto)"
-
-#: src/libslic3r/PrintConfig.cpp:399
-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 ""
-"Esta configuración independiente afectará la velocidad de los perímetros "
-"externos (los visibles). Si se expresa como porcentaje (por ejemplo: 80%), "
-"se calculará en la configuración de velocidad de perímetros anterior. "
-"Establecer a cero para auto."
-
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
-msgid "mm/s or %"
-msgstr "mm/s o %"
-
-#: src/libslic3r/PrintConfig.cpp:409
-msgid "External perimeters first"
-msgstr "Perímetros externos primero"
-
-#: src/libslic3r/PrintConfig.cpp:411
-msgid ""
-"Print contour perimeters from the outermost one to the innermost one instead "
-"of the default inverse order."
-msgstr ""
-"Imprimir perímetros de contorno desde el más externo hasta el más interno en "
-"lugar del orden inverso predeterminado."
-
-#: src/libslic3r/PrintConfig.cpp:418
-msgid "Extra perimeters if needed"
-msgstr "Perímetros adicionales si es necesario"
-
-#: src/libslic3r/PrintConfig.cpp:420
-#, no-c-format
-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 ""
-"Añadir más perímetros cuando se necesiten para evitar huecos en las paredes "
-"inclinadas. Slic3r sigue añadiendo perímetros hasta que más del 70% del "
-"perímetro superior sea soportado."
-
-#: src/libslic3r/PrintConfig.cpp:431
-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 ""
-"La extrusora que se usa (a menos que se especifiquen configuraciones de "
-"extrusión más específicas). Este valor anula los extrusores de perímetro y "
-"relleno, pero no los extrusores de soporte."
-
-#: src/libslic3r/PrintConfig.cpp:444
-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."
-msgstr ""
-"Ajuste este valor según la distancia vertical entre la punta de la boquilla "
-"y (generalmente) las barras X del carro. En otras palabras, esta es la "
-"altura del cilindro de holgura alrededor de su extrusor, y representa la "
-"profundidad máxima que el extrusor puede asomar antes de colisionar con "
-"otros objetos impresos."
-
-#: src/libslic3r/PrintConfig.cpp:455
-msgid "Radius"
-msgstr "Radio"
-
-#: src/libslic3r/PrintConfig.cpp:456
-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."
-msgstr ""
-"Ajuste este parámetro según el radio de espacio libre alrededor de su "
-"extrusor. Si el extrusor no está centrado, elija el valor más grande para "
-"seguridad. Esta configuración se utiliza para verificar colisiones y mostrar "
-"la vista previa gráfica en la bandeja."
-
-#: src/libslic3r/PrintConfig.cpp:467
-msgid "Extruder Color"
-msgstr "Color del extrusor"
-
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr "Esto solo se usa en la interfaz de Slic3r como ayuda visual."
-
-#: src/libslic3r/PrintConfig.cpp:475
-msgid "Extruder offset"
-msgstr "Offset del extrusor"
-
-#: src/libslic3r/PrintConfig.cpp:476
-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)."
-msgstr ""
-"Si su firmware no maneja el desplazamiento del extrusor, necesita el código "
-"G para tenerlo en cuenta. Esta opción le permite especificar el "
-"desplazamiento de cada extrusora con respecto a la primera. Se esperan "
-"coordenadas positivas (se restarán de la coordenada XY)."
-
-#: src/libslic3r/PrintConfig.cpp:486
-msgid "Extrusion axis"
-msgstr "Eje de extrusión"
-
-#: src/libslic3r/PrintConfig.cpp:487
-msgid ""
-"Use this option to set the axis letter associated to your printer's extruder "
-"(usually E but some printers use A)."
-msgstr ""
-"Utiliza esta opción para ajustar la letra asociada al extrusor de tu "
-"impresora (normalmente se usa E pero otras usan A)."
-
-#: src/libslic3r/PrintConfig.cpp:493
-msgid "Extrusion multiplier"
-msgstr "Multiplicador de extrusión"
-
-#: src/libslic3r/PrintConfig.cpp:494
-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."
-msgstr ""
-"Este factor cambia la cantidad de flujo proporcionalmente. Es posible que "
-"necesite ajustar esta configuración para obtener un buen acabado superficial "
-"y corregir el ancho de una sola pared. Los valores usuales están entre 0.9 y "
-"1.1. Si cree que necesita cambiar esto más, verifique el diámetro del "
-"filamento y los pasos del E en el firmware."
-
-#: src/libslic3r/PrintConfig.cpp:503
-msgid "Default extrusion width"
-msgstr "Ancho de extrusión por defecto"
-
-#: src/libslic3r/PrintConfig.cpp:505
-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 ""
-"Ajuste este valor distinto de cero para permitir un ancho de extrusión "
-"manual. Si se deja a cero, Slic3r obtiene anchuras de extrusión del diámetro "
-"de la boquilla (consulte la información sobre herramientas para conocer el "
-"ancho de extrusión, el ancho de extrusión de relleno, etc.). Si se expresa "
-"como porcentaje (por ejemplo: 230%), se computará sobre la altura de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:509
-msgid "mm or % (leave 0 for auto)"
-msgstr "mm o % (dejar 0 para automático)"
-
-#: src/libslic3r/PrintConfig.cpp:515
-msgid "Keep fan always on"
-msgstr "Mantener el ventilador siempre encendido"
-
-#: src/libslic3r/PrintConfig.cpp:516
-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 ""
-"Si esto está habilitado, el ventilador nunca se desactivará y se mantendrá "
-"funcionando al menos a su velocidad mínima. Útil para PLA, no recomendado "
-"para ABS."
-
-#: src/libslic3r/PrintConfig.cpp:522
-msgid "Enable fan if layer print time is below"
-msgstr ""
-"Habilitar ventilador si el tiempo de impresión de la capa está por debajo"
-
-#: src/libslic3r/PrintConfig.cpp:523
-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 ""
-"Si el tiempo de impresión de capa se estima por debajo de este número de "
-"segundos, el ventilador se habilitará y su velocidad se calculará al "
-"interpolar las velocidades mínima y máxima."
-
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
-msgid "approximate seconds"
-msgstr "segundos aproximadamente"
-
-#: src/libslic3r/PrintConfig.cpp:534
-msgid "Color"
-msgstr "Color"
-
-#: src/libslic3r/PrintConfig.cpp:541
-msgid "Filament notes"
-msgstr "Notas del filamento"
-
-#: src/libslic3r/PrintConfig.cpp:542
-msgid "You can put your notes regarding the filament here."
-msgstr "Puede poner sus notas con respecto al filamento aquí."
-
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
-msgid "Max volumetric speed"
-msgstr "Velocidad volumétrica máxima"
-
-#: src/libslic3r/PrintConfig.cpp:552
-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 ""
-"Velocidad volumétrica máxima permitida para este filamento. Limita la "
-"velocidad volumétrica máxima de una impresión al mínimo de velocidad "
-"volumétrica de impresión y filamento. Establecer en cero para usar sin "
-"límite."
-
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
-msgid "mm³/s"
-msgstr "mm³/s"
-
-#: src/libslic3r/PrintConfig.cpp:562
-msgid "Loading speed"
-msgstr "Velocidad de carga"
-
-#: src/libslic3r/PrintConfig.cpp:563
-msgid "Speed used for loading the filament on the wipe tower. "
-msgstr "Velocidad empleada para cargar el filamento en la torre de limpieza. "
-
-#: src/libslic3r/PrintConfig.cpp:571
-msgid "Loading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:572
-msgid "Speed used at the very beginning of loading phase. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:580
-msgid "Unloading speed"
-msgstr "Velocidad de descarga"
-
-#: src/libslic3r/PrintConfig.cpp:581
-msgid ""
-"Speed used for unloading the filament on the wipe tower (does not affect  "
-"initial part of unloading just after ramming). "
-msgstr ""
-"Velocidad empleada para descargar el filamento en la torre de limpieza (no "
-"afecta a la fase inicial de la descarga, sólo después de empujar). "
-
-#: src/libslic3r/PrintConfig.cpp:590
-msgid "Unloading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:591
-msgid ""
-"Speed used for unloading the tip of the filament immediately after ramming. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:599
-msgid "Delay after unloading"
-msgstr "Retardo tras la descarga"
-
-#: src/libslic3r/PrintConfig.cpp:600
-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. "
-msgstr ""
-"Tiempo de espera después de que se ha descargado el filamento. Puede ayudar "
-"para conseguir cambios de herramienta fiables con materiales flexibles que "
-"pueden necesitar más tiempo para encogerse a su tamaño original. "
-
-#: src/libslic3r/PrintConfig.cpp:610
-msgid "Number of cooling moves"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:611
-msgid ""
-"Filament is cooled by being moved back and forth in the cooling tubes. "
-"Specify desired number of these moves "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:620
-msgid "Speed of the first cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:621
-msgid "Cooling moves are gradually accelerating beginning at this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:629
-msgid "Minimal purge on wipe tower"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:630
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:635
-msgid "mm³"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:641
-msgid "Speed of the last cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:642
-msgid "Cooling moves are gradually accelerating towards this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:650
-msgid "Filament load time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:651
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:659
-msgid "Ramming parameters"
-msgstr "Parámetros de empuje"
-
-#: src/libslic3r/PrintConfig.cpp:660
-msgid ""
-"This string is edited by RammingDialog and contains ramming specific "
-"parameters "
-msgstr ""
-"Esta cadena se modifica con el Diálogo de Empuje y contiene parámetros "
-"específicos de empuje "
-
-#: src/libslic3r/PrintConfig.cpp:667
-msgid "Filament unload time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:668
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:677
-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."
-msgstr ""
-"Ingrese el diámetro de su fila aquí. Se requiere una buena precisión, por lo "
-"tanto, use un calibre y realice múltiples mediciones a lo largo del "
-"filamento, luego calcule el promedio."
-
-#: src/libslic3r/PrintConfig.cpp:685
-msgid "Density"
-msgstr "Densidad"
-
-#: src/libslic3r/PrintConfig.cpp:686
-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."
-msgstr ""
-"Ingrese su densidad de filamento aquí. Esto es solo para información "
-"estadística. Una forma decente es pesar una longitud conocida de filamento y "
-"calcular la relación entre la longitud y el volumen. Lo mejor es calcular el "
-"volumen directamente a través del desplazamiento."
-
-#: src/libslic3r/PrintConfig.cpp:689
-msgid "g/cm³"
-msgstr "g/cm³"
-
-#: src/libslic3r/PrintConfig.cpp:695
-msgid "Filament type"
-msgstr "Tipo de filamento"
-
-#: src/libslic3r/PrintConfig.cpp:696
-msgid "The filament material type for use in custom G-codes."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:712
-msgid "Soluble material"
-msgstr "Material soluble"
-
-#: src/libslic3r/PrintConfig.cpp:713
-msgid "Soluble material is most likely used for a soluble support."
-msgstr "El material soluble se usa muy probablemente para un soporte soluble."
-
-#: src/libslic3r/PrintConfig.cpp:719
-msgid ""
-"Enter your filament cost per kg here. This is only for statistical "
-"information."
-msgstr ""
-"Ingrese su coste del filamento por kg aquí. Esto es solo para información "
-"estadística."
-
-#: src/libslic3r/PrintConfig.cpp:720
-msgid "money/kg"
-msgstr "dinero/kg"
-
-#: src/libslic3r/PrintConfig.cpp:729
-msgid "Fill angle"
-msgstr "�ngulo de relleno"
-
-#: src/libslic3r/PrintConfig.cpp:731
-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."
-msgstr ""
-"�ngulo base predeterminado para orientación de relleno. Se aplicará "
-"sombreado cruzado a esto. Los puentes se rellenarán utilizando la mejor "
-"dirección que Slic3r pueda detectar, por lo que esta configuración no los "
-"afecta."
-
-#: src/libslic3r/PrintConfig.cpp:744
-msgid "Fill density"
-msgstr "Densidad de relleno"
-
-#: src/libslic3r/PrintConfig.cpp:746
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "Densidad de relleno interior, expresado en el rango 0% - 100%."
-
-#: src/libslic3r/PrintConfig.cpp:782
-msgid "Fill pattern"
-msgstr "Patrón de relleno"
-
-#: src/libslic3r/PrintConfig.cpp:784
-msgid "Fill pattern for general low-density infill."
-msgstr "Patrón de relleno para el relleno general de baja densidad."
-
-#: src/libslic3r/PrintConfig.cpp:801
-msgid "Grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:802
-msgid "Triangles"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:803
-msgid "Stars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:804
-msgid "Cubic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:805
-msgid "Line"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
-msgid "Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:808
-msgid "3D Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:809
-msgid "Gyroid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
-msgid "First layer"
-msgstr "Primera capa"
-
-#: src/libslic3r/PrintConfig.cpp:817
-msgid ""
-"This is the acceleration your printer will use for first layer. Set zero to "
-"disable acceleration control for first layer."
-msgstr ""
-"Esta es la aceleración que su impresora usará para la primera capa. "
-"Establezca cero para deshabilitar el control de aceleración para la primera "
-"capa."
-
-#: src/libslic3r/PrintConfig.cpp:827
-msgid ""
-"Heated build plate temperature for the first layer. Set this to zero to "
-"disable bed temperature control commands in the output."
-msgstr ""
-"Temperatura de base calefactable para la primera capa. Ajuste esto a cero "
-"para deshabilitar los comandos de control de temperatura de la cama en la "
-"salida."
-
-#: src/libslic3r/PrintConfig.cpp:837
-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."
-msgstr ""
-"Ajuste este valor distinto de cero para establecer un ancho de extrusión "
-"manual para la primera capa. Puede usar esto para forzar extrusiones más "
-"gordas para una mejor adhesión. Si se expresa como porcentaje (por ejemplo, "
-"120%), se calculará sobre la altura de la primera capa. Si se establece en "
-"cero, usará el ancho de extrusión predeterminado."
-
-#: src/libslic3r/PrintConfig.cpp:848
-msgid "First layer height"
-msgstr "Altura de la primera capa"
-
-#: src/libslic3r/PrintConfig.cpp:850
-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 ""
-"Al imprimir con alturas de capa muy bajas, es posible que desee imprimir una "
-"capa inferior más gruesa para mejorar la adhesión y la tolerancia de las "
-"placas de construcción no perfectas. Esto se puede expresar como un valor "
-"absoluto o como un porcentaje (por ejemplo: 150%) sobre la altura de capa "
-"predeterminada."
-
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
-msgid "mm or %"
-msgstr "mm o %"
-
-#: src/libslic3r/PrintConfig.cpp:860
-msgid "First layer speed"
-msgstr "Velocidad de la primera capa"
-
-#: src/libslic3r/PrintConfig.cpp:861
-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 ""
-"Si se expresa como valor absoluto en mm / s, esta velocidad se aplicará a "
-"todos los movimientos de impresión de la primera capa, independientemente de "
-"su tipo. Si se expresa como un porcentaje (por ejemplo: 40%), escalará las "
-"velocidades predeterminadas."
-
-#: src/libslic3r/PrintConfig.cpp:872
-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 ""
-"Temperatura del extrusor para la primera capa. Si desea controlar la "
-"temperatura manualmente durante la impresión, configúrela en cero para "
-"desactivar los comandos de control de temperatura en el archivo de salida."
-
-#: src/libslic3r/PrintConfig.cpp:882
-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 ""
-"Velocidad para llenar pequeños espacios usando movimientos cortos de zigzag. "
-"Mantenga esto razonablemente bajo para evitar demasiados problemas de "
-"vibración y sacudidas. Establezca cero para desactivar el llenado de huecos."
-
-#: src/libslic3r/PrintConfig.cpp:890
-msgid "Verbose G-code"
-msgstr "Código G detallado"
-
-#: src/libslic3r/PrintConfig.cpp:891
-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 ""
-"Habilítelo para obtener un archivo de código G comentado, con cada línea "
-"explicada por un texto descriptivo. Si imprime desde una tarjeta SD, el peso "
-"adicional del archivo podría ralentizar su firmware."
-
-#: src/libslic3r/PrintConfig.cpp:899
-msgid "G-code flavor"
-msgstr "Tipo de código G"
-
-#: src/libslic3r/PrintConfig.cpp:900
-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 ""
-"Algunos comandos de código G / M, incluido el control de temperatura y "
-"otros, no son universales. Establezca esta opción en el firmware de su "
-"impresora para obtener una salida compatible. El ajuste \"Sin extrusión\" "
-"evita que Slic3r exporte ningún valor de extrusión."
-
-#: src/libslic3r/PrintConfig.cpp:924
-msgid "No extrusion"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:929
-msgid "High extruder current on filament swap"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:930
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:939
-msgid ""
-"This is the acceleration your printer will use for infill. Set zero to "
-"disable acceleration control for infill."
-msgstr ""
-"Esta es la aceleración que su impresora usará para el relleno. Establezca "
-"cero para deshabilitar el control de aceleración para el relleno."
-
-#: src/libslic3r/PrintConfig.cpp:948
-msgid "Combine infill every"
-msgstr "Combinar el relleno cada"
-
-#: src/libslic3r/PrintConfig.cpp:950
-msgid ""
-"This feature allows to combine infill and speed up your print by extruding "
-"thicker infill layers while preserving thin perimeters, thus accuracy."
-msgstr ""
-"Esta característica permite combinar el relleno y acelerar la impresión "
-"mediante la extrusión de capas de relleno más gruesas a la vez que se "
-"preservan los finos perímetros y, por lo tanto, la precisión."
-
-#: src/libslic3r/PrintConfig.cpp:954
-msgid "Combine infill every n layers"
-msgstr "Combinar el relleno cada n capas"
-
-#: src/libslic3r/PrintConfig.cpp:960
-msgid "Infill extruder"
-msgstr "Extrusor de relleno"
-
-#: src/libslic3r/PrintConfig.cpp:962
-msgid "The extruder to use when printing infill."
-msgstr "El extrusor que se usa cuando se imprime relleno."
-
-#: src/libslic3r/PrintConfig.cpp:971
-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."
-msgstr ""
-"Ajuste este valor distinto de cero para establecer un ancho de extrusión "
-"manual para relleno. Si se deja en cero, se usará el ancho de extrusión por "
-"defecto si se establece, de lo contrario se usará 1.125 x diámetro de la "
-"boquilla. Es posible que desee extrusiones más gordas para acelerar el "
-"relleno y fortalecer sus partes. Si se expresa como porcentaje (por ejemplo, "
-"90%), se calculará sobre la altura de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:981
-msgid "Infill before perimeters"
-msgstr "Rellenar antes que los perímetros"
-
-#: src/libslic3r/PrintConfig.cpp:982
-msgid ""
-"This option will switch the print order of perimeters and infill, making the "
-"latter first."
-msgstr ""
-"Esta opción cambiará el orden de impresión de los perímetros y el relleno, "
-"haciendo que el último sea el primero."
-
-#: src/libslic3r/PrintConfig.cpp:988
-msgid "Only infill where needed"
-msgstr "Solo rellenar cuando sea necesario"
-
-#: src/libslic3r/PrintConfig.cpp:990
-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."
-msgstr ""
-"Esta opción limitará el relleno a las áreas realmente necesarias para "
-"soportar techos (actuará como material de soporte interno). Si está "
-"habilitado, ralentiza la generación del código G debido a las múltiples "
-"comprobaciones involucradas."
-
-#: src/libslic3r/PrintConfig.cpp:998
-msgid "Infill/perimeters overlap"
-msgstr "Superposición de relleno/perímetros"
-
-#: src/libslic3r/PrintConfig.cpp:1000
-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."
-msgstr ""
-"Esta configuración aplica una superposición adicional entre relleno y "
-"perímetros para una mejor unión. Teóricamente, esto no debería ser "
-"necesario, pero la reacción puede causar huecos. Si se expresa como "
-"porcentaje (ejemplo: 15%), se calcula sobre el ancho de extrusión del "
-"perímetro."
-
-#: src/libslic3r/PrintConfig.cpp:1012
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr ""
-"Velocidad para imprimir el relleno interno. Establecer a cero para auto."
-
-#: src/libslic3r/PrintConfig.cpp:1020
-msgid "Inherits profile"
-msgstr "Hereda el perfil"
-
-#: src/libslic3r/PrintConfig.cpp:1021
-msgid "Name of the profile, from which this profile inherits."
-msgstr "Nombre del perfil desde que éste hereda."
-
-#: src/libslic3r/PrintConfig.cpp:1032
-msgid "Interface shells"
-msgstr "Carcasas de interfaz"
-
-#: src/libslic3r/PrintConfig.cpp:1033
-msgid ""
-"Force the generation of solid shells between adjacent materials/volumes. "
-"Useful for multi-extruder prints with translucent materials or manual "
-"soluble support material."
-msgstr ""
-"Forzar la generación de carcasas sólidas entre materiales / volúmenes "
-"adyacentes. Útil para impresiones de múltiples extrusoras con materiales "
-"translúcidos o material de soporte soluble manual."
-
-#: src/libslic3r/PrintConfig.cpp:1043
-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:1054
-msgid "Supports remaining times"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1055
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1063
-msgid "Supports silent mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1064
-msgid "Set silent mode for the G-code flavor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1087
-msgid "Maximum feedrate %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1089
-msgid "Maximum feedrate of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1097
-msgid "Maximum acceleration %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1099
-msgid "Maximum acceleration of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1107
-msgid "Maximum jerk %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1109
-msgid "Maximum jerk of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
-msgid "Minimum feedrate when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
-msgid "Minimum travel feedrate"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
-msgid "Maximum acceleration when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
-msgid "Maximum acceleration when retracting"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
-msgid "Max"
-msgstr "Max"
-
-#: src/libslic3r/PrintConfig.cpp:1164
-msgid "This setting represents the maximum speed of your fan."
-msgstr "Esta configuración representa la velocidad máxima de su ventilador."
-
-#: src/libslic3r/PrintConfig.cpp:1174
-#, no-c-format
-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."
-msgstr ""
-"Esta es la altura más alta imprimible de capa para este extrusor, que se "
-"utiliza para cubrir la altura de la capa variable y la altura de la capa de "
-"soporte. La altura máxima recomendada de la capa es del 75% del ancho de "
-"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."
-
-#: src/libslic3r/PrintConfig.cpp:1185
-msgid "Max print speed"
-msgstr "Velocidad máxima de impresión"
-
-#: src/libslic3r/PrintConfig.cpp:1186
-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."
-msgstr ""
-"Al establecer otras configuraciones de velocidad en 0, Slic3r calculará "
-"automáticamente la velocidad óptima para mantener constante la presión en el "
-"extrusor. Esta configuración experimental se utiliza para establecer la "
-"velocidad de impresión más alta que desea permitir."
-
-#: src/libslic3r/PrintConfig.cpp:1197
-msgid ""
-"This experimental setting is used to set the maximum volumetric speed your "
-"extruder supports."
-msgstr ""
-"Esta configuración experimental se usa para establecer la velocidad "
-"volumétrica máxima que admite el extrusor."
-
-#: src/libslic3r/PrintConfig.cpp:1206
-msgid "Max volumetric slope positive"
-msgstr "Máx. Pendiente volumétrica positiva"
-
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
-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."
-msgstr ""
-"Esta configuración experimental se usa para limitar la velocidad de cambio "
-"en la velocidad de extrusión. Un valor de 1,8 mm³ / s² asegura que se cambia "
-"la velocidad de extrusión de 1,8 mm³ / s (ancho de extrusión de 0,45 mm, "
-"altura de extrusión de 0,2 mm, avance de 20 mm / s) a 5,4 mm³ / s (avance de "
-"60 mm / s) durará al menos 2 segundos."
-
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
-msgid "mm³/s²"
-msgstr "mm³/s²"
-
-#: src/libslic3r/PrintConfig.cpp:1218
-msgid "Max volumetric slope negative"
-msgstr "Máx. Pendiente volumétrica negativa"
-
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
-msgid "Min"
-msgstr "Min"
-
-#: src/libslic3r/PrintConfig.cpp:1231
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr ""
-"Este ajuste representa el PWM mínimo que el ventilador necesita para "
-"funcionar."
-
-#: src/libslic3r/PrintConfig.cpp:1241
-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."
-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."
-
-#: src/libslic3r/PrintConfig.cpp:1250
-msgid "Min print speed"
-msgstr "Velocidad de impresión mínima"
-
-#: src/libslic3r/PrintConfig.cpp:1251
-msgid "Slic3r will not scale speed down below this speed."
-msgstr "Slic3r no escalará la velocidad por debajo de esta velocidad."
-
-#: src/libslic3r/PrintConfig.cpp:1259
-msgid "Minimal filament extrusion length"
-msgstr "Longitud mínima de filamento extruido"
-
-#: src/libslic3r/PrintConfig.cpp:1260
-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."
-msgstr ""
-"Generar no menos que el número de bucles de falda requeridos para consumir "
-"la cantidad especificada de filamento en la capa inferior. Para máquinas "
-"multi-extrusoras, este mínimo se aplica a cada extrusora."
-
-#: src/libslic3r/PrintConfig.cpp:1270
-msgid "Configuration notes"
-msgstr "Notas de configuración"
-
-#: src/libslic3r/PrintConfig.cpp:1271
-msgid ""
-"You can put here your personal notes. This text will be added to the G-code "
-"header comments."
-msgstr ""
-"Puede poner sus notas personales aquí. Este texto se añadirá al código G "
-"como comentarios."
-
-#: src/libslic3r/PrintConfig.cpp:1281
-msgid "Nozzle diameter"
-msgstr "Diámetro de la boquilla"
-
-#: src/libslic3r/PrintConfig.cpp:1282
-msgid ""
-"This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
-msgstr ""
-"Este es el diámetro de la boquilla de su extrusor (por ejemplo: 0.5, 0.35, "
-"etc.)"
-
-#: src/libslic3r/PrintConfig.cpp:1288
-msgid "Host Type"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1289
-msgid ""
-"Slic3r can upload G-code files to a printer host. This field must contain "
-"the kind of the host."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr "Nombre de equipo, IP o URL"
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
-msgid "Only retract when crossing perimeters"
-msgstr "Solo retraer al cruzar perímetros"
-
-#: src/libslic3r/PrintConfig.cpp:1326
-msgid ""
-"Disables retraction when the travel path does not exceed the upper layer's "
-"perimeters (and thus any ooze will be probably invisible)."
-msgstr ""
-"Desactiva la retracción cuando la trayectoria de desplazamiento no supera "
-"los perímetros de la capa superior (y, por lo tanto, cualquier goteo "
-"probablemente será invisible)."
-
-#: src/libslic3r/PrintConfig.cpp:1334
-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 ""
-"Esta opción reducirá la temperatura de las extrusoras inactivas para evitar "
-"el goteo. Permitirá una falda alta automáticamente y moverá los extrusores "
-"fuera de dicha falda cuando cambie la temperatura."
-
-#: src/libslic3r/PrintConfig.cpp:1342
-msgid "Output filename format"
-msgstr "Formato de nombre de salida"
-
-#: src/libslic3r/PrintConfig.cpp:1343
-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 ""
-"Puedes usar todas las opciones de configuración como las variables dentro de "
-"esta muestra. Por ejemplo [layer_height], [fill_density] etc.También puedes "
-"usar [timestamp], [year], [month], [day], [hour], [minute], [second], "
-"[version], [input_filename], [input_filename_base]."
-
-#: src/libslic3r/PrintConfig.cpp:1353
-msgid "Detect bridging perimeters"
-msgstr "Detectar perímetros con puentes"
-
-#: src/libslic3r/PrintConfig.cpp:1355
-msgid ""
-"Experimental option to adjust flow for overhangs (bridge flow will be used), "
-"to apply bridge speed to them and enable fan."
-msgstr ""
-"Opción experimental para ajustar el flujo para salientes (se usará el flujo "
-"del puente), para aplicar la velocidad del puente a ellos y habilitar el "
-"ventilador."
-
-#: src/libslic3r/PrintConfig.cpp:1362
-msgid "Filament parking position"
-msgstr "Posición de aparcar el filamento"
-
-#: src/libslic3r/PrintConfig.cpp:1363
-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 ""
-"Distancia de la punta del extrusor desde la posición donde el filamento es "
-"colocado cuando se descarga. Esto debería coincidir con el valor en el "
-"firmware de la impresora. "
-
-#: src/libslic3r/PrintConfig.cpp:1372
-msgid "Extra loading distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1373
-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:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
-msgid "Perimeters"
-msgstr "Perímetros"
-
-#: src/libslic3r/PrintConfig.cpp:1383
-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 ""
-"Esta es la aceleración que su impresora usará para los perímetros. Un valor "
-"alto como 9000 generalmente da buenos resultados si su hardware está a la "
-"altura del trabajo. Establezca cero para deshabilitar el control de "
-"aceleración para los perímetros."
-
-#: src/libslic3r/PrintConfig.cpp:1392
-msgid "Perimeter extruder"
-msgstr "Extrusor de perímetros"
-
-#: src/libslic3r/PrintConfig.cpp:1394
-msgid ""
-"The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr ""
-"El extrusor que se usa al imprimir perímetros y borde. El primer extrusor es "
-"1."
-
-#: src/libslic3r/PrintConfig.cpp:1404
-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."
-msgstr ""
-"Ajuste este valor distinto de cero para establecer un ancho de extrusión "
-"manual para los perímetros. Es posible que desee utilizar extrusiones más "
-"delgadas para obtener superficies más precisas. Si se deja en cero, se usará "
-"el ancho de extrusión por defecto si se establece, de lo contrario se usará "
-"1.125 x diámetro de la boquilla. Si se expresa como porcentaje (por ejemplo, "
-"200%), se calculará sobre la altura de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:1417
-msgid ""
-"Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr ""
-"Velocidad para perímetros (contornos, también conocidos como conchas "
-"verticales). Establecer a cero para auto."
-
-#: src/libslic3r/PrintConfig.cpp:1427
-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 ""
-"Esta opción establece la cantidad de perímetros que se generarán para cada "
-"capa. Tenga en cuenta que Slic3r puede aumentar este número automáticamente "
-"cuando detecta superficies inclinadas que se benefician de un mayor número "
-"de perímetros si la opción Perímetros adicionales está habilitada."
-
-#: src/libslic3r/PrintConfig.cpp:1431
-msgid "(minimum)"
-msgstr "(mínimo)"
-
-#: src/libslic3r/PrintConfig.cpp:1439
-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."
-msgstr ""
-"Si desea procesar el código G de salida a través de scripts personalizados, "
-"simplemente haga una lista de sus rutas absolutas aquí. Separe los scripts "
-"múltiples con un punto y coma. Los scripts se pasarán por la ruta absoluta "
-"al archivo de código G como primer argumento, y pueden acceder a la "
-"configuración de configuración de Slic3r leyendo las variables de entorno."
-
-#: src/libslic3r/PrintConfig.cpp:1452
-msgid "Printer type"
-msgstr "Tipo de impresora"
-
-#: src/libslic3r/PrintConfig.cpp:1453
-msgid "Type of the printer."
-msgstr "Tipo de impresora."
-
-#: src/libslic3r/PrintConfig.cpp:1457
-msgid "Printer notes"
-msgstr "Notas de la impresora"
-
-#: src/libslic3r/PrintConfig.cpp:1458
-msgid "You can put your notes regarding the printer here."
-msgstr "Puede poner sus notas con respecto a la impresora aquí."
-
-#: src/libslic3r/PrintConfig.cpp:1467
-msgid "Printer vendor"
-msgstr "Fabricante de la impresora"
-
-#: src/libslic3r/PrintConfig.cpp:1468
-msgid "Name of the printer vendor."
-msgstr "Nombre del fabricante de la impresora."
-
-#: src/libslic3r/PrintConfig.cpp:1472
-msgid "Printer variant"
-msgstr "Modelo de impresora"
-
-#: src/libslic3r/PrintConfig.cpp:1473
-msgid ""
-"Name of the printer variant. For example, the printer variants may be "
-"differentiated by a nozzle diameter."
-msgstr ""
-"Nombre de la variante de impresora. Por ejemplo, las variantes pueden "
-"distinguir diferentes diámetros de boquilla."
-
-#: src/libslic3r/PrintConfig.cpp:1483
-msgid "Raft layers"
-msgstr "Capas de balsa"
-
-#: src/libslic3r/PrintConfig.cpp:1485
-msgid ""
-"The object will be raised by this number of layers, and support material "
-"will be generated under it."
-msgstr ""
-"El objeto será elevado por este número de capas y se generará material de "
-"soporte debajo de él."
-
-#: src/libslic3r/PrintConfig.cpp:1494
-msgid "Resolution"
-msgstr "Resolución"
-
-#: src/libslic3r/PrintConfig.cpp:1495
-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 ""
-"Resolución mínima de detalles, utilizada para simplificar el archivo de "
-"entrada para acelerar el trabajo de laminado y reducir el uso de memoria. "
-"Los modelos de alta resolución suelen llevar más detalles de los que las "
-"impresoras pueden ofrecer. Establézcalo en cero para desactivar cualquier "
-"simplificación y usar la resolución completa de la entrada."
-
-#: src/libslic3r/PrintConfig.cpp:1506
-msgid "Minimum travel after retraction"
-msgstr "Distancia mínima después de la retracción"
-
-#: src/libslic3r/PrintConfig.cpp:1507
-msgid ""
-"Retraction is not triggered when travel moves are shorter than this length."
-msgstr ""
-"La retracción no se activa cuando los movimientos de desplazamiento son más "
-"cortos que esta longitud."
-
-#: src/libslic3r/PrintConfig.cpp:1514
-msgid "Retract amount before wipe"
-msgstr "Retracta cantidad antes de limpiar"
-
-#: src/libslic3r/PrintConfig.cpp:1515
-msgid ""
-"With bowden extruders, it may be wise to do some amount of quick retract "
-"before doing the wipe movement."
-msgstr ""
-"Con extrusores bowden, puede ser recomendable realizar una retracción rápida "
-"antes de realizar el movimiento de limpiar."
-
-#: src/libslic3r/PrintConfig.cpp:1523
-msgid "Retract on layer change"
-msgstr "Retraer en el cambio de capa"
-
-#: src/libslic3r/PrintConfig.cpp:1524
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr ""
-"Esta bandera impone una retractación cada vez que se realiza un movimiento Z."
-
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
-msgid "Length"
-msgstr "Largo"
-
-#: src/libslic3r/PrintConfig.cpp:1531
-msgid "Retraction Length"
-msgstr "Longitud de retracción"
-
-#: src/libslic3r/PrintConfig.cpp:1532
-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 ""
-"Cuando se activa la retracción, el filamento se retira en la cantidad "
-"especificada (la longitud se mide en el filamento sin procesar, antes de que "
-"entre en el extrusor)."
-
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
-msgid "mm (zero to disable)"
-msgstr "mm (cero para deshabilitar)"
-
-#: src/libslic3r/PrintConfig.cpp:1540
-msgid "Retraction Length (Toolchange)"
-msgstr "Longitud de retracción (cambio de herramienta)"
-
-#: src/libslic3r/PrintConfig.cpp:1541
-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 ""
-"Cuando se desencadena la retracción antes de cambiar la herramienta, el "
-"filamento se retira en la cantidad especificada (la longitud se mide en el "
-"filamento sin procesar, antes de que entre en el extrusor)."
-
-#: src/libslic3r/PrintConfig.cpp:1550
-msgid "Lift Z"
-msgstr "Levantar Z"
-
-#: src/libslic3r/PrintConfig.cpp:1551
-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 ""
-"Si establece esto en un valor positivo, Z se levantará rápidamente cada vez "
-"que se active una retracción. Cuando se usan múltiples extrusores , solo se "
-"considerará la configuración del primer extrusor."
-
-#: src/libslic3r/PrintConfig.cpp:1559
-msgid "Above Z"
-msgstr "Encima de Z"
-
-#: src/libslic3r/PrintConfig.cpp:1560
-msgid "Only lift Z above"
-msgstr "Solo levantar Z mayor que"
-
-#: src/libslic3r/PrintConfig.cpp:1561
-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 ""
-"Si establece esto en un valor positivo, la elevación de Z solo tendrá lugar "
-"por encima de la Z absoluta especificada. Puede ajustar esta configuración "
-"para omitir el levantamiento en las primeras capas."
-
-#: src/libslic3r/PrintConfig.cpp:1569
-msgid "Below Z"
-msgstr "Por debajo de Z"
-
-#: src/libslic3r/PrintConfig.cpp:1570
-msgid "Only lift Z below"
-msgstr "Solo levantar Z menor que"
-
-#: src/libslic3r/PrintConfig.cpp:1571
-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 ""
-"Si configura esto en un valor positivo, la elevación Z solo tendrá lugar por "
-"debajo de la Z absoluta especificada. Puede ajustar esta configuración para "
-"limitar la elevación a las primeras capas."
-
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
-msgid "Extra length on restart"
-msgstr "Longitud adicional en el reinicio"
-
-#: src/libslic3r/PrintConfig.cpp:1581
-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 ""
-"Cuando la retracción se compensa después de un movimiento, el extrusor "
-"necesitará introducir más filamento. Este ajuste raramente se necesita."
-
-#: src/libslic3r/PrintConfig.cpp:1590
-msgid ""
-"When the retraction is compensated after changing tool, the extruder will "
-"push this additional amount of filament."
-msgstr ""
-"Cuando la retracción se compensa después de cambiar la herramienta, el "
-"extrusor empujará esta cantidad adicional de filamento."
-
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
-msgid "Retraction Speed"
-msgstr "Velocidad de retracción"
-
-#: src/libslic3r/PrintConfig.cpp:1600
-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)."
-
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
-msgid "Deretraction Speed"
-msgstr "Velocidad de deretracción"
-
-#: src/libslic3r/PrintConfig.cpp:1609
-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 ""
-"La velocidad de carga de un filamento en la extrusora después de la "
-"retracción (solo se aplica al motor del extrusor). Si se deja a cero, se usa "
-"la velocidad de retracción."
-
-#: src/libslic3r/PrintConfig.cpp:1617
-msgid "Seam position"
-msgstr "Posición de la costura"
-
-#: src/libslic3r/PrintConfig.cpp:1619
-msgid "Position of perimeters starting points."
-msgstr "Posición de los puntos de inicio del perímetro."
-
-#: src/libslic3r/PrintConfig.cpp:1626
-msgid "Random"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1627
-msgid "Nearest"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1628
-msgid "Aligned"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1636
-msgid "Direction"
-msgstr "Dirección"
-
-#: src/libslic3r/PrintConfig.cpp:1638
-msgid "Preferred direction of the seam"
-msgstr "Dirección preferida de la costura"
-
-#: src/libslic3r/PrintConfig.cpp:1639
-msgid "Seam preferred direction"
-msgstr "Dirección de la costura"
-
-#: src/libslic3r/PrintConfig.cpp:1647
-msgid "Jitter"
-msgstr "Jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1649
-msgid "Seam preferred direction jitter"
-msgstr "Dirección preferida de unión jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1650
-msgid "Preferred direction of the seam - jitter"
-msgstr "Dirección preferida de la unión - jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1661
-msgid "USB/serial port for printer connection."
-msgstr "Puerto USB/serial para la conexión con la impresora."
-
-#: src/libslic3r/PrintConfig.cpp:1669
-msgid "Serial port speed"
-msgstr "Velocidad del puerto serial"
-
-#: src/libslic3r/PrintConfig.cpp:1670
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr ""
-"Velocidad (baudios) del puerto USB / serie para la conexión de la impresora."
-
-#: src/libslic3r/PrintConfig.cpp:1679
-msgid "Distance from object"
-msgstr "Distancia del objeto"
-
-#: src/libslic3r/PrintConfig.cpp:1680
-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 ""
-"Distancia entre falda y objeto(s). Ajuste esto a cero para unir la falda a "
-"los objetos y obtener un borde para una mejor adhesión."
-
-#: src/libslic3r/PrintConfig.cpp:1688
-msgid "Skirt height"
-msgstr "Altura de la falda"
-
-#: src/libslic3r/PrintConfig.cpp:1689
-msgid ""
-"Height of skirt expressed in layers. Set this to a tall value to use skirt "
-"as a shield against drafts."
-msgstr ""
-"Altura de la falda expresada en capas. Establezca esto en un valor alto para "
-"usar la falda como escudo contra corrientes de aire."
-
-#: src/libslic3r/PrintConfig.cpp:1697
-msgid "Loops (minimum)"
-msgstr "Bucles (mínimo)"
-
-#: src/libslic3r/PrintConfig.cpp:1698
-msgid "Skirt Loops"
-msgstr "Vueltas de la falda"
-
-#: src/libslic3r/PrintConfig.cpp:1699
-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 ""
-"Número de vueltas para la falda Si se establece la opción Longitud Mínima de "
-"Extrusión, el número de bucles puede ser mayor que el configurado aquí. "
-"Ajuste esto a cero para deshabilitar la falda por completo."
-
-#: src/libslic3r/PrintConfig.cpp:1708
-msgid "Slow down if layer print time is below"
-msgstr ""
-"Disminuya la velocidad si el tiempo de impresión de la capa está por debajo"
-
-#: src/libslic3r/PrintConfig.cpp:1709
-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 ""
-"Si el tiempo de impresión de la capa se estima por debajo de este número de "
-"segundos, la velocidad de los movimientos de impresión se reducirá para "
-"extender la duración a este valor."
-
-#: src/libslic3r/PrintConfig.cpp:1720
-msgid "Small perimeters"
-msgstr "Perímetros pequeños"
-
-#: src/libslic3r/PrintConfig.cpp:1722
-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 ""
-"Esta configuración por separado afectará la velocidad de los perímetros con "
-"un radio <= 6,5 mm (generalmente agujeros). Si se expresa como porcentaje "
-"(por ejemplo: 80%), se calculará en la configuración de velocidad de "
-"perímetros anterior. Establecer a cero para auto."
-
-#: src/libslic3r/PrintConfig.cpp:1732
-msgid "Solid infill threshold area"
-msgstr "�rea del umbral de relleno sólido"
-
-#: src/libslic3r/PrintConfig.cpp:1734
-msgid ""
-"Force solid infill for regions having a smaller area than the specified "
-"threshold."
-msgstr ""
-"Forzar el relleno sólido para las regiones que tienen un área más pequeña "
-"que el umbral especificado."
-
-#: src/libslic3r/PrintConfig.cpp:1735
-msgid "mm²"
-msgstr "mm²"
-
-#: src/libslic3r/PrintConfig.cpp:1742
-msgid "Solid infill extruder"
-msgstr "Extrusor de relleno sólido"
-
-#: src/libslic3r/PrintConfig.cpp:1744
-msgid "The extruder to use when printing solid infill."
-msgstr "El extrusor que se usa al imprimir relleno sólido."
-
-#: src/libslic3r/PrintConfig.cpp:1751
-msgid "Solid infill every"
-msgstr "Relleno sólido cada"
-
-#: src/libslic3r/PrintConfig.cpp:1753
-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."
-msgstr ""
-"Esta característica permite forzar una capa sólida en cada número de capas. "
-"Cero para deshabilitar. Puede establecer esto en cualquier valor (por "
-"ejemplo, 9999); Slic3r seleccionará automáticamente la cantidad máxima "
-"posible de capas para combinar según el diámetro de la boquilla y la altura "
-"de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:1766
-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."
-msgstr ""
-"Ajuste este valor distinto de cero para establecer un ancho de extrusión "
-"manual para el relleno de superficies sólidas. Si se deja en cero, se usará "
-"el ancho de extrusión por defecto si se establece, de lo contrario se usará "
-"1.125 x diámetro de la boquilla. Si se expresa como porcentaje (por ejemplo, "
-"90%), se calculará sobre la altura de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:1777
-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 ""
-"Velocidad para imprimir regiones sólidas (superior / inferior / conchas "
-"horizontales internas). Esto se puede expresar como un porcentaje (por "
-"ejemplo: 80%) sobre la velocidad de relleno predeterminada anterior. "
-"Establecer a cero para auto."
-
-#: src/libslic3r/PrintConfig.cpp:1789
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr ""
-"Número de capas sólidas para generar en las superficies superior e inferior."
-
-#: src/libslic3r/PrintConfig.cpp:1796
-msgid "Spiral vase"
-msgstr "Modo vaso"
-
-#: src/libslic3r/PrintConfig.cpp:1797
-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 ""
-"Esta función aumentará Z gradualmente mientras imprime un objeto de pared "
-"simple para eliminar cualquier costura visible. Esta opción requiere un "
-"perímetro único, sin relleno, sin capas sólidas superiores y sin material de "
-"soporte. Todavía puede establecer cualquier cantidad de capas sólidas "
-"inferiores, así como bucles de falda / balsa. No funcionará al imprimir más "
-"de un objeto."
-
-#: src/libslic3r/PrintConfig.cpp:1806
-msgid "Temperature variation"
-msgstr "Variación de temperatura"
-
-#: src/libslic3r/PrintConfig.cpp:1807
-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 ""
-"Diferencia de temperatura que se aplicará cuando un extrusor no esté activo. "
-"ACtiva una falda \"de sacrificio\" de altura completa en la que las "
-"boquillas se limpian periódicamente."
-
-#: src/libslic3r/PrintConfig.cpp:1818
-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 ""
-"Este procedimiento de inicio se inserta en el principio, después de que la "
-"cama ha llegado a la temperatura objetivo y el extrusor ha comenzado a "
-"calentarse, y después de que haya completado el calentamiento. Si Slic3r "
-"detecta un M104 o M190 en los g-codes custom, estos comandos no se iniciarán "
-"automaticamente por lo que eres libre de personalizar el orden de "
-"calentamiento y otras acciones. Fíjate que puedes utilizar variables de "
-"marcación de posición para todos los ajustes de Slic3r, como que puedes usar "
-"\"M109 S[first_layer_temperature]\" donde quieras."
-
-#: src/libslic3r/PrintConfig.cpp:1834
-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 ""
-"Este procedimiento de inicio se inserta en el principio, después de que la "
-"impresora haya realizado el g-code de inicio. Si Slic3r detecta un M104, "
-"M109, M140 o M190 en los g-codes custom, estos comandos no se iniciarán "
-"automaticamente por lo que eres libre de personalizar el orden de "
-"calentamiento y otras acciones. Fíjate que puedes utilizar variables de "
-"marcación de posición para todos los ajustes de Slic3r, como que puedes usar "
-"\"M109 S[first_layer_temperature]\" donde quieras. Si tienes varios "
-"extrusores, el g-code se procesará en el orden de estos."
-
-#: src/libslic3r/PrintConfig.cpp:1850
-msgid "Single Extruder Multi Material"
-msgstr "Extrusor único de múltiples materiales"
-
-#: src/libslic3r/PrintConfig.cpp:1851
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr "La impresora multiplexa los filamentos en un solo fusor."
-
-#: src/libslic3r/PrintConfig.cpp:1857
-msgid "Prime all printing extruders"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1858
-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:1864
-msgid "Generate support material"
-msgstr "Generar material de soporte"
-
-#: src/libslic3r/PrintConfig.cpp:1866
-msgid "Enable support material generation."
-msgstr "Habilite la generación de material de soporte."
-
-#: src/libslic3r/PrintConfig.cpp:1871
-msgid "Auto generated supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1873
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1880
-msgid "XY separation between an object and its support"
-msgstr "Separación XY entre un objeto y su soporte"
-
-#: src/libslic3r/PrintConfig.cpp:1882
-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 ""
-"Separación XY entre un objeto y su soporte. Si se expresa como porcentaje "
-"(por ejemplo 50%), se calculará sobre el ancho del perímetro externo."
-
-#: src/libslic3r/PrintConfig.cpp:1893
-msgid "Pattern angle"
-msgstr "�ngulo del patrón"
-
-#: src/libslic3r/PrintConfig.cpp:1895
-msgid ""
-"Use this setting to rotate the support material pattern on the horizontal "
-"plane."
-msgstr ""
-"Use esta configuración para rotar el patrón de material de soporte en el "
-"plano horizontal."
-
-#: src/libslic3r/PrintConfig.cpp:1906
-msgid ""
-"Only create support if it lies on a build plate. Don't create support on a "
-"print."
-msgstr ""
-"Solo crear soportes si está en contacto con la plataforma. No crea soporte "
-"en la impresión."
-
-#: src/libslic3r/PrintConfig.cpp:1913
-msgid "Contact Z distance"
-msgstr "Distancia Z de contacto"
-
-#: src/libslic3r/PrintConfig.cpp:1915
-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 ""
-"La distancia vertical entre el objeto y la interfaz del material de soporte. "
-"Establecer esto en 0 también evitará que Slic3r use el flujo y la velocidad "
-"del puente para la primera capa de los objetos."
-
-#: src/libslic3r/PrintConfig.cpp:1923
-msgid "soluble"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1924
-msgid "detachable"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1929
-msgid "Enforce support for the first"
-msgstr "Forzar soportes para la primera"
-
-#: src/libslic3r/PrintConfig.cpp:1931
-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 ""
-"Generar material de soporte para la cantidad especificada de capas contando "
-"desde abajo, independientemente de si el material de soporte normal está "
-"habilitado o no e independientemente de cualquier umbral de ángulo. Es útil "
-"para obtener una mayor adhesión de los objetos que tienen una huella muy "
-"delgada o deficiente en la placa de construcción."
-
-#: src/libslic3r/PrintConfig.cpp:1937
-msgid "Enforce support for the first n layers"
-msgstr "Aplicar soportes para las primeras n capas"
-
-#: src/libslic3r/PrintConfig.cpp:1943
-msgid "Support material/raft/skirt extruder"
-msgstr "Extrusor de material de soporte/falda/balsa"
-
-#: src/libslic3r/PrintConfig.cpp:1945
-msgid ""
-"The extruder to use when printing support material, raft and skirt (1+, 0 to "
-"use the current extruder to minimize tool changes)."
-msgstr ""
-"El extrusor que se usa al imprimir material de soporte, balsa y falda (1+, 0 "
-"para usar la extrusora actual para minimizar los cambios de herramientas)."
-
-#: src/libslic3r/PrintConfig.cpp:1955
-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."
-msgstr ""
-"Ajuste este valor distinto de cero para establecer un ancho de extrusión "
-"manual para el material de soporte. Si se deja en cero, se usará el ancho de "
-"extrusión por defecto si se establece, de lo contrario se usará el diámetro "
-"de la boquilla. Si se expresa como porcentaje (por ejemplo, 90%), se "
-"calculará sobre la altura de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:1964
-msgid "Interface loops"
-msgstr "Bucles de interfaz"
-
-#: src/libslic3r/PrintConfig.cpp:1966
-msgid ""
-"Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr ""
-"Cubrir la capa de contacto superior de los soportes con bucles. Desactivado "
-"por defecto."
-
-#: src/libslic3r/PrintConfig.cpp:1972
-msgid "Support material/raft interface extruder"
-msgstr "Extrusor del material de soporte/soporte de la balsa"
-
-#: src/libslic3r/PrintConfig.cpp:1974
-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 ""
-"La extrusora que se usa al imprimir la interfaz de material de soporte (1+, "
-"0 para usar la extrusora actual para minimizar los cambios de herramientas). "
-"Esto también afecta a la balsa."
-
-#: src/libslic3r/PrintConfig.cpp:1982
-msgid "Interface layers"
-msgstr "Capas de interfaz"
-
-#: src/libslic3r/PrintConfig.cpp:1984
-msgid ""
-"Number of interface layers to insert between the object(s) and support "
-"material."
-msgstr ""
-"Número de capas de interfaz para insertar entre el (los) objeto(s) y el "
-"material de soporte."
-
-#: src/libslic3r/PrintConfig.cpp:1992
-msgid "Interface pattern spacing"
-msgstr "Espaciado de patrón de interfaz"
-
-#: src/libslic3r/PrintConfig.cpp:1994
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr ""
-"Espaciado entre líneas de interfaz. Establezca cero para obtener una "
-"interfaz sólida."
-
-#: src/libslic3r/PrintConfig.cpp:2004
-msgid ""
-"Speed for printing support material interface layers. If expressed as "
-"percentage (for example 50%) it will be calculated over support material "
-"speed."
-msgstr ""
-"Velocidad para imprimir capas de interfaz de material de soporte. Si se "
-"expresa como porcentaje (por ejemplo, 50%), se calculará sobre la velocidad "
-"del material de soporte."
-
-#: src/libslic3r/PrintConfig.cpp:2013
-msgid "Pattern"
-msgstr "Patrón"
-
-#: src/libslic3r/PrintConfig.cpp:2015
-msgid "Pattern used to generate support material."
-msgstr "Patrón utilizado para generar material de soporte."
-
-#: src/libslic3r/PrintConfig.cpp:2022
-msgid "Rectilinear grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2028
-msgid "Pattern spacing"
-msgstr "Espaciado entre patrones"
-
-#: src/libslic3r/PrintConfig.cpp:2030
-msgid "Spacing between support material lines."
-msgstr "Espaciado entre las líneas de material de soporte."
-
-#: src/libslic3r/PrintConfig.cpp:2040
-msgid "Speed for printing support material."
-msgstr "Velocidad para imprimir material de soporte."
-
-#: src/libslic3r/PrintConfig.cpp:2047
-msgid "Synchronize with object layers"
-msgstr "Sincronizar con capas las del objeto"
-
-#: src/libslic3r/PrintConfig.cpp:2049
-msgid ""
-"Synchronize support layers with the object print layers. This is useful with "
-"multi-material printers, where the extruder switch is expensive."
-msgstr ""
-"Sincronizar las capas de soporte con las capas de impresión del objeto. Esto "
-"es útil con impresoras de múltiples materiales, donde el cambio de el "
-"extrusor es costoso."
-
-#: src/libslic3r/PrintConfig.cpp:2056
-msgid "Overhang threshold"
-msgstr "Umbral de voladizos"
-
-#: src/libslic3r/PrintConfig.cpp:2058
-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 ""
-"El material de soporte no se generará para voladizos cuyo ángulo de "
-"inclinación (90 ° = vertical) esté por encima del umbral dado. En otras "
-"palabras, este valor representa la pendiente más horizontal (medida desde el "
-"plano horizontal) que puede imprimir sin material de soporte. Ajuste a cero "
-"para la detección automática (recomendado)."
-
-#: src/libslic3r/PrintConfig.cpp:2071
-msgid "With sheath around the support"
-msgstr "Con protección alrededor del soporte"
-
-#: src/libslic3r/PrintConfig.cpp:2073
-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 ""
-"Añadir una funda (una sola línea de perímetro) alrededor de la base del "
-"soporte. Esto hace el soporte más fiable pero también más difícil de retirar."
-
-#: src/libslic3r/PrintConfig.cpp:2081
-msgid ""
-"Extruder temperature for layers after the first one. Set this to zero to "
-"disable temperature control commands in the output."
-msgstr ""
-"Temperatura del extrusor para capas después del primera. Ajuste esto a cero "
-"para desactivar los comandos de control de temperatura en la salida."
-
-#: src/libslic3r/PrintConfig.cpp:2084
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: src/libslic3r/PrintConfig.cpp:2090
-msgid "Detect thin walls"
-msgstr "Detecta paredes delgadas"
-
-#: src/libslic3r/PrintConfig.cpp:2092
-msgid ""
-"Detect single-width walls (parts where two extrusions don't fit and we need "
-"to collapse them into a single trace)."
-msgstr ""
-"Detecta muros de ancho único (partes donde dos extrusiones no se ajustan y "
-"tenemos que colapsarlas en un solo rastro)."
-
-#: src/libslic3r/PrintConfig.cpp:2099
-msgid "Threads"
-msgstr "Núcleos"
-
-#: src/libslic3r/PrintConfig.cpp:2100
-msgid ""
-"Threads are used to parallelize long-running tasks. Optimal threads number "
-"is slightly above the number of available cores/processors."
-msgstr ""
-"Núcleos usados para tareas multi-recurso. Número óptimo de núcleos es "
-"ligeramente sobre el numero de núcleos/procesadores disponibles."
-
-#: src/libslic3r/PrintConfig.cpp:2112
-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 ""
-"Este código personalizado se inserta justo antes de cada cambio de extrusor. "
-"Tenga en cuenta que puede usar variables de marcador de posición para todas "
-"las configuraciones de Slic3r, así como para [previous_extruder] y "
-"[next_extruder]."
-
-#: src/libslic3r/PrintConfig.cpp:2125
-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."
-msgstr ""
-"Ajuste este valor distinto de cero para establecer un ancho de extrusión "
-"manual para el relleno de las superficies superiores. Es posible que desee "
-"utilizar extrusiones más delgadas para llenar todas las regiones estrechas y "
-"obtener un acabado más suave. Si se deja en cero, se usará el ancho de "
-"extrusión por defecto si se establece, de lo contrario se usará el diámetro "
-"de la boquilla. Si se expresa como porcentaje (por ejemplo, 90%), se "
-"calculará sobre la altura de la capa."
-
-#: src/libslic3r/PrintConfig.cpp:2137
-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."
-msgstr ""
-"Velocidad para imprimir capas sólidas superiores (solo se aplica a las capas "
-"externas superiores y no a sus capas sólidas internas). Es posible que desee "
-"reducir la velocidad para obtener un acabado de superficie más agradable. "
-"Esto se puede expresar como un porcentaje (por ejemplo: 80%) sobre la "
-"velocidad de relleno sólido anterior. Establecer a cero para auto."
-
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "Superior"
-
-#: src/libslic3r/PrintConfig.cpp:2151
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "Número de capas sólidas para generar en las superficies superiores."
-
-#: src/libslic3r/PrintConfig.cpp:2153
-msgid "Top solid layers"
-msgstr "Capas solidas superiores"
-
-#: src/libslic3r/PrintConfig.cpp:2159
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr ""
-"Velocidad para movimientos (saltos entre puntos de extrusión distantes)."
-
-#: src/libslic3r/PrintConfig.cpp:2168
-msgid "Use firmware retraction"
-msgstr "Usar la retracción del firmware"
-
-#: src/libslic3r/PrintConfig.cpp:2169
-msgid ""
-"This experimental setting uses G10 and G11 commands to have the firmware "
-"handle the retraction. This is only supported in recent Marlin."
-msgstr ""
-"Esta configuración experimental utiliza comandos G10 y G11 para que el "
-"firmware maneje la retracción. Esto solo se admite en Marlin reciente."
-
-#: src/libslic3r/PrintConfig.cpp:2176
-msgid "Use relative E distances"
-msgstr "Usar las distancias relativas en E"
-
-#: src/libslic3r/PrintConfig.cpp:2177
-msgid ""
-"If your firmware requires relative E values, check this, otherwise leave it "
-"unchecked. Most firmwares use absolute values."
-msgstr ""
-"Si su firmware requiere valores E relativos, verifique esto, de lo "
-"contrario, deje sin marcar. La mayoría de los firmwares usan valores "
-"absolutos."
-
-#: src/libslic3r/PrintConfig.cpp:2184
-msgid "Use volumetric E"
-msgstr "Usar E volumétrico"
-
-#: src/libslic3r/PrintConfig.cpp:2185
-msgid ""
-"This experimental setting uses outputs the E values in cubic millimeters "
-"instead of linear millimeters. If your firmware doesn't already know "
-"filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] "
-"T0' in your start G-code in order to turn volumetric mode on and use the "
-"filament diameter associated to the filament selected in Slic3r. This is "
-"only supported in recent Marlin."
-msgstr ""
-"Este ajuste experimental utiliza como salida del E valores en milímetros "
-"cúbicos en lugar de milímetros lineales. Si su firmware aún no conoce el "
-"(los) diámetro (s) del filamento, puede poner comandos como 'M200 D "
-"[filament_diameter_0] T0' en su código G inicial para activar el modo "
-"volumétrico y usar el diámetro del filamento asociado al filamento "
-"seleccionado. en Slic3r. Esto solo se admite en Marlin reciente."
-
-#: src/libslic3r/PrintConfig.cpp:2196
-msgid "Enable variable layer height feature"
-msgstr "Habilitar la función de altura de capa variable"
-
-#: src/libslic3r/PrintConfig.cpp:2197
-msgid ""
-"Some printers or printer setups may have difficulties printing with a "
-"variable layer height. Enabled by default."
-msgstr ""
-"Algunas impresoras o configuraciones de impresora pueden tener dificultades "
-"para imprimir con una altura de capa variable. Habilitado por defecto."
-
-#: src/libslic3r/PrintConfig.cpp:2204
-msgid "Wipe while retracting"
-msgstr "Limpiar mientras se retrae"
-
-#: src/libslic3r/PrintConfig.cpp:2205
-msgid ""
-"This flag will move the nozzle while retracting to minimize the possible "
-"blob on leaky extruders."
-msgstr ""
-"Esta bandera moverá la boquilla mientras se retrae para minimizar la posible "
-"mancha en los extrusores con fugas."
-
-#: src/libslic3r/PrintConfig.cpp:2213
-msgid ""
-"Multi material printers may need to prime or purge extruders on tool "
-"changes. Extrude the excess material into the wipe tower."
-msgstr ""
-"Las impresoras de varios materiales pueden necesitar cebar o purgar "
-"extrusoras en los cambios de herramientas. Extruya el exceso de material en "
-"la torre de limpieza."
-
-#: src/libslic3r/PrintConfig.cpp:2220
-msgid "Purging volumes - load/unload volumes"
-msgstr "Volumen de purga - volumen de carga/descarga"
-
-#: src/libslic3r/PrintConfig.cpp:2221
-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 ""
-"Este vector guarda los volúmenes necesarios para cambiar  desde/hasta cada "
-"herramienta usada en la torre de limpieza. Estos valores se emplean para "
-"simplificar la creación de los volúmenes totales de purga más abajo. "
-
-#: src/libslic3r/PrintConfig.cpp:2228
-msgid "Purging volumes - matrix"
-msgstr "Volúmenes de purga - matriz"
-
-#: src/libslic3r/PrintConfig.cpp:2229
-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 ""
-"Esta matriz detalla los volúmenes (en milímetros cúbicos) necesarios para "
-"purgar el nuevo filamento en la torre de limpieza para cualquier par de "
-"filamentos. "
-
-#: src/libslic3r/PrintConfig.cpp:2239
-msgid "Position X"
-msgstr "Posición X"
-
-#: src/libslic3r/PrintConfig.cpp:2240
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr "Coordenada X de la esquina frontal izquierda de la torre de limpieza"
-
-#: src/libslic3r/PrintConfig.cpp:2247
-msgid "Position Y"
-msgstr "Posición Y"
-
-#: src/libslic3r/PrintConfig.cpp:2248
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr "Coordenada Y de la esquina delantera izquierda de la torre de limpieza"
-
-#: src/libslic3r/PrintConfig.cpp:2256
-msgid "Width of a wipe tower"
-msgstr "Ancho de la torre de limpieza"
-
-#: src/libslic3r/PrintConfig.cpp:2263
-msgid "Wipe tower rotation angle"
-msgstr "�ngulo de rotación de la torre de limpieza"
-
-#: src/libslic3r/PrintConfig.cpp:2264
-msgid "Wipe tower rotation angle with respect to x-axis "
-msgstr "�ngulo de rotación de la torre de limpieza con respecto al eje X "
-
-#: src/libslic3r/PrintConfig.cpp:2265
-msgid "degrees"
-msgstr "grados"
-
-#: src/libslic3r/PrintConfig.cpp:2272
-msgid "Wipe into this object's infill"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2273
-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:2281
-msgid "Wipe into this object"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2282
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2289
-msgid "Maximal bridging distance"
-msgstr "Distancia máxima de puentes"
-
-#: src/libslic3r/PrintConfig.cpp:2290
-msgid "Maximal distance between supports on sparse infill sections. "
-msgstr "Distancia máxima entre soportes en las secciones con relleno ligero. "
-
-#: src/libslic3r/PrintConfig.cpp:2297
-msgid "XY Size Compensation"
-msgstr "Compensación de tamaño XY"
-
-#: src/libslic3r/PrintConfig.cpp:2299
-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 ""
-"El objeto se crecerá / reducirá en el plano XY por el valor configurado "
-"(negativo = hacia adentro, positivo = hacia afuera). Esto podría ser útil "
-"para ajustar el tamaño de los orificios."
-
-#: src/libslic3r/PrintConfig.cpp:2308
-msgid "Z offset"
-msgstr "Ajuste en altura Z"
-
-#: src/libslic3r/PrintConfig.cpp:2309
-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)."
-msgstr ""
-"Este valor será añadido (o eliminado) de todas las coordenadas Z en el G-"
-"code de salida. Se usa para compensar una mala posición del final de carrera "
-"Z: por ejemplo, si tu interruptor deja la boquilla a 0.3mm de la base de "
-"impresión, ajustalo a -0.3 (o arregla tu interruptor)."
-
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
-msgid "Display width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2374
-msgid "Width of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2380
-msgid "Display height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2381
-msgid "Height of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2387
-msgid "Number of pixels in"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2389
-msgid "Number of pixels in X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2396
-msgid "Number of pixels in Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2402
-msgid "Display orientation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2403
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2410
-msgid "Landscape"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2411
-msgid "Portrait"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
-msgid "Printer scaling correction"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
-msgid "Initial layer height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
-msgid "Initial exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
-msgid "SLA print material notes"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2459
-msgid "You can put your notes regarding the SLA print material here."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
-msgid "Default SLA material profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2487
-msgid "Generate supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2489
-msgid "Generate supports for the models"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2494
-msgid "Support head front diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2496
-msgid "Diameter of the pointing side of the head"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2503
-msgid "Support head penetration"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2505
-msgid "How much the pinhead has to penetrate the model surface"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2512
-msgid "Support head width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2514
-msgid "Width from the back sphere center to the front sphere center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2521
-msgid "Support pillar diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2523
-msgid "Diameter in mm of the support pillars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2530
-msgid "Support pillar connection mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2531
-msgid ""
-"Controls the bridge type between two neigboring 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:2540
-msgid "Zig-Zag"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2541
-msgid "Cross"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2542
-msgid "Dynamic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2546
-msgid "Pillar widening factor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2548
-msgid ""
-"Merging bridges or pillars into another pillars can increase the radius. "
-"Zero means no increase, one means full increase."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2557
-msgid "Support base diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2559
-msgid "Diameter in mm of the pillar base"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2566
-msgid "Support base height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2568
-msgid "The height of the pillar base cone"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2575
-msgid "Critical angle"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2577
-msgid "The default angle for connecting support sticks and junctions."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2584
-msgid "Max bridge length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2586
-msgid "The max length of a bridge"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2593
-msgid "Object elevation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2595
-msgid "How much the supports should lift up the supported object."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
-msgid "Use pad"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2631
-msgid "Add a pad underneath the supported model"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2636
-msgid "Pad wall thickness"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2645
-msgid "Pad wall height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2654
-msgid "Max merge distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2663
-msgid "Pad edge radius"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3023
-msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:176
-msgid "Mixed"
-msgstr "Mezclado"
-
-#: src/libslic3r/GCode/PreviewData.cpp:396
-msgid "Height (mm)"
-msgstr "Altura (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:398
-msgid "Width (mm)"
-msgstr "Ancho (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:400
-msgid "Speed (mm/s)"
-msgstr "Velocidad (mm/s)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:402
-msgid "Volumetric flow rate (mm3/s)"
-msgstr "Tasa de flujo volumétrico (mm3/seg)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:491
-msgid "Default print color"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:495
-#, c-format
-msgid "up to %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:499
-#, c-format
-msgid "above %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:504
-#, c-format
-msgid "%.2f - %.2f mm"
-msgstr ""
diff --git a/resources/localization/fr_FR/Slic3rPE.mo b/resources/localization/fr_FR/Slic3rPE.mo
deleted file mode 100644
index 128106a4c..000000000
Binary files a/resources/localization/fr_FR/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/fr_FR/Slic3rPE_fr.po b/resources/localization/fr_FR/Slic3rPE_fr.po
deleted file mode 100644
index 36a89e94d..000000000
--- a/resources/localization/fr_FR/Slic3rPE_fr.po
+++ /dev/null
@@ -1,4831 +0,0 @@
-msgid ""
-msgstr ""
-"Language: fr_FR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.0.8\n"
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language-Team: \n"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1488
-msgid ""
-"\n"
-"\n"
-"and it has the following unsaved changes:"
-msgstr ""
-"\n"
-"\n"
-"et il y a les changements non sauvegardés suivants :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1491
-msgid ""
-"\n"
-"\n"
-"Discard changes and continue anyway?"
-msgstr ""
-"\n"
-"\n"
-"Annuler les changements et continuer malgré tout ?"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1489
-msgid ""
-"\n"
-"\n"
-"has the following unsaved changes:"
-msgstr ""
-"\n"
-"\n"
-"a les changements suivants non-enregistrés :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1488
-msgid ""
-"\n"
-"\n"
-"is not compatible with printer\n"
-msgstr ""
-"\n"
-"\n"
-"n'est pas compatible avec l'imprimante\n"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:34
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-"\n"
-"Pendant les autres couches, le ventilateur "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:30
-#, c-format
-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"
-"Si le temps estimé pour la couche est supérieur, mais cependant inférieur à ~%ds, le ventilateur tournera à une vitesse proportionnellement décroissante entre %d%% et %d%%."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:927
-msgid ""
-"\n"
-"Non-positive value."
-msgstr ""
-"\n"
-"Valeur non-positive."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:928
-msgid ""
-"\n"
-"Not a numeric value."
-msgstr ""
-"\n"
-"Valeur non-numérique."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
-msgid " - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
-msgstr " - Pensez à vérifier les mises à jours sur http://github.com/supermerill/slic3r/releases"
-
-# Used in this context: _("Save ") + title + _(" as:")
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
-msgid " as:"
-msgstr " sous :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:226
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr " à une vitesse de filament de %3.2f mm/s."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1035
-msgid " Browse "
-msgstr " Parcourir "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:215
-msgid " flow rate is maximized "
-msgstr " le débit est maximisé "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:662
-#, no-c-format
-msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
-"\n"
-"Shall I switch to rectilinear fill pattern?"
-msgstr ""
-" le motif de remplissage n'est pas supposé fonctionner à une densité de 100%.\n"
-"\n"
-"Dois-je passer au motif de remplissage rectiligne ?"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1470
-msgid " preset\n"
-msgstr " préréglage\n"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1469
-msgid " preset"
-msgstr " préréglage"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1583
-msgid " Preset"
-msgstr " Préréglage"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:942
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1637
-msgid " Set "
-msgstr " Appliquer "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1581
-msgid " the selected preset?"
-msgstr " le préréglage sélectionné ?"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:548
-msgid " was successfully sliced."
-msgstr " a été découpé avec succès."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:220
-msgid " with a volumetric rate "
-msgstr " avec un débit volumétrique "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:99
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:504
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:789
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:850
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1060
-msgid "%"
-msgstr "%"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:224
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr "%3.2f mm³/s"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1958
-#, perl-format
-msgid "%d (%d shells)"
-msgstr "%d (%d coques)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1965
-#, perl-format
-msgid "%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d facets reversed, %d backwards edges"
-msgstr "%d faces invalides, %d arrêtes corrigées, %d faces retirées, %d faces ajoutées, %d faces inversées, %d arrêtes à l'envers"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:269
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr "%d lignes : %.2lf mm"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:687
-#, perl-format
-msgid "%d presets successfully imported."
-msgstr "%d préréglages importés avec succès."
-
-#: xs/src/slic3r/GUI/Field.cpp:102
-#, c-format
-msgid "%s doesn't support percentage"
-msgstr "%s ne supporte pas un pourcentage"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:408
-msgid "&About Slic3r"
-msgstr "&A propos de Slic3r"
-
-#: xs/src/slic3r/GUI/GUI.cpp:466
-msgid "&Configuration"
-msgstr "&Configuration"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:263
-msgid "&Export Config Bundle…"
-msgstr "&Exporter le Lot de Configurations…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:257
-msgid "&Export Config…\tCtrl+E"
-msgstr "&Exporter la configuration…\tCtrl+E"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:418
-msgid "&File"
-msgstr "&Fichier"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:791
-msgid "&Finish"
-msgstr "&Fin"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:426
-msgid "&Help"
-msgstr "&Aide"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:260
-msgid "&Load Config Bundle…"
-msgstr "&Charger le Lot de Configurations…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:254
-msgid "&Load Config…\tCtrl+L"
-msgstr "&Charger la configuration…\tCtrl+L"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:420
-msgid "&Object"
-msgstr "&Objet"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:419
-msgid "&Plater"
-msgstr "&Plateau"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:304
-msgid "&Quit"
-msgstr "&Quitter"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:280
-msgid "&Repeat Last Quick Slice\tCtrl+Shift+U"
-msgstr "&Répéter la dernière découpe rapide\tCtrl+Shift+U"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:422
-msgid "&View"
-msgstr "&Vue"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:421
-msgid "&Window"
-msgstr "&Fenêtre"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:291
-msgid "(&Re)Slice Now\tCtrl+S"
-msgstr "(&Re)Découper maintenant\tCtrl+S"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:994
-msgid "(minimum)"
-msgstr "(minimum)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:474
-msgid ") not found."
-msgstr ") non trouvé."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:749
-msgid ". Discard changes and continue anyway?"
-msgstr ". Annuler les changements et continuer malgré tout ?"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:63
-msgid "1 Layer"
-msgstr "1 Couche"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:138
-msgid "2D"
-msgstr "2D"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:104
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2124
-msgid "3D"
-msgstr "3D"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1608
-msgid "3MF file exported to "
-msgstr "Fichier 3MF exporté vers "
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:185
-msgid "45° ccw"
-msgstr "45° ccw"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:186
-msgid "45° cw"
-msgstr "45° cw"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:148
-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."
-msgstr "Une expression booléenne utilisant les valeurs de configuration d'un profil d'imprimante actif. Si cette expression est évaluée comme vraie, ce profil est considéré comme compatible avec le profil d'imprimante actif."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:480
-msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
-msgstr "La règle générale est 160 à 230 °C pour le PLA et 215 à 250 °C pour l'ABS."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:494
-msgid "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have no heated bed."
-msgstr "La règle générale est 60 °C pour le PLA et 110 °C pour l'ABS. Laissez à zéro si vous n'avez pas de lit chauffant."
-
-#: xs/src/slic3r/GUI/AboutDialog.cpp:32
-msgid "About Slic3r"
-msgstr "A propos de Slic3r"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1099
-msgid "Above Z"
-msgstr "Au-delà de Z"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:417
-msgid "Acceleration control (advanced)"
-msgstr "Contrôle de l'accélération (avancé)"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:70
-msgid "Activate"
-msgstr "Activer"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:36
-msgid "Active: "
-msgstr "Actif : "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1566
-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 "Ajouter une enveloppe (une ligne unique de périmètre) autour de la base du support. Ceci rend le support plus fiable, mais aussi plus difficile à retirer."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:299
-#, no-c-format
-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 "Ajouter plus de périmètres si nécessaire pour éviter des trous dans les parois inclinées. Slic3r ajoute des périmètres, jusqu'à ce que plus de 70% de la boucle immédiatement au-dessus soit supportée."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:240
-msgid "Add solid infill near sloping surfaces to guarantee the vertical shell thickness (top+bottom solid layers)."
-msgstr "Ajouter un remplissage plein à proximité des surfaces inclinées pour garantir une épaisseur de coque verticale (couches pleines supérieures+inférieures)."
-
-#: xs/src/slic3r/GUI/Tab.cpp:754
-msgid "Additional information:"
-msgstr "Informations complémentaires :"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:288
-msgid "Additionally a backup snapshot of the whole configuration is created before an update is applied."
-msgstr "De plus, un instantané de sauvegarde de l'ensemble de la configuration est créé avant qu'une mise à jour ne soit appliquée."
-
-#: xs/src/slic3r/GUI/BonjourDialog.cpp:66
-msgid "Address"
-msgstr "Adresse"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:177
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:195
-msgid "Add…"
-msgstr "Ajouter…"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:342
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:356
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:449
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:452
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:831
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1113
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:107
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:208
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:736
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1733
-msgid "Advanced"
-msgstr "Avancé"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:319
-msgid "Advanced: avrdude output log"
-msgstr "Avancé : journal de sortie avrdude"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1138
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:766
-msgid "After layer change G-code"
-msgstr "G-Code après changement de couche"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1636
-msgid "All"
-msgstr "Tous"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2057
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2073
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2089
-msgid "Along X axis…"
-msgstr "Le long de l'axe X…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2060
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2076
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2092
-msgid "Along Y axis…"
-msgstr "Le long de l'axe Y…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2063
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2079
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2095
-msgid "Along Z axis…"
-msgstr "Le long de l'axe Z…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1592
-msgid "AMF file exported to "
-msgstr "Fichier AMF exporté vers "
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1300
-msgid "Another export job is currently running."
-msgstr "Une autre tâche d'export est actuellement en cours."
-
-#: xs/src/slic3r/GUI/Tab.cpp:749
-msgid "Any modifications should be saved as a new preset inherited from this one. "
-msgstr "Toute modification doit être enregistrée comme un nouveau préréglage hérité de celui-ci. "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:901
-msgid "API Key"
-msgstr "Clé API"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:299
-msgid "Application preferences"
-msgstr "Préférences de l'application"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:332
-msgid "Application will be restarted"
-msgstr "L'application va être redémarrée"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:397
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1242
-msgid "approximate seconds"
-msgstr "secondes approximatives"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1581
-msgid "Are you sure you want to "
-msgstr "Êtes-vous sûr de vouloir "
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:365
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-"Êtes-vous certain de vouloir annuler le processus de flash du firmware ?\n"
-"Cela pourrait rendre votre imprimante inutilisable !"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2044
-msgid "Around X axis…"
-msgstr "Autour de l'axe X…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2047
-msgid "Around Y axis…"
-msgstr "Autour de l'axe Y…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2050
-msgid "Around Z axis…"
-msgstr "Autour de l'axe Z…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:180
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:198
-msgid "Arrange"
-msgstr "Agencer"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:224
-msgid "Array of language names and identifiers should have the same size."
-msgstr "Les tableaux de noms et d'identifiants de langue doivent avoir la même taille."
-
-#: xs/src/slic3r/GUI/GUI.cpp:688
-msgid "Attempt to free unreferenced scalar"
-msgstr "Tentative de libération d'un scalaire non référencé"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:332
-msgid "Attention!"
-msgstr "Attention !"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:35
-msgid "Auto-center parts"
-msgstr "Centrer automatiquement les pièces"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1960
-#, perl-format
-msgid "Auto-repaired (%d errors)"
-msgstr "Réparé automatiquement (%d erreurs)"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:264
-msgid "Automatic updates"
-msgstr "Mises à jour automatiques"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:294
-msgid "Automatically repair an STL file"
-msgstr "Réparer automatiquement un fichier STL"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:424
-msgid "Autospeed (advanced)"
-msgstr "Vitesse automatique (avancé)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:26
-msgid "Avoid crossing perimeters"
-msgstr "Éviter de traverser les périmètres"
-
-#: xs/src/slic3r/GUI/Tab.cpp:2491
-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é."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2505
-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"
-"Cliquez pour restaurer la valeur à celle du dernier préréglage enregistré."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2455
-msgid ""
-"BACK ARROW;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 ""
-"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 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é."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:43
-msgid "Background processing"
-msgstr "Tâche en arrière plan"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:800
-msgid "Bed"
-msgstr "Plateau"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:940
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:34
-msgid "Bed shape"
-msgstr "Forme du plateau"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.hpp:42
-msgid "Bed Shape"
-msgstr "Forme du plateau"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:395
-msgid "Bed Shape and Size"
-msgstr "Forme du Plateau et Taille"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:42
-msgid "Bed temperature"
-msgstr "Température du plateau"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:39
-msgid "Bed temperature for layers after the first one. Set this to zero to disable bed temperature control commands in the output."
-msgstr "Température du plateau pour les couches après la première. Mettez ceci à zéro pour désactiver les commandes de contrôle de température du plateau dans la sortie."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:497
-msgid "Bed Temperature:"
-msgstr "Température du Plateau :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1132
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:48
-msgid "Before layer change G-code"
-msgstr "G-Code avant changement de couche"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:19
-msgid "Before roll back"
-msgstr "Avant le retour en arrière"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1108
-msgid "Below Z"
-msgstr "En-deçà de Z"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:59
-msgid "Between objects G-code"
-msgstr "Entre le G-code des objets"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1150
-msgid "Between objects G-code (for sequential printing)"
-msgstr "Entre le G-code des objets (pour une impression séquentielle)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:68
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:370
-msgid "Bottom"
-msgstr "Dessous"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:72
-msgid "Bottom solid layers"
-msgstr "Couches pleines inférieures"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:370
-msgid "Bottom View"
-msgstr "Vue du Dessous"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:77
-msgid "Bridge"
-msgstr "Ponts"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:144
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:86
-msgid "Bridge infill"
-msgstr "Remplissage du pont"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:117
-msgid "Bridges"
-msgstr "Ponts"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:97
-msgid "Bridges fan speed"
-msgstr "Vitesse du ventilateur pour les ponts"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:86
-msgid "Bridging"
-msgstr "Pont"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:88
-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 "Ecraser l'angle des ponts. Si laissé à zéro, l'angle des ponts sera calculé automatiquement. Sinon, l'angle fourni sera utilisé pour tous les ponts. Utilisez 180° pour un angle nul."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
-msgid "Bridging volumetric"
-msgstr "Volumétrie des ponts"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:371
-msgid "Brim"
-msgstr "Jupe"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:127
-msgid "Brim width"
-msgstr "Largeur de la jupe"
-
-#: xs/src/slic3r/GUI/ButtonsDescription.cpp:13
-msgid "Buttons And Text Colors Description"
-msgstr "Description des Boutons et des Couleurs de Texte"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:218
-msgid "by the print profile maximum"
-msgstr "par le maximum du profil de l'imprimante"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:85
-msgid "Cancel"
-msgstr "Annuler"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:213
-msgid "Cancelling..."
-msgstr "Annulation..."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2124
-msgid "Cannot overwrite a system profile."
-msgstr "Impossible d'écraser un profil système."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2128
-msgid "Cannot overwrite an external profile."
-msgstr "Impossible d'écraser un profil externe."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:962
-msgid "Capabilities"
-msgstr "Fonctionnalités"
-
-#: xs/src/slic3r/GUI/GUI.cpp:403
-msgid "Capture a configuration snapshot"
-msgstr "Capturer un instantané de la configuration"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1597
-msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-msgstr "Fichiers de certificat (*.crt, *.pem)|*.crt;*.pem|Tous les fichiers|*.*"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:325
-msgid "Change Application Language"
-msgstr "Changer la langue de l'application"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2030
-msgid "Change the number of copies of the selected object"
-msgstr "Changer le nombre de copies de l'objet sélectionné"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:272 xs/src/slic3r/GUI/Preferences.cpp:59
-msgid "Check for application updates"
-msgstr "Vérifier les mises à jour de l'application"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Choisir un fichier à partir duquel importer la forme du plateau (STL/OBJ/AMF/3MF/PRUSA) :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:457
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Choisir un fichier à découper (STL/OBJ/AMF/3MF/PRUSA) :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI.pm:286
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Choisir un ou plusieurs fichiers (STL/OBJ/AMF/3MF/PRUSA) :"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:360
-msgid "Choose the type of firmware used by your printer."
-msgstr "Choisissez le type de firmware utilisé par votre imprimante."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:62
-msgid "Circular"
-msgstr "Circulaire"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:135
-msgid "Clip multi-part objects"
-msgstr "Dissocier les objets multi-pièces"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:405
-msgid "Color"
-msgstr "Couleur"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:690
-msgid "Combine infill every"
-msgstr "Combiner le remplissage toutes les"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:696
-msgid "Combine infill every n layers"
-msgstr "Combiner le remplissage toutes les n couches"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:509
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:869
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1668
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:143
-msgid "Compatible printers"
-msgstr "Imprimantes compatibles"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:147
-msgid "Compatible printers condition"
-msgstr "Condition de compatibilité des imprimantes"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:154
-msgid "Complete individual objects"
-msgstr "Compléter les objets individuels"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:846
-msgid "Configuration Assistant"
-msgstr "Assistant de Configuration"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:884
-msgid "Configuration notes"
-msgstr "Notes de configuration"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:96 xs/src/slic3r/GUI/GUI.cpp:402
-msgid "Configuration Snapshots"
-msgstr "Instantanés de Configuration"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:69
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:161
-msgid "Configuration update"
-msgstr "Mise à jour de la configuration"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:69
-msgid "Configuration update is available"
-msgstr "Une mise à jour de la configuration est disponible"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:844
-msgid "Configuration Wizard"
-msgstr "Assistant de Configuration"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:366
-msgid "Confirmation"
-msgstr "Confirmation"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1020
-msgid "Connection failed."
-msgstr "La connexion a échoué."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:211
-msgid "Connection to OctoPrint works correctly."
-msgstr "La connexion avec OctoPrint fonctionne correctement."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1017
-msgid "Connection to printer works correctly."
-msgstr "La connexion avec l'imprimante fonctionne correctement."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1416
-msgid "Contact Z distance"
-msgstr "Distance de contact Z"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:120
-msgid "Controller"
-msgstr "Contrôleur"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:805
-msgid "Cooling"
-msgstr "Refroidissement"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:826
-msgid "Cooling thresholds"
-msgstr "Seuils de refroidissement"
-
-#: xs/src/libslic3r/PrintConfig.cpp:178
-msgid "Cooling tube length"
-msgstr "Longueur du tube de refroidissement"
-
-#: xs/src/libslic3r/PrintConfig.cpp:170
-msgid "Cooling tube position"
-msgstr "Position du tube de refroidissement"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:221
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:900
-msgid "Copies"
-msgstr "Copies"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:476
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:450
-msgid "Cost"
-msgstr "Coût"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1571
-msgid "Could not connect to OctoPrint"
-msgstr "Impossible de se connecter à OctoPrint"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1465
-msgid "Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr "Recouvrir la couche de contact supérieure des supports avec des boucles. Désactivé par défaut."
-
-#: xs/src/slic3r/GUI/Tab.cpp:743
-msgid "Current preset is inherited from "
-msgstr "Le préréglage en cours a hérité de "
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:41
-msgid "Current version:"
-msgstr "Version actuelle :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:71
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:150
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:92
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:846
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1119
-msgid "Custom G-code"
-msgstr "G-code personnalisé"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:240
-msgid "Custom setup"
-msgstr "Configuration personnalisée"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:189
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:205
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
-msgid "Cut…"
-msgstr "Couper…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2027
-msgid "Decrease copies"
-msgstr "Réduire les copies"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:300
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:170
-msgid "Default"
-msgstr "Défaut"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Field.cpp:42
-msgid "default"
-msgstr "défaut"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1469
-msgid "Default "
-msgstr "Défaut "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:489
-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."
-msgstr "Angle de base par défaut pour l'orientation du remplissage. Des croisements seront appliqués à cette valeur. Les ponts seront remplis avec la meilleure direction que Slic3r peut détecter, ce réglage ne les affecteront donc pas."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:376
-msgid "Default extrusion width"
-msgstr "Largeur d'extrusion par défaut"
-
-#: xs/src/slic3r/GUI/Tab.cpp:767
-msgid "default filament profile"
-msgstr "profil du filament par défaut"
-
-#: xs/src/libslic3r/PrintConfig.cpp:196
-msgid "Default filament profile"
-msgstr "Profil de filament par défaut"
-
-#: xs/src/libslic3r/PrintConfig.cpp:197
-msgid "Default filament profile associated with the current printer profile. On selection of the current printer profile, this filament profile will be activated."
-msgstr "Profil de filament par défaut associé au profil d'imprimante courant. En sélectionnant le profil d'imprimante courant, ce profil de filament sera activé."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2287 xs/src/slic3r/GUI/Tab.cpp:2373
-msgid "Default presets"
-msgstr "Préréglages par défaut"
-
-#: xs/src/libslic3r/PrintConfig.cpp:202
-msgid "Default print profile"
-msgstr "Profil de filament par défaut"
-
-#: xs/src/slic3r/GUI/Tab.cpp:764
-msgid "default print profile"
-msgstr "profil d'impression par défaut"
-
-#: xs/src/libslic3r/PrintConfig.cpp:203
-msgid "Default print profile associated with the current printer profile. On selection of the current printer profile, this print profile will be activated."
-msgstr "Profil de filament par défaut associé au profil d'imprimante courant. En sélectionnant le profil d'imprimante courant, ce profil de filament sera activé."
-
-#: xs/src/libslic3r/PrintConfig.cpp:1849
-msgid "degrees"
-msgstr "degrés"
-
-#: xs/src/libslic3r/PrintConfig.cpp:476
-msgid "Delay after unloading"
-msgstr "Délai après le déchargement"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1582
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:178
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:196
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2021
-msgid "Delete"
-msgstr "Supprimer"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1580
-msgid "delete"
-msgstr "supprimer"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:179
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:197
-msgid "Delete All"
-msgstr "Tout Supprimer"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:51
-msgid "Delete this preset"
-msgstr "Supprimer ce préréglage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:440
-msgid "Density"
-msgstr "Densité"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:503
-#, no-c-format
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "Densité du remplissage interne, exprimée en pourcentage de 0% à 100%."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:507
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:867
-msgid "Dependencies"
-msgstr "Dépendances"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1142
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1143
-msgid "Deretraction Speed"
-msgstr "Vitesse de Réinsertion"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:940
-msgid "Detect bridging perimeters"
-msgstr "Détecter les périmètres faisant des ponts"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1584
-msgid "Detect single-width walls (parts where two extrusions don't fit and we need to collapse them into a single trace)."
-msgstr "Détecter les parois de largeur unique (où deux extrusions côte à côte ne rentrent pas et doivent êtres fusionnées en un seul trait)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1582
-msgid "Detect thin walls"
-msgstr "Détecter les parois fines"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:66
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:431
-msgid "Diameter"
-msgstr "Diamètre"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:67
-msgid "Diameter of the print bed. It is assumed that origin (0,0) is located in the center."
-msgstr "Diamètre du plateau d'impression. Il est supposé que l'origine (0,0) est située au centre."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1169
-msgid "Direction"
-msgstr "Direction"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:53
-msgid "Disable communication with the printer over a serial / USB cable. This simplifies the user interface in case the printer is never attached to the computer."
-msgstr "Désactiver la communication avec l'imprimante via un câble série / USB. Ceci simplifie l'interface utilisateur dans le cas où l'imprimante n'est jamais connectée à l'ordinateur."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:180
-msgid "Disable fan for the first"
-msgstr "Désactiver le ventilateur pour le(s) première(s)"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:51
-msgid "Disable USB/serial connection"
-msgstr "Désactiver la connexion USB/série"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:916
-msgid "Disables retraction when the travel path does not exceed the upper layer's perimeters (and thus any ooze will be probably invisible)."
-msgstr "Désactiver la rétraction lorsque le chemin de déplacement ne franchit pas les périmètres des couches supérieures (et donc les coulures seront probablement invisibles)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:198
-msgid "Distance between copies"
-msgstr "Distance entre les copies"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1213
-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 "Distance entre le ou les objet(s) et la clôture. Mettez zéro pour attacher la clôture a(ux) objet(s) et obtenir une jupe, mais dans ce cas préférez l'utilisation du paramètre de la taille de jupe."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1212
-msgid "Distance from object"
-msgstr "Distance de l'objet"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:58
-msgid "Distance of the 0,0 G-code coordinate from the front left corner of the rectangle."
-msgstr "Distance des coordonnées 0,0 du G-code depuis le coin avant gauche du rectangle."
-
-#: xs/src/libslic3r/PrintConfig.cpp:171
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
-msgstr "Distance entre le point central du tube de refroidissement et la pointe de l'extrudeur. "
-
-#: xs/src/libslic3r/PrintConfig.cpp:1032
-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 "Distance entre la pointe de l'extrudeur et la position où le filament est positionné en attente lorsqu'il est déchargé. Cela doit correspondre à la valeur dans le firmware de l'imprimante. "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:199
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "Distance utilisée par la fonction d'agencement automatique du plateau."
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:51
-msgid "Don't notify about new releases any more"
-msgstr "Ne plus me notifier au sujet des nouvelles publications"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:190
-msgid "Don't support bridges"
-msgstr "Ne pas supporter les ponts"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:17
-msgid "Downgrade"
-msgstr "Rétrograder"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\2D.pm:132
-msgid "Drag your objects here"
-msgstr "Glissez vos objets ici"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:207
-msgid "Elephant foot compensation"
-msgstr "Compensation de l'effet patte d'éléphant"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:806
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:922
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1695
-msgid "Enable"
-msgstr "Activer"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:163
-msgid "Enable auto cooling"
-msgstr "Activer le refroidissement automatique"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:394
-msgid "Enable fan if layer print time is below"
-msgstr "Activer le ventilateur si le temps d'impression de la couche est inférieur à"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1381
-msgid "Enable support material generation."
-msgstr "Activer la génération des supports."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:645
-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 "Activez ceci pour obtenir un fichier G-code commenté, avec chaque ligne expliquée par un texte descriptif. Si vous imprimez depuis une carte SD, le poids supplémentaire du fichier pourrait ralentir le firmware de votre imprimante."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1681
-msgid "Enable variable layer height feature"
-msgstr "Activer la fonction de hauteur de couche variable"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:853
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1126
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:217
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:227
-msgid "End G-code"
-msgstr "G-code de fin"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1431
-msgid "Enforce support for the first"
-msgstr "Renforcer le support sur le(s) première(s)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1439
-msgid "Enforce support for the first n layers"
-msgstr "Renforcer le support pour les n premières couches"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:238
-msgid "Ensure vertical shell thickness"
-msgstr "S'assurer de l'épaisseur de la coque verticale"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:493
-msgid "Enter the bed temperature needed for getting your filament to stick to your heated bed."
-msgstr "Entrez la température du lit nécessaire pour que votre filament colle à votre lit chauffant."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:441
-msgid "Enter the diameter of your filament."
-msgstr "Entrez le diamètre de votre filament."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:428
-msgid "Enter the diameter of your printer's hot end nozzle."
-msgstr "Entrez le diamètre de la buse de la tête d'impression de votre imprimante."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1056
-msgid "Enter the new max size for the selected object:"
-msgstr "Entrez la nouvelle taille maximale pour l'objet sélectionné :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1030
-#, perl-format
-msgid "Enter the new size for the selected object (print bed: %smm):"
-msgstr "Entrez la nouvelle taille pour l'objet sélectionné (plateau d'impression : %s mm) :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:900
-msgid "Enter the number of copies of the selected object:"
-msgstr "Entrez le nombre de copies de l'objet sélectionné :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1061
-#, no-perl-format
-msgid "Enter the scale % for the selected object:"
-msgstr "Entrez l'échelle en % pour l'objet sélectionné :"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:479
-msgid "Enter the temperature needed for extruding your filament."
-msgstr "Entrez la température nécessaire pour extruder votre filament."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:477
-msgid "Enter your filament cost per kg here. This is only for statistical information."
-msgstr "Entrez le coût par Kg de votre filament. Ceci est uniquement pour l'information statistique."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:441
-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."
-msgstr "Entrez ici la densité de votre filament. Ceci est uniquement pour des informations statistiques. Un bon moyen d'obtenir cette valeur est de peser un morceau de filament d'une longueur connue et de calculer le rapport de sa longueur par son poids. Le mieux est de calculer le volume directement par déplacement."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:432
-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."
-msgstr "Entrez le diamètre de votre filament ici. Une bonne précision est requise, utilisez un pied à coulisse et calculez la moyenne de plusieurs mesures le long du filament."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:488
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:470
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1300
-msgid "Error"
-msgstr "Erreur"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1612
-msgid "Error exporting 3MF file "
-msgstr "Erreur d'export du fichier 3MF "
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1596
-msgid "Error exporting AMF file "
-msgstr "Erreur d'export du fichier AMF "
-
-#: xs/src/slic3r/Utils/OctoPrint.cpp:47
-msgid "Error while uploading to the OctoPrint server"
-msgstr "Erreur lors du téléchargement vers le serveur OctoPrint"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:315
-msgid "Error! "
-msgstr "Erreur ! "
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:451
-msgid "Estimated printing time"
-msgstr "Temps d'impression estimé"
-
-#: xs/src/slic3r/GUI/GUI.cpp:885
-msgid "Everywhere"
-msgstr "Partout"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:44
-#, c-format
-msgid "except for the first %d layers"
-msgstr "sauf pour les %d première couches"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:48
-msgid "except for the first layer"
-msgstr "sauf pour la première couche"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:141
-msgid "Exit Slic3r"
-msgstr "Quitter Slic3r"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:192
-msgid "Experimental option for preventing support material from being generated under bridged areas."
-msgstr "Option expérimentale pour empêcher la génération de support sous les ponts."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:942
-msgid "Experimental option to adjust flow for overhangs (bridge flow will be used), to apply bridge speed to them and enable fan."
-msgstr "Option expérimentale qui ajuste le flux pour les surplombs (le flux pour les ponts sera utilisé), leur applique la vitesse pour les ponts et active le ventilateur."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:263
-msgid "Export all presets to file"
-msgstr "Exporter tous les préréglage vers un fichier"
-
-#: lib/Slic3r/GUI/Plater.pm:1416
-msgid "Export cancelled"
-msgstr "Exportation annulée"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:257
-msgid "Export current configuration to file"
-msgstr "Exporter la configuration actuelle vers un fichier"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:323
-msgid "Export current plate as 3MF"
-msgstr "Exporter le plateau courant en 3MF"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:320
-msgid "Export current plate as AMF"
-msgstr "Exporter le plateau courant en AMF"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:314
-msgid "Export current plate as G-code"
-msgstr "Exporter le plateau courant en G-code"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:317
-msgid "Export current plate as STL"
-msgstr "Exporter le plateau courant en STL"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1454
-msgid "Export failed"
-msgstr "L'export a échoué"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:314
-msgid "Export G-code..."
-msgstr "Exporter le G-code..."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:236
-msgid "Export G-code…"
-msgstr "Exporter le G-code…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2113
-msgid "Export object as STL…"
-msgstr "Exporter l'objet en STL…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:323
-msgid "Export plate as 3MF..."
-msgstr "Exporter le plateau en 3MF..."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:320
-msgid "Export plate as AMF..."
-msgstr "Exporter le plateau en AMF..."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:317
-msgid "Export plate as STL..."
-msgstr "Exporter le plateau en STL..."
-
-#: xs/src/slic3r/GUI/GUI.cpp:950
-msgid "Export print config"
-msgstr "Exporter la configuration d'impression"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:240
-msgid "Export STL…"
-msgstr "Exporter le STL…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2113
-msgid "Export this single object as STL file"
-msgstr "Exporter cet unique objet en fichier STL"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:139
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:81
-msgid "External perimeter"
-msgstr "Périmètre externe"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:267
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:277
-msgid "External perimeters"
-msgstr "Périmètres externes"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:151
-msgid "external perimeters"
-msgstr "périmètres externes"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:289
-msgid "External perimeters first"
-msgstr "Périmètres externes en premier"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1118
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1126
-msgid "Extra length on restart"
-msgstr "Longueur supplémentaire à la reprise"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:297
-msgid "Extra perimeters if needed"
-msgstr "Périmètres supplémentaires si nécessaire"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:795
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1234
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:307
-msgid "Extruder"
-msgstr "Extrudeur"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1187
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:400
-#, c-format
-msgid "Extruder %d"
-msgstr "Extrudeur %d"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:463
-msgid "Extruder and Bed Temperatures"
-msgstr "Températures de l'Extrudeur et du Lit"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:224
-msgid "Extruder changed to"
-msgstr "Extrudeur changé à"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:479
-msgid "Extruder clearance (mm)"
-msgstr "Dégagement de l'extrudeur (mm)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:342
-msgid "Extruder Color"
-msgstr "Couleur de l'extrudeur"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:350
-msgid "Extruder offset"
-msgstr "Décalage de l'extrudeur"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:626
-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 "Température de l’extrudeur pour la première couche. Si vous voulez contrôler manuellement la température au cours de l’impression, mettez à zéro pour désactiver les commandes de contrôle de température dans le fichier de sortie."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1573
-msgid "Extruder temperature for layers after the first one. Set this to zero to disable temperature control commands in the output."
-msgstr "Température de l'extrudeur pour les couches après la première. Mettez zéro pour désactiver les commandes de contrôle de la température dans le fichier de sortie."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:431
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:966
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:308
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:702
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:958
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1272
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1445
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1471
-msgid "Extruders"
-msgstr "Extrudeurs"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:360
-msgid "Extrusion axis"
-msgstr "Axe d'extrusion"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:367
-msgid "Extrusion multiplier"
-msgstr "Multiplicateur d'extrusion"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:483
-msgid "Extrusion Temperature:"
-msgstr "Température d'Extrusion :"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:268
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:377
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:592
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:710
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:967
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1292
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1454
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1614
-msgid "Extrusion Width"
-msgstr "Largeur d'Extrusion"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:453
-msgid "Extrusion width"
-msgstr "Largeur d'extrusion"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:410
-msgid "Facets"
-msgstr "Faces"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:36
-msgid "Fan "
-msgstr "Ventilateur "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:817
-msgid "Fan settings"
-msgstr "Réglages du ventilateur"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:818
-msgid "Fan speed"
-msgstr "Vitesse du ventilateur"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:330
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:68
-msgid "Feature type"
-msgstr "Type de fonctionnalité"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:78
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:79
-msgid "Feature types"
-msgstr "Types de fonctionnalité"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:183
-msgid "Fewer"
-msgstr "Moins"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:786
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:787
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:368
-msgid "Filament"
-msgstr "Filament"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:412
-msgid "Filament and Nozzle Diameters"
-msgstr "Diamètres du Filament et de la Buse"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:445
-msgid "Filament Diameter:"
-msgstr "Diamètre du Filament :"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:412
-msgid "Filament notes"
-msgstr "Notes du filament"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1031
-msgid "Filament parking position"
-msgstr "Position d'attente du filament"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:832
-msgid "Filament properties"
-msgstr "Propriétés du filament"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:202
-msgid "Filament Settings"
-msgstr "Réglages du filament"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:450
-msgid "Filament type"
-msgstr "Type de filament"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:44
-msgid "filaments"
-msgstr "filaments"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1445
-msgid "File added to print queue"
-msgstr "Fichier ajouté à la file d'impression"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:475
-msgid "File Not Found"
-msgstr "Fichier non trouvé"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:487
-msgid "Fill angle"
-msgstr "Angle du remplissage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:501
-msgid "Fill density"
-msgstr "Densité du remplissage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:539
-msgid "Fill pattern"
-msgstr "Motif de remplissage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:541
-msgid "Fill pattern for general low-density infill."
-msgstr "Motif pour les remplissages de faible densité."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:248
-msgid "Fill pattern for top/bottom infill. This only affects the external visible layer, and not its adjacent solid shells."
-msgstr "Motif pour les surfaces supérieurs/inférieurs. Ceci affecte seulement la couche externe visible, et non les replissages plein adjacents."
-
-#: xs/src/slic3r/GUI/BonjourDialog.cpp:194
-msgid "Finished"
-msgstr "Terminé"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1110
-msgid "Firmware"
-msgstr "Firmware"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:266
-msgid "Firmware flasher"
-msgstr "Outil de flash du firmware"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:293
-msgid "Firmware image:"
-msgstr "Image du firmware :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1314
-msgid "Firmware Retraction"
-msgstr "Rétraction du Firmware"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:356
-msgid "Firmware Type"
-msgstr "Type de Firmware"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:573
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:582
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:591
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:625
-msgid "First layer"
-msgstr "Première couche"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:603
-msgid "First layer height"
-msgstr "Hauteur de la première couche"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:615
-msgid "First layer speed"
-msgstr "Vitesse de la première couche"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
-msgid "First layer volumetric"
-msgstr "Volume de la première couche"
-
-#: xs/src/slic3r/GUI/GUI.cpp:326
-msgid "Flash printer firmware"
-msgstr "Flasher le firmware de l'imprimante"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:84
-msgid "Flash!"
-msgstr "Flash !"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:147
-msgid "Flashing cancelled."
-msgstr "Processus de flash annulé."
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:146
-msgid "Flashing failed. Please see the avrdude log below."
-msgstr "Le processus de flash a échoué. Veuillez consulter le journal avrdude ci-dessous."
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:123
-msgid "Flashing in progress. Please do not disconnect the printer!"
-msgstr "Processus de flash en cours. Veuillez ne pas déconnecter l'imprimante !"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:145
-msgid "Flashing succeeded!"
-msgstr "Flash effectué avec succès !"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:466
-msgid "Flow"
-msgstr "Flux"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:181
-msgid "For more information please visit our wiki page:"
-msgstr "Pour plus d'informations, merci de visiter notre page wiki :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:599
-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 ""
-"Pour que la tour de nettoyage fonctionne avec des supports solubles, les couches de support\n"
-"doivent être synchronisées avec les couches de l'objet.\n"
-"\n"
-"Dois-je synchroniser les couches de support pour pouvoir activer la tour de nettoyage ?"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1264
-msgid "Force solid infill for regions having a smaller area than the specified threshold."
-msgstr "Forcer un remplissage plein pour les zones ayant une surface plus petite que la valeur indiquée."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:758
-msgid "Force the generation of solid shells between adjacent materials/volumes. Useful for multi-extruder prints with translucent materials or manual soluble support material."
-msgstr "Force la génération de coques pleines entre des volumes/matériaux adjacents. Utile pour des impressions multi-extrudeurs avec des matériaux translucides ou avec un support manuel soluble."
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:260
-msgid "From"
-msgstr "De"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:371
-msgid "Front"
-msgstr "Avant"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:371
-msgid "Front View"
-msgstr "Vue Avant"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:514
-msgid "G-code"
-msgstr "G-code"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1451
-msgid "G-code file exported to "
-msgstr "Fichier G-code exporté vers "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:652
-msgid "G-code flavor"
-msgstr "Version du G-code"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:444
-msgid "g/cm³"
-msgstr "g/cm³"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:634
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:145
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:87
-msgid "Gap fill"
-msgstr "Remplissage des trous"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:937
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:11
-msgid "General"
-msgstr "Général"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:875
-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."
-msgstr "Nombre minimum de clôtures à générer afin de consommer la quantité de filament spécifiée sur la couche inférieure. Pour les machines multi-extrudeurs, ce minimum s'applique à chaque extrudeur."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1379
-msgid "Generate support material"
-msgstr "Générer des supports"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1433
-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 "Générer des supports pour le nombre de couches spécifié à partir du bas, que les supports normaux soient activés ou non et sans tenir compte de seuils d'inclinaison. Ceci est utile pour obtenir une meilleure adhésion pour des objets ayant une surface de contact très fine ou limitée sur le plateau."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:442
-msgid "Good precision is required, so use a caliper and do multiple measurements along the filament, then compute the average."
-msgstr "Une bonne précision est requise, utilisez un pied à coulisse et calculez la moyenne de plusieurs mesures le long du filament."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:583
-msgid "Heated build plate temperature for the first layer. Set this to zero to disable bed temperature control commands in the output."
-msgstr "Température du plateau chauffant pour la première couche. Mettez ceci à zéro pour désactiver les commandes de contrôle de température du plateau dans la sortie."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:320
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:69
-msgid "Height"
-msgstr "Hauteur"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:332
-msgid "Height (mm)"
-msgstr "Hauteur (mm)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1222
-msgid "Height of skirt expressed in layers. Set this to a tall value to use skirt as a shield against drafts."
-msgstr "Hauteur de la clôture exprimée en couches. Mettez une valeur élevée pour utiliser la clôture comme un bouclier contre les flux d'airs."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:213
-#, c-format
-msgid "Hello, welcome to Slic3r Slic3r++! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
-msgstr "Bonjour, bienvenu dans Slic3r Slic3r++ ! Ce %s vous aide à la configuration initiale ; juste quelques paramètres et vous serez prêt à imprimer."
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
-msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
-msgstr "Ici vous pouvez ajuster le volume de purge nécessaire (mm³) pour une paire d'outils donnée."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:329
-msgid "Horizontal shells"
-msgstr "Coques horizontales"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:128
-msgid "Horizontal width of the brim that will be printed around each object on the first layer."
-msgstr "Largeur horizontale de la jupe qui sera imprimée autour de chaque objet sur la première couche."
-
-#: xs/src/slic3r/GUI/BonjourDialog.cpp:67
-msgid "Hostname"
-msgstr "Nom d'hôte"
-
-#: xs/src/libslic3r/PrintConfig.cpp:991
-msgid "Hostname, IP or URL"
-msgstr "Nom d'hôte, IP ou URL"
-
-#: xs/src/slic3r/GUI/Tab.cpp:113
-msgid ""
-"Hover the cursor over buttons to find more information \n"
-"or click this button."
-msgstr ""
-"Passez le curseur au dessus des boutons pour obtenir plus d'informations\n"
-"ou cliquez sur ce bouton."
-
-#: xs/src/slic3r/GUI/Tab.cpp:1612
-msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
-msgstr "Le fichier HTTPS CA est optionnel. Il est uniquement requis si vous utilisez le HTTPS avec un certificat auto-signé."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:275 xs/src/slic3r/GUI/Preferences.cpp:61
-msgid "If enabled, Slic3r checks for new versions of Slic3r PE 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 "Si activé, Slic3r vérifie en ligne l'existence de nouvelles versions de Slic3r PE. Lorsqu'une nouvelle version est disponible, une notification est affichée au démarrage suivant de l'application (jamais pendant l'utilisation du programme). Ceci est uniquement un mécanisme de notification, aucune installation automatique n'est faite."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:282 xs/src/slic3r/GUI/Preferences.cpp:69
-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 "Si activé, Slic3r télécharge les mises à jours des préréglages système intégrés en arrière-plan. Ces mises à jour sont téléchargées dans un répertoire temporaire séparé. Lorsqu'une nouvelle version de préréglages est disponible, elle est proposée au démarrage de l'application."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:26
-#, c-format
-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 "Si le temps de couche estimé est inférieur à ~%d s, le ventilateur tournera à %d%% et la vitesse d'impression sera réduite pour qu'au moins %d s soient passées sur cette couche (cependant, la vitesse ne sera jamais réduite en-dessous de %d mm/s)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:616
-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 "Si exprimée avec une valeur absolue en mm/s, cette vitesse sera appliquée à tous les déplacements d'impression de la première couche, quel que soit leur type. Si exprimée comme un pourcentage (par exemple 40%), cela modulera la vitesse par défaut."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:395
-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 "Si le temps d'impression estimé de la couche est inférieur à ce nombre de secondes, le ventilateur sera activé et sa vitesse calculée par interpolation des vitesses minimum et maximum."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1240
-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 "Si le temps d'impression estimé de la couche est inférieur à ce nombre de secondes, la vitesse des déplacements d'impression sera réduite afin d'atteindre cette valeur."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:388
-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 "Si ceci est activé, le ventilateur ne sera jamais désactivé et sera maintenu au moins à sa vitesse minimum. Utile pour le PLA, mais risqué pour l'ABS."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:37
-msgid "If this is enabled, Slic3r will auto-center objects around the print bed center."
-msgstr "Si ceci est activé, Slic3r centrera automatique les objets autour du centre du plateau d'impression."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:45
-msgid "If this is enabled, Slic3r will pre-process objects as soon as they're loaded in order to save time when exporting G-code."
-msgstr "Si ceci est activé, Slic3r va pré-calculer les objets dès qu'ils sont chargés pour gagner du temps lors de l'export du G-code."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:29
-msgid "If this is enabled, Slic3r will prompt the last output directory instead of the one containing the input files."
-msgstr "Si ceci est activé, Slic3r affichera le dernier répertoire de sortie au lieu de celui contenant les fichiers d'entrée."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:77
-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 "Si vous avez des soucis de rendu causés par un driver OpenGL 2.0 bogué, vous pouvez essayer de cocher cette case. Ceci désactivera l'édition de la hauteur de couche et l'anti-aliasing, vous avez donc intérêt à mettre à jour vos drivers graphiques."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1091
-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 "Si vous indiquez une valeur positive, l'axe Z est rapidement élevé à chaque rétraction. Lorsque vous utilisez plusieurs extrudeurs, seul le réglage du premier extrudeur sera pris en compte."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1101
-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 "Si vous indiquez une valeur positive, le levage de l'axe Z ne sera déclenché qu'à partir de la valeur absolue indiquée pour l'axe Z. Vous pouvez modifier ce réglage pour éviter le levage de l'axe Z sur les premières couches."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1110
-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 "Si vous indiquez une valeur positive, le levage de l'axe Z ne sera déclenché que jusqu'à la valeur absolue indiquée pour l'axe Z. Vous pouvez modifier ce réglage pour limiter le levage de l'axe Z aux premières couches."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:451
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1002
-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."
-msgstr "Si vous voulez traiter le G-code de sortie à l'aide de scripts personnalisés, listez simplement leurs chemins absolus ici. Séparez les divers scripts avec un point virgule. Les scripts vont recevoir en premier argument le chemin absolu du fichier G-code, et ils peuvent accéder aux réglages de configuration de Slic3r en lisant des variables d'environnement."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:351
-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)."
-msgstr "Si le firmware de votre imprimante ne gère pas le décalage de l'extrudeur, c'est au G-code d'en tenir compte. Cette option vous permet de spécifier le décalage de chaque extrudeur par rapport au premier. Des valeurs positives sont attendues (elles seront soustraites des coordonnées XY)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1664
-msgid "If your firmware requires relative E values, check this, otherwise leave it unchecked. Most firmwares use absolute values."
-msgstr "Si votre firmware requiert des valeurs relatives pour E, cochez cette case, sinon laissez-la décochée. La plupart des firmwares utilisent des valeurs absolues."
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:125
-msgid "Incompatible bundles:"
-msgstr "Lots incompatibles :"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:67
-msgid "Incompatible with this Slic3r"
-msgstr "Incompatible avec ce Slic3r"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2024
-msgid "Increase copies"
-msgstr "Augmenter les copies"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:346
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:347
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:664
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:87
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:247
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:488
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:502
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:540
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:681
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:691
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:709
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:727
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:746
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1263
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1280
-msgid "Infill"
-msgstr "Remplissage"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:169
-msgid "infill"
-msgstr "remplissage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:720
-msgid "Infill before perimeters"
-msgstr "Remplissage avant les périmètres"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:701
-msgid "Infill extruder"
-msgstr "Extrudeur pour le remplissage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:735
-msgid "Infill/perimeters overlap"
-msgstr "Chevauchement remplissage/périmètres"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:398
-msgid "Info"
-msgstr "Info"
-
-#: xs/src/libslic3r/PrintConfig.cpp:819
-msgid "Inherits profile"
-msgstr "Hérite du profil"
-
-#: xs/src/slic3r/GUI/Field.cpp:111
-msgid "Input value is out of range"
-msgstr "La valeur entrée est hors plage"
-
-#: xs/src/slic3r/GUI/GUI.cpp:402
-msgid "Inspect / activate configuration snapshots"
-msgstr "Inspecter / activer les instantanés de configuration"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1479
-msgid "Interface layers"
-msgstr "Couches d'interface"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1463
-msgid "Interface loops"
-msgstr "Boucles d'interface"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1488
-msgid "Interface pattern spacing"
-msgstr "Espacement du motif d'interface"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:757
-msgid "Interface shells"
-msgstr "Coques d'interface"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:141
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:83
-msgid "Internal infill"
-msgstr "Remplissage interne"
-
-#: xs/src/slic3r/Utils/OctoPrint.cpp:120
-msgid "Invalid API key"
-msgstr "Clé API invalide"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1031
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1056
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1061
-msgid "Invalid scaling value entered"
-msgstr "Valeur de mise à l'échelle entrée invalide"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:368
-msgid "Iso"
-msgstr "Isométrique"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:368
-msgid "Iso View"
-msgstr "Vue Isométrique"
-
-#: xs/src/slic3r/GUI/Tab.cpp:748
-msgid "It can't be deleted or modified. "
-msgstr "Il ne peut être supprimé ou modifié. "
-
-#: xs/src/slic3r/GUI/Tab.cpp:741
-msgid "It's a default preset."
-msgstr "C'est un préréglage par défaut."
-
-#: xs/src/slic3r/GUI/Tab.cpp:742
-msgid "It's a system preset."
-msgstr "C'est un préréglage système."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1180
-msgid "Jitter"
-msgstr "Gigue"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:387
-msgid "Keep fan always on"
-msgstr "Garder le ventilateur toujours actif"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:235
-msgid "Language"
-msgstr "Langue"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:192
-msgid "Layer Editing"
-msgstr "Édition de Couche"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:207
-msgid "Layer editing"
-msgstr "Édition de couche"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:314
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:777
-msgid "Layer height"
-msgstr "Hauteur de couche"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1194
-msgid "Layer height limits"
-msgstr "Limites de hauteur de couche"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:183
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:694
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1033
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1224
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1285
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1437
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1482
-msgid "layers"
-msgstr "couches"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:157
-msgid "Layers"
-msgstr "Couches"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:69
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:239
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:290
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:298
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:604
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:762
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:778
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:941
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:989
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1152
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1583
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1639
-msgid "Layers and Perimeters"
-msgstr "Couches et Périmètres"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:313
-msgid "Layers and perimeters"
-msgstr "Couches et périmètres"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:373
-msgid "Left"
-msgstr "Gauche"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:373
-msgid "Left View"
-msgstr "Vue Gauche"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1071
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1080
-msgid "Length"
-msgstr "Longueur"
-
-#: xs/src/libslic3r/PrintConfig.cpp:179
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
-msgstr "Longueur du tube de refroidissement pour limiter l'espace pour les déplacements de refroidissement à l'intérieur de celui-ci "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1090
-msgid "Lift Z"
-msgstr "Levage de l'axe Z"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:254
-msgid "Load exported configuration file"
-msgstr "Charger le fichier de configuration exporté"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:260
-msgid "Load presets from a bundle"
-msgstr "Charger les préréglages à partir d'un lot"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:75
-msgid "Load shape from STL..."
-msgstr "Charger une forme depuis un STL..."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:692
-msgid "Loaded "
-msgstr "Chargé "
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:233
-msgid "loaded"
-msgstr "chargé"
-
-#: xs/src/libslic3r/PrintConfig.cpp:459
-msgid "Loading speed"
-msgstr "Vitesse de chargement"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:629
-msgid "Loading…"
-msgstr "Chargement…"
-
-#: xs/src/slic3r/GUI/Tab.cpp:2481
-msgid "LOCKED LOCK icon indicates that the settings are the same as the system values for the current option group"
-msgstr "L'icône VERROU VERROUILLE indique que les paramètres sont les mêmes que les valeurs système pour le groupe d'options en cours"
-
-#: xs/src/slic3r/GUI/Tab.cpp:2497
-msgid "LOCKED LOCK icon indicates that the value is the same as the system value."
-msgstr "L'icône VERROU VERROUILLE indique que la valeur est la même que la valeur système."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2442
-msgid "LOCKED LOCK;indicates that the settings are the same as the system values for the current option group"
-msgstr "VERROU VERROUILLE;indique que les paramètres sont les mêmes que les valeurs système pour le groupe d'options en cours"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1229
-msgid "Loops (minimum)"
-msgstr "Boucles (minimum)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:412
-msgid "Manifold"
-msgstr "Variété"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:411
-msgid "Materials"
-msgstr "Matériaux"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:787
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:796
-msgid "Max"
-msgstr "Maximum"
-
-#: xs/src/libslic3r/PrintConfig.cpp:876
-msgid "Max print height"
-msgstr "Hauteur maximale d'impression"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:807
-msgid "Max print speed"
-msgstr "Vitesse d'impression maximale"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
-msgid "max slic3r version"
-msgstr "version maximale de slic3r"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:837
-msgid "Max volumetric slope negative"
-msgstr "Pente volumétrique négative maximum"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:826
-msgid "Max volumetric slope positive"
-msgstr "Pente volumétrique positive maximum"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:421
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:817
-msgid "Max volumetric speed"
-msgstr "Vitesse volumétrique maximale"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1854
-msgid "Maximal bridging distance"
-msgstr "Distance maximale de pont"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1855
-msgid "Maximal distance between supports on sparse infill sections. "
-msgstr "Distance maximale entre les supports sur les sections de remplissage épars. "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:422
-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 "Vitesse volumétrique maximale autorisée pour ce filament. Limite la vitesse volumétrique d'une impression au minimum des vitesses volumétriques d'impression et de filament. Mettez à zéro pour enlever la limite."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:848
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:857
-msgid "Min"
-msgstr "Minimum"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:866
-msgid "Min print speed"
-msgstr "Vitesse d'impression minimale"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
-msgid "min slic3r version"
-msgstr "version minimale de slic3r"
-
-#: xs/src/libslic3r/PrintConfig.cpp:951
-msgid "Minimal filament extrusion length"
-msgstr "Longueur minimale d'extrusion de filament"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1040
-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 "Résolution minimale pour les détails, utilisée pour simplifier le fichier d'entrée afin d'accélérer le découpage et de réduire l'utilisation de la mémoire. Les modèles haute-résolution possèdent souvent plus de détails que ce que les imprimantes peuvent produire. Mettez à zéro pour désactiver toute simplification et utiliser la résolution complète de l'entrée."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1050
-msgid "Minimum travel after retraction"
-msgstr "Trajet minimal après une rétraction"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2055
-msgid "Mirror"
-msgstr "Symétrie"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2055
-msgid "Mirror the selected object"
-msgstr "Symétriser l'objet sélectionné"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2057
-msgid "Mirror the selected object along the X axis"
-msgstr "Symétriser l'objet sélectionné selon l'axe X"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2060
-msgid "Mirror the selected object along the Y axis"
-msgstr "Symétriser l'objet sélectionné selon l'axe Y"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2063
-msgid "Mirror the selected object along the Z axis"
-msgstr "Symétriser l'objet sélectionné selon l'axe Z"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:65
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:129
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:200
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:211
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:325
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:336
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:355
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:434
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:781
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:801
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:860
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:878
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:896
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1044
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1052
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1094
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1103
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1113
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1121
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1129
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1215
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1421
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1491
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1527
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1704
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1711
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1718
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1727
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1737
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1747
-msgid "mm"
-msgstr "mm"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1075
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1085
-msgid "mm (zero to disable)"
-msgstr "mm (zéro pour désactiver)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:609
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:740
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1390
-msgid "mm or %"
-msgstr "mm ou %"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:382
-msgid "mm or % (leave 0 for auto)"
-msgstr "mm ou % (laissez à 0 pour le mode automatique)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:272
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:597
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:715
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:972
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1296
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1458
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1619
-msgid "mm or % (leave 0 for default)"
-msgstr "mm ou % (laissez à 0 pour la valeur par défaut)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:120
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:638
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:749
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:811
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:868
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:981
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1137
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1146
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1536
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1649
-msgid "mm/s"
-msgstr "mm/s"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:282
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:619
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1255
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1306
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1501
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1631
-msgid "mm/s or %"
-msgstr "mm/s ou %"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:80
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:174
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:576
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:684
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:952
-msgid "mm/s²"
-msgstr "mm/s²"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1265
-msgid "mm²"
-msgstr "mm²"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:425
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:820
-msgid "mm³/s"
-msgstr "mm³/s"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:831
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:842
-msgid "mm³/s²"
-msgstr "mm³/s²"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:55
-msgid "model"
-msgstr "modèle"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:414
-msgid "Modifiers"
-msgstr "Modificateurs"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:478
-msgid "money/kg"
-msgstr "€/kg"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:182
-msgid "More"
-msgstr "Plus"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1696
-msgid "Multi material printers may need to prime or purge extruders on tool changes. Extrude the excess material into the wipe tower."
-msgstr "Les imprimantes multi-matériaux peuvent avoir besoin de préparer ou de purger leurs extrudeurs lors d'un changement d'outil. Extruder le matériau en excès dans la tour de nettoyage."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:666
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:683
-msgid "Multi-part object detected"
-msgstr "Objet multi-pièces détecté"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:430
-msgid "Multiple Extruders"
-msgstr "Extrudeurs Multiples"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:680
-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 ""
-"Plusieurs objets ont été chargés pour une imprimante multi-matériaux.\n"
-"Au lieu de les considérer comme plusieurs objets, dois-je considérer\n"
-"ces fichiers comment représentant un objets ayant plusieurs pièces ?\n"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:220
-msgid "Name"
-msgstr "Nom"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1126
-msgid "Name of the printer variant. For example, the printer variants may be differentiated by a nozzle diameter."
-msgstr "Nom de la variante d'imprimante. Par exemple, la variante d'imprimante peut être différenciée par un diamètre de buse."
-
-#: xs/src/libslic3r/PrintConfig.cpp:1121
-msgid "Name of the printer vendor."
-msgstr "Nom du fabriquant de l'imprimante."
-
-#: xs/src/libslic3r/PrintConfig.cpp:820
-msgid "Name of the profile, from which this profile inherits."
-msgstr "Nom du profil, duquel hérite ce profil."
-
-#: xs/src/slic3r/GUI/BonjourDialog.cpp:53
-msgid "Network lookup"
-msgstr "Recherche réseau"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:27
-msgid "New version of Slic3r PE is available"
-msgstr "Une nouvelle version de Slic3r PE est disponible"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:43
-msgid "New version:"
-msgstr "Nouvelle version :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:469
-msgid "No previously sliced file."
-msgstr "Aucun fichier précédemment découpé."
-
-#: xs/src/slic3r/GUI/RammingChart.cpp:28
-msgid "NO RAMMING AT ALL"
-msgstr "PAS D'EXPULSION DU TOUT"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:137
-msgid "None"
-msgstr "Aucun"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1571
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr "Note : une version d'Octoprint supérieure ou égale à 1.1.0 est requise."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:500
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:501
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:859
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:860
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1156
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1157
-msgid "Notes"
-msgstr "Notes"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:493
-msgid "Notice"
-msgstr "Remarque"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:85
-msgid "nozzle"
-msgstr "buse"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:894
-msgid "Nozzle diameter"
-msgstr "Diamètre de la buse"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:431
-msgid "Nozzle Diameter:"
-msgstr "Diamètre de la Buse :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:967
-msgid "Number of extruders of the printer."
-msgstr "Nombre d'extrudeurs de l'imprimante."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1481
-msgid "Number of interface layers to insert between the object(s) and support material."
-msgstr "Nombre de couches d'interface à insérer entre le(s) objet(s) et les supports."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1231
-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 "Nombre de boucles pour la clôture. Si la Longueur Minimale d'Extrusion est paramétrée, le nombre de boucles minimale sera plus grand que celui configuré ici. Mettez à zéro pour désactiver complètement la clôture."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:70
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "Nombre de couches pleines à générer sur les surfaces inférieures."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1315
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr "Nombre de couches pleines à générer sur les surfaces supérieures et inférieures."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1640
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "Nombre de couches pleines à générer sur les surfaces supérieures."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:745
-msgid "Object too large?"
-msgstr "Objet trop grand ?"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1032
-msgid "OctoPrint upload"
-msgstr "Envoi vers OctoPrint"
-
-#: lib/Slic3r/GUI/Plater.pm:1511
-msgid "OctoPrint upload finished."
-msgstr "Envoi vers OctoPrint terminé."
-
-#: xs/src/slic3r/GUI/BonjourDialog.cpp:69
-msgid "OctoPrint version"
-msgstr "Version d'OctoPrint"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1410
-msgid "Only create support if it lies on a build plate. Don't create support on a print."
-msgstr "Créer uniquement des supports reposant sur le plateau. Ne pas créer pas de supports sur une impression."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:726
-msgid "Only infill where needed"
-msgstr "Remplissage seulement où cela est nécessaire"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1205
-msgid "Only lift Z"
-msgstr "Lever Z seulement"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1100
-msgid "Only lift Z above"
-msgstr "Lever Z seulement au-dessus de"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1109
-msgid "Only lift Z below"
-msgstr "Lever Z seulement en-dessous de"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:915
-msgid "Only retract when crossing perimeters"
-msgstr "Rétracter uniquement lors du franchissement de périmètres"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:438
-msgid "Ooze prevention"
-msgstr "Prévention des coulures"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:251
-msgid "Open a model"
-msgstr "Ouvrir un modèle"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1598
-msgid "Open CA certificate file"
-msgstr "Ouvrir le fichier de certificat CA"
-
-#: lib/Slic3r/GUI/MainFrame.pm:194
-msgid "Open STL/OBJ/AMF/3MF…\tCtrl+O"
-msgstr "Ouvrir STL/OBJ/AMF/3MF…\tCtrl+O"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
-msgid "Open the 3D cutting tool"
-msgstr "Ouvrir l'outil de coupe 3D"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2106
-msgid "Open the object editor dialog"
-msgstr "Ouvrir la boîte de dialogue d'édition d'objet"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
-msgid "Open the Slic3r++ releases page in your browser"
-msgstr "Ouvrir la page des publications de la Slic3r++ dans votre navigateur"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr "Ouvrir la page de téléchargement des drivers Prusa3D dans votre navigateur"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:398
-msgid "Open the Slic3r manual in your browser"
-msgstr "Ouvrir la manuel de Slic3r dans votre navigateur"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:395
-msgid "Open the Slic3r website in your browser"
-msgstr "Ouvrir le site web de Slic3r dans votre navigateur"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:27
-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 "Optimiser les déplacements afin de minimiser le franchissement de périmètres. Ceci est surtout utile avec les extruder Bowden qui sont sujets aux coulures. Cette fonctionnalité ralentit l'impression et la génération du G-code."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:384
-msgid "Options for support material and raft"
-msgstr "Options pour le matériau de support et le radeau"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:57
-msgid "Origin"
-msgstr "Origine"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:469
-msgid "Other"
-msgstr "Autre"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:38
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1572
-msgid "Other layers"
-msgstr "Autres couches"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:295
-msgid "Other Vendors"
-msgstr "Autres Fabriquants"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:238
-msgid "Other vendors"
-msgstr "Autres fabriquants"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:488
-msgid "Output file"
-msgstr "Fichier de sortie"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:930
-msgid "Output filename format"
-msgstr "Format du nom de fichier de sortie"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:476
-msgid "Output options"
-msgstr "Options de sortie"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:140
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:82
-msgid "Overhang perimeter"
-msgstr "Périmètre en surplomb"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1550
-msgid "Overhang threshold"
-msgstr "Seuil de surplomb"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:463
-msgid "Overlap"
-msgstr "Chevauchement"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1508
-msgid "Pattern"
-msgstr "Motif"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1398
-msgid "Pattern angle"
-msgstr "Angle du motif"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1524
-msgid "Pattern spacing"
-msgstr "Espacement du motif"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1510
-msgid "Pattern used to generate support material."
-msgstr "Motif utilisé pour générer les supports."
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:138
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:80
-msgid "Perimeter"
-msgstr "Périmètre"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:957
-msgid "Perimeter extruder"
-msgstr "Extrudeur pour les périmètres"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:948
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:966
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:978
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:988
-msgid "Perimeters"
-msgstr "Périmètres"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:160
-msgid "perimeters"
-msgstr "périmètres"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:297
-msgid "Pick another vendor supported by Slic3r PE:"
-msgstr "Choisissez un autre fabriquant supporté par Slic3r PE :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2024
-msgid "Place one more copy of the selected object"
-msgstr "Placer une copie supplémentaire de l'objet sélectionné"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:118
-msgid "Plater"
-msgstr "Plateau"
-
-#: lib/Slic3r/GUI/Plater.pm:1897
-msgid "Please install the OpenGL modules to use this feature (see build instructions)."
-msgstr "Veuillez installer les modules OpenGL pour pouvoir utiliser cette fonctionnalité (voir les instructions de montage)."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1199
-msgid "Position (for multi-extruder printers)"
-msgstr "Position (pour les imprimantes multi-extrudeurs)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1153
-msgid "Position of perimeters starting points."
-msgstr "Position des points de départ des périmètres."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1702
-msgid "Position X"
-msgstr "Position X"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1709
-msgid "Position Y"
-msgstr "Position Y"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:494
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1001
-msgid "Post-processing scripts"
-msgstr "Scripts de post-traitement"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.hpp:17
-msgid "Preferences"
-msgstr "Préférences"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1171
-msgid "Preferred direction of the seam"
-msgstr "Direction préférée de la jointure"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1183
-msgid "Preferred direction of the seam - jitter"
-msgstr "Direction préférée de la jointure - gigue"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1222
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:150
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2125
-msgid "Preview"
-msgstr "Aperçu"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:474
-msgid "Previously sliced file ("
-msgstr "Fichier précédemment découpé ("
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "print"
-msgstr "imprimer"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:291
-msgid "Print contour perimeters from the outermost one to the innermost one instead of the default inverse order."
-msgstr "Imprimer les périmètres de l'extérieur vers l'intérieur au lieu de l'ordre par défaut qui est inversé."
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:412
-msgid "Print Diameters"
-msgstr "Diamètres d'Impression"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:182
-msgid "Print Settings"
-msgstr "Réglages d'Impression"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:367
-msgid "Print settings"
-msgstr "Réglages d'impression"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:836
-msgid "Print speed override"
-msgstr "Contournement de la vitesse d'impression"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:369
-msgid "Printer"
-msgstr "Imprimante"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "printer"
-msgstr "imprimer"
-
-#: xs/src/slic3r/GUI/Tab.cpp:762
-msgid "printer model"
-msgstr "modèle de l'imprimante"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1014
-msgid "Printer notes"
-msgstr "Notes de l'imprimante"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:228
-msgid "Printer Settings"
-msgstr "Réglages de l'Imprimante"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1106
-msgid "Printer type"
-msgstr "Type d'imprimante"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1125
-msgid "Printer variant"
-msgstr "Variante d'imprimante"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1120
-msgid "Printer vendor"
-msgstr "Fabriquant de l'imprimante"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:238
-msgid "Print…"
-msgstr "Impression…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:528
-msgid "Processing "
-msgstr "Traitement "
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:629
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:643
-msgid "Processing input file\n"
-msgstr "Traitement du fichier d'entrée\n"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:508
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:868
-msgid "Profile dependencies"
-msgstr "Dépendances du profil"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:300
-msgid "Progress:"
-msgstr "Progression :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
-msgid "Prusa 3D Drivers"
-msgstr "Drivers Prusa 3D"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
-msgid "Slic3r++ Releases"
-msgstr "Publication de la Slic3r++"
-
-#: xs/src/slic3r/GUI/GUI.cpp:908
-msgid "Purging volumes"
-msgstr "Volumes de purge"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1807
-msgid "Purging volumes - load/unload volumes"
-msgstr "Volumes de purge - volumes de chargement/déchargement"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1815
-msgid "Purging volumes - matrix"
-msgstr "Volumes de purge - matrice"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:268
-msgid "Q&uick Slice…\tCtrl+U"
-msgstr "&Découpage Rapide…\tCtrl+U"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:335
-msgid "Quality (slower slicing)"
-msgstr "Qualité (découpage plus lent)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:274
-msgid "Quick Slice and Save &As…\tCtrl+Alt+U"
-msgstr "Découpage Rapide et &Enregistrer Sous…\tCtrl+Alt+U"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:304
-msgid "Quit Slic3r"
-msgstr "Quitter Slic3r"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:331
-msgid "Radius"
-msgstr "Rayon"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:380
-msgid "Raft"
-msgstr "Radeau"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1029
-msgid "Raft layers"
-msgstr "Couches du radeau"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1319
-msgid "Ramming"
-msgstr "Expulsion"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:14
-msgid "Ramming customization"
-msgstr "Personnalisation de l'expulsion"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:40
-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 ..."
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:90
-msgid "Ramming line spacing"
-msgstr "Espacement de la ligne de ramming"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:88
-msgid "Ramming line width"
-msgstr "Largeur de la ligne d'expulsion"
-
-#: xs/src/libslic3r/PrintConfig.cpp:486
-msgid "Ramming parameters"
-msgstr "Paramètres de l'expulsion"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1321
-msgid "Ramming settings"
-msgstr "Réglages de l'expulsion"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:144
-msgid "Re-configure"
-msgstr "Reconfigurer"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:297
-msgid "Ready"
-msgstr "Prêt"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:372
-msgid "Rear"
-msgstr "Arrière"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:372
-msgid "Rear View"
-msgstr "Vue Arrière"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:262
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr "Épaisseur des parois fines de l'objet recommandée pour la hauteur de couche %.2f et "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:245
-msgid "Recommended object thin wall thickness: Not available due to invalid layer height."
-msgstr "Épaisseur des parois fines de l'objet recommandée : Non disponible car la hauteur de couche est invalide."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:46
-msgid "Rectangular"
-msgstr "Rectangle"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:352
-msgid "Reducing printing time"
-msgstr "Réduction du temps d'impression"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2110
-msgid "Reload from Disk"
-msgstr "Recharger depuis le Disque"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2110
-msgid "Reload the selected file from Disk"
-msgstr "Recharger le fichier sélectionné depuis le Disque"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:27
-msgid "Remember output directory"
-msgstr "Se souvenir du répertoire de sortie"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1582
-msgid "Remove"
-msgstr "Retirer"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1580
-msgid "remove"
-msgstr "retirer"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2027
-msgid "Remove one copy of the selected object"
-msgstr "Retirer une copie de l'objet sélectionné"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2021
-msgid "Remove the selected object"
-msgstr "Retirer l'objet sélectionné"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:217
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr "Supprimer les profils d'utilisateur - installation à partir de zéro (un snapshot sera fait avant)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:594
-msgid "Repair"
-msgstr "Réparer"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:294
-msgid "Repair STL file…"
-msgstr "Réparer le fichier STL…"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:280
-msgid "Repeat last quick slice"
-msgstr "Répéter le dernier découpage rapide"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
-msgid "Report an Issue"
-msgstr "Signaler un problème"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
-msgid "Report an issue on the Slic3r Slic3r++"
-msgstr "Signaler un problème sur la Slic3r++ de Slic3r"
-
-#: xs/src/slic3r/Utils/PresetUpdater.cpp:514
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr "nécessite min. %s et max. %s"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:288
-msgid "Rescan"
-msgstr "Scanner à nouveau"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:995
-msgid "Rescan serial ports"
-msgstr "Rescanner les ports série"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1039
-msgid "Resolution"
-msgstr "Résolution"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1057
-msgid "Retract amount before wipe"
-msgstr "Quantité de rétractation avant essuyage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1065
-msgid "Retract on layer change"
-msgstr "Rétracter lors des changements de couche"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1202
-msgid "Retraction"
-msgstr "Rétraction"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1051
-msgid "Retraction is not triggered when travel moves are shorter than this length."
-msgstr "La rétraction n'est pas déclenchée lorsque les déplacements sont plus courts que cette distance."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1072
-msgid "Retraction Length"
-msgstr "Longueur de Rétractation"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1081
-msgid "Retraction Length (Toolchange)"
-msgstr "Longueur de Rétractation (changement d'outil)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1134
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1135
-msgid "Retraction Speed"
-msgstr "Vitesse de Rétractation"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1218
-msgid "Retraction when tool is disabled (advanced settings for multi-extruder setups)"
-msgstr "Rétractation lorsque l'outil est désactivé (réglages avancés pour les configurations multi-extrudeurs)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:96
-msgid "Retractions"
-msgstr "Rétractations"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:374
-msgid "Right"
-msgstr "Droite"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:374
-msgid "Right View"
-msgstr "Vue Droite"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2042
-msgid "Rotate"
-msgstr "Pivoter"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2034
-msgid "Rotate 45° clockwise"
-msgstr "Pivoter de 45° dans le sens des aiguilles d'une montre"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2037
-msgid "Rotate 45° counter-clockwise"
-msgstr "Pivoter de 45° dans le sens inverse des aiguilles d'une montre"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2034
-msgid "Rotate the selected object by 45° clockwise"
-msgstr "Pivoter l'objet sélectionné de 45° dans le sens des aiguilles d'une montre"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2037
-msgid "Rotate the selected object by 45° counter-clockwise"
-msgstr "Pivoter l'objet sélectionné de 45° dans le sens inverse des aiguilles d'une montre"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2042
-msgid "Rotate the selected object by an arbitrary angle"
-msgstr "Pivoter l'objet sélectionnée d'un angle donné"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2044
-msgid "Rotate the selected object by an arbitrary angle around X axis"
-msgstr "Pivoter l'objet sélectionnée d'un angle donné autour de l'axe X"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2047
-msgid "Rotate the selected object by an arbitrary angle around Y axis"
-msgstr "Pivoter l'objet sélectionnée d'un angle donné autour de l'axe Y"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2050
-msgid "Rotate the selected object by an arbitrary angle around Z axis"
-msgstr "Pivoter l'objet sélectionnée d'un angle donné autour de l'axe Z"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:211 xs/src/slic3r/GUI/GUI.cpp:399
-#, c-format
-msgid "Run %s"
-msgstr "Run %s"
-
-#: xs/src/slic3r/GUI/RammingChart.cpp:81 xs/src/slic3r/GUI/RammingChart.cpp:86
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:82
-#: xs/src/libslic3r/PrintConfig.cpp:480
-msgid "s"
-msgstr "s"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:514
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1645
-msgid "Save "
-msgstr "Enregistrer "
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:605
-msgid "Save configuration as:"
-msgstr "Enregistrer la configuration sous :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:50
-msgid "Save current "
-msgstr "Enregistrer l'état actuel "
-
-#: lib/Slic3r/GUI/Plater.pm:1399
-msgid "Save G-code file as:"
-msgstr "Sauvegarder le fichier G-code en tant que :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:580
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr "Enregistrer le fichier OBJ (moins enclin aux erreurs de coordonnées que le STL) sous :"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:248
-msgid "Save preset"
-msgstr "Enregistrer le préréglage"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:646
-msgid "Save presets bundle as:"
-msgstr "Enregistrer le lot de préréglages sous :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:222
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1056
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1061
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2068
-msgid "Scale"
-msgstr "Redimensionner"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1031
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
-msgid "Scale along "
-msgstr "Redimensionner le long de "
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2068
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2084
-msgid "Scale the selected object along a single axis"
-msgstr "Redimensionner l'objet sélectionné le long d'un seul axe"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2073
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2089
-msgid "Scale the selected object along the X axis"
-msgstr "Redimensionner l'objet sélectionné le long de l'axe X"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2070
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2086
-msgid "Scale the selected object along the XYZ axes"
-msgstr "Redimensionner l'objet sélectionné le long des axes XYZ"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2076
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2092
-msgid "Scale the selected object along the Y axis"
-msgstr "Redimensionner l'objet sélectionné le long de l'axe Y"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2079
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2095
-msgid "Scale the selected object along the Z axis"
-msgstr "Redimensionner l'objet sélectionné le long de l'axe Z"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2084
-msgid "Scale to size"
-msgstr "Redimensionner à la taille"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:187
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:203
-msgid "Scale…"
-msgstr "Redimensionner…"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1151
-msgid "Seam position"
-msgstr "Position de la jointure"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1172
-msgid "Seam preferred direction"
-msgstr "Direction préférée de la jointure"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1182
-msgid "Seam preferred direction jitter"
-msgstr "Gigue de la direction préférée de la jointure"
-
-#: xs/src/slic3r/GUI/BonjourDialog.cpp:187
-msgid "Searching for devices"
-msgstr "Recherche des dispositifs"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:342
-msgid "Select &Controller Tab\tCtrl+T"
-msgstr "Sélectionner l'Onglet &Contrôleur\tCtrl+T"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:353
-msgid "Select &Filament Settings Tab\tCtrl+3"
-msgstr "Sélectionner l'Onglet des Réglages du &Filament\tCtrl+3"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:336
-msgid "Select &Plater Tab\tCtrl+1"
-msgstr "Sélectionner l'Onglet du &Plateau\tCtrl+1"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:103
-msgid "Select all"
-msgstr "Tout sélectionner"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:623
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:667
-msgid "Select configuration to load:"
-msgstr "Sélectionner la configuration à charger :"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:104
-msgid "Select none"
-msgstr "Ne sélectionner aucun"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:350
-msgid "Select P&rint Settings Tab\tCtrl+2"
-msgstr "Sélectionner l'Onglet des Réglages d'&Impression\tCtrl+2"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:356
-msgid "Select Print&er Settings Tab\tCtrl+4"
-msgstr "Sélectionner l'Onglet des Réglages de l'Impri&mante\tCtrl+4"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:235
-msgid "Select the language"
-msgstr "Sélectionner la langue"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1667
-msgid "Select the printers this profile is compatible with."
-msgstr "Sélectionner les imprimantes avec lesquelles ce profil est compatible."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:566
-msgid "Select the STL file to repair:"
-msgstr "Sélectionner le fichier STL à réparer :"
-
-#: xs/src/slic3r/GUI/GUI.cpp:882
-msgid "Select what kind of support do you need"
-msgstr "Choisissez le type de support dont vous avez besoin"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:239
-msgid "Send to printer"
-msgstr "Envoyer à l'imprimante"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1448
-msgid "Sending G-code file to the OctoPrint server..."
-msgstr "Envoi du fichier G-code vers le serveur OctoPrint..."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:477
-msgid "Sequential printing"
-msgstr "Impression séquentielle"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:990
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1193
-msgid "Serial port"
-msgstr "Port série"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1202
-msgid "Serial port speed"
-msgstr "Vitesse du port série"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:286
-msgid "Serial port:"
-msgstr "Port série :"
-
-#: xs/src/slic3r/GUI/BonjourDialog.cpp:68
-msgid "Service name"
-msgstr "Nom du service"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2030
-msgid "Set number of copies…"
-msgstr "Choisir le nombre de copies…"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:398
-msgid "Set the shape of your printer's bed."
-msgstr "Réglez la forme du plateau de votre imprimante."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:378
-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 "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement la largeur d’extrusion. Si la valeur reste sur zéro, Slic3r calcule la largeur d’extrusion en se basant sur le diamètre de la buse (voir l’info-bulle concernant la largeur d’extrusion du périmètre, la largeur d’extrusion du remplissage, etc…). Si la valeur est exprimée en pourcentage (par exemple : 230%), elle sera calculée par rapport à la hauteur de couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:269
-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 "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement la largeur d’extrusion pour les périmètres extérieurs. Si la valeur reste sur zéro, la largeur d’extrusion par défaut sera utilisée si définie, sinon la valeur 1.125 x diamètre de la buse sera utilisée. Si la valeur est exprimée en pourcentage (par exemple : 200%), elle sera calculée par rapport à la hauteur de couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:593
-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."
-msgstr "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement la largeur d’extrusion pour la première couche. Vous pouvez procéder ainsi pour obtenir des extrudats plus épais afin d’avoir une meilleure adhérence. Si la valeur est exprimée en pourcentage (par exemple : 120%), elle sera calculée par rapport à la hauteur de la première couche. Si elle est réglée sur zéro, elle utilisera la largeur d’extrusion par défaut."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1293
-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."
-msgstr "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement la largeur d’extrusion pour le remplissage ou pour les surfaces pleines. Si la valeur reste sur zéro, la largeur d’extrusion par défaut sera utilisée si définie, sinon la valeur 1.125 x diamètre de la buse sera utilisée. Si la valeur est exprimée en pourcentage (par exemple : 90%), elle sera calculée par rapport à la hauteur de couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1615
-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."
-msgstr "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement la largeur d’extrusion pour le remplissage ou pour les surfaces supérieures. Vous voudrez peut-être utiliser des extrudats plus fins pour remplir les zones les plus étroites et obtenir des finitions plus lisses. Si la valeur reste sur zéro, la largeur d’extrusion par défaut sera utilisée si définie, sinon le diamètre de la buse sera utilisé. Si la valeur est exprimée en pourcentage (par exemple : 90%), elle sera calculée par rapport à la hauteur de couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:711
-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."
-msgstr "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement la largeur d’extrusion pour le remplissage. Si la valeur reste sur zéro, la largeur d’extrusion par défaut sera utilisée si définie, sinon la valeur 1.125 x diamètre de la buse sera utilisée. Vous voudrez peut-être utiliser des extrudats plus épais pour accélérer le remplissage et rendre vos pièces plus solides. Si la valeur est exprimée en pourcentage (par exemple : 90%), elle sera calculée par rapport à la hauteur de couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:968
-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."
-msgstr "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement une largeur d’extrusion pour les périmètres. Vous voudrez peut-être utiliser des extrudats plus fin pour obtenir des surfaces plus nettes. Si la valeur reste sur zéro, la largeur d’extrusion par défaut sera utilisée si définie, sinon la valeur 1.125 x diamètre de la buse sera utilisée. Si la valeur est exprimée en pourcentage (par exemple : 200%), elle sera calculée par rapport à la hauteur de couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1455
-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."
-msgstr "Réglez ce paramètre sur une valeur non-nulle pour définir manuellement la largeur d’extrusion pour les supports. Si la valeur reste sur zéro, la largeur d’extrusion par défaut sera utilisée si définie, sinon le diamètre de la buse sera utilisée. Si la valeur est exprimée en pourcentage (par exemple : 90%), elle sera calculée par rapport à la hauteur de couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:332
-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."
-msgstr "Paramétrez ceci avec le rayon de dégagement autour de l'extrudeur. Si l'extrudeur n'est pas centré, choisissez la plus grande valeur par sécurité. Ce réglage est utilisé pour vérifier les collisions et afficher l'aperçu graphique sur le plateau."
-
-#: xs/src/libslic3r/PrintConfig.cpp:877
-msgid "Set this to the maximum height that can be reached by your extruder while printing."
-msgstr "Réglez cette valeur sur la hauteur maximum que peut atteindre votre extrudeur au cours de l'impression."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:321
-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."
-msgstr "Paramétrez ceci avec la distance verticale entre la pointe de la buse et (habituellement) les tiges du chariot de l'axe X. En d'autres termes, il s'agit de la hauteur du cylindre de dégagement autour de l'extrudeur, et elle représente la profondeur maximum à laquelle peut descendre l'extrudeur avant d'entrer en collision avec d'autres objets imprimés."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:120
-msgid "Settings"
-msgstr "Réglages"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:191
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:206
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2106
-msgid "Settings…"
-msgstr "Réglages…"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:39
-msgid "Shape"
-msgstr "Forme"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:98
-msgid "Shells"
-msgstr "Coques"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:75
-msgid "Show"
-msgstr "Afficher"
-
-#: lib/Slic3r/GUI/MainFrame.pm:337
-msgid "Show &Configuration Folder"
-msgstr "Afficher le Répertoire de &Configuration"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:408
-msgid "Show about dialog"
-msgstr "Afficher la boîte de dialogue à propos"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:337
-msgid "Show advanced settings"
-msgstr "Afficher les réglages avancés"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:67
-msgid "Show incompatible print and filament presets"
-msgstr "Afficher les préréglages d'impression et de filament incompatibles"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:337
-msgid "Show simplified settings"
-msgstr "Afficher les réglages simplifiés"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:402
-msgid "Show system information"
-msgstr "Afficher les informations système"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:353
-msgid "Show the filament settings"
-msgstr "Afficher les réglages de filament"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:336
-msgid "Show the plater"
-msgstr "Afficher le plateau"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:350
-msgid "Show the print settings"
-msgstr "Afficher les réglages d'impression"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:342
-msgid "Show the printer controller"
-msgstr "Afficher le contrôleur de l'imprimante"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:356
-msgid "Show the printer settings"
-msgstr "Afficher les réglages de l'imprimante"
-
-#: lib/Slic3r/GUI/MainFrame.pm:337
-msgid "Show user configuration folder (datadir)"
-msgstr "Afficher le répertoire de configuration utilisateur (datadir)"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1716 xs/src/slic3r/GUI/Tab.cpp:1722
-msgid "Single extruder MM setup"
-msgstr "Réglage MM pour extrudeur unique"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1373
-msgid "Single Extruder Multi Material"
-msgstr "Extrudeur Unique Multi-Matériaux"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1723
-msgid "Single extruder multimaterial parameters"
-msgstr "Paramètres multimatériaux pour extrudeur unique"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:50
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1191
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:408
-msgid "Size"
-msgstr "Taille"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:938
-msgid "Size and coordinates"
-msgstr "Taille et coordonnées"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:51
-msgid "Size in X and Y of the rectangular plate."
-msgstr "Taille en X et Y du plateau rectangulaire."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:365
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:146
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:88
-msgid "Skirt"
-msgstr "Clôture"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:364
-msgid "Skirt and brim"
-msgstr "Jupe et Clôture"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1221
-msgid "Skirt height"
-msgstr "Hauteur de la clôture"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1230
-msgid "Skirt Loops"
-msgstr "Boucles de la clôture"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:398
-msgid "Slic3r &Manual"
-msgstr "&Manuel de Slic3r"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:395
-msgid "Slic3r &Website"
-msgstr "Site &Web de Slic3r"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:902
-msgid "Slic3r can upload G-code files to OctoPrint. This field should contain the API Key required for authentication."
-msgstr "Slic3r peut envoyer des fichiers G-code à OctoPrint. Ce champ doit contenir la clé d'API requise pour l'authentification."
-
-#: xs/src/libslic3r/PrintConfig.cpp:992
-msgid "Slic3r can upload G-code files to OctoPrint. This field should contain the hostname, IP address or URL of the OctoPrint instance."
-msgstr "Slic3r peut télécharger des fichiers G-code vers OctoPrint. Ce champ doit contenir le nom d'hôte, l'adresse IP ou l'URL de l'instance OctoPrint."
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:108
-msgid "Slic3r configuration is incompatible"
-msgstr "La configuration de Slic3r n'est pas compatible"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:929
-msgid "Slic3r Error"
-msgstr "Erreur de Slic3r"
-
-#: xs/src/slic3r/GUI/MsgDialog.cpp:64
-msgid "Slic3r error"
-msgstr "Erreur de Slic3r"
-
-#: xs/src/slic3r/GUI/MsgDialog.cpp:64
-msgid "Slic3r has encountered an error"
-msgstr "Slic3r a rencontré une erreur"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:108
-msgid "Slic3r incompatibility"
-msgstr "Incompatibilité avec Slic3r"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:165
-#, c-format
-msgid ""
-"Slic3r PE 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 ""
-"Slic3r PE 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."
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:42
-msgid "slic3r version"
-msgstr "version de slic3r"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:867
-msgid "Slic3r will not scale speed down below this speed."
-msgstr "Slic3r ne descendra pas en-dessous de cette vitesse."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:268
-msgid "Slice a file into a G-code"
-msgstr "Découper un fichier en G-code"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:274
-msgid "Slice a file into a G-code, save as"
-msgstr "Découper un fichier en G-code, enregistrer sous"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:287
-msgid "Slice file to a multi-layer SVG"
-msgstr "Découper un fichier en un SVG multi-couches"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:237
-msgid "Slice now"
-msgstr "Découper maintenant"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:287
-msgid "Slice to SV&G…\tCtrl+G"
-msgstr "Découper vers SV&G...\tCtrl+G"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:438
-msgid "Sliced Info"
-msgstr "Informations de découpage"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1286
-msgid "Slicing cancelled"
-msgstr "Découpe annulée"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:550
-msgid "Slicing Done!"
-msgstr "Découpe Effectuée !"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:528
-msgid "Slicing…"
-msgstr "Découpe en cours…"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1239
-msgid "Slow down if layer print time is below"
-msgstr "Ralentir si le temps d'impression de la couche est inférieur à"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1250
-msgid "Small perimeters"
-msgstr "Périmètres fins"
-
-#: xs/src/slic3r/GUI/GUI.cpp:417
-msgid "Snapshot name"
-msgstr "Nom du snapshot"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:179
-msgid "solid infill"
-msgstr "remplissage plein"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1291
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1301
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:142
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:84
-msgid "Solid infill"
-msgstr "Remplissage plein"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1279
-msgid "Solid infill every"
-msgstr "Remplissage plein toutes les"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1271
-msgid "Solid infill extruder"
-msgstr "Extrudeur pour le remplissage plein"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1262
-msgid "Solid infill threshold area"
-msgstr "Surface de seuil pour le remplissage plein"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:330
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1314
-msgid "Solid layers"
-msgstr "Couches pleines"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:470
-msgid "Soluble material"
-msgstr "Matériau soluble"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:471
-msgid "Soluble material is most likely used for a soluble support."
-msgstr "Il est probable qu'un matériau soluble soit utilisé pour un support soluble."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:653
-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 "Certaines commandes G/M-code, dont le contrôle de température et autres, ne sont pas universelles. Paramétrez cette option avec le firmware de votre imprimante pour obtenir une sortie compatible. La version \"sans extrusion\" empêche Slic3r d'exporter toute valeur d'extrusion."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1682
-msgid "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default."
-msgstr "Certaines imprimantes ou certains réglages d'imprimante peuvent rencontrer des difficultés pour imprimer avec une hauteur de couche variable. Activé par défaut."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1490
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr "Espacement entre les lignes d'interface. Mettez à zéro pour obtenir une interface pleine."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1526
-msgid "Spacing between support material lines."
-msgstr "Espacement entre les lignes des supports."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:398
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:118
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:278
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:635
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:747
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:979
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1201
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1251
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1302
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1625
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:71
-msgid "Speed"
-msgstr "Vitesse"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1203
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr "Vitesse (baud) du port USB/série pour la connexion à l'imprimante."
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:336
-msgid "Speed (mm/s)"
-msgstr "Vitesse (mm/s)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:636
-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 "Vitesse pour combler de petits interstices avec de courts mouvements en zigzag. Gardez un réglage relativement lent afin d'éviter les problèmes de vibration et de résonance. Réglez sur zéro pour désactiver le remplissage d'interstices."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:411
-msgid "Speed for non-print moves"
-msgstr "Vitesse pour les déplacements sans impression"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:980
-msgid "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr "Vitesse pour les périmètres (contours, parois verticales). Réglez sur zéro pour un ajustement automatique."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:399
-msgid "Speed for print moves"
-msgstr "Vitesse pour les déplacements d'impression"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:119
-msgid "Speed for printing bridges."
-msgstr "Vitesse d'impression des ponts."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1303
-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 "Vitesse pour imprimer des zones pleines (supérieures/inférieures/parois horizontales internes). Peut être exprimée en pourcentage (par exemple: 80%) de la vitesse de remplissage par défaut susmentionnée. Réglez sur zéro pour un ajustement automatique."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1499
-msgid "Speed for printing support material interface layers. If expressed as percentage (for example 50%) it will be calculated over support material speed."
-msgstr "Vitesse d'impression des couches d'interface des supports. Si exprimée en pourcentage (par exemple 50%), elle sera calculée à partir de la vitesse d'impression des supports."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1535
-msgid "Speed for printing support material."
-msgstr "Vitesse d'impression du support."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:748
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr "Vitesse pour imprimer le remplissage interne. Réglez sur zéro pour un ajustement automatique."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1626
-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."
-msgstr "Vitesse pour imprimer les couches pleines du dessus (ne s'applique qu'aux couches externes les plus hautes et pas aux couches pleines internes). Vous voudrez peut-être abaisser cette vitesse afin d'avoir une finition de surface plus nette. Peut être exprimé en pourcentage (par exemple: 80%) de la vitesse de remplissage pleine susmentionnée. Réglez sur zéro pour un ajustement automatique."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1648
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr "Vitesse pour les déplacements (trajet entre deux points d'extrusion distants)."
-
-#: xs/src/libslic3r/PrintConfig.cpp:460
-msgid "Speed used for loading the filament on the wipe tower. "
-msgstr "Vitesse utilisée pour charger le filament sur la tour de nettoyage. "
-
-#: xs/src/libslic3r/PrintConfig.cpp:468
-msgid "Speed used for unloading the filament on the wipe tower (does not affect  initial part of unloading just after ramming). "
-msgstr "Vitesse utilisée pour décharger le filament sur la tour de nettoyage (n'affecte pas l'étape initiale de déchargement juste après l'expulsion). "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1322
-msgid "Spiral vase"
-msgstr "Mode vase (spirale)"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:540
-msgid "Spiral Vase"
-msgstr "Mode vase (spirale)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:188
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:204
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2099
-msgid "Split"
-msgstr "Scinder"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2099
-msgid "Split the selected object into individual parts"
-msgstr "Scinder l'objet sélectionné en pièces individuelles"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:847
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1120
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1342
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1357
-msgid "Start G-code"
-msgstr "G-code de début"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:291
-msgid "Start new slicing process"
-msgstr "Démarrer un nouveau processus de découpe"
-
-#: xs/src/slic3r/GUI/FirmwareDialog.cpp:296
-msgid "Status:"
-msgstr "État :"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1539
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1581
-msgid "STL file exported to "
-msgstr "Fichier STL exporté vers "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1017
-msgid "Success!"
-msgstr "Réussi !"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:198
-msgid "support"
-msgstr "support"
-
-#: xs/src/slic3r/GUI/GUI.cpp:879
-msgid "Support"
-msgstr "Support"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:620
-msgid "Support Generator"
-msgstr "Générateur de Support"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:208
-msgid "support interface"
-msgstr "interface du support"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:374
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:375
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:191
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1030
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1380
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1387
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1399
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1409
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1417
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1432
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1453
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1464
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1480
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1489
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1498
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1509
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1525
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1533
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1534
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1543
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1551
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1565
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:147
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:89
-msgid "Support material"
-msgstr "Support"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1497
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:148
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:90
-msgid "Support material interface"
-msgstr "Interface des supports"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1552
-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 "Le support ne sera pas généré pour les surplombs dont l'inclinaison (90° = vertical) dépasse le seuil défini. Autrement dit, cette valeur représente l'inclinaison horizontale maximum (mesurée à partir du plan horizontal) que vous pouvez imprimer sans support. Réglez sur zéro pour une détection automatique (recommandé)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1470
-msgid "Support material/raft interface extruder"
-msgstr "Extrudeur pour l'interface des supports/du radeau"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1444
-msgid "Support material/raft/skirt extruder"
-msgstr "Extrudeur pour support/tapis/clôture"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1408
-msgid "Support on build plate only"
-msgstr "Support sur le plateau uniquement"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:617
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters\n"
-"\n"
-"Shall I adjust those settings for supports?"
-msgstr ""
-"Les supports sont plus efficaces, si la fonctionnalité suivante est activée :\n"
-"-Détection des périmètres de pont\n"
-"\n"
-"Voulez-vous que que je modifie les réglages des supports ?"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:59
-msgid "Suppress \" - default - \" presets"
-msgstr "Supprimer les préréglages \" - par défaut - \""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:61
-msgid "Suppress \" - default - \" presets in the Print / Filament / Printer selections once there are any other valid presets available."
-msgstr "Supprimer les préréglages \" - par défaut - \" dans les choix Impression / Filament / Imprimante une fois qu'il y a d'autres préréglages valides disponibles."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:514
-msgid "SVG"
-msgstr "SVG"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:325
-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"
-"\n"
-"Voulez-vous continuer ?"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1544
-msgid "Synchronize support layers with the object print layers. This is useful with multi-material printers, where the extruder switch is expensive."
-msgstr "Synchroniser les couches du support avec les couches d'impression de l'objet. Cela est utile pour les imprimantes multi-matériaux, pour lesquelles le changement d'extrudeur est onéreux."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1542
-msgid "Synchronize with object layers"
-msgstr "Synchroniser avec les couches de l'objet"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:402
-msgid "System Info"
-msgstr "Informations sur le Système"
-
-#: xs/src/slic3r/GUI/Tab.cpp:2286 xs/src/slic3r/GUI/Tab.cpp:2372
-#: xs/src/slic3r/GUI/Preset.cpp:605 xs/src/slic3r/GUI/Preset.cpp:645
-#: xs/src/slic3r/GUI/Preset.cpp:670 xs/src/slic3r/GUI/Preset.cpp:702
-#: xs/src/slic3r/GUI/PresetBundle.cpp:1069
-#: xs/src/slic3r/GUI/PresetBundle.cpp:1122 lib/Slic3r/GUI/Plater.pm:552
-msgid "System presets"
-msgstr "Préréglages système"
-
-#: xs/src/slic3r/GUI/GUI.cpp:403
-msgid "Take Configuration Snapshot"
-msgstr "Prendre un snapshot de la configuration"
-
-#: xs/src/slic3r/GUI/GUI.cpp:417
-msgid "Taking configuration snapshot"
-msgstr "Snapshot de la configuration  en cours"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1576
-msgid "Temperature"
-msgstr "Température"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:794
-msgid "Temperature "
-msgstr "Température "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1333
-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 "Différence de température devant être appliquée quand un extrudeur n'est pas actif. Permet la génération d'une clôture complète \"sacrificielle\" sur lequel les buses sont nettoyées régulièrement."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1332
-msgid "Temperature variation"
-msgstr "Variation de température"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:463
-msgid "Temperatures"
-msgstr "Températures"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1004
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1072
-msgid "Test"
-msgstr "Test"
-
-# Used in context: _("The ") + str_fill_pattern + _(" infill pattern is not supposed to work at 100% density.\n")
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:662
-msgid "The "
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:309
-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 "L'extrudeur à utiliser (à moins que d'autres réglages d'extrudeur plus spécifiques soient spécifiés). Cette valeur se substitue aux extrudeurs de périmètre et de remplissage, mais pas aux extrudeurs de support."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:703
-msgid "The extruder to use when printing infill."
-msgstr "L'extrudeur à utiliser pour imprimer le remplissage."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:959
-msgid "The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr "L'extrudeur à utiliser pour imprimer les périmètres et la jupe. Le premier extrudeur a le numéro 1."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1273
-msgid "The extruder to use when printing solid infill."
-msgstr "L'extrudeur à utiliser pour imprimer les remplissages plein."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1472
-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 "L'extrudeur à utiliser pour imprimer les intercalaires du support (1+,0 pour utiliser l'extrudeur actuel et limiter les changements d'outil). Cela affecte également le raft."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1446
-msgid "The extruder to use when printing support material, raft and skirt (1+, 0 to use the current extruder to minimize tool changes)."
-msgstr "L'extrudeur à utiliser pour imprimer des supports, du tapis ou des clôtures (1+,0 pour utiliser l'extrudeur actuel et limiter les changements d'outil)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:209
-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 "La première couche sera réduite sur le plan XY selon la valeur configurée afin de compenser l'écrasement de la première couche également connu sous le nom d'effet Pied d'Éléphant."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1734
-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 sizes."
-msgstr "L'objet sera agrandi/réduit sur les plans XY selon la valeur indiquée (négatif = réduit, positif = agrandi). Ce réglage peut être utile pour un réglage fin des tailles de trous."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1031
-msgid "The object will be raised by this number of layers, and support material will be generated under it."
-msgstr "L'objet sera surélevé de ce nombre de couches, et du support sera généré en dessous."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1374
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr "L'imprimante multiplexe les filaments vers une seule tête d'extrusion."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr "Le fichier sélectionné ne contient aucune géométrie."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:328
-msgid "The selected file contains several disjoint areas. This is not supported."
-msgstr "Le fichier sélectionné contient plusieurs zones disjointes. Cela n'est pas utilisable."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1112
-msgid "The selected object can't be split because it contains more than one volume/material."
-msgstr "L'objet sélectionné ne peut être scindé car il contient plus d'un volume/matériau."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1121
-msgid "The selected object couldn't be split because it contains only one part."
-msgstr "L'objet sélectionné n'a pu être scindé car il ne contient qu'une seule pièce."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1144
-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 "La vitesse de chargement d'un filament dans l'extrudeur après une rétractation (ne s'applique qu'au moteur de l'extrudeur). Si cette valeur reste sur zéro, la vitesse de rétraction est utilisée."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1136
-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)."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:533
-#, no-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"
-"- no ensure_vertical_shell_thickness\n"
-"\n"
-"Shall I adjust those settings in order to enable Spiral Vase?"
-msgstr ""
-"Le mode Vase requiert :\n"
-"-Un seul périmètre\n"
-"-Pas de couches pleines sur le dessus\n"
-"-Une densité de remplissage de 0%\n"
-"-Pas de supports\n"
-"-'S'assurer de l'épaisseur de la coque verticale' décochée\n"
-"\n"
-"Voulez-vous que je modifie ces réglages afin d'activer le mode Vase?"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1560
-msgid "The supplied name is empty. It can't be saved."
-msgstr "Le nom proposé est vide. Sauvegarde impossible."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1788
-msgid "The supplied name is not available."
-msgstr "Le nom proposé n'est pas disponible."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1785
-msgid "The supplied name is not valid; the following characters are not allowed:"
-msgstr "Le nom proposé n'est pas valide ; les caractères suivants ne sont pas autorisés :"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1418
-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 "Distance verticale entre l'objet et l'intercalaire du support. Régler cette 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."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1312
-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 ?"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:581
-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 ""
-"A l'heure actuelle la Tour de Nettoyage ne tolère les supports non-solubles \n"
-"que s'ils sont imprimés avec l'extrudeur en cours d'utilisation sans déclencher un changement d'outil.\n"
-"(support_material_extruder de même que support_material_interface_extruder doivent être réglés sur 0).\n"
-"\n"
-"Voulez-vous que je modifie ces réglages pour activer la Tour de Nettoyage ?"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:60
-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."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:767
-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]."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:49
-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]."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1603
-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 "Ce code personnalisé est inséré juste avant chaque changement d'extrudeur. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r de même que [previous_extruder] et [next_extruder]."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:228
-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 "Cette procédure de fin est insérée à la fin du fichier de sortie, avant le gcode de fin de l'imprimante. Notez que vous pouvez  utiliser des variables génériques pour tous les réglages de Slic3r. Si vous avez plusieurs extrudeurs, le gcode sera traité suivant l'ordre des extrudeurs."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:218
-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 "Cette procédure de fin est insérée à la fin du fichier de sortie. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:827
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:838
-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."
-msgstr "Ce réglage expérimental sert à limiter la vitesse de changement dans le flux d'extrusion. Une valeur de 1.8 mm³/s² garantit qu'un changement de flux d'extrusion de 1.8 mm³/s (largeur d'extrusion 0.45mm, hauteur d'extrusion 0.2mm, alimentation 20 mm/s) à 5.4 mm³/s (alimentation 60 mm/s) prendra au moins 2 secondes."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:818
-msgid "This experimental setting is used to set the maximum volumetric speed your extruder supports."
-msgstr "Ce réglage expérimental est utilisé pour paramétrer la vitesse volumétrique maximum tolérée par votre extrudeur."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1657
-msgid "This experimental setting uses G10 and G11 commands to have the firmware handle the retraction. This is only supported in recent Marlin."
-msgstr "Ce réglage expérimental utilise les commandes G10 et G11 pour laisser le firmware gérer la rétractation. Utilisable seulement par les versions récentes de Marlin."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1671
-msgid "This experimental setting uses outputs the E values in cubic millimeters instead of linear millimeters. If your firmware doesn't already know filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] T0' in your start G-code in order to turn volumetric mode on and use the filament diameter associated to the filament selected in Slic3r. This is only supported in recent Marlin."
-msgstr "Cette fonction expérimentale génère des valeurs de E en millimètres cubiques au lieu de millimètres linéaires. Si votre firmware ne connait pas déjà le diamètre du filament, vous pouvez saisir une commande comme 'M200 D[filament_diameter_0] T0' dans votre G-Code de début pour activer le mode volumétrique, et utiliser le diamètre de filament associé au filament choisi dans Slic3r. Cette fonction n'est utilisable que dans les versions récentes de Marlin."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:108
-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 "Ce facteur affecte la quantité de plastique utilisée pour les ponts. Vous pouvez le diminuer légèrement pour éviter l'affaissement. La valeur par défaut est généralement suffisante et vous devriez expérimenter le refroidissement (utiliser un ventilateur) avant de modifier ceci."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:368
-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."
-msgstr "Ce facteur modifie proportionnellement le flux d'extrusion. Vous pouvez avoir besoin de modifier ceci afin d'obtenir un rendu de surface net et une largeur correcte pour les murs uniques. Les valeurs habituelles vont de 0.9 à 1.1. Si vous pensez devoir changer davantage cette valeur, vérifiez le diamètre de votre filament et les E Steps dans le firmware."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:98
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr "Cette vitesse de ventilateur sera utilisée pour les ponts et les surplombs."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:692
-msgid "This feature allows to combine infill and speed up your print by extruding thicker infill layers while preserving thin perimeters, thus accuracy."
-msgstr "Cette fonction permet de combiner le remplissage afin d'accélérer l'impression en extrudant des couches de remplissage plus épaisses tout en conservant des périmètres fins, avec plus de précision."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1281
-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."
-msgstr "Cette fonction permet de forcer l'impression d'une couche pleine après le nombre de couches indiqué. Réglez sur zéro pour la désactiver. Vous pouvez indiquer n'importe quelle valeur (par exemple 9999); Slic3r choisira automatiquement le nombre maximum de couches a combiner en fonction du diamètre de la buse et de l'épaisseur des couches."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1323
-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 "Afin de rendre invisible les jointures, cette fonction élèvera la tête d'impresion graduellement (en cas d'impression d'un objet à paroi unique). Cette option nécessite de n'avoir qu'un seul périmètre, de ne pas avoir de remplissage, ni de surface pleine supérieure, ni de support. Vous pouvez toujours choisir le nombre de surface pleines inférieures de même que les boucles des jupes et des clôtures. Cela ne fonctionnera pas si vous imprimez plus d'un objet."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:663
-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 ""
-"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?\n"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:164
-msgid "This flag enables the automatic cooling logic that adjusts print speed and fan speed according to layer printing time."
-msgstr "Cette option active la logique de refroidissement automatique, qui ajuste la vitesse d'impression et celle du ventilateur en fonction du temps d'impression de la couche."
-
-#: xs/src/slic3r/GUI/GUI.cpp:899
-msgid "This flag enables the brim that will be printed around each object on the first layer."
-msgstr "Cette option permet l'impression de la jupe qui entoure chaque objet lors de la première couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1066
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr "Cette option active la rétractation lors d'un déplacement sur l'axe Z."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1689
-msgid "This flag will move the nozzle while retracting to minimize the possible blob on leaky extruders."
-msgstr "Cette option déplace la buse lors des rétractations, limitant ainsi l'apparition d'amas sur les extrudeurs ayant tendance à couler."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:343
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:406
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr "Ceci est uniquement utilisé dans l'interface de Slic3r comme indication visuelle."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:171
-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."
-msgstr "Accélération à laquelle votre imprimante sera réinitialisée suite à une modification de l'accélération des fonctions spécifiques (périmètre/remplissage). Régler sur zéro pour ne pas réinitialiser l'accélération."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:78
-msgid "This is the acceleration your printer will use for bridges. Set zero to disable acceleration control for bridges."
-msgstr "L'accélération qui sera utilisée par votre imprimante pour les ponts. Régler sur zéro pour désactiver l'accélération pour les ponts."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:574
-msgid "This is the acceleration your printer will use for first layer. Set zero to disable acceleration control for first layer."
-msgstr "L'accélération que l'imprimante utilisera pour la première couche. Régler sur zéro afin de désactiver le contrôle de l'accélération pour la première couche."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:682
-msgid "This is the acceleration your printer will use for infill. Set zero to disable acceleration control for infill."
-msgstr "Il s'agit de l'accélération que votre imprimante utilisera pour le remplissage. Régler sur zéro afin de désactiver le contrôle de l'accélération pour le remplissage."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:949
-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 "L'accélération que votre imprimante utilisera pour les périmètres. Une valeur élevée comme 9000  donne généralement de bons résultats si votre matériel le permet. Régler sur zéro afin de désactiver le contrôle de l'accélération pour les périmètres."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:895
-msgid "This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
-msgstr "Il s'agit du diamètre de la buse de votre extrudeur (par exemple: 0.5, 0.35, etc.)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:797
-#, no-c-format
-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."
-msgstr "Ceci est la hauteur de couche imprimable maximum pour cet extrudeur, utilisée pour plafonner la hauteur de couche variable et la hauteur de couche des supports. La hauteur de couche maximum recommandée est 75% de la largeur d'extrusion afin d'obtenir une adhésion inter-couches correcte. Si réglée sur 0, la hauteur de couche est limitée à 75% du diamètre de la buse."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:858
-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."
-msgstr "Cette valeur est la hauteur de couche imprimable minimum pour cet extrudeur et elle limite la résolution pour la hauteur de couche variable. Les valeurs type se situent entre 0.05 mm et 0.1 mm."
-
-#: xs/src/libslic3r/PrintConfig.cpp:1816
-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 "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. "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:990
-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 "Cette option définit le nombre de périmètres à générer pour chaque couche. Notez que Slic3r peut augmenter cette valeur automatiquement si il détecte une surface inclinée qui nécessite un plus grand nombre de périmètres, si l'option \"Périmètres supplémentaires\" est sélectionnée."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:923
-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 "Cette option abaissera la température des extrudeurs inutilisés pour prévenir le oozing (suintement). Cela active automatiquement la génération d'une grande clôture et le déplacement des extrudeurs hors de cette clôture lors des changements de température."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:728
-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."
-msgstr "Cette option limitera le remplissage aux zones nécessaires pour soutenir les couches supérieures (cela agira comme un support interne). Si activé, la génération du G-Code prendra plus de temps à cause des calculs supplémentaires requis."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:721
-msgid "This option will switch the print order of perimeters and infill, making the latter first."
-msgstr "Cette option inverse l'ordre d'impression des périmètres et du remplissage, ce dernier étant alors imprimé en premier."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:279
-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 "Ce réglage distinct affectera la vitesse des périmètres extérieurs (ceux qui sont visibles). Si cette valeur est exprimée en pourcentage (par exemple: 80%) elle sera calculée d'après le réglage de la vitesse de périmètre susmentionnée. Réglez sur zéro pour un ajustement automatique."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1252
-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 "Ce réglage distinct affectera la vitesse des périmètre ayant un rayon <= 6.5mm (les trous habituellement). Si cette valeur est exprimée en pourcentage (par exemple: 80%) elle sera calculée d'après le réglage de la vitesse de périmètre susmentionnée. Réglez sur zéro pour un ajustement automatique."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:737
-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."
-msgstr "Cette option applique un chevauchement supplémentaire entre les périmètres et le remplissage pour une meilleur fusion. En théorie, cela ne devrait pas être nécessaire, mais le jeu mécanique peut générer des espacements. Si exprimé en pourcentage (par exemple 15%), la valeur sera calculée en fonction de la largeur d'extrusion du périmètre."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:779
-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 "Cette option contrôle l'épaisseur (et donc le nombre total) des couches. Des couches plus fines donneront une meilleure précision mais l'impression sera plus longue."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:788
-msgid "This setting represents the maximum speed of your fan."
-msgstr "Cette option représente la vitesse maximum du ventilateur."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:849
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr "Cette option représente le PWM minimum dont votre ventilateur a besoin pour tourner."
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:120
-#, c-format
-msgid "This Slic3r PE version: %s"
-msgstr "Version de ce Slic3r PE : %s"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1358
-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 "Cette procédure de démarrage est insérée au début, après un gcode de démarrage de l'imprimante. Elle est utilisée pour remplacer les réglages pour un filament spécifique. Si Slic3r détecte des commandes M104, M109, M140 ou M190 dans vos codes personnalisés ces commandes ne seront pas ajoutées automatiquement, de cette manière vous pouvez personnaliser la procédure de chauffe et autres actions. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r, donc vous pouvez saisir une commande \"M109 S[first_layer_temperature]\" où vous voulez. Si vous avez plusieurs extrudeurs, le G-Code sera exécuté dans l'ordre des extrudeurs."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1343
-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 "Cette procédure de démarrage est insérée au début, après que le plateau a atteint la température ciblée et lorsque l'extrudeur vient juste de commencer à chauffer, et avant que l'extrudeur ait terminé de chauffer. Si Slic3r détecte des commandes M104 ou M190 dans vos codes personnalisés, ces commandes ne seront pas ajoutées automatiquement ainsi vous serez libre de personnaliser l'ordre des commandes de chauffe et autres actions personnalisées. Notez que vous pouvez utiliser des variables génériques pour tous les réglages de Slic3r, donc vous pouvez mettre une commande \"M109S[first_layer_temperature]\" où vous le souhaitez."
-
-#: xs/src/libslic3r/PrintConfig.cpp:487
-msgid "This string is edited by RammingDialog and contains ramming specific parameters "
-msgstr "Cette chaine est éditée par RammingDialog et contient les paramètres spécifiques d'expulsion "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1743
-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)."
-msgstr "Cette valeur sera ajoutée (ou soustraite) de toutes les coordonnées Z dans le G-Code de sortie. Elle est utilisée pour compenser une mauvaise position de fin de course Z: par exemple si votre fin de course place votre buse à 0.3mm au dessus du plateau, réglez cette valeur sur -0.3 (ou corrigez votre fin de course)."
-
-#: xs/src/libslic3r/PrintConfig.cpp:1808
-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 "Ce vecteur enregistre les volumes requis pour changer l'outil utilisé pour la tour de nettoyage. Ces valeurs sont utilisées pour simplifier la création des volumes de purge complets ci-dessous. "
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:111
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-"Cette version de Slic3r PE 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 Slic3r PE après en avoir utilisé une nouvelle.\n"
-"\n"
-"Vous pouvez soit quitter Slic3r 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 Slic3r.\n"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1590
-msgid "Threads"
-msgstr "Threads"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1591
-msgid "Threads are used to parallelize long-running tasks. Optimal threads number is slightly above the number of available cores/processors."
-msgstr "Les threads sont utilisés pour paralléliser les calculs longs. Le nombre optimal de threads est légèrement supérieur au nombre de coeurs/processeurs disponibles."
-
-#: xs/src/slic3r/GUI/RammingChart.cpp:81
-msgid "Time"
-msgstr "Durée"
-
-#: xs/src/libslic3r/PrintConfig.cpp:477
-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. "
-msgstr "Temps d'attente nécessaire après que le filament ait été déchargé.  Peut aider à obtenir des changements d'outils fiables avec des matériaux flexible qui ont besoin de plus de temps pour revenir à leurs dimensions originales. "
-
-#: xs/src/slic3r/GUI/Tab.cpp:750
-msgid "To do that please specify a new name for the preset."
-msgstr "Pour faire cela veuillez spécifier un nouveau nom pour le préréglage."
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:34
-msgid "To download, follow the link below."
-msgstr "Pour télécharger, suivez le lien ci-dessous."
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:338
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:72
-msgid "Tool"
-msgstr "Outil"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:238
-msgid "Tool #"
-msgstr "Outil #"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1144
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1602
-msgid "Tool change G-code"
-msgstr "G-code de changement d'outil"
-
-#: xs/src/slic3r/GUI/Tab.cpp:1315
-msgid "Toolchange parameters with single extruder MM printers"
-msgstr "Paramètres de changement d'outil pour les imprimantes multi-matériaux mono-extrudeur"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1638
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:369
-msgid "Top"
-msgstr "Haut"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:187
-msgid "top solid infill"
-msgstr "remplissage plein du dessus"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1613
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1624
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:143
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:85
-msgid "Top solid infill"
-msgstr "Remplissage plein du dessus"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1642
-msgid "Top solid layers"
-msgstr "Couches pleines du dessus"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:369
-msgid "Top View"
-msgstr "Vue du Dessus"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:246
-msgid "Top/bottom fill pattern"
-msgstr "Motif de remplissage dessus/dessous"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:245
-msgid "Total purging volume is calculated by summing two values below, depending on which tools are loaded/unloaded."
-msgstr "Le volume de purge total est calculé en additionnant les deux valeurs ci-dessous, en fonction des outils qui sont chargés/déchargés."
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:84
-msgid "Total rammed volume"
-msgstr "Volume total expulsé"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:82
-msgid "Total ramming time"
-msgstr "Durée totale de l'expulsion"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1647
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:95
-msgid "Travel"
-msgstr "Déplacement"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1107
-msgid "Type of the printer."
-msgstr "Type d'imprimante."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2070
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2086
-msgid "Uniformly…"
-msgstr "Uniformément…"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:24
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:232
-msgid "unloaded"
-msgstr "déchargé"
-
-#: xs/src/libslic3r/PrintConfig.cpp:467
-msgid "Unloading speed"
-msgstr "Vitesse de déchargement"
-
-#: xs/src/slic3r/GUI/Tab.cpp:2483
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system values for the current option group.\n"
-"Click to reset all settings for current option group to the system values."
-msgstr ""
-"L'icône CADENAS OUVERT indique que certains paramètres ont été modifiés et ne sont pas égaux aux valeurs 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 par défaut."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2498
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system value.\n"
-"Click to reset current value to the system value."
-msgstr ""
-"L'icône CADENAS OUVERT indique que la valeur a été changée et n'est pas égale à la valeur par défaut.\n"
-"Cliquez pour régler la valeur actuelle sur la valeur par défaut."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2445
-msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to the system values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system values."
-msgstr ""
-"CADENAS OUVERT;indique que certains paramètres ont été modifiés et ne sont pas égaux aux valeurs 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 par défaut."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:97
-msgid "Unretractions"
-msgstr "Dérétractation"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1492
-msgid "Unsaved Changes"
-msgstr "Changements Non Sauvegardés"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:750
-msgid "Unsaved Presets"
-msgstr "Préréglages Non Sauvegardés"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:27
-msgid "Update available"
-msgstr "Mise à jour disponible"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:279 xs/src/slic3r/GUI/Preferences.cpp:67
-msgid "Update built-in Presets automatically"
-msgstr "Mettre à jour automatiquement les Préréglages intégrés"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:264
-msgid "Updates"
-msgstr "Mises à jour"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:283
-msgid "Updates are never applied without user's consent and never overwrite user's customized settings."
-msgstr "Les mises à jour ne sont jamais appliquées sans l'accord de l'utilisateur et n'annulent jamais les réglages personnalisés de l'utilisateur."
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:15
-msgid "Upgrade"
-msgstr "Mise à jour"
-
-#: xs/src/slic3r/GUI/GUI.cpp:326
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr "Charger un firmware dans une imprimante basée sur un Arduino"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:989
-msgid "USB/Serial connection"
-msgstr "Port USB/Série"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1194
-msgid "USB/serial port for printer connection."
-msgstr "Port USB/Série pour la connexion de l'imprimante."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1656
-msgid "Use firmware retraction"
-msgstr "Utiliser la rétractation du firmware"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:75
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr "Utiliser le rendu de legacy OpenGL 1.1"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1663
-msgid "Use relative E distances"
-msgstr "Utiliser des valeurs E relatives"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:361
-msgid "Use this option to set the axis letter associated to your printer's extruder (usually E but some printers use A)."
-msgstr "Utiliser cette option pour indiquer la lettre utilisée par l'extrudeur de votre imprimante (habituellement E, mais certaines imprimantes utilisent A)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1400
-msgid "Use this setting to rotate the support material pattern on the horizontal plane."
-msgstr "Utiliser ce réglage pour orienter le motif du support sur le plan horizontal."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1670
-msgid "Use volumetric E"
-msgstr "E Volumétrique"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:449
-msgid "Used Filament (g)"
-msgstr "Filament Utilisé (g)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:447
-msgid "Used Filament (m)"
-msgstr "Filament Utilisé (m)"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:448
-msgid "Used Filament (mm³)"
-msgstr "Filament Utilisé (mm³)"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:21
-msgid "User"
-msgstr "Utilisateur"
-
-#: xs/src/slic3r/GUI/Preset.cpp:649 xs/src/slic3r/GUI/Preset.cpp:706
-#: xs/src/slic3r/GUI/PresetBundle.cpp:1127 lib/Slic3r/GUI/Plater.pm:553
-msgid "User presets"
-msgstr "Préréglages utilisateur"
-
-#: xs/src/slic3r/GUI/ButtonsDescription.cpp:38
-msgid "Value is the same as the system value"
-msgstr "La valeur est identique à la valeur du système"
-
-#: xs/src/slic3r/GUI/ButtonsDescription.cpp:55
-msgid "Value was changed and is not equal to the system value or the last saved preset"
-msgstr "La valeur a été changée et n'est pas égale à la valeur du système ou au dernier préréglage sauvegardé"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:55
-msgid "variants"
-msgstr "variantes"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:49 xs/src/slic3r/GUI/Tab.cpp:755
-msgid "vendor"
-msgstr "fabriquant"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:644
-msgid "Verbose G-code"
-msgstr "G-code commenté"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
-msgid "Version "
-msgstr "Version "
-
-#: xs/src/slic3r/GUI/AboutDialog.cpp:60
-msgid "Version"
-msgstr "Version"
-
-#: xs/src/slic3r/GUI/ConfigSnapshotDialog.cpp:49
-msgid "version"
-msgstr "version"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:318
-msgid "Vertical shells"
-msgstr "Parois verticales"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:65
-msgid "View"
-msgstr "Vue"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:409
-msgid "Volume"
-msgstr "Volume"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:241
-msgid "Volume to purge (mm³) when the filament is being"
-msgstr "Volume à purger (mm³) lorsque le filament est"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
-msgid "Volumetric"
-msgstr "Volumétrique"
-
-#: lib/Slic3r/GUI/Plater/3DPreview.pm:71
-msgid "Volumetric flow rate"
-msgstr "Débit volumétrique"
-
-#: xs/src/libslic3r/GCode/PreviewData.cpp:370
-msgid "Volumetric flow rate (mm3/s)"
-msgstr "Débit volumétrique (mm3/s)"
-
-#: xs/src/slic3r/GUI/RammingChart.cpp:86
-msgid "Volumetric speed"
-msgstr "Vitesse volumétrique"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:500
-msgid "Warning"
-msgstr "Alerte"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:205
-msgid "Welcome"
-msgstr "Bienvenue"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:205
-#, c-format
-msgid "Welcome to the Slic3r %s"
-msgstr "Bienvenue sur Slic3r %s"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\2D.pm:131
-msgid "What do you want to print today? â„¢"
-msgstr "Que voulez-vous imprimer aujourd'hui? â„¢"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:69
-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 "Lorsqu'ils sont sélectionnés, les préréglages de l'imprimante et du filament sont visibles dans l'éditeur de préréglage même s'ils sont désignés comme incompatibles avec l'imprimante en cours d'utilisation"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:219
-msgid "when printing "
-msgstr "pendant l'impression des "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:136
-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 "Lorsque vous imprimez des objets multi-matériaux, ce réglage fera en sorte que Slic3r rattache ensemble les parties de l'objet qui se superposent (la 2e partie sera rattachée à la 1ere, la 3e partie sera rattachée à la 1ere et la 2e, etc...)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:155
-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."
-msgstr "Lorsque vous imprimez plusieurs objets ou copies, ce réglage permet de terminer un objet avant de passer au suivant (en repartant de sa première couche). Cette fonction est utile pour éviter les risques d'impressions gâchées. Slic3r doit vous avertir et éviter les collisions entre les objets et l'extrudeur, mais soyez vigilant."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:605
-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 "Lors d'une impression avec de très faibles épaisseurs de couche, vous pouvez choisir d'imprimer une première couche plus épaisse pour améliorer l'adhérence et la tolérance aux plateaux imparfaits. Ce réglage peut être exprimé comme une valeur absolue ou un pourcentage (par exemple 150%) par rapport à l'épaisseur de couche par défaut."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1082
-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 "Lorsque la rétractation est déclenchée avant un changement d'outil, le filament est retiré de la longueur indiquée (la longueur est mesurée sur le filament brut, avant qu'il entre dans l'extrudeur)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1073
-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 "Lorsque la rétractation est déclenchée, le filament est tiré en arrière de la longueur indiquée (la longueur est mesurée sur le filament brut, avant qu'il entre dans l'extrudeur)."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:808
-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."
-msgstr "Lorsque vous réglez les autres vitesses à 0, Slic3r calculera automatiquement la vitesse optimale de façon à garder une pression constante dans l'extrudeur. Cette fonction expérimentale est utilisée pour régler la plus haute vitesse que vous souhaitez autoriser."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1127
-msgid "When the retraction is compensated after changing tool, the extruder will push this additional amount of filament."
-msgstr "Lorsque la rétractation est compensée après un changement d'outil, l'extrudeur exprimera cette quantité de filament en plus."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1119
-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 "Lorsque la rétractation est compensée après un déplacement, l'extruder exprimera cette quantité de filament en plus. Ce réglage est rarement nécessaire."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2486
-msgid "WHITE BULLET icon indicates a non system preset."
-msgstr "L'icône en forme de PUCE BLANCHE indique un préréglage non-système."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2489
-msgid "WHITE BULLET icon indicates that the settings are the same as in the last saved preset for the current option group."
-msgstr "L'icône en forme de PUCE BLANCHE indique que les réglages sont identiques au dernier préréglage sauvegardé pour le groupe d'options actuel."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2504
-msgid "WHITE BULLET icon indicates that the value is the same as in the last saved preset."
-msgstr "L'icône PUCE BLANCHE indique que la valeur est la même que pour le dernier préréglage sauvegardé."
-
-#: xs/src/slic3r/GUI/Tab.cpp:2451
-msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr "PUCE BLANCHE;pour le bouton gauche : indique un préréglage non-système, pour le bouton droit : indique que le réglage n'a pas été modifié."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1716
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:70
-msgid "Width"
-msgstr "Largeur"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:334
-msgid "Width (mm)"
-msgstr "Largeur (mm)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1717
-msgid "Width of a wipe tower"
-msgstr "Largeur d'une tour de nettoyage"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:41
-#, c-format
-msgid "will always run at %d%% "
-msgstr "fonctionnera toujours à %d%% "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:50
-msgid "will be turned off."
-msgstr "sera désactivé."
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:442
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:149
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:91
-msgid "Wipe tower"
-msgstr "Tour de nettoyage"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:564
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:585
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:602
-msgid "Wipe Tower"
-msgstr "Tour de Nettoyage"
-
-#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:142
-msgid "Wipe tower - Purging volume adjustment"
-msgstr "Tour de nettoyage - Ajustement du volume de purge"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1847
-msgid "Wipe tower rotation angle"
-msgstr "Angle de rotation de la tour de nettoyage"
-
-#: xs/src/libslic3r/PrintConfig.cpp:1848
-msgid "Wipe tower rotation angle with respect to x-axis "
-msgstr "Angle de rotation de la tour de nettoyage par rapport à l'axe X "
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1688
-msgid "Wipe while retracting"
-msgstr "Nettoyer lors des rétractations"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1058
-msgid "With bowden extruders, it may be wise to do some amount of quick retract before doing the wipe movement."
-msgstr "Avec les extrudeurs bowden, il est conseillé d'effectuer une rétractation rapide avant de réaliser le mouvement de nettoyage."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1564
-msgid "With sheath around the support"
-msgstr "Avec une enveloppe autour du support"
-
-#: xs/src/slic3r/GUI/UpdateDialogs.cpp:72
-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"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"Voulez-vous l'installer ?\n"
-"\n"
-"Notez qu'un snapshot 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 :"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1703
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr "Coordonnée X du coin avant gauche d'une tour de nettoyage"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1386
-msgid "XY separation between an object and its support"
-msgstr "Séparation XY entre un objet et son support"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1388
-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 "Séparation XY entre un objet et son support. Si la valeur est exprimée en pourcentage (par exemple 50%), elle sera calculée à partir de la largeur du périmètre extérieur."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1732
-msgid "XY Size Compensation"
-msgstr "Compensation de Taille XY"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1710
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr "Coordonnée Y du coin avant gauche d'une tour de nettoyage"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1970
-msgid "Yes"
-msgstr "Oui"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:885
-msgid "You can put here your personal notes. This text will be added to the G-code header comments."
-msgstr "Vous pouvez inscrire ici vos commentaires personnels. Ce texte sera ajouté au commentaire en entête du G-Code."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:413
-msgid "You can put your notes regarding the filament here."
-msgstr "Vous pouvez saisir vos remarques concernant le filament ici."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1015
-msgid "You can put your notes regarding the printer here."
-msgstr "Vous pouvez saisir ici vos observations concernant l'imprimante."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:181
-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 "Vous pouvez régler ce paramètre sur une valeur positive pour désactiver complètement le ventilateur pendant les premières couches, afin de ne pas rendre l'adhérence plus difficile."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:931
-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 "Vous pouvez utiliser toutes les options de configuration comme variables dans ce modèle. Par exemple :  [layer_height], [fill_density] etc. Vous pouvez aussi utiliser [timestamp], [year], [month], [day], [hour], [minute], [second], [version], [input_filename], [input_filename_base]."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:749
-msgid "You have unsaved changes "
-msgstr "Les modifications n'ont pas été sauvegardées "
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:101
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr "Vous devez redémarrer Slic3r afin que les modifications soient appliquées."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:594
-msgid "Your file was repaired."
-msgstr "Votre fichier a été réparé."
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:744
-msgid "Your object appears to be too large, so it was automatically scaled down to fit your print bed."
-msgstr "Votre objet semble être trop grand, il a donc été automatiquement réduit afin de l'adapter à votre plateau d'impression."
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1742
-msgid "Z offset"
-msgstr "Décalage Z"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:91
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:492
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1170
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1181
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1401
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1557
-msgid "°"
-msgstr "°"
-
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:484
-#: xs/src/slic3r/GUI/ConfigWizard.cpp:498
-msgid "°C"
-msgstr "°C"
-
-#: supermerill's add: tab.cpp
-msgid "Avoid unsupported perimeters"
-msgstr "Eviter les périmètres sans support"
-
-#: supermerill's add: tab.cpp
-msgid "Seam"
-msgstr "Jointures"
-
-#: supermerill's add: tab.cpp
-msgid "Looping perimeter"
-msgstr "Périmètres en boucle"
-
-#: supermerill's add: tab.cpp
-msgid "Fill internal"
-msgstr "Remplissage interne"
-
-#: supermerill's add: tab.cpp
-msgid "Fill external"
-msgstr "Remplissage plein externe"
-
-#: supermerill's add: tab.cpp
-msgid "Supporting dense layer"
-msgstr "Couche de support pour remplissage plein"
-
-#: supermerill's add: tab.cpp
-msgid "Anchor solid infill by X mm"
-msgstr "Ancrage des remplissages plein de X mm "
-
-#: supermerill's add: tab.cpp
-msgid "Perimeter speed"
-msgstr "Vitesses pour les périmètres"
-
-#: supermerill's add: tab.cpp
-msgid "Infill speed"
-msgstr "Vitesses pour les remplissages"
-
-#: supermerill's add: tab.cpp
-msgid "Support speed"
-msgstr "Vitesses pour les supports"
-
-#: supermerill's add: tab.cpp
-msgid "First layer speed"
-msgstr "Vitesses pour la première couche"
-
-#: supermerill's add: tab.cpp
-msgid "Wipe tower position"
-msgstr "Position de la tour de vidage"
-
-#: supermerill's add: tab.cpp
-msgid "Bridge flow ratio"
-msgstr "Débit lors de ponts"
-
-#: supermerill's add: tab.cpp
-msgid "XY compensation"
-msgstr "Compensation en XY"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "remove_small_gaps"
-msgstr "Retirer les petites imperfections"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Top fan speed"
-msgstr "Vitesse du ventilateur pour le dessus"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Above the bridges"
-msgstr "Au-dessus des ponts"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "First layer"
-msgstr "Première couche"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Top Pattern"
-msgstr "Motif du dessus"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Bottom Pattern"
-msgstr "Motif du dessous"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Enforce 100% fill volume"
-msgstr "S'assurer que les remplissages sont exacts en volume"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Bridged"
-msgstr "Ponts"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "External"
-msgstr "Externe"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Seam position"
-msgstr "Position des jointures"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Only one perimeter on Top surfaces"
-msgstr "Seulement un périmètre autoir des surfaces du dessus"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Fill"
-msgstr "Remplissage"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Do not connect infill lines to each other"
-msgstr "Ne pas connecter les lignes de remplissage entre elles"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Algorithm"
-msgstr "Algorithme"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Sparse"
-msgstr "Epars"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Exact last layer height"
-msgstr "Mettre la dernière tranche à la heuteur exacte"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Minimum perimeters"
-msgstr "Nombre min de périmètres"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Only on bridged areas"
-msgstr "Seulement sur ponts"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Solid first layer"
-msgstr "Première couche pleine"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Travel move reduced"
-msgstr "Moins de déplacements"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Hidden"
-msgstr "Cachée"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Small"
-msgstr "Fins"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Solid"
-msgstr "Plein"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Interface"
-msgstr "Interface"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Top solid"
-msgstr "Plein du dessus"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "All layers"
-msgstr "Toutes les couches"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Holes"
-msgstr "Trous"
-
-#: tooltips
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Remove small gaps"
-msgstr "Retire les mini-espaces/imperfections"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Remove the small gaps in the 3D model when slicing. Disable it if you "
-        "are very confident on your model, or you want to print an item with a geometry "
-        "designed for vase mode."
-msgstr "Retire touts les petits trous et espaces (imperfections) qui peuvent être présent sur le modèle. A ne décocher que si le modèle 3D à été crée exprès, pour le mode vase."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "This fan speed is enforced during all top fills."
-msgstr "Cette vitesse de ventilation est utilisé pour toutes les surface du dessus."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "This factor affects the amount of plastic to overextrude "
-                   "when we are filling on top of a bridge surface."
-                   "With a number >1, we can retrieve a correct z-height "
-                   "even if the bridged layer has fallen a bit. "
-                   "It's useful if you want to have a nice flat top layer."
-msgstr "Ce paramètre affecxte la quantité de matière déposée au-dessus des ponts. Sachant que les ponts s'affaissent un peu, avec un paramètre légèrement supérieur à 1, on peut revenir à la bonne hauteur. C'est surtotu utile si on veut obtenir des surfaces supérieure bien plate et jolie."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "The first layer will be grown / shrunk in the XY plane by the configured value "
-                   "to compensate for the 1st layer squish aka an Elephant Foot effect. (should be negative = inwards)"
-msgstr "La première couche est agrandie / rétrécie en XY par cette valeur pour compenser la déformation de la première couche. (negatif = vers l'intérieur de la pièce, positif = vers l'extérieur) !!! Devrait être négative  (<0) afin de rétrécir la pièce !!!"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Fill pattern for top infill. This only affects the top external visible layer, and not its adjacent solid shells."
-msgstr "Motif pour les surfaces du dessus. Ceci affecte seulement la couche externe visible, et non les coques pleines adjacentes."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Fill pattern for bottom infill. This only affects the bottom external visible layer, and not its adjacent solid shells."
-msgstr "Motif pour les surfaces du dessous. Ceci affecte seulement la couche externe visible, et non les coques pleines adjacentes."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Experimental option which modifies (in solid infill) fill flow to have the exact amount of plastic inside the volume to fill "
-        "(it generally changes the flow from -7% to +4%, depending on the size of the surface to fill and the overlap parameters, "
-        "but it can go as high as +50% for infill in very small areas where rectilinear doesn't have good coverage). It has the advantage "
-        "to remove the over-extrusion seen in thin infill areas, from the overlap ratio"
-msgstr "Option expérimentale qui modifie le débit dans les couches pleines pour s'assurer que le volume extrudé est égal au volume à remplir. En génral, le débit n'ets modifié que de 4-7% mais cela peut aller jusqu'a +50% dans les très petites zones où il est difficile de circuler. Le pricipal avantage est de retirer l'effet de sur-extrusion souvent vues dans les zones de remplissage étroites."
-
-#: supermerill's add: PrintConfig.cpp
-msgid This parameter grows the top/bottom/solid layers by the specified MM to anchor them into the part. Put 0 to deactivate it."
-msgstr "Ce paramètre agrandi les couches pleines par X mm pour bien les ancrer dans la pièce. Mettre 0 pour désactiver cette fonction."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "This parameter grows the bridged solid infill layers by the specified MM to anchor them into the part. Put 0 to deactivate it."
-msgstr "Ce paramètre agrandi les couches de pont par X mm pour bien les ancrer dans la pièce. Mettre 0 pour désactiver cette fonction."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Join the perimeters to create only one continuous extrusion without any z-hop."
-        " Long inside travel (from external to holes) are not extruded to give some space to the infill."
-msgstr "Rabouter les périmètres pour en créer une unique et longue extrusion. Lors d'un passage de périmètre extérieur vers intérieur, si l'espace est grand, un déplacemnt sera tout de même utilisé."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Position of perimeters starting points."
-msgstr "Position des point de départ des jonctions entre périmètres"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Use only one perimeter on flat top surface, to let more space to the top infill pattern."
-msgstr "Utiliser seulement une seule ligne de périmètre sur les surfaces du dessus, afin de laisser le plus de place possible au motif de remplissage du dessus."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "If expressed as absolute value in mm/s, this speed will be applied to all the print moves "
-                   "but infill of the first layer, it can be overwrite by the 'default' (default depends of the type of the path) "
-                   "speed if it's lower than that. If expressed as a percentage "
-                   "(for example: 40%) it will scale the 'default' speeds."
-msgstr "Si exprimée avec une valeur absolue en mm/s, cette vitesse sera appliquée à toutes les impressions de la première couche, sauf les remplissages (et si la vitesse par défaut est plus petite, elle sera utilisée à la place). Si exprimée comme un pourcentage (par exemple 40%), cela modulera la vitesse par défaut."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "If expressed as absolute value in mm/s, this speed will be applied to infill moves "
-                   "of the first layer, it can be overwrite by the 'default' (solid infill or infill if not bottom) "
-                   "speed if it's lower than that. If expressed as a percentage "
-                   "(for example: 40%) it will scale the 'default' speed."
-msgstr "Si exprimée avec une valeur absolue en mm/s, cette vitesse sera appliquée aux impressions de remplissage de la première couche (et si la vitesse par défaut est plus petite, elle sera utilisée à la place). Si exprimée comme un pourcentage (par exemple 40%), cela modulera la vitesse par défaut."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Enable gap fill algorithm. It will extrude small lines between perimeters "
-        "when there is not enough space for another perimeter or an infill."
-msgstr "Active les impression de remplissage des petits trous qui peuvent subsister entre les périmètres et sui sont trop petits pour faire du remplissage."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Enables the creation of a support layer under the first solid layer. This allows you to use a lower infill ratio without compromising the top quality."
-        " The dense infill is laid out with a 50% infill density."
-msgstr "Active le remplacement du motif de remplissage sous les remplissage plein afin de permettre un meilleur support de ceux-ci. Cela permet de choisir un ratio de remplissage plus petit."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "If checked, the infill algorithm will try to not connect the lines near the infill. Can be useful for art or with high infill/perimeter overlap."
-msgstr "Si coché, l'algorithme de dessin des patrons de remplissage va essayer de ne pas connecter ses lignes entre elles, en bordure des périmètres."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Choose the way the dense layer is lay out."
-        " The automatic option let it try to draw the smallest surface with only strait lines inside the sparse infill."
-        " The anchored just enlarge a bit (by bridged anchor) the surfaces that need a better support."
-msgstr "Choisissez la façon dont la couche de support est dessinée. L'option eutomatique essayera de trouver une surface sans virage au milieu du vide. L'option ancrée utilisera une surface un peu plus grande que celle supoortée."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Automatic"
-msgstr "Automatique"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Automatic, only for small areas"
-msgstr "Automatique, sur les zones étroites"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Anchored"
-msgstr "Ancré"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "This setting controls the height of last object layers to put the last layer at the exact highest height possible. Experimental."
-msgstr "Ce paramètre fonctionne mal, ne l'utilisez pas. Il aurait dû placer la dernière couche exactement à la hauteur de l'objet, mais ça marche mal."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Experimental option to remove perimeters where there is nothing under it and where a bridged infill should be better. Computationally intensive!"
-msgstr "option très expérimentale pour permettre de ne pas mettre de périmètres s'il n'y a pas de couches en support en-dessous."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Number of perimeters exluded from this option."
-msgstr "Nombre de périmètre qui ne sont pas retirés par cette fonction"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Only remove perimeters over areas marked as 'bridge'. Can be useful to let perimeter run over overhangs, but it's not very reliable."
-msgstr "Ne retirer les périmètres qu'au dessus des endroit où il peut y avoir des ponts. Utile pour garder les surplombs."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Use a solid layer instead of a raft for the layer that touch the build plate."
-msgstr "Dépose une couche peinle sur le plateur à la place d'un quadriallage."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Add a big cost to travel paths when possible (when going into a loop), so it will prefer a less optimal seam posistion if it's nearer."
-msgstr "Ajoute un fort coût aux déplacement pour les minimiser davantage."
-
-#: supermerill's add: PrintConfig.cpp
-msgid "The convex holes will be grown / shrunk in the XY plane by the configured value"
-                   " (negative = inwards, positive = outwards, should be positive as the holes are always a bit smaller)."
-                   " This might be useful for fine-tuning hole sizes."
-msgstr "Les trous convexes vont être agrandis/rétécis en XY par cette valeur pour compenser la rétractation du palstique. (negatif = vers l'intérieur de la pièce, positif = vers l'extérieur) !!! Devrait être négative (<0) afin d'agrandir le trou!!!"
-
-#: supermerill's add: PrintConfig.cpp
-msgid "Invalid value for --over-bridge-flow-ratio"
-msgstr "Valeur invalide pour --over-bridge-flow-ratio"
-
-#: supermerill's add: others Tab.hpp
-msgid "Hardware Settings"
-msgstr "Paramètres du matériel"
-
-msgid "Rectilinear"
-msgstr "Rectilinéaire"
-
-msgid "Grid"
-msgstr "Grille"
-
-msgid "Stars"
-msgstr "Etoiles"
-
-msgid "Cubic"
-msgstr "Tri-Cubique"
-
-msgid "Line"
-msgstr "Lignes"
-
-msgid "Concentric"
-msgstr "Concentrique"
-
-msgid "Honeycomb"
-msgstr "Hexagones"
-
-msgid "3D Honeycomb"
-msgstr "Hexagonal 3D"
-
-msgid "Gyroid"
-msgstr "Gyroide"
-
-msgid "Hilbert Curve"
-msgstr "Hilbert (Fractale)"
-
-msgid "Ironing"
-msgstr "Lissée"
-
-msgid "Concentric"
-msgstr "Concentrique"
-
-msgid "Nearest"
-msgstr "Au plus près"
-
-msgid "Random"
-msgstr "Aléatoire"
-
-msgid "Aligned"
-msgstr "Aligné"
-
-msgid "Concentric"
-msgstr "Concentrique"
diff --git a/resources/localization/it/Slic3rPE.mo b/resources/localization/it/Slic3rPE.mo
deleted file mode 100644
index dd865ca9d..000000000
Binary files a/resources/localization/it/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/it/Slic3rPE_it.po b/resources/localization/it/Slic3rPE_it.po
deleted file mode 100644
index 1bd270426..000000000
--- a/resources/localization/it/Slic3rPE_it.po
+++ /dev/null
@@ -1,7058 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language: it\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.8\n"
-"Language-Team: \n"
-
-#: src/slic3r/GUI/AboutDialog.cpp:33
-msgid "About Slic3r"
-msgstr "Riguardo Slic3r"
-
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
-msgid "Version"
-msgstr "Versione"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:43
-msgid "Shape"
-msgstr "Forma"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
-msgid "Rectangular"
-msgstr "Rettangolare"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
-msgid "Size"
-msgstr "Dimensione"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
-msgid "Size in X and Y of the rectangular plate."
-msgstr "Dimensioni su X e Y del piano rettangolare."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
-msgid "Origin"
-msgstr "Origine"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
-msgid ""
-"Distance of the 0,0 G-code coordinate from the front left corner of the "
-"rectangle."
-msgstr ""
-"Distanza della coordinata 0,0 del G-code dall'angolo frontale sinistro del "
-"rettangolo."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
-msgid "Circular"
-msgstr "Circolare"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
-msgid "mm"
-msgstr "mm"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
-msgid "Diameter"
-msgstr "Diametro"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
-msgid ""
-"Diameter of the print bed. It is assumed that origin (0,0) is located in the "
-"center."
-msgstr ""
-"Diametro del piano di stampa. Si presume che l'origine (0,0) si trovi al "
-"centro."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
-#: src/libslic3r/GCode/PreviewData.cpp:175
-msgid "Custom"
-msgstr "Personalizzato"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
-msgid "Load shape from STL..."
-msgstr "Carica forma da STL..."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr ""
-"Scegli un file per importare la forma del piano da (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
-msgid "Error! "
-msgstr "Errore! "
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr "Il file selezionato non contiene geometrie."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
-msgid ""
-"The selected file contains several disjoint areas. This is not supported."
-msgstr ""
-"Il file selezionato contiene molteplici aree disgiunte. Non è supportato."
-
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape"
-msgstr "Forma Letto"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:54
-msgid "Network lookup"
-msgstr "Network lookup"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:67
-msgid "Address"
-msgstr "Indirizzo"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:68
-msgid "Hostname"
-msgstr "Hostname"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:69
-msgid "Service name"
-msgstr "Nome servizio"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:70
-msgid "OctoPrint version"
-msgstr "Versione di OctoPrint"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:188
-msgid "Searching for devices"
-msgstr "Ricerca dispositivi"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:195
-msgid "Finished"
-msgstr "Finito"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:15
-msgid "Buttons And Text Colors Description"
-msgstr "Descrizione colori testo e pulsanti"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:40
-msgid "Value is the same as the system value"
-msgstr "Valore uguale a quello di sistema"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:57
-msgid ""
-"Value was changed and is not equal to the system value or the last saved "
-"preset"
-msgstr ""
-"Il valore è stato modificato e non è uguale al valore di sistema o "
-"all'ultimo preset salvato"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
-msgid "Upgrade"
-msgstr "Aggiorna"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
-msgid "Downgrade"
-msgstr "Downgrade"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
-msgid "Before roll back"
-msgstr "Prima di tornare indietro"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
-msgid "User"
-msgstr "Utente"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
-msgid "Unknown"
-msgstr "Ignoto"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
-msgid "Active: "
-msgstr "Attivo: "
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "slic3r version"
-msgstr "versione di slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
-msgid "print"
-msgstr "stampa"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "filaments"
-msgstr "filamenti"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
-msgid "printer"
-msgstr "stampante"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
-msgid "vendor"
-msgstr "venditore"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
-msgid "version"
-msgstr "versione"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
-msgid "min slic3r version"
-msgstr "versione min slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
-msgid "max slic3r version"
-msgstr "versione slic3r massima"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "model"
-msgstr "modello"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "variants"
-msgstr "varianti"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
-msgid "Incompatible with this Slic3r"
-msgstr "Incompatibile con questo Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
-msgid "Activate"
-msgstr "Attiva"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
-msgid "Configuration Snapshots"
-msgstr "Istantanee di Configurazione"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:92
-msgid "nozzle"
-msgstr "ugello"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
-msgstr "predefinito"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
-msgstr "Seleziona tutto"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "Deseleziona tutti"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-#, c-format
-msgid "Welcome to the Slic3r %s"
-msgstr "Benvenuto su Slic3r %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-msgid "Welcome"
-msgstr "Benvenuti"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
-#, c-format
-msgid "Run %s"
-msgstr "Run %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:234
-#, c-format
-msgid ""
-"Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
-"configuration; just a few settings and you will be ready to print."
-msgstr ""
-"Ciao, benvenuto su Slic3r Prusa Edition! Questo %s ti aiuterà con la "
-"configurazione iniziale; giusto un paio di impostazioni e sarai pronto a "
-"stampare."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:238
-msgid ""
-"Remove user profiles - install from scratch (a snapshot will be taken "
-"beforehand)"
-msgstr ""
-"Rimuovi profili utente - reinstalla da zero (sarà prima fatto uno snapshot)"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr "Altri fornitori"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr "Setup personalizzato"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Automatic updates"
-msgstr "Aggiornamenti automatici"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Updates"
-msgstr "Aggiornamenti"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
-msgid "Check for application updates"
-msgstr "Verifica la presenza di aggiornamenti"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
-msgid ""
-"If enabled, Slic3r checks for new versions of Slic3r PE 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 ""
-"Se attivato, Slic3r verifica la presenza di una nuova versione di Slic3r PE "
-"online. Quando una nuova versione diviene disponibile, viene mostrata una "
-"notifica al successivo avvio dell'applicazione (mai durante l'uso del "
-"programma). Questo è solo un meccanismo di notifica, non viene effettuato "
-"nessun aggiornamento automatico."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
-msgid "Update built-in Presets automatically"
-msgstr "Aggiorna automaticamente i Preset integrati"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
-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 ""
-"Se abilitato, Slic3r scarica gli aggiornamenti dei preset inclusi in "
-"background. Questi aggiornamenti sono scaricati in una posizione temporanea. "
-"Quando una nuova versione dei preset diventa disponibile, viene offerta "
-"all'avvio."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:308
-msgid ""
-"Updates are never applied without user's consent and never overwrite user's "
-"customized settings."
-msgstr ""
-"Gli aggiornamenti non vengono mai applicati senza il consenso dell'utente e "
-"non sovrascrivono mai i settaggi personalizzati dell'utente."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:313
-msgid ""
-"Additionally a backup snapshot of the whole configuration is created before "
-"an update is applied."
-msgstr ""
-"Inoltre una copia di backup dei preset viene creata prima di applicare un "
-"aggiornamento."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:320
-msgid "Other Vendors"
-msgstr "Altri Fornitori"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:322
-msgid "Pick another vendor supported by Slic3r PE:"
-msgstr "Scegli un altro fornitore supportato da Slic3r PE:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381
-msgid "Firmware Type"
-msgstr "Tipo Firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
-msgid "Firmware"
-msgstr "Firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:385
-msgid "Choose the type of firmware used by your printer."
-msgstr "Scegliete il firmware usato dalla vostra stampante."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape and Size"
-msgstr "Forma e dimensioni del piano"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:422
-msgid "Set the shape of your printer's bed."
-msgstr "Imposta la dimensione del piano della stampante."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Filament and Nozzle Diameters"
-msgstr "Diametro filamento e ugello"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Print Diameters"
-msgstr "Diametro di stampa"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:452
-msgid "Enter the diameter of your printer's hot end nozzle."
-msgstr "Inserisci il diametro dell'ugello dell'estrusore della stampante."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:455
-msgid "Nozzle Diameter:"
-msgstr "Diametro ugello:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:465
-msgid "Enter the diameter of your filament."
-msgstr "Inserite il diametro del vostro filamento."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:466
-msgid ""
-"Good precision is required, so use a caliper and do multiple measurements "
-"along the filament, then compute the average."
-msgstr ""
-"E' necessaria una buona precisione, quindi utilizza un calibro ed effettua "
-"diverse misurazioni lungo il filamento, quindi calcola la media."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:469
-msgid "Filament Diameter:"
-msgstr "Diametro del filamento:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Extruder and Bed Temperatures"
-msgstr "Temperature dell'estrusore e del piano"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Temperatures"
-msgstr "Temperature"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:503
-msgid "Enter the temperature needed for extruding your filament."
-msgstr "Inserisci la temperatura necessaria per estrudere il filamento."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:504
-msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
-msgstr ""
-"Una regola generale è da 160 a 230°C per il PLA, e da 215 a 250°C per l'ABS."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:507
-msgid "Extrusion Temperature:"
-msgstr "Temperatura di estrusione:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
-msgid "°C"
-msgstr "°C"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:517
-msgid ""
-"Enter the bed temperature needed for getting your filament to stick to your "
-"heated bed."
-msgstr ""
-"Inserisci la temperatura del piano necessaria per far attaccare il filamento "
-"al piano riscaldato."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:518
-msgid ""
-"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
-"no heated bed."
-msgstr ""
-"Una regola generale è 60°C per il PLA e 110°C per l'ABS. Lascia a zero se "
-"non hai un piano riscaldato."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:521
-msgid "Bed Temperature:"
-msgstr "Temperatura letto:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:833
-msgid "< &Back"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:834
-msgid "&Next >"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:835
-msgid "&Finish"
-msgstr "&Completa"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:906
-msgid "Configuration Wizard"
-msgstr "Wizard di configurazione"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:907
-msgid "Configuration &Wizard"
-msgstr "&Wizard di configurazione"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:909
-msgid "Configuration Assistant"
-msgstr "Assistente configurazione"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:910
-msgid "Configuration &Assistant"
-msgstr "&Assistente configurazione"
-
-#: src/slic3r/GUI/Field.cpp:109
-msgid "default value"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:112
-msgid "parameter name"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:140
-#, c-format
-msgid "%s doesn't support percentage"
-msgstr "%s non supporta la percentuale"
-
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:153
-msgid "Input value is out of range"
-msgstr "Valore input fuori portata"
-
-#: src/slic3r/GUI/Field.cpp:176
-#, c-format
-msgid ""
-"Do you mean %d%% instead of %d %s?\n"
-"Select YES if you want to change this value to %d%%, \n"
-"or NO if you are sure that %d %s is a correct value."
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:179
-msgid "Parameter validation"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
-msgid "Flash!"
-msgstr "Flash!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr "Cancella"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
-msgid "Flashing in progress. Please do not disconnect the printer!"
-msgstr "Flash in corso. Non disconnettere la stampante!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
-msgid "Flashing succeeded!"
-msgstr "Flash completato con successo!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
-msgid "Flashing failed. Please see the avrdude log below."
-msgstr ""
-"Flash fallito. Ti preghiamo di consultare il registro avrdude qui sotto."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
-msgid "Flashing cancelled."
-msgstr "Flash cancellato."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
-#, 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 ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
-msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
-#, c-format
-msgid "Error accessing port at %s: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
-msgid "Firmware flasher"
-msgstr "Flasher Firmware"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
-msgid "Firmware image:"
-msgstr "Immagine firmware:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
-msgid "Serial port:"
-msgstr "Porta seriale:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
-msgid "Autodetected"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
-msgid "Rescan"
-msgstr "Ri-scansiona"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
-msgid "Progress:"
-msgstr "Progresso:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
-msgid "Status:"
-msgstr "Stato:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
-msgid "Ready"
-msgstr "Pronto"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr "Avanzato: registro output avrdude"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-"Sei sicuro di voler cancellare il flash del firmware?\n"
-"Questo potrebbe lasciare la tua stampante in una condizione inutilizzabile!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
-msgid "Confirmation"
-msgstr "Conferma"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
-msgid "Cancelling..."
-msgstr "Cancellazione..."
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
-msgid "Detected object outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
-msgid "Detected toolpath outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "Ruota"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "Scala"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
-msgid "Rotate lower part upwards"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
-msgid "Perform cut"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2276
-msgid "Cut object:"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
-msgid "Cut"
-msgstr "Taglia"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2466
-msgid "Keep upper part"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2467
-msgid "Keep lower part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "Avvertenza"
-
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr "Tentativo di liberare lo scalare senza riferimenti"
-
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
-msgid "Warning"
-msgstr "Attenzione"
-
-#: src/slic3r/GUI/GUI_App.cpp:377
-msgid "Choose one file (3MF):"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:389
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Scegli uno o più file (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/GUI_App.cpp:451
-msgid "Array of language names and identifiers should have the same size."
-msgstr ""
-"Gli array dei nomi di lingua e gli identificatori dovrebbero avere la stessa "
-"dimensione."
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Select the language"
-msgstr "Seleziona la lingua"
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Language"
-msgstr "Lingua"
-
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
-msgid "Default"
-msgstr "Predefinito"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "&Configuration Snapshots"
-msgstr "Istantanee di &Configurazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "Inspect / activate configuration snapshots"
-msgstr "Ispeziona / attiva istantanee di configurazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Take Configuration &Snapshot"
-msgstr "Cattura i&stantanea di configurazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Capture a configuration snapshot"
-msgstr "Cattura un'istantanea della configurazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "&Preferences"
-msgstr "&Preferenze"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "Application preferences"
-msgstr "Preferenze applicazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: src/slic3r/GUI/GUI_App.cpp:617
-msgid "Advanced View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Slic3r View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:622
-msgid "Change Application &Language"
-msgstr "Cambia &Lingua Applicazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Flash printer &firmware"
-msgstr "Installa &firmware stampante"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr "Carica un'immagine del firmware su una stampante basata su Arduino"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Taking configuration snapshot"
-msgstr "Cattura istantanea della configurazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Snapshot name"
-msgstr "Nome istantanea"
-
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "L'applicazione verrà riavviata"
-
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "Attenzione!"
-
-#: src/slic3r/GUI/GUI_App.cpp:691
-msgid "&Configuration"
-msgstr "&Configurazione"
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid "You have unsaved changes "
-msgstr "Sono presenti modifiche non salvate "
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid ". Discard changes and continue anyway?"
-msgstr ". Scartare le modifiche e continuare comunque?"
-
-#: src/slic3r/GUI/GUI_App.cpp:712
-msgid "Unsaved Presets"
-msgstr "Preset non salvati"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
-msgid "Layers and Perimeters"
-msgstr "Layer e Perimetri"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
-msgid "Infill"
-msgstr "Riempimento"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
-msgid "Support material"
-msgstr "Materiale supporto"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "Velocità"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
-msgid "Extruders"
-msgstr "Estrusori"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
-msgid "Extrusion Width"
-msgstr "Larghezza Estrusione"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
-msgid "Supports"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
-msgid "Pad"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
-msgid "Name"
-msgstr "Nome"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
-msgid "Right button click the icon to change the object settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
-#, c-format
-msgid "Auto-repaired (%d errors):\n"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
-msgid "degenerate facets"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
-msgid "edges fixed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
-msgid "facets removed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
-msgid "facets added"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
-msgid "facets reversed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
-msgid "backwards edges"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
-msgid "Right button click the icon to fix STL through Netfabb"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
-msgid "Extruder"
-msgstr "Estrusore"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
-msgid "Select showing settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
-msgid "Load"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
-msgid "Box"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Cylinder"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Sphere"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Slab"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
-msgid "Split to parts"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
-msgid "Add settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
-msgid "Change type"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
-msgid "You can't delete the last solid part from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
-msgid "You can't delete the last intance from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
-msgid ""
-"The selected object couldn't be split because it contains only one part."
-msgstr ""
-"L'oggetto selezionato non può essere diviso perché contiene solo una parte."
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
-msgid "Group manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
-msgid "Object manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
-msgid "Object Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
-msgid "Part Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
-msgid "Part manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
-msgid "Instance manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
-msgid "You can't change a type of the last solid part of the object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
-msgid "Select type of part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
-msgid "The supplied name is not valid;"
-msgstr "Il nome fornito non è valido;"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
-msgid "the following characters are not allowed:"
-msgstr "i seguenti caratteri non sono permessi:"
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
-msgid "Object Manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
-msgid "Object name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
-msgid "Position"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
-msgid "Rotation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
-msgid "Scale factors"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
-msgid "Translate"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:235
-msgid "View"
-msgstr "Vista"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:394
-msgid "Feature type"
-msgstr "Tipo di caratteristica"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
-msgid "Height"
-msgstr "Altezza"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
-msgid "Width"
-msgstr "Larghezza"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:242
-msgid "Volumetric flow rate"
-msgstr "Portata volumetrica"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
-msgid "Tool"
-msgstr "Strumento"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:406
-msgid "Color Print"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:247
-msgid "Show"
-msgstr "Mostra"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
-msgid "Feature types"
-msgstr "Tipi di caratteristica"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
-msgid "Perimeter"
-msgstr "Perimetro"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
-msgid "External perimeter"
-msgstr "Perimetro esterno"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
-msgid "Overhang perimeter"
-msgstr "Perimetro sporgente"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
-msgid "Internal infill"
-msgstr "Riempimento interno"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
-msgid "Solid infill"
-msgstr "Riempimento solido"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
-msgid "Top solid infill"
-msgstr "Riempimento solido superiore"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
-msgid "Bridge infill"
-msgstr "Riempimento Bridge"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
-#: src/libslic3r/GCode/PreviewData.cpp:170
-msgid "Gap fill"
-msgstr "Riempimento spazi"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
-#: src/libslic3r/GCode/PreviewData.cpp:171
-msgid "Skirt"
-msgstr "Skirt"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
-#: src/libslic3r/GCode/PreviewData.cpp:173
-msgid "Support material interface"
-msgstr "Interfaccia materiale supporto"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
-#: src/libslic3r/GCode/PreviewData.cpp:174
-msgid "Wipe tower"
-msgstr "Torre di spurgo"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
-msgid "Travel"
-msgstr "Spostamento"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:270
-msgid "Retractions"
-msgstr "Retrazioni"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:271
-msgid "Unretractions"
-msgstr "Non retrazioni"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:272
-msgid "Shells"
-msgstr "Gusci"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
-msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
-msgid "Export G-code"
-msgstr "Esporta G-code"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
-msgid "Save project (3MF)"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "(Re)slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Quick slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat last quick slice"
-msgstr "Ripeti l'ultimo slice veloce"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
-msgid "Select Plater Tab"
-msgstr "Seleziona Scheda Piano"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Quick slice and Save as"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Select Print Settings Tab"
-msgstr "Seleziona Scheda impostazioni di Stampa"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
-msgid "Select Filament Settings Tab"
-msgstr "Seleziona Scheda Impostazioni Filamento"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
-msgid "Select Printer Settings Tab"
-msgstr "Seleziona Scheda Impostazioni Stampante"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
-msgid "Switch to 3D"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
-msgid "Switch to Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
-msgid "Print host upload queue"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
-msgid "Camera view "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
-msgid "Add Instance to selected object "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
-msgid "Remove Instance from selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
-msgid "Show keyboard shortcuts list"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
-msgid "Select multiple object/Move multiple object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
-msgid "Arrange"
-msgstr "Ordina"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
-msgid "Select All objects"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
-msgid "Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
-msgid "Delete All"
-msgstr "Cancella tutto"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
-msgid "Gizmo move"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
-msgid "Gizmo scale"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
-msgid "Gizmo rotate"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Gizmo cut"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Gizmo Place face on bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Gizmo SLA support points"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Zoom to Bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Zoom to all objects in scene, if none selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Zoom to selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Zoom in"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Zoom out"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Unselect gizmo, keep object selection"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
-msgid "Plater Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Arrow Up"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Upper Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Arrow Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Lower Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
-msgid "Preview Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:53
-msgid ""
-" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
-msgstr ""
-" - Ricorda di controllare gli aggiornamenti su http://github.com/prusa3d/"
-"slic3r/releases"
-
-#: src/slic3r/GUI/MainFrame.cpp:130
-msgid "Plater"
-msgstr "Piano"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "&Apri"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "Open a project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "Save current project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save current project file as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Import STL/OBJ/AM&F/3MF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Load a model"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Import &Config"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Load exported configuration file"
-msgstr "Carica un file di configurazione esportato"
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Import Config from &project"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Load configuration from project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Import Config &Bundle"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Load presets from a bundle"
-msgstr "Carica i preset da un gruppo"
-
-#: src/slic3r/GUI/MainFrame.cpp:256
-msgid "&Import"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export &G-code"
-msgstr "Esporta &G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export current plate as G-code"
-msgstr "Esporta il piano corrente come G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export plate as &STL"
-msgstr "Esporta piano come &STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export current plate as STL"
-msgstr "Esporta il piano corrente come STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export plate as &AMF"
-msgstr "Esporta piano come &AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export current plate as AMF"
-msgstr "Esporta il piano corrente come AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export &Config"
-msgstr "Esporta &Configurazione"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export current configuration to file"
-msgstr "Esporta la configurazione corrente su file"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export Config &Bundle"
-msgstr "Esporta G&ruppo di Configurazioni"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export all presets to file"
-msgstr "Esporta tutti i preset su file"
-
-#: src/slic3r/GUI/MainFrame.cpp:271
-msgid "&Export"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Slice a file into a G-code"
-msgstr "Processa un file in G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Quick Slice and Save As"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Slice a file into a G-code, save as"
-msgstr "Processa un file in G-code, salva come"
-
-#: src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat Last Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "(Re)Slice &Now"
-msgstr "(Re)Slice &Ora"
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "Start new slicing process"
-msgstr "Inizia un nuovo processo di slicing"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "&Repair STL file"
-msgstr "&Ripara file STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "Automatically repair an STL file"
-msgstr "Ripara automaticamente un file STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "&Quit"
-msgstr "&Chiudi"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "Quit Slic3r"
-msgstr "Chiudi Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "&Select all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "Selects all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "&Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "Deletes the current selection"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Delete &all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Deletes all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "&Plater Tab"
-msgstr "Scheda &Piano"
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "Show the plater"
-msgstr "Mostra il piano"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "P&rint Settings Tab"
-msgstr "Scheda impostazioni di &Stampa"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "Show the print settings"
-msgstr "Mostra impostazioni di stampa"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "&Filament Settings Tab"
-msgstr "Scheda Impostazioni &Filamento"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "Show the filament settings"
-msgstr "Mostra impostazioni filamento"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Print&er Settings Tab"
-msgstr "Scheda Impostazioni Stampant&e"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Show the printer settings"
-msgstr "Mostra impostazioni della stampante"
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "3&D"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "Show the 3D editing view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Pre&view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Show the 3D slices preview"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Print &Host Upload Queue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Display the Print Host Upload Queue window"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr "&Iso"
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "Iso View"
-msgstr "Vista isometrica"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr "S&uperiore"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "Top View"
-msgstr "Vista superiore"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr "I&nferiore"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "Bottom View"
-msgstr "Vista inferiore"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr "&Frontale"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "Front View"
-msgstr "Vista anteriore"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr "&Posteriore"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "Rear View"
-msgstr "Vista posteriore"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr "&Sinistra"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "Left View"
-msgstr "Vista sinistra"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr "&Destra"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "Right View"
-msgstr "Vista destra"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Prusa 3D &Drivers"
-msgstr "&Driver Prusa 3D"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr "Apri la pagina di download dei driver Prusa3D sul tuo browser"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
-msgstr "&Versioni Prusa Edition"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
-msgstr "Apri la pagina delle versioni Prusa Edition sul tuo browser"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
-msgstr "Sito &web Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
-msgstr "Apri la pagina di Slic3r sul tuo browser"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr "&Manuale Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr "Apri il manuale di Slic3r sul tuo browser"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "System &Info"
-msgstr "&Informazioni di sistema"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "Show system information"
-msgstr "Mostra informazioni di sistema"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show &Configuration Folder"
-msgstr "Cartella Mostra &Configurazione"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show user configuration folder (datadir)"
-msgstr "Mostra cartella configurazione utente (datadir)"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an I&ssue"
-msgstr "Segnala un &problema"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
-msgstr "Segnala un problema su Slic3r Prusa Edition"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
-msgstr "&Su Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "Show about dialog"
-msgstr "Mostra la finestra di dialogo al riguardo di"
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "Show the list of the keyboard shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:439
-msgid "&File"
-msgstr "&File"
-
-#: src/slic3r/GUI/MainFrame.cpp:440
-msgid "&Edit"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:441
-msgid "&Window"
-msgstr "F&inestra"
-
-#: src/slic3r/GUI/MainFrame.cpp:442
-msgid "&View"
-msgstr "&Vista"
-
-#: src/slic3r/GUI/MainFrame.cpp:445
-msgid "&Help"
-msgstr "&Aiuto"
-
-#: src/slic3r/GUI/MainFrame.cpp:472
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Scegli un file da processare (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/MainFrame.cpp:486
-msgid "No previously sliced file."
-msgstr "File non processato precedentemente."
-
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
-msgid "Error"
-msgstr "Errore"
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid "Previously sliced file ("
-msgstr "File precedentemente processato ("
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid ") not found."
-msgstr ") non trovato."
-
-#: src/slic3r/GUI/MainFrame.cpp:493
-msgid "File Not Found"
-msgstr "File non trovato"
-
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
-msgid "Save "
-msgstr "Salva "
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "SVG"
-msgstr "SVG"
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "G-code"
-msgstr "G-code"
-
-# Context: L('Save ') . ($params{export_svg} ? L('SVG') : L('G-code')) . L(' file as:'), e.g. "Save G-Code file as:"
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid " file as:"
-msgstr " file come:"
-
-#: src/slic3r/GUI/MainFrame.cpp:548
-msgid "Save zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Slicing"
-msgstr "Slicing"
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Processing "
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:583
-msgid " was successfully sliced."
-msgstr " generato con successo."
-
-#: src/slic3r/GUI/MainFrame.cpp:585
-msgid "Slicing Done!"
-msgstr "Slicing Completato!"
-
-#: src/slic3r/GUI/MainFrame.cpp:600
-msgid "Select the STL file to repair:"
-msgstr "Seleziona il file STL da riparare:"
-
-#: src/slic3r/GUI/MainFrame.cpp:614
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr ""
-"Salva il file OBJ (meno soggetto a errori di coordinate dell'STL) come:"
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Your file was repaired."
-msgstr "Il file è stato riparato."
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Repair"
-msgstr "Ripara"
-
-#: src/slic3r/GUI/MainFrame.cpp:643
-msgid "Save configuration as:"
-msgstr "Salva configurazione come:"
-
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
-msgid "Select configuration to load:"
-msgstr "Seleziona configurazione da caricare:"
-
-#: src/slic3r/GUI/MainFrame.cpp:700
-msgid "Save presets bundle as:"
-msgstr "Salva il gruppo di preset come:"
-
-#: src/slic3r/GUI/MainFrame.cpp:751
-#, c-format
-msgid "%d presets successfully imported."
-msgstr "%d preset importati correttamente."
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r error"
-msgstr "Errore Slic3r"
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r has encountered an error"
-msgstr "Slic3r ha riscontrato un errore"
-
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "Info"
-
-#: src/slic3r/GUI/Plater.cpp:126
-msgid "Volume"
-msgstr "Volume"
-
-#: src/slic3r/GUI/Plater.cpp:127
-msgid "Facets"
-msgstr "Facce"
-
-#: src/slic3r/GUI/Plater.cpp:128
-msgid "Materials"
-msgstr "Materiali"
-
-#: src/slic3r/GUI/Plater.cpp:131
-msgid "Manifold"
-msgstr "Manifold"
-
-#: src/slic3r/GUI/Plater.cpp:174
-msgid "Sliced Info"
-msgstr "Informazioni processo"
-
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
-msgid "Used Filament (m)"
-msgstr "Filamento usato (m)"
-
-#: src/slic3r/GUI/Plater.cpp:194
-msgid "Used Filament (mm³)"
-msgstr "Filamento usato (mm³)"
-
-#: src/slic3r/GUI/Plater.cpp:195
-msgid "Used Filament (g)"
-msgstr "Filamento usato (g)"
-
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
-msgid "Cost"
-msgstr "Costo"
-
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
-msgid "Estimated printing time"
-msgstr "Tempo di stampa stimato"
-
-#: src/slic3r/GUI/Plater.cpp:198
-msgid "Number of tool changes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr "Supporto"
-
-#: src/slic3r/GUI/Plater.cpp:364
-msgid "Select what kind of support do you need"
-msgstr "Seleziona il tipo di supporto richiesto"
-
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "Nessuno"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
-msgid "Support on build plate only"
-msgstr "Supporti solo dal piano di stampa"
-
-#: src/slic3r/GUI/Plater.cpp:367
-msgid "Everywhere"
-msgstr "Ovunque"
-
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
-msgid "Brim"
-msgstr "Brim"
-
-#: src/slic3r/GUI/Plater.cpp:381
-msgid ""
-"This flag enables the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"La spunta su questa opzione abilita il brim che verrà stampato attorno ad "
-"ogni oggetto nel primo layer."
-
-#: src/slic3r/GUI/Plater.cpp:390
-msgid "Purging volumes"
-msgstr "Volumi di spurgo"
-
-#: src/slic3r/GUI/Plater.cpp:556
-msgid "Print settings"
-msgstr "Impostazioni di stampa"
-
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
-msgid "Filament"
-msgstr "Filamento"
-
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
-msgid "SLA print"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
-msgid "SLA material"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:560
-msgid "Printer"
-msgstr "Stampante"
-
-#: src/slic3r/GUI/Plater.cpp:588
-msgid "Send to printer"
-msgstr "Manda alla stampante"
-
-#: src/slic3r/GUI/Plater.cpp:607
-msgid "Slice now"
-msgstr "Processa ora"
-
-#: src/slic3r/GUI/Plater.cpp:787
-#, c-format
-msgid "%d (%d shells)"
-msgstr "%d (%d di perimetri)"
-
-#: src/slic3r/GUI/Plater.cpp:792
-#, c-format
-msgid "Auto-repaired (%d errors)"
-msgstr "Auto-riparati (%d errori)"
-
-#: src/slic3r/GUI/Plater.cpp:795
-#, c-format
-msgid ""
-"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
-"facets reversed, %d backwards edges"
-msgstr ""
-"%d facce degenerate, %d spigoli riparati, %d facce rimosse, %d faccee "
-"aggiunte, %d facce invertite, %d spigoli inversi"
-
-#: src/slic3r/GUI/Plater.cpp:805
-msgid "Yes"
-msgstr "Si"
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "wipe tower"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:855
-msgid "normal mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:859
-msgid "silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1304
-msgid "Loading"
-msgstr "Caricando"
-
-#: src/slic3r/GUI/Plater.cpp:1314
-#, c-format
-msgid "Processing input file %s\n"
-msgstr "Elaborando il file di input %s\n"
-
-#: src/slic3r/GUI/Plater.cpp:1366
-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 ""
-"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?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
-msgid "Multi-part object detected"
-msgstr "Rilevato oggetto in parti multiple"
-
-#: src/slic3r/GUI/Plater.cpp:1388
-#, 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 ""
-
-#: src/slic3r/GUI/Plater.cpp:1408
-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 ""
-"Sono stati caricati oggetti multipli per stampante multi-material.\n"
-"Invece di considerarli come oggetti multipli, devo considerarli come parte "
-"di un singolo oggetto avente parti multiple?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1424
-msgid "Loaded"
-msgstr "Caricato"
-
-#: src/slic3r/GUI/Plater.cpp:1492
-msgid ""
-"Your object appears to be too large, so it was automatically scaled down to "
-"fit your print bed."
-msgstr ""
-"L'oggetto sembra essere troppo grande, è stato quindi scalato "
-"automaticamente per entrare nel piano di stampa."
-
-#: src/slic3r/GUI/Plater.cpp:1493
-msgid "Object too large?"
-msgstr "Oggetto troppo grande?"
-
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr "Esporta configurazione di stampa"
-
-#: src/slic3r/GUI/Plater.cpp:1538
-msgid "Save file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1702
-msgid "Arranging canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1705
-msgid "Arranging"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1736
-msgid "Could not arrange model objects! Some geometries may be invalid."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1740
-msgid "Arranging done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1782
-msgid "Orientation search canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1787
-msgid "Searching for optimal orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1797
-msgid "Orientation found."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1818
-msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
-msgstr ""
-"L'oggetto selezionato non può essere diviso perché contiene più di un volume/"
-"materiale."
-
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
-msgid "Cancelling"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1962
-msgid "Another export job is currently running."
-msgstr "Un altro processo di esportazione è in corso."
-
-#: src/slic3r/GUI/Plater.cpp:2215
-msgid "Export failed"
-msgstr "Esportazione fallita"
-
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "Cancella"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "Rimuovi l'oggetto selezionato"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Increase copies"
-msgstr "Aumenta copie"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Place one more copy of the selected object"
-msgstr "Posiziona una o più copie dell'oggetto selezionato"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Decrease copies"
-msgstr "Diminuisci le copie"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Remove one copy of the selected object"
-msgstr "Rimuovi una copia dell'oggetto selezionato"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Set number of copies"
-msgstr "Imposta numero delle copie"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Change the number of copies of the selected object"
-msgstr "Cambia il numero di copie dell'oggetto selezionato"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload from Disk"
-msgstr "Ricarica da Disco"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload the selected file from Disk"
-msgstr "Ricarica il file selezionato dal Disco"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "Esporta questo singolo oggetto come file STL"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Along X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Mirror the selected object along the X axis"
-msgstr "Specchia l'oggetto selezionato sull'asse X"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Along Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Mirror the selected object along the Y axis"
-msgstr "Specchia l'oggetto selezionato sull'asse y"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Along Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Mirror the selected object along the Z axis"
-msgstr "Specchia l'oggetto selezionato sull'asse Z"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror"
-msgstr "Specchia"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror the selected object"
-msgstr "Specchia l'oggetto selezionato"
-
-#: src/slic3r/GUI/Plater.cpp:2400
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
-msgid "Split the selected object into individual objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
-msgid "Split the selected object into individual sub-parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
-msgid "Split"
-msgstr "Dividi"
-
-#: src/slic3r/GUI/Plater.cpp:2405
-msgid "Split the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save G-code file as:"
-msgstr "Salva il file G-code come:"
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2845
-#, c-format
-msgid "STL file exported to %s"
-msgstr "File STL esportato a %s"
-
-#: src/slic3r/GUI/Plater.cpp:2861
-#, c-format
-msgid "AMF file exported to %s"
-msgstr "File AMF esportato a %s"
-
-#: src/slic3r/GUI/Plater.cpp:2864
-#, c-format
-msgid "Error exporting AMF file %s"
-msgstr "Errore nell'esportazione del file AMF %s"
-
-#: src/slic3r/GUI/Plater.cpp:2891
-#, c-format
-msgid "3MF file exported to %s"
-msgstr "File 3MF esportato a %s"
-
-#: src/slic3r/GUI/Plater.cpp:2894
-#, c-format
-msgid "Error exporting 3MF file %s"
-msgstr "Errore nell'esportazione del file 3MF %s"
-
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
-msgid "General"
-msgstr "Generale"
-
-#: src/slic3r/GUI/Preferences.cpp:34
-msgid "Remember output directory"
-msgstr "Ricorda la directory di output"
-
-#: src/slic3r/GUI/Preferences.cpp:36
-msgid ""
-"If this is enabled, Slic3r will prompt the last output directory instead of "
-"the one containing the input files."
-msgstr ""
-"Se attivo, Slic3r suggerirà l'ultima cartella di destinazione invece della "
-"cartella contenente il file di ricezione."
-
-#: src/slic3r/GUI/Preferences.cpp:42
-msgid "Auto-center parts"
-msgstr "Auto-centra le parti"
-
-#: src/slic3r/GUI/Preferences.cpp:44
-msgid ""
-"If this is enabled, Slic3r will auto-center objects around the print bed "
-"center."
-msgstr ""
-"Se attivo, Slic3r posizionerà automaticamente gli oggetti al centro del "
-"piano di stampa."
-
-#: src/slic3r/GUI/Preferences.cpp:50
-msgid "Background processing"
-msgstr "Lavorazione in background"
-
-#: src/slic3r/GUI/Preferences.cpp:52
-msgid ""
-"If this is enabled, Slic3r will pre-process objects as soon as they're "
-"loaded in order to save time when exporting G-code."
-msgstr ""
-"Se attivo, Slic3r processerà in anticipo gli oggetti non appena saranno "
-"caricati, così da risparmiare tempo durante l'esportazione del G-code."
-
-#: src/slic3r/GUI/Preferences.cpp:74
-msgid "Suppress \" - default - \" presets"
-msgstr "Sopprimi preset \" - default - \""
-
-#: src/slic3r/GUI/Preferences.cpp:76
-msgid ""
-"Suppress \" - default - \" presets in the Print / Filament / Printer "
-"selections once there are any other valid presets available."
-msgstr ""
-"Sopprimi i preset \" - default - \" nelle selezioni Stampa / Filamento / "
-"Stampante non appena sono disponibili altri preset validi."
-
-#: src/slic3r/GUI/Preferences.cpp:82
-msgid "Show incompatible print and filament presets"
-msgstr "Mostra preset di stampa e di filamento incompatibili"
-
-#: src/slic3r/GUI/Preferences.cpp:84
-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 ""
-"Quando attivato, i preset di stampa e di filamento vengono mostrati "
-"nell'editor dei preset anche se sono segnati come incompatibili con la "
-"stampante attiva"
-
-#: src/slic3r/GUI/Preferences.cpp:90
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr "Utilizza il rendering legacy di OpenGL 1.1"
-
-#: src/slic3r/GUI/Preferences.cpp:92
-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 ""
-"Se hai problemi nel rendering causati da bug nel driver OpenGL 2.0, puoi "
-"provare ad attivare questa opzione. Si disattiverà la modifica altezza layer "
-"e l'anti-aliasing, quindi è meglio aggiornare i driver grafici."
-
-#: src/slic3r/GUI/Preferences.cpp:115
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr "E' necessario riavviare Slic3r per rendere effettive le modifiche."
-
-#: src/slic3r/GUI/Preset.cpp:170
-msgid "modified"
-msgstr ""
-
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
-msgid "System presets"
-msgstr "Preset di sistema"
-
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
-msgid "User presets"
-msgstr "Preset utente"
-
-#: src/slic3r/GUI/Preset.cpp:1157
-msgid "filament"
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:28
-#, c-format
-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 ""
-"Se il tempo previsto per il layer è inferiore a ~%ds, la ventola girerà al %d"
-"%% e la velocità di stampa sarà ridotta così da impiegare non meno di %ds su "
-"quel layer (in ogni caso, la velocità non sarà mai ridotta sotto %dmm/s)."
-
-#: src/slic3r/GUI/PresetHints.cpp:32
-#, c-format
-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"
-"Se il tempo di stampa previsto per il layer è più lungo, ma comunque "
-"inferiore a ~%ds, la ventola girerà ad una velocità proporzionalmente "
-"decrescente compresa tra %d%% e %d%%."
-
-#: src/slic3r/GUI/PresetHints.cpp:36
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-"\n"
-"Durante gli altri layer, la ventola "
-
-#: src/slic3r/GUI/PresetHints.cpp:38
-msgid "Fan "
-msgstr "Ventola "
-
-#: src/slic3r/GUI/PresetHints.cpp:43
-#, c-format
-msgid "will always run at %d%% "
-msgstr "lavorerà sempre a %d%% "
-
-#: src/slic3r/GUI/PresetHints.cpp:46
-#, c-format
-msgid "except for the first %d layers"
-msgstr "ad eccezione dei primi %d layers"
-
-#: src/slic3r/GUI/PresetHints.cpp:50
-msgid "except for the first layer"
-msgstr "ad eccezione del primo layer"
-
-#: src/slic3r/GUI/PresetHints.cpp:52
-msgid "will be turned off."
-msgstr "verrà spento."
-
-#: src/slic3r/GUI/PresetHints.cpp:153
-msgid "external perimeters"
-msgstr "perimetri esterni"
-
-#: src/slic3r/GUI/PresetHints.cpp:162
-msgid "perimeters"
-msgstr "perimetri"
-
-#: src/slic3r/GUI/PresetHints.cpp:171
-msgid "infill"
-msgstr "riempimento"
-
-#: src/slic3r/GUI/PresetHints.cpp:181
-msgid "solid infill"
-msgstr "riempimento solido"
-
-#: src/slic3r/GUI/PresetHints.cpp:189
-msgid "top solid infill"
-msgstr "riempimento solido superiore"
-
-#: src/slic3r/GUI/PresetHints.cpp:200
-msgid "support"
-msgstr "supporto"
-
-#: src/slic3r/GUI/PresetHints.cpp:210
-msgid "support interface"
-msgstr "interfaccia supporto"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "First layer volumetric"
-msgstr "Volumetrica primo strato"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Bridging volumetric"
-msgstr "Ponteggio volumetrico"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Volumetric"
-msgstr "Volumetrico"
-
-#: src/slic3r/GUI/PresetHints.cpp:217
-msgid " flow rate is maximized "
-msgstr " Il flusso viene massimizzato "
-
-#: src/slic3r/GUI/PresetHints.cpp:220
-msgid "by the print profile maximum"
-msgstr "secondo il massimo del profilo di stampa"
-
-#: src/slic3r/GUI/PresetHints.cpp:221
-msgid "when printing "
-msgstr "durante la stampa "
-
-#: src/slic3r/GUI/PresetHints.cpp:222
-msgid " with a volumetric rate "
-msgstr " con una portata volumetrica "
-
-#: src/slic3r/GUI/PresetHints.cpp:226
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr "%3.2f mm³/s"
-
-#: src/slic3r/GUI/PresetHints.cpp:228
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr " alla velocità del filamento di %3.2f mm/s."
-
-#: src/slic3r/GUI/PresetHints.cpp:247
-msgid ""
-"Recommended object thin wall thickness: Not available due to invalid layer "
-"height."
-msgstr ""
-"Spessore raccomandato per oggetto con parete sottile: Non disponibile a "
-"causa di un'altezza layer non valida."
-
-#: src/slic3r/GUI/PresetHints.cpp:264
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr ""
-"Spessore raccomandato per oggetto con parete sottile per altezza layer %.2f "
-"e "
-
-#: src/slic3r/GUI/PresetHints.cpp:271
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr "%d linee: %.2lf mm"
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Send G-Code to printer host"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Upload to Printer Host with the following filename:"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
-msgid "Start printing after upload"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
-msgid "Use forward slashes ( / ) as a directory separator if needed."
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
-msgid "Cancel selected"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
-msgid "Show error message"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
-msgid "Enqueued"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
-msgid "Uploading"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
-msgid "Completed"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
-msgid "Error uploading to print host:"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:23
-msgid "NO RAMMING AT ALL"
-msgstr "NESSUN RAMMING"
-
-#: src/slic3r/GUI/RammingChart.cpp:76
-msgid "Time"
-msgstr "Tempo"
-
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
-msgid "s"
-msgstr "s"
-
-#: src/slic3r/GUI/RammingChart.cpp:81
-msgid "Volumetric speed"
-msgstr "Velocità volumetrica"
-
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
-msgid "Slic3r Prusa Edition - System Information"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
-msgid "Compatible printers"
-msgstr "Stampanti compatibili"
-
-#: src/slic3r/GUI/Tab.cpp:50
-msgid "Select the printers this profile is compatible with."
-msgstr "Seleziona le stampanti compatibili con questo profilo."
-
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
-msgid "Compatible print profiles"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:56
-msgid "Select the print profiles this profile is compatible with."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:118
-msgid "Save current "
-msgstr "Salva attuale "
-
-#: src/slic3r/GUI/Tab.cpp:119
-msgid "Delete this preset"
-msgstr "Cancella questo preset"
-
-#: src/slic3r/GUI/Tab.cpp:131
-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:824
-msgid "It's a default preset."
-msgstr "E' un preset preimpostato."
-
-#: src/slic3r/GUI/Tab.cpp:825
-msgid "It's a system preset."
-msgstr "E' un preset di sistema."
-
-#: src/slic3r/GUI/Tab.cpp:826
-msgid "Current preset is inherited from "
-msgstr "Il preset corrente è ereditato da "
-
-#: src/slic3r/GUI/Tab.cpp:831
-msgid "It can't be deleted or modified. "
-msgstr "Non può essere eliminato o modificato. "
-
-#: src/slic3r/GUI/Tab.cpp:832
-msgid ""
-"Any modifications should be saved as a new preset inherited from this one. "
-msgstr ""
-"Qualunque modifica dovrebbe essere salvata come un nuovo preset ereditato da "
-"questo. "
-
-#: src/slic3r/GUI/Tab.cpp:833
-msgid "To do that please specify a new name for the preset."
-msgstr ""
-"Per favore specifica un nuovo nome per il preset per effettuare l'operazione."
-
-#: src/slic3r/GUI/Tab.cpp:837
-msgid "Additional information:"
-msgstr "Informazioni aggiuntive:"
-
-#: src/slic3r/GUI/Tab.cpp:843
-msgid "printer model"
-msgstr "modello stampante"
-
-#: src/slic3r/GUI/Tab.cpp:851
-msgid "default print profile"
-msgstr "profilo di stampa predefinito"
-
-#: src/slic3r/GUI/Tab.cpp:854
-msgid "default filament profile"
-msgstr "profilo filamento predefinito"
-
-#: src/slic3r/GUI/Tab.cpp:868
-msgid "default SLA material profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:872
-msgid "default SLA print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
-msgid "Layers and perimeters"
-msgstr "Layer e perimetri"
-
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
-msgid "Layer height"
-msgstr "Altezza layer"
-
-#: src/slic3r/GUI/Tab.cpp:924
-msgid "Vertical shells"
-msgstr "Gusci verticali"
-
-#: src/slic3r/GUI/Tab.cpp:935
-msgid "Horizontal shells"
-msgstr "Gusci orizzontali"
-
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
-msgid "Solid layers"
-msgstr "Layer solidi"
-
-#: src/slic3r/GUI/Tab.cpp:941
-msgid "Quality (slower slicing)"
-msgstr "Qualità (slicing più lento)"
-
-#: src/slic3r/GUI/Tab.cpp:958
-msgid "Reducing printing time"
-msgstr "Ridurre tempo di stampa"
-
-#: src/slic3r/GUI/Tab.cpp:970
-msgid "Skirt and brim"
-msgstr "Skirt e brim"
-
-#: src/slic3r/GUI/Tab.cpp:987
-msgid "Raft"
-msgstr "Raft"
-
-#: src/slic3r/GUI/Tab.cpp:991
-msgid "Options for support material and raft"
-msgstr "Opzioni per materiale di supporto e raft"
-
-#: src/slic3r/GUI/Tab.cpp:1006
-msgid "Speed for print moves"
-msgstr "Velocità per i movimenti di stampa"
-
-#: src/slic3r/GUI/Tab.cpp:1018
-msgid "Speed for non-print moves"
-msgstr "Velocità per i movimenti non di stampa"
-
-#: src/slic3r/GUI/Tab.cpp:1021
-msgid "Modifiers"
-msgstr "Modificatori"
-
-#: src/slic3r/GUI/Tab.cpp:1024
-msgid "Acceleration control (advanced)"
-msgstr "Controllo Accelerazione (avanzato)"
-
-#: src/slic3r/GUI/Tab.cpp:1031
-msgid "Autospeed (advanced)"
-msgstr "Autovelocità (avanzato)"
-
-#: src/slic3r/GUI/Tab.cpp:1037
-msgid "Multiple Extruders"
-msgstr "Estrusori multipli"
-
-#: src/slic3r/GUI/Tab.cpp:1045
-msgid "Ooze prevention"
-msgstr "Prevenzione delle fuoriuscite"
-
-#: src/slic3r/GUI/Tab.cpp:1062
-msgid "Extrusion width"
-msgstr "Larghezza estrusione"
-
-#: src/slic3r/GUI/Tab.cpp:1072
-msgid "Overlap"
-msgstr "Sovrapposizione"
-
-#: src/slic3r/GUI/Tab.cpp:1075
-msgid "Flow"
-msgstr "Flusso"
-
-#: src/slic3r/GUI/Tab.cpp:1078
-msgid "Other"
-msgstr "Altro"
-
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
-msgid "Output options"
-msgstr "Opzioni Output"
-
-#: src/slic3r/GUI/Tab.cpp:1086
-msgid "Sequential printing"
-msgstr "Stampa sequenziale"
-
-#: src/slic3r/GUI/Tab.cpp:1088
-msgid "Extruder clearance (mm)"
-msgstr "Spazio libero per l'estrusore (mm)"
-
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
-msgid "Output file"
-msgstr "File di Output"
-
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
-msgid "Post-processing scripts"
-msgstr "Script di post produzione"
-
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
-msgid "Notes"
-msgstr "Note"
-
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
-msgid "Dependencies"
-msgstr "Dipendenze"
-
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
-msgid "Profile dependencies"
-msgstr "Dipendenze profilo"
-
-#: src/slic3r/GUI/Tab.cpp:1161
-#, no-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"
-"- no ensure_vertical_shell_thickness\n"
-"\n"
-"Shall I adjust those settings in order to enable Spiral Vase?"
-msgstr ""
-"La modalità Vaso a Spirale richiede:\n"
-"- un perimetro\n"
-"- assenza di layer solidi superiori\n"
-"- densità riempimento 0%\n"
-"- assenza di materiale di supporto\n"
-"- assicura_spessore_ guscio_ verticale disattivato\n"
-"\n"
-"Posso regolare queste impostazioni così da attivare il Vaso a Spirale?"
-
-#: src/slic3r/GUI/Tab.cpp:1168
-msgid "Spiral Vase"
-msgstr "Vaso a Spirale"
-
-#: src/slic3r/GUI/Tab.cpp:1191
-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 ""
-"La Torre di Spurgo attualmente supporta solamente supporti non solubili\n"
-"se questi sono stampati con l'attuale estrusore senza attivare un cambio "
-"d'attrezzo.\n"
-"(entrambi support_material_extruder e support_material_interface_extruder "
-"devono essere impostati a 0).\n"
-"\n"
-"Devo regolare queste impostazioni per abilitare la Torre di Spurgo?"
-
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
-msgid "Wipe Tower"
-msgstr "Torre di Spurgo"
-
-#: src/slic3r/GUI/Tab.cpp:1209
-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 ""
-"Perché la Wipe Tower possa funzionare con i supporti solubili, gli strati "
-"dei supporti devono essere sincronizzati con quelli del modello.\n"
-"\n"
-"Sincronizzare i supporti per abilitare la Wipe Tower?"
-
-#: src/slic3r/GUI/Tab.cpp:1227
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters\n"
-"\n"
-"Shall I adjust those settings for supports?"
-msgstr ""
-"I supporti hanno più successo se l'opzione seguente è attivata:\n"
-"-Rileva i perimetri in bridging\n"
-"\n"
-"Adattare questa opzione ai supporti?"
-
-#: src/slic3r/GUI/Tab.cpp:1230
-msgid "Support Generator"
-msgstr "Generatore Supporto"
-
-# Used in context: _("The ") + str_fill_pattern + _(" infill pattern is not supposed to work at 100% density.\n")
-#: src/slic3r/GUI/Tab.cpp:1272
-msgid "The "
-msgstr "Il "
-
-#: src/slic3r/GUI/Tab.cpp:1272
-#, no-c-format
-msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
-"\n"
-"Shall I switch to rectilinear fill pattern?"
-msgstr ""
-" il pattern di riempimento non dovrebbe funzionare con densità 100%.\n"
-"\n"
-"Posso cambiarlo in pattern di riempimento rettilineo?"
-
-#: src/slic3r/GUI/Tab.cpp:1388
-msgid "Temperature "
-msgstr "Temperatura "
-
-#: src/slic3r/GUI/Tab.cpp:1394
-msgid "Bed"
-msgstr "Letto"
-
-#: src/slic3r/GUI/Tab.cpp:1399
-msgid "Cooling"
-msgstr "Raffreddamento"
-
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
-msgid "Enable"
-msgstr "Abilita"
-
-#: src/slic3r/GUI/Tab.cpp:1411
-msgid "Fan settings"
-msgstr "Impostazioni ventola"
-
-#: src/slic3r/GUI/Tab.cpp:1412
-msgid "Fan speed"
-msgstr "Velocità ventola"
-
-#: src/slic3r/GUI/Tab.cpp:1420
-msgid "Cooling thresholds"
-msgstr "Soglia di raffreddamento"
-
-#: src/slic3r/GUI/Tab.cpp:1426
-msgid "Filament properties"
-msgstr "Proprietà filamento"
-
-#: src/slic3r/GUI/Tab.cpp:1430
-msgid "Print speed override"
-msgstr "Scavalca velocità di stampa"
-
-#: src/slic3r/GUI/Tab.cpp:1440
-msgid "Toolchange parameters with single extruder MM printers"
-msgstr "Parametri di cambio strumento per stampanti MM con estrusore singolo"
-
-#: src/slic3r/GUI/Tab.cpp:1455
-msgid "Ramming settings"
-msgstr "Impostazioni del ramming"
-
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
-msgid "Custom G-code"
-msgstr "G-code personalizzato"
-
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
-msgid "Start G-code"
-msgstr "Inizia G-code"
-
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
-msgid "End G-code"
-msgstr "Fine G-code"
-
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
-msgid " Browse "
-msgstr " Naviga "
-
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
-msgid "Test"
-msgstr "Test"
-
-#: src/slic3r/GUI/Tab.cpp:1615
-msgid "Could not get a valid Printer Host reference"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
-msgid "Success!"
-msgstr "Successo!"
-
-#: src/slic3r/GUI/Tab.cpp:1636
-msgid ""
-"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
-"signed certificate."
-msgstr ""
-"File HTTPS CA opzionale. E' necessario solo se si intende usare un HTTPS con "
-"certificato autofirmato."
-
-#: src/slic3r/GUI/Tab.cpp:1648
-msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-msgstr "File di certificato (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-
-#: src/slic3r/GUI/Tab.cpp:1649
-msgid "Open CA certificate file"
-msgstr "Apri file di certificato CA"
-
-#: src/slic3r/GUI/Tab.cpp:1676
-msgid ""
-"HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
-msgid "Size and coordinates"
-msgstr "Dimensione e coordinate"
-
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
-msgid " Set "
-msgstr " Imposta "
-
-#: src/slic3r/GUI/Tab.cpp:1740
-msgid "Capabilities"
-msgstr "Capacità"
-
-#: src/slic3r/GUI/Tab.cpp:1745
-msgid "Number of extruders of the printer."
-msgstr "Numero estrusori della stampante."
-
-#: src/slic3r/GUI/Tab.cpp:1773
-msgid "USB/Serial connection"
-msgstr "Connessione USB/Seriale"
-
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
-msgid "Serial port"
-msgstr "Porta seriale"
-
-#: src/slic3r/GUI/Tab.cpp:1779
-msgid "Rescan serial ports"
-msgstr "Scansiona nuovamente porte seriali"
-
-#: src/slic3r/GUI/Tab.cpp:1801
-msgid "Connection to printer works correctly."
-msgstr "Connessione con la stampante funzionante."
-
-#: src/slic3r/GUI/Tab.cpp:1804
-msgid "Connection failed."
-msgstr "Connessione fallita."
-
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
-msgid "Print Host upload"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
-msgid "Before layer change G-code"
-msgstr "Prima del G-code di cambio di strato"
-
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
-msgid "After layer change G-code"
-msgstr "Dopo il G-code di cambio di strato"
-
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
-msgid "Tool change G-code"
-msgstr "G-code cambio strumento"
-
-#: src/slic3r/GUI/Tab.cpp:1877
-msgid "Between objects G-code (for sequential printing)"
-msgstr "G-code tra gli oggetti (per stampa sequenziale)"
-
-#: src/slic3r/GUI/Tab.cpp:1938
-msgid "Display"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
-msgid "Corrections"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
-msgid "Machine limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2025
-msgid "Values in this column are for Full Power mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2026
-msgid "Full Power"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2031
-msgid "Values in this column are for Silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2032
-msgid "Silent"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2040
-msgid "Maximum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2045
-msgid "Maximum accelerations"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2052
-msgid "Jerk limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2057
-msgid "Minimum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
-msgid "Single extruder MM setup"
-msgstr "Setup Estrusore singolo MM"
-
-#: src/slic3r/GUI/Tab.cpp:2104
-msgid "Single extruder multimaterial parameters"
-msgstr "Parametri multimateriali estrusore singolo"
-
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
-#, c-format
-msgid "Extruder %d"
-msgstr "Estrusore %d"
-
-#: src/slic3r/GUI/Tab.cpp:2125
-msgid "Layer height limits"
-msgstr "Limiti altezza layer"
-
-#: src/slic3r/GUI/Tab.cpp:2130
-msgid "Position (for multi-extruder printers)"
-msgstr "Posizione (per stampanti multi-estrusore)"
-
-#: src/slic3r/GUI/Tab.cpp:2133
-msgid "Retraction"
-msgstr "Retrazione"
-
-#: src/slic3r/GUI/Tab.cpp:2136
-msgid "Only lift Z"
-msgstr "Eleva solo Z"
-
-#: src/slic3r/GUI/Tab.cpp:2149
-msgid ""
-"Retraction when tool is disabled (advanced settings for multi-extruder "
-"setups)"
-msgstr ""
-"Retrai quando l'attrezzo è disabilitato (impostazioni avanzate per setup "
-"multi-estrusore)"
-
-#: src/slic3r/GUI/Tab.cpp:2153
-msgid "Preview"
-msgstr "Anteprima"
-
-#: src/slic3r/GUI/Tab.cpp:2284
-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 ""
-"La funzione Wipe non è disponibile quando si usa la modalità Retrazione "
-"Firmware.\n"
-"\n"
-"Devo disattivarla per poter abilitare la Retrazione Firmware?"
-
-#: src/slic3r/GUI/Tab.cpp:2286
-msgid "Firmware Retraction"
-msgstr "Retrazione Firmware"
-
-#: src/slic3r/GUI/Tab.cpp:2565
-#, c-format
-msgid "Default preset (%s)"
-msgstr "Preset predefiniti (%s)"
-
-#: src/slic3r/GUI/Tab.cpp:2566
-#, c-format
-msgid "Preset (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2583
-msgid "has the following unsaved changes:"
-msgstr "ha le seguenti modifiche non salvate:"
-
-#: src/slic3r/GUI/Tab.cpp:2586
-msgid "is not compatible with printer"
-msgstr "non è compatibile con la stampante"
-
-#: src/slic3r/GUI/Tab.cpp:2587
-msgid "is not compatible with print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2589
-msgid "and it has the following unsaved changes:"
-msgstr "e sono presenti le seguenti modifiche non salvate:"
-
-#: src/slic3r/GUI/Tab.cpp:2592
-msgid "Discard changes and continue anyway?"
-msgstr "Eliminare le modifiche e continuare comunque?"
-
-#: src/slic3r/GUI/Tab.cpp:2593
-msgid "Unsaved Changes"
-msgstr "Modifiche non salvate"
-
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
-msgid "Please check your object list before preset changing."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2699
-msgid "The supplied name is empty. It can't be saved."
-msgstr "Il nome fornito è vuoto. Non può essere salvato."
-
-#: src/slic3r/GUI/Tab.cpp:2704
-msgid "Cannot overwrite a system profile."
-msgstr "Impossibile sovrascrivere un profilo di sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2708
-msgid "Cannot overwrite an external profile."
-msgstr "Impossibile sovrascrivere un profilo esterno."
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "remove"
-msgstr "rimuovi"
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "delete"
-msgstr "cancella"
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid "Are you sure you want to "
-msgstr "Sei sicuro di voler "
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid " the selected preset?"
-msgstr " il preset selezionato?"
-
-#: src/slic3r/GUI/Tab.cpp:2736
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: src/slic3r/GUI/Tab.cpp:2737
-msgid " Preset"
-msgstr " Preset"
-
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "Tutto"
-
-#: src/slic3r/GUI/Tab.cpp:2869
-msgid ""
-"LOCKED LOCK;indicates that the settings are the same as the system values "
-"for the current option group"
-msgstr ""
-"LUCCHETTO CHIUSO; indica che le impostazioni sono le stesse dei valori di "
-"sistema per il corrente gruppo di opzioni"
-
-#: src/slic3r/GUI/Tab.cpp:2872
-msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
-"the system values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group "
-"to the system values."
-msgstr ""
-"LUCCHETTO APERTO;indica che è stata modificata qualche impostazione e non è "
-"uguale ai valori di sistema del corrente gruppo di opzioni.\n"
-"Clicca l'icona LUCCHETTO CHIUSO per resettare tutte le impostazioni del "
-"corrente gruppo di opzioni ai valori di sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2878
-msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr ""
-"WHITE BULLET;per il bottone sinistro: indica un preset non di sistema,\n"
-"per il bottone destro: indica che le impostazioni non sono state modificate."
-
-#: src/slic3r/GUI/Tab.cpp:2882
-msgid ""
-"BACK ARROW;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 ""
-"FRECCIA INDIETRO; indica che le impostazioni sono state modificate e non "
-"sono uguali all'ultimo preset salvato per l'attuale gruppo opzioni.\n"
-"Clicca l'icona FRECCIA INDIETRO per resettare all'ultimo preset salvato "
-"tutte le impostazioni per il seguente gruppo di opzioni."
-
-#: src/slic3r/GUI/Tab.cpp:2908
-msgid ""
-"LOCKED LOCK icon indicates that the settings are the same as the system "
-"values for the current option group"
-msgstr ""
-"Icona LUCCHETTO CHIUSO indica che le impostazioni sono uguali ai valori di "
-"sistema per il seguente gruppo di opzioni"
-
-#: src/slic3r/GUI/Tab.cpp:2910
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not "
-"equal to the system values for the current option group.\n"
-"Click to reset all settings for current option group to the system values."
-msgstr ""
-"L'icona del LUCCHETTO APERTO indica che alcune impostazioni sono state "
-"cambiate e non sono uguali ai valori di sistema per il gruppo di opzioni "
-"corrente.\n"
-"Cliccate per resettare tutte le impostazioni per il gruppo corrente ai "
-"valori di sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2913
-msgid "WHITE BULLET icon indicates a non system preset."
-msgstr "L'icona a forma di PALLINO BIANCO indica un preset non di sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2916
-msgid ""
-"WHITE BULLET icon indicates that the settings are the same as in the last "
-"saved preset for the current option group."
-msgstr ""
-"L'icona a forma di PALLINO BIANCO indica che le impostazioni sono uguali "
-"agli ultimi preset salvati per il gruppo di opzioni corrente."
-
-#: src/slic3r/GUI/Tab.cpp:2918
-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 ""
-"Icona FRECCIA INDIETRO indica che le impostazioni sono state cambiate e non "
-"sono uguali all'ultimo preset salvato per il seguente gruppo di opzioni.\n"
-"Clicca per resettare all'ultimo preset salvato tutte le impostazioni per il "
-"seguente gruppo di opzioni."
-
-#: src/slic3r/GUI/Tab.cpp:2924
-msgid ""
-"LOCKED LOCK icon indicates that the value is the same as the system value."
-msgstr ""
-"L'icona del LUCCHETTO CHIUSO indica che il valore è uguale al valore di "
-"sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2925
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
-"the system value.\n"
-"Click to reset current value to the system value."
-msgstr ""
-"L'icona del LUCCHETTO APERTO indica che il valore è stato cambiato e non è "
-"uguale al valore di sistema. \n"
-"Cliccate per resettare il valore corrente al valore di sistema."
-
-#: src/slic3r/GUI/Tab.cpp:2931
-msgid ""
-"WHITE BULLET icon indicates that the value is the same as in the last saved "
-"preset."
-msgstr ""
-"L'icona a forma di PALLINO BIANCO indica che il valore è lo stesso "
-"dell'ultimo preset salvato."
-
-#: src/slic3r/GUI/Tab.cpp:2932
-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 FRECCIA ALL'INDIETRO indica che il valore è stato cambiato e non è uguale "
-"all'ultimo preset salvato.\n"
-"Cliccare per resettare il valore corrente all'ultimo preset salvato."
-
-# Used in this context: _("Save ") + title + _(" as:")
-#: src/slic3r/GUI/Tab.cpp:3031
-msgid " as:"
-msgstr " come:"
-
-#: src/slic3r/GUI/Tab.cpp:3075
-msgid "the following postfix are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3079
-msgid "The supplied name is not available."
-msgstr "Il nome fornito non è disponibile."
-
-#: src/slic3r/GUI/Tab.cpp:3092
-msgid "Material"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
-msgid "Layers"
-msgstr "Layer"
-
-#: src/slic3r/GUI/Tab.cpp:3098
-msgid "Exposure"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3183
-msgid "Support head"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3188
-msgid "Support pillar"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3196
-msgid "Connection of the support sticks and junctions"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3200
-msgid "Automatic generation"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
-msgid "Print Settings"
-msgstr "Impostazioni Stampa"
-
-#: src/slic3r/GUI/Tab.hpp:311
-msgid "Filament Settings"
-msgstr "Impostazioni Filamento"
-
-#: src/slic3r/GUI/Tab.hpp:344
-msgid "Printer Settings"
-msgstr "Impostazioni stampante"
-
-#: src/slic3r/GUI/Tab.hpp:367
-msgid "Material Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:393
-msgid "Save preset"
-msgstr "Salva preset"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "Update available"
-msgstr "Aggiornamento disponibile"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "New version of Slic3r PE is available"
-msgstr "Nuova versione di Slic3r PE disponibile"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
-msgid "To download, follow the link below."
-msgstr "Vai sul link sotto per scaricare."
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
-msgid "Current version:"
-msgstr "Versione corrente:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
-msgid "New version:"
-msgstr "Nuova versione:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
-msgid "Don't notify about new releases any more"
-msgstr "Non notificare più i nuovi rilasci"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
-msgid "Configuration update"
-msgstr "Aggiornamento di configurazione"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
-msgid "Configuration update is available"
-msgstr "Aggiornamento di configurazione disponibile"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
-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"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"Vuoi installarlo?\n"
-"\n"
-"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/UpdateDialogs.cpp:109
-msgid "Slic3r incompatibility"
-msgstr "Incompatibilità Slic3r"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r configuration is incompatible"
-msgstr "Configurazione Slic3r incompatibile"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed "
-"configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using "
-"a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-"Questa versione di Slic3r PE non è compatibile con gli attuali gruppi di "
-"configurazioni installati.\n"
-"Probabilmente è causato dall'esecuzione di una vecchia versione di Slic3r PE "
-"dopo averne utilizzata una più recente.\n"
-"\n"
-"Prova a chiudere Slic3r e riprovare con una versione più nuova, 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 Slic3r.\n"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
-#, c-format
-msgid "This Slic3r PE version: %s"
-msgstr "Questa versione di Slic3r PE: %s"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
-msgid "Incompatible bundles:"
-msgstr "Gruppi incompatibili:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
-msgid "Exit Slic3r"
-msgstr "Esci da Slic3r"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
-msgid "Re-configure"
-msgstr "Ri-configura"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
-#, c-format
-msgid ""
-"Slic3r PE 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 ""
-"Slic3r PE adesso utilizza una struttura di aggiornamento delle "
-"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/UpdateDialogs.cpp:182
-msgid "For more information please visit our wiki page:"
-msgstr "Per maggiori informazioni visita la nostra pagina wiki:"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
-msgid "Ramming customization"
-msgstr "Personalizzazione del ramming"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
-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 strumento in "
-"una stampante MM a 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 diverse velocità "
-"per ottenere la forma corretta. Per questo motivi 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:78
-msgid "Total ramming time"
-msgstr "Tempo totale di ramming"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
-msgid "Total rammed volume"
-msgstr "Volume totale di ramming"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
-msgid "Ramming line width"
-msgstr "Larghezza della linea di Ramming"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
-msgid "Ramming line spacing"
-msgstr "Distanza tra le linee di Ramming"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
-msgid "Wipe tower - Purging volume adjustment"
-msgstr "Torre di spurgo - Regolazione volume di spurgo"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
-msgid ""
-"Here you can adjust required purging volume (mm³) for any given pair of "
-"tools."
-msgstr ""
-"Qui è possibile regolare il volume di spurgo necessario (mm³) per ogni "
-"coppia di strumenti."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
-msgid "Extruder changed to"
-msgstr "Cambia estrusore a"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
-msgid "unloaded"
-msgstr "scaricato"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
-msgid "loaded"
-msgstr "caricato"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
-msgid "Tool #"
-msgstr "Utensile #"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
-msgid ""
-"Total purging volume is calculated by summing two values below, depending on "
-"which tools are loaded/unloaded."
-msgstr ""
-"Il volume totale di purga viene calcolato sommando i due valori sotto, a "
-"seconda di quali strumenti vengono scaricati/caricati."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
-msgid "Volume to purge (mm³) when the filament is being"
-msgstr "Il volume di spurgo (mm³) quando il filamento viene"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
-msgid "From"
-msgstr "Da"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
-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"
-"\n"
-"Procedere?"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show simplified settings"
-msgstr "Mostra impostazioni semplificate"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show advanced settings"
-msgstr "Mostra impostazioni avanzate"
-
-#: src/slic3r/Utils/OctoPrint.cpp:65
-#, c-format
-msgid "Mismatched type of print host: %s"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:80
-msgid "Connection to OctoPrint works correctly."
-msgstr "Connessione con OctoPrint funzionante."
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Could not connect to OctoPrint"
-msgstr "Non è possibile connettere ad OctoPrint"
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr "Nota: è richiesta una versione di OctoPrint 1.1.0 o successiva."
-
-#: src/slic3r/Utils/OctoPrint.cpp:181
-msgid "Connection to Prusa SLA works correctly."
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:186
-msgid "Could not connect to Prusa SLA"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:571
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr "richiede min. %s e max. %s"
-
-#: src/slic3r/Utils/PresetUpdater.cpp:576
-#, c-format
-msgid "requires min. %s"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:578
-#, c-format
-msgid "requires max. %s"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:235
-msgid "Failed loading the input model."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:248
-msgid "Mesh repair failed."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the 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 ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
-msgid "Model fixing"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
-msgid "Exporting model..."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
-msgid "Export of a temporary 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
-msgid "Import of the repaired 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
-msgid "Model repair finished"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
-msgid "Model repair canceled"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-msgid "Model repaired successfully"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model Repair by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model repair failed: \n"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1175
-msgid "All objects are outside of the print volume."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1201
-msgid "Some objects are too close; your extruder will collide with them."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1216
-msgid ""
-"Some objects are too tall and cannot be printed without extruder collisions."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1226
-msgid "The Spiral Vase option can only be used when printing a single object."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1228
-msgid ""
-"The Spiral Vase option can only be used when printing single material "
-"objects."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1234
-msgid ""
-"All extruders must have the same diameter for single extruder multimaterial "
-"printer."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1239
-msgid ""
-"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
-"and Repetier G-code flavors."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1241
-msgid ""
-"The Wipe Tower is currently only supported with the relative extruder "
-"addressing (use_relative_e_distances=1)."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1253
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1255
-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:1257
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are printed "
-"with the same support_material_contact_distance"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1259
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are sliced "
-"equally."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1281
-msgid ""
-"The Wipe tower is only supported if all objects have the same layer height "
-"profile"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1290
-msgid "The supplied settings will cause an empty print."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1307
-msgid ""
-"One or more object were assigned an extruder that the printer does not have."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1316
-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 ""
-
-#: src/libslic3r/Print.cpp:1324
-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:1328
-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 ""
-
-#: src/libslic3r/Print.cpp:1335
-msgid "first_layer_height"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1350
-msgid "First layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1354
-msgid "Layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
-msgid "Printer technology"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:41
-msgid "Bed shape"
-msgstr "Forma letto"
-
-#: src/libslic3r/PrintConfig.cpp:48
-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 ""
-"Questa impostazione controlla l'altezza (e quindi il numero totale) degli "
-"strati/layer. Un layer più sottile sarà più preciso ma sarà necessario più "
-"tempo per stampare."
-
-#: src/libslic3r/PrintConfig.cpp:56
-msgid "Max print height"
-msgstr "Altezza massima di stampa"
-
-#: src/libslic3r/PrintConfig.cpp:57
-msgid ""
-"Set this to the maximum height that can be reached by your extruder while "
-"printing."
-msgstr ""
-"Impostate alla massima altezza che può essere raggiunta dal vostro estrusore "
-"durante la stampa."
-
-#: src/libslic3r/PrintConfig.cpp:73
-msgid "Avoid crossing perimeters"
-msgstr "Evita incrocio perimetri"
-
-#: src/libslic3r/PrintConfig.cpp:74
-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 ""
-"Ottimizza il movimenti di spostamento per minimizzare l'incrocio di "
-"perimetri. E' comunemente usato con estrusori Bowden che soffrono di oozing. "
-"Questa caratteristica rallenta sia la stampa che la generazione del G-code."
-
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
-msgid "Other layers"
-msgstr "Altri layer"
-
-#: src/libslic3r/PrintConfig.cpp:83
-msgid ""
-"Bed temperature for layers after the first one. Set this to zero to disable "
-"bed temperature control commands in the output."
-msgstr ""
-"Temperatura per i layer dopo il primo. Imposta questo a zero per disattivare "
-"i comandi di controllo della temperatura del letto in output."
-
-#: src/libslic3r/PrintConfig.cpp:86
-msgid "Bed temperature"
-msgstr "Temperatura letto"
-
-#: src/libslic3r/PrintConfig.cpp:93
-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/libslic3r/PrintConfig.cpp:104
-msgid "Between objects G-code"
-msgstr "G-code tra gli oggetti"
-
-#: src/libslic3r/PrintConfig.cpp:105
-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:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "Inferiore"
-
-#: src/libslic3r/PrintConfig.cpp:116
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "Numero di layer solidi da generare sulle superfici inferiori."
-
-#: src/libslic3r/PrintConfig.cpp:118
-msgid "Bottom solid layers"
-msgstr "Layer solidi sul fondo"
-
-#: src/libslic3r/PrintConfig.cpp:123
-msgid "Bridge"
-msgstr "Bridge"
-
-#: src/libslic3r/PrintConfig.cpp:124
-msgid ""
-"This is the acceleration your printer will use for bridges. Set zero to "
-"disable acceleration control for bridges."
-msgstr ""
-"Questa è l'accelerazione che la tua stampante utilizzerà per i bridge. "
-"Impostala a zero per disattivare il controllo dell'accelerazione per i "
-"bridge."
-
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
-msgid "mm/s²"
-msgstr "mm/s²"
-
-#: src/libslic3r/PrintConfig.cpp:133
-msgid "Bridging angle"
-msgstr "Angolo Ponteggio"
-
-#: src/libslic3r/PrintConfig.cpp:135
-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 ""
-"Ignora angolo Bridging. Se lasciato a zero, l'angolo di bridging verrà "
-"calcolato automaticamente. Altrimenti l'angolo fornito sarà utilizzato per "
-"tutti i bridge. Usa 180° per l'angolo zero."
-
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
-msgid "°"
-msgstr "°"
-
-#: src/libslic3r/PrintConfig.cpp:145
-msgid "Bridges fan speed"
-msgstr "Velocità ventola Bridge"
-
-#: src/libslic3r/PrintConfig.cpp:146
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr ""
-"Questa velocità della ventola verrà forzata durante tutti i bridge e "
-"overhang."
-
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
-msgid "%"
-msgstr "%"
-
-#: src/libslic3r/PrintConfig.cpp:155
-msgid "Bridge flow ratio"
-msgstr "Rapporto flusso Bridge"
-
-#: src/libslic3r/PrintConfig.cpp:157
-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 ""
-"Questo fattore influenza la quantità di plastica per il bridging. Puoi "
-"diminuirlo leggermente per tendere il materiale estruso ed evitare che si "
-"afflosci, sebbene le impostazioni predefinite sono generalmente buone ed è "
-"consigliabile sperimentare con il raffreddamento (usare la ventola) prima di "
-"modificare questo valore."
-
-#: src/libslic3r/PrintConfig.cpp:168
-msgid "Bridges"
-msgstr "Bridge"
-
-#: src/libslic3r/PrintConfig.cpp:170
-msgid "Speed for printing bridges."
-msgstr "Velocità di stampa Bridge."
-
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
-msgid "mm/s"
-msgstr "mm/s"
-
-#: src/libslic3r/PrintConfig.cpp:178
-msgid "Brim width"
-msgstr "Larghezza brim"
-
-#: src/libslic3r/PrintConfig.cpp:179
-msgid ""
-"Horizontal width of the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Larghezza orizzontale del brim che sarà stampata attorno ad ogni oggetto nel "
-"primo layer."
-
-#: src/libslic3r/PrintConfig.cpp:187
-msgid "Clip multi-part objects"
-msgstr "Collega oggetti multi-part"
-
-#: src/libslic3r/PrintConfig.cpp:188
-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 ""
-"Durante la stampa di oggetti multi-materiali, questa impostazione farà si "
-"che slic3r unisca le parti sovrapposte dell'oggetto (la seconda sarà "
-"collegata con la prima, la terza parte sarà collegata con la prima e la "
-"seconda ecc..)."
-
-#: src/libslic3r/PrintConfig.cpp:196
-msgid "Colorprint height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:197
-msgid "Heights at which a filament change is to occur. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:207
-msgid "Compatible printers condition"
-msgstr "Condizioni di stampante compatibile"
-
-#: src/libslic3r/PrintConfig.cpp:208
-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."
-msgstr ""
-"Un'espressione booleana che usa i valori di configurazione di un profilo "
-"stampante attivo. Se questa espressione produce un risultato vero, questo "
-"profilo si considera compatibile con il profilo stampante attivo."
-
-#: src/libslic3r/PrintConfig.cpp:220
-msgid "Compatible print profiles condition"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:221
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:235
-msgid "Complete individual objects"
-msgstr "Completa oggetti individuali"
-
-#: src/libslic3r/PrintConfig.cpp:236
-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."
-msgstr ""
-"Durante la stampa di oggetti multipli o copie, questa funzione completerà "
-"ciascun oggetto prima di spostarsi al prossimo (e iniziando la stampa dal "
-"primo layer). Questa funzione è utile per evitare il rischio di stampe "
-"rovinate. Slic3r dovrebbe avvisarti e prevenire collisioni con l'estrusore, "
-"ma fai attenzione."
-
-#: src/libslic3r/PrintConfig.cpp:245
-msgid "Enable auto cooling"
-msgstr "Abilita auto raffreddamento"
-
-#: src/libslic3r/PrintConfig.cpp:246
-msgid ""
-"This flag enables the automatic cooling logic that adjusts print speed and "
-"fan speed according to layer printing time."
-msgstr ""
-"Questo contrassegno abilita la logica del raffreddamento automatico in modo "
-"da regolare la velocità di stampa e la velocità della ventola in base al "
-"tempo di stampa del layer."
-
-#: src/libslic3r/PrintConfig.cpp:252
-msgid "Cooling tube position"
-msgstr "Posizione tubo di raffreddamento"
-
-#: src/libslic3r/PrintConfig.cpp:253
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
-msgstr ""
-"Distanza del centro del tubo di raffreddamento dalla punta dell'estrusore "
-
-#: src/libslic3r/PrintConfig.cpp:261
-msgid "Cooling tube length"
-msgstr "Lunghezza del tubo di raffreddamento"
-
-#: src/libslic3r/PrintConfig.cpp:262
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
-msgstr ""
-"Lunghezza del tubo di raffreddamento per limitare lo spazio delle mosse di "
-"raffreddamento al suo interno "
-
-#: src/libslic3r/PrintConfig.cpp:271
-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."
-msgstr ""
-"Questa è l'accelerazione a cui la stampante sarà reimpostata dopo aver "
-"utilizzato un valore di accelerazione per un ruolo specifico (perimetro/"
-"riempimento). Imposta a zero per evitare del tutto la reimpostazione "
-"dell'accelerazione."
-
-#: src/libslic3r/PrintConfig.cpp:281
-msgid "Default filament profile"
-msgstr "Profilo filamento predefinito"
-
-#: src/libslic3r/PrintConfig.cpp:282
-msgid ""
-"Default filament profile associated with the current printer profile. On "
-"selection of the current printer profile, this filament profile will be "
-"activated."
-msgstr ""
-"Profilo filamento di default associato al profilo stampante corrente. Alla "
-"selezione del profilo stampante corrente, questo profilo filamento verrà "
-"attivato."
-
-#: src/libslic3r/PrintConfig.cpp:287
-msgid "Default print profile"
-msgstr "Profilo di stampa predefinito"
-
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
-msgid ""
-"Default print profile associated with the current printer profile. On "
-"selection of the current printer profile, this print profile will be "
-"activated."
-msgstr ""
-"Profilo di stampa di default associato al profilo stampante corrente. Alla "
-"selezione del profilo stampante corrente, questo profilo di stampa verrà "
-"attivato."
-
-#: src/libslic3r/PrintConfig.cpp:293
-msgid "Disable fan for the first"
-msgstr "Disattiva ventola per i primi"
-
-#: src/libslic3r/PrintConfig.cpp:294
-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 ""
-"E' possibile impostare un valore positivo per disattivare completamente la "
-"ventola durante i primi layer, così da non peggiorare l'adesione."
-
-#: src/libslic3r/PrintConfig.cpp:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
-msgid "layers"
-msgstr "layer"
-
-#: src/libslic3r/PrintConfig.cpp:304
-msgid "Don't support bridges"
-msgstr "Non supportare i bridge"
-
-#: src/libslic3r/PrintConfig.cpp:306
-msgid ""
-"Experimental option for preventing support material from being generated "
-"under bridged areas."
-msgstr ""
-"Opzione sperimentale per prevenire la formazione di supporti sotto i bridge."
-
-#: src/libslic3r/PrintConfig.cpp:313
-msgid "Distance between copies"
-msgstr "Distanza tra le copie"
-
-#: src/libslic3r/PrintConfig.cpp:314
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "Distanza usata per la funzione disposizione automatica del piatto."
-
-#: src/libslic3r/PrintConfig.cpp:322
-msgid "Elephant foot compensation"
-msgstr "Compensazione zampa d'elefante"
-
-#: src/libslic3r/PrintConfig.cpp:324
-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 ""
-"Il primo layer verrà ristretto sul piano XY dal valore configurato, così da "
-"compensare per lo schiacciamento del 1° layer, anche noto come effetto Zampa "
-"d'elefante."
-
-#: src/libslic3r/PrintConfig.cpp:334
-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 ""
-"Questa procedura finale è inserita alla fine del file di output. Si fa "
-"presente che puoi usare variabili sostitutive per tutte le impostazioni di "
-"Slic3r."
-
-#: src/libslic3r/PrintConfig.cpp:345
-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 ""
-"Questa procedura finale è inserita alla fine del file di output, prima del "
-"termine del gcode della stampante. Si fa presente che puoi usare variabili "
-"sostitutive per tutte le impostazioni di Slic3r. Se hai estrusori multipli, "
-"il gcode è processato nell'ordine dell'estrusore."
-
-#: src/libslic3r/PrintConfig.cpp:356
-msgid "Ensure vertical shell thickness"
-msgstr "Mantieni spessore guscio verticale"
-
-#: src/libslic3r/PrintConfig.cpp:358
-msgid ""
-"Add solid infill near sloping surfaces to guarantee the vertical shell "
-"thickness (top+bottom solid layers)."
-msgstr ""
-"Aggiunge un riempimento solido vicino le superfici inclinate per garantire "
-"lo spessore verticale (layer solidi superiore + inferiore)"
-
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "Trama riempimento superiore/inferiore"
-
-#: src/libslic3r/PrintConfig.cpp:367
-msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
-msgstr ""
-"Pattern di riempimento per il fondo o la cima. Questo influenza solo lo "
-"strato visibile esterno e non i perimetri adiacenti."
-
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
-msgid "Rectilinear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
-msgid "Concentric"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
-msgid "Hilbert Curve"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
-msgid "Archimedean Chords"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
-msgid "Octagram Spiral"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
-msgid "External perimeters"
-msgstr "Perimetri esterni"
-
-#: src/libslic3r/PrintConfig.cpp:388
-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 ""
-"Imposta questo valore diverso da zero per impostare una larghezza "
-"d'estrusione manuale per i perimetri esterni. Se lasciato a zero, verrà "
-"utilizzata la larghezza predefinita se impostata; diversamente verrà "
-"utilizzato il valore 1.125 x il diametro dell'ugello. Se espresso in "
-"percentuale (per esempio 200%), sarà calcolato sull'altezza del layer."
-
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
-msgid "mm or % (leave 0 for default)"
-msgstr "mm o % (lasciate 0 per il default)"
-
-#: src/libslic3r/PrintConfig.cpp:399
-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 ""
-"Questa impostazione separata avrà effetto sulla velocità dei perimetri "
-"esterni (quelli visibili). Se espresso come percentuale (per esempio: 80%) "
-"verrà calcolato sull'impostazione della velocità dei perimetri qui sopra. "
-"Imposta a zero per automatico."
-
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
-msgid "mm/s or %"
-msgstr "mm/s o %"
-
-#: src/libslic3r/PrintConfig.cpp:409
-msgid "External perimeters first"
-msgstr "Perimetri esterni per primi"
-
-#: src/libslic3r/PrintConfig.cpp:411
-msgid ""
-"Print contour perimeters from the outermost one to the innermost one instead "
-"of the default inverse order."
-msgstr ""
-"Stampa i perimetri di contorno dal più esterno al più interno invece "
-"dell'ordine predefinito inverso."
-
-#: src/libslic3r/PrintConfig.cpp:418
-msgid "Extra perimeters if needed"
-msgstr "Perimetro aggiuntivo se necessario"
-
-#: src/libslic3r/PrintConfig.cpp:420
-#, no-c-format
-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 ""
-"Aggiunge più perimetri quando necessario per evitare spazi tra i perimetri "
-"inclinati. Slic3r continua ad aggiungere perimetri fino a quando almeno il "
-"70% del giro immediatamente sopra sarà supportato."
-
-#: src/libslic3r/PrintConfig.cpp:431
-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 ""
-"Estrusore da utilizzare (a meno che non siano specificate impostazioni "
-"d'estrusore più specifiche). Questo valore scavalca l'estrusore dei "
-"perimetri e di riempimento, ma non l'estrusore dei supporti."
-
-#: src/libslic3r/PrintConfig.cpp:444
-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."
-msgstr ""
-"Imposta la distanza verticale tra la punta dell'ugello e (solitamente) le "
-"barre del carrello X. In altre parole, questa è l'altezza dello spazio "
-"cilindrico attorno l'estrusore, e indica la profondità massima che "
-"l'estrusore può affacciarsi prima di sbattere con altri oggetti stampati."
-
-#: src/libslic3r/PrintConfig.cpp:455
-msgid "Radius"
-msgstr "Raggio"
-
-#: src/libslic3r/PrintConfig.cpp:456
-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."
-msgstr ""
-"Imposta il raggio di spazio attorno all'estrusore. Se l'estrusore non è "
-"centrato, scegli il valore più grande per sicurezza. Questa impostazione è "
-"usata per controllare le collisioni e per mostrare l'anteprima grafica nel "
-"piano."
-
-#: src/libslic3r/PrintConfig.cpp:467
-msgid "Extruder Color"
-msgstr "Colore estrusore"
-
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr "Utilizzato solo nell'interfaccia di Slic3r come aiuto visivo."
-
-#: src/libslic3r/PrintConfig.cpp:475
-msgid "Extruder offset"
-msgstr "Offset estrusore"
-
-#: src/libslic3r/PrintConfig.cpp:476
-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)."
-msgstr ""
-"Se il firmware non gestisce lo spostamento dell'estrusore,  è necessario che "
-"il G-code ne tenga conto. Questa opzione  permette di specificare lo "
-"spostamento di ciascun estrusore rispetto al primo. Si aspetta delle "
-"coordinate positive (che saranno sottratte dalle coordinate XY)."
-
-#: src/libslic3r/PrintConfig.cpp:486
-msgid "Extrusion axis"
-msgstr "Asse estrusore"
-
-#: src/libslic3r/PrintConfig.cpp:487
-msgid ""
-"Use this option to set the axis letter associated to your printer's extruder "
-"(usually E but some printers use A)."
-msgstr ""
-"Usa questa opzione per impostare la lettera dell'asse associato "
-"all'estrusore della tua stampante (solitamente E, ma alcune stampanti "
-"utilizzano A)."
-
-#: src/libslic3r/PrintConfig.cpp:493
-msgid "Extrusion multiplier"
-msgstr "Moltiplicatore estrusione"
-
-#: src/libslic3r/PrintConfig.cpp:494
-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."
-msgstr ""
-"Questo fattore modifica proporzionalmente il valore del flusso. Dovrai "
-"modificare questa impostazione per ottenere una buona finitura superficiale "
-"e correggere la larghezza delle pareti singole. Normalmente i valori sono "
-"tra 0.9 e 1.1. Se ritieni di dover modificare questo valore ulteriormente, "
-"controlla il diametro del filamento e i passi E del tuo firmware."
-
-#: src/libslic3r/PrintConfig.cpp:503
-msgid "Default extrusion width"
-msgstr "Larghezza estrusione predefinita"
-
-#: src/libslic3r/PrintConfig.cpp:505
-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 ""
-"Imposta questo valore diverso da zero per permettere la larghezza estrusione "
-"manuale. Se lasciato a zero, Slic3r ricava la larghezza d'estrusione dal "
-"diametro dell'ugello (vedi il suggerimento per la larghezza di estrusione "
-"perimetro,larghezza estrusione riempimento ecc.). Se espresso come "
-"percentuale (ad esempio 230%), sarà calcolato sull'altezza del layer."
-
-#: src/libslic3r/PrintConfig.cpp:509
-msgid "mm or % (leave 0 for auto)"
-msgstr "mm o % (lasciate 0 per l'automatico)"
-
-#: src/libslic3r/PrintConfig.cpp:515
-msgid "Keep fan always on"
-msgstr "Mantieni la ventola sempre accesa"
-
-#: src/libslic3r/PrintConfig.cpp:516
-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 ""
-"Se questo è attivo, la ventola non verrà mai disattiva e verrà mantenuta "
-"attiva almeno alla velocità minima. Utile per il PLA, dannosa per l'ABS."
-
-#: src/libslic3r/PrintConfig.cpp:522
-msgid "Enable fan if layer print time is below"
-msgstr "Abilita ventola se il tempo di stampa del layer è inferiore"
-
-#: src/libslic3r/PrintConfig.cpp:523
-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 ""
-"Se il tempo stimato di stampa del layer è al di sotto di questo numero di "
-"secondi, la ventola sarà attivata e la sua velocità sarà calcolata "
-"interpolando la velocità minima e massima."
-
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
-msgid "approximate seconds"
-msgstr "secondi approssimativi"
-
-#: src/libslic3r/PrintConfig.cpp:534
-msgid "Color"
-msgstr "Colore"
-
-#: src/libslic3r/PrintConfig.cpp:541
-msgid "Filament notes"
-msgstr "Note filamento"
-
-#: src/libslic3r/PrintConfig.cpp:542
-msgid "You can put your notes regarding the filament here."
-msgstr "E' possibile inserire qui le note riguardanti il filamento."
-
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
-msgid "Max volumetric speed"
-msgstr "Massima velocità volumetrica"
-
-#: src/libslic3r/PrintConfig.cpp:552
-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 ""
-"Massima velocità volumetrica consentita per questo filamento. Limita la "
-"velocità volumetrica massima di una stampa alla velocità volumetrica minima "
-"del filamento e di stampa. Imposta a zero per non avere limite."
-
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
-msgid "mm³/s"
-msgstr "mm³/s"
-
-#: src/libslic3r/PrintConfig.cpp:562
-msgid "Loading speed"
-msgstr "Velocità di caricamento"
-
-#: src/libslic3r/PrintConfig.cpp:563
-msgid "Speed used for loading the filament on the wipe tower. "
-msgstr "Velocità utilizzata per caricare il filamento sulla torre di spurgo. "
-
-#: src/libslic3r/PrintConfig.cpp:571
-msgid "Loading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:572
-msgid "Speed used at the very beginning of loading phase. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:580
-msgid "Unloading speed"
-msgstr "Velocità di scaricamento"
-
-#: src/libslic3r/PrintConfig.cpp:581
-msgid ""
-"Speed used for unloading the filament on the wipe tower (does not affect  "
-"initial part of unloading just after ramming). "
-msgstr ""
-"Velocità usata per scaricare il filamento sulla wipe tower (non influisce "
-"sulla parte iniziale dello scaricamento dopo il ramming) "
-
-#: src/libslic3r/PrintConfig.cpp:590
-msgid "Unloading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:591
-msgid ""
-"Speed used for unloading the tip of the filament immediately after ramming. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:599
-msgid "Delay after unloading"
-msgstr "Ritardo dopo lo scarico"
-
-#: src/libslic3r/PrintConfig.cpp:600
-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. "
-msgstr ""
-"Tempo di attesa dopo lo scaricamento del filamento. Può aiutare per ottenere "
-"cambi affidabili con materiali flessibili che potrebbero richiedere più "
-"tempo per tornare alle dimensioni originali. "
-
-#: src/libslic3r/PrintConfig.cpp:610
-msgid "Number of cooling moves"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:611
-msgid ""
-"Filament is cooled by being moved back and forth in the cooling tubes. "
-"Specify desired number of these moves "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:620
-msgid "Speed of the first cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:621
-msgid "Cooling moves are gradually accelerating beginning at this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:629
-msgid "Minimal purge on wipe tower"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:630
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:635
-msgid "mm³"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:641
-msgid "Speed of the last cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:642
-msgid "Cooling moves are gradually accelerating towards this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:650
-msgid "Filament load time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:651
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:659
-msgid "Ramming parameters"
-msgstr "Parametri del ramming"
-
-#: src/libslic3r/PrintConfig.cpp:660
-msgid ""
-"This string is edited by RammingDialog and contains ramming specific "
-"parameters "
-msgstr ""
-"Questa stringa viene controllata da RammingDialog e contiene parametri "
-"specifici del ramming "
-
-#: src/libslic3r/PrintConfig.cpp:667
-msgid "Filament unload time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:668
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:677
-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."
-msgstr ""
-"Inserisci qui il diametro del filamento. E' richiesta una buona precisione, "
-"pertanto usa un calibro ed esegui misurazioni multiple lungo il filamento, "
-"per poi ricavare una media."
-
-#: src/libslic3r/PrintConfig.cpp:685
-msgid "Density"
-msgstr "Densità"
-
-#: src/libslic3r/PrintConfig.cpp:686
-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."
-msgstr ""
-"Inserisci qui la densità del filamento. E' solo un'informazione statistica. "
-"Un metodo approssimativo consiste nel pesare un pezzo di filamento di "
-"lunghezza nota, e calcolare il rapporto tra lunghezza e volume. E' meglio "
-"calcolare il volume direttamente attraverso il dislocamento."
-
-#: src/libslic3r/PrintConfig.cpp:689
-msgid "g/cm³"
-msgstr "g/cm³"
-
-#: src/libslic3r/PrintConfig.cpp:695
-msgid "Filament type"
-msgstr "Tipo filamento"
-
-#: src/libslic3r/PrintConfig.cpp:696
-msgid "The filament material type for use in custom G-codes."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:712
-msgid "Soluble material"
-msgstr "Materiale solubile"
-
-#: src/libslic3r/PrintConfig.cpp:713
-msgid "Soluble material is most likely used for a soluble support."
-msgstr "Il materiale solubile è comunemente usato per un supporto solubile."
-
-#: src/libslic3r/PrintConfig.cpp:719
-msgid ""
-"Enter your filament cost per kg here. This is only for statistical "
-"information."
-msgstr ""
-"Inserisci qui il costo del filamento per kg. E' solo un'informazione "
-"statistica."
-
-#: src/libslic3r/PrintConfig.cpp:720
-msgid "money/kg"
-msgstr "soldi/kg"
-
-#: src/libslic3r/PrintConfig.cpp:729
-msgid "Fill angle"
-msgstr "Angolo riempimento"
-
-#: src/libslic3r/PrintConfig.cpp:731
-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."
-msgstr ""
-"Angolo base predefinito per l'orientamento del riempimento. Su questo verrà "
-"applicato il tratteggio. I bridge saranno riempiti utilizzando la migliore "
-"direzione che Slic3r può determinare, quindi questa impostazione non "
-"influisce sui bridge."
-
-#: src/libslic3r/PrintConfig.cpp:744
-msgid "Fill density"
-msgstr "Densità riempimento"
-
-#: src/libslic3r/PrintConfig.cpp:746
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "Densità del riempimento interno, espresso nell'intervallo 0% - 100%."
-
-#: src/libslic3r/PrintConfig.cpp:782
-msgid "Fill pattern"
-msgstr "Schema riempimento"
-
-#: src/libslic3r/PrintConfig.cpp:784
-msgid "Fill pattern for general low-density infill."
-msgstr "Schema per riempimento comune a bassa densità."
-
-#: src/libslic3r/PrintConfig.cpp:801
-msgid "Grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:802
-msgid "Triangles"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:803
-msgid "Stars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:804
-msgid "Cubic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:805
-msgid "Line"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
-msgid "Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:808
-msgid "3D Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:809
-msgid "Gyroid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
-msgid "First layer"
-msgstr "Primo strato"
-
-#: src/libslic3r/PrintConfig.cpp:817
-msgid ""
-"This is the acceleration your printer will use for first layer. Set zero to "
-"disable acceleration control for first layer."
-msgstr ""
-"Questa è l'accelerazione che la stampante utilizzerà per il primo layer. "
-"Imposta a zero per disattivare il controllo dell'accelerazione per il primo "
-"layer."
-
-#: src/libslic3r/PrintConfig.cpp:827
-msgid ""
-"Heated build plate temperature for the first layer. Set this to zero to "
-"disable bed temperature control commands in the output."
-msgstr ""
-"Temperatura piano riscaldato per il primo layer. Imposta a zero per "
-"disattivare i comandi di controllo temperatura nell'output."
-
-#: src/libslic3r/PrintConfig.cpp:837
-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."
-msgstr ""
-"Imposta questo valore diverso da zero per impostare la larghezza di "
-"estrusione manuale per il primo layer. Puoi usarlo per forzare un'estrusione "
-"più grossa per avere un'adesione migliore. Se espresso in percentuale (per "
-"esempio 120%) sarà calcolato sull'altezza del primo layer. Se impostato a "
-"zero, sarà utilizzata la larghezza di estrusione predefinita."
-
-#: src/libslic3r/PrintConfig.cpp:848
-msgid "First layer height"
-msgstr "Altezza del primo strato"
-
-#: src/libslic3r/PrintConfig.cpp:850
-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 ""
-"Durante la stampa di layer molto bassi, potresti comunque aver bisogno di "
-"stampare layer inferiori più spessi per migliorare l'adesione e la "
-"tolleranza per piani di stampa non perfetti. Questo può essere espresso come "
-"un valore assoluto o come una percentuale (per esempio: 150%) sull'altezza "
-"layer predefinita."
-
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
-msgid "mm or %"
-msgstr "mm o %"
-
-#: src/libslic3r/PrintConfig.cpp:860
-msgid "First layer speed"
-msgstr "Velocità del primo strato"
-
-#: src/libslic3r/PrintConfig.cpp:861
-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 ""
-"Se espresso come valore assoluto in mm/s, questa velocità sarà applicata a "
-"tutti i movimenti di stampa del primo layer, a prescindere dal tipo di "
-"movimento. Se espresso come percentuale (per esempio: 40%) verranno scalate "
-"le velocità predefinite."
-
-#: src/libslic3r/PrintConfig.cpp:872
-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 ""
-"Temperatura estrusore per il primo layer. Se vuoi controllare manualmente la "
-"temperatura durante la stampa, imposta questo a zero per disattivare i "
-"comandi di controllo temperatura nel file di output."
-
-#: src/libslic3r/PrintConfig.cpp:882
-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 ""
-"Velocità per il riempimento degli spazi stretti utilizzando brevi movimenti "
-"a zig-zag. Mantieni questa velocità ragionevolmente bassa per evitare "
-"problemi di oscillazione e risonanza. Imposta a zero per disabilitare il "
-"riempimento degli spazi."
-
-#: src/libslic3r/PrintConfig.cpp:890
-msgid "Verbose G-code"
-msgstr "G-code Verbose"
-
-#: src/libslic3r/PrintConfig.cpp:891
-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 ""
-"Abilita per ottenere un file G-code commentato, con un testo descrittivo per "
-"ciascuna linea. Se stampi da memoria SD, il peso aggiuntivo del file "
-"potrebbe rallentare il tuo firmware."
-
-#: src/libslic3r/PrintConfig.cpp:899
-msgid "G-code flavor"
-msgstr "Tipologia di G-code"
-
-#: src/libslic3r/PrintConfig.cpp:900
-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 ""
-"Alcuni comandi G/M-code, incluso il controllo temperatura ed altri, non sono "
-"universali. Attiva questa impostazione sul firmware della tua stampante per "
-"ottenere un output compatibile. Il tipo \"No estrusione\" impedisce che "
-"Slic3r esporti qualunque valore di estrusione."
-
-#: src/libslic3r/PrintConfig.cpp:924
-msgid "No extrusion"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:929
-msgid "High extruder current on filament swap"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:930
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:939
-msgid ""
-"This is the acceleration your printer will use for infill. Set zero to "
-"disable acceleration control for infill."
-msgstr ""
-"Questa è l'accelerazione che la stampante utilizzerà per il riempimento. "
-"Imposta a zero per disattivare il controllo dell'accelerazione per il "
-"riempimento."
-
-#: src/libslic3r/PrintConfig.cpp:948
-msgid "Combine infill every"
-msgstr "Combina riempimento ogni"
-
-#: src/libslic3r/PrintConfig.cpp:950
-msgid ""
-"This feature allows to combine infill and speed up your print by extruding "
-"thicker infill layers while preserving thin perimeters, thus accuracy."
-msgstr ""
-"Questa funzione permette di combinare il riempimento e velocizza il tempo di "
-"stampa estrudendo layer di infill più spessi conservando tuttavia i "
-"perimetri sottili, e quindi l'accuratezza."
-
-#: src/libslic3r/PrintConfig.cpp:954
-msgid "Combine infill every n layers"
-msgstr "Combina riempimento ogni n layer"
-
-#: src/libslic3r/PrintConfig.cpp:960
-msgid "Infill extruder"
-msgstr "Estrusore riempimento"
-
-#: src/libslic3r/PrintConfig.cpp:962
-msgid "The extruder to use when printing infill."
-msgstr "L'estrusore da utilizzare per la stampa del riempimento."
-
-#: src/libslic3r/PrintConfig.cpp:971
-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."
-msgstr ""
-"Imposta questo valore diverso da zero per impostare una larghezza "
-"d'estrusione manuale per il riempimento. Se lasciato a zero, verrà usata la "
-"larghezza d'estrusione predefinita, altrimenti verrà utilizzato il valore "
-"1.125 x il diametro dell'ugello. Dovresti usare un estrusione più grossa per "
-"velocizzare la stampa del riempimento e rendere le tue parti più robuste. Se "
-"espresso in percentuale (per esempio 90%) verrà calcolato sull'altezza del "
-"layer."
-
-#: src/libslic3r/PrintConfig.cpp:981
-msgid "Infill before perimeters"
-msgstr "Riempimento prima dei perimetri"
-
-#: src/libslic3r/PrintConfig.cpp:982
-msgid ""
-"This option will switch the print order of perimeters and infill, making the "
-"latter first."
-msgstr ""
-"Questa opzione sostituirà l'ordine di stampa dei perimetri e del "
-"riempimento, realizzando per primo il secondo."
-
-#: src/libslic3r/PrintConfig.cpp:988
-msgid "Only infill where needed"
-msgstr "Riempimento solo quando necessario"
-
-#: src/libslic3r/PrintConfig.cpp:990
-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."
-msgstr ""
-"Questa opzione limiterà il riempimento alle aree che effettivamente hanno "
-"bisogno di un supporto per i soffitti (si comporterà come un materiale di "
-"supporto interno). Se attivato, rallenterà la generazione del G-code a causa "
-"dei molteplici controlli necessari."
-
-#: src/libslic3r/PrintConfig.cpp:998
-msgid "Infill/perimeters overlap"
-msgstr "Sovrapposizione riempimento/perimetri"
-
-#: src/libslic3r/PrintConfig.cpp:1000
-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."
-msgstr ""
-"Questa impostazione applica una sovrapposizione aggiuntiva tra perimetri e "
-"riempimento per una migliore unione. Teoricamente non sarebbe necessario, ma "
-"i contraccolpi possono causare spazi vuoi. Se espresso in percentuale (per "
-"esempio: 15%) viene calcolato sulla larghezza d'estrusione del perimetro."
-
-#: src/libslic3r/PrintConfig.cpp:1012
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr ""
-"Velocità per la stampa del riempimento interno. Imposta a zero per auto."
-
-#: src/libslic3r/PrintConfig.cpp:1020
-msgid "Inherits profile"
-msgstr "Eredita profilo"
-
-#: src/libslic3r/PrintConfig.cpp:1021
-msgid "Name of the profile, from which this profile inherits."
-msgstr "Nome del profilo da cui questo profilo eredita."
-
-#: src/libslic3r/PrintConfig.cpp:1032
-msgid "Interface shells"
-msgstr "Gusci interfaccia"
-
-#: src/libslic3r/PrintConfig.cpp:1033
-msgid ""
-"Force the generation of solid shells between adjacent materials/volumes. "
-"Useful for multi-extruder prints with translucent materials or manual "
-"soluble support material."
-msgstr ""
-"Forza la generazione di perimetri solidi tra volumi o materiali adiacenti. "
-"Utile per stampe multi estrusore con materiali traslucidi o supporti "
-"solubili manuali."
-
-#: src/libslic3r/PrintConfig.cpp:1043
-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:1054
-msgid "Supports remaining times"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1055
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1063
-msgid "Supports silent mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1064
-msgid "Set silent mode for the G-code flavor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1087
-msgid "Maximum feedrate %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1089
-msgid "Maximum feedrate of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1097
-msgid "Maximum acceleration %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1099
-msgid "Maximum acceleration of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1107
-msgid "Maximum jerk %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1109
-msgid "Maximum jerk of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
-msgid "Minimum feedrate when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
-msgid "Minimum travel feedrate"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
-msgid "Maximum acceleration when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
-msgid "Maximum acceleration when retracting"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
-msgid "Max"
-msgstr "Massimo"
-
-#: src/libslic3r/PrintConfig.cpp:1164
-msgid "This setting represents the maximum speed of your fan."
-msgstr "Questa impostazione rappresenta la velocità massima della ventola."
-
-#: src/libslic3r/PrintConfig.cpp:1174
-#, no-c-format
-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."
-msgstr ""
-"Questa è la massima altezza layer stampabile per questo estrusore, usata "
-"come limite per l'altezza variabile dei layer e l'altezza dei layer di "
-"supporto. L'altezza layer massima raccomandata è il 75% della larghezza di "
-"estrusione, in modo da ottenere una buona adesione tra i layer. Se impostato "
-"a 0, l'altezza layer è limitata al 75% del diametro dell'ugello."
-
-#: src/libslic3r/PrintConfig.cpp:1185
-msgid "Max print speed"
-msgstr "Massima velocità di stampa"
-
-#: src/libslic3r/PrintConfig.cpp:1186
-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."
-msgstr ""
-"Quando le altre velocità sono impostate a 0, Slic3r calcolerà "
-"automaticamente la velocità ottimale in modo da mantenere costante la "
-"pressione dell'estrusore. Questa impostazione sperimentale è utilizzata per "
-"impostare la velocità massima di stampa che vuoi permettere."
-
-#: src/libslic3r/PrintConfig.cpp:1197
-msgid ""
-"This experimental setting is used to set the maximum volumetric speed your "
-"extruder supports."
-msgstr ""
-"Questa impostazione sperimentale è utilizzata per impostare la massima "
-"velocità volumetrica supportata dal tuo estrusore."
-
-#: src/libslic3r/PrintConfig.cpp:1206
-msgid "Max volumetric slope positive"
-msgstr "Massima pendenza volumetrica positiva"
-
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
-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."
-msgstr ""
-"Questa impostazione sperimentale è utilizzata per limitare la velocità del "
-"cambio nel fattore di estrusione.  Un valore di 1.8 mm³/s² assicura che un "
-"cambio dal fattore di estrusione di 1.8 mm³/s (larghezza estrusione 0.45mm, "
-"altezza estrusione di 0.2mm, avanzamento 20 mm/s) a 5.4 mm³/s (avanzamento a "
-"60 mm/s) impiegherà almeno 2 secondi."
-
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
-msgid "mm³/s²"
-msgstr "mm³/s²"
-
-#: src/libslic3r/PrintConfig.cpp:1218
-msgid "Max volumetric slope negative"
-msgstr "Massima pendenza volumetrica negativa"
-
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
-msgid "Min"
-msgstr "Minimo"
-
-#: src/libslic3r/PrintConfig.cpp:1231
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr ""
-"Questa impostazione rappresenta la PWM minima (modulazione di larghezza di "
-"impulso) che la ventola necessita per lavorare."
-
-#: src/libslic3r/PrintConfig.cpp:1241
-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."
-msgstr ""
-"Questa è l'altezza minima stampabile per questo estrusore e limita la "
-"risoluzione per l'altezza variabile di layer.  Valori tipici sono compresi "
-"tra 0.05 mm e 0.1 mm."
-
-#: src/libslic3r/PrintConfig.cpp:1250
-msgid "Min print speed"
-msgstr "Velocità minima di stampa"
-
-#: src/libslic3r/PrintConfig.cpp:1251
-msgid "Slic3r will not scale speed down below this speed."
-msgstr "Slic3r non rallenterà la velocità al di sotto di questa."
-
-#: src/libslic3r/PrintConfig.cpp:1259
-msgid "Minimal filament extrusion length"
-msgstr "Lunghezza di estrusione minima del filamento"
-
-#: src/libslic3r/PrintConfig.cpp:1260
-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."
-msgstr ""
-"Genera almeno il numero di skirt necessari per consumare la quantità di "
-"filamento specificata per il primo strato. Per le macchine multi estrusore, "
-"questo minimo riguarda ciascun estrusore."
-
-#: src/libslic3r/PrintConfig.cpp:1270
-msgid "Configuration notes"
-msgstr "Note di configurazione"
-
-#: src/libslic3r/PrintConfig.cpp:1271
-msgid ""
-"You can put here your personal notes. This text will be added to the G-code "
-"header comments."
-msgstr ""
-"E' possibile inserire qui le note personali. Questo testo verrà aggiunto nei "
-"commenti iniziali del G-code."
-
-#: src/libslic3r/PrintConfig.cpp:1281
-msgid "Nozzle diameter"
-msgstr "Diametro ugello"
-
-#: src/libslic3r/PrintConfig.cpp:1282
-msgid ""
-"This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
-msgstr ""
-"Questo è il diametro dell'ugello dell'estrusore (per esempio: 0.5, 0.35 ecc.)"
-
-#: src/libslic3r/PrintConfig.cpp:1288
-msgid "Host Type"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1289
-msgid ""
-"Slic3r can upload G-code files to a printer host. This field must contain "
-"the kind of the host."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr "Hostname, IP o URL"
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
-msgid "Only retract when crossing perimeters"
-msgstr "Ritrai solo se si attraversa un perimetro"
-
-#: src/libslic3r/PrintConfig.cpp:1326
-msgid ""
-"Disables retraction when the travel path does not exceed the upper layer's "
-"perimeters (and thus any ooze will be probably invisible)."
-msgstr ""
-"Disabilita la retrazione quando la traiettoria del movimento non oltrepassa "
-"i perimetri del layer superiore (pertanto qualunque scolatura sarà "
-"probabilmente invisibile)."
-
-#: src/libslic3r/PrintConfig.cpp:1334
-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 ""
-"Questa opzione abbasserà la temperatura degli estrusori inattivi per "
-"prevenire oozing. Attiverà automaticamente uno skirt alto e muoverà "
-"l'estrusore al di fuori di questo skirt al cambiamento di temperature."
-
-#: src/libslic3r/PrintConfig.cpp:1342
-msgid "Output filename format"
-msgstr "Formato del file di Output"
-
-#: src/libslic3r/PrintConfig.cpp:1343
-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 ""
-"E' possibile utilizzare tutte le opzioni di configurazione come variabili "
-"all'interno di questo modello. Ad esempio: [layer_height], [fill_density] "
-"ecc. Puoi anche usare [timestamp], [year], [month], [day], [hour], [minute], "
-"[second], [version], [input_filename ], [nome_filename_input]."
-
-#: src/libslic3r/PrintConfig.cpp:1353
-msgid "Detect bridging perimeters"
-msgstr "Rileva perimetri ponte"
-
-#: src/libslic3r/PrintConfig.cpp:1355
-msgid ""
-"Experimental option to adjust flow for overhangs (bridge flow will be used), "
-"to apply bridge speed to them and enable fan."
-msgstr ""
-"Opzione sperimentale per regolare il flusso delle sporgenze (sarà utilizzato "
-"il flusso dei bridge), applicare la velocità del bridge e attivare la "
-"ventola."
-
-#: src/libslic3r/PrintConfig.cpp:1362
-msgid "Filament parking position"
-msgstr "Posizione di parking del filamento"
-
-#: src/libslic3r/PrintConfig.cpp:1363
-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 ""
-"Distanza della punta dell'estrusore dalla posizione dove il filamento viene "
-"posto mentre viene scaricato. Dovrebbe essere uguale al valore nel firmware "
-"della stampante. "
-
-#: src/libslic3r/PrintConfig.cpp:1372
-msgid "Extra loading distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1373
-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:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
-msgid "Perimeters"
-msgstr "Perimetri"
-
-#: src/libslic3r/PrintConfig.cpp:1383
-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 ""
-"Questa è l'accelerazione che la stampante utilizzerà per i perimetri. Un "
-"valore alto come 9000 solitamente produce dei buoni risultati se l'hardware "
-"è all'altezza. Imposta a zero per disattivare il controllo "
-"dell'accelerazione per i perimetri."
-
-#: src/libslic3r/PrintConfig.cpp:1392
-msgid "Perimeter extruder"
-msgstr "Estrusore perimetro"
-
-#: src/libslic3r/PrintConfig.cpp:1394
-msgid ""
-"The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr ""
-"L'estrusore da utilizzare per la stampa dei perimetri e del brim. Il primo "
-"estrusore è 1."
-
-#: src/libslic3r/PrintConfig.cpp:1404
-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."
-msgstr ""
-"Imposta questo valore diverso da zero per impostare una larghezza "
-"d'estrusione manuale per i perimetri. Dovresti scegliere un'estrusione più "
-"sottile per ottenere superfici più precise. Se lasciato a zero, verrà usata "
-"la larghezza d'estrusione predefinita, altrimenti verrà utilizzato il valore "
-"1.125 x il diametro dell'ugello. Se espresso in percentuale (per esempio "
-"200%) verrà calcolato sull'altezza del layer."
-
-#: src/libslic3r/PrintConfig.cpp:1417
-msgid ""
-"Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr ""
-"Velocità per i perimetri (contorni, conosciuti anche come gusci verticali). "
-"Imposta a zero per automatizzare."
-
-#: src/libslic3r/PrintConfig.cpp:1427
-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 ""
-"Questa opzione imposta il numero di perimetri da generare per ogni layer. Da "
-"notare che Slic3r aumenta questo numero automaticamente quando rileva "
-"superfici inclinate che potrebbero beneficiare di un aumento del numero dei "
-"perimetri se l'opzione Perimetri aggiuntivi è attiva."
-
-#: src/libslic3r/PrintConfig.cpp:1431
-msgid "(minimum)"
-msgstr "(minimo)"
-
-#: src/libslic3r/PrintConfig.cpp:1439
-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."
-msgstr ""
-"Se vuoi processare il G-code in uscita con script personalizzati, basta "
-"elencare qui il loro percorso assoluto. Separa i diversi script con un punto "
-"e virgola.  Gli script passeranno il percorso assoluto nel G-code come primo "
-"argomento, e potranno accedere alle impostazioni di configurazione di Slic3r "
-"leggendo le variabili di ambiente."
-
-#: src/libslic3r/PrintConfig.cpp:1452
-msgid "Printer type"
-msgstr "Tipo stampante"
-
-#: src/libslic3r/PrintConfig.cpp:1453
-msgid "Type of the printer."
-msgstr "Tipologia stampante."
-
-#: src/libslic3r/PrintConfig.cpp:1457
-msgid "Printer notes"
-msgstr "Note stampante"
-
-#: src/libslic3r/PrintConfig.cpp:1458
-msgid "You can put your notes regarding the printer here."
-msgstr "E' possibile inserire qui le note riguardanti la stampante."
-
-#: src/libslic3r/PrintConfig.cpp:1467
-msgid "Printer vendor"
-msgstr "Venditore della stampante"
-
-#: src/libslic3r/PrintConfig.cpp:1468
-msgid "Name of the printer vendor."
-msgstr "Nome del venditore della stampante."
-
-#: src/libslic3r/PrintConfig.cpp:1472
-msgid "Printer variant"
-msgstr "Variante della stampante"
-
-#: src/libslic3r/PrintConfig.cpp:1473
-msgid ""
-"Name of the printer variant. For example, the printer variants may be "
-"differentiated by a nozzle diameter."
-msgstr ""
-"Nome della variante di stampante. Per esempio le varianti di una stampante "
-"potrebbero differire per diametro dell'ugello."
-
-#: src/libslic3r/PrintConfig.cpp:1483
-msgid "Raft layers"
-msgstr "Layer raft"
-
-#: src/libslic3r/PrintConfig.cpp:1485
-msgid ""
-"The object will be raised by this number of layers, and support material "
-"will be generated under it."
-msgstr ""
-"L'oggetto verrà sollevato da questo numero di layer, e verrà generato il "
-"materiale di supporto al di sotto di questo."
-
-#: src/libslic3r/PrintConfig.cpp:1494
-msgid "Resolution"
-msgstr "Risoluzione"
-
-#: src/libslic3r/PrintConfig.cpp:1495
-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 ""
-"Risoluzione minima dettaglio, utilizzato per semplificare il file input "
-"accelerando lo slicing e riducendo l'utilizzo di memoria. I file ad alta "
-"risoluzione spesso hanno più dettaglio di quanto la stampante possa "
-"generare. Impostate a zero per disabilitare la semplificazione e utilizzare "
-"la risoluzione completa."
-
-#: src/libslic3r/PrintConfig.cpp:1506
-msgid "Minimum travel after retraction"
-msgstr "Spostamento minimo dopo una ritrazione"
-
-#: src/libslic3r/PrintConfig.cpp:1507
-msgid ""
-"Retraction is not triggered when travel moves are shorter than this length."
-msgstr ""
-"La retrazione non è attivata quando i movimenti di spostamento sono più "
-"brevi di questa lunghezza."
-
-#: src/libslic3r/PrintConfig.cpp:1514
-msgid "Retract amount before wipe"
-msgstr "Retrai la quantità prima di pulire"
-
-#: src/libslic3r/PrintConfig.cpp:1515
-msgid ""
-"With bowden extruders, it may be wise to do some amount of quick retract "
-"before doing the wipe movement."
-msgstr ""
-"Con estrusori bowden, potrebbe essere saggio effettuare una certa retrazione "
-"veloce prima di effettuare un movimento di pulizia."
-
-#: src/libslic3r/PrintConfig.cpp:1523
-msgid "Retract on layer change"
-msgstr "Ritrai al cambio layer"
-
-#: src/libslic3r/PrintConfig.cpp:1524
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr ""
-"Questo contrassegno forza una retrazione ogni volta che viene effettuato un "
-"movimento di Z."
-
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
-msgid "Length"
-msgstr "Lunghezza"
-
-#: src/libslic3r/PrintConfig.cpp:1531
-msgid "Retraction Length"
-msgstr "Lunghezza Retrazione"
-
-#: src/libslic3r/PrintConfig.cpp:1532
-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 ""
-"Quando viene attivata la retrazione, il filamento viene ritirato per la "
-"quantità specificata (la lunghezza è misurata sul filamento grezzo, prima "
-"che questo entri dentro l'estrusore)."
-
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
-msgid "mm (zero to disable)"
-msgstr "mm (imposta a zero per disabilitare)"
-
-#: src/libslic3r/PrintConfig.cpp:1540
-msgid "Retraction Length (Toolchange)"
-msgstr "Lunghezza Retrazione (cambio tool)"
-
-#: src/libslic3r/PrintConfig.cpp:1541
-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 ""
-"Quando viene attivata la retrazione prima del cambio strumento, il filamento "
-"è ritirato per la quantità specificata (la lunghezza è misurata sul "
-"filamento grezzo, prima che questo entri dentro l'estrusore)."
-
-#: src/libslic3r/PrintConfig.cpp:1550
-msgid "Lift Z"
-msgstr "Solleva Z"
-
-#: src/libslic3r/PrintConfig.cpp:1551
-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 ""
-"Se inserisci un valore positivo, Z verrà alzato velocemente ogni volta che "
-"si innesca una retrazione. Quando si utilizzano diversi estrusori, verrà "
-"considerato solamente l'impostazione del primo estrusore."
-
-#: src/libslic3r/PrintConfig.cpp:1559
-msgid "Above Z"
-msgstr "Sopra Z"
-
-#: src/libslic3r/PrintConfig.cpp:1560
-msgid "Only lift Z above"
-msgstr "Eleva solo Z al di sopra"
-
-#: src/libslic3r/PrintConfig.cpp:1561
-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 ""
-"Se inserisci un valore positivo, il sollevamento Z avverrà solamente sopra "
-"un certo specifico valore assoluto Z. Puoi regolare questa impostazione per "
-"evitare il sollevamento nei primi layer."
-
-#: src/libslic3r/PrintConfig.cpp:1569
-msgid "Below Z"
-msgstr "Sotto Z"
-
-#: src/libslic3r/PrintConfig.cpp:1570
-msgid "Only lift Z below"
-msgstr "Eleva solo Z al di sotto"
-
-#: src/libslic3r/PrintConfig.cpp:1571
-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 ""
-"Se inserisci un valore positivo, il sollevamento Z avverrà solamente sotto "
-"un certo specifico valore assoluto Z. Puoi regolare questa impostazione per "
-"limitare il sollevamento ai primi layer."
-
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
-msgid "Extra length on restart"
-msgstr "Lunghezza extra in ripresa"
-
-#: src/libslic3r/PrintConfig.cpp:1581
-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 ""
-"Quando la retrazione è compensata dopo un movimento di spostamento, "
-"l'estrusore spingerà questa quantità addizionale di filamento. Questa "
-"impostazione è raramente necessaria."
-
-#: src/libslic3r/PrintConfig.cpp:1590
-msgid ""
-"When the retraction is compensated after changing tool, the extruder will "
-"push this additional amount of filament."
-msgstr ""
-"Quando la retrazione è compensata dopo un cambio di strumento, l'estrusore "
-"spingerà questa quantità addizionale di filamento."
-
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
-msgid "Retraction Speed"
-msgstr "Velocità di retrazione"
-
-#: src/libslic3r/PrintConfig.cpp:1600
-msgid "The speed for retractions (it only applies to the extruder motor)."
-msgstr ""
-"Velocità delle retrazioni (si applica solamente al motore dell'estrusore)."
-
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
-msgid "Deretraction Speed"
-msgstr "Velocità di deretrazione"
-
-#: src/libslic3r/PrintConfig.cpp:1609
-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 ""
-"La velocità di caricamento di un filamento nell'estrusore dopo la retrazione "
-"(si applica solamente al motore dell'estrusore). Se lasciato a zero, verrà "
-"utilizzata la velocità di retrazione."
-
-#: src/libslic3r/PrintConfig.cpp:1617
-msgid "Seam position"
-msgstr "Posizione giunzione"
-
-#: src/libslic3r/PrintConfig.cpp:1619
-msgid "Position of perimeters starting points."
-msgstr "Posizione dei punti iniziali dei perimetri."
-
-#: src/libslic3r/PrintConfig.cpp:1626
-msgid "Random"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1627
-msgid "Nearest"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1628
-msgid "Aligned"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1636
-msgid "Direction"
-msgstr "Direzione"
-
-#: src/libslic3r/PrintConfig.cpp:1638
-msgid "Preferred direction of the seam"
-msgstr "Direzione preferita della giunzione"
-
-#: src/libslic3r/PrintConfig.cpp:1639
-msgid "Seam preferred direction"
-msgstr "Direzione preferita giunzione"
-
-#: src/libslic3r/PrintConfig.cpp:1647
-msgid "Jitter"
-msgstr "Jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1649
-msgid "Seam preferred direction jitter"
-msgstr "Direzione preferita giunzione jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1650
-msgid "Preferred direction of the seam - jitter"
-msgstr "Direzione preferita della giunzione - jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1661
-msgid "USB/serial port for printer connection."
-msgstr "Porta USB/Seriale per connessione stampante."
-
-#: src/libslic3r/PrintConfig.cpp:1669
-msgid "Serial port speed"
-msgstr "Velocità porta seriale"
-
-#: src/libslic3r/PrintConfig.cpp:1670
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr "Velocità (baud) USB/Seriale per la connessione stampante."
-
-#: src/libslic3r/PrintConfig.cpp:1679
-msgid "Distance from object"
-msgstr "Distanza dall'oggetto"
-
-#: src/libslic3r/PrintConfig.cpp:1680
-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 ""
-"La distanza tra skirt e oggetto(i). Imposta questo valore a zero per unire "
-"lo skirt all'oggetto(i) e ottenere un brim per una migliore adesione."
-
-#: src/libslic3r/PrintConfig.cpp:1688
-msgid "Skirt height"
-msgstr "Altezza skirt"
-
-#: src/libslic3r/PrintConfig.cpp:1689
-msgid ""
-"Height of skirt expressed in layers. Set this to a tall value to use skirt "
-"as a shield against drafts."
-msgstr ""
-"Altezza dello skirt espresso in layer. Imposta un valore alto per utilizzare "
-"lo skirt come scudo contro le scolature."
-
-#: src/libslic3r/PrintConfig.cpp:1697
-msgid "Loops (minimum)"
-msgstr "Giri (minimo)"
-
-#: src/libslic3r/PrintConfig.cpp:1698
-msgid "Skirt Loops"
-msgstr "Giri skirt"
-
-#: src/libslic3r/PrintConfig.cpp:1699
-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 ""
-"Numero di giri per lo skirt. Se è impostata l'opzione per la lunghezza "
-"minima di estrusione, il numero dei giri potrebbe essere più grande di "
-"quello configurato qui. Imposta questo valore a zero per disattivare "
-"completamente lo skirt."
-
-#: src/libslic3r/PrintConfig.cpp:1708
-msgid "Slow down if layer print time is below"
-msgstr "Rallenta se il tempo di stampa del layer è inferiore"
-
-#: src/libslic3r/PrintConfig.cpp:1709
-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 ""
-"Se il tempo stimato di stampa del layer è al di sotto di questo numero di "
-"secondi, la velocità dei movimenti di stampa sarà ridotta per estendere la "
-"durata di questo valore."
-
-#: src/libslic3r/PrintConfig.cpp:1720
-msgid "Small perimeters"
-msgstr "Perimetri piccoli"
-
-#: src/libslic3r/PrintConfig.cpp:1722
-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 ""
-"Questa impostazione separata influenzerà la velocità dei perimetri con "
-"raggio <=6.5mm (solitamente i buchi). Se espresso come percentuale (per "
-"esempio: 80%) sarà calcolato sulla velocità dei perimetri qui sopra. Imposta "
-"a zero per automatico."
-
-#: src/libslic3r/PrintConfig.cpp:1732
-msgid "Solid infill threshold area"
-msgstr "Area inizio riempimento solido"
-
-#: src/libslic3r/PrintConfig.cpp:1734
-msgid ""
-"Force solid infill for regions having a smaller area than the specified "
-"threshold."
-msgstr ""
-"Forza riempimento solido per le regioni con un'area inferiore al limite "
-"specificato."
-
-#: src/libslic3r/PrintConfig.cpp:1735
-msgid "mm²"
-msgstr "mm²"
-
-#: src/libslic3r/PrintConfig.cpp:1742
-msgid "Solid infill extruder"
-msgstr "Estrusore riempimento solido"
-
-#: src/libslic3r/PrintConfig.cpp:1744
-msgid "The extruder to use when printing solid infill."
-msgstr "L'estrusore da utilizzare per la stampa del riempimento solido."
-
-#: src/libslic3r/PrintConfig.cpp:1751
-msgid "Solid infill every"
-msgstr "Riempimento solido ogni"
-
-#: src/libslic3r/PrintConfig.cpp:1753
-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."
-msgstr ""
-"Questa funzione permette di forzare un layer solido ogni tot layer. Zero per "
-"disabilitare. E' possibile impostare qualunque valore (per esempio 9999); "
-"Slic3r sceglierà automaticamente il maggior numero possibile di layer da "
-"combinare secondo il diametro dell'ugello e l'altezza layer."
-
-#: src/libslic3r/PrintConfig.cpp:1766
-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."
-msgstr ""
-"Imposta questo valore diverso da zero per impostare una larghezza "
-"d'estrusione manuale per il riempimento delle superfici solide. Se lasciato "
-"a zero, verrà usata la larghezza d'estrusione predefinita, altrimenti verrà "
-"utilizzato il valore 1.125 x il diametro dell'ugello. Se espresso in "
-"percentuale (per esempio 90%) verrà calcolato sull'altezza del layer."
-
-#: src/libslic3r/PrintConfig.cpp:1777
-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 ""
-"La velocità per le regioni di stampa solide (superiore/inferiore/gusci "
-"interni orizzontali). Questo valore può essere espresso come percentuale "
-"(per esempio: 80%) sulla velocità del riempimento predefinita qui sopra. "
-"Imposta a zero per automatizzare."
-
-#: src/libslic3r/PrintConfig.cpp:1789
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr ""
-"Numero di layer solidi da generare sulle superfici superiori e inferiori."
-
-#: src/libslic3r/PrintConfig.cpp:1796
-msgid "Spiral vase"
-msgstr "Vaso a spirale"
-
-#: src/libslic3r/PrintConfig.cpp:1797
-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 ""
-"Questa funzione solleverà Z gradualmente durante la stampa di un oggetto a "
-"parete singola allo scopo di rimuovere qualunque giunzione. Questa opzione "
-"richiede un singolo perimetro, nessun riempimento, nessun layer solido "
-"superiore e nessun materiale di supporto. E' possibile comunque impostare "
-"qualunque numero di layer solidi inferiori così come per i giri di skirt/"
-"brim. Non funzionerà stampando più di un oggetto."
-
-#: src/libslic3r/PrintConfig.cpp:1806
-msgid "Temperature variation"
-msgstr "Variazione di temperatura"
-
-#: src/libslic3r/PrintConfig.cpp:1807
-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 ""
-"La differenza di temperatura da applicare quando un estrusore non è attivo. "
-"Abilita uno skirt \"sacrificale\" a piena altezza su cui l'ugello verrà "
-"pulito periodicamente."
-
-#: src/libslic3r/PrintConfig.cpp:1818
-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 ""
-"La procedura iniziale è inserita all'inizio, dopo che il piano ha raggiunto "
-"la temperatura impostata e l'estrusore ha appena iniziato a scaldare, e "
-"prima che l'estrusore abbia completato il riscaldamento. Se Slic3r rileva  "
-"M104 o M190 nei tuoi codici personalizzati, questi comandi non verranno "
-"inseriti automaticamente così sarà possibile personalizzare l'ordine dei "
-"comandi di riscaldamento e altre azioni personalizzate. Da notare che è "
-"possibile utilizzare variabili sostitutive per tutte le impostazioni di "
-"Slic3r, così sarà possibile inserire un comando \"M109 "
-"S[first_layer_temperature]\" ovunque si voglia."
-
-#: src/libslic3r/PrintConfig.cpp:1834
-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 ""
-"Questa procedura iniziale è inserita all'inizio, dopo qualunque gcode "
-"iniziale della stampante. Questo viene usato per scavalcare le impostazioni "
-"per un filamento specifico. Se Slic3r rileva M104, M109, M140 o M190 nel tuo "
-"codice personalizzato, questi comandi non verranno inseriti automaticamente "
-"così che sarà possibile personalizzare l'ordine dei comandi di riscaldamento "
-"e altre azioni personalizzate. Da notare che è possibile utilizzare "
-"variabili sostitutive per tutte le impostazioni di Slic3r, così che sia "
-"possibile inserire un comando \"M109S [first_layer_temperature]\" ovunque si "
-"voglia. Se si hanno estrusori multipli, il gcode è processato nell'ordine "
-"degli estrusori."
-
-#: src/libslic3r/PrintConfig.cpp:1850
-msgid "Single Extruder Multi Material"
-msgstr "Multi Material a Estrusore Singolo"
-
-#: src/libslic3r/PrintConfig.cpp:1851
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr "La stampante processa diversi filamenti in un singolo hotend."
-
-#: src/libslic3r/PrintConfig.cpp:1857
-msgid "Prime all printing extruders"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1858
-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:1864
-msgid "Generate support material"
-msgstr "Genera materiale di supporto"
-
-#: src/libslic3r/PrintConfig.cpp:1866
-msgid "Enable support material generation."
-msgstr "Abilita la creazione di materiale di supporto."
-
-#: src/libslic3r/PrintConfig.cpp:1871
-msgid "Auto generated supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1873
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1880
-msgid "XY separation between an object and its support"
-msgstr "Separazione XY tra un oggetto e il suo supporto"
-
-#: src/libslic3r/PrintConfig.cpp:1882
-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 ""
-"La separazione XY tra l'oggetto e il suo supporto. Se espresso come "
-"percentuale (ad esempio 50%), verrà calcolato sulla larghezza del perimetro "
-"esterno."
-
-#: src/libslic3r/PrintConfig.cpp:1893
-msgid "Pattern angle"
-msgstr "Angolo trama"
-
-#: src/libslic3r/PrintConfig.cpp:1895
-msgid ""
-"Use this setting to rotate the support material pattern on the horizontal "
-"plane."
-msgstr ""
-"Usa questa impostazione per ruotare la trama del materiale di supporto sul "
-"piano orizzontale."
-
-#: src/libslic3r/PrintConfig.cpp:1906
-msgid ""
-"Only create support if it lies on a build plate. Don't create support on a "
-"print."
-msgstr ""
-"Crea supporti solo se poggiano sulla superficie di stampa. Non creare "
-"supporti sulla stampa."
-
-#: src/libslic3r/PrintConfig.cpp:1913
-msgid "Contact Z distance"
-msgstr "Distanza di contatto Z"
-
-#: src/libslic3r/PrintConfig.cpp:1915
-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 ""
-"Distanza verticale tra oggetto e interfaccia del materiale di supporto. "
-"Impostando questo valore a 0 eviterà che Slic3r utilizzi il flusso e "
-"velocità bridge per il primo layer dell'oggetto."
-
-#: src/libslic3r/PrintConfig.cpp:1923
-msgid "soluble"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1924
-msgid "detachable"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1929
-msgid "Enforce support for the first"
-msgstr "Applica il supporto per i primi"
-
-#: src/libslic3r/PrintConfig.cpp:1931
-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 ""
-"Genera materiale di supporto per il numero di layer specificati partendo dal "
-"basso, a prescindere che sia abilitato il materiale di supporto normale o "
-"meno, e indipendentemente dall'angolo limite. Questo è utile per ottenere "
-"più adesione negli oggetti con un appoggio sul piano molto sottile o fragile."
-
-#: src/libslic3r/PrintConfig.cpp:1937
-msgid "Enforce support for the first n layers"
-msgstr "Applica il supporto per i primi n layer"
-
-#: src/libslic3r/PrintConfig.cpp:1943
-msgid "Support material/raft/skirt extruder"
-msgstr "Estrusore materiale di supporto/raft/skirt"
-
-#: src/libslic3r/PrintConfig.cpp:1945
-msgid ""
-"The extruder to use when printing support material, raft and skirt (1+, 0 to "
-"use the current extruder to minimize tool changes)."
-msgstr ""
-"L'estrusore da utilizzare per la stampa del materiale di supporto, raft e "
-"skirt (1+, 0 per utilizzare l'estrusore attuale per minimizzare i cambi di "
-"strumento)."
-
-#: src/libslic3r/PrintConfig.cpp:1955
-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."
-msgstr ""
-"Imposta questo valore diverso da zero per impostare una larghezza "
-"d'estrusione manuale per il supporto. Se lasciato a zero, verrà usata la "
-"larghezza d'estrusione predefinita., altrimenti verrà utilizzato il valore "
-"del diametro dell'ugello. Se espresso in percentuale (per esempio 90%) verrà "
-"calcolato sull'altezza del layer."
-
-#: src/libslic3r/PrintConfig.cpp:1964
-msgid "Interface loops"
-msgstr "Giri interfaccia"
-
-#: src/libslic3r/PrintConfig.cpp:1966
-msgid ""
-"Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr ""
-"Copri lo strato di contatto superiore del supporto con anelli. Disattivato "
-"per impostazione predefinita."
-
-#: src/libslic3r/PrintConfig.cpp:1972
-msgid "Support material/raft interface extruder"
-msgstr "Estrusore materiale di supporto/intefaccia raft"
-
-#: src/libslic3r/PrintConfig.cpp:1974
-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 ""
-"L'estrusore da utilizzare per la stampa dell'interfaccia del materiale di "
-"supporto (1+, 0 per usare l'estrusore attuale per minimizzare il cambio di "
-"strumento). Questo influenza anche il raft."
-
-#: src/libslic3r/PrintConfig.cpp:1982
-msgid "Interface layers"
-msgstr "Layer interfaccia"
-
-#: src/libslic3r/PrintConfig.cpp:1984
-msgid ""
-"Number of interface layers to insert between the object(s) and support "
-"material."
-msgstr ""
-"Numero di layer interfaccia da inserire tra l'oggetto(i) e il materiale di "
-"supporto."
-
-#: src/libslic3r/PrintConfig.cpp:1992
-msgid "Interface pattern spacing"
-msgstr "Spaziatura trama interfaccia"
-
-#: src/libslic3r/PrintConfig.cpp:1994
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr ""
-"Spaziatura tra le linee di interfaccia. Imposta a zero per ottenere "
-"un'interfaccia solida."
-
-#: src/libslic3r/PrintConfig.cpp:2004
-msgid ""
-"Speed for printing support material interface layers. If expressed as "
-"percentage (for example 50%) it will be calculated over support material "
-"speed."
-msgstr ""
-"Velocità per la stampa dei layer di interfaccia del materiale di supporto. "
-"Se espresso come percentuale (per esempio 50%) sarà calcolato sulla velocità "
-"del materiale di supporto."
-
-#: src/libslic3r/PrintConfig.cpp:2013
-msgid "Pattern"
-msgstr "Trama"
-
-#: src/libslic3r/PrintConfig.cpp:2015
-msgid "Pattern used to generate support material."
-msgstr "Trama usata per generare il materiale di supporto."
-
-#: src/libslic3r/PrintConfig.cpp:2022
-msgid "Rectilinear grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2028
-msgid "Pattern spacing"
-msgstr "Spaziatura trama"
-
-#: src/libslic3r/PrintConfig.cpp:2030
-msgid "Spacing between support material lines."
-msgstr "Spaziatura tra le linee del materiale di supporto."
-
-#: src/libslic3r/PrintConfig.cpp:2040
-msgid "Speed for printing support material."
-msgstr "Velocità per la stampa del materiale di supporto."
-
-#: src/libslic3r/PrintConfig.cpp:2047
-msgid "Synchronize with object layers"
-msgstr "Sincronizza con i layer dell'oggetto"
-
-#: src/libslic3r/PrintConfig.cpp:2049
-msgid ""
-"Synchronize support layers with the object print layers. This is useful with "
-"multi-material printers, where the extruder switch is expensive."
-msgstr ""
-"Sincronizza i layer di supporto con i layer dell'oggetto stampato. E' utile "
-"con le stampanti multi-material, dove il cambio estrusore è costoso."
-
-#: src/libslic3r/PrintConfig.cpp:2056
-msgid "Overhang threshold"
-msgstr "Soglia sporgenza"
-
-#: src/libslic3r/PrintConfig.cpp:2058
-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 ""
-"Il materiale di supporto non sarà generato per sporgenze con angolo di "
-"inclinazione (90°=verticale) superiore al limite impostato. In altre parole, "
-"questo valore rappresenta l'inclinazione orizzontale massima (misurata dal "
-"piano orizzontale) che puoi stampare senza materiale di supporto. Imposta a "
-"zero per un rilevamento automatico (raccomandato)."
-
-#: src/libslic3r/PrintConfig.cpp:2071
-msgid "With sheath around the support"
-msgstr "Con guaina attorno al supporto"
-
-#: src/libslic3r/PrintConfig.cpp:2073
-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 ""
-"Aggiunge un contorno (una singola linea di perimetro) attorno alla base del "
-"supporto. Questo rende il supporto più affidabile, ma anche più difficile da "
-"rimuovere."
-
-#: src/libslic3r/PrintConfig.cpp:2081
-msgid ""
-"Extruder temperature for layers after the first one. Set this to zero to "
-"disable temperature control commands in the output."
-msgstr ""
-"Temperatura estrusore per i layer successivi al primo. Imposta questo a zero "
-"per disattivare i comandi di controllo temperatura nell'output."
-
-#: src/libslic3r/PrintConfig.cpp:2084
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: src/libslic3r/PrintConfig.cpp:2090
-msgid "Detect thin walls"
-msgstr "Rileva perimetri sottili"
-
-#: src/libslic3r/PrintConfig.cpp:2092
-msgid ""
-"Detect single-width walls (parts where two extrusions don't fit and we need "
-"to collapse them into a single trace)."
-msgstr ""
-"Rileva pareti a spessore singolo (parti in cui non entrano due estrusioni ed "
-"è necessario comprimerle in una singola traccia)."
-
-#: src/libslic3r/PrintConfig.cpp:2099
-msgid "Threads"
-msgstr "Thread"
-
-#: src/libslic3r/PrintConfig.cpp:2100
-msgid ""
-"Threads are used to parallelize long-running tasks. Optimal threads number "
-"is slightly above the number of available cores/processors."
-msgstr ""
-"I thread sono utilizzati per parallelizzare operazioni di lunga durata. Il "
-"numero di thread ottimali è leggermente superiore al numero di core / "
-"processori disponibili."
-
-#: src/libslic3r/PrintConfig.cpp:2112
-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 ""
-"Questo codice personalizzato è inserito ad ogni cambio estrusore, subito "
-"prima del movimento Z. Si fa presente che puoi usare variabili sostitutive "
-"per tutte le impostazioni di Slic3r  sia per [previous_extruder] che per "
-"[next_extruder]."
-
-#: src/libslic3r/PrintConfig.cpp:2125
-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."
-msgstr ""
-"Imposta questo valore diverso da zero per impostare una larghezza "
-"d'estrusione manuale per il riempimento delle superfici superiori. Dovresti "
-"scegliere un'estrusione più sottile per riempire gli spazi stretti ed "
-"ottenere una finitura più liscia. Se lasciato a zero, verrà usata la "
-"larghezza d'estrusione predefinita, altrimenti verrà utilizzato il valore "
-"1.125 x il diametro dell'ugello. Se espresso in percentuale (per esempio "
-"90%) verrà calcolato sull'altezza del layer."
-
-#: src/libslic3r/PrintConfig.cpp:2137
-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."
-msgstr ""
-"Velocità di stampa dei layer solidi superiori (si applica solamente al layer "
-"solido esterno più in alto e non ai layer solidi interni). Rallenta questa "
-"impostazione per ottenere una superficie più rifinita. Questo valore può "
-"essere espresso come percentuale (per esempio: 80%) della velocità del "
-"riempimento solido qui sopra. Imposta a zero per auto."
-
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "Superiore"
-
-#: src/libslic3r/PrintConfig.cpp:2151
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "Numero di layer solidi da generare sulle superfici superiori."
-
-#: src/libslic3r/PrintConfig.cpp:2153
-msgid "Top solid layers"
-msgstr "Layer solidi superiori"
-
-#: src/libslic3r/PrintConfig.cpp:2159
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr ""
-"Velocità per movimenti di spostamento (salti tra punti di estrusione "
-"distanti)."
-
-#: src/libslic3r/PrintConfig.cpp:2168
-msgid "Use firmware retraction"
-msgstr "Usa retrazione firmware"
-
-#: src/libslic3r/PrintConfig.cpp:2169
-msgid ""
-"This experimental setting uses G10 and G11 commands to have the firmware "
-"handle the retraction. This is only supported in recent Marlin."
-msgstr ""
-"Questa funziona sperimentale utilizza i comandi G10 e G11 per permettere al "
-"firmware la gestione della retrazione. E' supportata solo nel Marlin recenti."
-
-#: src/libslic3r/PrintConfig.cpp:2176
-msgid "Use relative E distances"
-msgstr "Usa distanze E relative"
-
-#: src/libslic3r/PrintConfig.cpp:2177
-msgid ""
-"If your firmware requires relative E values, check this, otherwise leave it "
-"unchecked. Most firmwares use absolute values."
-msgstr ""
-"Se il firmware richiede valori E relativi, selezionalo, altrimenti lascialo "
-"non selezionato. Molti firmware utilizzano valori assoluti."
-
-#: src/libslic3r/PrintConfig.cpp:2184
-msgid "Use volumetric E"
-msgstr "Utilizza E volumetrico"
-
-#: src/libslic3r/PrintConfig.cpp:2185
-msgid ""
-"This experimental setting uses outputs the E values in cubic millimeters "
-"instead of linear millimeters. If your firmware doesn't already know "
-"filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] "
-"T0' in your start G-code in order to turn volumetric mode on and use the "
-"filament diameter associated to the filament selected in Slic3r. This is "
-"only supported in recent Marlin."
-msgstr ""
-"Questa impostazione sperimentale produce un valore di E in uscita in "
-"millimetri cubici anziché in millimetri lienari. Se il tuo firmware non sa "
-"ancora qual'è il diametro del filamento, puoi inserire un comando tipo 'M200 "
-"D[filament_diameter_0] T0' nel tuo G-code iniziale in modo da attivare la "
-"funzione volumetrica e usare il diametro associato al filamento selezionato "
-"su Slic3r. Questa funziona è supportata solo nel Marlin più recente."
-
-#: src/libslic3r/PrintConfig.cpp:2196
-msgid "Enable variable layer height feature"
-msgstr "Abilita la funzione Layer ad altezza variabile"
-
-#: src/libslic3r/PrintConfig.cpp:2197
-msgid ""
-"Some printers or printer setups may have difficulties printing with a "
-"variable layer height. Enabled by default."
-msgstr ""
-"Alcune stampanti o setup di stampanti possono riscontrare difficoltà a "
-"stampare con l'altezza layer variabile. Attivato come predefinito."
-
-#: src/libslic3r/PrintConfig.cpp:2204
-msgid "Wipe while retracting"
-msgstr "Pulisci durante la retrazione"
-
-#: src/libslic3r/PrintConfig.cpp:2205
-msgid ""
-"This flag will move the nozzle while retracting to minimize the possible "
-"blob on leaky extruders."
-msgstr ""
-"Questo contrassegno farà spostare l'ugello durante la retrazione in modo da "
-"minimizzare il possibile grumo su estrusori che perdono."
-
-#: src/libslic3r/PrintConfig.cpp:2213
-msgid ""
-"Multi material printers may need to prime or purge extruders on tool "
-"changes. Extrude the excess material into the wipe tower."
-msgstr ""
-"Le stampanti multi-material potrebbero necessitare di caricare o spurgare "
-"l'estrusore al cambio di strumento. Estrude il materiale in eccesso in una "
-"torre di spurgo."
-
-#: src/libslic3r/PrintConfig.cpp:2220
-msgid "Purging volumes - load/unload volumes"
-msgstr "Volumi di purga - volumi di carico/scarico"
-
-#: src/libslic3r/PrintConfig.cpp:2221
-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 ""
-"Questo vettore salva il volume necessario per cambiare da/a ognuno strumento "
-"usato per la wipe tower. Questi valori vengono usati per semplificare la "
-"creazione dei volumi di purga completi. "
-
-#: src/libslic3r/PrintConfig.cpp:2228
-msgid "Purging volumes - matrix"
-msgstr "Volumi di purga - matrice"
-
-#: src/libslic3r/PrintConfig.cpp:2229
-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 ""
-"Questa matrice descrive il volume (in millimetri cubici) necessario per "
-"purgare il filamento nella wipe tower per una qualunque coppia di strumenti. "
-
-#: src/libslic3r/PrintConfig.cpp:2239
-msgid "Position X"
-msgstr "Posizione X"
-
-#: src/libslic3r/PrintConfig.cpp:2240
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr "Coordinata X dell'angolo frontale sinistro di una torre di spurgo"
-
-#: src/libslic3r/PrintConfig.cpp:2247
-msgid "Position Y"
-msgstr "Posizione Y"
-
-#: src/libslic3r/PrintConfig.cpp:2248
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr "Coordinata Y dell'angolo frontale sinistro  di una torre di spurgo"
-
-#: src/libslic3r/PrintConfig.cpp:2256
-msgid "Width of a wipe tower"
-msgstr "Larghezza della torre di spurgo"
-
-#: src/libslic3r/PrintConfig.cpp:2263
-msgid "Wipe tower rotation angle"
-msgstr "Angolo di rotazione della wipe tower"
-
-#: src/libslic3r/PrintConfig.cpp:2264
-msgid "Wipe tower rotation angle with respect to x-axis "
-msgstr "Angolo di rotazione della wipe tower rispetto all'asse X "
-
-#: src/libslic3r/PrintConfig.cpp:2265
-msgid "degrees"
-msgstr "gradi"
-
-#: src/libslic3r/PrintConfig.cpp:2272
-msgid "Wipe into this object's infill"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2273
-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:2281
-msgid "Wipe into this object"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2282
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2289
-msgid "Maximal bridging distance"
-msgstr "Distanza massima di bridging"
-
-#: src/libslic3r/PrintConfig.cpp:2290
-msgid "Maximal distance between supports on sparse infill sections. "
-msgstr "Distanza massima tra supporti in sezioni a scarso riempimento. "
-
-#: src/libslic3r/PrintConfig.cpp:2297
-msgid "XY Size Compensation"
-msgstr "Compensazione dimensione XY"
-
-#: src/libslic3r/PrintConfig.cpp:2299
-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 ""
-"L'oggetto verrà allargato/ristretto sul piano XY dal valore configurato "
-"(negativo = verso l'interno, positivo = verso l'esterno). Questo può essere "
-"utile per regolare la grandezza dei fori."
-
-#: src/libslic3r/PrintConfig.cpp:2308
-msgid "Z offset"
-msgstr "Offset Z"
-
-#: src/libslic3r/PrintConfig.cpp:2309
-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)."
-msgstr ""
-"Questo valore sarà aggiunto (o sottratto) da tutte le coordinate Z nel G-"
-"code di output. Viene utilizzato per compensare una posizione di finecorsa Z "
-"errata: per esempio, se la posizione minima del finecorsa rimane in realtà "
-"0.3mm lontano dal piano, imposta questo valore a -0.3 (o sistema il "
-"finecorsa)."
-
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
-msgid "Display width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2374
-msgid "Width of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2380
-msgid "Display height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2381
-msgid "Height of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2387
-msgid "Number of pixels in"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2389
-msgid "Number of pixels in X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2396
-msgid "Number of pixels in Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2402
-msgid "Display orientation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2403
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2410
-msgid "Landscape"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2411
-msgid "Portrait"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
-msgid "Printer scaling correction"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
-msgid "Initial layer height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
-msgid "Initial exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
-msgid "SLA print material notes"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2459
-msgid "You can put your notes regarding the SLA print material here."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
-msgid "Default SLA material profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2487
-msgid "Generate supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2489
-msgid "Generate supports for the models"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2494
-msgid "Support head front diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2496
-msgid "Diameter of the pointing side of the head"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2503
-msgid "Support head penetration"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2505
-msgid "How much the pinhead has to penetrate the model surface"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2512
-msgid "Support head width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2514
-msgid "Width from the back sphere center to the front sphere center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2521
-msgid "Support pillar diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2523
-msgid "Diameter in mm of the support pillars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2530
-msgid "Support pillar connection mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2531
-msgid ""
-"Controls the bridge type between two neigboring 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:2540
-msgid "Zig-Zag"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2541
-msgid "Cross"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2542
-msgid "Dynamic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2546
-msgid "Pillar widening factor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2548
-msgid ""
-"Merging bridges or pillars into another pillars can increase the radius. "
-"Zero means no increase, one means full increase."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2557
-msgid "Support base diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2559
-msgid "Diameter in mm of the pillar base"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2566
-msgid "Support base height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2568
-msgid "The height of the pillar base cone"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2575
-msgid "Critical angle"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2577
-msgid "The default angle for connecting support sticks and junctions."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2584
-msgid "Max bridge length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2586
-msgid "The max length of a bridge"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2593
-msgid "Object elevation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2595
-msgid "How much the supports should lift up the supported object."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
-msgid "Use pad"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2631
-msgid "Add a pad underneath the supported model"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2636
-msgid "Pad wall thickness"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2645
-msgid "Pad wall height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2654
-msgid "Max merge distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2663
-msgid "Pad edge radius"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3023
-msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:176
-msgid "Mixed"
-msgstr "Mischiate"
-
-#: src/libslic3r/GCode/PreviewData.cpp:396
-msgid "Height (mm)"
-msgstr "Altezza (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:398
-msgid "Width (mm)"
-msgstr "Larghezza (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:400
-msgid "Speed (mm/s)"
-msgstr "Velocità (mm/s)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:402
-msgid "Volumetric flow rate (mm3/s)"
-msgstr "Flusso volumetrico (mm3/s)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:491
-msgid "Default print color"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:495
-#, c-format
-msgid "up to %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:499
-#, c-format
-msgid "above %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:504
-#, c-format
-msgid "%.2f - %.2f mm"
-msgstr ""
diff --git a/resources/localization/ko_KR/Slic3rPE.mo b/resources/localization/ko_KR/PrusaSlicer.mo
similarity index 51%
rename from resources/localization/ko_KR/Slic3rPE.mo
rename to resources/localization/ko_KR/PrusaSlicer.mo
index 32d5c6a20..1b9246671 100644
Binary files a/resources/localization/ko_KR/Slic3rPE.mo and b/resources/localization/ko_KR/PrusaSlicer.mo differ
diff --git a/resources/localization/ko_KR/Slic3rPE.po b/resources/localization/ko_KR/PrusaSlicer_kr.po
similarity index 67%
rename from resources/localization/ko_KR/Slic3rPE.po
rename to resources/localization/ko_KR/PrusaSlicer_kr.po
index 60d15b889..ba8975367 100644
--- a/resources/localization/ko_KR/Slic3rPE.po
+++ b/resources/localization/ko_KR/PrusaSlicer_kr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: slic3rkorean\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: 2019-01-21 12:02+0100\n"
+"POT-Creation-Date: 2019-04-09 14:34+0200\n"
+"PO-Revision-Date: 2019-04-09 16:37+0200\n"
 "Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
@@ -16,11 +16,11 @@ msgstr ""
 "X-Crowdin-Language: ko\n"
 "X-Crowdin-File: ko_KR.po\n"
 
-#: src/slic3r/GUI/AboutDialog.cpp:33
+#: src/slic3r/GUI/AboutDialog.cpp:35
 msgid "About Slic3r"
 msgstr "Slic3r� 대하여"
 
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
+#: src/slic3r/GUI/AboutDialog.cpp:64 src/slic3r/GUI/MainFrame.cpp:52
 msgid "Version"
 msgstr "버전"
 
@@ -28,136 +28,136 @@ msgstr "버전"
 msgid "Shape"
 msgstr "모양"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
+#: src/slic3r/GUI/BedShapeDialog.cpp:51
 msgid "Rectangular"
 msgstr "�사�형"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
+#: src/slic3r/GUI/BedShapeDialog.cpp:55
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:118 src/slic3r/GUI/Plater.cpp:136
+#: src/slic3r/GUI/Tab.cpp:2185
 msgid "Size"
 msgstr "사�즈"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
+#: src/slic3r/GUI/BedShapeDialog.cpp:56
 msgid "Size in X and Y of the rectangular plate."
 msgstr "사격형 플레�트 X � Y �기."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
+#: src/slic3r/GUI/BedShapeDialog.cpp:62
 msgid "Origin"
 msgstr "�본"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
+#: src/slic3r/GUI/BedShapeDialog.cpp:63
 msgid ""
 "Distance of the 0,0 G-code coordinate from the front left corner of the "
 "rectangle."
 msgstr "사�형� 전면 왼쪽� 모서리�서 0, 0 G-코드 좌표 거리입니다."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
+#: src/slic3r/GUI/BedShapeDialog.cpp:67
 msgid "Circular"
 msgstr "�형"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
+#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/slic3r/GUI/ConfigWizard.cpp:111
+#: src/slic3r/GUI/ConfigWizard.cpp:544 src/slic3r/GUI/ConfigWizard.cpp:558
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:115
+#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/libslic3r/PrintConfig.cpp:59 src/libslic3r/PrintConfig.cpp:66
+#: src/libslic3r/PrintConfig.cpp:75 src/libslic3r/PrintConfig.cpp:209
+#: src/libslic3r/PrintConfig.cpp:284 src/libslic3r/PrintConfig.cpp:292
+#: src/libslic3r/PrintConfig.cpp:342 src/libslic3r/PrintConfig.cpp:352
+#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:483
+#: src/libslic3r/PrintConfig.cpp:501 src/libslic3r/PrintConfig.cpp:679
+#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1226
+#: src/libslic3r/PrintConfig.cpp:1244 src/libslic3r/PrintConfig.cpp:1262
+#: src/libslic3r/PrintConfig.cpp:1314 src/libslic3r/PrintConfig.cpp:1324
+#: src/libslic3r/PrintConfig.cpp:1445 src/libslic3r/PrintConfig.cpp:1453
+#: src/libslic3r/PrintConfig.cpp:1494 src/libslic3r/PrintConfig.cpp:1502
+#: src/libslic3r/PrintConfig.cpp:1512 src/libslic3r/PrintConfig.cpp:1520
+#: src/libslic3r/PrintConfig.cpp:1528 src/libslic3r/PrintConfig.cpp:1611
+#: src/libslic3r/PrintConfig.cpp:1827 src/libslic3r/PrintConfig.cpp:1897
+#: src/libslic3r/PrintConfig.cpp:1931 src/libslic3r/PrintConfig.cpp:2123
+#: src/libslic3r/PrintConfig.cpp:2130 src/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2167 src/libslic3r/PrintConfig.cpp:2177
+#: src/libslic3r/PrintConfig.cpp:2187 src/libslic3r/PrintConfig.cpp:2293
+#: src/libslic3r/PrintConfig.cpp:2368 src/libslic3r/PrintConfig.cpp:2377
+#: src/libslic3r/PrintConfig.cpp:2386 src/libslic3r/PrintConfig.cpp:2396
+#: src/libslic3r/PrintConfig.cpp:2440 src/libslic3r/PrintConfig.cpp:2450
+#: src/libslic3r/PrintConfig.cpp:2469 src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:2488 src/libslic3r/PrintConfig.cpp:2506
+#: src/libslic3r/PrintConfig.cpp:2521 src/libslic3r/PrintConfig.cpp:2532
+#: src/libslic3r/PrintConfig.cpp:2545 src/libslic3r/PrintConfig.cpp:2555
 msgid "mm"
 msgstr "mm"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
+#: src/slic3r/GUI/BedShapeDialog.cpp:71 src/libslic3r/PrintConfig.cpp:676
 msgid "Diameter"
 msgstr "노� �경"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
+#: src/slic3r/GUI/BedShapeDialog.cpp:72
 msgid ""
 "Diameter of the print bed. It is assumed that origin (0,0) is located in the "
 "center."
 msgstr "�쇄 침대� �경. �� (0,0) � 중심� 있다고 가정합니다."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
+#: src/slic3r/GUI/BedShapeDialog.cpp:76 src/slic3r/GUI/GUI_Preview.cpp:239
 #: src/libslic3r/GCode/PreviewData.cpp:175
 msgid "Custom"
 msgstr "커스터"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
+#: src/slic3r/GUI/BedShapeDialog.cpp:80
 msgid "Load shape from STL..."
 msgstr "STL파� 로드."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
+#: src/slic3r/GUI/BedShapeDialog.cpp:126
 msgid "Settings"
 msgstr "설정"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
+#: src/slic3r/GUI/BedShapeDialog.cpp:299
 msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr "침대 모양 (STL/OBJ/AMF/3MF/PRUSA) �서 가져오려는 파�� 선� 합니다:"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
+#: src/slic3r/GUI/BedShapeDialog.cpp:316 src/slic3r/GUI/GUI_ObjectList.cpp:1252
 msgid "Error! "
 msgstr "�러! "
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
+#: src/slic3r/GUI/BedShapeDialog.cpp:325
 msgid "The selected file contains no geometry."
 msgstr "선�한 파��는 형�� 없는 �함 �어 있습니다."
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
+#: src/slic3r/GUI/BedShapeDialog.cpp:329
 msgid ""
 "The selected file contains several disjoint areas. This is not supported."
 msgstr ""
 "선�한 파� 여러 분리 � �역� �함 �어 있습니다. � 지� �지 않습니다."
 
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:507
 msgid "Bed Shape"
 msgstr "배드 모양"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:54
+#: src/slic3r/GUI/BonjourDialog.cpp:55
 msgid "Network lookup"
 msgstr "네트워� 조회"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:67
+#: src/slic3r/GUI/BonjourDialog.cpp:72
 msgid "Address"
 msgstr "주소"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:68
+#: src/slic3r/GUI/BonjourDialog.cpp:73
 msgid "Hostname"
 msgstr "호스트�름"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:69
+#: src/slic3r/GUI/BonjourDialog.cpp:74
 msgid "Service name"
 msgstr "서비스 �름"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:70
+#: src/slic3r/GUI/BonjourDialog.cpp:76
 msgid "OctoPrint version"
 msgstr "옥토프린트 버전"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:188
+#: src/slic3r/GUI/BonjourDialog.cpp:218
 msgid "Searching for devices"
 msgstr "디바�스 검색"
 
-#: src/slic3r/GUI/BonjourDialog.cpp:195
+#: src/slic3r/GUI/BonjourDialog.cpp:225
 msgid "Finished"
 msgstr "완료"
 
@@ -176,113 +176,118 @@ msgid ""
 msgstr ""
 "값� 변경 �었고 시스템 값 �는 마지막으로 저장 � 사전 설정과 같지 않�"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:17
 msgid "Upgrade"
 msgstr "업그레�드"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:19
 msgid "Downgrade"
 msgstr "다운그레�드"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:21
 msgid "Before roll back"
 msgstr "롤백 전�"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:23
 msgid "User"
 msgstr "사용�"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:26
 msgid "Unknown"
 msgstr "알 수 없�"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:38
 msgid "Active: "
 msgstr "활성: "
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44
 msgid "slic3r version"
 msgstr "slic3r� 대하여"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45 src/slic3r/GUI/Preset.cpp:1250
 msgid "print"
 msgstr "프린트"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46
 msgid "filaments"
 msgstr "필�멘트"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:47 src/slic3r/GUI/Preset.cpp:1254
 msgid "printer"
 msgstr "프린터"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Tab.cpp:872
 msgid "vendor"
 msgstr "벤�"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
 msgid "version"
 msgstr "버전"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
 msgid "min slic3r version"
 msgstr "최소 slic3r 버전"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:54
 msgid "max slic3r version"
 msgstr "최대 slic3r 버전"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57
 msgid "model"
 msgstr "모�"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57
 msgid "variants"
 msgstr "변종"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69
 msgid "Incompatible with this Slic3r"
 msgstr "� Slic3r와 호환 �지 않�"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:72
 msgid "Activate"
 msgstr "활성화"
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:98
 msgid "Configuration Snapshots"
 msgstr "구성 스냅�"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:92
+#: src/slic3r/GUI/ConfigWizard.cpp:111
 msgid "nozzle"
 msgstr "노�"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
-msgstr "기본값"
+#: src/slic3r/GUI/ConfigWizard.cpp:115
+msgid "Alternate nozzles:"
+msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
+#: src/slic3r/GUI/ConfigWizard.cpp:181
+msgid "All standard"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:182 src/slic3r/GUI/Tab.cpp:2909
+msgid "All"
 msgstr "모� 선�"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "선� 없�"
+#: src/slic3r/GUI/ConfigWizard.cpp:183 src/slic3r/GUI/Plater.cpp:414
+#: src/libslic3r/GCode/PreviewData.cpp:162
+msgid "None"
+msgstr "없�"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:284
 #, c-format
 msgid "Welcome to the Slic3r %s"
 msgstr "Slic3r %s� 오신것� 환� 합니다"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:284
 msgid "Welcome"
 msgstr "환�합니다"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
+#: src/slic3r/GUI/ConfigWizard.cpp:288 src/slic3r/GUI/GUI_App.cpp:600
 #, c-format
 msgid "Run %s"
 msgstr "%s 실행"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:234
+#: src/slic3r/GUI/ConfigWizard.cpp:290
 #, c-format
 msgid ""
 "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
@@ -291,33 +296,46 @@ msgstr ""
 "안녕하세요, Slic3r prusa 버전� 오신 것� 환� 합니다! � %s 초기 구성;� �"
 "움� �니다. 단지 몇 가지 설정 하 고 당신� �쇄 준비가 � 것입니다."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:238
+#: src/slic3r/GUI/ConfigWizard.cpp:294
 msgid ""
 "Remove user profiles - install from scratch (a snapshot will be taken "
 "beforehand)"
 msgstr "사용� 프로필 제거-처�부터 설치 (스냅�� 사전� 수행 �니다)"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr "다른 공급 업체"
+#: src/slic3r/GUI/ConfigWizard.cpp:325
+#, c-format
+msgid "%s Family"
+msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr "사용� 지정 설치"
+#: src/slic3r/GUI/ConfigWizard.cpp:362
+msgid "Custom Printer Setup"
+msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:362
+msgid "Custom Printer"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:364
+msgid "Define a custom printer profile"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:366
+msgid "Custom profile name:"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:390
 msgid "Automatic updates"
 msgstr "�� 업��트"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:390
 msgid "Updates"
 msgstr "업��트"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
+#: src/slic3r/GUI/ConfigWizard.cpp:398 src/slic3r/GUI/Preferences.cpp:59
 msgid "Check for application updates"
 msgstr "프로그램 업��트 확�"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
+#: src/slic3r/GUI/ConfigWizard.cpp:401 src/slic3r/GUI/Preferences.cpp:61
 msgid ""
 "If enabled, Slic3r checks for new versions of Slic3r PE online. When a new "
 "version becomes available a notification is displayed at the next "
@@ -329,11 +347,11 @@ msgstr ""
 "�는 절대로 사용하지 마십시오). �것� 알림 메커니즘 �� �� 설치가 수행�"
 "지 않습니다."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
+#: src/slic3r/GUI/ConfigWizard.cpp:405 src/slic3r/GUI/Preferences.cpp:67
 msgid "Update built-in Presets automatically"
 msgstr "기존� 설정 �� 업��트"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
+#: src/slic3r/GUI/ConfigWizard.cpp:408 src/slic3r/GUI/Preferences.cpp:69
 msgid ""
 "If enabled, Slic3r downloads updates of built-in system presets in the "
 "background. These updates are downloaded into a separate temporary location. "
@@ -344,7 +362,7 @@ msgstr ""
 "운로드합니다. �러한 업��트는 별�� 임시 위치� 다운로드�니다. 새로운 사"
 "전 설정 버전� 사용할 수있게�면 �용 프로그램 시작시 제공�니다."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:308
+#: src/slic3r/GUI/ConfigWizard.cpp:409
 msgid ""
 "Updates are never applied without user's consent and never overwrite user's "
 "customized settings."
@@ -352,61 +370,61 @@ msgstr ""
 "업��트는 사용�� ��없� �용�지 않으며 사용�� 사용� 지정� 설정� �"
 "어 쓰지 않습니다."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:313
+#: src/slic3r/GUI/ConfigWizard.cpp:414
 msgid ""
 "Additionally a backup snapshot of the whole configuration is created before "
 "an update is applied."
 msgstr "�한 업��트가 �용�기 전� 전체 구성� 백업 스냅 샷� �성�니다."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:320
+#: src/slic3r/GUI/ConfigWizard.cpp:421
 msgid "Other Vendors"
 msgstr "다른 공급 업체"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:322
+#: src/slic3r/GUI/ConfigWizard.cpp:423
 msgid "Pick another vendor supported by Slic3r PE:"
 msgstr "Slic3r PE가 지�하는 다른 공급 업체를 선�하십시오:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381
+#: src/slic3r/GUI/ConfigWizard.cpp:469
 msgid "Firmware Type"
 msgstr "펌웨어 타입"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
+#: src/slic3r/GUI/ConfigWizard.cpp:469 src/slic3r/GUI/Tab.cpp:1870
 msgid "Firmware"
 msgstr "펌웨어"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:385
+#: src/slic3r/GUI/ConfigWizard.cpp:473
 msgid "Choose the type of firmware used by your printer."
 msgstr "프린터� 패치할 펌웨어를 선�하세요."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/ConfigWizard.cpp:507
 msgid "Bed Shape and Size"
 msgstr "배드 모양과 �기"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:422
+#: src/slic3r/GUI/ConfigWizard.cpp:510
 msgid "Set the shape of your printer's bed."
 msgstr "프린터 배드모양� 설정하세요."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:524
 msgid "Filament and Nozzle Diameters"
 msgstr "필�멘트와 노� �기"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:524
 msgid "Print Diameters"
 msgstr "�쇄 �경"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:452
+#: src/slic3r/GUI/ConfigWizard.cpp:540
 msgid "Enter the diameter of your printer's hot end nozzle."
 msgstr "핫 엔드 노� �경� 입력하십시오."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:455
+#: src/slic3r/GUI/ConfigWizard.cpp:543
 msgid "Nozzle Diameter:"
 msgstr "노� �경:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:465
+#: src/slic3r/GUI/ConfigWizard.cpp:553
 msgid "Enter the diameter of your filament."
 msgstr "필�멘트� �경� 입력하십시오."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:466
+#: src/slic3r/GUI/ConfigWizard.cpp:554
 msgid ""
 "Good precision is required, so use a caliper and do multiple measurements "
 "along the filament, then compute the average."
@@ -414,41 +432,41 @@ msgstr ""
 "정밀�가 필요하므로 캘리�를 사용하여 필�멘트를 따� 여러 번 측정 한 다� �"
 "균� 계산하십시오."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:469
+#: src/slic3r/GUI/ConfigWizard.cpp:557
 msgid "Filament Diameter:"
 msgstr "필�멘트 �경:"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:575
 msgid "Extruder and Bed Temperatures"
 msgstr "�스트루�와 배드 온�"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:575
 msgid "Temperatures"
 msgstr "온�"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:503
+#: src/slic3r/GUI/ConfigWizard.cpp:591
 msgid "Enter the temperature needed for extruding your filament."
 msgstr "필�멘트 압출� 필요한 온�를 입력하십시오."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:504
+#: src/slic3r/GUI/ConfigWizard.cpp:592
 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:507
+#: src/slic3r/GUI/ConfigWizard.cpp:595
 msgid "Extrusion Temperature:"
 msgstr "출력 온� :"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
+#: src/slic3r/GUI/ConfigWizard.cpp:596 src/slic3r/GUI/ConfigWizard.cpp:610
 msgid "°C"
 msgstr "°C"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:517
+#: src/slic3r/GUI/ConfigWizard.cpp:605
 msgid ""
 "Enter the bed temperature needed for getting your filament to stick to your "
 "heated bed."
 msgstr "필�멘트가 핫배드� 접착하는� 필요한 배드온�를 입력하십시오."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:518
+#: src/slic3r/GUI/ConfigWizard.cpp:606
 msgid ""
 "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
 "no heated bed."
@@ -456,62 +474,78 @@ msgstr ""
 "보통� PLA� 경우 60 ° C�고 ABS� 경우 110 ° C입니다. 핫배드가 없는 경우�"
 "는 0으로 �십시오."
 
-#: src/slic3r/GUI/ConfigWizard.cpp:521
+#: src/slic3r/GUI/ConfigWizard.cpp:609
 msgid "Bed Temperature:"
 msgstr "배드 온� :"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:833
+#: src/slic3r/GUI/ConfigWizard.cpp:1001
+msgid "Select all standard printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1004
 msgid "< &Back"
 msgstr "< &뒤로"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:834
+#: src/slic3r/GUI/ConfigWizard.cpp:1005
 msgid "&Next >"
 msgstr "&다� >"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:835
+#: src/slic3r/GUI/ConfigWizard.cpp:1006
 msgid "&Finish"
 msgstr "&완료"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:906
+#: src/slic3r/GUI/ConfigWizard.cpp:1007 src/slic3r/GUI/FirmwareDialog.cpp:142
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:37
+#: src/slic3r/GUI/ProgressStatusBar.cpp:28
+msgid "Cancel"
+msgstr "취소"
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1021
+msgid "Prusa FFF Technology Printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1024
+msgid "Prusa MSLA Technology Printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1111
 msgid "Configuration Wizard"
 msgstr "구성 마법사"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:907
+#: src/slic3r/GUI/ConfigWizard.cpp:1112
 msgid "Configuration &Wizard"
 msgstr "구성 마법사"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:909
+#: src/slic3r/GUI/ConfigWizard.cpp:1114
 msgid "Configuration Assistant"
 msgstr "구성 �우미"
 
-#: src/slic3r/GUI/ConfigWizard.cpp:910
+#: src/slic3r/GUI/ConfigWizard.cpp:1115
 msgid "Configuration &Assistant"
 msgstr "구성 �우미"
 
-#: src/slic3r/GUI/Field.cpp:109
+#: src/slic3r/GUI/Field.cpp:112
 msgid "default value"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:112
+#: src/slic3r/GUI/Field.cpp:115
 msgid "parameter name"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:140
+#: src/slic3r/GUI/Field.cpp:143
 #, c-format
 msgid "%s doesn't support percentage"
 msgstr "%s �(가) 백분율� 지�하지 않�"
 
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
+#: src/slic3r/GUI/Field.cpp:157 src/slic3r/GUI/Field.cpp:180
+msgid "Invalid numeric input."
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:153
+#: src/slic3r/GUI/Field.cpp:162
 msgid "Input value is out of range"
 msgstr "Input value is out of range"
 
-#: src/slic3r/GUI/Field.cpp:176
+#: src/slic3r/GUI/Field.cpp:188
 #, c-format
 msgid ""
 "Do you mean %d%% instead of %d %s?\n"
@@ -519,40 +553,35 @@ msgid ""
 "or NO if you are sure that %d %s is a correct value."
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:179
+#: src/slic3r/GUI/Field.cpp:191
 msgid "Parameter validation"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
+#: src/slic3r/GUI/FirmwareDialog.cpp:141
 msgid "Flash!"
 msgstr "완료!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr "취소"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
+#: src/slic3r/GUI/FirmwareDialog.cpp:143
 msgid "Flashing in progress. Please do not disconnect the printer!"
 msgstr "아� 플래싱 중입니다. 커넥트를 분리하지 마십시오!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
+#: src/slic3r/GUI/FirmwareDialog.cpp:187
+msgid "Flashing failed: "
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:268
 msgid "Flashing succeeded!"
 msgstr "플래싱 성공!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
+#: src/slic3r/GUI/FirmwareDialog.cpp:269
 msgid "Flashing failed. Please see the avrdude log below."
 msgstr "플래시 실패. 아래� 로그를 확�하세요."
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
+#: src/slic3r/GUI/FirmwareDialog.cpp:270
 msgid "Flashing cancelled."
 msgstr "깜빡임 취소�."
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
+#: src/slic3r/GUI/FirmwareDialog.cpp:308
 #, c-format
 msgid ""
 "This firmware hex file does not match the printer model.\n"
@@ -563,58 +592,77 @@ msgid ""
 "Please only continue if you are sure this is the right thing to do."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
+#: src/slic3r/GUI/FirmwareDialog.cpp:395 src/slic3r/GUI/FirmwareDialog.cpp:431
+#, c-format
 msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
+"Multiple %s devices found. Please only connect one at a time for flashing."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
+#: src/slic3r/GUI/FirmwareDialog.cpp:412
+#, 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 ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
+#: src/slic3r/GUI/FirmwareDialog.cpp:525
+#, c-format
+msgid "The %s device could not have been found"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:603
 #, c-format
 msgid "Error accessing port at %s: %s"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
+#: src/slic3r/GUI/FirmwareDialog.cpp:605
+#, c-format
+msgid "Error: %s"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:735
 msgid "Firmware flasher"
 msgstr "펌웨어 플래셔"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
+#: src/slic3r/GUI/FirmwareDialog.cpp:762
 msgid "Firmware image:"
 msgstr "펌웨어 �미지:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
+#: src/slic3r/GUI/FirmwareDialog.cpp:766
 msgid "Serial port:"
 msgstr "시리얼 �트:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
+#: src/slic3r/GUI/FirmwareDialog.cpp:768
 msgid "Autodetected"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
+#: src/slic3r/GUI/FirmwareDialog.cpp:769
 msgid "Rescan"
 msgstr "재검색"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
+#: src/slic3r/GUI/FirmwareDialog.cpp:776
 msgid "Progress:"
 msgstr "진행:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
+#: src/slic3r/GUI/FirmwareDialog.cpp:779
 msgid "Status:"
 msgstr "지위:"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
+#: src/slic3r/GUI/FirmwareDialog.cpp:780
 msgid "Ready"
 msgstr "준비"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr "고급: avrdude 로그 출력"
+#: src/slic3r/GUI/FirmwareDialog.cpp:800
+msgid "Advanced: Output log"
+msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
+#: src/slic3r/GUI/FirmwareDialog.cpp:811
+#: src/slic3r/GUI/PrintHostDialogs.cpp:161
+msgid "Close"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:859
 msgid ""
 "Are you sure you want to cancel firmware flashing?\n"
 "This could leave your printer in an unusable state!"
@@ -622,159 +670,247 @@ msgstr ""
 "펌웨어 플래싱� 취소하시겠습니까?\n"
 "프린터가 사용할 수 없는 �태가 � 수 있습니다!"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
+#: src/slic3r/GUI/FirmwareDialog.cpp:860
 msgid "Confirmation"
 msgstr "확�"
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
+#: src/slic3r/GUI/FirmwareDialog.cpp:863
 msgid "Cancelling..."
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
+#: src/slic3r/GUI/GLCanvas3D.cpp:709
 msgid "Detected object outside print volume"
 msgstr "출력물� 프린터 출력 사�즈를 넘었습니다"
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
+#: src/slic3r/GUI/GLCanvas3D.cpp:710
 msgid "Detected toolpath outside print volume"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "회전"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:711
+msgid "Some objects are not visible when editing supports"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "�기"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:713
+msgid ""
+"Detected object outside print volume\n"
+"Resolve a clash to continue slicing/export process correctly"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:35
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:195
 msgid "Rotate lower part upwards"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:36
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:198
 msgid "Perform cut"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2276
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:43
 msgid "Cut object:"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:88
+msgid "Cut [C]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:188 src/libslic3r/PrintConfig.cpp:3006
 msgid "Cut"
 msgstr "�르기"
 
-#: src/slic3r/GUI/GLGizmo.cpp:2466
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:193
 msgid "Keep upper part"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2467
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:194
 msgid "Keep lower part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "공지"
+#: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:32
+msgid "Place on face [F]"
+msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr "참조 �지 않� 스칼�를 비우려고"
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:51
+msgid "Move [M]"
+msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:176
+msgid "Position (mm)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:176
+msgid "Displacement (mm)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:458
+msgid "Rotate [R]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:491
+msgid "Rotation (deg)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:51
+msgid "Scale [S]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:276
+msgid "Scale (%)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:597
+msgid "Left mouse click - add point"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:598
+msgid "Right mouse click - remove point"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:599
+msgid "Shift + Left (+ drag) - select point(s)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:606
+msgid "Head diameter: "
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:618
+msgid "Lock supports under new islands"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:622
+msgid "Remove selected points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:626
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:679
+msgid "Remove all points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:631
+msgid "Apply changes"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:636
+msgid "Discard changes"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:644
+msgid "Minimal points distance: "
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:655
+msgid "Support points density: "
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:669
+msgid "Auto-generate points [A]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:675
+msgid "Manual editing [M]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:738
+msgid "SLA Support Points [L]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:767
+msgid "Do you want to save your manually edited support points ?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:768
+msgid "Save changes?"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:897
+msgid ""
+"Autogeneration will erase all manually edited points.\n"
+"\n"
+"Are you sure you want to do it?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:899 src/slic3r/GUI/GUI.cpp:288
+#: src/slic3r/GUI/WipeTowerDialog.cpp:44 src/slic3r/GUI/WipeTowerDialog.cpp:328
 msgid "Warning"
 msgstr "위험"
 
-#: src/slic3r/GUI/GUI_App.cpp:377
+#: src/slic3r/GUI/GUI.cpp:147 src/slic3r/GUI/Tab.cpp:2720
+msgid "It's impossible to print multi-part object(s) with SLA technology."
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:148
+msgid "Please check and fix your object list."
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:149 src/slic3r/GUI/GUI_App.cpp:679
+#: src/slic3r/GUI/Tab.cpp:2722
+msgid "Attention!"
+msgstr "주목!"
+
+#: src/slic3r/GUI/GUI.cpp:282
+msgid "Notice"
+msgstr "공지"
+
+#: src/slic3r/GUI/GUI_App.cpp:318
+msgid "Changing of an application language"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:326 src/slic3r/GUI/GUI_App.cpp:335
+msgid "Recreating"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:339
+msgid "Loading of a current presets"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:347
+msgid "Loading of a mode view"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:429
 msgid "Choose one file (3MF):"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:389
+#: src/slic3r/GUI/GUI_App.cpp:441
 msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr "파�� 선�하세요 (STL/OBJ/AMF/3MF/PRUSA):"
 
-#: src/slic3r/GUI/GUI_App.cpp:451
+#: src/slic3r/GUI/GUI_App.cpp:454
 msgid "Array of language names and identifiers should have the same size."
 msgstr "언어 �름과 �별� 배열� 같� �기 여야합니다."
 
-#: src/slic3r/GUI/GUI_App.cpp:461
+#: src/slic3r/GUI/GUI_App.cpp:464
 msgid "Select the language"
 msgstr "언어를 선�"
 
-#: src/slic3r/GUI/GUI_App.cpp:461
+#: src/slic3r/GUI/GUI_App.cpp:464
 msgid "Language"
 msgstr "언어"
 
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
+#: src/slic3r/GUI/GUI_App.cpp:534 src/slic3r/GUI/GUI_ObjectList.cpp:1067
+#: src/libslic3r/PrintConfig.cpp:298
 msgid "Default"
 msgstr "기본값"
 
 # xs/src/slic3r/GUI/GUI.cpp:349
-#: src/slic3r/GUI/GUI_App.cpp:609
+#: src/slic3r/GUI/GUI_App.cpp:603
 msgid "&Configuration Snapshots"
 msgstr "구성 스냅�"
 
-#: src/slic3r/GUI/GUI_App.cpp:609
+#: src/slic3r/GUI/GUI_App.cpp:603
 msgid "Inspect / activate configuration snapshots"
 msgstr "구성 스냅 샷 검사 / 활성화"
 
-#: src/slic3r/GUI/GUI_App.cpp:610
+#: src/slic3r/GUI/GUI_App.cpp:604
 msgid "Take Configuration &Snapshot"
 msgstr "구성 스냅 샷 가져 오기"
 
-#: src/slic3r/GUI/GUI_App.cpp:610
+#: src/slic3r/GUI/GUI_App.cpp:604
 msgid "Capture a configuration snapshot"
 msgstr "구성 스냅 샷 캡처"
 
-#: src/slic3r/GUI/GUI_App.cpp:613
+#: src/slic3r/GUI/GUI_App.cpp:607
 msgid "&Preferences"
 msgstr "환경 설정"
 
@@ -782,7 +918,7 @@ msgstr "환경 설정"
 msgid "Application preferences"
 msgstr "�용 프로그램 환경 설정"
 
-#: src/slic3r/GUI/GUI_App.cpp:616
+#: src/slic3r/GUI/GUI_App.cpp:616 src/slic3r/GUI/wxExtensions.cpp:2446
 msgid "Simple"
 msgstr ""
 
@@ -790,12 +926,14 @@ msgstr ""
 msgid "Simple View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
+#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:73
+#: src/slic3r/GUI/Tab.cpp:977 src/slic3r/GUI/Tab.cpp:992
+#: src/slic3r/GUI/Tab.cpp:1090 src/slic3r/GUI/Tab.cpp:1093
+#: src/slic3r/GUI/Tab.cpp:1466 src/slic3r/GUI/Tab.cpp:1890
+#: src/slic3r/GUI/Tab.cpp:3347 src/slic3r/GUI/wxExtensions.cpp:2447
+#: src/libslic3r/PrintConfig.cpp:72 src/libslic3r/PrintConfig.cpp:186
+#: src/libslic3r/PrintConfig.cpp:349 src/libslic3r/PrintConfig.cpp:987
+#: src/libslic3r/PrintConfig.cpp:2173
 msgid "Advanced"
 msgstr "고급"
 
@@ -803,7 +941,7 @@ msgstr "고급"
 msgid "Advanced View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:618
+#: src/slic3r/GUI/GUI_App.cpp:618 src/slic3r/GUI/wxExtensions.cpp:2448
 msgid "Expert"
 msgstr ""
 
@@ -811,574 +949,713 @@ msgstr ""
 msgid "Expert View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:620
+#: src/slic3r/GUI/GUI_App.cpp:623
 msgid "Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:620
+#: src/slic3r/GUI/GUI_App.cpp:623
 msgid "Slic3r View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:622
+#: src/slic3r/GUI/GUI_App.cpp:625
 msgid "Change Application &Language"
 msgstr "�용 프로그램 언어 번경"
 
-#: src/slic3r/GUI/GUI_App.cpp:624
+#: src/slic3r/GUI/GUI_App.cpp:627
 msgid "Flash printer &firmware"
 msgstr "프린터 펌웨어 플래시"
 
-#: src/slic3r/GUI/GUI_App.cpp:624
+#: src/slic3r/GUI/GUI_App.cpp:627
 msgid "Upload a firmware image into an Arduino based printer"
 msgstr "아��노 기반� 프린터 �미지 업로드"
 
-#: src/slic3r/GUI/GUI_App.cpp:636
+#: src/slic3r/GUI/GUI_App.cpp:639
 msgid "Taking configuration snapshot"
 msgstr "구성 스냅 샷 만들기"
 
-#: src/slic3r/GUI/GUI_App.cpp:636
+#: src/slic3r/GUI/GUI_App.cpp:639
 msgid "Snapshot name"
 msgstr "스냅 샷 �름"
 
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "애플리케�션� 다시 시작�"
+#: src/slic3r/GUI/GUI_App.cpp:676
+msgid "Application will be restarted after language change."
+msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "주목!"
+#: src/slic3r/GUI/GUI_App.cpp:677
+msgid "3D-Scene will be cleaned."
+msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:691
+#: src/slic3r/GUI/GUI_App.cpp:678
+msgid "Please, check your changes before."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:706
 msgid "&Configuration"
 msgstr "&구성"
 
-#: src/slic3r/GUI/GUI_App.cpp:711
+#: src/slic3r/GUI/GUI_App.cpp:726
 msgid "You have unsaved changes "
 msgstr "저장�지 않� 변경 사항� 있습니다 "
 
-#: src/slic3r/GUI/GUI_App.cpp:711
+#: src/slic3r/GUI/GUI_App.cpp:726
 msgid ". Discard changes and continue anyway?"
 msgstr ". 변경 사항� 취소하고 계� 하시겠습니까?"
 
-#: src/slic3r/GUI/GUI_App.cpp:712
+#: src/slic3r/GUI/GUI_App.cpp:727
 msgid "Unsaved Presets"
 msgstr "저장�지 않� 기존설정"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:28 src/slic3r/GUI/GUI_ObjectList.cpp:65
+#: src/libslic3r/PrintConfig.cpp:56 src/libslic3r/PrintConfig.cpp:149
+#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:437
+#: src/libslic3r/PrintConfig.cpp:445 src/libslic3r/PrintConfig.cpp:841
+#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1304
+#: src/libslic3r/PrintConfig.cpp:1370 src/libslic3r/PrintConfig.cpp:1551
+#: src/libslic3r/PrintConfig.cpp:1986 src/libslic3r/PrintConfig.cpp:2042
 msgid "Layers and Perimeters"
 msgstr "레�어 � 경계선"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
+#: src/slic3r/GUI/GUI_ObjectList.cpp:29 src/slic3r/GUI/GUI_ObjectList.cpp:66
+#: src/slic3r/GUI/Plater.cpp:431 src/slic3r/GUI/Tab.cpp:981
+#: src/slic3r/GUI/Tab.cpp:982 src/slic3r/GUI/Tab.cpp:1311
+#: src/libslic3r/PrintConfig.cpp:166 src/libslic3r/PrintConfig.cpp:388
+#: src/libslic3r/PrintConfig.cpp:728 src/libslic3r/PrintConfig.cpp:742
+#: src/libslic3r/PrintConfig.cpp:779 src/libslic3r/PrintConfig.cpp:932
+#: src/libslic3r/PrintConfig.cpp:942 src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:978 src/libslic3r/PrintConfig.cpp:997
+#: src/libslic3r/PrintConfig.cpp:1658 src/libslic3r/PrintConfig.cpp:1675
 msgid "Infill"
 msgstr "�필(채움)"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
+#: src/slic3r/GUI/GUI_ObjectList.cpp:30 src/slic3r/GUI/GUI_ObjectList.cpp:67
+#: src/slic3r/GUI/GUI_Preview.cpp:236 src/slic3r/GUI/Tab.cpp:1010
+#: src/slic3r/GUI/Tab.cpp:1011 src/libslic3r/PrintConfig.cpp:333
+#: src/libslic3r/PrintConfig.cpp:1431 src/libslic3r/PrintConfig.cpp:1779
+#: src/libslic3r/PrintConfig.cpp:1785 src/libslic3r/PrintConfig.cpp:1793
+#: src/libslic3r/PrintConfig.cpp:1805 src/libslic3r/PrintConfig.cpp:1815
+#: src/libslic3r/PrintConfig.cpp:1823 src/libslic3r/PrintConfig.cpp:1838
+#: src/libslic3r/PrintConfig.cpp:1859 src/libslic3r/PrintConfig.cpp:1870
+#: src/libslic3r/PrintConfig.cpp:1886 src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1904 src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:1929 src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1947
+#: src/libslic3r/PrintConfig.cpp:1955 src/libslic3r/PrintConfig.cpp:1969
+#: src/libslic3r/GCode/PreviewData.cpp:172
 msgid "Support material"
 msgstr "서�트 재료(Support material)"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "��"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
+#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_ObjectList.cpp:69
+#: src/slic3r/GUI/Tab.cpp:1070 src/slic3r/GUI/Tab.cpp:1794
+#: src/libslic3r/PrintConfig.cpp:455 src/libslic3r/PrintConfig.cpp:953
+#: src/libslic3r/PrintConfig.cpp:1339 src/libslic3r/PrintConfig.cpp:1667
+#: src/libslic3r/PrintConfig.cpp:1851 src/libslic3r/PrintConfig.cpp:1877
+#: src/libslic3r/PrintConfig.cpp:2149 src/libslic3r/PrintConfig.cpp:2157
 msgid "Extruders"
 msgstr "�스트루�"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
+#: src/slic3r/GUI/GUI_ObjectList.cpp:39
+msgid "Pad and Support"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:68 src/slic3r/GUI/GUI_Preview.cpp:215
+#: src/slic3r/GUI/Tab.cpp:1035 src/libslic3r/PrintConfig.cpp:198
+#: src/libslic3r/PrintConfig.cpp:425 src/libslic3r/PrintConfig.cpp:870
+#: src/libslic3r/PrintConfig.cpp:998 src/libslic3r/PrintConfig.cpp:1360
+#: src/libslic3r/PrintConfig.cpp:1597 src/libslic3r/PrintConfig.cpp:1646
+#: src/libslic3r/PrintConfig.cpp:1697 src/libslic3r/PrintConfig.cpp:2028
+msgid "Speed"
+msgstr "��"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:70 src/libslic3r/PrintConfig.cpp:415
+#: src/libslic3r/PrintConfig.cpp:522 src/libslic3r/PrintConfig.cpp:829
+#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1348
+#: src/libslic3r/PrintConfig.cpp:1687 src/libslic3r/PrintConfig.cpp:1860
+#: src/libslic3r/PrintConfig.cpp:2017
 msgid "Extrusion Width"
 msgstr "압출 �"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
+#: src/slic3r/GUI/GUI_ObjectList.cpp:75 src/slic3r/GUI/Plater.cpp:410
+#: src/slic3r/GUI/Tab.cpp:3309 src/slic3r/GUI/Tab.cpp:3310
+#: src/libslic3r/PrintConfig.cpp:2359 src/libslic3r/PrintConfig.cpp:2366
+#: src/libslic3r/PrintConfig.cpp:2375 src/libslic3r/PrintConfig.cpp:2384
+#: src/libslic3r/PrintConfig.cpp:2394 src/libslic3r/PrintConfig.cpp:2420
+#: src/libslic3r/PrintConfig.cpp:2427 src/libslic3r/PrintConfig.cpp:2438
+#: src/libslic3r/PrintConfig.cpp:2448 src/libslic3r/PrintConfig.cpp:2457
+#: src/libslic3r/PrintConfig.cpp:2467 src/libslic3r/PrintConfig.cpp:2476
+#: src/libslic3r/PrintConfig.cpp:2486 src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2504
 msgid "Supports"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
+#: src/slic3r/GUI/GUI_ObjectList.cpp:76 src/slic3r/GUI/Tab.cpp:3337
+#: src/slic3r/GUI/Tab.cpp:3338 src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2519 src/libslic3r/PrintConfig.cpp:2530
+#: src/libslic3r/PrintConfig.cpp:2540 src/libslic3r/PrintConfig.cpp:2553
+#: src/libslic3r/PrintConfig.cpp:2562
 msgid "Pad"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
+#: src/slic3r/GUI/GUI_ObjectList.cpp:173
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:45
 msgid "Name"
 msgstr "�름"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
+#: src/slic3r/GUI/GUI_ObjectList.cpp:201
 msgid "Right button click the icon to change the object settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
+#: src/slic3r/GUI/GUI_ObjectList.cpp:209
 #, c-format
 msgid "Auto-repaired (%d errors):\n"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
+#: src/slic3r/GUI/GUI_ObjectList.cpp:212
 msgid "degenerate facets"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
+#: src/slic3r/GUI/GUI_ObjectList.cpp:213
 msgid "edges fixed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
+#: src/slic3r/GUI/GUI_ObjectList.cpp:214
 msgid "facets removed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
+#: src/slic3r/GUI/GUI_ObjectList.cpp:215
 msgid "facets added"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:216
 msgid "facets reversed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:217
 msgid "backwards edges"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
+#: src/slic3r/GUI/GUI_ObjectList.cpp:231
 msgid "Right button click the icon to fix STL through Netfabb"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
+#: src/slic3r/GUI/GUI_ObjectList.cpp:278 src/slic3r/GUI/Tab.cpp:1430
+#: src/libslic3r/PrintConfig.cpp:454
 msgid "Extruder"
 msgstr "�스트루�(Extruder)"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
+#: src/slic3r/GUI/GUI_ObjectList.cpp:683 src/slic3r/GUI/GUI_ObjectList.cpp:963
+#: src/slic3r/GUI/GUI_ObjectList.cpp:969 src/slic3r/GUI/GUI_ObjectList.cpp:1199
+#, c-format
+msgid "Quick Add Settings (%s)"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:746
 msgid "Select showing settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:874
 msgid "Load"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879 src/slic3r/GUI/GUI_ObjectList.cpp:911
+#: src/slic3r/GUI/GUI_ObjectList.cpp:914
 msgid "Box"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Cylinder"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Sphere"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Slab"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
+#: src/slic3r/GUI/GUI_ObjectList.cpp:890 src/slic3r/GUI/GUI_ObjectList.cpp:906
 msgid "Add part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
+#: src/slic3r/GUI/GUI_ObjectList.cpp:891
 msgid "Add modifier"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
+#: src/slic3r/GUI/GUI_ObjectList.cpp:892 src/slic3r/GUI/GUI_ObjectList.cpp:910
 msgid "Add support enforcer"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
+#: src/slic3r/GUI/GUI_ObjectList.cpp:893 src/slic3r/GUI/GUI_ObjectList.cpp:913
 msgid "Add support blocker"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
+#: src/slic3r/GUI/GUI_ObjectList.cpp:934
 msgid "Split to parts"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
+#: src/slic3r/GUI/GUI_ObjectList.cpp:942
 msgid "Add settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
 msgid "Change type"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1016
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1153
+msgid "Set as a Separated Object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1024
+msgid "Rename"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1034
+msgid "Fix through the Netfabb"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1041 src/slic3r/GUI/Plater.cpp:2861
+msgid "Export as STL"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1048
+msgid "Change extruder"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1073
+msgid "Select new extruder for the object/part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1079 src/slic3r/GUI/Plater.cpp:2825
+#: src/slic3r/GUI/Plater.cpp:2843 src/slic3r/GUI/Tab.cpp:2860
+msgid "Delete"
+msgstr "지우기(delete)"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1153
+msgid "Set as a Separated Objects"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1374
+msgid "Generic"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1516
 msgid "You can't delete the last solid part from object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1533
 msgid "You can't delete the last intance from object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1560 src/slic3r/GUI/Plater.cpp:2219
 msgid ""
 "The selected object couldn't be split because it contains only one part."
 msgstr ""
 "선�한 오브�트는 파트가 하나만 �함�어 있기 때문� 분할 할 수 없습니다."
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1676
 msgid "Group manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1688
 msgid "Object manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1698
 msgid "Object Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1702
 msgid "Part Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1711
 msgid "Part manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1717
 msgid "Instance manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2240
+msgid "Object or Instance"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2240
+msgid "Part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2242
+msgid "Unsupported selection"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2243
+#, c-format
+msgid "You started your selection with %s Item."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2244
+#, c-format
+msgid "In this mode you can select only other %s Items%s"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2247
+msgid "of a current Object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2252
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2325 src/slic3r/GUI/Plater.cpp:117
+msgid "Info"
+msgstr "ì •ë³´"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2366
 msgid "You can't change a type of the last solid part of the object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2373
 msgid "Select type of part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
+msgid "Enter new name"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
+msgid "Renaming"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2554
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2632 src/slic3r/GUI/Tab.cpp:3191
+#: src/slic3r/GUI/Tab.cpp:3195
 msgid "The supplied name is not valid;"
 msgstr "제공� �름� 유효하지 않습니다;"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2555
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2633 src/slic3r/GUI/Tab.cpp:3192
 msgid "the following characters are not allowed:"
 msgstr "다� 문�는 허용�지 않습니다:"
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2653
+msgid "Set extruder for selected items"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2654
+msgid "Select extruder number for selected objects and/or parts"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2667
+msgid "Select extruder number:"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2668
+msgid "This extruder will be set for selected items"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:25
 msgid "Object Manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:47
 msgid "Object name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:115
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:160
 msgid "Position"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:116
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:161
 msgid "Rotation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:117
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:201
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:221
+#: src/libslic3r/PrintConfig.cpp:3070
+msgid "Scale"
+msgstr "�기"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:162
 msgid "Scale factors"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:200
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:220
+#: src/libslic3r/PrintConfig.cpp:3055
+msgid "Rotate"
+msgstr "회전"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:219
 msgid "Translate"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:235
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:58
+msgid "Additional Settings"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Preview.cpp:209
 msgid "View"
 msgstr "View"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:212 src/slic3r/GUI/GUI_Preview.cpp:525
 #: src/libslic3r/GCode/PreviewData.cpp:394
 msgid "Feature type"
 msgstr "특색 유형"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
+#: src/slic3r/GUI/GUI_Preview.cpp:213 src/libslic3r/PrintConfig.cpp:467
 msgid "Height"
 msgstr "높�"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
+#: src/slic3r/GUI/GUI_Preview.cpp:214 src/libslic3r/PrintConfig.cpp:2135
 msgid "Width"
 msgstr "�"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:242
+#: src/slic3r/GUI/GUI_Preview.cpp:216
 msgid "Volumetric flow rate"
 msgstr "용�� 유량값"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
+#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/GUI_Preview.cpp:315
+#: src/slic3r/GUI/GUI_Preview.cpp:469 src/slic3r/GUI/GUI_Preview.cpp:525
+#: src/slic3r/GUI/GUI_Preview.cpp:701 src/libslic3r/GCode/PreviewData.cpp:404
 msgid "Tool"
 msgstr "�구"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/GUI_Preview.cpp:523
 #: src/libslic3r/GCode/PreviewData.cpp:406
 msgid "Color Print"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:247
+#: src/slic3r/GUI/GUI_Preview.cpp:221
 msgid "Show"
 msgstr "보다"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/GUI_Preview.cpp:225
 msgid "Feature types"
 msgstr "특색 유형"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
+#: src/slic3r/GUI/GUI_Preview.cpp:227 src/libslic3r/GCode/PreviewData.cpp:163
 msgid "Perimeter"
 msgstr "가장�리"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
+#: src/slic3r/GUI/GUI_Preview.cpp:228 src/libslic3r/GCode/PreviewData.cpp:164
 msgid "External perimeter"
 msgstr "외부 가장�리"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
+#: src/slic3r/GUI/GUI_Preview.cpp:229 src/libslic3r/GCode/PreviewData.cpp:165
 msgid "Overhang perimeter"
 msgstr "오버행(Overhang) 둘레"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
+#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/GCode/PreviewData.cpp:166
 msgid "Internal infill"
 msgstr "내부 채움"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
+#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/PrintConfig.cpp:1686
+#: src/libslic3r/PrintConfig.cpp:1696 src/libslic3r/GCode/PreviewData.cpp:167
 msgid "Solid infill"
 msgstr "솔리드 �필"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
+#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/PrintConfig.cpp:2016
+#: src/libslic3r/PrintConfig.cpp:2027 src/libslic3r/GCode/PreviewData.cpp:168
 msgid "Top solid infill"
 msgstr "가장 윗부분 채움"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
+#: src/slic3r/GUI/GUI_Preview.cpp:233 src/libslic3r/GCode/PreviewData.cpp:169
 msgid "Bridge infill"
 msgstr "프릿지 채움"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
+#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/PrintConfig.cpp:869
 #: src/libslic3r/GCode/PreviewData.cpp:170
 msgid "Gap fill"
 msgstr "공백 채움"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
+#: src/slic3r/GUI/GUI_Preview.cpp:235 src/slic3r/GUI/Tab.cpp:1001
 #: src/libslic3r/GCode/PreviewData.cpp:171
 msgid "Skirt"
 msgstr "스커트"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
+#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/PrintConfig.cpp:1903
 #: src/libslic3r/GCode/PreviewData.cpp:173
 msgid "Support material interface"
 msgstr "서�트 재료 �터페�스"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
+#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/Tab.cpp:1081
 #: src/libslic3r/GCode/PreviewData.cpp:174
 msgid "Wipe tower"
 msgstr "와�프 타워(Wipe tower)"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
+#: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/PrintConfig.cpp:2049
 msgid "Travel"
 msgstr "�송"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:270
+#: src/slic3r/GUI/GUI_Preview.cpp:244
 msgid "Retractions"
 msgstr "리트랙션"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:271
+#: src/slic3r/GUI/GUI_Preview.cpp:245
 msgid "Unretractions"
 msgstr "리트랙션 취소"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:272
+#: src/slic3r/GUI/GUI_Preview.cpp:246
 msgid "Shells"
 msgstr "쉘"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:13
 msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:100
 msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
 msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
 msgid "Load Config from .ini/amf/3mf/gcode"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:103 src/slic3r/GUI/Plater.cpp:725
+#: src/slic3r/GUI/Plater.cpp:3673 src/libslic3r/PrintConfig.cpp:2957
 msgid "Export G-code"
 msgstr "G-코드 내보내기"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:104
 msgid "Save project (3MF)"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
 msgid "Load Config from .ini/amf/3mf/gcode and merge"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
 msgid "(Re)slice"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
 msgid "Quick slice"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:108 src/slic3r/GUI/MainFrame.cpp:326
 msgid "Repeat last quick slice"
 msgstr "마지막으로 빠른 슬��스 반복"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
 msgid "Select Plater Tab"
 msgstr "선� � 플래�트 탭"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
 msgid "Quick slice and Save as"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
 msgid "Select Print Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
 msgid "Select Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
 msgid "Select Printer Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
 msgid "Switch to 3D"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
 msgid "Switch to Preview"
 msgstr ""
 
 # xs/src/slic3r/GUI/Preferences.cpp:9
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:116 src/slic3r/GUI/Preferences.cpp:10
 msgid "Preferences"
 msgstr "환경 설정"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:117
+#: src/slic3r/GUI/PrintHostDialogs.cpp:134
 msgid "Print host upload queue"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
 msgid "Camera view "
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
 msgid "Add Instance to selected object "
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
 msgid "Remove Instance from selected object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
 msgid "Show keyboard shortcuts list"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
 msgid "Select multiple object/Move multiple object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+msgid "Main Shortcuts"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:130
 msgid "Arrange"
 msgstr "ì •ë ¬"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:131
 msgid "Select All objects"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
 msgid "Delete selected"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
 msgid "Delete All"
 msgstr "전부 지움"
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
 msgid "Gizmo move"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
 msgid "Gizmo scale"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
 msgid "Gizmo rotate"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
 msgid "Gizmo cut"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
 msgid "Gizmo Place face on bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
 msgid "Gizmo SLA support points"
 msgstr ""
 
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#, no-c-format
+msgid ""
+"Press to snap by 5% in Gizmo scale\n"
+"or by 1mm in Gizmo move"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+msgid ""
+"Press to scale or rotate selected objects\n"
+"around their own center"
+msgstr ""
+
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:142
 msgid "Zoom to Bed"
 msgstr ""
@@ -1407,644 +1684,695 @@ msgstr ""
 msgid "Plater Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
 msgid "Arrow Up"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
 msgid "Upper Layer"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
 msgid "Arrow Down"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
 msgid "Lower Layer"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
 msgid "Preview Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:53
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
+msgid "Move current slider thump Up"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+msgid "Move current slider thump Down"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+msgid "Arrow Left"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+msgid "Set upper thumb to current slider thumb"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+msgid "Arrow Right"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+msgid "Set lower thumb to current slider thumb"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
+msgid "Add color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:180
+msgid "Delete color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+msgid "Layers Slider Shortcuts"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:54
 msgid ""
 " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
 msgstr ""
 " -http://github.com/prusa3d/slic3r/releases�서 업��트를 확�하는 것� 잊"
 "지 마십시오"
 
-#: src/slic3r/GUI/MainFrame.cpp:130
+#: src/slic3r/GUI/MainFrame.cpp:160
 msgid "Plater"
 msgstr "플레�트"
 
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "오픈"
+#: src/slic3r/GUI/MainFrame.cpp:273
+msgid "&Open Project"
+msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:236
+#: src/slic3r/GUI/MainFrame.cpp:273
 msgid "Open a project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
+#: src/slic3r/GUI/MainFrame.cpp:275
+msgid "&Save Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:238
+#: src/slic3r/GUI/MainFrame.cpp:275
 msgid "Save current project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
+#: src/slic3r/GUI/MainFrame.cpp:277
+msgid "Save Project &as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:240
+#: src/slic3r/GUI/MainFrame.cpp:277
 msgid "Save current project file as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:283
 msgid "Import STL/OBJ/AM&F/3MF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:283
 msgid "Load a model"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:286
 msgid "Import &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:286
 msgid "Load exported configuration file"
 msgstr "내 보낸 구성 파�로드"
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:288
 msgid "Import Config from &project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:288
 msgid "Load configuration from project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:291
 msgid "Import Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:291
 msgid "Load presets from a bundle"
 msgstr "번들�서 미리 설정로드"
 
-#: src/slic3r/GUI/MainFrame.cpp:256
+#: src/slic3r/GUI/MainFrame.cpp:293
 msgid "&Import"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:296
 msgid "Export &G-code"
 msgstr "G-코드 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:296
 msgid "Export current plate as G-code"
 msgstr "현재 플레�트를 G 코드로 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:299
 msgid "Export plate as &STL"
 msgstr "STL로 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:299
 msgid "Export current plate as STL"
 msgstr "현재 플레�트를 STL로 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:301
 msgid "Export plate as &AMF"
 msgstr "AMF로 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:301
 msgid "Export current plate as AMF"
 msgstr "현재 플레�트를AMF로 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:304
 msgid "Export &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:304
 msgid "Export current configuration to file"
 msgstr "현재 구성� 파�로 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:306
 msgid "Export Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:306
 msgid "Export all presets to file"
 msgstr "모든 �전 설정� 파�로 내보내기"
 
-#: src/slic3r/GUI/MainFrame.cpp:271
+#: src/slic3r/GUI/MainFrame.cpp:308
 msgid "&Export"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:314
 msgid "Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:314
 msgid "Slice a file into a G-code"
 msgstr "파�� G 코드로 분할"
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:320
 msgid "Quick Slice and Save As"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:320
 msgid "Slice a file into a G-code, save as"
 msgstr "파�� G 코드로 분할하고 다�으로 저장"
 
-#: src/slic3r/GUI/MainFrame.cpp:289
+#: src/slic3r/GUI/MainFrame.cpp:326
 msgid "Repeat Last Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:334
 msgid "(Re)Slice &Now"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:334
 msgid "Start new slicing process"
 msgstr "새로운 슬��싱 작업 시작"
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:337
 msgid "&Repair STL file"
 msgstr "STL 파� 복구"
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:337
 msgid "Automatically repair an STL file"
 msgstr "STL 파�� ��으로 복구합니다"
 
-#: src/slic3r/GUI/MainFrame.cpp:303
+#: src/slic3r/GUI/MainFrame.cpp:340
 msgid "&Quit"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:303
+#: src/slic3r/GUI/MainFrame.cpp:340
 msgid "Quit Slic3r"
 msgstr "Slic3r 종료"
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:374
 msgid "&Select all"
-msgstr ""
+msgstr "모� 선�"
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:374
 msgid "Selects all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:377
 msgid "&Delete selected"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:377
 msgid "Deletes the current selection"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:379
 msgid "Delete &all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:379
 msgid "Deletes all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:392
 msgid "&Plater Tab"
 msgstr "선� � 플래�트 탭"
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:392
 msgid "Show the plater"
 msgstr "플레�트를 보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:399
 msgid "P&rint Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:399
 msgid "Show the print settings"
 msgstr "�쇄 설정 표시"
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:401
 msgid "&Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:401
 msgid "Show the filament settings"
 msgstr "필�멘트 설정보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:403
 msgid "Print&er Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:403
 msgid "Show the printer settings"
 msgstr "간단한 설정보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:407
 msgid "3&D"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:407
 msgid "Show the 3D editing view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:409
 msgid "Pre&view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:409
 msgid "Show the 3D slices preview"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:430
 msgid "Print &Host Upload Queue"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:430
 msgid "Display the Print Host Upload Queue window"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
+#: src/slic3r/GUI/MainFrame.cpp:439
+msgid "Iso"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:388
+#: src/slic3r/GUI/MainFrame.cpp:439
 msgid "Iso View"
 msgstr "Iso 보기"
 
 # lib/Slic3r/GUI/MainFrame.pm:327
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
+#: src/slic3r/GUI/MainFrame.cpp:441
+msgid "Top"
 msgstr "윗부분"
 
-#: src/slic3r/GUI/MainFrame.cpp:390
+#: src/libslic3r/PrintConfig.cpp:2041
+msgctxt "Layers"
+msgid "Top"
+msgstr "윗부분"
+
+#: src/slic3r/GUI/MainFrame.cpp:441
 msgid "Top View"
 msgstr "위�서 보기"
 
 # lib/Slic3r/GUI/MainFrame.pm:328
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
+#: src/slic3r/GUI/MainFrame.cpp:442
+msgid "Bottom"
 msgstr "바닥(Bottom)"
 
-#: src/slic3r/GUI/MainFrame.cpp:391
+#: src/libslic3r/PrintConfig.cpp:148
+msgctxt "Layers"
+msgid "Bottom"
+msgstr "바닥(Bottom)"
+
+#: src/slic3r/GUI/MainFrame.cpp:442
 msgid "Bottom View"
 msgstr "바닥 보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
+#: src/slic3r/GUI/MainFrame.cpp:443
+msgid "Front"
 msgstr "ì•ž"
 
-#: src/slic3r/GUI/MainFrame.cpp:392
+#: src/slic3r/GUI/MainFrame.cpp:443
 msgid "Front View"
 msgstr "앞면 보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
+#: src/slic3r/GUI/MainFrame.cpp:444 src/libslic3r/PrintConfig.cpp:1561
+msgid "Rear"
 msgstr "ë’·ë©´"
 
-#: src/slic3r/GUI/MainFrame.cpp:393
+#: src/slic3r/GUI/MainFrame.cpp:444
 msgid "Rear View"
 msgstr "뒷면 보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
+#: src/slic3r/GUI/MainFrame.cpp:445
+msgid "Left"
 msgstr "왼쪽"
 
-#: src/slic3r/GUI/MainFrame.cpp:394
+#: src/slic3r/GUI/MainFrame.cpp:445
 msgid "Left View"
 msgstr "왼쪽 보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
+#: src/slic3r/GUI/MainFrame.cpp:446
+msgid "Right"
 msgstr "오른쪽"
 
-#: src/slic3r/GUI/MainFrame.cpp:395
+#: src/slic3r/GUI/MainFrame.cpp:446
 msgid "Right View"
 msgstr "오른쪽 보기"
 
-#: src/slic3r/GUI/MainFrame.cpp:409
+#: src/slic3r/GUI/MainFrame.cpp:460
 msgid "Prusa 3D &Drivers"
 msgstr "푸르사 3D 드��버"
 
-#: src/slic3r/GUI/MainFrame.cpp:409
+#: src/slic3r/GUI/MainFrame.cpp:460
 msgid "Open the Prusa3D drivers download page in your browser"
 msgstr "브�우저�서 Prusa3D 드��버 다운로드 페�지를 엽니다"
 
-#: src/slic3r/GUI/MainFrame.cpp:411
+#: src/slic3r/GUI/MainFrame.cpp:462
 msgid "Prusa Edition &Releases"
 msgstr "Prusa �디션 릴리스"
 
-#: src/slic3r/GUI/MainFrame.cpp:411
+#: src/slic3r/GUI/MainFrame.cpp:462
 msgid "Open the Prusa Edition releases page in your browser"
 msgstr "브�우저�서 Prusa Edition 릴리즈 페�지를 엽니 다"
 
-#: src/slic3r/GUI/MainFrame.cpp:417
+#: src/slic3r/GUI/MainFrame.cpp:468
 msgid "Slic3r &Website"
 msgstr "Slic3r � 웹 사�트"
 
-#: src/slic3r/GUI/MainFrame.cpp:417
+#: src/slic3r/GUI/MainFrame.cpp:468
 msgid "Open the Slic3r website in your browser"
 msgstr "브�우저�서 Slic3r 웹 사�트 열기"
 
-#: src/slic3r/GUI/MainFrame.cpp:419
+#: src/slic3r/GUI/MainFrame.cpp:470
 msgid "Slic3r &Manual"
 msgstr "Slic3r &메뉴얼"
 
-#: src/slic3r/GUI/MainFrame.cpp:419
+#: src/slic3r/GUI/MainFrame.cpp:470
 msgid "Open the Slic3r manual in your browser"
 msgstr "브�우저�서 Slic3r 설명서를 엽니다"
 
-#: src/slic3r/GUI/MainFrame.cpp:422
+#: src/slic3r/GUI/MainFrame.cpp:473
 msgid "System &Info"
 msgstr "시스템 정보"
 
-#: src/slic3r/GUI/MainFrame.cpp:422
+#: src/slic3r/GUI/MainFrame.cpp:473
 msgid "Show system information"
 msgstr "시스템 정보 표시"
 
-#: src/slic3r/GUI/MainFrame.cpp:424
+#: src/slic3r/GUI/MainFrame.cpp:475
 msgid "Show &Configuration Folder"
 msgstr "�� 표시 � 구성"
 
-#: src/slic3r/GUI/MainFrame.cpp:424
+#: src/slic3r/GUI/MainFrame.cpp:475
 msgid "Show user configuration folder (datadir)"
 msgstr "사용� 구성 �� 표시 (datadir)"
 
-#: src/slic3r/GUI/MainFrame.cpp:426
+#: src/slic3r/GUI/MainFrame.cpp:477
 msgid "Report an I&ssue"
 msgstr "문제보고"
 
-#: src/slic3r/GUI/MainFrame.cpp:426
+#: src/slic3r/GUI/MainFrame.cpp:477
 msgid "Report an issue on the Slic3r Prusa Edition"
 msgstr "Slic3r Prusa Edition� 관한 문제� 보고"
 
-#: src/slic3r/GUI/MainFrame.cpp:428
+#: src/slic3r/GUI/MainFrame.cpp:479
 msgid "&About Slic3r"
 msgstr "&Slic3r� 대하여"
 
-#: src/slic3r/GUI/MainFrame.cpp:428
+#: src/slic3r/GUI/MainFrame.cpp:479
 msgid "Show about dialog"
 msgstr "대화�� 표시"
 
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
+#: src/slic3r/GUI/MainFrame.cpp:482
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:431
+#: src/slic3r/GUI/MainFrame.cpp:482
 msgid "Show the list of the keyboard shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:439
+#: src/slic3r/GUI/MainFrame.cpp:490
 msgid "&File"
 msgstr "&파�"
 
-#: src/slic3r/GUI/MainFrame.cpp:440
+#: src/slic3r/GUI/MainFrame.cpp:491
 msgid "&Edit"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:441
+#: src/slic3r/GUI/MainFrame.cpp:492
 msgid "&Window"
 msgstr "&윈�우"
 
-#: src/slic3r/GUI/MainFrame.cpp:442
+#: src/slic3r/GUI/MainFrame.cpp:493
 msgid "&View"
 msgstr "&보다"
 
-#: src/slic3r/GUI/MainFrame.cpp:445
+#: src/slic3r/GUI/MainFrame.cpp:496
 msgid "&Help"
 msgstr "&�움�"
 
-#: src/slic3r/GUI/MainFrame.cpp:472
+#: src/slic3r/GUI/MainFrame.cpp:524
 msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr "슬��스 할 파�� 선�하십시오 (STL / OBJ / AMF / 3MF / PRUSA):"
 
-#: src/slic3r/GUI/MainFrame.cpp:486
+#: src/slic3r/GUI/MainFrame.cpp:538
 msgid "No previously sliced file."
 msgstr "�전� 분리 � 파�� 없습니다."
 
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
+#: src/slic3r/GUI/MainFrame.cpp:539 src/slic3r/GUI/PrintHostDialogs.cpp:219
 msgid "Error"
 msgstr "�러"
 
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:544
 msgid "Previously sliced file ("
 msgstr "�전� 분리 � 파� ("
 
-#: src/slic3r/GUI/MainFrame.cpp:492
+#: src/slic3r/GUI/MainFrame.cpp:544
 msgid ") not found."
 msgstr ")� 찾� 수 없습니다."
 
-#: src/slic3r/GUI/MainFrame.cpp:493
+#: src/slic3r/GUI/MainFrame.cpp:545
 msgid "File Not Found"
 msgstr "파�� 찾�수 없다"
 
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
+#: src/slic3r/GUI/MainFrame.cpp:580 src/slic3r/GUI/Tab.cpp:3152
 msgid "Save "
 msgstr "저장 "
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid "SVG"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid "G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid " file as:"
 msgstr " 다� 파� :"
 
-#: src/slic3r/GUI/MainFrame.cpp:548
+#: src/slic3r/GUI/MainFrame.cpp:595
 msgid "Save zip file as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:560
+#: src/slic3r/GUI/MainFrame.cpp:607 src/slic3r/GUI/Plater.cpp:2352
+#: src/slic3r/GUI/Plater.cpp:3467 src/slic3r/GUI/Tab.cpp:1110
+#: src/slic3r/GUI/Tab.cpp:3348
 msgid "Slicing"
 msgstr "슬��싱"
 
-#: src/slic3r/GUI/MainFrame.cpp:560
+#: src/slic3r/GUI/MainFrame.cpp:607
 msgid "Processing "
 msgstr "프로세싱 "
 
-#: src/slic3r/GUI/MainFrame.cpp:583
+#: src/slic3r/GUI/MainFrame.cpp:630
 msgid " was successfully sliced."
 msgstr " 성공�으로 슬��스."
 
-#: src/slic3r/GUI/MainFrame.cpp:585
+#: src/slic3r/GUI/MainFrame.cpp:632
 msgid "Slicing Done!"
 msgstr "슬��스 완료!"
 
-#: src/slic3r/GUI/MainFrame.cpp:600
+#: src/slic3r/GUI/MainFrame.cpp:647
 msgid "Select the STL file to repair:"
 msgstr "복구 할 STL 파�� 선�하십시오:"
 
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:661
 msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
 msgstr "OBJ 파�� 저장하십시오 (STL보다 오류를 � 조정할 가능성� ��):"
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676
 msgid "Your file was repaired."
 msgstr "파�� 복구�었습니다."
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676 src/libslic3r/PrintConfig.cpp:3051
 msgid "Repair"
 msgstr "수정"
 
-#: src/slic3r/GUI/MainFrame.cpp:643
+#: src/slic3r/GUI/MainFrame.cpp:690
 msgid "Save configuration as:"
 msgstr "구성� 저장 :"
 
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
+#: src/slic3r/GUI/MainFrame.cpp:710 src/slic3r/GUI/MainFrame.cpp:774
 msgid "Select configuration to load:"
 msgstr "로드 할 구성 선� :"
 
-#: src/slic3r/GUI/MainFrame.cpp:700
+#: src/slic3r/GUI/MainFrame.cpp:747
 msgid "Save presets bundle as:"
 msgstr "�전 설정 번들� 다�과 같� 저장 :"
 
-#: src/slic3r/GUI/MainFrame.cpp:751
+#: src/slic3r/GUI/MainFrame.cpp:798
 #, c-format
 msgid "%d presets successfully imported."
 msgstr "% d 사전 설정� 가져 왔습니다."
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
+#: src/slic3r/GUI/MsgDialog.cpp:71
 msgid "Slic3r error"
 msgstr "Slic3r 오류"
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
+#: src/slic3r/GUI/MsgDialog.cpp:71
 msgid "Slic3r has encountered an error"
 msgstr "Slic3r� 오류가 발�했습니다"
 
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "ì •ë³´"
-
-#: src/slic3r/GUI/Plater.cpp:126
+#: src/slic3r/GUI/Plater.cpp:137
 msgid "Volume"
 msgstr "�기"
 
-#: src/slic3r/GUI/Plater.cpp:127
+#: src/slic3r/GUI/Plater.cpp:138
 msgid "Facets"
 msgstr "측면"
 
-#: src/slic3r/GUI/Plater.cpp:128
+#: src/slic3r/GUI/Plater.cpp:139
 msgid "Materials"
 msgstr "재료"
 
-#: src/slic3r/GUI/Plater.cpp:131
+#: src/slic3r/GUI/Plater.cpp:142
 msgid "Manifold"
 msgstr "많�"
 
-#: src/slic3r/GUI/Plater.cpp:174
+#: src/slic3r/GUI/Plater.cpp:188
 msgid "Sliced Info"
 msgstr "슬��스� 정보"
 
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
+#: src/slic3r/GUI/Plater.cpp:207 src/slic3r/GUI/Plater.cpp:998
 msgid "Used Filament (m)"
 msgstr "사용� 필�멘트 (m)"
 
-#: src/slic3r/GUI/Plater.cpp:194
+#: src/slic3r/GUI/Plater.cpp:208
 msgid "Used Filament (mm³)"
 msgstr "사용� 필�멘트 (mm³)"
 
-#: src/slic3r/GUI/Plater.cpp:195
+#: src/slic3r/GUI/Plater.cpp:209
 msgid "Used Filament (g)"
 msgstr "사용� 필�멘트 (g)"
 
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
+#: src/slic3r/GUI/Plater.cpp:210
+msgid "Used Material (unit)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:211 src/slic3r/GUI/Plater.cpp:1013
+#: src/libslic3r/PrintConfig.cpp:716
 msgid "Cost"
 msgstr "비용"
 
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
+#: src/slic3r/GUI/Plater.cpp:212 src/slic3r/GUI/Plater.cpp:985
+#: src/slic3r/GUI/Plater.cpp:1027
 msgid "Estimated printing time"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:198
+#: src/slic3r/GUI/Plater.cpp:213
 msgid "Number of tool changes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr "서�트(지지대)"
+#: src/slic3r/GUI/Plater.cpp:290
+msgid "Click to edit preset"
+msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:364
+#: src/slic3r/GUI/Plater.cpp:413
 msgid "Select what kind of support do you need"
 msgstr "서�트� 종류를 선�하세요"
 
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "없�"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
+#: src/slic3r/GUI/Plater.cpp:415 src/libslic3r/PrintConfig.cpp:1814
+#: src/libslic3r/PrintConfig.cpp:2419
 msgid "Support on build plate only"
 msgstr "출력물만 서�트를 지지"
 
-#: src/slic3r/GUI/Plater.cpp:367
+#: src/slic3r/GUI/Plater.cpp:416
 msgid "Everywhere"
 msgstr "모든곳"
 
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
+#: src/slic3r/GUI/Plater.cpp:438 src/slic3r/GUI/Tab.cpp:1007
 msgid "Brim"
 msgstr "브림"
 
-#: src/slic3r/GUI/Plater.cpp:381
+#: src/slic3r/GUI/Plater.cpp:440
 msgid ""
 "This flag enables the brim that will be printed around each object on the "
 "first layer."
 msgstr ""
 "� 플래그는 첫 번째 레�어� � 개체 주위� �쇄 � 브림� 활성화합니다."
 
-#: src/slic3r/GUI/Plater.cpp:390
+#: src/slic3r/GUI/Plater.cpp:448
 msgid "Purging volumes"
 msgstr "볼륨 삭제"
 
-#: src/slic3r/GUI/Plater.cpp:556
+#: src/slic3r/GUI/Plater.cpp:673
 msgid "Print settings"
 msgstr "프린트 설정"
 
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
+#: src/slic3r/GUI/Plater.cpp:674 src/slic3r/GUI/Tab.cpp:1421
+#: src/slic3r/GUI/Tab.cpp:1422
 msgid "Filament"
 msgstr "필�멘트"
 
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
+#: src/slic3r/GUI/Plater.cpp:675 src/slic3r/GUI/Preset.cpp:1252
 msgid "SLA print"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
+#: src/slic3r/GUI/Plater.cpp:676 src/slic3r/GUI/Preset.cpp:1253
 msgid "SLA material"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:560
+#: src/slic3r/GUI/Plater.cpp:677
 msgid "Printer"
 msgstr "프린터"
 
-#: src/slic3r/GUI/Plater.cpp:588
+#: src/slic3r/GUI/Plater.cpp:707 src/slic3r/GUI/Plater.cpp:3674
 msgid "Send to printer"
 msgstr "프린터로 보내기"
 
-#: src/slic3r/GUI/Plater.cpp:607
+#: src/slic3r/GUI/Plater.cpp:727 src/slic3r/GUI/Plater.cpp:2352
+#: src/slic3r/GUI/Plater.cpp:3470
 msgid "Slice now"
 msgstr "지금 �르기"
 
-#: src/slic3r/GUI/Plater.cpp:787
+#: src/slic3r/GUI/Plater.cpp:860
+msgid "Hold Shift to Slice & Export G-code"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:931
 #, c-format
 msgid "%d (%d shells)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:792
+#: src/slic3r/GUI/Plater.cpp:936
 #, c-format
 msgid "Auto-repaired (%d errors)"
 msgstr "오류��수정 (%d errors)"
 
-#: src/slic3r/GUI/Plater.cpp:795
+#: src/slic3r/GUI/Plater.cpp:939
 #, c-format
 msgid ""
 "%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
@@ -2053,36 +2381,48 @@ msgstr ""
 "%d 면 고정, %d 모서리 고정, %d 면 제거, %d 면 추가, %d 면 반전, %d 후방 모서"
 "리"
 
-#: src/slic3r/GUI/Plater.cpp:805
+#: src/slic3r/GUI/Plater.cpp:949
 msgid "Yes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:972
+msgid "Used Material (ml)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:975
+msgid "object(s)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:975
+msgid "supports and pad"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1000 src/slic3r/GUI/Plater.cpp:1015
 msgid "objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:1000 src/slic3r/GUI/Plater.cpp:1015
 msgid "wipe tower"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:855
+#: src/slic3r/GUI/Plater.cpp:1030
 msgid "normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:859
+#: src/slic3r/GUI/Plater.cpp:1034
 msgid "silent mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1304
+#: src/slic3r/GUI/Plater.cpp:1544
 msgid "Loading"
 msgstr "로딩"
 
-#: src/slic3r/GUI/Plater.cpp:1314
+#: src/slic3r/GUI/Plater.cpp:1554
 #, c-format
 msgid "Processing input file %s\n"
 msgstr "입력 파� 처리 %s\n"
 
-#: src/slic3r/GUI/Plater.cpp:1366
+#: src/slic3r/GUI/Plater.cpp:1612
 msgid ""
 "This file contains several objects positioned at multiple heights. Instead "
 "of considering them as multiple objects, should I consider\n"
@@ -2092,18 +2432,28 @@ msgstr ""
 "는 대신,\n"
 "� 파�� 여러 부분� 갖는 단� �체로 보입니까?\n"
 
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
+#: src/slic3r/GUI/Plater.cpp:1615 src/slic3r/GUI/Plater.cpp:1707
 msgid "Multi-part object detected"
 msgstr "다중 부품 �체가 �지"
 
-#: src/slic3r/GUI/Plater.cpp:1388
+#: src/slic3r/GUI/Plater.cpp:1650
+msgid ""
+"This file cannot be loaded in simple mode. Do you want to switch to expert "
+"mode?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1651
+msgid "Detected advanced data"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1684
 #, 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 ""
 
-#: src/slic3r/GUI/Plater.cpp:1408
+#: src/slic3r/GUI/Plater.cpp:1704
 msgid ""
 "Multiple objects were loaded for a multi-material printer.\n"
 "Instead of considering them as multiple objects, should I consider\n"
@@ -2113,57 +2463,61 @@ msgstr ""
 "여러 �체로 간주하는 대신,\n"
 "� 파�들� 여러 부분� 갖는 단� �체를 나타낼 수 있습니까?\n"
 
-#: src/slic3r/GUI/Plater.cpp:1424
+#: src/slic3r/GUI/Plater.cpp:1720
 msgid "Loaded"
 msgstr "로드(loaded)"
 
-#: src/slic3r/GUI/Plater.cpp:1492
+#: src/slic3r/GUI/Plater.cpp:1812
 msgid ""
 "Your object appears to be too large, so it was automatically scaled down to "
 "fit your print bed."
 msgstr "개체가 너무 커서 �쇄물� 맞게 ��으로 축소�었습니다."
 
-#: src/slic3r/GUI/Plater.cpp:1493
+#: src/slic3r/GUI/Plater.cpp:1813
 msgid "Object too large?"
 msgstr "개체가 너무 �니까?"
 
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr "�쇄 설정 내보내기"
+#: src/slic3r/GUI/Plater.cpp:1863
+msgid "Export STL file:"
+msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1538
+#: src/slic3r/GUI/Plater.cpp:1870
+msgid "Export AMF file:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1876
 msgid "Save file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1702
+#: src/slic3r/GUI/Plater.cpp:2042
 msgid "Arranging canceled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1705
+#: src/slic3r/GUI/Plater.cpp:2045
 msgid "Arranging"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1736
+#: src/slic3r/GUI/Plater.cpp:2079
 msgid "Could not arrange model objects! Some geometries may be invalid."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1740
+#: src/slic3r/GUI/Plater.cpp:2083
 msgid "Arranging done."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1782
+#: src/slic3r/GUI/Plater.cpp:2124
 msgid "Orientation search canceled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1787
+#: src/slic3r/GUI/Plater.cpp:2129
 msgid "Searching for optimal orientation"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1797
+#: src/slic3r/GUI/Plater.cpp:2190
 msgid "Orientation found."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1818
+#: src/slic3r/GUI/Plater.cpp:2211
 msgid ""
 "The selected object can't be split because it contains more than one volume/"
 "material."
@@ -2171,170 +2525,179 @@ msgstr ""
 "선�한 �체는 둘 ��� 볼륨 / 재료가 �함�어 있기 때문� 분할 할 수 없습니"
 "다."
 
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
+#: src/slic3r/GUI/Plater.cpp:2337
+msgid "Invalid data"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2346
+msgid "Ready to slice"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2379 src/slic3r/GUI/PrintHostDialogs.cpp:220
 msgid "Cancelling"
 msgstr "취소 중"
 
-#: src/slic3r/GUI/Plater.cpp:1962
+#: src/slic3r/GUI/Plater.cpp:2396
 msgid "Another export job is currently running."
 msgstr "다른 내보내기 작업� 현재 실행 중입니다."
 
-#: src/slic3r/GUI/Plater.cpp:2215
+#: src/slic3r/GUI/Plater.cpp:2656
 msgid "Export failed"
 msgstr "내보내기 실패"
 
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
+#: src/slic3r/GUI/Plater.cpp:2661 src/slic3r/GUI/PrintHostDialogs.cpp:221
 msgid "Cancelled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "지우기(delete)"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "선�한 �체 제거"
-
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2747 src/slic3r/GUI/Plater.cpp:2759
+#: src/slic3r/GUI/Plater.cpp:2831
 msgid "Increase copies"
 msgstr "복사본 늘리기"
 
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2825 src/slic3r/GUI/Plater.cpp:2843
+msgid "Remove the selected object"
+msgstr "선�한 �체 제거"
+
+#: src/slic3r/GUI/Plater.cpp:2831
 msgid "Place one more copy of the selected object"
 msgstr "선�한 �체를 하나 � 복사합니다"
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2833
 msgid "Decrease copies"
 msgstr "복사본 �소"
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2833
 msgid "Remove one copy of the selected object"
 msgstr "선�한 �체 복사본 하나 삭제"
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2835
 msgid "Set number of copies"
 msgstr "복사� 수량 설정"
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2835
 msgid "Change the number of copies of the selected object"
 msgstr "선�한 개체� 복사본 수 변경"
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2858
 msgid "Reload from Disk"
 msgstr "디스��서 다시 불러오기"
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2858
 msgid "Reload the selected file from Disk"
 msgstr "디스��서 다시 불러오기"
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
+#: src/slic3r/GUI/Plater.cpp:2861
+msgid "Export the selected object as STL file"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "� �체를 STL 파�로 내 보냅니다"
-
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2873
 msgid "Along X axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2873
 msgid "Mirror the selected object along the X axis"
 msgstr "선�한 �체를 X 축� 따� 반전합니다"
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2875
 msgid "Along Y axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2875
 msgid "Mirror the selected object along the Y axis"
 msgstr "선�한 �체를 Y 축� 따� 반전합니다"
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2877
 msgid "Along Z axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2877
 msgid "Mirror the selected object along the Z axis"
 msgstr "선�한 �체를 Z 축� 따� 반전합니다"
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2880
 msgid "Mirror"
 msgstr "반전(Mirror)"
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2880
 msgid "Mirror the selected object"
 msgstr "반전할 �제를 선�"
 
-#: src/slic3r/GUI/Plater.cpp:2400
+#: src/slic3r/GUI/Plater.cpp:2898
 msgid "To objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
+#: src/slic3r/GUI/Plater.cpp:2898 src/slic3r/GUI/Plater.cpp:2920
 msgid "Split the selected object into individual objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2402
+#: src/slic3r/GUI/Plater.cpp:2900
 msgid "To parts"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:2900 src/slic3r/GUI/Plater.cpp:2940
 msgid "Split the selected object into individual sub-parts"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:2903 src/slic3r/GUI/Plater.cpp:2920
+#: src/slic3r/GUI/Plater.cpp:2940 src/libslic3r/PrintConfig.cpp:3075
 msgid "Split"
 msgstr "쪼개기"
 
-#: src/slic3r/GUI/Plater.cpp:2405
+#: src/slic3r/GUI/Plater.cpp:2903
 msgid "Split the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:2926
 msgid "Optimize orientation"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:2926
 msgid "Optimize the rotation of the object for better print results."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2795
+#: src/slic3r/GUI/Plater.cpp:3342
 msgid "Save G-code file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
+#: src/slic3r/GUI/Plater.cpp:3342
+msgid "Save SL1 file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2845
+#: src/slic3r/GUI/Plater.cpp:3397
 #, c-format
 msgid "STL file exported to %s"
 msgstr "내보낸 STL 파� %s"
 
-#: src/slic3r/GUI/Plater.cpp:2861
+#: src/slic3r/GUI/Plater.cpp:3413
 #, c-format
 msgid "AMF file exported to %s"
 msgstr "내보낸 AMF 파� %s"
 
-#: src/slic3r/GUI/Plater.cpp:2864
+#: src/slic3r/GUI/Plater.cpp:3416
 #, c-format
 msgid "Error exporting AMF file %s"
 msgstr "AMF 파� 내보내기 오류 %s"
 
-#: src/slic3r/GUI/Plater.cpp:2891
+#: src/slic3r/GUI/Plater.cpp:3442
 #, c-format
 msgid "3MF file exported to %s"
 msgstr "3MF 파�� 내보냈습니다 %s"
 
-#: src/slic3r/GUI/Plater.cpp:2894
+#: src/slic3r/GUI/Plater.cpp:3445
 #, c-format
 msgid "Error exporting 3MF file %s"
 msgstr "3MF 파� 내보내기 오류 %s"
 
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
+#: src/slic3r/GUI/Plater.cpp:3673
+msgid "Export"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3674
+msgid "Send G-code"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1762
+#: src/slic3r/GUI/Tab.cpp:1963
 msgid "General"
 msgstr "�반"
 
@@ -2396,11 +2759,11 @@ msgstr ""
 "� 옵션� 선�하면 활성 프린터와 호환�지 않는 것으로 표시� 경우�� �쇄 "
 "� 필�멘트 사전 설정� 사전 설정 편집기� 표시�니다"
 
-#: src/slic3r/GUI/Preferences.cpp:90
+#: src/slic3r/GUI/Preferences.cpp:91
 msgid "Use legacy OpenGL 1.1 rendering"
 msgstr "레거시 OpenGL 1.1 렌�� 사용"
 
-#: src/slic3r/GUI/Preferences.cpp:92
+#: src/slic3r/GUI/Preferences.cpp:93
 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 "
@@ -2410,26 +2773,40 @@ msgstr ""
 "해보십시오. �렇게하면 레�어 높� 편집 � 앤티 앨리어싱� 비활성화�므로 그"
 "래픽 드��버를 업그레�드하는 것� 좋습니다."
 
-#: src/slic3r/GUI/Preferences.cpp:115
+#: src/slic3r/GUI/Preferences.cpp:101
+msgid "Use Retina resolution for the 3D scene"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:103
+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 ""
+
+#: src/slic3r/GUI/Preferences.cpp:126
 msgid "You need to restart Slic3r to make the changes effective."
 msgstr "변경 사항� �용하려면 Slic3r� 다시 시작해야합니다."
 
-#: src/slic3r/GUI/Preset.cpp:170
+#: src/slic3r/GUI/Preset.cpp:207
 msgid "modified"
 msgstr "수정�곳"
 
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
+#: src/slic3r/GUI/Preset.cpp:918 src/slic3r/GUI/Preset.cpp:958
+#: src/slic3r/GUI/Preset.cpp:1011 src/slic3r/GUI/Preset.cpp:1043
+#: src/slic3r/GUI/PresetBundle.cpp:1484 src/slic3r/GUI/PresetBundle.cpp:1537
 msgid "System presets"
 msgstr "시스템 기본설정"
 
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
+#: src/slic3r/GUI/Preset.cpp:962 src/slic3r/GUI/Preset.cpp:1047
+#: src/slic3r/GUI/PresetBundle.cpp:1542
 msgid "User presets"
 msgstr "사용� 사전설정"
 
-#: src/slic3r/GUI/Preset.cpp:1157
+#: src/slic3r/GUI/Preset.cpp:991 src/slic3r/GUI/Tab.cpp:247
+msgid "Add a new printer"
+msgstr ""
+
+#: src/slic3r/GUI/Preset.cpp:1251
 msgid "filament"
 msgstr ""
 
@@ -2568,48 +2945,44 @@ msgstr "개체 레�어 높� %.2f � 대 한 얇� 벽 �께 권장 하 
 msgid "%d lines: %.2lf mm"
 msgstr "%d ��(lines): %.2lf mm"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
+#: src/slic3r/GUI/PrintHostDialogs.cpp:32
 msgid "Send G-Code to printer host"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
+#: src/slic3r/GUI/PrintHostDialogs.cpp:32
 msgid "Upload to Printer Host with the following filename:"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
+#: src/slic3r/GUI/PrintHostDialogs.cpp:34
 msgid "Start printing after upload"
 msgstr "업로드 후 �쇄 시작"
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
+#: src/slic3r/GUI/PrintHostDialogs.cpp:41
 msgid "Use forward slashes ( / ) as a directory separator if needed."
 msgstr "필요한 경우 디렉토리 분리 기호로 슬래시 (/)를 사용하십시오."
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
+#: src/slic3r/GUI/PrintHostDialogs.cpp:157
 msgid "Cancel selected"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
+#: src/slic3r/GUI/PrintHostDialogs.cpp:159
 msgid "Show error message"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
+#: src/slic3r/GUI/PrintHostDialogs.cpp:198
+#: src/slic3r/GUI/PrintHostDialogs.cpp:217
 msgid "Enqueued"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
+#: src/slic3r/GUI/PrintHostDialogs.cpp:218
 msgid "Uploading"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
+#: src/slic3r/GUI/PrintHostDialogs.cpp:222
 msgid "Completed"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
+#: src/slic3r/GUI/PrintHostDialogs.cpp:260
 msgid "Error uploading to print host:"
 msgstr ""
 
@@ -2622,10 +2995,10 @@ msgid "Time"
 msgstr "시간"
 
 #: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82 src/libslic3r/PrintConfig.cpp:611
+#: src/libslic3r/PrintConfig.cpp:655 src/libslic3r/PrintConfig.cpp:670
+#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2250
+#: src/libslic3r/PrintConfig.cpp:2308 src/libslic3r/PrintConfig.cpp:2315
 msgid "s"
 msgstr "s"
 
@@ -2633,35 +3006,35 @@ msgstr "s"
 msgid "Volumetric speed"
 msgstr "용�(Volumetric) 스피트"
 
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
+#: src/slic3r/GUI/SysInfoDialog.cpp:44
 msgid "Slic3r Prusa Edition - System Information"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
+#: src/slic3r/GUI/Tab.cpp:50 src/libslic3r/PrintConfig.cpp:228
 msgid "Compatible printers"
 msgstr "호환 가능한 프린터들"
 
-#: src/slic3r/GUI/Tab.cpp:50
+#: src/slic3r/GUI/Tab.cpp:51
 msgid "Select the printers this profile is compatible with."
 msgstr "� 프로파�과 호환 가능한 프린터를 선�하세요."
 
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
+#: src/slic3r/GUI/Tab.cpp:56 src/libslic3r/PrintConfig.cpp:243
 msgid "Compatible print profiles"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:56
+#: src/slic3r/GUI/Tab.cpp:57
 msgid "Select the print profiles this profile is compatible with."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:118
+#: src/slic3r/GUI/Tab.cpp:132
 msgid "Save current "
 msgstr "지금 저장 "
 
-#: src/slic3r/GUI/Tab.cpp:119
+#: src/slic3r/GUI/Tab.cpp:133
 msgid "Delete this preset"
 msgstr "�전 설정 삭제"
 
-#: src/slic3r/GUI/Tab.cpp:131
+#: src/slic3r/GUI/Tab.cpp:145
 msgid ""
 "Hover the cursor over buttons to find more information \n"
 "or click this button."
@@ -2669,180 +3042,180 @@ msgstr ""
 "버튼 위로 커서를 가져 가서 �세한 정보를 찾습니다.\n"
 "�는� 버튼� �릭하십시오."
 
-#: src/slic3r/GUI/Tab.cpp:824
+#: src/slic3r/GUI/Tab.cpp:858
 msgid "It's a default preset."
 msgstr "기본 설정입니다."
 
-#: src/slic3r/GUI/Tab.cpp:825
+#: src/slic3r/GUI/Tab.cpp:859
 msgid "It's a system preset."
 msgstr "시스템 설정입니다."
 
-#: src/slic3r/GUI/Tab.cpp:826
+#: src/slic3r/GUI/Tab.cpp:860
 msgid "Current preset is inherited from "
 msgstr "전� 설정�서 가져 옵니다 "
 
-#: src/slic3r/GUI/Tab.cpp:831
+#: src/slic3r/GUI/Tab.cpp:865
 msgid "It can't be deleted or modified. "
 msgstr "삭제하거나 수정할 수 없습니다. "
 
-#: src/slic3r/GUI/Tab.cpp:832
+#: src/slic3r/GUI/Tab.cpp:866
 msgid ""
 "Any modifications should be saved as a new preset inherited from this one. "
 msgstr "모든 수정 사항� � 항목�서 받� 기본 설정으로 저장해야합니다. "
 
-#: src/slic3r/GUI/Tab.cpp:833
+#: src/slic3r/GUI/Tab.cpp:867
 msgid "To do that please specify a new name for the preset."
 msgstr "그렇게하려면 기본 설정� 새 �름� 지정하십시오."
 
-#: src/slic3r/GUI/Tab.cpp:837
+#: src/slic3r/GUI/Tab.cpp:871
 msgid "Additional information:"
 msgstr "추가 정보:"
 
-#: src/slic3r/GUI/Tab.cpp:843
+#: src/slic3r/GUI/Tab.cpp:877
 msgid "printer model"
 msgstr "프린터 모�"
 
-#: src/slic3r/GUI/Tab.cpp:851
+#: src/slic3r/GUI/Tab.cpp:885
 msgid "default print profile"
 msgstr "기본 �쇄 프로파�"
 
-#: src/slic3r/GUI/Tab.cpp:854
+#: src/slic3r/GUI/Tab.cpp:888
 msgid "default filament profile"
 msgstr "기본 필�멘트 프로파�"
 
-#: src/slic3r/GUI/Tab.cpp:868
+#: src/slic3r/GUI/Tab.cpp:902
 msgid "default SLA material profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:872
+#: src/slic3r/GUI/Tab.cpp:906
 msgid "default SLA print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
+#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:3303
 msgid "Layers and perimeters"
 msgstr "레�어 � 경계선"
 
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
+#: src/slic3r/GUI/Tab.cpp:949 src/libslic3r/PrintConfig.cpp:55
 msgid "Layer height"
 msgstr "레�어 높�"
 
-#: src/slic3r/GUI/Tab.cpp:924
+#: src/slic3r/GUI/Tab.cpp:953
 msgid "Vertical shells"
 msgstr "쉘 높�"
 
-#: src/slic3r/GUI/Tab.cpp:935
+#: src/slic3r/GUI/Tab.cpp:964
 msgid "Horizontal shells"
 msgstr "쉘 너비"
 
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:965 src/libslic3r/PrintConfig.cpp:1709
 msgid "Solid layers"
 msgstr "솔리드 레�어"
 
-#: src/slic3r/GUI/Tab.cpp:941
+#: src/slic3r/GUI/Tab.cpp:970
 msgid "Quality (slower slicing)"
 msgstr "품질(슬��싱� �려�)"
 
-#: src/slic3r/GUI/Tab.cpp:958
+#: src/slic3r/GUI/Tab.cpp:988
 msgid "Reducing printing time"
 msgstr "출력 시간 단축"
 
-#: src/slic3r/GUI/Tab.cpp:970
+#: src/slic3r/GUI/Tab.cpp:1000
 msgid "Skirt and brim"
 msgstr "스커트와 브림"
 
-#: src/slic3r/GUI/Tab.cpp:987
+#: src/slic3r/GUI/Tab.cpp:1017
 msgid "Raft"
 msgstr "�프트"
 
-#: src/slic3r/GUI/Tab.cpp:991
+#: src/slic3r/GUI/Tab.cpp:1021
 msgid "Options for support material and raft"
 msgstr "서�트와 �프트 재료를 선�"
 
-#: src/slic3r/GUI/Tab.cpp:1006
+#: src/slic3r/GUI/Tab.cpp:1036
 msgid "Speed for print moves"
 msgstr "출력중 �� ��"
 
-#: src/slic3r/GUI/Tab.cpp:1018
+#: src/slic3r/GUI/Tab.cpp:1048
 msgid "Speed for non-print moves"
 msgstr "미출력시 ����"
 
-#: src/slic3r/GUI/Tab.cpp:1021
+#: src/slic3r/GUI/Tab.cpp:1051
 msgid "Modifiers"
 msgstr "수정"
 
-#: src/slic3r/GUI/Tab.cpp:1024
+#: src/slic3r/GUI/Tab.cpp:1054
 msgid "Acceleration control (advanced)"
 msgstr "가� 제어(고급)"
 
-#: src/slic3r/GUI/Tab.cpp:1031
+#: src/slic3r/GUI/Tab.cpp:1061
 msgid "Autospeed (advanced)"
 msgstr "오토스피트(고급)"
 
-#: src/slic3r/GUI/Tab.cpp:1037
+#: src/slic3r/GUI/Tab.cpp:1069
 msgid "Multiple Extruders"
 msgstr "다중 �스트루�"
 
-#: src/slic3r/GUI/Tab.cpp:1045
+#: src/slic3r/GUI/Tab.cpp:1077
 msgid "Ooze prevention"
 msgstr "오즈 방지(Ooze prevention)"
 
-#: src/slic3r/GUI/Tab.cpp:1062
+#: src/slic3r/GUI/Tab.cpp:1094
 msgid "Extrusion width"
 msgstr "악출 �(Extrusion width)"
 
-#: src/slic3r/GUI/Tab.cpp:1072
+#: src/slic3r/GUI/Tab.cpp:1104
 msgid "Overlap"
 msgstr "겹침(Overlap)"
 
-#: src/slic3r/GUI/Tab.cpp:1075
+#: src/slic3r/GUI/Tab.cpp:1107
 msgid "Flow"
 msgstr "유량(Flow)"
 
-#: src/slic3r/GUI/Tab.cpp:1078
+#: src/slic3r/GUI/Tab.cpp:1116
 msgid "Other"
 msgstr "그 외"
 
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
+#: src/slic3r/GUI/Tab.cpp:1119 src/slic3r/GUI/Tab.cpp:3351
 msgid "Output options"
 msgstr "출력 옵션"
 
-#: src/slic3r/GUI/Tab.cpp:1086
+#: src/slic3r/GUI/Tab.cpp:1120
 msgid "Sequential printing"
 msgstr "연� �쇄"
 
-#: src/slic3r/GUI/Tab.cpp:1088
+#: src/slic3r/GUI/Tab.cpp:1122
 msgid "Extruder clearance (mm)"
 msgstr "�스트루� 간격(mm)"
 
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
+#: src/slic3r/GUI/Tab.cpp:1131 src/slic3r/GUI/Tab.cpp:3352
 msgid "Output file"
 msgstr "출력 파�"
 
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
+#: src/slic3r/GUI/Tab.cpp:1138 src/libslic3r/PrintConfig.cpp:1382
 msgid "Post-processing scripts"
 msgstr "�스트 프로세싱 스�립트"
 
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
+#: src/slic3r/GUI/Tab.cpp:1144 src/slic3r/GUI/Tab.cpp:1145
+#: src/slic3r/GUI/Tab.cpp:1527 src/slic3r/GUI/Tab.cpp:1528
+#: src/slic3r/GUI/Tab.cpp:1935 src/slic3r/GUI/Tab.cpp:1936
+#: src/slic3r/GUI/Tab.cpp:2027 src/slic3r/GUI/Tab.cpp:2028
+#: src/slic3r/GUI/Tab.cpp:3240 src/slic3r/GUI/Tab.cpp:3241
 msgid "Notes"
 msgstr "메모"
 
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
+#: src/slic3r/GUI/Tab.cpp:1151 src/slic3r/GUI/Tab.cpp:1535
+#: src/slic3r/GUI/Tab.cpp:1942 src/slic3r/GUI/Tab.cpp:2034
+#: src/slic3r/GUI/Tab.cpp:3248 src/slic3r/GUI/Tab.cpp:3357
 msgid "Dependencies"
 msgstr "�한 그룹"
 
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
+#: src/slic3r/GUI/Tab.cpp:1152 src/slic3r/GUI/Tab.cpp:1536
+#: src/slic3r/GUI/Tab.cpp:1943 src/slic3r/GUI/Tab.cpp:2035
+#: src/slic3r/GUI/Tab.cpp:3249 src/slic3r/GUI/Tab.cpp:3358
 msgid "Profile dependencies"
 msgstr "프로파� 종�성"
 
-#: src/slic3r/GUI/Tab.cpp:1161
+#: src/slic3r/GUI/Tab.cpp:1198
 #, no-c-format
 msgid ""
 "The Spiral Vase mode requires:\n"
@@ -2863,11 +3236,11 @@ msgstr ""
 "\n"
 "스파�럴 바�스를 사용하려면 �러한 설정� 조정해야합니까?"
 
-#: src/slic3r/GUI/Tab.cpp:1168
+#: src/slic3r/GUI/Tab.cpp:1205
 msgid "Spiral Vase"
 msgstr "스파�럴 바�스"
 
-#: src/slic3r/GUI/Tab.cpp:1191
+#: src/slic3r/GUI/Tab.cpp:1228
 msgid ""
 "The Wipe Tower currently supports the non-soluble supports only\n"
 "if they are printed with the current extruder without triggering a tool "
@@ -2884,11 +3257,11 @@ msgstr ""
 "\n"
 "와�� 타워를 사용하려면 �러한 설정� 조정해야합니까?"
 
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
+#: src/slic3r/GUI/Tab.cpp:1232 src/slic3r/GUI/Tab.cpp:1249
 msgid "Wipe Tower"
 msgstr "와�프 타워(Wipe Tower)"
 
-#: src/slic3r/GUI/Tab.cpp:1209
+#: src/slic3r/GUI/Tab.cpp:1246
 msgid ""
 "For the Wipe Tower to work with the soluble supports, the support layers\n"
 "need to be synchronized with the object layers.\n"
@@ -2900,7 +3273,7 @@ msgstr ""
 "\n"
 "와�� 타워를 사용하려면 서�트 레�어를 �기화해야합니까?"
 
-#: src/slic3r/GUI/Tab.cpp:1227
+#: src/slic3r/GUI/Tab.cpp:1264
 msgid ""
 "Supports work better, if the following feature is enabled:\n"
 "- Detect bridging perimeters\n"
@@ -2912,15 +3285,15 @@ msgstr ""
 "\n"
 "서�트� 대한 설정� 조정해야합니까?"
 
-#: src/slic3r/GUI/Tab.cpp:1230
+#: src/slic3r/GUI/Tab.cpp:1267
 msgid "Support Generator"
 msgstr "서�트 �성"
 
-#: src/slic3r/GUI/Tab.cpp:1272
+#: src/slic3r/GUI/Tab.cpp:1309
 msgid "The "
 msgstr "The "
 
-#: src/slic3r/GUI/Tab.cpp:1272
+#: src/slic3r/GUI/Tab.cpp:1309
 #, no-c-format
 msgid ""
 " infill pattern is not supposed to work at 100% density.\n"
@@ -2931,82 +3304,82 @@ msgstr ""
 "\n"
 "�선 채우기 패턴으로 전환해야합니까?"
 
-#: src/slic3r/GUI/Tab.cpp:1388
+#: src/slic3r/GUI/Tab.cpp:1429
 msgid "Temperature "
 msgstr "온� "
 
-#: src/slic3r/GUI/Tab.cpp:1394
+#: src/slic3r/GUI/Tab.cpp:1435
 msgid "Bed"
 msgstr "배드(Bed)"
 
-#: src/slic3r/GUI/Tab.cpp:1399
+#: src/slic3r/GUI/Tab.cpp:1440
 msgid "Cooling"
 msgstr "냉�(Cooling)"
 
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
+#: src/slic3r/GUI/Tab.cpp:1441 src/libslic3r/PrintConfig.cpp:1285
+#: src/libslic3r/PrintConfig.cpp:2097
 msgid "Enable"
 msgstr "사용"
 
-#: src/slic3r/GUI/Tab.cpp:1411
+#: src/slic3r/GUI/Tab.cpp:1452
 msgid "Fan settings"
 msgstr "팬 설정"
 
-#: src/slic3r/GUI/Tab.cpp:1412
+#: src/slic3r/GUI/Tab.cpp:1453
 msgid "Fan speed"
 msgstr "팬 ��"
 
-#: src/slic3r/GUI/Tab.cpp:1420
+#: src/slic3r/GUI/Tab.cpp:1461
 msgid "Cooling thresholds"
 msgstr "냉� 임계 값"
 
-#: src/slic3r/GUI/Tab.cpp:1426
+#: src/slic3r/GUI/Tab.cpp:1467
 msgid "Filament properties"
 msgstr "필�멘트 특성"
 
-#: src/slic3r/GUI/Tab.cpp:1430
+#: src/slic3r/GUI/Tab.cpp:1471
 msgid "Print speed override"
 msgstr "�쇄 �� 중단"
 
-#: src/slic3r/GUI/Tab.cpp:1440
+#: src/slic3r/GUI/Tab.cpp:1481
 msgid "Toolchange parameters with single extruder MM printers"
 msgstr "싱글 �스트루� MM 프린터를 사용한 공구 �환 매개 변수"
 
-#: src/slic3r/GUI/Tab.cpp:1455
+#: src/slic3r/GUI/Tab.cpp:1496
 msgid "Ramming settings"
 msgstr "래� 설정"
 
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
+#: src/slic3r/GUI/Tab.cpp:1514 src/slic3r/GUI/Tab.cpp:1898
 msgid "Custom G-code"
 msgstr "수� G코드"
 
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
+#: src/slic3r/GUI/Tab.cpp:1515 src/slic3r/GUI/Tab.cpp:1899
+#: src/libslic3r/PrintConfig.cpp:1735 src/libslic3r/PrintConfig.cpp:1750
 msgid "Start G-code"
 msgstr "스타트 G코드"
 
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
+#: src/slic3r/GUI/Tab.cpp:1521 src/slic3r/GUI/Tab.cpp:1905
+#: src/libslic3r/PrintConfig.cpp:358 src/libslic3r/PrintConfig.cpp:368
 msgid "End G-code"
 msgstr "엔드 G코드"
 
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
+#: src/slic3r/GUI/Tab.cpp:1632 src/slic3r/GUI/Tab.cpp:1689
 msgid " Browse "
 msgstr " 검색 "
 
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:1651 src/slic3r/GUI/Tab.cpp:1838
 msgid "Test"
 msgstr "시험(test)"
 
-#: src/slic3r/GUI/Tab.cpp:1615
+#: src/slic3r/GUI/Tab.cpp:1662
 msgid "Could not get a valid Printer Host reference"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1668 src/slic3r/GUI/Tab.cpp:1851
 msgid "Success!"
 msgstr "성공!"
 
-#: src/slic3r/GUI/Tab.cpp:1636
+#: src/slic3r/GUI/Tab.cpp:1683
 msgid ""
 "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
 "signed certificate."
@@ -3014,15 +3387,15 @@ msgstr ""
 "HTTPS CA 파�� 선� 사항입니다. �체 서명 � ��서로 HTTPS를 사용하는 경우"
 "�만 필요합니다."
 
-#: src/slic3r/GUI/Tab.cpp:1648
+#: src/slic3r/GUI/Tab.cpp:1696
 msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
 msgstr "��서 파� (* .crt, * .pem) | * .crt; * .pem | 모든 파� | *. *"
 
-#: src/slic3r/GUI/Tab.cpp:1649
+#: src/slic3r/GUI/Tab.cpp:1697
 msgid "Open CA certificate file"
 msgstr "Open CA certificate file"
 
-#: src/slic3r/GUI/Tab.cpp:1676
+#: src/slic3r/GUI/Tab.cpp:1725
 msgid ""
 "HTTPS CA File:\n"
 "\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
@@ -3031,151 +3404,159 @@ msgid ""
 "Store / Keychain."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
+#: src/slic3r/GUI/Tab.cpp:1763 src/slic3r/GUI/Tab.cpp:1964
 msgid "Size and coordinates"
 msgstr "�기와 좌표"
 
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
+#: src/slic3r/GUI/Tab.cpp:1767 src/slic3r/GUI/Tab.cpp:1968
+#: src/slic3r/GUI/Tab.cpp:2911
 msgid " Set "
 msgstr " 세트 "
 
-#: src/slic3r/GUI/Tab.cpp:1740
+#: src/slic3r/GUI/Tab.cpp:1790
 msgid "Capabilities"
 msgstr "기능"
 
-#: src/slic3r/GUI/Tab.cpp:1745
+#: src/slic3r/GUI/Tab.cpp:1795
 msgid "Number of extruders of the printer."
 msgstr "프린터 �스트루� 숫�."
 
-#: src/slic3r/GUI/Tab.cpp:1773
+#: src/slic3r/GUI/Tab.cpp:1823
 msgid "USB/Serial connection"
 msgstr "USB/시리얼 연결"
 
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
+#: src/slic3r/GUI/Tab.cpp:1824 src/libslic3r/PrintConfig.cpp:1590
 msgid "Serial port"
 msgstr "시리얼 �트"
 
-#: src/slic3r/GUI/Tab.cpp:1779
+#: src/slic3r/GUI/Tab.cpp:1829
 msgid "Rescan serial ports"
 msgstr "시리얼�트 재검색"
 
-#: src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1851
 msgid "Connection to printer works correctly."
 msgstr "프린터 연결� 올바르게 작�합니다."
 
-#: src/slic3r/GUI/Tab.cpp:1804
+#: src/slic3r/GUI/Tab.cpp:1854
 msgid "Connection failed."
 msgstr "연결 실패."
 
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
+#: src/slic3r/GUI/Tab.cpp:1867 src/slic3r/GUI/Tab.cpp:2022
 msgid "Print Host upload"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
+#: src/slic3r/GUI/Tab.cpp:1911 src/libslic3r/PrintConfig.cpp:128
 msgid "Before layer change G-code"
 msgstr "레�어 변경 전 G 코드"
 
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
+#: src/slic3r/GUI/Tab.cpp:1917 src/libslic3r/PrintConfig.cpp:1030
 msgid "After layer change G-code"
 msgstr "레�어 변경 후 G 코드"
 
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
+#: src/slic3r/GUI/Tab.cpp:1923 src/libslic3r/PrintConfig.cpp:2005
 msgid "Tool change G-code"
 msgstr "툴 채�지 G 코드"
 
-#: src/slic3r/GUI/Tab.cpp:1877
+#: src/slic3r/GUI/Tab.cpp:1929
 msgid "Between objects G-code (for sequential printing)"
 msgstr "�체 간 G 코드 (순차 �쇄용)"
 
-#: src/slic3r/GUI/Tab.cpp:1938
+#: src/slic3r/GUI/Tab.cpp:1990
 msgid "Display"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
+#: src/slic3r/GUI/Tab.cpp:2001
+msgid "Tilt"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2002
+msgid "Tilt time"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2008 src/slic3r/GUI/Tab.cpp:3223
 msgid "Corrections"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
+#: src/slic3r/GUI/Tab.cpp:2074 src/slic3r/GUI/Tab.cpp:2136
+#: src/libslic3r/PrintConfig.cpp:1076 src/libslic3r/PrintConfig.cpp:1086
+#: src/libslic3r/PrintConfig.cpp:1096 src/libslic3r/PrintConfig.cpp:1109
+#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1131
+#: src/libslic3r/PrintConfig.cpp:1142
 msgid "Machine limits"
 msgstr "머신 한계설정"
 
-#: src/slic3r/GUI/Tab.cpp:2025
+#: src/slic3r/GUI/Tab.cpp:2088
 msgid "Values in this column are for Full Power mode"
 msgstr "� 열� 값� 최대 전력 모드입니다"
 
-#: src/slic3r/GUI/Tab.cpp:2026
+#: src/slic3r/GUI/Tab.cpp:2089
 msgid "Full Power"
 msgstr "최대 파워"
 
-#: src/slic3r/GUI/Tab.cpp:2031
+#: src/slic3r/GUI/Tab.cpp:2094
 msgid "Values in this column are for Silent mode"
 msgstr "� 열� 값� 무� 모드 용입니다"
 
-#: src/slic3r/GUI/Tab.cpp:2032
+#: src/slic3r/GUI/Tab.cpp:2095
 msgid "Silent"
 msgstr "무�"
 
-#: src/slic3r/GUI/Tab.cpp:2040
+#: src/slic3r/GUI/Tab.cpp:2103
 msgid "Maximum feedrates"
 msgstr "최대 �송��"
 
-#: src/slic3r/GUI/Tab.cpp:2045
+#: src/slic3r/GUI/Tab.cpp:2108
 msgid "Maximum accelerations"
 msgstr "최고 가��"
 
-#: src/slic3r/GUI/Tab.cpp:2052
+#: src/slic3r/GUI/Tab.cpp:2115
 msgid "Jerk limits"
 msgstr "저�(Jerk)값 한계"
 
-#: src/slic3r/GUI/Tab.cpp:2057
+#: src/slic3r/GUI/Tab.cpp:2120
 msgid "Minimum feedrates"
 msgstr "최대 �송��"
 
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
+#: src/slic3r/GUI/Tab.cpp:2158 src/slic3r/GUI/Tab.cpp:2166
 msgid "Single extruder MM setup"
 msgstr "싱글 �스트루� MM 설정"
 
-#: src/slic3r/GUI/Tab.cpp:2104
+#: src/slic3r/GUI/Tab.cpp:2167
 msgid "Single extruder multimaterial parameters"
 msgstr "싱글 �스트루� 멀티메터리알 파�미터"
 
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
+#: src/slic3r/GUI/Tab.cpp:2181 src/libslic3r/GCode/PreviewData.cpp:475
 #, c-format
 msgid "Extruder %d"
 msgstr "�스트루� %d"
 
-#: src/slic3r/GUI/Tab.cpp:2125
+#: src/slic3r/GUI/Tab.cpp:2188
 msgid "Layer height limits"
 msgstr "레�어 높� 한계치"
 
-#: src/slic3r/GUI/Tab.cpp:2130
+#: src/slic3r/GUI/Tab.cpp:2193
 msgid "Position (for multi-extruder printers)"
 msgstr "위치 (멀티 �스트루� 프린터 �함)"
 
-#: src/slic3r/GUI/Tab.cpp:2133
+#: src/slic3r/GUI/Tab.cpp:2196
 msgid "Retraction"
 msgstr "리트렉션"
 
-#: src/slic3r/GUI/Tab.cpp:2136
+#: src/slic3r/GUI/Tab.cpp:2199
 msgid "Only lift Z"
 msgstr "Z축만 올림"
 
-#: src/slic3r/GUI/Tab.cpp:2149
+#: src/slic3r/GUI/Tab.cpp:2212
 msgid ""
 "Retraction when tool is disabled (advanced settings for multi-extruder "
 "setups)"
 msgstr "�구 비활성화시 리트렉션 (멀티 �스트루� 고급 설정)"
 
-#: src/slic3r/GUI/Tab.cpp:2153
+#: src/slic3r/GUI/Tab.cpp:2216
 msgid "Preview"
 msgstr "프리뷰"
 
-#: src/slic3r/GUI/Tab.cpp:2284
+#: src/slic3r/GUI/Tab.cpp:2352
 msgid ""
 "The Wipe option is not available when using the Firmware Retraction mode.\n"
 "\n"
@@ -3185,99 +3566,95 @@ msgstr ""
 "\n"
 "펌웨어 리트렉션 하려면 비활성화해야합니까?"
 
-#: src/slic3r/GUI/Tab.cpp:2286
+#: src/slic3r/GUI/Tab.cpp:2354
 msgid "Firmware Retraction"
 msgstr "펌웨어 레트렉션"
 
-#: src/slic3r/GUI/Tab.cpp:2565
+#: src/slic3r/GUI/Tab.cpp:2681
 #, c-format
 msgid "Default preset (%s)"
 msgstr "시스템 기본값 (%s)"
 
-#: src/slic3r/GUI/Tab.cpp:2566
+#: src/slic3r/GUI/Tab.cpp:2682
 #, c-format
 msgid "Preset (%s)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2583
+#: src/slic3r/GUI/Tab.cpp:2699
 msgid "has the following unsaved changes:"
 msgstr "저장�지 않� 수정사항:"
 
-#: src/slic3r/GUI/Tab.cpp:2586
+#: src/slic3r/GUI/Tab.cpp:2702
 msgid "is not compatible with printer"
 msgstr "프린터와 호완 �지 않습니다"
 
-#: src/slic3r/GUI/Tab.cpp:2587
+#: src/slic3r/GUI/Tab.cpp:2703
 msgid "is not compatible with print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2589
+#: src/slic3r/GUI/Tab.cpp:2705
 msgid "and it has the following unsaved changes:"
 msgstr "저장�지 않� 변경�� 다�과 같습니다:"
 
-#: src/slic3r/GUI/Tab.cpp:2592
+#: src/slic3r/GUI/Tab.cpp:2708
 msgid "Discard changes and continue anyway?"
 msgstr "수정� 사항� 취소하고 계�하겠습니까?"
 
-#: src/slic3r/GUI/Tab.cpp:2593
+#: src/slic3r/GUI/Tab.cpp:2709
 msgid "Unsaved Changes"
 msgstr "미 저장� 변경�"
 
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
+#: src/slic3r/GUI/Tab.cpp:2721
 msgid "Please check your object list before preset changing."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2699
+#: src/slic3r/GUI/Tab.cpp:2801
+msgid "Copy"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2823
 msgid "The supplied name is empty. It can't be saved."
 msgstr "파� �름� 비어 있습니다. 저장할 수 없습니다."
 
-#: src/slic3r/GUI/Tab.cpp:2704
+#: src/slic3r/GUI/Tab.cpp:2828
 msgid "Cannot overwrite a system profile."
 msgstr "시스템 프로파�� 겹� 쓸 수 없습니다."
 
-#: src/slic3r/GUI/Tab.cpp:2708
+#: src/slic3r/GUI/Tab.cpp:2832
 msgid "Cannot overwrite an external profile."
 msgstr "외부 프로필� �어 쓸 수 없습니다."
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2858
 msgid "remove"
 msgstr "제거(remove)"
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2858
 msgid "delete"
 msgstr "지우기(delete)"
 
-#: src/slic3r/GUI/Tab.cpp:2735
+#: src/slic3r/GUI/Tab.cpp:2859
 msgid "Are you sure you want to "
 msgstr "정�로 다�과 같� 하겠습니까? "
 
-#: src/slic3r/GUI/Tab.cpp:2735
+#: src/slic3r/GUI/Tab.cpp:2859
 msgid " the selected preset?"
 msgstr " 를(가) 선�� 설정� 실행 할까요?"
 
-#: src/slic3r/GUI/Tab.cpp:2736
+#: src/slic3r/GUI/Tab.cpp:2860
 msgid "Remove"
 msgstr "제거(remove)"
 
-#: src/slic3r/GUI/Tab.cpp:2737
+#: src/slic3r/GUI/Tab.cpp:2861
 msgid " Preset"
 msgstr " 기본 설정"
 
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "모� 선�"
-
-#: src/slic3r/GUI/Tab.cpp:2869
+#: src/slic3r/GUI/Tab.cpp:2989
 msgid ""
 "LOCKED LOCK;indicates that the settings are the same as the system values "
 "for the current option group"
 msgstr "�물쇠 잠금 : 설정� 현재 옵션 그룹� 시스템 값과 �� 함� 나타냅니다"
 
-#: src/slic3r/GUI/Tab.cpp:2872
+#: src/slic3r/GUI/Tab.cpp:2992
 msgid ""
 "UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
 "the system values for the current option group.\n"
@@ -3289,7 +3666,7 @@ msgstr ""
 "현재 옵션 그룹� 모든 설정� 시스템 값으로 재설정하려면 �물쇠 잠금 아�콘� "
 "�릭하십시오."
 
-#: src/slic3r/GUI/Tab.cpp:2878
+#: src/slic3r/GUI/Tab.cpp:2998
 msgid ""
 "WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
 "for the right button: \tindicates that the settings hasn't been modified."
@@ -3297,7 +3674,7 @@ msgstr ""
 "�색 �알; 왼쪽 버튼 : 시스템� 아닌 사전 설정� 나타내며,\n"
 "오른쪽 버튼� 경우 : 설정� 수정�지 않았 �� 나타냅니다."
 
-#: src/slic3r/GUI/Tab.cpp:2882
+#: src/slic3r/GUI/Tab.cpp:3002
 msgid ""
 "BACK ARROW;indicates that the settings were changed and are not equal to the "
 "last saved preset for the current option group.\n"
@@ -3309,14 +3686,14 @@ msgstr ""
 "현재 옵션 그룹� 모든 설정� 시스템 값으로 재설정하려면 �물쇠 잠금 아�콘� "
 "�릭하십시오."
 
-#: src/slic3r/GUI/Tab.cpp:2908
+#: src/slic3r/GUI/Tab.cpp:3028
 msgid ""
 "LOCKED LOCK icon indicates that the settings are the same as the system "
 "values for the current option group"
 msgstr ""
 "�물쇠 잠금 아�코 설정� 현재 옵션 그룹� 시스템 값과 �� 함� 나타냅니다"
 
-#: src/slic3r/GUI/Tab.cpp:2910
+#: src/slic3r/GUI/Tab.cpp:3030
 msgid ""
 "UNLOCKED LOCK icon indicates that some settings were changed and are not "
 "equal to the system values for the current option group.\n"
@@ -3327,11 +3704,11 @@ msgstr ""
 "현재 옵션 그룹� 모든 설정� 시스템 값으로 재설정하려면 �물쇠 잠금 아�콘� "
 "�릭하십시오."
 
-#: src/slic3r/GUI/Tab.cpp:2913
+#: src/slic3r/GUI/Tab.cpp:3033
 msgid "WHITE BULLET icon indicates a non system preset."
 msgstr "�색 글머리 아�콘� 시스템 사전 설정� 아닌 것� 나타냅니다."
 
-#: src/slic3r/GUI/Tab.cpp:2916
+#: src/slic3r/GUI/Tab.cpp:3036
 msgid ""
 "WHITE BULLET icon indicates that the settings are the same as in the last "
 "saved preset for the current option group."
@@ -3339,7 +3716,7 @@ msgstr ""
 "�색 글머리 기호 아�콘� 설정� 현재 옵션 그룹� 대해 마지막으로 저장 � 사"
 "전 설정과 �� 하다는 것� 나타냅니다."
 
-#: src/slic3r/GUI/Tab.cpp:2918
+#: src/slic3r/GUI/Tab.cpp:3038
 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"
@@ -3351,12 +3728,12 @@ msgstr ""
 "마지막 현재 옵션 그룹� 대 한 모든 설정 다시 설정� �릭 하 여 사전 설정� 저"
 "장."
 
-#: src/slic3r/GUI/Tab.cpp:2924
+#: src/slic3r/GUI/Tab.cpp:3044
 msgid ""
 "LOCKED LOCK icon indicates that the value is the same as the system value."
 msgstr "잠긴 �물쇠 아�콘 값 같� 시스템 값 임� 나타냅니다."
 
-#: src/slic3r/GUI/Tab.cpp:2925
+#: src/slic3r/GUI/Tab.cpp:3045
 msgid ""
 "UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
 "the system value.\n"
@@ -3365,7 +3742,7 @@ msgstr ""
 "잠금 해제 �물쇠 아�콘 값 변경 � 시스템 값� 나타냅니다.\n"
 "시스템 값� 현재 값으로 설정 하려면 �릭 합니다."
 
-#: src/slic3r/GUI/Tab.cpp:2931
+#: src/slic3r/GUI/Tab.cpp:3051
 msgid ""
 "WHITE BULLET icon indicates that the value is the same as in the last saved "
 "preset."
@@ -3373,7 +3750,7 @@ msgstr ""
 "�색 글머리 기호 아�콘� 마지막으로 저장 한 사전 설정과 ��한 값� 나타냅니"
 "다."
 
-#: src/slic3r/GUI/Tab.cpp:2932
+#: src/slic3r/GUI/Tab.cpp:3052
 msgid ""
 "BACK ARROW icon indicates that the value was changed and is not equal to the "
 "last saved preset.\n"
@@ -3382,99 +3759,115 @@ msgstr ""
 "잠금 해제 �물쇠 아�콘 값 변경 � 시스템 값� 나타냅니다.\n"
 "시스템 값� 현재 값으로 설정 하려면 �릭 합니다."
 
-#: src/slic3r/GUI/Tab.cpp:3031
+#: src/slic3r/GUI/Tab.cpp:3152
 msgid " as:"
 msgstr " as:"
 
-#: src/slic3r/GUI/Tab.cpp:3075
+#: src/slic3r/GUI/Tab.cpp:3196
 msgid "the following postfix are not allowed:"
 msgstr "다� 접미사는 허용�지 않습니다:"
 
-#: src/slic3r/GUI/Tab.cpp:3079
+#: src/slic3r/GUI/Tab.cpp:3200
 msgid "The supplied name is not available."
 msgstr "The supplied name is not available."
 
-#: src/slic3r/GUI/Tab.cpp:3092
+#: src/slic3r/GUI/Tab.cpp:3213
 msgid "Material"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
+#: src/slic3r/GUI/Tab.cpp:3215 src/slic3r/GUI/Tab.cpp:3305
 msgid "Layers"
 msgstr "레�어"
 
-#: src/slic3r/GUI/Tab.cpp:3098
+#: src/slic3r/GUI/Tab.cpp:3219
 msgid "Exposure"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3183
+#: src/slic3r/GUI/Tab.cpp:3313
 msgid "Support head"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3188
+#: src/slic3r/GUI/Tab.cpp:3318
 msgid "Support pillar"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3196
+#: src/slic3r/GUI/Tab.cpp:3328
 msgid "Connection of the support sticks and junctions"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3200
+#: src/slic3r/GUI/Tab.cpp:3333
 msgid "Automatic generation"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
+#: src/slic3r/GUI/Tab.cpp:3395
+msgid "Head penetration should not be greater than the head width."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3396
+msgid "Invalid Head penetration"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3408
+msgid "Pinhead diameter should be smaller than the pillar diameter."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3409
+msgid "Invalid pinhead diameter"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.hpp:307 src/slic3r/GUI/Tab.hpp:395
 msgid "Print Settings"
 msgstr "출력 설정"
 
-#: src/slic3r/GUI/Tab.hpp:311
+#: src/slic3r/GUI/Tab.hpp:325
 msgid "Filament Settings"
 msgstr "필�멘트 설정"
 
-#: src/slic3r/GUI/Tab.hpp:344
+#: src/slic3r/GUI/Tab.hpp:358
 msgid "Printer Settings"
 msgstr "프린터 설정"
 
-#: src/slic3r/GUI/Tab.hpp:367
+#: src/slic3r/GUI/Tab.hpp:381
 msgid "Material Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:393
+#: src/slic3r/GUI/Tab.hpp:407
 msgid "Save preset"
 msgstr "사전 설정 저장"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
+#: src/slic3r/GUI/UpdateDialogs.cpp:29
 msgid "Update available"
 msgstr "사용가능한 업��트"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
+#: src/slic3r/GUI/UpdateDialogs.cpp:29
 msgid "New version of Slic3r PE is available"
 msgstr "새로운 버전� Slic3r PE 사용 가능"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
+#: src/slic3r/GUI/UpdateDialogs.cpp:36
 msgid "To download, follow the link below."
 msgstr "다운로드하려면 아래 ��를 �릭하십시오."
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
+#: src/slic3r/GUI/UpdateDialogs.cpp:44
 msgid "Current version:"
 msgstr "현재 버전:"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
+#: src/slic3r/GUI/UpdateDialogs.cpp:46
 msgid "New version:"
 msgstr "새로운 버전:"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
+#: src/slic3r/GUI/UpdateDialogs.cpp:54
 msgid "Don't notify about new releases any more"
 msgstr "새로운 수정사항� 대해 � �� 알림 안 함"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
+#: src/slic3r/GUI/UpdateDialogs.cpp:72 src/slic3r/GUI/UpdateDialogs.cpp:164
 msgid "Configuration update"
 msgstr "구성 업��트"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
+#: src/slic3r/GUI/UpdateDialogs.cpp:72
 msgid "Configuration update is available"
 msgstr "구성 업��트를 사용할 수 있�"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
+#: src/slic3r/GUI/UpdateDialogs.cpp:75
 msgid ""
 "Would you like to install it?\n"
 "\n"
@@ -3490,15 +3883,15 @@ msgstr ""
 "\n"
 "업��트 � 구성 번들 :"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
 msgid "Slic3r incompatibility"
 msgstr "Slic3r와 호환 �지 않�"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
 msgid "Slic3r configuration is incompatible"
 msgstr "Slic3r 구성� 호환�지 않습니다"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
+#: src/slic3r/GUI/UpdateDialogs.cpp:114
 msgid ""
 "This version of Slic3r PE is not compatible with currently installed "
 "configuration bundles.\n"
@@ -3516,24 +3909,24 @@ msgstr ""
 "니다. �렇게하면� Slic3r과 호환�는 파�� 설치하기 전� 기존 구성� 백업 스"
 "냅 샷� �성 할 수 있습니다.\n"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
+#: src/slic3r/GUI/UpdateDialogs.cpp:123
 #, c-format
 msgid "This Slic3r PE version: %s"
 msgstr "� Slic3r PE 버전 : % s"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
+#: src/slic3r/GUI/UpdateDialogs.cpp:128
 msgid "Incompatible bundles:"
 msgstr "호환�지 않는 번들 :"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
+#: src/slic3r/GUI/UpdateDialogs.cpp:144
 msgid "Exit Slic3r"
 msgstr "Exit Slic3r"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
+#: src/slic3r/GUI/UpdateDialogs.cpp:147
 msgid "Re-configure"
 msgstr "재구성"
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
+#: src/slic3r/GUI/UpdateDialogs.cpp:168
 #, c-format
 msgid ""
 "Slic3r PE now uses an updated configuration structure.\n"
@@ -3559,15 +3952,15 @@ msgstr ""
 "새 사전 설정� 설정하고 �� 사전 설정 업��트를 사용할지 여부를 선�하려면 "
 "다�� % s� 계� 진행하십시오."
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:182
+#: src/slic3r/GUI/UpdateDialogs.cpp:184
 msgid "For more information please visit our wiki page:"
 msgstr "�세한 정보는 위키 페�지를 참조하십시오 :"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
+#: src/slic3r/GUI/WipeTowerDialog.cpp:14
 msgid "Ramming customization"
 msgstr "사용� 정� 다지기(Ramming)"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
+#: src/slic3r/GUI/WipeTowerDialog.cpp:40
 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 "
@@ -3588,49 +3981,49 @@ msgstr ""
 "전문가 수준� 설정�므로 잘못� 조정으로 �해 용지 걸림, 압출기 휠� 필�멘"
 "트 등� 연삭 � 수 있습니다."
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82
 msgid "Total ramming time"
 msgstr "� 래� 시간"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
+#: src/slic3r/GUI/WipeTowerDialog.cpp:84
 msgid "Total rammed volume"
 msgstr "� 레미드 양"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/slic3r/GUI/WipeTowerDialog.cpp:88
 msgid "Ramming line width"
 msgstr "래� 선 너비"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
+#: src/slic3r/GUI/WipeTowerDialog.cpp:90
 msgid "Ramming line spacing"
 msgstr "래� 선 간격"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
+#: src/slic3r/GUI/WipeTowerDialog.cpp:141
 msgid "Wipe tower - Purging volume adjustment"
 msgstr "와�프 타워 - 버려진 필�멘트 조절"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
+#: src/slic3r/GUI/WipeTowerDialog.cpp:225
 msgid ""
 "Here you can adjust required purging volume (mm³) for any given pair of "
 "tools."
 msgstr "여기서 주어진 �구 �� 필요한 정화 용량 (mm³)� 조정할 수 있습니다."
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
+#: src/slic3r/GUI/WipeTowerDialog.cpp:226
 msgid "Extruder changed to"
 msgstr "�스트루� 번경"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
+#: src/slic3r/GUI/WipeTowerDialog.cpp:234
 msgid "unloaded"
 msgstr "언로드(unloaded)"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
+#: src/slic3r/GUI/WipeTowerDialog.cpp:235
 msgid "loaded"
 msgstr "로드(loaded)"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
+#: src/slic3r/GUI/WipeTowerDialog.cpp:240
 msgid "Tool #"
 msgstr "툴(Tool) #"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
+#: src/slic3r/GUI/WipeTowerDialog.cpp:247
 msgid ""
 "Total purging volume is calculated by summing two values below, depending on "
 "which tools are loaded/unloaded."
@@ -3638,15 +4031,15 @@ msgstr ""
 "� 정화 량� 어� 공구가로드 / 언로드�는지� 따� 아래� � 값� 합산하여 계"
 "산�니다."
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
+#: src/slic3r/GUI/WipeTowerDialog.cpp:248
 msgid "Volume to purge (mm³) when the filament is being"
 msgstr "제거할 필�멘트 양 (mm³)"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
+#: src/slic3r/GUI/WipeTowerDialog.cpp:262
 msgid "From"
 msgstr "From"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
+#: src/slic3r/GUI/WipeTowerDialog.cpp:327
 msgid ""
 "Switching to simple settings will discard changes done in the advanced "
 "mode!\n"
@@ -3657,57 +4050,87 @@ msgstr ""
 "\n"
 "계�하시겠습니까?"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show simplified settings"
 msgstr "간단한 설정보기"
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show advanced settings"
 msgstr "고급 설정보기"
 
-#: src/slic3r/Utils/OctoPrint.cpp:65
+#: src/slic3r/GUI/wxExtensions.cpp:2398
+#, c-format
+msgid "Switch to the %s mode"
+msgstr ""
+
+#: src/slic3r/GUI/wxExtensions.cpp:2399
+#, c-format
+msgid "Current mode is %s"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:51
+msgid "Connection to Duet works correctly."
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:56
+msgid "Could not connect to Duet"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:154
+msgid "Unknown error occured"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:148
+msgid "Wrong password"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:151
+msgid "Could not get resources to create a new connection"
+msgstr ""
+
+#: src/slic3r/Utils/OctoPrint.cpp:69
 #, c-format
 msgid "Mismatched type of print host: %s"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:80
+#: src/slic3r/Utils/OctoPrint.cpp:84
 msgid "Connection to OctoPrint works correctly."
 msgstr "OctoPrint� 연결하면 올바르게 작�합니다."
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Could not connect to OctoPrint"
 msgstr "OctoPrint� 연결할 수 없습니다"
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Note: OctoPrint version at least 1.1.0 is required."
 msgstr "참고 : OctoPrint 버전 1.1.0 ��� 필요합니다."
 
-#: src/slic3r/Utils/OctoPrint.cpp:181
+#: src/slic3r/Utils/OctoPrint.cpp:195
 msgid "Connection to Prusa SLA works correctly."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:186
+#: src/slic3r/Utils/OctoPrint.cpp:200
 msgid "Could not connect to Prusa SLA"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:571
+#: src/slic3r/Utils/PresetUpdater.cpp:583
 #, c-format
 msgid "requires min. %s and max. %s"
 msgstr "최소. %s 와 최대. %s"
 
-#: src/slic3r/Utils/PresetUpdater.cpp:576
+#: src/slic3r/Utils/PresetUpdater.cpp:588
 #, c-format
 msgid "requires min. %s"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:578
+#: src/slic3r/Utils/PresetUpdater.cpp:590
 #, c-format
 msgid "requires max. %s"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:359
+msgid "Exporting source model"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:235
@@ -3715,7 +4138,7 @@ msgid "Failed loading the input model."
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
+msgid "Repairing model by the Netfabb service"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:248
@@ -3723,8 +4146,8 @@ msgid "Mesh repair failed."
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the repaired model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:378
+msgid "Loading repaired model"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:263
@@ -3733,62 +4156,246 @@ msgstr ""
 msgid "Saving mesh into the 3MF container failed."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
+#: src/slic3r/Utils/FixModelByWin10.cpp:340
 msgid "Model fixing"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
+#: src/slic3r/Utils/FixModelByWin10.cpp:341
 msgid "Exporting model..."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
+#: src/slic3r/Utils/FixModelByWin10.cpp:368
 msgid "Export of a temporary 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
+#: src/slic3r/Utils/FixModelByWin10.cpp:383
 msgid "Import of the repaired 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
+#: src/slic3r/Utils/FixModelByWin10.cpp:385
+msgid "Repaired 3MF file does not contain any object"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:387
+msgid "Repaired 3MF file contains more than one object"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:389
+msgid "Repaired 3MF file does not contain any volume"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:391
+msgid "Repaired 3MF file contains more than one volume"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:400
 msgid "Model repair finished"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
+#: src/slic3r/Utils/FixModelByWin10.cpp:406
 msgid "Model repair canceled"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
 msgid "Model repaired successfully"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model Repair by the Netfabb service"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model repair failed: \n"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1175
+#: src/libslic3r/Zipper.cpp:35
+msgid "undefined error"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:37
+msgid "too many files"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:39
+msgid "file too large"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:41
+msgid "unsupported method"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:43
+msgid "unsupported encryption"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:45
+msgid "unsupported feature"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:47
+msgid "failed finding central directory"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:49
+msgid "not a ZIP archive"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:51
+msgid "invalid header or archive is corrupted"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:53
+msgid "unsupported multidisk archive"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:55
+msgid "decompression failed or archive is corrupted"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:57
+msgid "compression failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:59
+msgid "unexpected decompressed size"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:61
+msgid "CRC-32 check failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:63
+msgid "unsupported central directory size"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:65
+msgid "allocation failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:67
+msgid "file open failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:69
+msgid "file create failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:71
+msgid "file write failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:73
+msgid "file read failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:75
+msgid "file close failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:77
+msgid "file seek failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:79
+msgid "file stat failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:81
+msgid "invalid parameter"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:83
+msgid "invalid filename"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:85
+msgid "buffer too small"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:87
+msgid "internal error"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:89
+msgid "file not found"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:91
+msgid "archive is too large"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:93
+msgid "validation failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:95
+msgid "write calledback failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:105
+msgid "Error with zip archive"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2153
+msgid "Starting"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2154
+msgid "Filtering"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2155
+msgid "Generate pinheads"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2156
+msgid "Classification"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2157
+msgid "Routing to ground"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2158
+msgid "Routing supports to model surface"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2159
+msgid "Cascading pillars"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2160
+msgid "Processing small holes"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2161
+msgid "Done"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2162
+msgid "Abort"
+msgstr ""
+
+#: src/libslic3r/Print.cpp:1136
 msgid "All objects are outside of the print volume."
 msgstr "모든 개체가 �쇄 볼륨 외부� 있습니다."
 
-#: src/libslic3r/Print.cpp:1201
+#: src/libslic3r/Print.cpp:1165
 msgid "Some objects are too close; your extruder will collide with them."
 msgstr "�부 개체가 너무 가�습니다. 귀하� 압출기가 그들과 충�합니다."
 
-#: src/libslic3r/Print.cpp:1216
+#: src/libslic3r/Print.cpp:1180
 msgid ""
 "Some objects are too tall and cannot be printed without extruder collisions."
 msgstr "�부 개체는 너무 �고 �스트루� 충�없� �쇄 할 수 없습니다."
 
-#: src/libslic3r/Print.cpp:1226
+#: src/libslic3r/Print.cpp:1190
 msgid "The Spiral Vase option can only be used when printing a single object."
 msgstr ""
 "나선형 꽃병(Spiral Vase) 옵션� 단� 개체를 �쇄 할 때만 사용할 수 있습니다."
 
-#: src/libslic3r/Print.cpp:1228
+#: src/libslic3r/Print.cpp:1192
 msgid ""
 "The Spiral Vase option can only be used when printing single material "
 "objects."
@@ -3796,7 +4403,7 @@ msgstr ""
 "나선형 꽃병 옵션(Spiral Vase)� 단� 재료 �체를 �쇄 할 때만 사용할 수 있습"
 "니다."
 
-#: src/libslic3r/Print.cpp:1234
+#: src/libslic3r/Print.cpp:1198
 msgid ""
 "All extruders must have the same diameter for single extruder multimaterial "
 "printer."
@@ -3804,13 +4411,13 @@ msgstr ""
 "모든 �스트루�는 멀티메터리얼 프린터� 싱글 �스트루�� 대해 ��한 �경� "
 "가져야합니다."
 
-#: src/libslic3r/Print.cpp:1239
+#: src/libslic3r/Print.cpp:1203
 msgid ""
 "The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
 "and Repetier G-code flavors."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1241
+#: src/libslic3r/Print.cpp:1205
 msgid ""
 "The Wipe Tower is currently only supported with the relative extruder "
 "addressing (use_relative_e_distances=1)."
@@ -3818,7 +4425,7 @@ msgstr ""
 "와�프 타워는 현재 �대� 압출기 어드레싱 (use_relative_e_distances = 1)�서"
 "만 지��니다."
 
-#: src/libslic3r/Print.cpp:1253
+#: src/libslic3r/Print.cpp:1226
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they have equal "
 "layer heigths"
@@ -3826,7 +4433,7 @@ msgstr ""
 "와�프 타워 (Wipe Tower)는 같� 레�어 높�� 경우 여러 �체� 대해서만 지�"
 "�니다"
 
-#: src/libslic3r/Print.cpp:1255
+#: src/libslic3r/Print.cpp:1228
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "over an equal number of raft layers"
@@ -3834,7 +4441,7 @@ msgstr ""
 "와�프 타워는 같� 수� �프트 레�어 위� �쇄 � 경우 여러 �체� 대해서만 "
 "지��니다"
 
-#: src/libslic3r/Print.cpp:1257
+#: src/libslic3r/Print.cpp:1230
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "with the same support_material_contact_distance"
@@ -3842,30 +4449,30 @@ msgstr ""
 "와�프 타워는 ��한 support_material_contact_distance로 �쇄 � 경우 여러 �"
 "체� 대해서만 지��니다"
 
-#: src/libslic3r/Print.cpp:1259
+#: src/libslic3r/Print.cpp:1232
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are sliced "
 "equally."
 msgstr ""
 "와�프 타워는 똑같� 슬��스 � 경우 여러 오브�트� 대해서만 지��니다."
 
-#: src/libslic3r/Print.cpp:1281
+#: src/libslic3r/Print.cpp:1261
 msgid ""
 "The Wipe tower is only supported if all objects have the same layer height "
 "profile"
 msgstr ""
 "모든 오브�트� 레�어 높� 프로필� ��한 경우�만 와�프 타워가 지��니다"
 
-#: src/libslic3r/Print.cpp:1290
+#: src/libslic3r/Print.cpp:1271
 msgid "The supplied settings will cause an empty print."
 msgstr "제공� 설정으로 �해 빈 �쇄가 발�합니다."
 
-#: src/libslic3r/Print.cpp:1307
+#: src/libslic3r/Print.cpp:1288
 msgid ""
 "One or more object were assigned an extruder that the printer does not have."
 msgstr "하나 ��� 개체� 프린터�없는 압출기가 지정�었습니다."
 
-#: src/libslic3r/Print.cpp:1316
+#: src/libslic3r/Print.cpp:1297
 msgid ""
 "Printing with multiple extruders of differing nozzle diameters. If support "
 "is to be printed with the current extruder (support_material_extruder == 0 "
@@ -3876,13 +4483,13 @@ msgstr ""
 "(support_material_extruder == 0 �는 support_material_interface_extruder == "
 "0)로 �쇄�는 경우 모든 노�� ��한 지름�어야합니다."
 
-#: src/libslic3r/Print.cpp:1324
+#: src/libslic3r/Print.cpp:1305
 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:1328
+#: src/libslic3r/Print.cpp:1309
 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 "
@@ -3890,27 +4497,82 @@ msgid ""
 "set to 0)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1335
+#: src/libslic3r/Print.cpp:1316
 msgid "first_layer_height"
 msgstr "first_layer_height"
 
-#: src/libslic3r/Print.cpp:1350
+#: src/libslic3r/Print.cpp:1331
 msgid "First layer height can't be greater than nozzle diameter"
 msgstr "첫번째 레�어 높�는 노� �경보다 � 수 없습니다"
 
-#: src/libslic3r/Print.cpp:1354
+#: src/libslic3r/Print.cpp:1335
 msgid "Layer height can't be greater than nozzle diameter"
 msgstr "레�어 높�는 노� �경보다 � 수 없습니다"
 
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
+#: src/libslic3r/SLAPrint.cpp:55
+msgid "Slicing model"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:56 src/libslic3r/SLAPrint.cpp:801
+msgid "Generating support points"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:57
+msgid "Generating support tree"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:58
+msgid "Generating pad"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:59
+msgid "Slicing supports"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:71
+msgid "Merging slices and calculating statistics"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:72
+msgid "Rasterizing layers"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:605
+msgid ""
+"Cannot proceed without support points! Add support points or disable support "
+"generation."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:617
+msgid "Elevation is too low for object."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:699
+msgid "Slicing had to be stopped due to an internal error."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:849 src/libslic3r/SLAPrint.cpp:859
+#: src/libslic3r/SLAPrint.cpp:907
+msgid "Visualizing supports"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:1449
+msgid "Slicing done"
+msgstr ""
+
+#: src/libslic3r/PrintBase.cpp:65
+msgid "Failed processing of the output_filename_format template."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:42 src/libslic3r/PrintConfig.cpp:43
 msgid "Printer technology"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:41
+#: src/libslic3r/PrintConfig.cpp:50
 msgid "Bed shape"
 msgstr "배드 모양"
 
-#: src/libslic3r/PrintConfig.cpp:48
+#: src/libslic3r/PrintConfig.cpp:57
 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."
@@ -3918,21 +4580,52 @@ msgstr ""
 "� 설정� 슬��스/레�어� 높�(따�서 � 수)를 제어한다. 얇� 층� � 나� "
 "정확성� 제공하지만 �쇄하는 �는 � 많� 시간� 걸린다."
 
-#: src/libslic3r/PrintConfig.cpp:56
+#: src/libslic3r/PrintConfig.cpp:64
 msgid "Max print height"
 msgstr "최대 프린트 높�"
 
-#: src/libslic3r/PrintConfig.cpp:57
+#: src/libslic3r/PrintConfig.cpp:65
 msgid ""
 "Set this to the maximum height that can be reached by your extruder while "
 "printing."
 msgstr "�쇄 중� �스트루�가 �달 할 수있는 최대 높�로 설정하십시오."
 
+#: src/libslic3r/PrintConfig.cpp:71
+msgid "Slice gap closing radius"
+msgstr ""
+
 #: src/libslic3r/PrintConfig.cpp:73
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:81
+msgid "Hostname, IP or URL"
+msgstr "호스트 �름(Hostname), IP or URL"
+
+#: src/libslic3r/PrintConfig.cpp:82
+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."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:88
+msgid "API Key / Password"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:89
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:111
 msgid "Avoid crossing perimeters"
 msgstr "출력� 외측� 피하세요"
 
-#: src/libslic3r/PrintConfig.cpp:74
+#: src/libslic3r/PrintConfig.cpp:112
 msgid ""
 "Optimize travel moves in order to minimize the crossing of perimeters. This "
 "is mostly useful with Bowden extruders which suffer from oozing. This "
@@ -3942,11 +4635,11 @@ msgstr ""
 "(Bowling) 압출기가 �러 나오기 쉬운 경우� 주로 유용합니다. � 기능� 사용하"
 "면 �쇄 � G 코드 �성 ��가 �려집니다."
 
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
+#: src/libslic3r/PrintConfig.cpp:119 src/libslic3r/PrintConfig.cpp:1976
 msgid "Other layers"
 msgstr "다른 레�어"
 
-#: src/libslic3r/PrintConfig.cpp:83
+#: src/libslic3r/PrintConfig.cpp:120
 msgid ""
 "Bed temperature for layers after the first one. Set this to zero to disable "
 "bed temperature control commands in the output."
@@ -3954,11 +4647,11 @@ msgstr ""
 "첫 번째 레�어 �후� 레�어 온�. � 값� 0으로 설정하면 출력�서 ​​베드 온� "
 "제어 명령� 비활성화합니다."
 
-#: src/libslic3r/PrintConfig.cpp:86
+#: src/libslic3r/PrintConfig.cpp:122
 msgid "Bed temperature"
 msgstr "배드 온�"
 
-#: src/libslic3r/PrintConfig.cpp:93
+#: src/libslic3r/PrintConfig.cpp:129
 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 "
@@ -3968,11 +4661,11 @@ msgstr ""
 "설정과 [layer_num] � [layer_z]� 대한 �리 표시 � 변수를 사용할 수 있습니"
 "다."
 
-#: src/libslic3r/PrintConfig.cpp:104
+#: src/libslic3r/PrintConfig.cpp:139
 msgid "Between objects G-code"
 msgstr "�체 간 G 코드"
 
-#: src/libslic3r/PrintConfig.cpp:105
+#: src/libslic3r/PrintConfig.cpp:140
 msgid ""
 "This code is inserted between objects when using sequential printing. By "
 "default extruder and bed temperature are reset using non-wait command; "
@@ -3987,24 +4680,19 @@ msgstr ""
 "지 않습니다. 모든 Slic3r 설정� �리 표시 변수를 사용할 수 있으므로 �하는 위"
 "치� \"M109 S [first_layer_temperature]\"명령� 넣� 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "바닥(Bottom)"
-
-#: src/libslic3r/PrintConfig.cpp:116
+#: src/libslic3r/PrintConfig.cpp:150
 msgid "Number of solid layers to generate on bottom surfaces."
 msgstr "바닥면� �성 할 솔리드 레�어� 수."
 
-#: src/libslic3r/PrintConfig.cpp:118
+#: src/libslic3r/PrintConfig.cpp:151
 msgid "Bottom solid layers"
 msgstr "바닥 단� 레�어"
 
-#: src/libslic3r/PrintConfig.cpp:123
+#: src/libslic3r/PrintConfig.cpp:156
 msgid "Bridge"
 msgstr "브리지"
 
-#: src/libslic3r/PrintConfig.cpp:124
+#: src/libslic3r/PrintConfig.cpp:157
 msgid ""
 "This is the acceleration your printer will use for bridges. Set zero to "
 "disable acceleration control for bridges."
@@ -4012,18 +4700,18 @@ msgstr ""
 "�것� 프린터가 브릿지� 사용할 가��입니다. 브리지� 가� 제어를 사용하지 "
 "않으려면 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
+#: src/libslic3r/PrintConfig.cpp:159 src/libslic3r/PrintConfig.cpp:302
+#: src/libslic3r/PrintConfig.cpp:814 src/libslic3r/PrintConfig.cpp:935
+#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1133
+#: src/libslic3r/PrintConfig.cpp:1144 src/libslic3r/PrintConfig.cpp:1333
 msgid "mm/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:133
+#: src/libslic3r/PrintConfig.cpp:165
 msgid "Bridging angle"
 msgstr "브릿지 ��"
 
-#: src/libslic3r/PrintConfig.cpp:135
+#: src/libslic3r/PrintConfig.cpp:167
 msgid ""
 "Bridging angle override. If left to zero, the bridging angle will be "
 "calculated automatically. Otherwise the provided angle will be used for all "
@@ -4033,32 +4721,33 @@ msgstr ""
 "로 계산�니다. 그렇지 않으면 제공� ��가 모든 브리지� 사용�니다. �� 제"
 "로는 180 °를 사용하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
+#: src/libslic3r/PrintConfig.cpp:170 src/libslic3r/PrintConfig.cpp:732
+#: src/libslic3r/PrintConfig.cpp:1569 src/libslic3r/PrintConfig.cpp:1579
+#: src/libslic3r/PrintConfig.cpp:1807 src/libslic3r/PrintConfig.cpp:1961
+#: src/libslic3r/PrintConfig.cpp:2459
 msgid "°"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:145
+#: src/libslic3r/PrintConfig.cpp:176
 msgid "Bridges fan speed"
 msgstr "브릿지 팬 ��"
 
-#: src/libslic3r/PrintConfig.cpp:146
+#: src/libslic3r/PrintConfig.cpp:177
 msgid "This fan speed is enforced during all bridges and overhangs."
 msgstr "� 팬 ��는 모든 브릿지 � 오버행 중� �용�니다."
 
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
+#: src/libslic3r/PrintConfig.cpp:178 src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1216
+#: src/libslic3r/PrintConfig.cpp:1461 src/libslic3r/PrintConfig.cpp:2258
+#: src/libslic3r/PrintConfig.cpp:2498
 msgid "%"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:155
+#: src/libslic3r/PrintConfig.cpp:185
 msgid "Bridge flow ratio"
 msgstr "브릿지 유량(flow)값"
 
-#: src/libslic3r/PrintConfig.cpp:157
+#: src/libslic3r/PrintConfig.cpp:187
 msgid ""
 "This factor affects the amount of plastic for bridging. You can decrease it "
 "slightly to pull the extrudates and prevent sagging, although default "
@@ -4069,42 +4758,42 @@ msgstr ""
 "겨 처�� 방지하기 위해 약간 줄� 수 있지만 기본 설정� �반�으로 좋지만� "
 "문제를 해결하기 전� 냉� (팬 사용)� 시�해야합니다."
 
-#: src/libslic3r/PrintConfig.cpp:168
+#: src/libslic3r/PrintConfig.cpp:197
 msgid "Bridges"
 msgstr "브릿지(Bridges)"
 
-#: src/libslic3r/PrintConfig.cpp:170
+#: src/libslic3r/PrintConfig.cpp:199
 msgid "Speed for printing bridges."
 msgstr "브릿지 �쇄 ��."
 
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
+#: src/libslic3r/PrintConfig.cpp:200 src/libslic3r/PrintConfig.cpp:576
+#: src/libslic3r/PrintConfig.cpp:584 src/libslic3r/PrintConfig.cpp:593
+#: src/libslic3r/PrintConfig.cpp:601 src/libslic3r/PrintConfig.cpp:628
+#: src/libslic3r/PrintConfig.cpp:647 src/libslic3r/PrintConfig.cpp:873
+#: src/libslic3r/PrintConfig.cpp:1000 src/libslic3r/PrintConfig.cpp:1078
+#: src/libslic3r/PrintConfig.cpp:1098 src/libslic3r/PrintConfig.cpp:1111
+#: src/libslic3r/PrintConfig.cpp:1122 src/libslic3r/PrintConfig.cpp:1175
+#: src/libslic3r/PrintConfig.cpp:1234 src/libslic3r/PrintConfig.cpp:1362
+#: src/libslic3r/PrintConfig.cpp:1536 src/libslic3r/PrintConfig.cpp:1545
+#: src/libslic3r/PrintConfig.cpp:1940 src/libslic3r/PrintConfig.cpp:2051
 msgid "mm/s"
 msgstr "mm/s"
 
-#: src/libslic3r/PrintConfig.cpp:178
+#: src/libslic3r/PrintConfig.cpp:207
 msgid "Brim width"
 msgstr "브림 �"
 
-#: src/libslic3r/PrintConfig.cpp:179
+#: src/libslic3r/PrintConfig.cpp:208
 msgid ""
 "Horizontal width of the brim that will be printed around each object on the "
 "first layer."
 msgstr "첫 번째 레�어� � �체 주위� �쇄 � 가장�리� 가로 �입니다."
 
-#: src/libslic3r/PrintConfig.cpp:187
+#: src/libslic3r/PrintConfig.cpp:215
 msgid "Clip multi-part objects"
 msgstr "여러 파트 오브�트 �립"
 
-#: src/libslic3r/PrintConfig.cpp:188
+#: src/libslic3r/PrintConfig.cpp:216
 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 "
@@ -4114,19 +4803,19 @@ msgstr ""
 "체 파트를 서로 겹�서 잘�낼 수 있습니다 (� 번째 부분� 첫 번째 부분�서 �"
 "리핑�며 세 번째 부분� 첫 번째 � � 번째 부분�서 잘립니다)."
 
-#: src/libslic3r/PrintConfig.cpp:196
+#: src/libslic3r/PrintConfig.cpp:223
 msgid "Colorprint height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:197
+#: src/libslic3r/PrintConfig.cpp:224
 msgid "Heights at which a filament change is to occur. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:207
+#: src/libslic3r/PrintConfig.cpp:234
 msgid "Compatible printers condition"
 msgstr "호환 가능한 프린터 조건"
 
-#: src/libslic3r/PrintConfig.cpp:208
+#: src/libslic3r/PrintConfig.cpp:235
 msgid ""
 "A boolean expression using the configuration values of an active printer "
 "profile. If this expression evaluates to true, this profile is considered "
@@ -4135,22 +4824,22 @@ msgstr ""
 "활성 프린터 프로파�� 구성 값� 사용하는 부울 표현�. � 표현�� true로 �"
 "가�면� 프로필� 활성 프린터 프로필과 호환�는 것으로 간주�니다."
 
-#: src/libslic3r/PrintConfig.cpp:220
+#: src/libslic3r/PrintConfig.cpp:249
 msgid "Compatible print profiles condition"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:221
+#: src/libslic3r/PrintConfig.cpp:250
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:235
+#: src/libslic3r/PrintConfig.cpp:267
 msgid "Complete individual objects"
 msgstr "개별 개체 완성"
 
-#: src/libslic3r/PrintConfig.cpp:236
+#: src/libslic3r/PrintConfig.cpp:268
 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). "
@@ -4162,11 +4851,11 @@ msgstr ""
 "피할 때 유용합니다. Slic3r� 압출기 충�� 경고하고 예방해야하지만 조심하십시"
 "오."
 
-#: src/libslic3r/PrintConfig.cpp:245
+#: src/libslic3r/PrintConfig.cpp:276
 msgid "Enable auto cooling"
 msgstr "�� 냉� 사용"
 
-#: src/libslic3r/PrintConfig.cpp:246
+#: src/libslic3r/PrintConfig.cpp:277
 msgid ""
 "This flag enables the automatic cooling logic that adjusts print speed and "
 "fan speed according to layer printing time."
@@ -4174,23 +4863,23 @@ msgstr ""
 "� 플래그는 레�어 �쇄 시간� 따� �쇄 ��와 팬 ��를 조정하는 �� 냉� "
 "논리를 활성화합니다."
 
-#: src/libslic3r/PrintConfig.cpp:252
+#: src/libslic3r/PrintConfig.cpp:282
 msgid "Cooling tube position"
 msgstr "냉� 튜브 위치"
 
-#: src/libslic3r/PrintConfig.cpp:253
+#: src/libslic3r/PrintConfig.cpp:283
 msgid "Distance of the center-point of the cooling tube from the extruder tip "
 msgstr "압출기 ��서 냉� 튜브� 중심�까지� 거리 "
 
-#: src/libslic3r/PrintConfig.cpp:261
+#: src/libslic3r/PrintConfig.cpp:290
 msgid "Cooling tube length"
 msgstr "냉� 튜브 길�"
 
-#: src/libslic3r/PrintConfig.cpp:262
+#: src/libslic3r/PrintConfig.cpp:291
 msgid "Length of the cooling tube to limit space for cooling moves inside it "
 msgstr "내부� 냉� ��� 위해 공간� 제한하는 냉� 튜브� 길� "
 
-#: src/libslic3r/PrintConfig.cpp:271
+#: src/libslic3r/PrintConfig.cpp:299
 msgid ""
 "This is the acceleration your printer will be reset to after the role-"
 "specific acceleration values are used (perimeter/infill). Set zero to "
@@ -4199,11 +4888,11 @@ msgstr ""
 "역할 별 가�� 값� 사용 � 후� 프린터가 재설정�는 ��입니다 (둘레 / 충"
 "전). 가�� 전혀 재설정하지 않으려면 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:281
+#: src/libslic3r/PrintConfig.cpp:308
 msgid "Default filament profile"
 msgstr "기본 필�멘트 프로파�"
 
-#: src/libslic3r/PrintConfig.cpp:282
+#: src/libslic3r/PrintConfig.cpp:309
 msgid ""
 "Default filament profile associated with the current printer profile. On "
 "selection of the current printer profile, this filament profile will be "
@@ -4212,12 +4901,12 @@ msgstr ""
 "현재 프린터 프로파�과 연관� 기본 필�멘트 프로파�. 현재 프린터 프로파�� "
 "선�하면 � 필�멘트 프로파�� 활성화�니다."
 
-#: src/libslic3r/PrintConfig.cpp:287
+#: src/libslic3r/PrintConfig.cpp:315
 msgid "Default print profile"
 msgstr "기본 �쇄 프로파�"
 
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:316 src/libslic3r/PrintConfig.cpp:2337
+#: src/libslic3r/PrintConfig.cpp:2348
 msgid ""
 "Default print profile associated with the current printer profile. On "
 "selection of the current printer profile, this print profile will be "
@@ -4226,11 +4915,11 @@ msgstr ""
 "현재 프린터 프로파�과 연관� 기본 �쇄 프로파�. 현재 프린터 프로파�� 선�"
 "하면� �쇄 프로파�� 활성화�니다."
 
-#: src/libslic3r/PrintConfig.cpp:293
+#: src/libslic3r/PrintConfig.cpp:322
 msgid "Disable fan for the first"
 msgstr "첫 번째 팬 사용 중지"
 
-#: src/libslic3r/PrintConfig.cpp:294
+#: src/libslic3r/PrintConfig.cpp:323
 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."
@@ -4238,37 +4927,37 @@ msgstr ""
 "� 값� 양수 값으로 설정하면 첫 번째 레�어�서 팬� 사용하지 않�� 설정하"
 "여 접착력� 악화시키지 않습니다."
 
-#: src/libslic3r/PrintConfig.cpp:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
+#: src/libslic3r/PrintConfig.cpp:325 src/libslic3r/PrintConfig.cpp:945
+#: src/libslic3r/PrintConfig.cpp:1434 src/libslic3r/PrintConfig.cpp:1619
+#: src/libslic3r/PrintConfig.cpp:1680 src/libslic3r/PrintConfig.cpp:1843
+#: src/libslic3r/PrintConfig.cpp:1888
 msgid "layers"
 msgstr "레�어"
 
-#: src/libslic3r/PrintConfig.cpp:304
+#: src/libslic3r/PrintConfig.cpp:332
 msgid "Don't support bridges"
 msgstr "서�트와 브릿지를 사용하지 마세요"
 
-#: src/libslic3r/PrintConfig.cpp:306
+#: src/libslic3r/PrintConfig.cpp:334
 msgid ""
 "Experimental option for preventing support material from being generated "
 "under bridged areas."
 msgstr ""
 "브릿지 �역 아래� 서�팅 재료가 �성�는 것� 방지하기위한 실험� 옵션."
 
-#: src/libslic3r/PrintConfig.cpp:313
+#: src/libslic3r/PrintConfig.cpp:340
 msgid "Distance between copies"
 msgstr "복사본 간 거리"
 
-#: src/libslic3r/PrintConfig.cpp:314
+#: src/libslic3r/PrintConfig.cpp:341
 msgid "Distance used for the auto-arrange feature of the plater."
 msgstr "플래터(plater)� �� 정렬 기능� 사용�는 거리입니다."
 
-#: src/libslic3r/PrintConfig.cpp:322
+#: src/libslic3r/PrintConfig.cpp:348
 msgid "Elephant foot compensation"
 msgstr "코�리 발(Elephant foot) 보�값"
 
-#: src/libslic3r/PrintConfig.cpp:324
+#: src/libslic3r/PrintConfig.cpp:350
 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."
@@ -4276,7 +4965,7 @@ msgstr ""
 "첫 번째 레�어는 구성 요소 값� 따� XY �면�서 수축�어 �층 스 퀴시 코�리"
 "발(Elephant Foot) 효과를 보완합니다."
 
-#: src/libslic3r/PrintConfig.cpp:334
+#: src/libslic3r/PrintConfig.cpp:359
 msgid ""
 "This end procedure is inserted at the end of the output file. Note that you "
 "can use placeholder variables for all Slic3r settings."
@@ -4284,7 +4973,7 @@ msgstr ""
 "� 종료 절차는 출력 파�� �� 삽입�다. 모든 Slic3r 설정� �리 표시� 변수"
 "를 사용할 수 있다는 �� 유�하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:345
+#: src/libslic3r/PrintConfig.cpp:369
 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 "
@@ -4295,11 +4984,11 @@ msgstr ""
 "정� �리 표시� 변수를 사용할 수 있다는 �� 유�하십시오. 여러 개� 압출부"
 "가 있는 경우, 그 코드는 압출 순서대로 처리�다."
 
-#: src/libslic3r/PrintConfig.cpp:356
+#: src/libslic3r/PrintConfig.cpp:379
 msgid "Ensure vertical shell thickness"
 msgstr "수� 쉘(shell) �께 확�"
 
-#: src/libslic3r/PrintConfig.cpp:358
+#: src/libslic3r/PrintConfig.cpp:381
 msgid ""
 "Add solid infill near sloping surfaces to guarantee the vertical shell "
 "thickness (top+bottom solid layers)."
@@ -4307,44 +4996,52 @@ msgstr ""
 "경사 표면 근처� 솔리드 �필� 추가하여 수� 셸 �께(�단+하단 솔리드 레�어)"
 "를 보장하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "�단/하단 채우기(fill) 패턴"
-
-#: src/libslic3r/PrintConfig.cpp:367
-msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
+#: src/libslic3r/PrintConfig.cpp:387
+msgid "Top fill pattern"
 msgstr ""
-"�단/하단 주입� 채우기 패턴� �접한 외부면� 아닌 외부 솔리드 층�만 �향"
-"� 미친다."
 
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
+#: src/libslic3r/PrintConfig.cpp:389
+msgid ""
+"Fill pattern for top infill. This only affects the top visible layer, and "
+"not its adjacent solid shells."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:397 src/libslic3r/PrintConfig.cpp:795
+#: src/libslic3r/PrintConfig.cpp:1921
 msgid "Rectilinear"
 msgstr "�선면(Rectilinear)"
 
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
+#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:801
 msgid "Concentric"
 msgstr "�심�(Concentric)"
 
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
+#: src/libslic3r/PrintConfig.cpp:399 src/libslic3r/PrintConfig.cpp:805
 msgid "Hilbert Curve"
 msgstr "�버트 곡선(Hilbert Curve)"
 
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
+#: src/libslic3r/PrintConfig.cpp:400 src/libslic3r/PrintConfig.cpp:806
 msgid "Archimedean Chords"
 msgstr "아르키메�우스(Archimedean Chords)"
 
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
+#: src/libslic3r/PrintConfig.cpp:401 src/libslic3r/PrintConfig.cpp:807
 msgid "Octagram Spiral"
 msgstr "옥타그램 나선(Octagram Spiral)"
 
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
+#: src/libslic3r/PrintConfig.cpp:408
+msgid "Bottom fill pattern"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:409
+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:414 src/libslic3r/PrintConfig.cpp:424
 msgid "External perimeters"
 msgstr "외측 둘레"
 
-#: src/libslic3r/PrintConfig.cpp:388
+#: src/libslic3r/PrintConfig.cpp:416
 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, "
@@ -4355,14 +5052,14 @@ msgstr ""
 "오. 0� 경우 기본 압출 너비가 사용�며, 그렇지 않으면 1.125 x 노� �경� 사"
 "용�다. 백분율(예: 200%)로 표현�는 경우, 레�어 높�� 걸� 계산�다."
 
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
+#: src/libslic3r/PrintConfig.cpp:419 src/libslic3r/PrintConfig.cpp:834
+#: src/libslic3r/PrintConfig.cpp:966 src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1691 src/libslic3r/PrintConfig.cpp:1864
+#: src/libslic3r/PrintConfig.cpp:2022
 msgid "mm or % (leave 0 for default)"
 msgstr "mm �는 %(기본값� 경우 0으로 유지)"
 
-#: src/libslic3r/PrintConfig.cpp:399
+#: src/libslic3r/PrintConfig.cpp:426
 msgid ""
 "This separate setting will affect the speed of external perimeters (the "
 "visible ones). If expressed as percentage (for example: 80%) it will be "
@@ -4372,17 +5069,17 @@ msgstr ""
 "(예: 80%)로 표현�는 경우 위� Perimeter �� 설정� 따� 계산�다. ��� 위"
 "해 0으로 설정한다."
 
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
+#: src/libslic3r/PrintConfig.cpp:429 src/libslic3r/PrintConfig.cpp:855
+#: src/libslic3r/PrintConfig.cpp:1650 src/libslic3r/PrintConfig.cpp:1701
+#: src/libslic3r/PrintConfig.cpp:1907 src/libslic3r/PrintConfig.cpp:2034
 msgid "mm/s or %"
 msgstr "mm/s �는 %"
 
-#: src/libslic3r/PrintConfig.cpp:409
+#: src/libslic3r/PrintConfig.cpp:436
 msgid "External perimeters first"
 msgstr "외부 경계선 먼저"
 
-#: src/libslic3r/PrintConfig.cpp:411
+#: src/libslic3r/PrintConfig.cpp:438
 msgid ""
 "Print contour perimeters from the outermost one to the innermost one instead "
 "of the default inverse order."
@@ -4390,11 +5087,11 @@ msgstr ""
 "기본 역순 대신 가장 바깥쪽부터 가장 안쪽까지 윤곽선� �쇄하십시오. 타겟 TTS"
 "복사하기번역 저장번역 저장번역 수정."
 
-#: src/libslic3r/PrintConfig.cpp:418
+#: src/libslic3r/PrintConfig.cpp:444
 msgid "Extra perimeters if needed"
 msgstr "필요한 경우 추가 둘레"
 
-#: src/libslic3r/PrintConfig.cpp:420
+#: src/libslic3r/PrintConfig.cpp:446
 #, no-c-format
 msgid ""
 "Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r "
@@ -4404,7 +5101,7 @@ msgstr ""
 "경사 벽� 틈� 피하기 위해 필요한 경우 � 많� perimeter를 추가하십시오. 위"
 "� 루프� 70% ��� 지지� 때까지 Slic3r는 계�해서 perimeter를 추가한다."
 
-#: src/libslic3r/PrintConfig.cpp:431
+#: src/libslic3r/PrintConfig.cpp:456
 msgid ""
 "The extruder to use (unless more specific extruder settings are specified). "
 "This value overrides perimeter and infill extruders, but not the support "
@@ -4413,7 +5110,7 @@ msgstr ""
 "사용할 압출부(� 구체�� 압출부 설정� 지정�지 않� 경우) � 값� 경계 � "
 "압출부를 초과하지만 지� 압출�를 주입하지는 않는다."
 
-#: src/libslic3r/PrintConfig.cpp:444
+#: src/libslic3r/PrintConfig.cpp:468
 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 "
@@ -4424,11 +5121,11 @@ msgstr ""
 "다시 �하면, �것� 당신� 압출기 주위� 틈새 실린�� 높��며, 그것� 다른 "
 "�쇄� 물체와 충�하기 전� 압출기가 엿볼 수 있는 최대 깊�를 나타낸다."
 
-#: src/libslic3r/PrintConfig.cpp:455
+#: src/libslic3r/PrintConfig.cpp:478
 msgid "Radius"
 msgstr "반지름"
 
-#: src/libslic3r/PrintConfig.cpp:456
+#: src/libslic3r/PrintConfig.cpp:479
 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 "
@@ -4438,19 +5135,19 @@ msgstr ""
 "으면 안전� 위해 가장 � 값� 선�하십시오. � 설정� 충� 여부를 확�하고 플"
 "래터� 그래픽 미리 보기를 표시하기 위해 사용�다."
 
-#: src/libslic3r/PrintConfig.cpp:467
+#: src/libslic3r/PrintConfig.cpp:489
 msgid "Extruder Color"
 msgstr "�스트루� 컬러"
 
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
+#: src/libslic3r/PrintConfig.cpp:490 src/libslic3r/PrintConfig.cpp:550
 msgid "This is only used in the Slic3r interface as a visual help."
 msgstr "�것� 시�� �움�로 Slic3r �터페�스�서만 사용�다."
 
-#: src/libslic3r/PrintConfig.cpp:475
+#: src/libslic3r/PrintConfig.cpp:496
 msgid "Extruder offset"
 msgstr "�스트루� 오프셋"
 
-#: src/libslic3r/PrintConfig.cpp:476
+#: src/libslic3r/PrintConfig.cpp:497
 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 "
@@ -4461,11 +5158,11 @@ msgstr ""
 "� 사용하면 첫 번째 것� 대한 � 압출기� 변위를 지정할 수 있습니다. 양� 좌"
 "표가 필요합니다 (XY 좌표�서 �니다)."
 
-#: src/libslic3r/PrintConfig.cpp:486
+#: src/libslic3r/PrintConfig.cpp:506
 msgid "Extrusion axis"
 msgstr "압출 축"
 
-#: src/libslic3r/PrintConfig.cpp:487
+#: src/libslic3r/PrintConfig.cpp:507
 msgid ""
 "Use this option to set the axis letter associated to your printer's extruder "
 "(usually E but some printers use A)."
@@ -4473,11 +5170,11 @@ msgstr ""
 "� 옵션� 사용하여 프린터� 압출기� 연결� 축 문�를 설정합니다 (보통 E�지"
 "만 �부 프린터는 A를 사용합니다)."
 
-#: src/libslic3r/PrintConfig.cpp:493
+#: src/libslic3r/PrintConfig.cpp:512
 msgid "Extrusion multiplier"
 msgstr "압출 승수"
 
-#: src/libslic3r/PrintConfig.cpp:494
+#: src/libslic3r/PrintConfig.cpp:513
 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. "
@@ -4489,11 +5186,11 @@ msgstr ""
 "�입니다. � 값� � 변경해야한다고 �단�면 필�멘트 �경과 펌웨어 E 단계를 "
 "확�하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:503
+#: src/libslic3r/PrintConfig.cpp:521
 msgid "Default extrusion width"
 msgstr "기본 압출 �"
 
-#: src/libslic3r/PrintConfig.cpp:505
+#: src/libslic3r/PrintConfig.cpp:523
 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 "
@@ -4506,15 +5203,15 @@ msgstr ""
 "� 툴� 참조). 백분율로 표시�는 경우 (예 : 230 %) 레�어 높�를 기준으로 계"
 "산�니다."
 
-#: src/libslic3r/PrintConfig.cpp:509
+#: src/libslic3r/PrintConfig.cpp:527
 msgid "mm or % (leave 0 for auto)"
 msgstr "mm �는 % (��으로 0� 유지)"
 
-#: src/libslic3r/PrintConfig.cpp:515
+#: src/libslic3r/PrintConfig.cpp:532
 msgid "Keep fan always on"
 msgstr "항� 팬 켜기"
 
-#: src/libslic3r/PrintConfig.cpp:516
+#: src/libslic3r/PrintConfig.cpp:533
 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."
@@ -4522,11 +5219,11 @@ msgstr ""
 "� 기능� 사용하면 팬� 비활성화�지 않으며 최소한 최소 ��로 계� 회전합니"
 "다. PLA� 유용하며 ABS� 해롭다."
 
-#: src/libslic3r/PrintConfig.cpp:522
+#: src/libslic3r/PrintConfig.cpp:538
 msgid "Enable fan if layer print time is below"
 msgstr "레�어 �쇄 시간� 미만� 경우 팬 활성화"
 
-#: src/libslic3r/PrintConfig.cpp:523
+#: src/libslic3r/PrintConfig.cpp:539
 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 "
@@ -4535,27 +5232,27 @@ msgstr ""
 "레�어 �쇄 시간�� 초 미만으로 예��는 경우 팬� 활성화�고 ��는 최소 "
 "� 최대 ��를 보간하여 계산�니다."
 
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
+#: src/libslic3r/PrintConfig.cpp:541 src/libslic3r/PrintConfig.cpp:1637
 msgid "approximate seconds"
 msgstr "근사치 초"
 
-#: src/libslic3r/PrintConfig.cpp:534
+#: src/libslic3r/PrintConfig.cpp:549
 msgid "Color"
 msgstr "색�"
 
-#: src/libslic3r/PrintConfig.cpp:541
+#: src/libslic3r/PrintConfig.cpp:555
 msgid "Filament notes"
 msgstr "필�멘트 메모"
 
-#: src/libslic3r/PrintConfig.cpp:542
+#: src/libslic3r/PrintConfig.cpp:556
 msgid "You can put your notes regarding the filament here."
 msgstr "여기� 필�멘트� 관한 메모를 넣� 수 있다."
 
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
+#: src/libslic3r/PrintConfig.cpp:564 src/libslic3r/PrintConfig.cpp:1181
 msgid "Max volumetric speed"
 msgstr "최대 체� ��"
 
-#: src/libslic3r/PrintConfig.cpp:552
+#: src/libslic3r/PrintConfig.cpp:565
 msgid ""
 "Maximum volumetric speed allowed for this filament. Limits the maximum "
 "volumetric speed of a print to the minimum of print and filament volumetric "
@@ -4564,31 +5261,31 @@ msgstr ""
 "� 필�멘트� 허용�는 최대 체� ��. �쇄물� 최대 체� ��를 �쇄 � 필�"
 "멘트 체� �� 최소로 제한한다. 제한 없�� 대해 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
+#: src/libslic3r/PrintConfig.cpp:568 src/libslic3r/PrintConfig.cpp:1184
 msgid "mm³/s"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:562
+#: src/libslic3r/PrintConfig.cpp:574
 msgid "Loading speed"
 msgstr "로딩 ��"
 
-#: src/libslic3r/PrintConfig.cpp:563
+#: src/libslic3r/PrintConfig.cpp:575
 msgid "Speed used for loading the filament on the wipe tower. "
 msgstr "와�� 탑(wipe)� 필�멘트를 장착하는 � 사용�는 ��. "
 
-#: src/libslic3r/PrintConfig.cpp:571
+#: src/libslic3r/PrintConfig.cpp:582
 msgid "Loading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:572
+#: src/libslic3r/PrintConfig.cpp:583
 msgid "Speed used at the very beginning of loading phase. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:580
+#: src/libslic3r/PrintConfig.cpp:590
 msgid "Unloading speed"
 msgstr "언로딩 스피드"
 
-#: src/libslic3r/PrintConfig.cpp:581
+#: src/libslic3r/PrintConfig.cpp:591
 msgid ""
 "Speed used for unloading the filament on the wipe tower (does not affect  "
 "initial part of unloading just after ramming). "
@@ -4596,20 +5293,20 @@ msgstr ""
 "와�� 타워�서 필�멘트를 언로드하는 � 사용�는 ��(램핑 후 바로 언로딩� "
 "초기 부분�는 �향� 주지 않�). "
 
-#: src/libslic3r/PrintConfig.cpp:590
+#: src/libslic3r/PrintConfig.cpp:599
 msgid "Unloading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:591
+#: src/libslic3r/PrintConfig.cpp:600
 msgid ""
 "Speed used for unloading the tip of the filament immediately after ramming. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:599
+#: src/libslic3r/PrintConfig.cpp:607
 msgid "Delay after unloading"
 msgstr "언로드 후 딜레�"
 
-#: src/libslic3r/PrintConfig.cpp:600
+#: src/libslic3r/PrintConfig.cpp:608
 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 "
@@ -4618,30 +5315,30 @@ msgstr ""
 "필�멘트를 내린 후 기다리는 시간. �래 치수로 축소하는 � � 많� 시간� 필요"
 "할 수있는 유연한 재료로 신뢰할 수있는 공구 �환� 얻� 수 있습니다. "
 
-#: src/libslic3r/PrintConfig.cpp:610
+#: src/libslic3r/PrintConfig.cpp:617
 msgid "Number of cooling moves"
 msgstr "쿨� �� 숫�"
 
-#: src/libslic3r/PrintConfig.cpp:611
+#: src/libslic3r/PrintConfig.cpp:618
 msgid ""
 "Filament is cooled by being moved back and forth in the cooling tubes. "
 "Specify desired number of these moves "
 msgstr ""
 "필�멘트는 냉� 튜브�서 앞뒤로 움�여 냉��니다. �하는 �� 숫� 지정 "
 
-#: src/libslic3r/PrintConfig.cpp:620
+#: src/libslic3r/PrintConfig.cpp:626
 msgid "Speed of the first cooling move"
 msgstr "첫 번째 냉� �� ��"
 
-#: src/libslic3r/PrintConfig.cpp:621
+#: src/libslic3r/PrintConfig.cpp:627
 msgid "Cooling moves are gradually accelerating beginning at this speed. "
 msgstr "냉� ��가 서서히 빨�지고 있습니다. "
 
-#: src/libslic3r/PrintConfig.cpp:629
+#: src/libslic3r/PrintConfig.cpp:634
 msgid "Minimal purge on wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:630
+#: src/libslic3r/PrintConfig.cpp:635
 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 "
@@ -4650,45 +5347,45 @@ msgid ""
 "to produce successive infill or sacrificial object extrusions reliably."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:635
+#: src/libslic3r/PrintConfig.cpp:639
 msgid "mm³"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:641
+#: src/libslic3r/PrintConfig.cpp:645
 msgid "Speed of the last cooling move"
 msgstr "마지막 냉� �� ��"
 
-#: src/libslic3r/PrintConfig.cpp:642
+#: src/libslic3r/PrintConfig.cpp:646
 msgid "Cooling moves are gradually accelerating towards this speed. "
 msgstr "냉�� � ��쪽으로 �차 가�화�고 있습니다. "
 
-#: src/libslic3r/PrintConfig.cpp:650
+#: src/libslic3r/PrintConfig.cpp:653
 msgid "Filament load time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:651
+#: src/libslic3r/PrintConfig.cpp:654
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:659
+#: src/libslic3r/PrintConfig.cpp:661
 msgid "Ramming parameters"
 msgstr "래� 파�미터"
 
-#: src/libslic3r/PrintConfig.cpp:660
+#: src/libslic3r/PrintConfig.cpp:662
 msgid ""
 "This string is edited by RammingDialog and contains ramming specific "
 "parameters "
 msgstr ""
 "� 문�열� RammingDialog� �해 편집�고 램� 특정 매개 변수를 �함합니다 "
 
-#: src/libslic3r/PrintConfig.cpp:667
+#: src/libslic3r/PrintConfig.cpp:668
 msgid "Filament unload time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:668
+#: src/libslic3r/PrintConfig.cpp:669
 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 "
@@ -4704,11 +5401,11 @@ msgstr ""
 "여기� 필�멘트 �경� 입력하십시오. 정밀�가 필요하므로 캘리�를 사용하여 필"
 "�멘트를 따� 여러 번 측정 한 다� �균� 계산하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:685
+#: src/libslic3r/PrintConfig.cpp:684
 msgid "Density"
 msgstr "밀�"
 
-#: src/libslic3r/PrintConfig.cpp:686
+#: src/libslic3r/PrintConfig.cpp:685
 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 "
@@ -4719,41 +5416,41 @@ msgstr ""
 "� 알려진 길�� 필�멘트� 무게를 측정하고 길�와 볼륨� 비율� 계산하는 것"
 "입니다. 변위를 통해 �접�으로 부피를 계산하는 것� � 좋습니다."
 
-#: src/libslic3r/PrintConfig.cpp:689
+#: src/libslic3r/PrintConfig.cpp:688
 msgid "g/cm³"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:695
+#: src/libslic3r/PrintConfig.cpp:693
 msgid "Filament type"
 msgstr "필�멘트 타입"
 
-#: src/libslic3r/PrintConfig.cpp:696
+#: src/libslic3r/PrintConfig.cpp:694
 msgid "The filament material type for use in custom G-codes."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:712
+#: src/libslic3r/PrintConfig.cpp:710
 msgid "Soluble material"
 msgstr "수용성 재료"
 
-#: src/libslic3r/PrintConfig.cpp:713
+#: src/libslic3r/PrintConfig.cpp:711
 msgid "Soluble material is most likely used for a soluble support."
 msgstr "수용성 재료눈 물� 녹는 서�트� 가장 많� 사용�다."
 
-#: src/libslic3r/PrintConfig.cpp:719
+#: src/libslic3r/PrintConfig.cpp:717
 msgid ""
 "Enter your filament cost per kg here. This is only for statistical "
 "information."
 msgstr "kg 당 필�멘트 비용� 여기� 입력하십시오. 통계를 내기 위해서 입니다."
 
-#: src/libslic3r/PrintConfig.cpp:720
+#: src/libslic3r/PrintConfig.cpp:718
 msgid "money/kg"
 msgstr "�(\\)/kg"
 
-#: src/libslic3r/PrintConfig.cpp:729
+#: src/libslic3r/PrintConfig.cpp:727
 msgid "Fill angle"
 msgstr "채움 ��"
 
-#: src/libslic3r/PrintConfig.cpp:731
+#: src/libslic3r/PrintConfig.cpp:729
 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, "
@@ -4763,60 +5460,60 @@ msgstr ""
 "지 할 수있는 최�� 방향� 사용하여 브릿징� 채워지므로� 설정� �향� 미치"
 "지 않습니다."
 
-#: src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:741
 msgid "Fill density"
 msgstr "채우기(fill) 밀�"
 
-#: src/libslic3r/PrintConfig.cpp:746
+#: src/libslic3r/PrintConfig.cpp:743
 msgid "Density of internal infill, expressed in the range 0% - 100%."
 msgstr "0 % - 100 % 범위로 표현 � 내부 채움(infill)� 밀�."
 
-#: src/libslic3r/PrintConfig.cpp:782
+#: src/libslic3r/PrintConfig.cpp:778
 msgid "Fill pattern"
 msgstr "채우기(fill) 패턴"
 
-#: src/libslic3r/PrintConfig.cpp:784
+#: src/libslic3r/PrintConfig.cpp:780
 msgid "Fill pattern for general low-density infill."
 msgstr "�반 낮� 밀� 채움� 패턴."
 
-#: src/libslic3r/PrintConfig.cpp:801
+#: src/libslic3r/PrintConfig.cpp:796
 msgid "Grid"
 msgstr "그리드(Grid)"
 
-#: src/libslic3r/PrintConfig.cpp:802
+#: src/libslic3r/PrintConfig.cpp:797
 msgid "Triangles"
 msgstr "삼�형(Triangles)"
 
-#: src/libslic3r/PrintConfig.cpp:803
+#: src/libslic3r/PrintConfig.cpp:798
 msgid "Stars"
 msgstr "별(Stars)"
 
-#: src/libslic3r/PrintConfig.cpp:804
+#: src/libslic3r/PrintConfig.cpp:799
 msgid "Cubic"
 msgstr "�빅"
 
-#: src/libslic3r/PrintConfig.cpp:805
+#: src/libslic3r/PrintConfig.cpp:800
 msgid "Line"
 msgstr "ì„ (Line)"
 
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
+#: src/libslic3r/PrintConfig.cpp:802 src/libslic3r/PrintConfig.cpp:1923
 msgid "Honeycomb"
 msgstr "벌집"
 
-#: src/libslic3r/PrintConfig.cpp:808
+#: src/libslic3r/PrintConfig.cpp:803
 msgid "3D Honeycomb"
 msgstr "3D 벌집"
 
-#: src/libslic3r/PrintConfig.cpp:809
+#: src/libslic3r/PrintConfig.cpp:804
 msgid "Gyroid"
 msgstr "��로�드(Gyroid)"
 
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
+#: src/libslic3r/PrintConfig.cpp:811 src/libslic3r/PrintConfig.cpp:820
+#: src/libslic3r/PrintConfig.cpp:828 src/libslic3r/PrintConfig.cpp:861
 msgid "First layer"
 msgstr "첫 레�어"
 
-#: src/libslic3r/PrintConfig.cpp:817
+#: src/libslic3r/PrintConfig.cpp:812
 msgid ""
 "This is the acceleration your printer will use for first layer. Set zero to "
 "disable acceleration control for first layer."
@@ -4824,7 +5521,7 @@ msgstr ""
 "�것� 프린터가 첫 번째 레�어� 사용할 가��입니다. 0� 설정하면 첫 번째 레"
 "�어� 대한 가� 제어가 사용�지 않습니다."
 
-#: src/libslic3r/PrintConfig.cpp:827
+#: src/libslic3r/PrintConfig.cpp:821
 msgid ""
 "Heated build plate temperature for the first layer. Set this to zero to "
 "disable bed temperature control commands in the output."
@@ -4832,7 +5529,7 @@ msgstr ""
 "첫 번째 레�어� 대한 빌드 플레�트 온�를 가열. � 값� 0으로 설정하면 출력"
 "�서 ​​베드 온� 제어 명령� 비활성화합니다."
 
-#: src/libslic3r/PrintConfig.cpp:837
+#: src/libslic3r/PrintConfig.cpp:830
 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 "
@@ -4844,11 +5541,11 @@ msgstr ""
 "수 있습니다. 백분율 (예 : 120 %)로 표현하면 첫 번째 레�어 높�를 기준으로 계"
 "산�니다. 0으로 설정하면 기본 압출 �� 사용�니다."
 
-#: src/libslic3r/PrintConfig.cpp:848
+#: src/libslic3r/PrintConfig.cpp:840
 msgid "First layer height"
 msgstr "첫 레�어 높�"
 
-#: src/libslic3r/PrintConfig.cpp:850
+#: src/libslic3r/PrintConfig.cpp:842
 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 "
@@ -4860,16 +5557,16 @@ msgstr ""
 "다. �것� 절대값 �는 기본 계층 높�� 대한 백분율(예: 150%)로 표시할 수 있"
 "다."
 
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
+#: src/libslic3r/PrintConfig.cpp:846 src/libslic3r/PrintConfig.cpp:991
+#: src/libslic3r/PrintConfig.cpp:1796
 msgid "mm or %"
 msgstr "mm/s �는 %"
 
-#: src/libslic3r/PrintConfig.cpp:860
+#: src/libslic3r/PrintConfig.cpp:851
 msgid "First layer speed"
 msgstr "첫 레�어 ��"
 
-#: src/libslic3r/PrintConfig.cpp:861
+#: src/libslic3r/PrintConfig.cpp:852
 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 "
@@ -4879,7 +5576,7 @@ msgstr ""
 "�쇄 ��� �용�다. 백분율(예: 40%)로 표현�는 경우 기본 ��를 스케��한"
 "다."
 
-#: src/libslic3r/PrintConfig.cpp:872
+#: src/libslic3r/PrintConfig.cpp:862
 msgid ""
 "Extruder temperature for first layer. If you want to control temperature "
 "manually during print, set this to zero to disable temperature control "
@@ -4888,7 +5585,7 @@ msgstr ""
 "첫 번째 층� 외부 온�. �쇄 중� 온�를 수�으로 제어하려면 출력 파��서 온"
 "� 제어 명령� 사용하지 않으려면 � 값� 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:882
+#: src/libslic3r/PrintConfig.cpp:871
 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 "
@@ -4898,11 +5595,11 @@ msgstr ""
 "기 위해 �것� 합리�으로 낮게 유지한다. 간격 채우기를 사용하지 않으려면 0� "
 "설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:890
+#: src/libslic3r/PrintConfig.cpp:879
 msgid "Verbose G-code"
 msgstr "세부 G-코드"
 
-#: src/libslic3r/PrintConfig.cpp:891
+#: src/libslic3r/PrintConfig.cpp:880
 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 "
@@ -4912,11 +5609,11 @@ msgstr ""
 "� 선�하십시오. 만� 당신� SD카드로 �쇄한다면, 파�� 추가 무게로 �해 펌"
 "웨어� ��가 �려질 수 있다."
 
-#: src/libslic3r/PrintConfig.cpp:899
+#: src/libslic3r/PrintConfig.cpp:887
 msgid "G-code flavor"
 msgstr "G-code 형�"
 
-#: src/libslic3r/PrintConfig.cpp:900
+#: src/libslic3r/PrintConfig.cpp:888
 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 "
@@ -4927,22 +5624,22 @@ msgstr ""
 "얻으려면 � 옵션� 프린터� 펌웨어로 설정하십시오. \"압출 없�\" 형�� "
 "Slic3r가 어떠한 압출 값� 출력하지 못하게 한다."
 
-#: src/libslic3r/PrintConfig.cpp:924
+#: src/libslic3r/PrintConfig.cpp:911
 msgid "No extrusion"
 msgstr "압출 없�"
 
-#: src/libslic3r/PrintConfig.cpp:929
+#: src/libslic3r/PrintConfig.cpp:924
 msgid "High extruder current on filament swap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:930
+#: src/libslic3r/PrintConfig.cpp:925
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:939
+#: src/libslic3r/PrintConfig.cpp:933
 msgid ""
 "This is the acceleration your printer will use for infill. Set zero to "
 "disable acceleration control for infill."
@@ -4950,11 +5647,11 @@ msgstr ""
 "�것� 당신 프린터� 채움 가�력�다. 주입� 대한 가� 제어를 비활성화하려면 "
 "0� 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:948
+#: src/libslic3r/PrintConfig.cpp:941
 msgid "Combine infill every"
 msgstr "다� 시간마다 결합"
 
-#: src/libslic3r/PrintConfig.cpp:950
+#: src/libslic3r/PrintConfig.cpp:943
 msgid ""
 "This feature allows to combine infill and speed up your print by extruding "
 "thicker infill layers while preserving thin perimeters, thus accuracy."
@@ -4962,19 +5659,19 @@ msgstr ""
 "� 기능� �필� 결합하고 얇� 주변기기를 보존하면서 �꺼운 �필 층� 압출하"
 "여 �쇄 ��를 높� 수 있�� 하여 정확�를 높�다."
 
-#: src/libslic3r/PrintConfig.cpp:954
+#: src/libslic3r/PrintConfig.cpp:946
 msgid "Combine infill every n layers"
 msgstr "모든 n개 층� 채우기 위해 결합"
 
-#: src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:952
 msgid "Infill extruder"
 msgstr "채움(Infill) �스트루�"
 
-#: src/libslic3r/PrintConfig.cpp:962
+#: src/libslic3r/PrintConfig.cpp:954
 msgid "The extruder to use when printing infill."
 msgstr "채움으로 사용할 �스트루�."
 
-#: src/libslic3r/PrintConfig.cpp:971
+#: src/libslic3r/PrintConfig.cpp:962
 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 "
@@ -4988,21 +5685,21 @@ msgstr ""
 "� 사용하는 것� 좋습니다. 백분율 (예 : 90 %)로 표현하면 레�어 높�를 기준으"
 "로 계산�니다."
 
-#: src/libslic3r/PrintConfig.cpp:981
+#: src/libslic3r/PrintConfig.cpp:971
 msgid "Infill before perimeters"
 msgstr "둘레보다 앞쪽� 채움"
 
-#: src/libslic3r/PrintConfig.cpp:982
+#: src/libslic3r/PrintConfig.cpp:972
 msgid ""
 "This option will switch the print order of perimeters and infill, making the "
 "latter first."
 msgstr "� 옵션� 외부출력과 채움 �쇄 순서를 바꾸어, 후�를 먼저 만든다."
 
-#: src/libslic3r/PrintConfig.cpp:988
+#: src/libslic3r/PrintConfig.cpp:977
 msgid "Only infill where needed"
 msgstr "필요한 경우 채�"
 
-#: src/libslic3r/PrintConfig.cpp:990
+#: src/libslic3r/PrintConfig.cpp:979
 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 "
@@ -5012,11 +5709,11 @@ msgstr ""
 "� 할 것�다). 활성화� 경우 관련� 여러 번� �검으로 �해 G-code �성 ��"
 "를 늦춰�."
 
-#: src/libslic3r/PrintConfig.cpp:998
+#: src/libslic3r/PrintConfig.cpp:986
 msgid "Infill/perimeters overlap"
 msgstr "채움/둘레 겹침(perimeters overlap)"
 
-#: src/libslic3r/PrintConfig.cpp:1000
+#: src/libslic3r/PrintConfig.cpp:988
 msgid ""
 "This setting applies an additional overlap between infill and perimeters for "
 "better bonding. Theoretically this shouldn't be needed, but backlash might "
@@ -5027,23 +5724,23 @@ msgstr ""
 "론�으로 �것� 필요하지 않아야하지만 백래시가 갭� 유발할 수 있습니다. 백분"
 "율 (예 : 15 %)로 표시�는 경우 경계 압출 �� 기준으로 계산�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1012
+#: src/libslic3r/PrintConfig.cpp:999
 msgid "Speed for printing the internal fill. Set to zero for auto."
 msgstr "내부 채우기 �쇄 ��. ��으로 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:1020
+#: src/libslic3r/PrintConfig.cpp:1007
 msgid "Inherits profile"
 msgstr "프로필 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1021
+#: src/libslic3r/PrintConfig.cpp:1008
 msgid "Name of the profile, from which this profile inherits."
 msgstr "� 프로파�� ���는 프로파�� �름."
 
-#: src/libslic3r/PrintConfig.cpp:1032
+#: src/libslic3r/PrintConfig.cpp:1021
 msgid "Interface shells"
 msgstr "�터페�스 셸(shells)"
 
-#: src/libslic3r/PrintConfig.cpp:1033
+#: src/libslic3r/PrintConfig.cpp:1022
 msgid ""
 "Force the generation of solid shells between adjacent materials/volumes. "
 "Useful for multi-extruder prints with translucent materials or manual "
@@ -5052,7 +5749,7 @@ msgstr ""
 "�접 재료/볼륨 사�� 고체 쉘 �성� 강제하십시오. 반투명 재료 �는 수� 수용"
 "성 서�트 재료를 사용한 다중 압ㅊ기 �쇄� 유용함."
 
-#: src/libslic3r/PrintConfig.cpp:1043
+#: src/libslic3r/PrintConfig.cpp:1031
 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 "
@@ -5064,11 +5761,11 @@ msgstr ""
 "[layer_num] � [layer_z]� �리 표시� 변수를 사용할 수 있다는 �� 유�하십"
 "시오."
 
-#: src/libslic3r/PrintConfig.cpp:1054
+#: src/libslic3r/PrintConfig.cpp:1042
 msgid "Supports remaining times"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1055
+#: src/libslic3r/PrintConfig.cpp:1043
 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. "
@@ -5076,63 +5773,63 @@ msgid ""
 "firmware supports M73 Qxx Sxx for the silent mode."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1063
+#: src/libslic3r/PrintConfig.cpp:1051
 msgid "Supports silent mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1064
+#: src/libslic3r/PrintConfig.cpp:1052
 msgid "Set silent mode for the G-code flavor"
 msgstr "G-코드 특징� 대한 무� 모드 설정"
 
-#: src/libslic3r/PrintConfig.cpp:1087
+#: src/libslic3r/PrintConfig.cpp:1075
 msgid "Maximum feedrate %1%"
 msgstr "최 대 공 급 � � %1%"
 
-#: src/libslic3r/PrintConfig.cpp:1089
+#: src/libslic3r/PrintConfig.cpp:1077
 msgid "Maximum feedrate of the %1% axis"
 msgstr "최대 공급 �� of the %1% axis"
 
-#: src/libslic3r/PrintConfig.cpp:1097
+#: src/libslic3r/PrintConfig.cpp:1085
 msgid "Maximum acceleration %1%"
 msgstr "최대가� %1%"
 
-#: src/libslic3r/PrintConfig.cpp:1099
+#: src/libslic3r/PrintConfig.cpp:1087
 msgid "Maximum acceleration of the %1% axis"
 msgstr "최대  가��는 %1% 축"
 
-#: src/libslic3r/PrintConfig.cpp:1107
+#: src/libslic3r/PrintConfig.cpp:1095
 msgid "Maximum jerk %1%"
 msgstr "최대 저�(jerk) %1%"
 
-#: src/libslic3r/PrintConfig.cpp:1109
+#: src/libslic3r/PrintConfig.cpp:1097
 msgid "Maximum jerk of the %1% axis"
 msgstr "최대 저�는(jerk) %1% axis"
 
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
+#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1110
 msgid "Minimum feedrate when extruding"
 msgstr "압출시 최소 공급 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
+#: src/libslic3r/PrintConfig.cpp:1119 src/libslic3r/PrintConfig.cpp:1121
 msgid "Minimum travel feedrate"
 msgstr "최소 �송 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
+#: src/libslic3r/PrintConfig.cpp:1130 src/libslic3r/PrintConfig.cpp:1132
 msgid "Maximum acceleration when extruding"
 msgstr "압출시 최대 가��"
 
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
+#: src/libslic3r/PrintConfig.cpp:1141 src/libslic3r/PrintConfig.cpp:1143
 msgid "Maximum acceleration when retracting"
 msgstr "리트렉션 최대 가��"
 
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
+#: src/libslic3r/PrintConfig.cpp:1151 src/libslic3r/PrintConfig.cpp:1160
 msgid "Max"
 msgstr "최대"
 
-#: src/libslic3r/PrintConfig.cpp:1164
+#: src/libslic3r/PrintConfig.cpp:1152
 msgid "This setting represents the maximum speed of your fan."
 msgstr "� 설정� 팬� 최대 ��를 나타냅니다."
 
-#: src/libslic3r/PrintConfig.cpp:1174
+#: src/libslic3r/PrintConfig.cpp:1161
 #, no-c-format
 msgid ""
 "This is the highest printable layer height for this extruder, used to cap "
@@ -5145,11 +5842,11 @@ msgstr ""
 "는 압출 �� 75 %입니다. 0으로 설정하면 층 높�가 노� 지름� 75 %로 제한�니"
 "다."
 
-#: src/libslic3r/PrintConfig.cpp:1185
+#: src/libslic3r/PrintConfig.cpp:1171
 msgid "Max print speed"
 msgstr "최대 프린트 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1186
+#: src/libslic3r/PrintConfig.cpp:1172
 msgid ""
 "When setting other speed settings to 0 Slic3r will autocalculate the optimal "
 "speed in order to keep constant extruder pressure. This experimental setting "
@@ -5159,18 +5856,18 @@ msgstr ""
 "� ��를 �� 계산한다. � 실험 설정� 허용할 최대 �쇄 ��를 설정하는 � "
 "사용�다."
 
-#: src/libslic3r/PrintConfig.cpp:1197
+#: src/libslic3r/PrintConfig.cpp:1182
 msgid ""
 "This experimental setting is used to set the maximum volumetric speed your "
 "extruder supports."
 msgstr ""
 "� 실험 설정� 압출기가 지�하는 최대 체� ��를 설정하기 위해 사용�다."
 
-#: src/libslic3r/PrintConfig.cpp:1206
+#: src/libslic3r/PrintConfig.cpp:1191
 msgid "Max volumetric slope positive"
 msgstr "최대 체� 기울기 양"
 
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
+#: src/libslic3r/PrintConfig.cpp:1192 src/libslic3r/PrintConfig.cpp:1203
 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 "
@@ -5181,23 +5878,23 @@ msgstr ""
 "1.8mm3/s(0.45mm 압출 �, 0.2mm 압출 높�, 공급 �� 20mm/s)�서 5.4mm3/s(공"
 "급 �� 60mm/s)로 변경하는 � 최소 2초 �� 걸린다."
 
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
+#: src/libslic3r/PrintConfig.cpp:1196 src/libslic3r/PrintConfig.cpp:1207
 msgid "mm³/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1218
+#: src/libslic3r/PrintConfig.cpp:1202
 msgid "Max volumetric slope negative"
 msgstr "최대 체� 기울기 �수"
 
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
+#: src/libslic3r/PrintConfig.cpp:1214 src/libslic3r/PrintConfig.cpp:1223
 msgid "Min"
 msgstr "최소"
 
-#: src/libslic3r/PrintConfig.cpp:1231
+#: src/libslic3r/PrintConfig.cpp:1215
 msgid "This setting represents the minimum PWM your fan needs to work."
 msgstr "� 설정� 최소 PWM팬� 활�하는� 필요한를 나타냅니다."
 
-#: src/libslic3r/PrintConfig.cpp:1241
+#: src/libslic3r/PrintConfig.cpp:1224
 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 "
@@ -5206,19 +5903,19 @@ msgstr ""
 "�것� � 압출기� 대한 가장 낮� �쇄 가능한 층 높��고 가변 층 높�� 대"
 "한 분해능� 제한한다. 대표�� 값� 0.05mm와 0.1mm�다."
 
-#: src/libslic3r/PrintConfig.cpp:1250
+#: src/libslic3r/PrintConfig.cpp:1232
 msgid "Min print speed"
 msgstr "최소 �쇄 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1251
+#: src/libslic3r/PrintConfig.cpp:1233
 msgid "Slic3r will not scale speed down below this speed."
 msgstr "Slic3r는 � �� �하로 ��를 낮추지 않� 것�다."
 
-#: src/libslic3r/PrintConfig.cpp:1259
+#: src/libslic3r/PrintConfig.cpp:1240
 msgid "Minimal filament extrusion length"
 msgstr "최소 필�멘트 압출 길�"
 
-#: src/libslic3r/PrintConfig.cpp:1260
+#: src/libslic3r/PrintConfig.cpp:1241
 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 "
@@ -5227,11 +5924,11 @@ msgstr ""
 "하단 레�어�서 지정� 양� 필�멘트를 사용하는 � 필요한 스커트 루프� 수 �"
 "�으로 �성한다. 멀티 �스트루�� 경우, � 최소값� � 추가기기� �용�다."
 
-#: src/libslic3r/PrintConfig.cpp:1270
+#: src/libslic3r/PrintConfig.cpp:1250
 msgid "Configuration notes"
 msgstr "구성 노트"
 
-#: src/libslic3r/PrintConfig.cpp:1271
+#: src/libslic3r/PrintConfig.cpp:1251
 msgid ""
 "You can put here your personal notes. This text will be added to the G-code "
 "header comments."
@@ -5239,50 +5936,30 @@ msgstr ""
 "여기� 개� 노트를 넣� 수 있다. � �스트는 G-code 헤� 코멘트� 추가� 것�"
 "다."
 
-#: src/libslic3r/PrintConfig.cpp:1281
+#: src/libslic3r/PrintConfig.cpp:1260
 msgid "Nozzle diameter"
 msgstr "노� �경"
 
-#: src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1261
 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:1288
+#: src/libslic3r/PrintConfig.cpp:1266
 msgid "Host Type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1289
+#: src/libslic3r/PrintConfig.cpp:1267
 msgid ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr "호스트 �름(Hostname), IP or URL"
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
+#: src/libslic3r/PrintConfig.cpp:1278
 msgid "Only retract when crossing perimeters"
 msgstr "둘레를 횡단 할 때만 수축"
 
-#: src/libslic3r/PrintConfig.cpp:1326
+#: src/libslic3r/PrintConfig.cpp:1279
 msgid ""
 "Disables retraction when the travel path does not exceed the upper layer's "
 "perimeters (and thus any ooze will be probably invisible)."
@@ -5290,7 +5967,7 @@ msgstr ""
 "�� 경로가 �위 레�어� 경계를 초과하지 않는 경우 리트랙션� 비활성화합니"
 "다. 따�서 모든 오즈가 보�지 않습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1334
+#: src/libslic3r/PrintConfig.cpp:1286
 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 "
@@ -5300,11 +5977,11 @@ msgstr ""
 "변경할 때 키가 � 스커트를 ��으로 사용하고 스커트 외부로 압출기를 ��합니"
 "다."
 
-#: src/libslic3r/PrintConfig.cpp:1342
+#: src/libslic3r/PrintConfig.cpp:1293
 msgid "Output filename format"
 msgstr "출력 파��름  형�"
 
-#: src/libslic3r/PrintConfig.cpp:1343
+#: src/libslic3r/PrintConfig.cpp:1294
 msgid ""
 "You can use all configuration options as variables inside this template. For "
 "example: [layer_height], [fill_density] etc. You can also use [timestamp], "
@@ -5312,11 +5989,11 @@ msgid ""
 "[input_filename], [input_filename_base]."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1303
 msgid "Detect bridging perimeters"
 msgstr "브릿 징 경계선 �지"
 
-#: src/libslic3r/PrintConfig.cpp:1355
+#: src/libslic3r/PrintConfig.cpp:1305
 msgid ""
 "Experimental option to adjust flow for overhangs (bridge flow will be used), "
 "to apply bridge speed to them and enable fan."
@@ -5324,11 +6001,11 @@ msgstr ""
 "오버행� 대한 유량� 조정하는 실험 옵션 (브리지 �름(flow)� 사용�)� 브릿"
 "지 ��를 �용하고 팬� 활성화합니다."
 
-#: src/libslic3r/PrintConfig.cpp:1362
+#: src/libslic3r/PrintConfig.cpp:1311
 msgid "Filament parking position"
 msgstr "필�멘트 멈춤 위치"
 
-#: src/libslic3r/PrintConfig.cpp:1363
+#: src/libslic3r/PrintConfig.cpp:1312
 msgid ""
 "Distance of the extruder tip from the position where the filament is parked "
 "when unloaded. This should match the value in printer firmware. "
@@ -5336,11 +6013,11 @@ msgstr ""
 "언 로딩시 필�멘트 위치�서 압출기 �� 거리. � 값� 프린터 펌웨어� 값과 �"
 "치해야합니다. "
 
-#: src/libslic3r/PrintConfig.cpp:1372
+#: src/libslic3r/PrintConfig.cpp:1320
 msgid "Extra loading distance"
 msgstr "추가 로딩 거리"
 
-#: src/libslic3r/PrintConfig.cpp:1373
+#: src/libslic3r/PrintConfig.cpp:1321
 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 "
@@ -5351,12 +6028,12 @@ msgstr ""
 "�� 한 거리와 ��합니다. 양수�면 �수가 � 많� 로드�고 로드가 �수 � 경"
 "우 언로드보다 짧습니다. "
 
-#: src/libslic3r/PrintConfig.cpp:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
+#: src/libslic3r/PrintConfig.cpp:1329 src/libslic3r/PrintConfig.cpp:1347
+#: src/libslic3r/PrintConfig.cpp:1359 src/libslic3r/PrintConfig.cpp:1369
 msgid "Perimeters"
 msgstr "둘레"
 
-#: src/libslic3r/PrintConfig.cpp:1383
+#: src/libslic3r/PrintConfig.cpp:1330
 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 "
@@ -5366,17 +6043,17 @@ msgstr ""
 "작�하면 좋� 결과를 제공합니다. 주변� 가� 제어하지 않으려면 0으로 설정하십"
 "시오."
 
-#: src/libslic3r/PrintConfig.cpp:1392
+#: src/libslic3r/PrintConfig.cpp:1338
 msgid "Perimeter extruder"
 msgstr "주변 �스트루�"
 
-#: src/libslic3r/PrintConfig.cpp:1394
+#: src/libslic3r/PrintConfig.cpp:1340
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
 msgstr ""
 "둘레와 가장�리를 �쇄 할 때 사용할 압출기입니다. 첫 번째 압출기는 1입니다."
 
-#: src/libslic3r/PrintConfig.cpp:1404
+#: src/libslic3r/PrintConfig.cpp:1349
 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 "
@@ -5390,12 +6067,12 @@ msgstr ""
 "�경� 사용�니다. 백분율 (예 : 200 %)로 표현하면 레�어 높�를 기준으로 계산"
 "�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1417
+#: src/libslic3r/PrintConfig.cpp:1361
 msgid ""
 "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
 msgstr "둘레� �� (등고선, �명 세로 셸). ��으로 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:1427
+#: src/libslic3r/PrintConfig.cpp:1371
 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 "
@@ -5406,11 +6083,11 @@ msgstr ""
 "사용하면 � � 주변 수를 사용하는 경사면� �지 할 때 Slic3r�� 수를 ��으"
 "로 �가시킬 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1431
+#: src/libslic3r/PrintConfig.cpp:1375
 msgid "(minimum)"
 msgstr "(최소)"
 
-#: src/libslic3r/PrintConfig.cpp:1439
+#: src/libslic3r/PrintConfig.cpp:1383
 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. "
@@ -5423,35 +6100,35 @@ msgstr ""
 "파�� 절대 경로를 첫 번째 �수로 전달�며 환경 변수를 ��으로� Slic3r 구"
 "성 설정� 액세스 할 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1452
+#: src/libslic3r/PrintConfig.cpp:1395
 msgid "Printer type"
 msgstr "프린터 타입"
 
-#: src/libslic3r/PrintConfig.cpp:1453
+#: src/libslic3r/PrintConfig.cpp:1396
 msgid "Type of the printer."
 msgstr "프린터 유형."
 
-#: src/libslic3r/PrintConfig.cpp:1457
+#: src/libslic3r/PrintConfig.cpp:1401
 msgid "Printer notes"
 msgstr "프린터 노트"
 
-#: src/libslic3r/PrintConfig.cpp:1458
+#: src/libslic3r/PrintConfig.cpp:1402
 msgid "You can put your notes regarding the printer here."
 msgstr "프린터 관련 메모를 여기� 넣� 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1467
+#: src/libslic3r/PrintConfig.cpp:1410
 msgid "Printer vendor"
 msgstr "제조 회사"
 
-#: src/libslic3r/PrintConfig.cpp:1468
+#: src/libslic3r/PrintConfig.cpp:1411
 msgid "Name of the printer vendor."
 msgstr "프린터 공급 업체� �름입니다."
 
-#: src/libslic3r/PrintConfig.cpp:1472
+#: src/libslic3r/PrintConfig.cpp:1416
 msgid "Printer variant"
 msgstr "프린터 변형"
 
-#: src/libslic3r/PrintConfig.cpp:1473
+#: src/libslic3r/PrintConfig.cpp:1417
 msgid ""
 "Name of the printer variant. For example, the printer variants may be "
 "differentiated by a nozzle diameter."
@@ -5459,22 +6136,22 @@ msgstr ""
 "프린터 변종 �름입니다. 예를 들어, 프린터 변형� 노� 지름으로 구별 � 수 있"
 "습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1483
+#: src/libslic3r/PrintConfig.cpp:1430
 msgid "Raft layers"
 msgstr "�프트(Raft) 레�어"
 
-#: src/libslic3r/PrintConfig.cpp:1485
+#: src/libslic3r/PrintConfig.cpp:1432
 msgid ""
 "The object will be raised by this number of layers, and support material "
 "will be generated under it."
 msgstr ""
 "물체는 � 개수� 층� �해 �승�며, 그 아래�서 서�트 재료가 �성� 것�다."
 
-#: src/libslic3r/PrintConfig.cpp:1494
+#: src/libslic3r/PrintConfig.cpp:1440
 msgid "Resolution"
 msgstr "í•´ê²°"
 
-#: src/libslic3r/PrintConfig.cpp:1495
+#: src/libslic3r/PrintConfig.cpp:1441
 msgid ""
 "Minimum detail resolution, used to simplify the input file for speeding up "
 "the slicing job and reducing memory usage. High-resolution models often "
@@ -5486,20 +6163,20 @@ msgstr ""
 "있는 것보다 � 많� 디테�� 가지고 있다. 단순화를 사용하지 않고 입력�서 전"
 "체 해��를 사용하려면 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:1506
+#: src/libslic3r/PrintConfig.cpp:1451
 msgid "Minimum travel after retraction"
 msgstr "리트랙션 후 최소 �� 거리"
 
-#: src/libslic3r/PrintConfig.cpp:1507
+#: src/libslic3r/PrintConfig.cpp:1452
 msgid ""
 "Retraction is not triggered when travel moves are shorter than this length."
 msgstr "�� 거리가 � 길�보다 짧으면 리트렉션� 트리거�지 않습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1514
+#: src/libslic3r/PrintConfig.cpp:1458
 msgid "Retract amount before wipe"
 msgstr "닦아 내기 전� 수축량"
 
-#: src/libslic3r/PrintConfig.cpp:1515
+#: src/libslic3r/PrintConfig.cpp:1459
 msgid ""
 "With bowden extruders, it may be wise to do some amount of quick retract "
 "before doing the wipe movement."
@@ -5507,23 +6184,23 @@ msgstr ""
 "보우 � 압출기를 사용하면 와�� �작�하기 전� 약간� 빠른 리트랙션 를하는 "
 "것� 좋습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1523
+#: src/libslic3r/PrintConfig.cpp:1466
 msgid "Retract on layer change"
 msgstr "레�어 변경 후퇴"
 
-#: src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1467
 msgid "This flag enforces a retraction whenever a Z move is done."
 msgstr "� 플래그는 Z ��� 완료 � 때마다 취소를 강제 실행합니다."
 
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
+#: src/libslic3r/PrintConfig.cpp:1472 src/libslic3r/PrintConfig.cpp:1480
 msgid "Length"
 msgstr "길�"
 
-#: src/libslic3r/PrintConfig.cpp:1531
+#: src/libslic3r/PrintConfig.cpp:1473
 msgid "Retraction Length"
 msgstr "리트랙션 길�"
 
-#: src/libslic3r/PrintConfig.cpp:1532
+#: src/libslic3r/PrintConfig.cpp:1474
 msgid ""
 "When retraction is triggered, filament is pulled back by the specified "
 "amount (the length is measured on raw filament, before it enters the "
@@ -5532,15 +6209,15 @@ msgstr ""
 "후퇴가 트리거�면 필�멘트가 지정� 양만� 뒤로 당겨집니다 (길�는 압출기� "
 "들어가기 전� �시 필�멘트�서 측정�니다)."
 
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
+#: src/libslic3r/PrintConfig.cpp:1476 src/libslic3r/PrintConfig.cpp:1485
 msgid "mm (zero to disable)"
 msgstr "mm (0� 비활성화)"
 
-#: src/libslic3r/PrintConfig.cpp:1540
+#: src/libslic3r/PrintConfig.cpp:1481
 msgid "Retraction Length (Toolchange)"
 msgstr "리트랙션 길� (툴 체�지)"
 
-#: src/libslic3r/PrintConfig.cpp:1541
+#: src/libslic3r/PrintConfig.cpp:1482
 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 "
@@ -5549,11 +6226,11 @@ msgstr ""
 "공구를 �체하기 전� 후퇴가 트리거�면 필�멘트가 지정� 양만� 뒤로 당겨집니"
 "다 (길�는 압출기� 들어가기 전� �시 필�멘트�서 측정�니다)."
 
-#: src/libslic3r/PrintConfig.cpp:1550
+#: src/libslic3r/PrintConfig.cpp:1490
 msgid "Lift Z"
 msgstr "Z축 올림"
 
-#: src/libslic3r/PrintConfig.cpp:1551
+#: src/libslic3r/PrintConfig.cpp:1491
 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 "
@@ -5562,15 +6239,15 @@ msgstr ""
 "� 값� 양수 값으로 설정하면 철회가 트리거 � 때마다 Z가 빠르게 올�갑니다. "
 "여러 개� 압출기를 사용하는 경우 첫 번째 압출기� 설정 만 고려�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1559
+#: src/libslic3r/PrintConfig.cpp:1498
 msgid "Above Z"
 msgstr "Z 위"
 
-#: src/libslic3r/PrintConfig.cpp:1560
+#: src/libslic3r/PrintConfig.cpp:1499
 msgid "Only lift Z above"
 msgstr "오� Z축 위로만"
 
-#: src/libslic3r/PrintConfig.cpp:1561
+#: src/libslic3r/PrintConfig.cpp:1500
 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 "
@@ -5579,15 +6256,15 @@ msgstr ""
 "�것� 양� 값으로 설정하면, Z 리프트는 지정� 절대 Z 위로만 발�한다. 첫 번"
 "째 층�서 리프트를 건너뛸 수 있�� � 설정� 조정할 수 있다."
 
-#: src/libslic3r/PrintConfig.cpp:1569
+#: src/libslic3r/PrintConfig.cpp:1507
 msgid "Below Z"
 msgstr "Z 아래"
 
-#: src/libslic3r/PrintConfig.cpp:1570
+#: src/libslic3r/PrintConfig.cpp:1508
 msgid "Only lift Z below"
 msgstr "Z값 아래만"
 
-#: src/libslic3r/PrintConfig.cpp:1571
+#: src/libslic3r/PrintConfig.cpp:1509
 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 "
@@ -5596,11 +6273,11 @@ msgstr ""
 "�것� 양수 값으로 설정하면 Z 리프트가 지정� 절대 Z 아래�서만 발�합니다. "
 "첫 번째 레�어로 리프트를 제한하기 위해� 설정� 조정할 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
+#: src/libslic3r/PrintConfig.cpp:1517 src/libslic3r/PrintConfig.cpp:1525
 msgid "Extra length on restart"
 msgstr "재시작시 여분� 길�"
 
-#: src/libslic3r/PrintConfig.cpp:1581
+#: src/libslic3r/PrintConfig.cpp:1518
 msgid ""
 "When the retraction is compensated after the travel move, the extruder will "
 "push this additional amount of filament. This setting is rarely needed."
@@ -5608,7 +6285,7 @@ msgstr ""
 "�� 후 리트렉셔� 보정�면 �스트루�가 추가 양� 필�멘트를 밀어냅니다. � "
 "설정� 거� 필요하지 않습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1590
+#: src/libslic3r/PrintConfig.cpp:1526
 msgid ""
 "When the retraction is compensated after changing tool, the extruder will "
 "push this additional amount of filament."
@@ -5616,19 +6293,19 @@ msgstr ""
 "�구를 �환 한 후 리트렉션를 보정하면 �스트루�가 추가 양� 필�멘트를 밀게"
 "�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
+#: src/libslic3r/PrintConfig.cpp:1533 src/libslic3r/PrintConfig.cpp:1534
 msgid "Retraction Speed"
 msgstr "리트랙션 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1600
+#: src/libslic3r/PrintConfig.cpp:1535
 msgid "The speed for retractions (it only applies to the extruder motor)."
 msgstr "리트랙션 �� (�스트루� 모터�만 �용�)."
 
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
+#: src/libslic3r/PrintConfig.cpp:1541 src/libslic3r/PrintConfig.cpp:1542
 msgid "Deretraction Speed"
 msgstr "�� ��"
 
-#: src/libslic3r/PrintConfig.cpp:1609
+#: src/libslic3r/PrintConfig.cpp:1543
 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 "
@@ -5637,71 +6314,67 @@ msgstr ""
 "리트랙션 후 압출기� 필�멘트를 로드하는 �� (압출기 모터�만 �용�). 0으"
 "로 방치하면 리트랙션 ��가 사용�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1617
+#: src/libslic3r/PrintConfig.cpp:1550
 msgid "Seam position"
 msgstr "재봉선 위치"
 
-#: src/libslic3r/PrintConfig.cpp:1619
+#: src/libslic3r/PrintConfig.cpp:1552
 msgid "Position of perimeters starting points."
 msgstr "둘레� 시작�� 위치."
 
-#: src/libslic3r/PrintConfig.cpp:1626
+#: src/libslic3r/PrintConfig.cpp:1558
 msgid "Random"
 msgstr "무작위"
 
-#: src/libslic3r/PrintConfig.cpp:1627
+#: src/libslic3r/PrintConfig.cpp:1559
 msgid "Nearest"
 msgstr "가장 가까운"
 
-#: src/libslic3r/PrintConfig.cpp:1628
+#: src/libslic3r/PrintConfig.cpp:1560
 msgid "Aligned"
 msgstr "ì •ë ¬"
 
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1636
+#: src/libslic3r/PrintConfig.cpp:1568
 msgid "Direction"
 msgstr "ë°©í–¥"
 
-#: src/libslic3r/PrintConfig.cpp:1638
+#: src/libslic3r/PrintConfig.cpp:1570
 msgid "Preferred direction of the seam"
 msgstr "선호하는 심(seam)� 방향"
 
-#: src/libslic3r/PrintConfig.cpp:1639
+#: src/libslic3r/PrintConfig.cpp:1571
 msgid "Seam preferred direction"
 msgstr "심(Seam) 선호 방향"
 
-#: src/libslic3r/PrintConfig.cpp:1647
+#: src/libslic3r/PrintConfig.cpp:1578
 msgid "Jitter"
 msgstr "지터(Jitter)"
 
-#: src/libslic3r/PrintConfig.cpp:1649
+#: src/libslic3r/PrintConfig.cpp:1580
 msgid "Seam preferred direction jitter"
 msgstr "(Seam) 선호 방향 지터(Jitter)"
 
-#: src/libslic3r/PrintConfig.cpp:1650
+#: src/libslic3r/PrintConfig.cpp:1581
 msgid "Preferred direction of the seam - jitter"
 msgstr "재봉선 지터� 선호 방향"
 
-#: src/libslic3r/PrintConfig.cpp:1661
+#: src/libslic3r/PrintConfig.cpp:1591
 msgid "USB/serial port for printer connection."
 msgstr "프린터 연결� 위한 USB/시리얼 �트."
 
-#: src/libslic3r/PrintConfig.cpp:1669
+#: src/libslic3r/PrintConfig.cpp:1598
 msgid "Serial port speed"
 msgstr "시리얼 �트 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1670
+#: src/libslic3r/PrintConfig.cpp:1599
 msgid "Speed (baud) of USB/serial port for printer connection."
 msgstr "프린터 연결� 위한 USB/시리얼 �트� ��(보드)"
 
-#: src/libslic3r/PrintConfig.cpp:1679
+#: src/libslic3r/PrintConfig.cpp:1608
 msgid "Distance from object"
 msgstr "�체로부터� 거리"
 
-#: src/libslic3r/PrintConfig.cpp:1680
+#: src/libslic3r/PrintConfig.cpp:1609
 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."
@@ -5709,11 +6382,11 @@ msgstr ""
 "스커트와 �체 사�� 거리. 스커트를 �체� 부착하고 접착력� 높�기 위해 �"
 "를 0으로 설정한다."
 
-#: src/libslic3r/PrintConfig.cpp:1688
+#: src/libslic3r/PrintConfig.cpp:1616
 msgid "Skirt height"
 msgstr "스커트(Skirt) 높�"
 
-#: src/libslic3r/PrintConfig.cpp:1689
+#: src/libslic3r/PrintConfig.cpp:1617
 msgid ""
 "Height of skirt expressed in layers. Set this to a tall value to use skirt "
 "as a shield against drafts."
@@ -5721,15 +6394,15 @@ msgstr ""
 "스커트� 높� 레�어로 표현�다. �를 높� 값으로 설정하여 스커트를 드래프트"
 "� 대한 쉴ㄷ로 활용하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:1697
+#: src/libslic3r/PrintConfig.cpp:1624
 msgid "Loops (minimum)"
 msgstr "루프 (최소)"
 
-#: src/libslic3r/PrintConfig.cpp:1698
+#: src/libslic3r/PrintConfig.cpp:1625
 msgid "Skirt Loops"
 msgstr "스커트 루프"
 
-#: src/libslic3r/PrintConfig.cpp:1699
+#: src/libslic3r/PrintConfig.cpp:1626
 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 "
@@ -5738,11 +6411,11 @@ msgstr ""
 "스커트� 루프 수입니다. 최소 압출 길� 옵션� 설정한 경우 여기� 구성� 루프 "
 "수보다 � 수 있다. 스커트를 완전히 비활성화하려면 � 값� 0으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:1708
+#: src/libslic3r/PrintConfig.cpp:1634
 msgid "Slow down if layer print time is below"
 msgstr "레�어 �쇄 시간� 다�과 같� 경우 ��를 낮추십시오"
 
-#: src/libslic3r/PrintConfig.cpp:1709
+#: src/libslic3r/PrintConfig.cpp:1635
 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."
@@ -5750,11 +6423,11 @@ msgstr ""
 "층 �쇄 시간� � 시간보다 낮게 추정� 경우, �쇄 �� ��는 � 값으로 지�"
 "��� 축소�다."
 
-#: src/libslic3r/PrintConfig.cpp:1720
+#: src/libslic3r/PrintConfig.cpp:1645
 msgid "Small perimeters"
 msgstr "작� 둘레"
 
-#: src/libslic3r/PrintConfig.cpp:1722
+#: src/libslic3r/PrintConfig.cpp:1647
 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 "
@@ -5764,34 +6437,34 @@ msgstr ""
 "분율로 표시�는 경우 (예 : 80 %) 위� �� 설정�서 계산�니다. ��으로 0으"
 "로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:1732
+#: src/libslic3r/PrintConfig.cpp:1657
 msgid "Solid infill threshold area"
 msgstr "솔리드 채우기 임계값 �역"
 
-#: src/libslic3r/PrintConfig.cpp:1734
+#: src/libslic3r/PrintConfig.cpp:1659
 msgid ""
 "Force solid infill for regions having a smaller area than the specified "
 "threshold."
 msgstr ""
 "지정� 한계값보다 작� �역� 가진 �역� 대해 솔리드 �필� 강제 �용."
 
-#: src/libslic3r/PrintConfig.cpp:1735
+#: src/libslic3r/PrintConfig.cpp:1660
 msgid "mm²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1742
+#: src/libslic3r/PrintConfig.cpp:1666
 msgid "Solid infill extruder"
 msgstr "솔리드 �필 �스트루�"
 
-#: src/libslic3r/PrintConfig.cpp:1744
+#: src/libslic3r/PrintConfig.cpp:1668
 msgid "The extruder to use when printing solid infill."
 msgstr "꽉찬 면� �쇄할 때 사용하는 �스트루�."
 
-#: src/libslic3r/PrintConfig.cpp:1751
+#: src/libslic3r/PrintConfig.cpp:1674
 msgid "Solid infill every"
 msgstr "솔리드 �필 간격"
 
-#: src/libslic3r/PrintConfig.cpp:1753
+#: src/libslic3r/PrintConfig.cpp:1676
 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 "
@@ -5802,7 +6475,7 @@ msgstr ""
 "수 없�. 당신� �것� 어떤 값으로� 설정할 수 있다(예: 9999). Slic3r는 노� "
 "�경과 층 높�� 따� 결합할 최대 가능한 층 수를 ��으로 선�한다."
 
-#: src/libslic3r/PrintConfig.cpp:1766
+#: src/libslic3r/PrintConfig.cpp:1688
 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, "
@@ -5813,7 +6486,7 @@ msgstr ""
 "하십시오. 0� 경우 기본 압출 너비가 사용�며, 그렇지 않으면 1.125 x 노� �경"
 "� 사용�다. 백분율(예: 90%)로 표현�는 경우, 계층 높�� 걸� 계산�다."
 
-#: src/libslic3r/PrintConfig.cpp:1777
+#: src/libslic3r/PrintConfig.cpp:1698
 msgid ""
 "Speed for printing solid regions (top/bottom/internal horizontal shells). "
 "This can be expressed as a percentage (for example: 80%) over the default "
@@ -5822,15 +6495,15 @@ msgstr ""
 "솔리드 �역(�단/하부/내부 수� 셸) �쇄 �� �는 위� 기본 주입 ��� 대"
 "한 백분율(예: 80%)로 표시할 수 있다. ��� 위해 0으로 설정한다."
 
-#: src/libslic3r/PrintConfig.cpp:1789
+#: src/libslic3r/PrintConfig.cpp:1710
 msgid "Number of solid layers to generate on top and bottom surfaces."
 msgstr "�단 � 하단 표면� �성할 솔리드 레�어 수입니다."
 
-#: src/libslic3r/PrintConfig.cpp:1796
+#: src/libslic3r/PrintConfig.cpp:1716
 msgid "Spiral vase"
 msgstr "스파�럴 바�스"
 
-#: src/libslic3r/PrintConfig.cpp:1797
+#: src/libslic3r/PrintConfig.cpp:1717
 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, "
@@ -5844,11 +6517,11 @@ msgstr ""
 "수� �관없� 설정할 수 있다. 그것� 물체보다 � 많� �쇄할 때는 작�하지 않"
 "� 것�다."
 
-#: src/libslic3r/PrintConfig.cpp:1806
+#: src/libslic3r/PrintConfig.cpp:1725
 msgid "Temperature variation"
 msgstr "온� 변화"
 
-#: src/libslic3r/PrintConfig.cpp:1807
+#: src/libslic3r/PrintConfig.cpp:1726
 msgid ""
 "Temperature difference to be applied when an extruder is not active. Enables "
 "a full-height \"sacrificial\" skirt on which the nozzles are periodically "
@@ -5857,7 +6530,7 @@ msgstr ""
 "�출부가 활성화�지 않� 경우 �용�는 온� 차�. 노�� 주기�으로 닦는 전"
 "체 높� \"�공\" 스커트가 가능하다."
 
-#: src/libslic3r/PrintConfig.cpp:1818
+#: src/libslic3r/PrintConfig.cpp:1736
 msgid ""
 "This start procedure is inserted at the beginning, after bed has reached the "
 "target temperature and extruder just started heating, and before extruder "
@@ -5874,7 +6547,7 @@ msgstr ""
 "든 Slic3r 설정� �리 표시 � 변수를 사용할 수 있으므로 �하는 위치� \"M109 "
 "S [first_layer_temperature]\"명령� 넣� 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:1834
+#: src/libslic3r/PrintConfig.cpp:1751
 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 "
@@ -5893,48 +6566,48 @@ msgstr ""
 "[first_layer_temperature]\"명령� 넣� 수 있습니다. 여러 개� 압출기가있는 경"
 "우 gcode가 압출기 순서로 처리�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1850
+#: src/libslic3r/PrintConfig.cpp:1766
 msgid "Single Extruder Multi Material"
 msgstr "싱글 �스트루� 멀티메터리얼"
 
-#: src/libslic3r/PrintConfig.cpp:1851
+#: src/libslic3r/PrintConfig.cpp:1767
 msgid "The printer multiplexes filaments into a single hot end."
 msgstr "프린터는 필�멘트를 하나� 핫 엔드� 멀티플렉싱합니다."
 
-#: src/libslic3r/PrintConfig.cpp:1857
+#: src/libslic3r/PrintConfig.cpp:1772
 msgid "Prime all printing extruders"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1858
+#: src/libslic3r/PrintConfig.cpp:1773
 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:1864
+#: src/libslic3r/PrintConfig.cpp:1778
 msgid "Generate support material"
 msgstr "서�트 재료 �성"
 
-#: src/libslic3r/PrintConfig.cpp:1866
+#: src/libslic3r/PrintConfig.cpp:1780
 msgid "Enable support material generation."
 msgstr "서�트 재료를 사용합니다."
 
-#: src/libslic3r/PrintConfig.cpp:1871
+#: src/libslic3r/PrintConfig.cpp:1784
 msgid "Auto generated supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:1786
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1880
+#: src/libslic3r/PrintConfig.cpp:1792
 msgid "XY separation between an object and its support"
 msgstr "물체와 그 서�트 사� XY 분리"
 
-#: src/libslic3r/PrintConfig.cpp:1882
+#: src/libslic3r/PrintConfig.cpp:1794
 msgid ""
 "XY separation between an object and its support. If expressed as percentage "
 "(for example 50%), it will be calculated over external perimeter width."
@@ -5942,17 +6615,17 @@ msgstr ""
 "�체와 그 서�트 사�� XY 분리. 백분율 (예 : 50 %)로 표시�는 경우 외부 둘"
 "레 너비를 기준으로 계산�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1893
+#: src/libslic3r/PrintConfig.cpp:1804
 msgid "Pattern angle"
 msgstr "채움 ��"
 
-#: src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1806
 msgid ""
 "Use this setting to rotate the support material pattern on the horizontal "
 "plane."
 msgstr "� 설정� 사용하여지지 �면 패턴� 수�면으로 회전시킵니다."
 
-#: src/libslic3r/PrintConfig.cpp:1906
+#: src/libslic3r/PrintConfig.cpp:1816 src/libslic3r/PrintConfig.cpp:2421
 msgid ""
 "Only create support if it lies on a build plate. Don't create support on a "
 "print."
@@ -5960,11 +6633,11 @@ msgstr ""
 "그것� 빌드 플레�트�있는 경우�만 지�� 작성하십시오. �쇄물� 대한 지�"
 "� 작성하지 마십시오."
 
-#: src/libslic3r/PrintConfig.cpp:1913
+#: src/libslic3r/PrintConfig.cpp:1822
 msgid "Contact Z distance"
 msgstr "Z 거리 문�"
 
-#: src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:1824
 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 "
@@ -5973,19 +6646,19 @@ msgstr ""
 "물체와 서�트 사�� 수� 거리. � 값� 0으로 설정하면 Slic3r� 첫 번째 �체 "
 "레�어� 브리지 �름과 ��를 사용하지 못하게�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1923
+#: src/libslic3r/PrintConfig.cpp:1831
 msgid "soluble"
 msgstr "수용성"
 
-#: src/libslic3r/PrintConfig.cpp:1924
+#: src/libslic3r/PrintConfig.cpp:1832
 msgid "detachable"
 msgstr "분리 가능"
 
-#: src/libslic3r/PrintConfig.cpp:1929
+#: src/libslic3r/PrintConfig.cpp:1837
 msgid "Enforce support for the first"
 msgstr "첫 번째 서�트 � 강화"
 
-#: src/libslic3r/PrintConfig.cpp:1931
+#: src/libslic3r/PrintConfig.cpp:1839
 msgid ""
 "Generate support material for the specified number of layers counting from "
 "bottom, regardless of whether normal support material is enabled or not and "
@@ -5996,15 +6669,15 @@ msgstr ""
 "세어 지정� 레�어 수� 대한지지 �료를 �성합니다. �것� 빌드 플레�트� 매"
 "우 얇거나 부족한 풋 프린트를 가진 물체를 � 많� 부착 할 때 유용합니다."
 
-#: src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1844
 msgid "Enforce support for the first n layers"
 msgstr "첫 번째 n 개� 레�어� 대한 서�트 강화"
 
-#: src/libslic3r/PrintConfig.cpp:1943
+#: src/libslic3r/PrintConfig.cpp:1850
 msgid "Support material/raft/skirt extruder"
 msgstr "서�트 재료 / �프트 / 스커트 �스트루�"
 
-#: src/libslic3r/PrintConfig.cpp:1945
+#: src/libslic3r/PrintConfig.cpp:1852
 msgid ""
 "The extruder to use when printing support material, raft and skirt (1+, 0 to "
 "use the current extruder to minimize tool changes)."
@@ -6012,7 +6685,7 @@ msgstr ""
 "서�트 재료, �프트 � 스커트를 �쇄 할 때 사용하는 압출기 (�구 변경� 최소"
 "화하기 위해 현재 압출기를 사용하려면 1+, 0)."
 
-#: src/libslic3r/PrintConfig.cpp:1955
+#: src/libslic3r/PrintConfig.cpp:1861
 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, "
@@ -6023,20 +6696,20 @@ msgstr ""
 "0으로 설정하면 설정� 경우 기본 압출 �� 사용�고 그렇지 않으면 노� 지름� "
 "사용�니다. 백분율 (예 : 90 %)로 표현하면 레�어 높�를 기준으로 계산�니다."
 
-#: src/libslic3r/PrintConfig.cpp:1964
+#: src/libslic3r/PrintConfig.cpp:1869
 msgid "Interface loops"
 msgstr "�터페�스 루프"
 
-#: src/libslic3r/PrintConfig.cpp:1966
+#: src/libslic3r/PrintConfig.cpp:1871
 msgid ""
 "Cover the top contact layer of the supports with loops. Disabled by default."
 msgstr "지지대� �단 접촉 층� 루프로 �으십시오. 기본�으로 사용 안 함."
 
-#: src/libslic3r/PrintConfig.cpp:1972
+#: src/libslic3r/PrintConfig.cpp:1876
 msgid "Support material/raft interface extruder"
 msgstr "서�트 재료/�프트 �터페�스 �스트루�"
 
-#: src/libslic3r/PrintConfig.cpp:1974
+#: src/libslic3r/PrintConfig.cpp:1878
 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."
@@ -6045,26 +6718,26 @@ msgstr ""
 "기 위해 현재 �스트루�를 사용하려면 1+, 0). �것� �프트�� �향� 미칩니"
 "다."
 
-#: src/libslic3r/PrintConfig.cpp:1982
+#: src/libslic3r/PrintConfig.cpp:1885
 msgid "Interface layers"
 msgstr "�터페�스 레�어"
 
-#: src/libslic3r/PrintConfig.cpp:1984
+#: src/libslic3r/PrintConfig.cpp:1887
 msgid ""
 "Number of interface layers to insert between the object(s) and support "
 "material."
 msgstr "�체와 서�트 재료 사�� 삽입할 �터페�스 레�어 수입니다."
 
-#: src/libslic3r/PrintConfig.cpp:1992
+#: src/libslic3r/PrintConfig.cpp:1894
 msgid "Interface pattern spacing"
 msgstr "�터페�스 패턴 간격"
 
-#: src/libslic3r/PrintConfig.cpp:1994
+#: src/libslic3r/PrintConfig.cpp:1896
 msgid "Spacing between interface lines. Set zero to get a solid interface."
 msgstr ""
 "�터페�스 �� 간 간격. 솔리드 �터페�스를 가져오려면 0� 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:2004
+#: src/libslic3r/PrintConfig.cpp:1905
 msgid ""
 "Speed for printing support material interface layers. If expressed as "
 "percentage (for example 50%) it will be calculated over support material "
@@ -6073,35 +6746,35 @@ msgstr ""
 "서�트 재료 �터페�스 레�어 �쇄 �� 백분율(예: 50%)로 표현� 경우 서�트 "
 "재료 ��� 따� 계산�다."
 
-#: src/libslic3r/PrintConfig.cpp:2013
+#: src/libslic3r/PrintConfig.cpp:1914
 msgid "Pattern"
 msgstr "패턴"
 
-#: src/libslic3r/PrintConfig.cpp:2015
+#: src/libslic3r/PrintConfig.cpp:1916
 msgid "Pattern used to generate support material."
 msgstr "서�트 재료를 �성하는 � 사용�는 패턴."
 
-#: src/libslic3r/PrintConfig.cpp:2022
+#: src/libslic3r/PrintConfig.cpp:1922
 msgid "Rectilinear grid"
 msgstr "�선 그리드"
 
-#: src/libslic3r/PrintConfig.cpp:2028
+#: src/libslic3r/PrintConfig.cpp:1928
 msgid "Pattern spacing"
 msgstr "패턴 간격"
 
-#: src/libslic3r/PrintConfig.cpp:2030
+#: src/libslic3r/PrintConfig.cpp:1930
 msgid "Spacing between support material lines."
 msgstr "서�트 재료 �� 사�� 간격."
 
-#: src/libslic3r/PrintConfig.cpp:2040
+#: src/libslic3r/PrintConfig.cpp:1939
 msgid "Speed for printing support material."
 msgstr "서�트 재료를 �쇄하는 ��."
 
-#: src/libslic3r/PrintConfig.cpp:2047
+#: src/libslic3r/PrintConfig.cpp:1946
 msgid "Synchronize with object layers"
 msgstr "�체 레�어와 �기화"
 
-#: src/libslic3r/PrintConfig.cpp:2049
+#: src/libslic3r/PrintConfig.cpp:1948
 msgid ""
 "Synchronize support layers with the object print layers. This is useful with "
 "multi-material printers, where the extruder switch is expensive."
@@ -6109,11 +6782,11 @@ msgstr ""
 "서�트 레�어를 프린트 레�어와 �기화하십시오. �것�  스위치가 비싼 멀티 메"
 "터리얼 프린터�서 유용하다."
 
-#: src/libslic3r/PrintConfig.cpp:2056
+#: src/libslic3r/PrintConfig.cpp:1954
 msgid "Overhang threshold"
 msgstr "오버행 한계�"
 
-#: src/libslic3r/PrintConfig.cpp:2058
+#: src/libslic3r/PrintConfig.cpp:1956
 msgid ""
 "Support material will not be generated for overhangs whose slope angle (90° "
 "= vertical) is above the given threshold. In other words, this value "
@@ -6125,11 +6798,11 @@ msgstr ""
 "성�지 않는다. 즉, � 값� 서�트 재료 없� �쇄할 수 있는 가장 수� 경사(수"
 "�면�서 측정�)를 나타낸다. �� �지를 위해 0으로 설정하십시오(권장)."
 
-#: src/libslic3r/PrintConfig.cpp:2071
+#: src/libslic3r/PrintConfig.cpp:1968
 msgid "With sheath around the support"
 msgstr "서�트 주변�나 외부로"
 
-#: src/libslic3r/PrintConfig.cpp:2073
+#: src/libslic3r/PrintConfig.cpp:1970
 msgid ""
 "Add a sheath (a single perimeter line) around the base support. This makes "
 "the support more reliable, but also more difficult to remove."
@@ -6137,7 +6810,7 @@ msgstr ""
 "기본 서�트 주위� 외장 (단� 주변 선)� 추가하십시오. �것� 페�스 업�보"
 "다 신뢰성있게 만들�만 아니� 제거하기� 어렵습니다."
 
-#: src/libslic3r/PrintConfig.cpp:2081
+#: src/libslic3r/PrintConfig.cpp:1977
 msgid ""
 "Extruder temperature for layers after the first one. Set this to zero to "
 "disable temperature control commands in the output."
@@ -6145,25 +6818,25 @@ msgstr ""
 "첫 번째 것 �후� 레�어� 대한 � 낮� 온�. � 값� 0으로 설정하면 출력�"
 "서 ​​온� 제어 명령� 비활성화 할 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:2084
+#: src/libslic3r/PrintConfig.cpp:1979
 msgid "Temperature"
 msgstr "온�"
 
-#: src/libslic3r/PrintConfig.cpp:2090
+#: src/libslic3r/PrintConfig.cpp:1985
 msgid "Detect thin walls"
 msgstr "얇� 벽(walls) �지"
 
-#: src/libslic3r/PrintConfig.cpp:2092
+#: src/libslic3r/PrintConfig.cpp:1987
 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:2099
+#: src/libslic3r/PrintConfig.cpp:1993
 msgid "Threads"
 msgstr "스레드(Threads)"
 
-#: src/libslic3r/PrintConfig.cpp:2100
+#: src/libslic3r/PrintConfig.cpp:1994
 msgid ""
 "Threads are used to parallelize long-running tasks. Optimal threads number "
 "is slightly above the number of available cores/processors."
@@ -6171,7 +6844,7 @@ msgstr ""
 "스레드는 장기 실행 태스�를 병렬 처리하는 � 사용�니다. 최�� 스레드 수는 "
 "사용 가능한 코어 / 프로세서 수보다 약간 높습니다."
 
-#: src/libslic3r/PrintConfig.cpp:2112
+#: src/libslic3r/PrintConfig.cpp:2006
 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 "
@@ -6181,7 +6854,7 @@ msgstr ""
 "[previous_extruder] � [next_extruder]� 아니� 모든 Slic3r 설정� 대해 �리 "
 "표시 � 변수를 사용할 수 있습니다."
 
-#: src/libslic3r/PrintConfig.cpp:2125
+#: src/libslic3r/PrintConfig.cpp:2018
 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 "
@@ -6195,7 +6868,7 @@ msgstr ""
 "으면 노� 지름� 사용�니다. 백분율 (예 : 90 %)로 표현하면 레�어 높�를 기준"
 "으로 계산�니다."
 
-#: src/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2029
 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 "
@@ -6208,28 +6881,23 @@ msgstr ""
 "전 ��� 대한 백분율 (예 : 80 %)로 나타낼 수 있습니다. ��으로 0으로 설정하"
 "십시오."
 
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "윗부분"
-
-#: src/libslic3r/PrintConfig.cpp:2151
+#: src/libslic3r/PrintConfig.cpp:2043
 msgid "Number of solid layers to generate on top surfaces."
 msgstr "�단 표면� �성 할 솔리드 레�어 수입니다."
 
-#: src/libslic3r/PrintConfig.cpp:2153
+#: src/libslic3r/PrintConfig.cpp:2044
 msgid "Top solid layers"
 msgstr "탑 솔리드 레�어"
 
-#: src/libslic3r/PrintConfig.cpp:2159
+#: src/libslic3r/PrintConfig.cpp:2050
 msgid "Speed for travel moves (jumps between distant extrusion points)."
 msgstr "�� �� (먼 �출 � 사�� �프)."
 
-#: src/libslic3r/PrintConfig.cpp:2168
+#: src/libslic3r/PrintConfig.cpp:2058
 msgid "Use firmware retraction"
 msgstr "펌웨어 철회"
 
-#: src/libslic3r/PrintConfig.cpp:2169
+#: src/libslic3r/PrintConfig.cpp:2059
 msgid ""
 "This experimental setting uses G10 and G11 commands to have the firmware "
 "handle the retraction. This is only supported in recent Marlin."
@@ -6237,11 +6905,11 @@ msgstr ""
 "� 실험 설정� G10 � G11 명령� 사용하여 펌웨어�서 취소를 처리하��합니"
 "다. �것� 최근� �린�서만 지��니다."
 
-#: src/libslic3r/PrintConfig.cpp:2176
+#: src/libslic3r/PrintConfig.cpp:2065
 msgid "Use relative E distances"
 msgstr "�대�� E 거리 사용"
 
-#: src/libslic3r/PrintConfig.cpp:2177
+#: src/libslic3r/PrintConfig.cpp:2066
 msgid ""
 "If your firmware requires relative E values, check this, otherwise leave it "
 "unchecked. Most firmwares use absolute values."
@@ -6249,11 +6917,11 @@ msgstr ""
 "펌웨어� �대 E 값� 필요한 경우� 값� 선�하고, 그렇지 않으면 선�하지 마십"
 "시오. 대부분� 회사는 절대 값� 사용합니다."
 
-#: src/libslic3r/PrintConfig.cpp:2184
+#: src/libslic3r/PrintConfig.cpp:2072
 msgid "Use volumetric E"
 msgstr "용� E 사용"
 
-#: src/libslic3r/PrintConfig.cpp:2185
+#: src/libslic3r/PrintConfig.cpp:2073
 msgid ""
 "This experimental setting uses outputs the E values in cubic millimeters "
 "instead of linear millimeters. If your firmware doesn't already know "
@@ -6268,11 +6936,11 @@ msgstr ""
 "[filament_diameter_0] T0'과 같� 명령� 입력 할 수 있습니다 Slic3r. �것� 최"
 "근� �린�서만 지��니다."
 
-#: src/libslic3r/PrintConfig.cpp:2196
+#: src/libslic3r/PrintConfig.cpp:2083
 msgid "Enable variable layer height feature"
 msgstr "가변 레�어 높� 기능 사용"
 
-#: src/libslic3r/PrintConfig.cpp:2197
+#: src/libslic3r/PrintConfig.cpp:2084
 msgid ""
 "Some printers or printer setups may have difficulties printing with a "
 "variable layer height. Enabled by default."
@@ -6280,11 +6948,11 @@ msgstr ""
 "�부 프린터 �는 프린터 설정� 가변 레�어 높�로 �쇄하는 � 어려움�있� "
 "수 있습니다. 기본�으로 사용�니다."
 
-#: src/libslic3r/PrintConfig.cpp:2204
+#: src/libslic3r/PrintConfig.cpp:2090
 msgid "Wipe while retracting"
 msgstr "수축시 닦아내십시오"
 
-#: src/libslic3r/PrintConfig.cpp:2205
+#: src/libslic3r/PrintConfig.cpp:2091
 msgid ""
 "This flag will move the nozzle while retracting to minimize the possible "
 "blob on leaky extruders."
@@ -6292,7 +6960,7 @@ msgstr ""
 "� 플래그는 누출� 리트랙싱� 블럽 가능성� 최소화하기 위해 수축하는 �안 노"
 "�� ��시킨다."
 
-#: src/libslic3r/PrintConfig.cpp:2213
+#: src/libslic3r/PrintConfig.cpp:2098
 msgid ""
 "Multi material printers may need to prime or purge extruders on tool "
 "changes. Extrude the excess material into the wipe tower."
@@ -6300,11 +6968,11 @@ msgstr ""
 "멀티 메터리알 프린터는 공구 �환 시 �스트루�를 프���하거나 제거해야 할 "
 "수 있다. 과�한 물질� 와�� 타워� �출시킨다."
 
-#: src/libslic3r/PrintConfig.cpp:2220
+#: src/libslic3r/PrintConfig.cpp:2104
 msgid "Purging volumes - load/unload volumes"
 msgstr "볼륨 삭제 - 볼륨 로드/언로드"
 
-#: src/libslic3r/PrintConfig.cpp:2221
+#: src/libslic3r/PrintConfig.cpp:2105
 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 "
@@ -6313,11 +6981,11 @@ msgstr ""
 "� 벡터는 와�� 작� 타워� 사용�는 � 공구와 �환하는 � 필요한 볼륨� 저"
 "장한다. �러한 값� 아래 전체 삭제 볼륨 �성� 단순화하기 위해 사용�다. "
 
-#: src/libslic3r/PrintConfig.cpp:2228
+#: src/libslic3r/PrintConfig.cpp:2111
 msgid "Purging volumes - matrix"
 msgstr "볼륨 삭제 - 행렬"
 
-#: src/libslic3r/PrintConfig.cpp:2229
+#: src/libslic3r/PrintConfig.cpp:2112
 msgid ""
 "This matrix describes volumes (in cubic milimetres) required to purge the "
 "new filament on the wipe tower for any given pair of tools. "
@@ -6325,73 +6993,73 @@ msgstr ""
 "� 매트릭스는 주어진 공구 �� 대해 새 필�멘트를 지우는 � 필요한 볼륨(입방 "
 "밀리미터)� 설명한다. "
 
-#: src/libslic3r/PrintConfig.cpp:2239
+#: src/libslic3r/PrintConfig.cpp:2121
 msgid "Position X"
 msgstr "X축 위치"
 
-#: src/libslic3r/PrintConfig.cpp:2240
+#: src/libslic3r/PrintConfig.cpp:2122
 msgid "X coordinate of the left front corner of a wipe tower"
 msgstr "와�프 타워� 좌측 전면 모서리� X 좌표"
 
-#: src/libslic3r/PrintConfig.cpp:2247
+#: src/libslic3r/PrintConfig.cpp:2128
 msgid "Position Y"
 msgstr "Y축 위치"
 
-#: src/libslic3r/PrintConfig.cpp:2248
+#: src/libslic3r/PrintConfig.cpp:2129
 msgid "Y coordinate of the left front corner of a wipe tower"
 msgstr "와�� 작� 타워� 좌측 전방 모서리� Y 좌표"
 
-#: src/libslic3r/PrintConfig.cpp:2256
+#: src/libslic3r/PrintConfig.cpp:2136
 msgid "Width of a wipe tower"
 msgstr "와�� 타워 �"
 
-#: src/libslic3r/PrintConfig.cpp:2263
+#: src/libslic3r/PrintConfig.cpp:2142
 msgid "Wipe tower rotation angle"
 msgstr "와�� 타워 회전��"
 
-#: src/libslic3r/PrintConfig.cpp:2264
+#: src/libslic3r/PrintConfig.cpp:2143
 msgid "Wipe tower rotation angle with respect to x-axis "
 msgstr "X 축� 대한 와�� 타워 �� "
 
-#: src/libslic3r/PrintConfig.cpp:2265
+#: src/libslic3r/PrintConfig.cpp:2144 src/libslic3r/PrintConfig.cpp:2565
 msgid "degrees"
 msgstr "��"
 
-#: src/libslic3r/PrintConfig.cpp:2272
+#: src/libslic3r/PrintConfig.cpp:2150
 msgid "Wipe into this object's infill"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2273
+#: src/libslic3r/PrintConfig.cpp:2151
 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:2281
+#: src/libslic3r/PrintConfig.cpp:2158
 msgid "Wipe into this object"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2282
+#: src/libslic3r/PrintConfig.cpp:2159
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2289
+#: src/libslic3r/PrintConfig.cpp:2165
 msgid "Maximal bridging distance"
 msgstr "최대 브리징 거리"
 
-#: src/libslic3r/PrintConfig.cpp:2290
+#: src/libslic3r/PrintConfig.cpp:2166
 msgid "Maximal distance between supports on sparse infill sections. "
 msgstr "드문드문하 �필 섹션�서 지지대 사�� 최대 거리. "
 
-#: src/libslic3r/PrintConfig.cpp:2297
+#: src/libslic3r/PrintConfig.cpp:2172
 msgid "XY Size Compensation"
 msgstr "XY �기 보정"
 
-#: src/libslic3r/PrintConfig.cpp:2299
+#: src/libslic3r/PrintConfig.cpp:2174
 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-"
@@ -6400,11 +7068,11 @@ msgstr ""
 "XY �면�서 설정� 값(�수 = 안, 양 = 바깥쪽)� 따� �체가 �가/정격�다. �"
 "는 구� �기를 미세 조정하는� 유용할 수 있다."
 
-#: src/libslic3r/PrintConfig.cpp:2308
+#: src/libslic3r/PrintConfig.cpp:2182
 msgid "Z offset"
 msgstr "Z 오프셋"
 
-#: src/libslic3r/PrintConfig.cpp:2309
+#: src/libslic3r/PrintConfig.cpp:2183
 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 "
@@ -6415,425 +7083,578 @@ msgstr ""
 "톱 0� 실제로 노�� 프린트 베드�서 0.3mm 떨어진 곳� 둔 경우, �를 -0.3(�"
 "는 엔드 스톱� 고정)으로 설정하십시오."
 
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
+#: src/libslic3r/PrintConfig.cpp:2200
 msgid "Display width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2374
+#: src/libslic3r/PrintConfig.cpp:2201
 msgid "Width of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2380
+#: src/libslic3r/PrintConfig.cpp:2206
 msgid "Display height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2381
+#: src/libslic3r/PrintConfig.cpp:2207
 msgid "Height of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2387
+#: src/libslic3r/PrintConfig.cpp:2212
 msgid "Number of pixels in"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2389
+#: src/libslic3r/PrintConfig.cpp:2214
 msgid "Number of pixels in X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2396
+#: src/libslic3r/PrintConfig.cpp:2220
 msgid "Number of pixels in Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2402
+#: src/libslic3r/PrintConfig.cpp:2225
 msgid "Display orientation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2403
+#: src/libslic3r/PrintConfig.cpp:2226
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2410
+#: src/libslic3r/PrintConfig.cpp:2232
 msgid "Landscape"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2411
+#: src/libslic3r/PrintConfig.cpp:2233
 msgid "Portrait"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
+#: src/libslic3r/PrintConfig.cpp:2238
+msgid "Fast"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2239
+msgid "Fast tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2240
+msgid "Time of the fast tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2247
+msgid "Slow"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2248
+msgid "Slow tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2249
+msgid "Time of the slow tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2256
+msgid "Area fill"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2257
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:2264 src/libslic3r/PrintConfig.cpp:2265
+#: src/libslic3r/PrintConfig.cpp:2266
 msgid "Printer scaling correction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
+#: src/libslic3r/PrintConfig.cpp:2272 src/libslic3r/PrintConfig.cpp:2273
+msgid "Printer absolute correction"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2274
+msgid ""
+"Will inflate or deflate the sliced 2D polygons according to the sign of the "
+"correction."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2280 src/libslic3r/PrintConfig.cpp:2281
+msgid "Printer gamma correction"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2282
+msgid "This will apply a gamm correction to the rasterized 2D polygons."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2291 src/libslic3r/PrintConfig.cpp:2292
 msgid "Initial layer height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
+#: src/libslic3r/PrintConfig.cpp:2298
+msgid "Faded layers"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2299
+msgid ""
+"Number of the layers needed for the exposure time fade from initial exposure "
+"time to the exposure time"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2306 src/libslic3r/PrintConfig.cpp:2307
+msgid "Exposure time"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2313 src/libslic3r/PrintConfig.cpp:2314
 msgid "Initial exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
+#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2321
+msgid "Correction for expansion"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
+#: src/libslic3r/PrintConfig.cpp:2327
 msgid "SLA print material notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2459
+#: src/libslic3r/PrintConfig.cpp:2328
 msgid "You can put your notes regarding the SLA print material here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
+#: src/libslic3r/PrintConfig.cpp:2336 src/libslic3r/PrintConfig.cpp:2347
 msgid "Default SLA material profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2487
+#: src/libslic3r/PrintConfig.cpp:2358
 msgid "Generate supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2489
+#: src/libslic3r/PrintConfig.cpp:2360
 msgid "Generate supports for the models"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2494
+#: src/libslic3r/PrintConfig.cpp:2365
 msgid "Support head front diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2367
 msgid "Diameter of the pointing side of the head"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2503
+#: src/libslic3r/PrintConfig.cpp:2374
 msgid "Support head penetration"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2505
+#: src/libslic3r/PrintConfig.cpp:2376
 msgid "How much the pinhead has to penetrate the model surface"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2383
 msgid "Support head width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2514
+#: src/libslic3r/PrintConfig.cpp:2385
 msgid "Width from the back sphere center to the front sphere center"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2521
+#: src/libslic3r/PrintConfig.cpp:2393
 msgid "Support pillar diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2523
+#: src/libslic3r/PrintConfig.cpp:2395
 msgid "Diameter in mm of the support pillars"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2530
+#: src/libslic3r/PrintConfig.cpp:2403
 msgid "Support pillar connection mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2531
+#: src/libslic3r/PrintConfig.cpp:2404
 msgid ""
 "Controls the bridge type between two neigboring 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:2540
+#: src/libslic3r/PrintConfig.cpp:2412
 msgid "Zig-Zag"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2541
+#: src/libslic3r/PrintConfig.cpp:2413
 msgid "Cross"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2542
+#: src/libslic3r/PrintConfig.cpp:2414
 msgid "Dynamic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2546
+#: src/libslic3r/PrintConfig.cpp:2426
 msgid "Pillar widening factor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2548
+#: src/libslic3r/PrintConfig.cpp:2428
 msgid ""
 "Merging bridges or pillars into another pillars can increase the radius. "
 "Zero means no increase, one means full increase."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2557
+#: src/libslic3r/PrintConfig.cpp:2437
 msgid "Support base diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2559
+#: src/libslic3r/PrintConfig.cpp:2439
 msgid "Diameter in mm of the pillar base"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2566
+#: src/libslic3r/PrintConfig.cpp:2447
 msgid "Support base height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2568
+#: src/libslic3r/PrintConfig.cpp:2449
 msgid "The height of the pillar base cone"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2575
+#: src/libslic3r/PrintConfig.cpp:2456
 msgid "Critical angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2577
+#: src/libslic3r/PrintConfig.cpp:2458
 msgid "The default angle for connecting support sticks and junctions."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2584
+#: src/libslic3r/PrintConfig.cpp:2466
 msgid "Max bridge length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2586
+#: src/libslic3r/PrintConfig.cpp:2468
 msgid "The max length of a bridge"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2593
+#: src/libslic3r/PrintConfig.cpp:2475
+msgid "Max pillar linking distance"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2477
+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:2485
 msgid "Object elevation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2595
+#: src/libslic3r/PrintConfig.cpp:2487
 msgid "How much the supports should lift up the supported object."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
+#: src/libslic3r/PrintConfig.cpp:2495
+msgid "Support points density"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
+#: src/libslic3r/PrintConfig.cpp:2497
+msgid "This is a relative measure of support points density."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
+#: src/libslic3r/PrintConfig.cpp:2503
+msgid "Minimal distance of the support points"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
+#: src/libslic3r/PrintConfig.cpp:2505
+msgid "No support points will be placed closer than this threshold."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
+#: src/libslic3r/PrintConfig.cpp:2511
 msgid "Use pad"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2631
+#: src/libslic3r/PrintConfig.cpp:2513
 msgid "Add a pad underneath the supported model"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2636
+#: src/libslic3r/PrintConfig.cpp:2518
 msgid "Pad wall thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2645
+#: src/libslic3r/PrintConfig.cpp:2520
+msgid "The thickness of the pad and its optional cavity walls."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2528
 msgid "Pad wall height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2654
+#: src/libslic3r/PrintConfig.cpp:2529
+msgid "Defines the cavity depth. Set to zero to disable the cavity."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2539
 msgid "Max merge distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2663
+#: src/libslic3r/PrintConfig.cpp:2541
+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:2552
 msgid "Pad edge radius"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3017
+#: src/libslic3r/PrintConfig.cpp:2561
+msgid "Pad wall slope"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2563
+msgid ""
+"The slope of the pad wall relative to the bed plane. 90 degrees means "
+"straight walls."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2924
+msgid "Export SVG"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2925
+msgid "Export the model(s) as OBJ."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2936
+msgid "Export SLA"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2937
+msgid "Slice the model and export SLA printing layers as PNG."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2942
+msgid "Export 3MF"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2943
+msgid "Export the model(s) as 3MF."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2947
+msgid "Export AMF"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2948
+msgid "Export the model(s) as AMF."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2952
+msgid "Export STL"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2953
+msgid "Export the model(s) as STL."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2958
+msgid "Slice the model and export toolpaths as G-code."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2963
+msgid "Slice"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2964
+msgid ""
+"Slice the model as FFF or SLA based on the printer_technology configuration "
+"value."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2969
+msgid "Help"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2970
+msgid "Show this help."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2975
+msgid "Help (FFF options)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2976
+msgid "Show the full list of print/G-code configuration options."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2980
+msgid "Help (SLA options)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2981
+msgid "Show the full list of SLA print configuration options."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2985
+msgid "Output Model Info"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2986
+msgid "Write information about the model to the console."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2990
+msgid "Save config file"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2991
+msgid "Save configuration to the specified file."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3001
+msgid "Align XY"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3002
+msgid "Align the model to the given point."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3007
 msgid "Cut model at the given Z."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
+#: src/libslic3r/PrintConfig.cpp:3028
+msgid "Center"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3023
+#: src/libslic3r/PrintConfig.cpp:3029
+msgid "Center the print around the given center."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3033
+msgid "Don't arrange"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3034
 msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
+"Do not rearrange the given models before merging and keep their original XY "
+"coordinates."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
+#: src/libslic3r/PrintConfig.cpp:3037
+msgid "Duplicate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3031
+#: src/libslic3r/PrintConfig.cpp:3038
+msgid "Multiply copies by this factor."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3042
+msgid "Duplicate by grid"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3043
+msgid "Multiply copies by creating a grid."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3046
+msgid "Merge"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3047
+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:3052
+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:3056
+msgid "Rotation angle around the Z axis in degrees."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3060
+msgid "Rotate around X"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3061
+msgid "Rotation angle around the X axis in degrees."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3065
+msgid "Rotate around Y"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3066
+msgid "Rotation angle around the Y axis in degrees."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3071
+msgid "Scaling factor or percentage."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3076
+msgid ""
+"Detect unconnected parts in the given model(s) and split them into separate "
+"objects."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3079
+msgid "Scale to Fit"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3080
+msgid "Scale to fit the given volume."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3089
+msgid "Ignore non-existent config files"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3090
+msgid "Do not fail if a file supplied to --load does not exist."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3093
+msgid "Load config file"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3094
+msgid ""
+"Load configuration from the specified file. It can be used more than once to "
+"load options from multiple files."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3097
+msgid "Output File"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3098
+msgid ""
+"The file where the output will be written (if not specified, it will be "
+"based on the input file)."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3108
+msgid "Data directory"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3109
 msgid ""
 "Load and store settings at the given directory. This is useful for "
 "maintaining different profiles or including configurations from a network "
 "storage."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr ""
-
 #: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
+msgid "Logging level"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
+#: src/libslic3r/PrintConfig.cpp:3113
+msgid ""
+"Messages with severity lower or eqal to the loglevel will be printed out. 0:"
+"trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
 msgstr ""
 
 #: src/libslic3r/GCode/PreviewData.cpp:176
diff --git a/resources/localization/list.txt b/resources/localization/list.txt
index aa673bbdf..fdffaf9d9 100644
--- a/resources/localization/list.txt
+++ b/resources/localization/list.txt
@@ -1,4 +1,5 @@
 src/slic3r/GUI/AboutDialog.cpp
+src/slic3r/GUI/BackgroundSlicingProcess.cpp
 src/slic3r/GUI/BedShapeDialog.cpp
 src/slic3r/GUI/BedShapeDialog.hpp
 src/slic3r/GUI/BonjourDialog.cpp
@@ -8,11 +9,17 @@ src/slic3r/GUI/ConfigWizard.cpp
 src/slic3r/GUI/Field.cpp
 src/slic3r/GUI/FirmwareDialog.cpp
 src/slic3r/GUI/GLCanvas3D.cpp
-src/slic3r/GUI/GLGizmo.cpp
+src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
+src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
+src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
+src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
 src/slic3r/GUI/GUI.cpp
 src/slic3r/GUI/GUI_App.cpp
 src/slic3r/GUI/GUI_ObjectList.cpp
 src/slic3r/GUI/GUI_ObjectManipulation.cpp
+src/slic3r/GUI/GUI_ObjectSettings.cpp
 src/slic3r/GUI/GUI_Preview.cpp
 src/slic3r/GUI/KBShortcutsDialog.cpp
 src/slic3r/GUI/MainFrame.cpp
@@ -23,15 +30,23 @@ src/slic3r/GUI/Preset.cpp
 src/slic3r/GUI/PresetBundle.cpp
 src/slic3r/GUI/PresetHints.cpp
 src/slic3r/GUI/PrintHostDialogs.cpp
+src/slic3r/GUI/ProgressStatusBar.cpp
 src/slic3r/GUI/RammingChart.cpp
 src/slic3r/GUI/SysInfoDialog.cpp
 src/slic3r/GUI/Tab.cpp
 src/slic3r/GUI/Tab.hpp
 src/slic3r/GUI/UpdateDialogs.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
+src/slic3r/GUI/wxExtensions.cpp
+src/slic3r/Utils/Duet.cpp
 src/slic3r/Utils/OctoPrint.cpp
 src/slic3r/Utils/PresetUpdater.cpp
 src/slic3r/Utils/FixModelByWin10.cpp
+src/libslic3r/Zipper.cpp
+src/libslic3r/SLA/SLASupportTree.cpp
 src/libslic3r/Print.cpp
+src/libslic3r/SLAPrint.cpp
+src/libslic3r/PrintBase.cpp
 src/libslic3r/PrintConfig.cpp
+src/libslic3r/PrintObject.cpp
 src/libslic3r/GCode/PreviewData.cpp
diff --git a/resources/localization/pl/Slic3rPE.mo b/resources/localization/pl/Slic3rPE.mo
deleted file mode 100644
index 7cd9902cf..000000000
Binary files a/resources/localization/pl/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/pl/Slic3rPE_pl.po b/resources/localization/pl/Slic3rPE_pl.po
deleted file mode 100644
index 44c39a7c2..000000000
--- a/resources/localization/pl/Slic3rPE_pl.po
+++ /dev/null
@@ -1,7006 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language-Team: \n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"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: Poedit 2.0.8\n"
-
-#: src/slic3r/GUI/AboutDialog.cpp:33
-msgid "About Slic3r"
-msgstr "O Slic3r"
-
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
-msgid "Version"
-msgstr "Wersja"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:43
-msgid "Shape"
-msgstr "Kształt"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
-msgid "Rectangular"
-msgstr "ProstokÄ…tny"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
-msgid "Size"
-msgstr "Rozmiar"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
-msgid "Size in X and Y of the rectangular plate."
-msgstr "Rozmiar X i Y stołu prostokątnego."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
-msgid "Origin"
-msgstr "Punkt zerowy"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
-msgid ""
-"Distance of the 0,0 G-code coordinate from the front left corner of the "
-"rectangle."
-msgstr ""
-"Odległość koordynaty punktu zerowego od przedniego lewego rogu prostokąta."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
-msgid "Circular"
-msgstr "Okrągły"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
-msgid "mm"
-msgstr "mm"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
-msgid "Diameter"
-msgstr "Åšrednica"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
-msgid ""
-"Diameter of the print bed. It is assumed that origin (0,0) is located in the "
-"center."
-msgstr ""
-"Średnica stołu. Z założenia punkt bazowy (0, 0) jest zlokalizowany na środku."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
-#: src/libslic3r/GCode/PreviewData.cpp:175
-msgid "Custom"
-msgstr "WÅ‚asny"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
-msgid "Load shape from STL..."
-msgstr ""
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
-msgid "Settings"
-msgstr "Ustawienia"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Wybierz plik do importu kształtu stołu (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
-msgid "Error! "
-msgstr "BÅ‚Ä…d! "
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr "Wybrany plik nie zawiera żadnego kształtu."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
-msgid ""
-"The selected file contains several disjoint areas. This is not supported."
-msgstr ""
-"Wybrany plik zawiera kilka rozłączonych obszarów. Taki plik nie jest "
-"obsługiwany."
-
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape"
-msgstr "Kształt stołu"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:54
-msgid "Network lookup"
-msgstr "PodglÄ…d sieci"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:67
-msgid "Address"
-msgstr "Adres"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:68
-msgid "Hostname"
-msgstr "Nazwa hosta"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:69
-msgid "Service name"
-msgstr "Nazwa usługi"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:70
-msgid "OctoPrint version"
-msgstr "Wersja OctoPrint"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:188
-msgid "Searching for devices"
-msgstr "Wyszukiwanie urządzeń"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:195
-msgid "Finished"
-msgstr "Zakończono"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:15
-msgid "Buttons And Text Colors Description"
-msgstr "Opis Przycisków i Kolorów Tekstu"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:40
-msgid "Value is the same as the system value"
-msgstr "Wartość jest taka sama jak systemowa"
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:57
-msgid ""
-"Value was changed and is not equal to the system value or the last saved "
-"preset"
-msgstr ""
-"Wartość została zmieniona i nie równa się wartości systemowej lub tej z "
-"ostatnio zapisanego zestawu ustawień"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
-msgid "Upgrade"
-msgstr "Aktualizacja"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
-msgid "Downgrade"
-msgstr "Deaktualizacja"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
-msgid "Before roll back"
-msgstr "Przez zmianÄ…"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
-msgid "User"
-msgstr "Użytkownik"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
-msgid "Unknown"
-msgstr "Nieznane"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
-msgid "Active: "
-msgstr "Aktywny: "
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "slic3r version"
-msgstr "wersja Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
-msgid "print"
-msgstr "druk"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "filaments"
-msgstr "filamenty"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
-msgid "printer"
-msgstr "drukarka"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
-msgid "vendor"
-msgstr "dostawca"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
-msgid "version"
-msgstr "wersja"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
-msgid "min slic3r version"
-msgstr "minimalna wersja slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
-msgid "max slic3r version"
-msgstr "maksymalna wersja Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "model"
-msgstr "model"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "variants"
-msgstr "warianty"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
-msgid "Incompatible with this Slic3r"
-msgstr "Niekompatybilne z tÄ… wersjÄ… Slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
-msgid "Activate"
-msgstr "Aktywacja"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
-msgid "Configuration Snapshots"
-msgstr "Zrzuty konfiguracji"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:92
-msgid "nozzle"
-msgstr "dysza"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
-msgstr "domyślnie"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
-msgstr "Zaznacz wszystko"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "Odznacz"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-#, c-format
-msgid "Welcome to the Slic3r %s"
-msgstr "Witaj w Slic3r %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-msgid "Welcome"
-msgstr "Witaj"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
-#, c-format
-msgid "Run %s"
-msgstr "Uruchom %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:234
-#, c-format
-msgid ""
-"Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
-"configuration; just a few settings and you will be ready to print."
-msgstr ""
-"Witaj w Slic3r Prusa Edition! Ten %s pomoże we wstępnej konfiguracji - tylko "
-"kilka ustawień dzieli Cię od gotowości do drukowania."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:238
-msgid ""
-"Remove user profiles - install from scratch (a snapshot will be taken "
-"beforehand)"
-msgstr ""
-"Usuń profile użytkownika - czysta instalacja (najpierw zostanie wykonany "
-"zrzut)"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr "Inni dostawcy"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr "WÅ‚asne ustawienia"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Automatic updates"
-msgstr "Automatyczne aktualizacje"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Updates"
-msgstr "Aktualizacje"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
-msgid "Check for application updates"
-msgstr "Sprawdź aktualizacje aplikacji"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
-msgid ""
-"If enabled, Slic3r checks for new versions of Slic3r PE 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 ""
-"Włączenie automatycznego sprawdzania dostępności nowych wersji Slic3r PE "
-"online. Pojawienie się nowej wersji spowoduje wyświetlenie powiadomienia "
-"przy starcie aplikacji (nigdy podczas jej pracy). Ta funkcja służy tylko "
-"powiadamianiu, nie instaluje aktualizacji automatycznie."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
-msgid "Update built-in Presets automatically"
-msgstr "Automatyczna aktualizacja wbudowanych zestawów ustawień"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
-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 ""
-"Włączenie powoduje pobieranie wbudowanych systemowych zestawów ustawień w "
-"tle. Te ustawienia są pobierane do oddzielnej lokalizacji tymczasowej. Jeśli "
-"pojawi siÄ™ nowa wersja to opcja jej instalacji pojawi siÄ™ przy starcie "
-"aplikacji."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:308
-msgid ""
-"Updates are never applied without user's consent and never overwrite user's "
-"customized settings."
-msgstr ""
-"Aktualizacje nie są stosowane bez wiedzy użytkownika i nigdy nie nadpisują "
-"zapisanych ustawień własnych."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:313
-msgid ""
-"Additionally a backup snapshot of the whole configuration is created before "
-"an update is applied."
-msgstr ""
-"Dodatkowa kopia zrzutu całej konfiguracji jest tworzona przed "
-"zainstalowaniem aktualizacji."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:320
-msgid "Other Vendors"
-msgstr "Inni dostawcy"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:322
-msgid "Pick another vendor supported by Slic3r PE:"
-msgstr "Wybierz innego dostawcÄ™ wspieranego przez Slic3r PE:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381
-msgid "Firmware Type"
-msgstr "Typ firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
-msgid "Firmware"
-msgstr "Firmware"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:385
-msgid "Choose the type of firmware used by your printer."
-msgstr "Wybierz rodzaj firmware używanego przez Twoją drukarkę."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape and Size"
-msgstr "Kształt i rozmiar stołu roboczego"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:422
-msgid "Set the shape of your printer's bed."
-msgstr "Ustaw kształt stołu roboczego drukarki."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Filament and Nozzle Diameters"
-msgstr "Åšrednice filamentu i dyszy"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Print Diameters"
-msgstr "Åšrednice wydruku"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:452
-msgid "Enter the diameter of your printer's hot end nozzle."
-msgstr "Wprowadź średnicę dyszy hotendu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:455
-msgid "Nozzle Diameter:"
-msgstr "Åšrednica dyszy:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:465
-msgid "Enter the diameter of your filament."
-msgstr "Wprowadź średnicę filamentu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:466
-msgid ""
-"Good precision is required, so use a caliper and do multiple measurements "
-"along the filament, then compute the average."
-msgstr ""
-"Wymagana jest spora precyzja, użyj więc suwmiarki i przeprowadź kilka "
-"pomiarów w sporych odstępach od siebie i oblicz średnią."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:469
-msgid "Filament Diameter:"
-msgstr "Åšrednica Filamentu:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Extruder and Bed Temperatures"
-msgstr "Temperatury ekstrudera i stołu"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Temperatures"
-msgstr "Temperatury"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:503
-msgid "Enter the temperature needed for extruding your filament."
-msgstr "Wprowadź temperaturę potrzebną do ekstruzji filamentu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:504
-msgid "A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS."
-msgstr "Generalną zasadą jest 160 do 230 °C dla PLA i 215 do 250 °C dla ABS."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:507
-msgid "Extrusion Temperature:"
-msgstr "Temperatura ekstrudera:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
-msgid "°C"
-msgstr "°C"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:517
-msgid ""
-"Enter the bed temperature needed for getting your filament to stick to your "
-"heated bed."
-msgstr ""
-"Wprowadź temperaturę potrzebną do dobrego przylegania filamentu do "
-"powierzchni podgrzewanego stołu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:518
-msgid ""
-"A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
-"no heated bed."
-msgstr ""
-"Generalną zasadą jest 60 °C dla PLA i 110 °C dla ABS. Ustaw zero jeśli nie "
-"masz podgrzewanego stołu."
-
-#: src/slic3r/GUI/ConfigWizard.cpp:521
-msgid "Bed Temperature:"
-msgstr "Temperatura stołu:"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:833
-msgid "< &Back"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:834
-msgid "&Next >"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:835
-msgid "&Finish"
-msgstr "&Zakończ"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:906
-msgid "Configuration Wizard"
-msgstr "Asystent Konfiguracji"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:907
-msgid "Configuration &Wizard"
-msgstr "&Asystent Konfiguracji"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:909
-msgid "Configuration Assistant"
-msgstr "Asystent konfiguracji"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:910
-msgid "Configuration &Assistant"
-msgstr "&Asystent Konfiguracji"
-
-#: src/slic3r/GUI/Field.cpp:109
-msgid "default value"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:112
-msgid "parameter name"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:140
-#, c-format
-msgid "%s doesn't support percentage"
-msgstr "%s nie może być wartością procentową"
-
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:153
-msgid "Input value is out of range"
-msgstr "Wartość poza zakresem"
-
-#: src/slic3r/GUI/Field.cpp:176
-#, c-format
-msgid ""
-"Do you mean %d%% instead of %d %s?\n"
-"Select YES if you want to change this value to %d%%, \n"
-"or NO if you are sure that %d %s is a correct value."
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:179
-msgid "Parameter validation"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
-msgid "Flash!"
-msgstr "Flash!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
-msgid "Flashing in progress. Please do not disconnect the printer!"
-msgstr "Flashowanie w toku. Proszę nie odłączać drukarki!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
-msgid "Flashing succeeded!"
-msgstr "Flashowanie pomyślne!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
-msgid "Flashing failed. Please see the avrdude log below."
-msgstr "Flashowanie nie powiodło się. Zobacz log z avrdude poniżej."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
-msgid "Flashing cancelled."
-msgstr "Flashowanie anulowane."
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
-#, 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 ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
-msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
-#, c-format
-msgid "Error accessing port at %s: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
-msgid "Firmware flasher"
-msgstr "Flasher firmware"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
-msgid "Firmware image:"
-msgstr "Obraz firmware:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
-msgid "Serial port:"
-msgstr "Port szeregowy:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
-msgid "Autodetected"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
-msgid "Rescan"
-msgstr "Skanuj ponownie"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
-msgid "Progress:"
-msgstr "Postęp:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
-msgid "Status:"
-msgstr "Stan:"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
-msgid "Ready"
-msgstr "Gotowe"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr "Zaawansowane: log wyjściowy z avrdude"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-"Czy na pewno chcesz przerwać flashowanie firmware?\n"
-"Może to spowodować nieprzewidziane problemy z drukarką!"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
-msgid "Confirmation"
-msgstr "Potwierdzenie"
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
-msgid "Cancelling..."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
-msgid "Detected object outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
-msgid "Detected toolpath outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "Obróć"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "Skalowanie"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
-msgid "Rotate lower part upwards"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
-msgid "Perform cut"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2276
-msgid "Cut object:"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
-msgid "Cut"
-msgstr "Obcinanie"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2466
-msgid "Keep upper part"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2467
-msgid "Keep lower part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "Uwaga"
-
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr "Próba uwolnienia nieokreślonego skalara"
-
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#: src/slic3r/GUI/GUI_App.cpp:377
-msgid "Choose one file (3MF):"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:389
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Wybierz jeden lub więcej plików (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/GUI_App.cpp:451
-msgid "Array of language names and identifiers should have the same size."
-msgstr "Listy nazw języków i oznaczeń powinny mieć taki sam rozmiar."
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Select the language"
-msgstr "Wybierz język"
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Language"
-msgstr "Język"
-
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
-msgid "Default"
-msgstr "Domyślnie"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "&Configuration Snapshots"
-msgstr "Zrzuty &konfiguracji"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "Inspect / activate configuration snapshots"
-msgstr "Sprawdzenie / aktywacja zrzutów konfiguracji"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Take Configuration &Snapshot"
-msgstr "Wykonaj &Zrzut Konfiguracji"
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Capture a configuration snapshot"
-msgstr "Zapisz zrzut konfiguracji"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "&Preferences"
-msgstr "&Preferencje"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "Application preferences"
-msgstr "Preferencje aplikacji"
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: src/slic3r/GUI/GUI_App.cpp:617
-msgid "Advanced View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Slic3r View Mode"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:622
-msgid "Change Application &Language"
-msgstr "Zmień &język aplikacji"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Flash printer &firmware"
-msgstr "Flash &firmware drukarki"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr "Wgraj obraz firmware do drukarki opartej na Adruino"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Taking configuration snapshot"
-msgstr "Zrzucanie konfiguracji"
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Snapshot name"
-msgstr "Nazwa zrzutu"
-
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "Aplikacja zostanie uruchomiona ponownie"
-
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "Uwaga!"
-
-#: src/slic3r/GUI/GUI_App.cpp:691
-msgid "&Configuration"
-msgstr "&Konfiguracja"
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid "You have unsaved changes "
-msgstr "Masz niesapisane zmiany "
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid ". Discard changes and continue anyway?"
-msgstr ". Odrzucić zmiany i kontynuować?"
-
-#: src/slic3r/GUI/GUI_App.cpp:712
-msgid "Unsaved Presets"
-msgstr "Niezapisane zestawy ustawień"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
-msgid "Layers and Perimeters"
-msgstr "Warstwy i Obrysy"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
-msgid "Infill"
-msgstr "Wypełnienie"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
-msgid "Support material"
-msgstr "Materiał podporowy"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "Prędkość"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
-msgid "Extruders"
-msgstr "Ekstrudery"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
-msgid "Extrusion Width"
-msgstr "Szerokość Ekstruzji"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
-msgid "Supports"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
-msgid "Pad"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
-msgid "Name"
-msgstr "Nazwa"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
-msgid "Right button click the icon to change the object settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
-#, c-format
-msgid "Auto-repaired (%d errors):\n"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
-msgid "degenerate facets"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
-msgid "edges fixed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
-msgid "facets removed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
-msgid "facets added"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
-msgid "facets reversed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
-msgid "backwards edges"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
-msgid "Right button click the icon to fix STL through Netfabb"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
-msgid "Extruder"
-msgstr "Ekstruder"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
-msgid "Select showing settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
-msgid "Load"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
-msgid "Box"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Cylinder"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Sphere"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Slab"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
-msgid "Split to parts"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
-msgid "Add settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
-msgid "Change type"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
-msgid "You can't delete the last solid part from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
-msgid "You can't delete the last intance from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
-msgid ""
-"The selected object couldn't be split because it contains only one part."
-msgstr ""
-"Wybrany model nie może być rozdzielony ponieważ zawiera tylko jedną część."
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
-msgid "Group manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
-msgid "Object manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
-msgid "Object Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
-msgid "Part Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
-msgid "Part manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
-msgid "Instance manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
-msgid "You can't change a type of the last solid part of the object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
-msgid "Select type of part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
-msgid "The supplied name is not valid;"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
-msgid "the following characters are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
-msgid "Object Manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
-msgid "Object name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
-msgid "Position"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
-msgid "Rotation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
-msgid "Scale factors"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
-msgid "Translate"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:235
-msgid "View"
-msgstr "Widok"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:394
-msgid "Feature type"
-msgstr "Rodzaj funkcji"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
-msgid "Height"
-msgstr "Wysokość"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
-msgid "Width"
-msgstr "Szerokość"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:242
-msgid "Volumetric flow rate"
-msgstr "Objętościowa wartość przepływu"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
-msgid "Tool"
-msgstr "Narzędzie"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:406
-msgid "Color Print"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:247
-msgid "Show"
-msgstr "Pokaż"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
-msgid "Feature types"
-msgstr "Rodzaje funkcji"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
-msgid "Perimeter"
-msgstr "Obrys"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
-msgid "External perimeter"
-msgstr "Obrys zewnętrzny"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
-msgid "Overhang perimeter"
-msgstr "Obrys zwisu"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
-msgid "Internal infill"
-msgstr "Wypełnienie wewnętrzne"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
-msgid "Solid infill"
-msgstr "Zwarte wypełnienie"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
-msgid "Top solid infill"
-msgstr "Zwarte wypełnienie górne"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
-msgid "Bridge infill"
-msgstr "Wypełnienie mostu"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
-#: src/libslic3r/GCode/PreviewData.cpp:170
-msgid "Gap fill"
-msgstr "Wypełnienie szpar"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
-#: src/libslic3r/GCode/PreviewData.cpp:171
-msgid "Skirt"
-msgstr "Skirt"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
-#: src/libslic3r/GCode/PreviewData.cpp:173
-msgid "Support material interface"
-msgstr "Warstwa Å‚Ä…czÄ…ca podpory z modelem"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
-#: src/libslic3r/GCode/PreviewData.cpp:174
-msgid "Wipe tower"
-msgstr "Wieża czyszcząca"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
-msgid "Travel"
-msgstr "Jałowy"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:270
-msgid "Retractions"
-msgstr "Retrakcje"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:271
-msgid "Unretractions"
-msgstr "Powrót retrakcji"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:272
-msgid "Shells"
-msgstr "Powłoka"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
-msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
-msgid "Export G-code"
-msgstr "Eksport G-code"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
-msgid "Save project (3MF)"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "(Re)slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Quick slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat last quick slice"
-msgstr "Powtórz ostatnie szybkie cięcie"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
-msgid "Select Plater Tab"
-msgstr "Zakładka Stół"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Quick slice and Save as"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Select Print Settings Tab"
-msgstr "Ustawienia Druku"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
-msgid "Select Filament Settings Tab"
-msgstr "Ustawienia Filamentu"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
-msgid "Select Printer Settings Tab"
-msgstr "Ustawienia Drukarki"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
-msgid "Switch to 3D"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
-msgid "Switch to Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
-msgstr "Preferencje"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
-msgid "Print host upload queue"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
-msgid "Camera view "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
-msgid "Add Instance to selected object "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
-msgid "Remove Instance from selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
-msgid "Show keyboard shortcuts list"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
-msgid "Select multiple object/Move multiple object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
-msgid "Arrange"
-msgstr "Rozmieść"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
-msgid "Select All objects"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
-msgid "Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
-msgid "Delete All"
-msgstr "Usuń wszystko"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
-msgid "Gizmo move"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
-msgid "Gizmo scale"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
-msgid "Gizmo rotate"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Gizmo cut"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Gizmo Place face on bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Gizmo SLA support points"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Zoom to Bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Zoom to all objects in scene, if none selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Zoom to selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Zoom in"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Zoom out"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Unselect gizmo, keep object selection"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
-msgid "Plater Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Arrow Up"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Upper Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Arrow Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Lower Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
-msgid "Preview Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:53
-msgid ""
-" - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
-msgstr ""
-" - Pamiętaj aby sprawdzać aktualizacja na http://github.com/prusa3d/slic3r/"
-"releases"
-
-#: src/slic3r/GUI/MainFrame.cpp:130
-msgid "Plater"
-msgstr "Zawartość Stołu"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "&Otwórz"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "Open a project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "Save current project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save current project file as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Import STL/OBJ/AM&F/3MF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Load a model"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Import &Config"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Load exported configuration file"
-msgstr "Wczytaj wyeksportowany plik konfiguracyjny"
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Import Config from &project"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Load configuration from project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Import Config &Bundle"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Load presets from a bundle"
-msgstr "Wczytaj zestaw ustawień"
-
-#: src/slic3r/GUI/MainFrame.cpp:256
-msgid "&Import"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export &G-code"
-msgstr "Eksport &G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export current plate as G-code"
-msgstr "Eksport zawartości stołu jako G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export plate as &STL"
-msgstr "Eksport zawartości stołu jako &STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export current plate as STL"
-msgstr "Eksport zawartości stołu jako STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export plate as &AMF"
-msgstr "Eksport zawartości stołu jako &AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export current plate as AMF"
-msgstr "Eksport zawartości stołu jako AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export &Config"
-msgstr "Eksport &Konfiguracji"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export current configuration to file"
-msgstr "Eksport obecnej konfiguracji do pliku"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export Config &Bundle"
-msgstr "Eksport &Paczki Konfiguracyjnej"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export all presets to file"
-msgstr "Eksport wszystkich zestawów ustawień do pliku"
-
-#: src/slic3r/GUI/MainFrame.cpp:271
-msgid "&Export"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Slice a file into a G-code"
-msgstr "Cięcie jako G-code"
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Quick Slice and Save As"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Slice a file into a G-code, save as"
-msgstr "Cięcie jako G-code, zapisz jako"
-
-#: src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat Last Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "(Re)Slice &Now"
-msgstr "T&nij (ponownie)"
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "Start new slicing process"
-msgstr "Uruchom nowy proces cięcia"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "&Repair STL file"
-msgstr "Na&prawa pliku STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "Automatically repair an STL file"
-msgstr "Automatyczna naprawa pliku STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "&Quit"
-msgstr "&Wyjście"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "Quit Slic3r"
-msgstr "Zamknij Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "&Select all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "Selects all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "&Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "Deletes the current selection"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Delete &all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Deletes all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "&Plater Tab"
-msgstr "Zakładka &Stół"
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "Show the plater"
-msgstr "Pokaż zawartość stołu"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "P&rint Settings Tab"
-msgstr "Ustawienia D&ruku"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "Show the print settings"
-msgstr "Pokaż ustawienia druku"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "&Filament Settings Tab"
-msgstr "Ustawienia &Filamentu"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "Show the filament settings"
-msgstr "Pokaż ustawienia filamentu"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Print&er Settings Tab"
-msgstr "&Ustawienia Drukarki"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Show the printer settings"
-msgstr "Pokaż ustawienia drukarki"
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "3&D"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "Show the 3D editing view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Pre&view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Show the 3D slices preview"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Print &Host Upload Queue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Display the Print Host Upload Queue window"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr "&Izometryczny"
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "Iso View"
-msgstr "Widok izometryczny"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr "Z &góry"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "Top View"
-msgstr "Widok z góry"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr "Od &dołu"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "Bottom View"
-msgstr "Widok od dołu"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr "&Przód"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "Front View"
-msgstr "Widok przodu"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr "&Tył"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "Rear View"
-msgstr "Widok z tyłu"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr "&Lewo"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "Left View"
-msgstr "Widok lewy"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr "P&rawo"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "Right View"
-msgstr "Widok prawy"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Prusa 3D &Drivers"
-msgstr "&Sterowniki Prusa3D"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr "Otwórz stronę Prusa3D ze sterownikami w przeglądarce"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
-msgstr "W&ydania Prusa Edition"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
-msgstr "Otwórz stronę z wydaniami Prusa Edition w przeglądarce"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
-msgstr "Strona &WWW Slic3ra"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
-msgstr "Otwórz stronę Slic3ra w przeglądarce"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr "I&nstrukcja"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr "Otwórz instrukcję do Slic3ra w przeglądarce"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "System &Info"
-msgstr "&Informacje o systemie"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "Show system information"
-msgstr "Pokaż informacje o systemie"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show &Configuration Folder"
-msgstr "Pokaż folder &Konfiguracyjny"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show user configuration folder (datadir)"
-msgstr "Pokaż folder z konfiguracjami użytkownika (datadir)"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an I&ssue"
-msgstr "Zgłoś &problem"
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
-msgstr "Zgłoś problem z Slic3r Prusa Edition"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
-msgstr "Inform&acje o Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "Show about dialog"
-msgstr "Pokaż okienko"
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "Show the list of the keyboard shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:439
-msgid "&File"
-msgstr "&Plik"
-
-#: src/slic3r/GUI/MainFrame.cpp:440
-msgid "&Edit"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:441
-msgid "&Window"
-msgstr "&Okno"
-
-#: src/slic3r/GUI/MainFrame.cpp:442
-msgid "&View"
-msgstr "&Widok"
-
-#: src/slic3r/GUI/MainFrame.cpp:445
-msgid "&Help"
-msgstr "Pomo&c"
-
-#: src/slic3r/GUI/MainFrame.cpp:472
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Wybierz plik do pocięcia (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/MainFrame.cpp:486
-msgid "No previously sliced file."
-msgstr "Brak poprzednio pociętych plików."
-
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid "Previously sliced file ("
-msgstr "Poprzednio pocięty plik ("
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid ") not found."
-msgstr ") nie znaleziono."
-
-#: src/slic3r/GUI/MainFrame.cpp:493
-msgid "File Not Found"
-msgstr "Nie znaleziono pliku"
-
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
-msgid "Save "
-msgstr "Zapisz "
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "SVG"
-msgstr "SVG"
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "G-code"
-msgstr "G-code"
-
-# Context: L('Save ') . ($params{export_svg} ? L('SVG') : L('G-code')) . L(' file as:'), e.g. "Save G-Code file as:"
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid " file as:"
-msgstr " plik jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:548
-msgid "Save zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Slicing"
-msgstr "Cięcie"
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Processing "
-msgstr "Przetwarzanie "
-
-#: src/slic3r/GUI/MainFrame.cpp:583
-msgid " was successfully sliced."
-msgstr " został pomyślnie pocięty."
-
-#: src/slic3r/GUI/MainFrame.cpp:585
-msgid "Slicing Done!"
-msgstr "Cięcie zakończone!"
-
-#: src/slic3r/GUI/MainFrame.cpp:600
-msgid "Select the STL file to repair:"
-msgstr "Wybierz plik STL do naprawy:"
-
-#: src/slic3r/GUI/MainFrame.cpp:614
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr "Zapisz plik OBJ (mniej podatny na błędy współrzędnych niż STL) jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Your file was repaired."
-msgstr "Twój plik został naprawiony."
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Repair"
-msgstr "Naprawa"
-
-#: src/slic3r/GUI/MainFrame.cpp:643
-msgid "Save configuration as:"
-msgstr "Zapisz konfiguracjÄ™ jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
-msgid "Select configuration to load:"
-msgstr "Wybierz konfiguracjÄ™ do wczytania:"
-
-#: src/slic3r/GUI/MainFrame.cpp:700
-msgid "Save presets bundle as:"
-msgstr "Zapisz paczkę ustawień jako:"
-
-#: src/slic3r/GUI/MainFrame.cpp:751
-#, c-format
-msgid "%d presets successfully imported."
-msgstr "pomyślnie zaimportowano %d zestawów ustawień."
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r error"
-msgstr "BÅ‚Ä…d Slic3r"
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r has encountered an error"
-msgstr "Slic3r napotkał błąd"
-
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "Info"
-
-#: src/slic3r/GUI/Plater.cpp:126
-msgid "Volume"
-msgstr "Objętość"
-
-#: src/slic3r/GUI/Plater.cpp:127
-msgid "Facets"
-msgstr "Powierzchnie"
-
-#: src/slic3r/GUI/Plater.cpp:128
-msgid "Materials"
-msgstr "Materiały"
-
-#: src/slic3r/GUI/Plater.cpp:131
-msgid "Manifold"
-msgstr "Model zamknięty"
-
-#: src/slic3r/GUI/Plater.cpp:174
-msgid "Sliced Info"
-msgstr "Informacje o cięciu"
-
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
-msgid "Used Filament (m)"
-msgstr "Użyty filament (m)"
-
-#: src/slic3r/GUI/Plater.cpp:194
-msgid "Used Filament (mm³)"
-msgstr "Użyty filament (mm³)"
-
-#: src/slic3r/GUI/Plater.cpp:195
-msgid "Used Filament (g)"
-msgstr "Użyty filament (g)"
-
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
-msgid "Cost"
-msgstr "Koszt"
-
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
-msgid "Estimated printing time"
-msgstr "Szacowany czas druku"
-
-#: src/slic3r/GUI/Plater.cpp:198
-msgid "Number of tool changes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr "Podpory"
-
-#: src/slic3r/GUI/Plater.cpp:364
-msgid "Select what kind of support do you need"
-msgstr "Wybierz rodzaj potrzebnych podpór"
-
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "Brak"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
-msgid "Support on build plate only"
-msgstr "Podpory jedynie na powierzchni stołu"
-
-#: src/slic3r/GUI/Plater.cpp:367
-msgid "Everywhere"
-msgstr "Wszędzie"
-
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
-msgid "Brim"
-msgstr "Brim (obramowanie)"
-
-#: src/slic3r/GUI/Plater.cpp:381
-msgid ""
-"This flag enables the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Ta flaga włącza brim, który zostanie wydrukowany na pierwszej warstwie wokół "
-"każdego modelu."
-
-#: src/slic3r/GUI/Plater.cpp:390
-msgid "Purging volumes"
-msgstr "Objętości czyszczenia"
-
-#: src/slic3r/GUI/Plater.cpp:556
-msgid "Print settings"
-msgstr "Ustawienia druku"
-
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
-msgid "Filament"
-msgstr "Filament"
-
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
-msgid "SLA print"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
-msgid "SLA material"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:560
-msgid "Printer"
-msgstr "Drukarka"
-
-#: src/slic3r/GUI/Plater.cpp:588
-msgid "Send to printer"
-msgstr "Wyślij do drukarki"
-
-#: src/slic3r/GUI/Plater.cpp:607
-msgid "Slice now"
-msgstr "Cięcie"
-
-#: src/slic3r/GUI/Plater.cpp:787
-#, c-format
-msgid "%d (%d shells)"
-msgstr "%d (%d obrysów)"
-
-#: src/slic3r/GUI/Plater.cpp:792
-#, c-format
-msgid "Auto-repaired (%d errors)"
-msgstr "Naprawiono automatycznie (%d błędów)"
-
-#: src/slic3r/GUI/Plater.cpp:795
-#, c-format
-msgid ""
-"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
-"facets reversed, %d backwards edges"
-msgstr ""
-"%d nieprawidłowych powierzchni, %d naprawionych krawędzi, %d powierzchni "
-"usunięto, %d powierzchni dodano, %d powierzchni odwrócono, %d odwróconych "
-"krawędzi"
-
-#: src/slic3r/GUI/Plater.cpp:805
-msgid "Yes"
-msgstr "Tak"
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "wipe tower"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:855
-msgid "normal mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:859
-msgid "silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1304
-msgid "Loading"
-msgstr "Wczytywanie"
-
-#: src/slic3r/GUI/Plater.cpp:1314
-#, c-format
-msgid "Processing input file %s\n"
-msgstr "Przetwarzanie pliku wejściowego %s\n"
-
-#: src/slic3r/GUI/Plater.cpp:1366
-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 ""
-"Ten plik zawiera kilka modeli umieszczonych na różnych wysokościach. "
-"Potraktować go jako\n"
-"jeden model składający się z kilku części?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
-msgid "Multi-part object detected"
-msgstr "Wykryto obiekt wieloczęściowy"
-
-#: src/slic3r/GUI/Plater.cpp:1388
-#, 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 ""
-
-#: src/slic3r/GUI/Plater.cpp:1408
-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 ""
-"Kilka obiektów zostało załadowanych dla drukarki typu multi-material.\n"
-"Traktować je jako jeden model zawierający kilka części?\n"
-
-#: src/slic3r/GUI/Plater.cpp:1424
-msgid "Loaded"
-msgstr "Wczytano"
-
-#: src/slic3r/GUI/Plater.cpp:1492
-msgid ""
-"Your object appears to be too large, so it was automatically scaled down to "
-"fit your print bed."
-msgstr ""
-"Importowany model przekracza wymiary przestrzeni roboczej i został "
-"przeskalowany do odpowiednich rozmiarów."
-
-#: src/slic3r/GUI/Plater.cpp:1493
-msgid "Object too large?"
-msgstr "Model zbyt duży?"
-
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr "Export konfiguracji druku"
-
-#: src/slic3r/GUI/Plater.cpp:1538
-msgid "Save file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1702
-msgid "Arranging canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1705
-msgid "Arranging"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1736
-msgid "Could not arrange model objects! Some geometries may be invalid."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1740
-msgid "Arranging done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1782
-msgid "Orientation search canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1787
-msgid "Searching for optimal orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1797
-msgid "Orientation found."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1818
-msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
-msgstr ""
-"Wybrany model nie może być podzielony ponieważ składa się z więcej niż "
-"jednej części lub zawiera więcej niż jeden materiał."
-
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
-msgid "Cancelling"
-msgstr "Anulowanie"
-
-#: src/slic3r/GUI/Plater.cpp:1962
-msgid "Another export job is currently running."
-msgstr "W tej chwili trwa inny proces eksportu."
-
-#: src/slic3r/GUI/Plater.cpp:2215
-msgid "Export failed"
-msgstr "Niepowodzenie eksportu"
-
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "Usuń"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "Usuń wybrany model"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Increase copies"
-msgstr "Zwiększ kopie"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Place one more copy of the selected object"
-msgstr "Umieść jedną kopię zaznaczonego modelu"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Decrease copies"
-msgstr "Zmniejsz kopie"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Remove one copy of the selected object"
-msgstr "Usuń jedną kopię wybranego modelu"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Set number of copies"
-msgstr "Ustaw ilość kopii"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Change the number of copies of the selected object"
-msgstr "Zmień ilość kopii wybranego modelu"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload from Disk"
-msgstr "Wczytaj ponownie z dysku"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload the selected file from Disk"
-msgstr "Wczytaj ponownie wybrany plik z dysku"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
-msgstr "Eksport modelu jako STL"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "Eksport pojedynczego modelu jako plik STL"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Along X axis"
-msgstr "Wzdłuż osi X"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Mirror the selected object along the X axis"
-msgstr "Odbicie lustrzane wybranego modelu w osi X"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Along Y axis"
-msgstr "Wzdłuż osi Y"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Mirror the selected object along the Y axis"
-msgstr "Odbicie lustrzane wybranego modelu w osi Y"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Along Z axis"
-msgstr "Wzdłuż osi Z"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Mirror the selected object along the Z axis"
-msgstr "Odbicie lustrzane wybranego modelu w osi Z"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror"
-msgstr "Lustrzane"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror the selected object"
-msgstr "Odbicie lustrzane wybranego modelu"
-
-#: src/slic3r/GUI/Plater.cpp:2400
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
-msgid "Split the selected object into individual objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
-msgid "Split the selected object into individual sub-parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
-msgid "Split"
-msgstr "Podziel"
-
-#: src/slic3r/GUI/Plater.cpp:2405
-msgid "Split the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save G-code file as:"
-msgstr "Zapisz plik G-code jako:"
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2845
-#, c-format
-msgid "STL file exported to %s"
-msgstr "Plik STL został wyeksportowany do %s"
-
-#: src/slic3r/GUI/Plater.cpp:2861
-#, c-format
-msgid "AMF file exported to %s"
-msgstr "Plik AMF został wyeksportowany do %s"
-
-#: src/slic3r/GUI/Plater.cpp:2864
-#, c-format
-msgid "Error exporting AMF file %s"
-msgstr "BÅ‚Ä…d eksportu pliku AMF %s"
-
-#: src/slic3r/GUI/Plater.cpp:2891
-#, c-format
-msgid "3MF file exported to %s"
-msgstr "Plik 3MF został wyeksportowany do %s"
-
-#: src/slic3r/GUI/Plater.cpp:2894
-#, c-format
-msgid "Error exporting 3MF file %s"
-msgstr "BÅ‚Ä…d eksportu pliku 3MF %s"
-
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
-msgid "General"
-msgstr "Ogólne"
-
-#: src/slic3r/GUI/Preferences.cpp:34
-msgid "Remember output directory"
-msgstr "Zapamiętaj katalog wyjściowy"
-
-#: src/slic3r/GUI/Preferences.cpp:36
-msgid ""
-"If this is enabled, Slic3r will prompt the last output directory instead of "
-"the one containing the input files."
-msgstr ""
-"Włączenie spowoduje, że Slic3r będzie za każdym razem pytał gdzie "
-"wyeksportować plik zamiast używać katalogu z plikami wejściowymi."
-
-#: src/slic3r/GUI/Preferences.cpp:42
-msgid "Auto-center parts"
-msgstr "Rozmieść modele automatycznie"
-
-#: src/slic3r/GUI/Preferences.cpp:44
-msgid ""
-"If this is enabled, Slic3r will auto-center objects around the print bed "
-"center."
-msgstr ""
-"Spowoduje, że Slic3r będzie automatycznie umieszczał modele wokół centrum "
-"stołu."
-
-#: src/slic3r/GUI/Preferences.cpp:50
-msgid "Background processing"
-msgstr "Przetwarzanie w tle"
-
-#: src/slic3r/GUI/Preferences.cpp:52
-msgid ""
-"If this is enabled, Slic3r will pre-process objects as soon as they're "
-"loaded in order to save time when exporting G-code."
-msgstr ""
-"Spowoduje, że Slic3r będzie automatycznie procesował modele jak tylko "
-"zostaną załadowane aby zmniejszyć czas eksportu G-code."
-
-#: src/slic3r/GUI/Preferences.cpp:74
-msgid "Suppress \" - default - \" presets"
-msgstr "Ukryj \" - domyślne - \" zestawy ustawień"
-
-#: src/slic3r/GUI/Preferences.cpp:76
-msgid ""
-"Suppress \" - default - \" presets in the Print / Filament / Printer "
-"selections once there are any other valid presets available."
-msgstr ""
-"Ukryj \" - domyślne - \" zestawy ustawień w zakładkach Druk / Filament / "
-"Drukarka gdy dostępne są inne kompatybilne ustawienia."
-
-#: src/slic3r/GUI/Preferences.cpp:82
-msgid "Show incompatible print and filament presets"
-msgstr "Pokaż niekompatybilne ustawienia druku i filamentów"
-
-#: src/slic3r/GUI/Preferences.cpp:84
-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 ""
-"Zaznaczenie tej opcji spowoduje wyświetlanie wszystkich ustawień druku i "
-"filamentów w edytorze zestawów ustawień, nawet jeśli są oznaczone jak "
-"niekompatybilne z wybranÄ… drukarkÄ…"
-
-#: src/slic3r/GUI/Preferences.cpp:90
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr "Użyj renderowania OpenGL 1.1 (przestarzałe)"
-
-#: src/slic3r/GUI/Preferences.cpp:92
-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 ""
-"Jeśli napotykasz błędy spowodowane problematycznym sterownikiem OpenGL 2.0, "
-"spróbuj zaznaczyć to pole. Wyłączy to edycję wysokości warstwy i anti-"
-"aliasing, więc prawdopodobnie lepiej będzie zaktualizować sterowniki karty "
-"graficznej."
-
-#: src/slic3r/GUI/Preferences.cpp:115
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr "Trzeba zrestartować Slic3r aby wprowadzić zmiany."
-
-#: src/slic3r/GUI/Preset.cpp:170
-msgid "modified"
-msgstr ""
-
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
-msgid "System presets"
-msgstr "Ustawienia systemowe"
-
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
-msgid "User presets"
-msgstr "Zestawy użytkownika"
-
-#: src/slic3r/GUI/Preset.cpp:1157
-msgid "filament"
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:28
-#, c-format
-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 ""
-"Jeśli szacowany czas druku warstwy jest niższy niż ~%d s, wentylator będzie "
-"pracował na %d %% a prędkość druku zostanie obniżona tak, aby warstwa była "
-"drukowana przez nie mniej niż %d s  (jednakże prędkość nie zejdzie poniżej "
-"%d mm/s)."
-
-#: src/slic3r/GUI/PresetHints.cpp:32
-#, c-format
-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"
-"Jeśli szacowany czas jest wyższy, ale poniżej ~%ds, wentylator będzie "
-"pracował z proporcjonalnie zmniejszaną prędkością poniędzy %d%% a %d%%."
-
-#: src/slic3r/GUI/PresetHints.cpp:36
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-"\n"
-"Na pozostałych warstwach, wentylator "
-
-#: src/slic3r/GUI/PresetHints.cpp:38
-msgid "Fan "
-msgstr "Wentylator "
-
-#: src/slic3r/GUI/PresetHints.cpp:43
-#, c-format
-msgid "will always run at %d%% "
-msgstr "będzie zawsze pracować w %d %% "
-
-#: src/slic3r/GUI/PresetHints.cpp:46
-#, c-format
-msgid "except for the first %d layers"
-msgstr "za wyjÄ…tkiem pierwszych %d warstw"
-
-#: src/slic3r/GUI/PresetHints.cpp:50
-msgid "except for the first layer"
-msgstr "za wyjÄ…tkiem pierwszej warstwy"
-
-#: src/slic3r/GUI/PresetHints.cpp:52
-msgid "will be turned off."
-msgstr "będzie wyłączony."
-
-#: src/slic3r/GUI/PresetHints.cpp:153
-msgid "external perimeters"
-msgstr "obrysów zewnętrznych"
-
-#: src/slic3r/GUI/PresetHints.cpp:162
-msgid "perimeters"
-msgstr "obrysy"
-
-#: src/slic3r/GUI/PresetHints.cpp:171
-msgid "infill"
-msgstr "wypełnienia"
-
-#: src/slic3r/GUI/PresetHints.cpp:181
-msgid "solid infill"
-msgstr "zwarte wypełnienie"
-
-#: src/slic3r/GUI/PresetHints.cpp:189
-msgid "top solid infill"
-msgstr "zwarte wypełnienie na szczycie"
-
-#: src/slic3r/GUI/PresetHints.cpp:200
-msgid "support"
-msgstr "podpora"
-
-#: src/slic3r/GUI/PresetHints.cpp:210
-msgid "support interface"
-msgstr "warstwa Å‚Ä…czÄ…ca podpory z modelem"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "First layer volumetric"
-msgstr "Na pierwszej warstwie"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Bridging volumetric"
-msgstr "Mosty objętościowe"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Volumetric"
-msgstr "Objętościowy"
-
-#: src/slic3r/GUI/PresetHints.cpp:217
-msgid " flow rate is maximized "
-msgstr " przepływ osiąga wartości szczytowe "
-
-#: src/slic3r/GUI/PresetHints.cpp:220
-msgid "by the print profile maximum"
-msgstr "maksimum zależny od profilu wydruku"
-
-#: src/slic3r/GUI/PresetHints.cpp:221
-msgid "when printing "
-msgstr "podczas druku "
-
-#: src/slic3r/GUI/PresetHints.cpp:222
-msgid " with a volumetric rate "
-msgstr " ze współczynnikiem objętościowym "
-
-#: src/slic3r/GUI/PresetHints.cpp:226
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr "%3.2f mm³/s"
-
-#: src/slic3r/GUI/PresetHints.cpp:228
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr " z prędkością filamentu %3.2f mm/s."
-
-#: src/slic3r/GUI/PresetHints.cpp:247
-msgid ""
-"Recommended object thin wall thickness: Not available due to invalid layer "
-"height."
-msgstr ""
-"Zalecana grubość ścian dla modelu: niedostępna ze względu na niewłaściwą "
-"wysokość warstwy."
-
-#: src/slic3r/GUI/PresetHints.cpp:264
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr "Zalecana grubość ściany modelu dla wysokości warstwy %.2f i "
-
-#: src/slic3r/GUI/PresetHints.cpp:271
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr "%d linii: %.2lf mm"
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Send G-Code to printer host"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Upload to Printer Host with the following filename:"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
-msgid "Start printing after upload"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
-msgid "Use forward slashes ( / ) as a directory separator if needed."
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
-msgid "Cancel selected"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
-msgid "Show error message"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
-msgid "Enqueued"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
-msgid "Uploading"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
-msgid "Completed"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
-msgid "Error uploading to print host:"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:23
-msgid "NO RAMMING AT ALL"
-msgstr "BRAK WYCISKANIA"
-
-#: src/slic3r/GUI/RammingChart.cpp:76
-msgid "Time"
-msgstr "Czas"
-
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
-msgid "s"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:81
-msgid "Volumetric speed"
-msgstr "Prędkość objętościowa"
-
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
-msgid "Slic3r Prusa Edition - System Information"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
-msgid "Compatible printers"
-msgstr "Kompatybilne drukarki"
-
-#: src/slic3r/GUI/Tab.cpp:50
-msgid "Select the printers this profile is compatible with."
-msgstr "Wybierz drukarki kompatybilne z tym profilem."
-
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
-msgid "Compatible print profiles"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:56
-msgid "Select the print profiles this profile is compatible with."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:118
-msgid "Save current "
-msgstr "Zapisz bieżące "
-
-#: src/slic3r/GUI/Tab.cpp:119
-msgid "Delete this preset"
-msgstr "Usuń ten zestaw ustawień"
-
-#: src/slic3r/GUI/Tab.cpp:131
-msgid ""
-"Hover the cursor over buttons to find more information \n"
-"or click this button."
-msgstr ""
-"Umieść kursor nad przyciskiem aby uzyskać więcej informacji\n"
-"lub kliknij ten przycisk."
-
-#: src/slic3r/GUI/Tab.cpp:824
-msgid "It's a default preset."
-msgstr "Domyślny zestaw ustawień."
-
-#: src/slic3r/GUI/Tab.cpp:825
-msgid "It's a system preset."
-msgstr "To jest systemowy zestaw ustawień."
-
-#: src/slic3r/GUI/Tab.cpp:826
-msgid "Current preset is inherited from "
-msgstr "Obecny zestaw ustawień jest dziedziczony z "
-
-#: src/slic3r/GUI/Tab.cpp:831
-msgid "It can't be deleted or modified. "
-msgstr "Nie można usunąć ani zmodyfikować. "
-
-#: src/slic3r/GUI/Tab.cpp:832
-msgid ""
-"Any modifications should be saved as a new preset inherited from this one. "
-msgstr ""
-"Każda modyfikacja powinna zostać zapisana jako nowy zestaw ustawień "
-"dziedziczony z obecnego. "
-
-#: src/slic3r/GUI/Tab.cpp:833
-msgid "To do that please specify a new name for the preset."
-msgstr "Aby to zrobić ustaw nową nazwę zestawu ustawień."
-
-#: src/slic3r/GUI/Tab.cpp:837
-msgid "Additional information:"
-msgstr "Dodatkowe informacje:"
-
-#: src/slic3r/GUI/Tab.cpp:843
-msgid "printer model"
-msgstr "model drukarki"
-
-#: src/slic3r/GUI/Tab.cpp:851
-msgid "default print profile"
-msgstr "domyślny profil druku"
-
-#: src/slic3r/GUI/Tab.cpp:854
-msgid "default filament profile"
-msgstr "domyślny profil filamentu"
-
-#: src/slic3r/GUI/Tab.cpp:868
-msgid "default SLA material profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:872
-msgid "default SLA print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
-msgid "Layers and perimeters"
-msgstr "Warstwy i obrysy"
-
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
-msgid "Layer height"
-msgstr "Wysokość warstwy"
-
-#: src/slic3r/GUI/Tab.cpp:924
-msgid "Vertical shells"
-msgstr "Powłoka pionowa"
-
-#: src/slic3r/GUI/Tab.cpp:935
-msgid "Horizontal shells"
-msgstr "Powłoka pozioma"
-
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
-msgid "Solid layers"
-msgstr "Zwarte warstwy"
-
-#: src/slic3r/GUI/Tab.cpp:941
-msgid "Quality (slower slicing)"
-msgstr "Jakość (wolniejsze cięcie)"
-
-#: src/slic3r/GUI/Tab.cpp:958
-msgid "Reducing printing time"
-msgstr "Obniżanie czasu wydruku"
-
-#: src/slic3r/GUI/Tab.cpp:970
-msgid "Skirt and brim"
-msgstr "Skirt i brim"
-
-#: src/slic3r/GUI/Tab.cpp:987
-msgid "Raft"
-msgstr "Tratwa (raft)"
-
-#: src/slic3r/GUI/Tab.cpp:991
-msgid "Options for support material and raft"
-msgstr "Opcje materiału podporowego i tratwy (raft)"
-
-#: src/slic3r/GUI/Tab.cpp:1006
-msgid "Speed for print moves"
-msgstr "Prędkość ruchów drukujących"
-
-#: src/slic3r/GUI/Tab.cpp:1018
-msgid "Speed for non-print moves"
-msgstr "Prędkość ruchów jałowych"
-
-#: src/slic3r/GUI/Tab.cpp:1021
-msgid "Modifiers"
-msgstr "Modyfikatory"
-
-#: src/slic3r/GUI/Tab.cpp:1024
-msgid "Acceleration control (advanced)"
-msgstr "Ustawienia przyspieszeń (zaawansowane)"
-
-#: src/slic3r/GUI/Tab.cpp:1031
-msgid "Autospeed (advanced)"
-msgstr "Automatyczne dostosowanie prędkości (zaawansowane)"
-
-#: src/slic3r/GUI/Tab.cpp:1037
-msgid "Multiple Extruders"
-msgstr "Kilka ekstruderów"
-
-#: src/slic3r/GUI/Tab.cpp:1045
-msgid "Ooze prevention"
-msgstr "Zapobieganie wyciekom (ooze)"
-
-#: src/slic3r/GUI/Tab.cpp:1062
-msgid "Extrusion width"
-msgstr "Szerokość ekstruzji"
-
-#: src/slic3r/GUI/Tab.cpp:1072
-msgid "Overlap"
-msgstr "Nakładanie"
-
-#: src/slic3r/GUI/Tab.cpp:1075
-msgid "Flow"
-msgstr "Przepływ"
-
-#: src/slic3r/GUI/Tab.cpp:1078
-msgid "Other"
-msgstr "Inne"
-
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
-msgid "Output options"
-msgstr "Opcje wyjściowe"
-
-#: src/slic3r/GUI/Tab.cpp:1086
-msgid "Sequential printing"
-msgstr "Drukowanie sekwencyjne (model po modelu)"
-
-#: src/slic3r/GUI/Tab.cpp:1088
-msgid "Extruder clearance (mm)"
-msgstr "Odstęp od ekstrudera (mm)"
-
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
-msgid "Output file"
-msgstr "Plik wyjściowy"
-
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
-msgid "Post-processing scripts"
-msgstr "Skrypty do przetwarzania końcowego"
-
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
-msgid "Notes"
-msgstr "Notatki"
-
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
-msgid "Dependencies"
-msgstr "Zależności"
-
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
-msgid "Profile dependencies"
-msgstr "Zależności profilowe"
-
-#: src/slic3r/GUI/Tab.cpp:1161
-#, no-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"
-"- no ensure_vertical_shell_thickness\n"
-"\n"
-"Shall I adjust those settings in order to enable Spiral Vase?"
-msgstr ""
-"Wymagania trybu wazy:\n"
-"- jeden obrys\n"
-"- brak warstw górnych\n"
-"- 0% wypełnienia\n"
-"- brak materiału podporowego\n"
-"- brak opcji \"zagwarantuj odpowiednią grubość ścianki\"\n"
-"\n"
-"Czy ustawić te parametry odpowiednio dla trybu wazy?"
-
-#: src/slic3r/GUI/Tab.cpp:1168
-msgid "Spiral Vase"
-msgstr "Tryb Wazy"
-
-#: src/slic3r/GUI/Tab.cpp:1191
-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 ""
-"Użycie wieży czyszczącej jest możliwe jedynie przy użyciu nierozpuszczalnych "
-"podpór\n"
-"gdy są drukowane z obecnie używanego ekstrudera, bez inicjowania jego "
-"zmiany.\n"
-"(zarówno support_material_extruder i support_material_interface_extruder "
-"muszą być ustawione na 0).\n"
-"\n"
-"Zmienić te ustawienia aby włączyć wieżę czyszczącą?"
-
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
-msgid "Wipe Tower"
-msgstr "Wieża Czyszcząca"
-
-#: src/slic3r/GUI/Tab.cpp:1209
-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 ""
-"Aby wieża czyszcząca działała przy rozpuszczalnych podporach, warstwy "
-"podporowe muszą być zsynchronizowane z warstwami modelu.\n"
-"\n"
-"Zsynchronizować warstwy podporowe aby włączyć wieżę czyszczącą?"
-
-#: src/slic3r/GUI/Tab.cpp:1227
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters\n"
-"\n"
-"Shall I adjust those settings for supports?"
-msgstr ""
-"Druk podpór daje lepsze efekty, gdy następująca funkcja jest włączona:\n"
-"- Wykrywanie mostów przy obrysach\n"
-"\n"
-"Zmienić tą opcję dla druku podpór?"
-
-#: src/slic3r/GUI/Tab.cpp:1230
-msgid "Support Generator"
-msgstr "Generator Podpór"
-
-# Used in context: _("The ") + str_fill_pattern + _(" infill pattern is not supposed to work at 100% density.\n")
-#: src/slic3r/GUI/Tab.cpp:1272
-msgid "The "
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1272
-#, no-c-format
-msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
-"\n"
-"Shall I switch to rectilinear fill pattern?"
-msgstr ""
-" wzór wypełnienia nie działa z gęstością 100%.\n"
-"\n"
-"Zmienić wzór wypełnienia na linie równoległe?"
-
-#: src/slic3r/GUI/Tab.cpp:1388
-msgid "Temperature "
-msgstr "Temperatura "
-
-#: src/slic3r/GUI/Tab.cpp:1394
-msgid "Bed"
-msgstr "Stół"
-
-#: src/slic3r/GUI/Tab.cpp:1399
-msgid "Cooling"
-msgstr "Chłodzenie"
-
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
-msgid "Enable"
-msgstr "WÅ‚Ä…cz"
-
-#: src/slic3r/GUI/Tab.cpp:1411
-msgid "Fan settings"
-msgstr "Ustawienia wentylatora"
-
-#: src/slic3r/GUI/Tab.cpp:1412
-msgid "Fan speed"
-msgstr "Prędkość wentylatora"
-
-#: src/slic3r/GUI/Tab.cpp:1420
-msgid "Cooling thresholds"
-msgstr "Progi chłodzenia"
-
-#: src/slic3r/GUI/Tab.cpp:1426
-msgid "Filament properties"
-msgstr "Właściwości filamentu"
-
-#: src/slic3r/GUI/Tab.cpp:1430
-msgid "Print speed override"
-msgstr "Nadpisanie prędkości druku"
-
-#: src/slic3r/GUI/Tab.cpp:1440
-msgid "Toolchange parameters with single extruder MM printers"
-msgstr "Parametry zmiany narzędzia dla drukarek MM z jednym ekstruderem"
-
-#: src/slic3r/GUI/Tab.cpp:1455
-msgid "Ramming settings"
-msgstr "Ustawienia wyciskania"
-
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
-msgid "Custom G-code"
-msgstr "WÅ‚asny G-code"
-
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
-msgid "Start G-code"
-msgstr "G-code startowy"
-
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
-msgid "End G-code"
-msgstr "Końcowy G-code"
-
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
-msgid " Browse "
-msgstr " PrzeglÄ…daj "
-
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
-msgid "Test"
-msgstr "Test"
-
-#: src/slic3r/GUI/Tab.cpp:1615
-msgid "Could not get a valid Printer Host reference"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
-msgid "Success!"
-msgstr "Powodzenie!"
-
-#: src/slic3r/GUI/Tab.cpp:1636
-msgid ""
-"HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
-"signed certificate."
-msgstr ""
-"Plik HTTPS CA jest opcjonalny. Jest potrzebny jedynie w sytuacji, gdy "
-"używasz HTTPS z certyfikatem samopodpisanym."
-
-#: src/slic3r/GUI/Tab.cpp:1648
-msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-msgstr "Pliki certyfikatów (*.crt, *.pem)|*.crt;*.pem|Wszystkie pliki|*.*"
-
-#: src/slic3r/GUI/Tab.cpp:1649
-msgid "Open CA certificate file"
-msgstr "Otwórz plik certyfikatu CA"
-
-#: src/slic3r/GUI/Tab.cpp:1676
-msgid ""
-"HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
-"Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate "
-"Store / Keychain."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
-msgid "Size and coordinates"
-msgstr "Rozmiar i koordynaty"
-
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
-msgid " Set "
-msgstr " Ustaw "
-
-#: src/slic3r/GUI/Tab.cpp:1740
-msgid "Capabilities"
-msgstr "Możliwości"
-
-#: src/slic3r/GUI/Tab.cpp:1745
-msgid "Number of extruders of the printer."
-msgstr "Liczba ekstruderów drukarki."
-
-#: src/slic3r/GUI/Tab.cpp:1773
-msgid "USB/Serial connection"
-msgstr "Połączenie USB/szeregowe"
-
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
-msgid "Serial port"
-msgstr "Port szeregowy"
-
-#: src/slic3r/GUI/Tab.cpp:1779
-msgid "Rescan serial ports"
-msgstr "Przeskanuj porty szeregowe"
-
-#: src/slic3r/GUI/Tab.cpp:1801
-msgid "Connection to printer works correctly."
-msgstr "Połączenie z drukarką pomyślne."
-
-#: src/slic3r/GUI/Tab.cpp:1804
-msgid "Connection failed."
-msgstr "Błąd połączenia."
-
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
-msgid "Print Host upload"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
-msgid "Before layer change G-code"
-msgstr "G-code wykonywany przed zmianÄ… warstwy"
-
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
-msgid "After layer change G-code"
-msgstr "G-code wykonywany po zmianie warstwy"
-
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
-msgid "Tool change G-code"
-msgstr "G-code wykonywany przy zmianie narzędzia"
-
-#: src/slic3r/GUI/Tab.cpp:1877
-msgid "Between objects G-code (for sequential printing)"
-msgstr ""
-"G-code wykonywany przy przejściach pomiędzy modelami (druk sekwencyjny)"
-
-#: src/slic3r/GUI/Tab.cpp:1938
-msgid "Display"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
-msgid "Corrections"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
-msgid "Machine limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2025
-msgid "Values in this column are for Full Power mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2026
-msgid "Full Power"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2031
-msgid "Values in this column are for Silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2032
-msgid "Silent"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2040
-msgid "Maximum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2045
-msgid "Maximum accelerations"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2052
-msgid "Jerk limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2057
-msgid "Minimum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
-msgid "Single extruder MM setup"
-msgstr "Ustawienia MM dla jednego ekstrudera"
-
-#: src/slic3r/GUI/Tab.cpp:2104
-msgid "Single extruder multimaterial parameters"
-msgstr "Parametry multimaterial przy jednym ekstruderze"
-
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
-#, c-format
-msgid "Extruder %d"
-msgstr "Ekstruder %d"
-
-#: src/slic3r/GUI/Tab.cpp:2125
-msgid "Layer height limits"
-msgstr "Limit wysokości warstw"
-
-#: src/slic3r/GUI/Tab.cpp:2130
-msgid "Position (for multi-extruder printers)"
-msgstr "Pozycja (dla drukarek z kilkoma ekstruderami)"
-
-#: src/slic3r/GUI/Tab.cpp:2133
-msgid "Retraction"
-msgstr "Retrakcja"
-
-#: src/slic3r/GUI/Tab.cpp:2136
-msgid "Only lift Z"
-msgstr "Tylko z-hop"
-
-#: src/slic3r/GUI/Tab.cpp:2149
-msgid ""
-"Retraction when tool is disabled (advanced settings for multi-extruder "
-"setups)"
-msgstr ""
-"Retrakcja gdy dany ekstruder nie jest w użyciu (funkcja zaawansowana dla "
-"drukarek z kilkoma ekstruderami)"
-
-#: src/slic3r/GUI/Tab.cpp:2153
-msgid "Preview"
-msgstr "PodglÄ…d"
-
-#: src/slic3r/GUI/Tab.cpp:2284
-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 ""
-"Opcja czyszczenia dyszy nie jest dostępna z funkcją Retrakcji w Firmware "
-"(Firmware Retraction).\n"
-"\n"
-"Wyłączyć ją aby włączyć Firmware Retraction?"
-
-#: src/slic3r/GUI/Tab.cpp:2286
-msgid "Firmware Retraction"
-msgstr "Retrakcja z firmware"
-
-#: src/slic3r/GUI/Tab.cpp:2565
-#, c-format
-msgid "Default preset (%s)"
-msgstr "Domyślne zestaw ustawień (%s)"
-
-#: src/slic3r/GUI/Tab.cpp:2566
-#, c-format
-msgid "Preset (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2583
-msgid "has the following unsaved changes:"
-msgstr "ma następujące niezapisane zmiany:"
-
-#: src/slic3r/GUI/Tab.cpp:2586
-msgid "is not compatible with printer"
-msgstr "nie jest kompatybilne z drukarkÄ…"
-
-#: src/slic3r/GUI/Tab.cpp:2587
-msgid "is not compatible with print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2589
-msgid "and it has the following unsaved changes:"
-msgstr "i ma następujące niezapisane zmiany:"
-
-#: src/slic3r/GUI/Tab.cpp:2592
-msgid "Discard changes and continue anyway?"
-msgstr "Odrzucić zmiany i kontynuować?"
-
-#: src/slic3r/GUI/Tab.cpp:2593
-msgid "Unsaved Changes"
-msgstr "Niezapisane zmiany"
-
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
-msgid "Please check your object list before preset changing."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2699
-msgid "The supplied name is empty. It can't be saved."
-msgstr "Podana nazwa jest pusta. Nie można zapisać."
-
-#: src/slic3r/GUI/Tab.cpp:2704
-msgid "Cannot overwrite a system profile."
-msgstr "Nie można nadpisać profilu systemowego."
-
-#: src/slic3r/GUI/Tab.cpp:2708
-msgid "Cannot overwrite an external profile."
-msgstr "Nie można nadpisać profilu zewnętrznego."
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "remove"
-msgstr "usuń"
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "delete"
-msgstr "usuń"
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid "Are you sure you want to "
-msgstr "Czy na pewno chcesz "
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid " the selected preset?"
-msgstr " wybrany zestaw ustawień?"
-
-#: src/slic3r/GUI/Tab.cpp:2736
-msgid "Remove"
-msgstr "Usuń"
-
-#: src/slic3r/GUI/Tab.cpp:2737
-msgid " Preset"
-msgstr " Zestaw ustawień"
-
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "Wszystko"
-
-#: src/slic3r/GUI/Tab.cpp:2869
-msgid ""
-"LOCKED LOCK;indicates that the settings are the same as the system values "
-"for the current option group"
-msgstr ""
-"ZAMKNIĘTA K�ÓDKA;oznacza, że ustawienia są takie same jak wartości systemowe "
-"w obecnej grupie ustawień"
-
-#: src/slic3r/GUI/Tab.cpp:2872
-msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
-"the system values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group "
-"to the system values."
-msgstr ""
-"OTWARTA K�ÓDKA; oznacza, że niektóre ustawienia zostały zmodyfikowane i nie "
-"odpowiadają wartościom systemowym w obecnej grupie opcji.\n"
-"Kliknij ikonę OTWARTEJ K�ÓDKI aby zresetować wszystkie ustawienia obecnej "
-"grupy ustawień do wartości systemowych."
-
-#: src/slic3r/GUI/Tab.cpp:2878
-msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr ""
-"BIA�A KROPKA;dla lewego przycisku: wskazuje na niesystemowy zestaw "
-"ustawień,\n"
-"dla prawego przycisku: wskazuje, że ustawienia nie zostały zmodyfikowane."
-
-#: src/slic3r/GUI/Tab.cpp:2882
-msgid ""
-"BACK ARROW;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 ""
-"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 ikonę STRZA�KI W TY� aby zresetować wszystkie ustawienia w obecnej "
-"grupie opcji do tych z ostatnio zapisanego zestawu ustawień."
-
-#: src/slic3r/GUI/Tab.cpp:2908
-msgid ""
-"LOCKED LOCK icon indicates that the settings are the same as the system "
-"values for the current option group"
-msgstr ""
-"ZAMKNIĘTA K�ÓDKA oznacza, że ustawienia są takie same jak wartości systemowe "
-"w obecnej grupie ustawień"
-
-#: src/slic3r/GUI/Tab.cpp:2910
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not "
-"equal to the system values for the current option group.\n"
-"Click to reset all settings for current option group to the system values."
-msgstr ""
-"OTWARTA K�ÓDKA oznacza, że niektóre ustawienia zostały zmodyfikowane i nie "
-"odpowiadają wartościom systemowym w obecnej grupie opcji.\n"
-"Kliknij aby zresetować wszystkie ustawienia obecnej grupy ustawień do "
-"wartości systemowych."
-
-#: src/slic3r/GUI/Tab.cpp:2913
-msgid "WHITE BULLET icon indicates a non system preset."
-msgstr "BIA�A KROPKA oznacza niesystemowy zestaw ustawień."
-
-#: src/slic3r/GUI/Tab.cpp:2916
-msgid ""
-"WHITE BULLET icon indicates that the settings are the same as in the last "
-"saved preset for the current option group."
-msgstr ""
-"BIA�A KROPKA oznacza, że ustawienia są takie same jak w ostatnio zapisanym "
-"zestawie ustawień dla obecnej grupy opcji."
-
-#: src/slic3r/GUI/Tab.cpp:2918
-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:2924
-msgid ""
-"LOCKED LOCK icon indicates that the value is the same as the system value."
-msgstr ""
-"ZAMKNIĘTA K�ÓDKA oznacza, że ustawienia są takie same jak wartości systemowe."
-
-#: src/slic3r/GUI/Tab.cpp:2925
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
-"the system value.\n"
-"Click to reset current value to the system value."
-msgstr ""
-"OTWARTA K�ÓDKA oznacza, że niektóre ustawienia zostały zmodyfikowane i nie "
-"odpowiadają wartościom systemowym.\n"
-"Kliknij ikonę aby zresetować do wartości systemowej."
-
-#: src/slic3r/GUI/Tab.cpp:2931
-msgid ""
-"WHITE BULLET icon indicates that the value is the same as in the last saved "
-"preset."
-msgstr ""
-"BIA�A KROPKA oznacza, że wartość jest taka sama jak w ostatnio zapisanym "
-"zestawie ustawień."
-
-#: src/slic3r/GUI/Tab.cpp:2932
-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ń."
-
-# Used in this context: _("Save ") + title + _(" as:")
-#: src/slic3r/GUI/Tab.cpp:3031
-msgid " as:"
-msgstr " jako:"
-
-#: src/slic3r/GUI/Tab.cpp:3075
-msgid "the following postfix are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3079
-msgid "The supplied name is not available."
-msgstr "Podana nazwa jest niedostępna."
-
-#: src/slic3r/GUI/Tab.cpp:3092
-msgid "Material"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
-msgid "Layers"
-msgstr "Warstwy"
-
-#: src/slic3r/GUI/Tab.cpp:3098
-msgid "Exposure"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3183
-msgid "Support head"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3188
-msgid "Support pillar"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3196
-msgid "Connection of the support sticks and junctions"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3200
-msgid "Automatic generation"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
-msgid "Print Settings"
-msgstr "Ustawienia Druku"
-
-#: src/slic3r/GUI/Tab.hpp:311
-msgid "Filament Settings"
-msgstr "Ustawienia Filamentu"
-
-#: src/slic3r/GUI/Tab.hpp:344
-msgid "Printer Settings"
-msgstr "Ustawienia Drukarki"
-
-#: src/slic3r/GUI/Tab.hpp:367
-msgid "Material Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:393
-msgid "Save preset"
-msgstr "Zapisz zestaw ustawień"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "Update available"
-msgstr "Dostępna jest aktualizacja"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "New version of Slic3r PE is available"
-msgstr "Dostępna jest nowa wersja Slic3r PE"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
-msgid "To download, follow the link below."
-msgstr "Przejdź do linku aby pobrać."
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
-msgid "Current version:"
-msgstr "Obecna wersja:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
-msgid "New version:"
-msgstr "Nowa wersja:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
-msgid "Don't notify about new releases any more"
-msgstr "Nie powiadamiaj o nowych wersjach"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
-msgid "Configuration update"
-msgstr "Aktualizacja konfiguracji"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
-msgid "Configuration update is available"
-msgstr "Dostępna jest aktualizacja konfiguracji"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
-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"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-"Czy chcesz kontynuować instalację?\n"
-"\n"
-"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/UpdateDialogs.cpp:109
-msgid "Slic3r incompatibility"
-msgstr "Niekompatybilność ze Slic3r"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r configuration is incompatible"
-msgstr "Konfiguracja Slic3r jest niekompatybilna"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed "
-"configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using "
-"a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-"Ta wersja Slic3r PE nie jest kompatybilna z aktualnie zainstalowanym "
-"zestawem konfiguracji.\n"
-"Może to być rezultatem uruchomienia starszej wersji Slic3r PE po instalacji "
-"nowszej.\n"
-"\n"
-"Masz 2 opcje wyboru: możesz zamknąć Slic3r i spróbować ponownie uruchomić "
-"nowszą wersję lub uruchomić ponownie konfigurację początkową. Wybranie "
-"drugiej opcji spowoduje stworzenie zrzutu istniejÄ…cej konfiguracji przed "
-"instalacjÄ… konfiguracji kompatybilnej z tÄ… wersjÄ… Slic3ra.\n"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
-#, c-format
-msgid "This Slic3r PE version: %s"
-msgstr "Ta wersja Slic3r PE: %s"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
-msgid "Incompatible bundles:"
-msgstr "Niekompatybilne zestawy ustawień:"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
-msgid "Exit Slic3r"
-msgstr "Zamknij Slic3r"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
-msgid "Re-configure"
-msgstr "Ponowna konfiguracja"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
-#, c-format
-msgid ""
-"Slic3r PE 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 ""
-"Slic3r PE używa teraz ulepszonej struktury konfiguracji.\n"
-"\n"
-"Wprowadzamy tak zwane \"Zestawy systemowe\", które zawierają preinstalowane "
-"ustawienia domyślne dla różnych drukarek. Te Zestawy nie mogą być "
-"zmodyfikowane, ale za to użytkownik może na ich bazie utworzyć własne - "
-"kopiując ustawienia z jednego z Zestawów.\n"
-"Zestaw dziedziczący ustawienia może skopiować ustawienia z zestawu "
-"nadrzędnego lub nadpisać je własnymi.\n"
-"\n"
-"Przejdź do %s aby stworzyć nowe zestawy i wybrać opcję ich automatycznej "
-"aktualizacji."
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:182
-msgid "For more information please visit our wiki page:"
-msgstr "Aby uzyskać więcej informacji odwiedź naszą wiki:"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
-msgid "Ramming customization"
-msgstr "Dostosowywanie wyciskania"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
-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:78
-msgid "Total ramming time"
-msgstr "Całkowity czas wyciskania"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
-msgid "Total rammed volume"
-msgstr "Całkowita objętość wyciskania"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
-msgid "Ramming line width"
-msgstr "Szerokość linii wyciskania"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
-msgid "Ramming line spacing"
-msgstr "Rozmieszczenie linii wyciskania"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
-msgid "Wipe tower - Purging volume adjustment"
-msgstr "Wieża czyszcząca - dostosowanie objętości czyszczenia"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
-msgid ""
-"Here you can adjust required purging volume (mm³) for any given pair of "
-"tools."
-msgstr ""
-"To ustawienie odpowiada za objętość czyszczonego filamentu w (mm³) dla danej "
-"pary ekstruderów."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
-msgid "Extruder changed to"
-msgstr "Ekstruder zmieniony na"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
-msgid "unloaded"
-msgstr "rozładowano"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
-msgid "loaded"
-msgstr "załadowano"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
-msgid "Tool #"
-msgstr "Narzędzie #"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
-msgid ""
-"Total purging volume is calculated by summing two values below, depending on "
-"which tools are loaded/unloaded."
-msgstr ""
-"Całkowita objętość czyszczenia jest obliczana z sumy obydwóch wartości "
-"poniżej, w zależności która para narzędzi jest rozładowana/ładowana."
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
-msgid "Volume to purge (mm³) when the filament is being"
-msgstr "Objętość do wyczyszczenia (mm³), gdy filament jest"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
-msgid "From"
-msgstr "Od"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
-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/WipeTowerDialog.cpp:333
-msgid "Show simplified settings"
-msgstr "Pokaż ustawienia uproszczone"
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show advanced settings"
-msgstr "Pokaż ustawienia zaawansowane"
-
-#: src/slic3r/Utils/OctoPrint.cpp:65
-#, c-format
-msgid "Mismatched type of print host: %s"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:80
-msgid "Connection to OctoPrint works correctly."
-msgstr "Połączenie z OctoPrint pomyślne."
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Could not connect to OctoPrint"
-msgstr "Nie można połączyć się z OctoPrint"
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr "Uwaga: wymagany jest OctoPrint w wersji 1.1.0 lub wyższej."
-
-#: src/slic3r/Utils/OctoPrint.cpp:181
-msgid "Connection to Prusa SLA works correctly."
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:186
-msgid "Could not connect to Prusa SLA"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:571
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr "wymaga min. %s i max. %s"
-
-#: src/slic3r/Utils/PresetUpdater.cpp:576
-#, c-format
-msgid "requires min. %s"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:578
-#, c-format
-msgid "requires max. %s"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:235
-msgid "Failed loading the input model."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:248
-msgid "Mesh repair failed."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the 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 ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
-msgid "Model fixing"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
-msgid "Exporting model..."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
-msgid "Export of a temporary 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
-msgid "Import of the repaired 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
-msgid "Model repair finished"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
-msgid "Model repair canceled"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-msgid "Model repaired successfully"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model Repair by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model repair failed: \n"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1175
-msgid "All objects are outside of the print volume."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1201
-msgid "Some objects are too close; your extruder will collide with them."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1216
-msgid ""
-"Some objects are too tall and cannot be printed without extruder collisions."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1226
-msgid "The Spiral Vase option can only be used when printing a single object."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1228
-msgid ""
-"The Spiral Vase option can only be used when printing single material "
-"objects."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1234
-msgid ""
-"All extruders must have the same diameter for single extruder multimaterial "
-"printer."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1239
-msgid ""
-"The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
-"and Repetier G-code flavors."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1241
-msgid ""
-"The Wipe Tower is currently only supported with the relative extruder "
-"addressing (use_relative_e_distances=1)."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1253
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they have equal "
-"layer heigths"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1255
-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:1257
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are printed "
-"with the same support_material_contact_distance"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1259
-msgid ""
-"The Wipe Tower is only supported for multiple objects if they are sliced "
-"equally."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1281
-msgid ""
-"The Wipe tower is only supported if all objects have the same layer height "
-"profile"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1290
-msgid "The supplied settings will cause an empty print."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1307
-msgid ""
-"One or more object were assigned an extruder that the printer does not have."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1316
-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 ""
-
-#: src/libslic3r/Print.cpp:1324
-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:1328
-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 ""
-
-#: src/libslic3r/Print.cpp:1335
-msgid "first_layer_height"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1350
-msgid "First layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1354
-msgid "Layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
-msgid "Printer technology"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:41
-msgid "Bed shape"
-msgstr "Kształt stołu"
-
-#: src/libslic3r/PrintConfig.cpp:48
-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 ""
-"To ustawienie odpowiada za wysokość warstwy (czyli cięcia), a w konsekwencji "
-"za ich liczbę. Niższe warstwy zapewniają lepszą dokładność i jakość, ale "
-"wydłużają ogólny czas wydruku."
-
-#: src/libslic3r/PrintConfig.cpp:56
-msgid "Max print height"
-msgstr "Maksymalna wysokość wydruku"
-
-#: src/libslic3r/PrintConfig.cpp:57
-msgid ""
-"Set this to the maximum height that can be reached by your extruder while "
-"printing."
-msgstr ""
-"Ustaw tutaj maksymalną wysokość, jaką może osiągnąć Twój ekstruder podczas "
-"drukowania."
-
-#: src/libslic3r/PrintConfig.cpp:73
-msgid "Avoid crossing perimeters"
-msgstr "Unikaj ruchów nad obrysami"
-
-#: src/libslic3r/PrintConfig.cpp:74
-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 ""
-"Optymalizuj ruchy jałowe aby zminimalizować przejeżdżanie nad obrysami. Ta "
-"funkcja jest przydatna szczególne przy ekstruderach typu bowden, podatnych "
-"na wyciekanie filamentu z dyszy. Włączenie tej funkcji wydłuża zarówno czas "
-"druku jak i czas generowania G-code."
-
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
-msgid "Other layers"
-msgstr "Inne warstwy"
-
-#: src/libslic3r/PrintConfig.cpp:83
-msgid ""
-"Bed temperature for layers after the first one. Set this to zero to disable "
-"bed temperature control commands in the output."
-msgstr ""
-"Temperatura stołu dla warstw powyżej pierwszej. Ustaw 0 aby wyłączyć "
-"kontrolowanie temperatury w pliku wyjściowym."
-
-#: src/libslic3r/PrintConfig.cpp:86
-msgid "Bed temperature"
-msgstr "Temperatura stołu"
-
-#: src/libslic3r/PrintConfig.cpp:93
-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 ""
-"Ten kod jest wykonywany przy każdej zmianie warstwy, zaraz przed "
-"podniesieniem ekstrudera na wysokość 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/libslic3r/PrintConfig.cpp:104
-msgid "Between objects G-code"
-msgstr "G-code wykonywany przy przejściach pomiędzy modelami"
-
-#: src/libslic3r/PrintConfig.cpp:105
-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:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "Dolne"
-
-#: src/libslic3r/PrintConfig.cpp:116
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "Liczba zwartych warstw dolnych."
-
-#: src/libslic3r/PrintConfig.cpp:118
-msgid "Bottom solid layers"
-msgstr "Zwarte warstwy dolne"
-
-#: src/libslic3r/PrintConfig.cpp:123
-msgid "Bridge"
-msgstr "Most"
-
-#: src/libslic3r/PrintConfig.cpp:124
-msgid ""
-"This is the acceleration your printer will use for bridges. Set zero to "
-"disable acceleration control for bridges."
-msgstr ""
-"To jest przyspieszenie stosowane przy druku mostów. Ustaw zero aby wyłączyć "
-"osobne ustawienia przyspieszenia dla mostów."
-
-#: src/libslic3r/PrintConfig.cpp:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
-msgid "mm/s²"
-msgstr "mm/s²"
-
-#: src/libslic3r/PrintConfig.cpp:133
-msgid "Bridging angle"
-msgstr "Kąt linii mostów"
-
-#: src/libslic3r/PrintConfig.cpp:135
-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 ""
-"Nadpisanie kąta linii mostów. Jeśli zostanie 0 to kąt zostanie obliczony "
-"automatycznie. W innym przypadku ustawiony kąt będzie dotyczył wszystkich "
-"mostów. Ustaw 180° dla kąta zerowego."
-
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
-msgid "°"
-msgstr "°"
-
-#: src/libslic3r/PrintConfig.cpp:145
-msgid "Bridges fan speed"
-msgstr "Prędkość wentylatora przy mostach"
-
-#: src/libslic3r/PrintConfig.cpp:146
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr ""
-"Ta prędkość wentylatora zostanie zastosowana przy druku mostów i zwisów."
-
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
-msgid "%"
-msgstr "%"
-
-#: src/libslic3r/PrintConfig.cpp:155
-msgid "Bridge flow ratio"
-msgstr "Współczynnik przepływu przy mostach"
-
-#: src/libslic3r/PrintConfig.cpp:157
-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 ""
-"Ten współczynnik określa ilość plastiku wytłaczaną przy drukowaniu mostów. "
-"Możesz delikatnie zmniejszyć tą wartość aby zapobiec opadaniu drukowanej "
-"linii, jednakże standardowe ustawienia są zazwyczaj dobrze dobrane i "
-"najpierw poeksperymentuj z chłodzeniem wydruku."
-
-#: src/libslic3r/PrintConfig.cpp:168
-msgid "Bridges"
-msgstr "Mosty"
-
-#: src/libslic3r/PrintConfig.cpp:170
-msgid "Speed for printing bridges."
-msgstr "Prędkość drukowania mostów."
-
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
-msgid "mm/s"
-msgstr "mm/s"
-
-#: src/libslic3r/PrintConfig.cpp:178
-msgid "Brim width"
-msgstr "Szerokość brim"
-
-#: src/libslic3r/PrintConfig.cpp:179
-msgid ""
-"Horizontal width of the brim that will be printed around each object on the "
-"first layer."
-msgstr ""
-"Szerokość brim (obramowania), drukowanego wokół każdego z modeli na "
-"pierwszej warstwie."
-
-#: src/libslic3r/PrintConfig.cpp:187
-msgid "Clip multi-part objects"
-msgstr "Przycinaj modele złożone z kilku części"
-
-#: src/libslic3r/PrintConfig.cpp:188
-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 ""
-"To ustawienie sprawi, że podczas druku modeli z wielu materiałów, Slic3r "
-"przytnie nachodzące na siebie części (druga część zostanie przycięta przez "
-"pierwszÄ…, trzecia przez pierwszÄ… i drugÄ… itd.)"
-
-#: src/libslic3r/PrintConfig.cpp:196
-msgid "Colorprint height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:197
-msgid "Heights at which a filament change is to occur. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:207
-msgid "Compatible printers condition"
-msgstr "Warunki kompatybilności z drukarką"
-
-#: src/libslic3r/PrintConfig.cpp:208
-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."
-msgstr ""
-"Wyrażenie logiczne (Boole'owskie) używające wartości konfiguracji aktywnego "
-"profilu drukarki. Jeśli to wyrażenie jest prawdziwe to znaczy, że aktywny "
-"profil jest kompatybilny z drukarkÄ…."
-
-#: src/libslic3r/PrintConfig.cpp:220
-msgid "Compatible print profiles condition"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:221
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:235
-msgid "Complete individual objects"
-msgstr "Druk sekwencyjny (model po modelu)"
-
-#: src/libslic3r/PrintConfig.cpp:236
-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."
-msgstr ""
-"Włączenie tej opcji sprawi, że przy druku kilku modeli drukarka wydrukuje "
-"jeden model w całości zanim przejdzie do następnego (zaczynając od "
-"najniższej warstwy). Przydaje się aby uniknąć ryzyka niepowodzenia wydruku "
-"kilku części. Slic3r powinien ostrzec przed możliwością kolizji z "
-"ekstruderem, ale zachowaj ostrożność."
-
-#: src/libslic3r/PrintConfig.cpp:245
-msgid "Enable auto cooling"
-msgstr "Włącz automatyczne chłodzenie"
-
-#: src/libslic3r/PrintConfig.cpp:246
-msgid ""
-"This flag enables the automatic cooling logic that adjusts print speed and "
-"fan speed according to layer printing time."
-msgstr ""
-"Ta flaga umożliwia automatyczne sterowanie chłodzeniem przez zmianę "
-"prędkości druku i wentylatora względem czasu druku jednej warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:252
-msgid "Cooling tube position"
-msgstr "Pozycja rurki chłodzącej"
-
-#: src/libslic3r/PrintConfig.cpp:253
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
-msgstr "Odległość punktu centralnego rurki chłodzącej od końcówki ekstrudera "
-
-#: src/libslic3r/PrintConfig.cpp:261
-msgid "Cooling tube length"
-msgstr "Długość rurki chłodzącej"
-
-#: src/libslic3r/PrintConfig.cpp:262
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
-msgstr "Długość rurki chłodzącej ograniczająca ruchy chłodzące wewnątrz jej "
-
-#: src/libslic3r/PrintConfig.cpp:271
-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."
-msgstr ""
-"Do tej wartości przyspieszenia drukarka wróci gdy ustawione zostaną "
-"przyspieszenia dla określonych ruchów (obrysy/wypełnienie). Ustaw zero aby "
-"wyłączyć resetowanie przyspieszeń."
-
-#: src/libslic3r/PrintConfig.cpp:281
-msgid "Default filament profile"
-msgstr "Domyślny profil filamentu"
-
-#: src/libslic3r/PrintConfig.cpp:282
-msgid ""
-"Default filament profile associated with the current printer profile. On "
-"selection of the current printer profile, this filament profile will be "
-"activated."
-msgstr ""
-"Domyślny profil filamentu powiązany z obecnym profilem drukarki. Przy "
-"wybraniu obecnego profilu drukarki automatycznie zostanie wybrany ten profil "
-"filamentu."
-
-#: src/libslic3r/PrintConfig.cpp:287
-msgid "Default print profile"
-msgstr "Domyślny profil druku"
-
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
-msgid ""
-"Default print profile associated with the current printer profile. On "
-"selection of the current printer profile, this print profile will be "
-"activated."
-msgstr ""
-"Domyślny profil druku powiązany z obecnym profilem drukarki. Przy wybraniu "
-"obecnego profilu drukarki automatycznie zostanie wybrany ten profil "
-"filamentu."
-
-#: src/libslic3r/PrintConfig.cpp:293
-msgid "Disable fan for the first"
-msgstr "Wyłącz wentylator przy pierwszych"
-
-#: src/libslic3r/PrintConfig.cpp:294
-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 ""
-"Wpisując tutaj wartość dodatnią możesz wyłączyć wentylator podczas druku "
-"pierwszych warstw, aby nie pogarszać przyczepności do stołu."
-
-#: src/libslic3r/PrintConfig.cpp:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
-msgid "layers"
-msgstr "warstwy"
-
-#: src/libslic3r/PrintConfig.cpp:304
-msgid "Don't support bridges"
-msgstr "Nie używaj podpór pod mostami"
-
-#: src/libslic3r/PrintConfig.cpp:306
-msgid ""
-"Experimental option for preventing support material from being generated "
-"under bridged areas."
-msgstr ""
-"Funkcja eksperymentalna mająca zapobiegać tworzeniu podpór pod mostami."
-
-#: src/libslic3r/PrintConfig.cpp:313
-msgid "Distance between copies"
-msgstr "Odstęp pomiędzy kopiami"
-
-#: src/libslic3r/PrintConfig.cpp:314
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "Odstęp używany przy automatycznym rozmieszczaniu modeli na stole."
-
-#: src/libslic3r/PrintConfig.cpp:322
-msgid "Elephant foot compensation"
-msgstr "Kompensacja \"stopy słonia\""
-
-#: src/libslic3r/PrintConfig.cpp:324
-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 ""
-"Pierwsza warstwa zostanie zmniejszona o tą wartość w osiach X i Y aby "
-"zniwelować efekt stopy słonia (Elephant Foot - gdy pierwsza warstwa "
-"\"rozjeżdża\" się na boki)."
-
-#: src/libslic3r/PrintConfig.cpp:334
-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 ""
-"Ten kod jest wykonywany jako ostatni w pliku wyjściowym. Pamiętaj, że możesz "
-"użyć zmiennych typu placeholder dla wszystkich ustawień Slic3r."
-
-#: src/libslic3r/PrintConfig.cpp:345
-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 ""
-"Ten kod jest wykonywany na samym końcu, przed samym zakończeniem wykonywania "
-"pliku G-code. Pamiętaj, że możesz użyć zmiennych typu placeholder dla "
-"wszystkich ustawień Slic3r. Jeśli masz kilka ekstruderów, ten G-code jest "
-"wykonywany zgodnie z ich kolejnością."
-
-#: src/libslic3r/PrintConfig.cpp:356
-msgid "Ensure vertical shell thickness"
-msgstr "Zagwarantuj odpowiednią grubość ścianki"
-
-#: src/libslic3r/PrintConfig.cpp:358
-msgid ""
-"Add solid infill near sloping surfaces to guarantee the vertical shell "
-"thickness (top+bottom solid layers)."
-msgstr ""
-"Dodaj zwarte wypełnienie przy pochyłych powierzchniach aby zagwarantować "
-"odpowiednią grubość warstwy (suma górnych i dolnych zwartych warstw)."
-
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "Wzór wypełnienia góry/dołu"
-
-#: src/libslic3r/PrintConfig.cpp:367
-msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
-msgstr ""
-"Wzór wypełnienia górnego/dolnego. Ma wpływ jedynie na zewnętrzne widoczne "
-"warstwy, nie ma wpływu na przylegające do nich powłoki zwartego wypełnienia."
-
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
-msgid "Rectilinear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
-msgid "Concentric"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
-msgid "Hilbert Curve"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
-msgid "Archimedean Chords"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
-msgid "Octagram Spiral"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
-msgid "External perimeters"
-msgstr "Obrysy zewnętrzne"
-
-#: src/libslic3r/PrintConfig.cpp:388
-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 ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstruzji obrysów zewnętrznych. Jeśli ustawisz zero, szerokość będzie miała "
-"wartość domyślną, czyli 1.125x średnicy dyszy. Jeśli ustawisz wartość "
-"procentową (np. 200%) to zostanie obliczona z wysokości warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
-msgid "mm or % (leave 0 for default)"
-msgstr "mm lub % (zero dla domyślnych)"
-
-#: src/libslic3r/PrintConfig.cpp:399
-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 ""
-"To ustawienie steruje prędkością zewnętrznych (widocznych) obrysów. Jeśli "
-"ustawisz wartość procentową (np. 80%) to zostanie obliczona z prędkości "
-"obrysów ustawionej powyżej. Ustaw zero aby pozwolić na sterowanie "
-"automatyczne."
-
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
-msgid "mm/s or %"
-msgstr "mm/s lub %"
-
-#: src/libslic3r/PrintConfig.cpp:409
-msgid "External perimeters first"
-msgstr "Najpierw obrysy zewnętrzne"
-
-#: src/libslic3r/PrintConfig.cpp:411
-msgid ""
-"Print contour perimeters from the outermost one to the innermost one instead "
-"of the default inverse order."
-msgstr ""
-"Drukuj obrysy od zewnątrz do wewnątrz zamiast domyślnego ustawienia węwnątrz-"
-"zewnÄ…trz."
-
-#: src/libslic3r/PrintConfig.cpp:418
-msgid "Extra perimeters if needed"
-msgstr "Dodatkowe obrysy jeśli potrzebne"
-
-#: src/libslic3r/PrintConfig.cpp:420
-#, no-c-format
-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 ""
-"Dodaj więcej obrysów, aby uniknąć przerw przy pochyłych ścianach. Slic3r "
-"będzie dodawał tyle obrysów, ile jest potrzebne aby podeprzeć co najmniej "
-"70% grubości ściany kolejnej warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:431
-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 ""
-"Używany ekstruder (jeśli nie są określone dokładniejsze ustawienia "
-"ekstuderów). To ustawienie nadpisuje ustawienia ekstruderów dla obrysów i "
-"wypełnienia, ale nie tych dla podpór."
-
-#: src/libslic3r/PrintConfig.cpp:444
-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."
-msgstr ""
-"Określa pionową odległość końcówki dyszy od (zazwyczaj) prętów osi X. "
-"Inaczej mówiąc (matematycznie), jest to wysokość cylindra opisanego na "
-"zespole ekstrudera i określa maksymalną głębokość, na którą może opuścić się "
-"ekstruder aby nie uderzyć w obiekt znajdujący się bezpośrednio pod prętami "
-"osi X."
-
-#: src/libslic3r/PrintConfig.cpp:455
-msgid "Radius"
-msgstr "Promień"
-
-#: src/libslic3r/PrintConfig.cpp:456
-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."
-msgstr ""
-"Określa promień okręgu opisanego na całym zespole ekstrudera (matematycznie "
-"- wyobraź sobie, że chcesz narysować okrąg opisany na zespole ekstrudera "
-"patrząc na niego z góry). Jeśli sam ekstruder nie jest dokładnie na środku, "
-"użyj największego promienia. Ta wartość jest używana do wykrywania możliwych "
-"kolizji z wydrukowanymi modelami i jako graficzna reprezentacja na "
-"wirtualnym stole."
-
-#: src/libslic3r/PrintConfig.cpp:467
-msgid "Extruder Color"
-msgstr "Kolor ekstrudera"
-
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr ""
-"Ta funkcja jest używana jedynie w interfejsie Slic3ra jako pomoc wizualna."
-
-#: src/libslic3r/PrintConfig.cpp:475
-msgid "Extruder offset"
-msgstr "Margines ekstrudera"
-
-#: src/libslic3r/PrintConfig.cpp:476
-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)."
-msgstr ""
-"Jeśli oprogramowanie układowe (firmware) Twojej drukarki nie obsługuje "
-"rozmieszczenia ekstruderów to trzeba to określić w G-code. Ta opcja pozwala "
-"ustawić rozmieszczenie każdego ekstrudera w relacji do pierwszego. Oczekuje "
-"koordynat dodatnich (będą odejmowane od koordynat XY)."
-
-#: src/libslic3r/PrintConfig.cpp:486
-msgid "Extrusion axis"
-msgstr "OÅ› ekstruzji"
-
-#: src/libslic3r/PrintConfig.cpp:487
-msgid ""
-"Use this option to set the axis letter associated to your printer's extruder "
-"(usually E but some printers use A)."
-msgstr ""
-"Ta opcja określa literę, którą Twoja drukarka opisuje oś ekstrudera "
-"(zazwyczaj jest to E ale niektóre drukarki używają A)."
-
-#: src/libslic3r/PrintConfig.cpp:493
-msgid "Extrusion multiplier"
-msgstr "Współczynnik ekstruzji"
-
-#: src/libslic3r/PrintConfig.cpp:494
-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."
-msgstr ""
-"Ten współczynnik określa proporcjonalną ilość przepływu plastiku. Możesz "
-"zmienić tą wartość aby uzyskać gładsze powierzchnie i poprawną szerokość "
-"ścian drukowanych z 1 linii. Ten współczynnik waha się zazwyczaj od 0.9 do "
-"1.1. Jeśli musisz wykroczyć poza ten zakres to najpierw zmierz średnicę "
-"filamentu i kroki ekstrudera (E steps)."
-
-#: src/libslic3r/PrintConfig.cpp:503
-msgid "Default extrusion width"
-msgstr "Domyślna szerokość linii"
-
-#: src/libslic3r/PrintConfig.cpp:505
-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 ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstrudowanej linii. Jeśli ustawisz zero, Slic3r obliczy szerokość ekstruzji "
-"na podstawie średnicy dyszy (zobacz wskazówki dla szerokości ekstruzji "
-"obrysów, wypełnienia itp). Jeśli ustawisz wartość procentową (np. 230%) to "
-"zostanie obliczona z wysokości warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:509
-msgid "mm or % (leave 0 for auto)"
-msgstr "mm lub % (zero dla wartości automatycznych)"
-
-#: src/libslic3r/PrintConfig.cpp:515
-msgid "Keep fan always on"
-msgstr "Wentylator zawsze włączony"
-
-#: src/libslic3r/PrintConfig.cpp:516
-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 ""
-"Ta opcja spowoduje, że wentylator nie wyłączy się podczas druku, tzn. zawsze "
-"będzie pracował z przynajmniej minimalną prędkością. Przydatne dla PLA, może "
-"szkodzić przy ABS."
-
-#: src/libslic3r/PrintConfig.cpp:522
-msgid "Enable fan if layer print time is below"
-msgstr "Włącz chłodzenie jeśli czas druku warstwy wynosi poniżej"
-
-#: src/libslic3r/PrintConfig.cpp:523
-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 ""
-"Jeśli szacowany czas druku warstwy będzie niższy niż ta wartość to "
-"wentylator będzie włączony a jego prędkość będzie interpolowana na podstawie "
-"górnego i dolnego limitu prędkości."
-
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
-msgid "approximate seconds"
-msgstr "szacowane sekundy"
-
-#: src/libslic3r/PrintConfig.cpp:534
-msgid "Color"
-msgstr "Kolor"
-
-#: src/libslic3r/PrintConfig.cpp:541
-msgid "Filament notes"
-msgstr "Notatki do filamentu"
-
-#: src/libslic3r/PrintConfig.cpp:542
-msgid "You can put your notes regarding the filament here."
-msgstr "Tutaj możesz umieścić notatki dotyczące filamentu."
-
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
-msgid "Max volumetric speed"
-msgstr "Maksymalny przepływ"
-
-#: src/libslic3r/PrintConfig.cpp:552
-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 ""
-"Maksymalna prędkość objętościowa dla tego filamentu.  Ogranicza maksymalną "
-"prędkość objętościową do minimum objętościowej prędkości druku i filamentu. "
-"Ustaw zero aby usunąć ograniczenie."
-
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
-msgid "mm³/s"
-msgstr "mm³/s"
-
-#: src/libslic3r/PrintConfig.cpp:562
-msgid "Loading speed"
-msgstr "Prędkość ładowania"
-
-#: src/libslic3r/PrintConfig.cpp:563
-msgid "Speed used for loading the filament on the wipe tower. "
-msgstr "Prędkość ładowania filamentu przy druku wieży czyszczącej. "
-
-#: src/libslic3r/PrintConfig.cpp:571
-msgid "Loading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:572
-msgid "Speed used at the very beginning of loading phase. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:580
-msgid "Unloading speed"
-msgstr "Prędkość rozładowania"
-
-#: src/libslic3r/PrintConfig.cpp:581
-msgid ""
-"Speed used for unloading the filament on the wipe tower (does not affect  "
-"initial part of unloading just after ramming). "
-msgstr ""
-"Prędkość rozładowywania filamentu dla wieży czyszczącej (nie wpływa na "
-"początkową fazę rozładowywania zaraz po wyciskaniu). "
-
-#: src/libslic3r/PrintConfig.cpp:590
-msgid "Unloading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:591
-msgid ""
-"Speed used for unloading the tip of the filament immediately after ramming. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:599
-msgid "Delay after unloading"
-msgstr "Opóźnienie po rozładowaniu"
-
-#: src/libslic3r/PrintConfig.cpp:600
-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. "
-msgstr ""
-"Czas bezczynności po rozładowaniu filamentu. Może pomóc w bezproblemowej "
-"zmianie narzędzia podczas druku z materiałami elastycznymi, które mogą "
-"potrzebować więcej czasu na skurcz termiczny wracając do nominalnego "
-"rozmiaru. "
-
-#: src/libslic3r/PrintConfig.cpp:610
-msgid "Number of cooling moves"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:611
-msgid ""
-"Filament is cooled by being moved back and forth in the cooling tubes. "
-"Specify desired number of these moves "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:620
-msgid "Speed of the first cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:621
-msgid "Cooling moves are gradually accelerating beginning at this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:629
-msgid "Minimal purge on wipe tower"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:630
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:635
-msgid "mm³"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:641
-msgid "Speed of the last cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:642
-msgid "Cooling moves are gradually accelerating towards this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:650
-msgid "Filament load time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:651
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:659
-msgid "Ramming parameters"
-msgstr "Parametry wyciskania"
-
-#: src/libslic3r/PrintConfig.cpp:660
-msgid ""
-"This string is edited by RammingDialog and contains ramming specific "
-"parameters "
-msgstr ""
-"Ten ciąg jest edytowany przez RammingDialog i zawiera parametry właściwe dla "
-"wyciskania "
-
-#: src/libslic3r/PrintConfig.cpp:667
-msgid "Filament unload time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:668
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:677
-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."
-msgstr ""
-"Wprowadź średnicę filamentu. Wymagana jest precyzja, więc użyj suwmiarki i "
-"zmierz filament w kilku miejscach, potem oblicz średnią."
-
-#: src/libslic3r/PrintConfig.cpp:685
-msgid "Density"
-msgstr "Gęstość"
-
-#: src/libslic3r/PrintConfig.cpp:686
-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."
-msgstr ""
-"Wprowadź gęstość filamentu. Służy tylko statystykom. Dobrą metodą jest "
-"zważenie filamentu o zmierzonej długości i przeliczenie stosunku wagi do "
-"objętości."
-
-#: src/libslic3r/PrintConfig.cpp:689
-msgid "g/cm³"
-msgstr "g/cm³"
-
-#: src/libslic3r/PrintConfig.cpp:695
-msgid "Filament type"
-msgstr "Typ filamentu"
-
-#: src/libslic3r/PrintConfig.cpp:696
-msgid "The filament material type for use in custom G-codes."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:712
-msgid "Soluble material"
-msgstr "Materiał rozpuszczalny"
-
-#: src/libslic3r/PrintConfig.cpp:713
-msgid "Soluble material is most likely used for a soluble support."
-msgstr ""
-"Materiał rozpuszczalny jest używany zazwyczaj do rozpuszczalnych podpór."
-
-#: src/libslic3r/PrintConfig.cpp:719
-msgid ""
-"Enter your filament cost per kg here. This is only for statistical "
-"information."
-msgstr "Wprowadź koszt filamentu za kilogram. Służy tylko statystykom."
-
-#: src/libslic3r/PrintConfig.cpp:720
-msgid "money/kg"
-msgstr "piniendzy/kg"
-
-#: src/libslic3r/PrintConfig.cpp:729
-msgid "Fill angle"
-msgstr "Kąt wypełnienia"
-
-#: src/libslic3r/PrintConfig.cpp:731
-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."
-msgstr ""
-"Domyślny kąt linii wypełnienia. Mosty będą wypełniane z użyciem najlepszego "
-"kierunku obliczonego przez Slic3r, więc to ustawienie ich nie dotyczy."
-
-#: src/libslic3r/PrintConfig.cpp:744
-msgid "Fill density"
-msgstr "Gęstość wypełnienia"
-
-#: src/libslic3r/PrintConfig.cpp:746
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "Gęstość wypełnienia wewnętrznego, wyrażana w zakresie 0% - 100%."
-
-#: src/libslic3r/PrintConfig.cpp:782
-msgid "Fill pattern"
-msgstr "Wzór wypełnienia"
-
-#: src/libslic3r/PrintConfig.cpp:784
-msgid "Fill pattern for general low-density infill."
-msgstr "Wzór dla ogólnego wypełnienia o niskiej gęstości."
-
-#: src/libslic3r/PrintConfig.cpp:801
-msgid "Grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:802
-msgid "Triangles"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:803
-msgid "Stars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:804
-msgid "Cubic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:805
-msgid "Line"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
-msgid "Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:808
-msgid "3D Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:809
-msgid "Gyroid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
-msgid "First layer"
-msgstr "Pierwsza warstwa"
-
-#: src/libslic3r/PrintConfig.cpp:817
-msgid ""
-"This is the acceleration your printer will use for first layer. Set zero to "
-"disable acceleration control for first layer."
-msgstr ""
-"To jest przyspieszenie stosowane przy druku pierwszej warstwy. Ustaw zero "
-"aby wyłączyć osobne ustawienia przyspieszenia dla pierwszej warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:827
-msgid ""
-"Heated build plate temperature for the first layer. Set this to zero to "
-"disable bed temperature control commands in the output."
-msgstr ""
-"Temperatura podgrzewanego stołu dla pierwszej warstwy. Ustaw zero aby "
-"wyłączyć komendy kontrolujące temperaturę stołu w pliku wyjściowym."
-
-#: src/libslic3r/PrintConfig.cpp:837
-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."
-msgstr ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstruzji pierwszej warstwy. Dzięki tej funkcji możesz wymusić grubsze linie "
-"dla lepszej przyczepności. Jeśli ustawisz wartość procentową (np. 120%) to "
-"będzie oliczona z wysokości pierwszej warstwy. Ustaw zero dla wartości "
-"domyślnej."
-
-#: src/libslic3r/PrintConfig.cpp:848
-msgid "First layer height"
-msgstr "Wysokość pierwszej warstwy"
-
-#: src/libslic3r/PrintConfig.cpp:850
-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 ""
-"Podczas druku z bardzo małą wysokością warstwy warto mimo wszystko "
-"wydrukować najniższą warstwę o większej wysokości aby zwiększyć przyczepność "
-"i tolerancję na niedoskonałości powierzchni druki. Może być wyrażona jako "
-"wartość bezwzględna lub procentowa (np. 150%) nominalnej wysokości warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
-msgid "mm or %"
-msgstr "mm lub %"
-
-#: src/libslic3r/PrintConfig.cpp:860
-msgid "First layer speed"
-msgstr "Prędkość pierwszej warstwy"
-
-#: src/libslic3r/PrintConfig.cpp:861
-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 ""
-"Jeśli ustawisz wartość bezwzględną wyrażoną w mm/s, taka prędkość będzie "
-"zastosowana dla wszystkich ruchów drukujących dla pierwszej warstwy, nie "
-"zależnie od ich rodzajów. Jeśli ustawisz wartość procentową (np. 40%), "
-"będzie ona skalowana wg domyślnej prędkości."
-
-#: src/libslic3r/PrintConfig.cpp:872
-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 ""
-"Temperatura ekstrudera dla pierwszej warstwy. Jeśli chcesz ręcznie "
-"kontrolować temperaturę podczas druku to ustaw zero aby wyłączyć komendy "
-"kontrolujące temperaturę w pliku wyjściowym."
-
-#: src/libslic3r/PrintConfig.cpp:882
-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 ""
-"Prędkość wypełniania szczelin krótkimi ruchami typu zygzak. Ustaw tą wartość "
-"na tyle nisko aby uniknąć wibracji i rezonansu. Ustaw 0 aby wyłączyć "
-"wypełnianie szczelin."
-
-#: src/libslic3r/PrintConfig.cpp:890
-msgid "Verbose G-code"
-msgstr "G-code rozszerzony"
-
-#: src/libslic3r/PrintConfig.cpp:891
-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 ""
-"Włącz tą opcję aby dodawać komentarz opsiujący do każdej liniki pliku G-"
-"code. Przy druku z karty SD dodatkowy rozmiar pliku może sprawiać, że "
-"firmware będzie reagować wolniej."
-
-#: src/libslic3r/PrintConfig.cpp:899
-msgid "G-code flavor"
-msgstr "Rodzaj G-code"
-
-#: src/libslic3r/PrintConfig.cpp:900
-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 ""
-"Niektóre komendy G/M-code, wliczając w to dot. kontroli temperatury i inne, "
-"nie są uniwersalne. Ustaw tą opcję zgodnie z oprogramowaniem układowym "
-"Twojej drukarki aby dostać kompatybilny plik wyjściowy. Parametr \"Bez "
-"ekstruzji\" (\"No extrusion\") zapobiega generowaniu przez Slic3r "
-"jakichkolwiek ekstruzji."
-
-#: src/libslic3r/PrintConfig.cpp:924
-msgid "No extrusion"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:929
-msgid "High extruder current on filament swap"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:930
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:939
-msgid ""
-"This is the acceleration your printer will use for infill. Set zero to "
-"disable acceleration control for infill."
-msgstr ""
-"To jest przyspieszenie stosowane przy druku wypełnienia. Ustaw zero aby "
-"wyłączyć osobne ustawienia przyspieszenia dla wypełnienia."
-
-#: src/libslic3r/PrintConfig.cpp:948
-msgid "Combine infill every"
-msgstr "Scalaj wypełnienie co"
-
-#: src/libslic3r/PrintConfig.cpp:950
-msgid ""
-"This feature allows to combine infill and speed up your print by extruding "
-"thicker infill layers while preserving thin perimeters, thus accuracy."
-msgstr ""
-"Ta funkcja pozwala ustawić oddzielne wysokości dla wypełnienia i obrysów "
-"modelu i przyspieszyć wydruk ustawiając np. wyższą warstwę wypełnienia "
-"zachowując nominalną wysokość obrysów, co pozwoli zachować wysoką jakość i "
-"dokładność wydruku."
-
-#: src/libslic3r/PrintConfig.cpp:954
-msgid "Combine infill every n layers"
-msgstr "Scalaj wypełnienie co n warstw"
-
-#: src/libslic3r/PrintConfig.cpp:960
-msgid "Infill extruder"
-msgstr "Ekstruder dla wypełnienia"
-
-#: src/libslic3r/PrintConfig.cpp:962
-msgid "The extruder to use when printing infill."
-msgstr "Ekstruder używany do druku wypełnienia."
-
-#: src/libslic3r/PrintConfig.cpp:971
-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."
-msgstr ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstruzji wypełnienia. Jeśli ustawisz zero to szerokość będzie miała wartość "
-"domyślną, czyli 1.125x średnicy dyszy. Możesz ustawić większą szerokość aby "
-"przyspieszyć druk wypełnienia i zwiększyć wytrzymałość wydruków. Jeśli "
-"ustawisz wartość procentową (np. 90%) to zostanie obliczona z wysokości "
-"warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:981
-msgid "Infill before perimeters"
-msgstr "Wypełnienie przed obrysami"
-
-#: src/libslic3r/PrintConfig.cpp:982
-msgid ""
-"This option will switch the print order of perimeters and infill, making the "
-"latter first."
-msgstr ""
-"Ta opcja zamieni kolejność druku obrysów i wypełnienia, aby te drugie były "
-"drukowane jako pierwsze."
-
-#: src/libslic3r/PrintConfig.cpp:988
-msgid "Only infill where needed"
-msgstr "Tylko potrzebne wypełnienie"
-
-#: src/libslic3r/PrintConfig.cpp:990
-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."
-msgstr ""
-"Ta opcja wygeneruje wypełnienie jedynie w miejscach, gdzie jest potrzebne do "
-"podparcia górnych warstw (zadziała na zasadzie wewnętrznych podpór). "
-"Włączenie jej spowolni generowanie G-code ze względu na konieczność "
-"kilkukrotnej weryfikacji."
-
-#: src/libslic3r/PrintConfig.cpp:998
-msgid "Infill/perimeters overlap"
-msgstr "Nakładanie wypełnienia na obrysy"
-
-#: src/libslic3r/PrintConfig.cpp:1000
-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."
-msgstr ""
-"To ustawienie odpowiada za dodatkowe nakładanie na siebie linii obrysów i "
-"wypełnienia dla lepszego spojenia. Teoretycznie nie powinno być potrzebne "
-"ale luz może powodować szczeliny. Jeśli ustawisz wartość procentową (np. "
-"15%) to zostanie obliczona z szerokości ekstruzji obrysów."
-
-#: src/libslic3r/PrintConfig.cpp:1012
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr ""
-"Prędkość druku wewnętrznego wypełnienia. Ustaw 0 dla prędkości automatycznej."
-
-#: src/libslic3r/PrintConfig.cpp:1020
-msgid "Inherits profile"
-msgstr "Dziedziczy profil"
-
-#: src/libslic3r/PrintConfig.cpp:1021
-msgid "Name of the profile, from which this profile inherits."
-msgstr "Nazwa profilu, z którego dziedziczy ten profil."
-
-#: src/libslic3r/PrintConfig.cpp:1032
-msgid "Interface shells"
-msgstr "Obrysy Å‚Ä…czÄ…ce"
-
-#: src/libslic3r/PrintConfig.cpp:1033
-msgid ""
-"Force the generation of solid shells between adjacent materials/volumes. "
-"Useful for multi-extruder prints with translucent materials or manual "
-"soluble support material."
-msgstr ""
-"Wymuś generowanie zwartych powłok pomiędzy przylegającymi do siebie "
-"materiałami. Przydatne przy druku materiałami przejrzystymi lub przy "
-"ręcznych podporach rozpuszczalnych."
-
-#: src/libslic3r/PrintConfig.cpp:1043
-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/libslic3r/PrintConfig.cpp:1054
-msgid "Supports remaining times"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1055
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1063
-msgid "Supports silent mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1064
-msgid "Set silent mode for the G-code flavor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1087
-msgid "Maximum feedrate %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1089
-msgid "Maximum feedrate of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1097
-msgid "Maximum acceleration %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1099
-msgid "Maximum acceleration of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1107
-msgid "Maximum jerk %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1109
-msgid "Maximum jerk of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
-msgid "Minimum feedrate when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
-msgid "Minimum travel feedrate"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
-msgid "Maximum acceleration when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
-msgid "Maximum acceleration when retracting"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
-msgid "Max"
-msgstr "Max"
-
-#: src/libslic3r/PrintConfig.cpp:1164
-msgid "This setting represents the maximum speed of your fan."
-msgstr "To ustawienie odpowiada za maksymalną prędkość wentylatora."
-
-#: src/libslic3r/PrintConfig.cpp:1174
-#, no-c-format
-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."
-msgstr ""
-"To jest najwyższa możliwa do wydrukowania wysokość warstwy dla tego "
-"ekstrudera i jednocześnie górny limit dla funkcji zmiennej wysokości warstwy "
-"i materiału podporowego. Zalecana jest wartość nie większa niż 75% "
-"szerokości ekstruzji aby zapewnić dobrą przyczepność warstw do siebie. Jeśli "
-"ustawisz zero, wysokość warstwy zostanie ograniczona do 75% średnicy dyszy."
-
-#: src/libslic3r/PrintConfig.cpp:1185
-msgid "Max print speed"
-msgstr "Maksymalna prędkość druku"
-
-#: src/libslic3r/PrintConfig.cpp:1186
-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."
-msgstr ""
-"Ustawienie pozostałych prędkości na 0 spowoduje, ze Slic3r będzie "
-"automatycznie przeliczał optymalną prędkość dla utrzymania stałego ciśnienia "
-"materiału w ekstruderze. To eksperymentalne ustawienie określa maksymalną "
-"dozwoloną prędkość druku."
-
-#: src/libslic3r/PrintConfig.cpp:1197
-msgid ""
-"This experimental setting is used to set the maximum volumetric speed your "
-"extruder supports."
-msgstr ""
-"Ta eksperymentalna funkcja określa maksymalną prędkość objętościową, którą "
-"jest w stanie wytłoczyć Twój ekstruder."
-
-#: src/libslic3r/PrintConfig.cpp:1206
-msgid "Max volumetric slope positive"
-msgstr "Maksymalny objętościowo kąt pozytywny"
-
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
-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."
-msgstr ""
-"To ustawienie eksperymentalne jest używane do ograniczania szybkości zmian "
-"ilości ekstrudowanego materiału. Wartość 1.8 mm³/s² oznacza, że zmiana z "
-"ilości ekstrudowanego materiału z poziomu 1.8 mm³/s (czyli 0.45 mm "
-"szerokości ekstruzji, 0.2 mm wysokości warstwy przy prędkości 20 mm/s) na "
-"5.4 mm³/s (prędkość 60 mm/s) zajmie co najmniej 2 sekundy."
-
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
-msgid "mm³/s²"
-msgstr "mm³/s²"
-
-#: src/libslic3r/PrintConfig.cpp:1218
-msgid "Max volumetric slope negative"
-msgstr "Maksymalny negatywny kÄ…t zwisu"
-
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
-msgid "Min"
-msgstr "Min"
-
-#: src/libslic3r/PrintConfig.cpp:1231
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr ""
-"To ustawienie wyraża minimalny PWM (Pulse Width Modulation), który jest "
-"niezbędny dla wentylatora."
-
-#: src/libslic3r/PrintConfig.cpp:1241
-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."
-msgstr ""
-"To jest najniższa możliwa do wydrukowania wysokość warstwy dla tego "
-"ekstrudera i jednocześnie dolny limit dla funkcji zmiennej wysokości "
-"warstwy. Zazwyczaj jest to 0.05 lub 0.1 mm."
-
-#: src/libslic3r/PrintConfig.cpp:1250
-msgid "Min print speed"
-msgstr "Minimalna prędkość druku"
-
-#: src/libslic3r/PrintConfig.cpp:1251
-msgid "Slic3r will not scale speed down below this speed."
-msgstr "Slic3r nie będzie skalował prędkości poniżej tej wartości."
-
-#: src/libslic3r/PrintConfig.cpp:1259
-msgid "Minimal filament extrusion length"
-msgstr "Minimalna długość ekstruzji"
-
-#: src/libslic3r/PrintConfig.cpp:1260
-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."
-msgstr ""
-"Generuj ilość pętli skirtu nie mniejszą niż określona aby zużyć taką ilość "
-"filamentu na dolnej warstwie. Dla drukarek z kilkoma ekstuderami ta wartość "
-"jest stosowana dla każdego z nich."
-
-#: src/libslic3r/PrintConfig.cpp:1270
-msgid "Configuration notes"
-msgstr "Notatki konfiguracyjne"
-
-#: src/libslic3r/PrintConfig.cpp:1271
-msgid ""
-"You can put here your personal notes. This text will be added to the G-code "
-"header comments."
-msgstr ""
-"Tutaj możesz umieścić notatki, które zostaną dodane do nagłówka pliku G-code."
-
-#: src/libslic3r/PrintConfig.cpp:1281
-msgid "Nozzle diameter"
-msgstr "Åšrednica dyszy"
-
-#: src/libslic3r/PrintConfig.cpp:1282
-msgid ""
-"This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
-msgstr "To jest średnica dyszy ekstrudera (np. 0.5, 0.35 itp.)"
-
-#: src/libslic3r/PrintConfig.cpp:1288
-msgid "Host Type"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1289
-msgid ""
-"Slic3r can upload G-code files to a printer host. This field must contain "
-"the kind of the host."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr "Nazwa Hosta, IP lub URL"
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
-msgid "Only retract when crossing perimeters"
-msgstr "Retrakcja tylko przy przechodzeniu nad obrysami"
-
-#: src/libslic3r/PrintConfig.cpp:1326
-msgid ""
-"Disables retraction when the travel path does not exceed the upper layer's "
-"perimeters (and thus any ooze will be probably invisible)."
-msgstr ""
-"Wyłącza retrakcję gdy ruch jałowy nie wykracza poza zewnętrzny obrys górnej "
-"warstwy (więc jakiekolwiek wycieki z dyszy prawdopodobnie i tak nie będą "
-"widoczne)."
-
-#: src/libslic3r/PrintConfig.cpp:1334
-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 ""
-"Ta funkcja obniży temperatury nieużywanych ekstruderów aby zapobiec "
-"wyciekaniu filamentu z dyszy. Równocześnie włączy wysoki skirt i przesunie "
-"ekstrudery poza jego obrys przy zmianie temperatury."
-
-#: src/libslic3r/PrintConfig.cpp:1342
-msgid "Output filename format"
-msgstr "Rozszerzenie pliku wyjściowego"
-
-#: src/libslic3r/PrintConfig.cpp:1343
-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 ""
-"Możesz użyć wszystkich opcji konfiguracjnych jako zmiennych w tym szablonie, "
-"takich jak np: [layer_height] - wysokość warstwy, [fill_density] - gęstość "
-"wypełnienia, itp. Możesz również użyć [timestamp] - czas, [year] - rok, "
-"[month] - miesiąc, [day] - dzień, [hour] - godzina, [minute] - minuta, "
-"[second] - sekunda, [version] - wersja, [input_filename] - pełna nazwa pliku "
-"wejściowego, [input_filename_base] - nazwa pliku wejściowego bez "
-"rozszerzenia."
-
-#: src/libslic3r/PrintConfig.cpp:1353
-msgid "Detect bridging perimeters"
-msgstr "Wykrywanie mostów przy obrysach"
-
-#: src/libslic3r/PrintConfig.cpp:1355
-msgid ""
-"Experimental option to adjust flow for overhangs (bridge flow will be used), "
-"to apply bridge speed to them and enable fan."
-msgstr ""
-"Opcja eksperymentalna dostosowująca przepływ przy zwisach (zostanie "
-"zastosowany przepływ taki jak dla mostów), zastosuje również prędkość i "
-"chłodzenie takie jak dla mostów."
-
-#: src/libslic3r/PrintConfig.cpp:1362
-msgid "Filament parking position"
-msgstr "Pozycja zatrzymania filamentu"
-
-#: src/libslic3r/PrintConfig.cpp:1363
-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 ""
-"Odległość końcówki ekstrudera do miejsca zatrzymania filamentu po "
-"rozładowaniu. Ta wartość powinna odpowiadać tej ustawionej w firmware "
-"drukarki. "
-
-#: src/libslic3r/PrintConfig.cpp:1372
-msgid "Extra loading distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1373
-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:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
-msgid "Perimeters"
-msgstr "Obrysy"
-
-#: src/libslic3r/PrintConfig.cpp:1383
-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 ""
-"To jest przyspieszenie stosowane przy druku obrysów. Wysoka wartość, np. "
-"9000 zazwyczaj daje dobre rezultaty - pod warunkiem, że Twój sprzęt się do "
-"tego nadaje. Ustaw zero aby wyłączyć osobne ustawienia przyspieszenia dla "
-"obrysów."
-
-#: src/libslic3r/PrintConfig.cpp:1392
-msgid "Perimeter extruder"
-msgstr "Ekstruder dla obrysów"
-
-#: src/libslic3r/PrintConfig.cpp:1394
-msgid ""
-"The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr ""
-"Ekstruder używany przy druku obrysów i brim. Pierwszy ekstruder ma nr 1."
-
-#: src/libslic3r/PrintConfig.cpp:1404
-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."
-msgstr ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstruzji obrysów. Możesz ustawić większą szerokość aby uzyskać "
-"dokładniejsze wykończenie powierzchni. Jeśli ustawisz zero to szerokość "
-"będzie miała wartość domyślną, czyli 1.125x średnicy dyszy. Jeśli ustawisz "
-"wartość procentową (np. 200%) to zostanie obliczona z wysokości warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:1417
-msgid ""
-"Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr ""
-"Prędkość obrysów (inaczej powłoki pionowej). Ustaw 0 dla prędkości "
-"automatycznej."
-
-#: src/libslic3r/PrintConfig.cpp:1427
-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 ""
-"To ustawienie określa ilość obrysów, które będą generowane dla każdej "
-"warstwy. Weź po uwagę, że Slic3r może zwiększyć tą liczbę automatycznie gdy "
-"wykryje zwisy, w których wydruku pomoże dodatkowa ilość obrysów przy "
-"jednocześnie włączonej opcji \"Dodatkowe obrysy jeśli potrzebne\"."
-
-#: src/libslic3r/PrintConfig.cpp:1431
-msgid "(minimum)"
-msgstr "(minimum)"
-
-#: src/libslic3r/PrintConfig.cpp:1439
-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."
-msgstr ""
-"Wprowadź ścieżki do własnych skryptów jeśli chcesz dodać je do wyjściowego "
-"pliku G-code. Możesz dodać wiele skryptów, rozdzielając je średnikiem ( ; ). "
-"Skrypty będą przetwarzane jako pierwsze w kolejności i mają dostęp do "
-"ustawień konfiguracyjnych Slic3ra przez zmienne środowiskowe."
-
-#: src/libslic3r/PrintConfig.cpp:1452
-msgid "Printer type"
-msgstr "Rodzaj drukarki"
-
-#: src/libslic3r/PrintConfig.cpp:1453
-msgid "Type of the printer."
-msgstr "Rodzaj drukarki."
-
-#: src/libslic3r/PrintConfig.cpp:1457
-msgid "Printer notes"
-msgstr "Notatki o drukarce"
-
-#: src/libslic3r/PrintConfig.cpp:1458
-msgid "You can put your notes regarding the printer here."
-msgstr "Tutaj możesz umieścić notatki dotyczące drukarki."
-
-#: src/libslic3r/PrintConfig.cpp:1467
-msgid "Printer vendor"
-msgstr "Dostawca drukarki"
-
-#: src/libslic3r/PrintConfig.cpp:1468
-msgid "Name of the printer vendor."
-msgstr "Nazwa dostawcy drukarki."
-
-#: src/libslic3r/PrintConfig.cpp:1472
-msgid "Printer variant"
-msgstr "Wariant drukarki"
-
-#: src/libslic3r/PrintConfig.cpp:1473
-msgid ""
-"Name of the printer variant. For example, the printer variants may be "
-"differentiated by a nozzle diameter."
-msgstr "Nazwa wersji drukarki. Możesz np. tworzyć warianty wg średnicy dyszy."
-
-#: src/libslic3r/PrintConfig.cpp:1483
-msgid "Raft layers"
-msgstr "Warstwy tratwy"
-
-#: src/libslic3r/PrintConfig.cpp:1485
-msgid ""
-"The object will be raised by this number of layers, and support material "
-"will be generated under it."
-msgstr ""
-"Model zostanie podniesiony o zadaną ilość warstw i umieszczony na podporach."
-
-#: src/libslic3r/PrintConfig.cpp:1494
-msgid "Resolution"
-msgstr "Rozdzielczość"
-
-#: src/libslic3r/PrintConfig.cpp:1495
-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 ""
-"Minimalna rozdzielczość, używana do uproszczenia modelu wejściowego, co "
-"prowadzi do przyspieszenia procesu cięcia. Modele w wysokiej rozdzielczości "
-"mogą zawierać więcej szczegółów niż drukarka jest w stanie przetworzyć. "
-"Ustaw zero aby wyłączyć upraszczanie i użyć pełnej rozdzielczości pliku "
-"wejściowego."
-
-#: src/libslic3r/PrintConfig.cpp:1506
-msgid "Minimum travel after retraction"
-msgstr "Minimalny ruch jałowy po retrakcji"
-
-#: src/libslic3r/PrintConfig.cpp:1507
-msgid ""
-"Retraction is not triggered when travel moves are shorter than this length."
-msgstr ""
-"Retrakcja nie zostanie wykonana przy ruchu jałowym krótszym niż ta wartość."
-
-#: src/libslic3r/PrintConfig.cpp:1514
-msgid "Retract amount before wipe"
-msgstr "Długość retrakcji przed ruchem czyszczącym"
-
-#: src/libslic3r/PrintConfig.cpp:1515
-msgid ""
-"With bowden extruders, it may be wise to do some amount of quick retract "
-"before doing the wipe movement."
-msgstr ""
-"Przy ekstruderze typu bowden warto wykonać szybką retrakcję przed ruchem "
-"czyszczÄ…cym."
-
-#: src/libslic3r/PrintConfig.cpp:1523
-msgid "Retract on layer change"
-msgstr "Retrakcja przy zmianie warstwy"
-
-#: src/libslic3r/PrintConfig.cpp:1524
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr "Ta flaga wymusza retrakcję przy każdej zmianie wysokości Z."
-
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
-msgid "Length"
-msgstr "Długość"
-
-#: src/libslic3r/PrintConfig.cpp:1531
-msgid "Retraction Length"
-msgstr "Długość retrakcji"
-
-#: src/libslic3r/PrintConfig.cpp:1532
-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 ""
-"Kiedy zostaje wykonana retrakcja to filament o określonej długości jest "
-"wciągany z powrotem (mierzona jest długość nieprzetworzonego filamentu, "
-"zanim wejdzie do ekstrudera)."
-
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
-msgid "mm (zero to disable)"
-msgstr "mm (zero aby wyłączyć)"
-
-#: src/libslic3r/PrintConfig.cpp:1540
-msgid "Retraction Length (Toolchange)"
-msgstr "Długość Retrakcji (zmiana narzędzia)"
-
-#: src/libslic3r/PrintConfig.cpp:1541
-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 ""
-"Kiedy retrakcja zostaje wykonana przed zmianÄ… ekstrudera, filament o "
-"określonej długości jest wciągany z powrotem (mierzona jest długość "
-"nieprzetworzonego filamentu, zanim wejdzie do ekstrudera)."
-
-#: src/libslic3r/PrintConfig.cpp:1550
-msgid "Lift Z"
-msgstr "Z-hop"
-
-#: src/libslic3r/PrintConfig.cpp:1551
-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 ""
-"Jeśli ustawisz tu wartość dodatnią to oś Z wykona szybki ruch w górę przy "
-"każdej retrakcji. Przy używaniu kilku ekstruderów tylko ustawienia "
-"pierwszego z nich będą brane pod uwagę."
-
-#: src/libslic3r/PrintConfig.cpp:1559
-msgid "Above Z"
-msgstr "Powyżej Z"
-
-#: src/libslic3r/PrintConfig.cpp:1560
-msgid "Only lift Z above"
-msgstr "Z-hop tylko powyżej"
-
-#: src/libslic3r/PrintConfig.cpp:1561
-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 ""
-"Jeśli ustawisz wartość dodatnią, to oś Z (z-hop) będzie podnosić się tylko "
-"powyżej ustawionej wartości. Możesz w ten sposób wyłączyć z-hop na pierwszej "
-"warstwie."
-
-#: src/libslic3r/PrintConfig.cpp:1569
-msgid "Below Z"
-msgstr "Poniżej Z"
-
-#: src/libslic3r/PrintConfig.cpp:1570
-msgid "Only lift Z below"
-msgstr "Z-hop tylko poniżej"
-
-#: src/libslic3r/PrintConfig.cpp:1571
-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 ""
-"Jeśli ustawisz wartość dodatnią, to z-hop będzie odbywał się tylko poniżej "
-"ustawionej wartości. Możesz w ten sposób ograniczyć działanie funkcji np. "
-"tylko dla pierwszych warstw."
-
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
-msgid "Extra length on restart"
-msgstr "Dodatkowa ilość dla powrotu"
-
-#: src/libslic3r/PrintConfig.cpp:1581
-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 ""
-"Jeśli retrakcja jest korygowana po ruchu jałowym, ekstruder przepchnie taką "
-"dodatkową ilość filamentu. Ta opcja jest rzadko potrzebna."
-
-#: src/libslic3r/PrintConfig.cpp:1590
-msgid ""
-"When the retraction is compensated after changing tool, the extruder will "
-"push this additional amount of filament."
-msgstr ""
-"Jeśli retrakcja jest korygowana po zmianie narzędzia, ekstruder przepchnie "
-"taką dodatkową ilość filamentu."
-
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
-msgid "Retraction Speed"
-msgstr "Prędkość retrakcji"
-
-#: src/libslic3r/PrintConfig.cpp:1600
-msgid "The speed for retractions (it only applies to the extruder motor)."
-msgstr "Prędkość retrakcji (stosowana tylko dla silnika ekstrudera)."
-
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
-msgid "Deretraction Speed"
-msgstr "Prędkość powrotu retrakcji"
-
-#: src/libslic3r/PrintConfig.cpp:1609
-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 ""
-"Prędkość powrotu filamentu do ekstrudera po retrakcji (dotyczy tylko silnika "
-"ekstrudera). Ustaw zero aby użyć prędkości retrakcji."
-
-#: src/libslic3r/PrintConfig.cpp:1617
-msgid "Seam position"
-msgstr "Pozycja szwu"
-
-#: src/libslic3r/PrintConfig.cpp:1619
-msgid "Position of perimeters starting points."
-msgstr "Pozycja startowa druku obrysów."
-
-#: src/libslic3r/PrintConfig.cpp:1626
-msgid "Random"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1627
-msgid "Nearest"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1628
-msgid "Aligned"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1636
-msgid "Direction"
-msgstr "Kierunek"
-
-#: src/libslic3r/PrintConfig.cpp:1638
-msgid "Preferred direction of the seam"
-msgstr "Preferowane ustawienie szwu"
-
-#: src/libslic3r/PrintConfig.cpp:1639
-msgid "Seam preferred direction"
-msgstr "Preferowany kierunek szwu"
-
-#: src/libslic3r/PrintConfig.cpp:1647
-msgid "Jitter"
-msgstr "Jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1649
-msgid "Seam preferred direction jitter"
-msgstr "Kierunek jitter wyznaczany przez szew"
-
-#: src/libslic3r/PrintConfig.cpp:1650
-msgid "Preferred direction of the seam - jitter"
-msgstr "Preferowany kierunek szwu - jitter"
-
-#: src/libslic3r/PrintConfig.cpp:1661
-msgid "USB/serial port for printer connection."
-msgstr "Port USB/szeregowy do połączenia z drukarką."
-
-#: src/libslic3r/PrintConfig.cpp:1669
-msgid "Serial port speed"
-msgstr "Szybkość portu szeregowego"
-
-#: src/libslic3r/PrintConfig.cpp:1670
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr ""
-"Szybkość transmisji portu USB/portu szeregowego do połączenia z drukarką."
-
-#: src/libslic3r/PrintConfig.cpp:1679
-msgid "Distance from object"
-msgstr "Odstęp od modelu"
-
-#: src/libslic3r/PrintConfig.cpp:1680
-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 ""
-"Odległość skirtu od modelu. Ustaw zero aby dołączyć do modelu i uzyskać "
-"obramowanie dla lepszej przyczepności."
-
-#: src/libslic3r/PrintConfig.cpp:1688
-msgid "Skirt height"
-msgstr "Wysokość skirt"
-
-#: src/libslic3r/PrintConfig.cpp:1689
-msgid ""
-"Height of skirt expressed in layers. Set this to a tall value to use skirt "
-"as a shield against drafts."
-msgstr ""
-"Wysokość skirtu wyrażona w warstwach. Ustawienie wysokiej wartości spowoduje "
-"stworzenie osłony chroniącej przed przeciągami."
-
-#: src/libslic3r/PrintConfig.cpp:1697
-msgid "Loops (minimum)"
-msgstr "Pętle (minimum)"
-
-#: src/libslic3r/PrintConfig.cpp:1698
-msgid "Skirt Loops"
-msgstr "Liczba obrysów skirt"
-
-#: src/libslic3r/PrintConfig.cpp:1699
-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 ""
-"Liczba pętli skirt. Jeśli włączona jest opcja \"Minimalna długość ekstruzji"
-"\", to może ona nadpisać wartość wprowadzoną w tym polu. Ustaw zero aby "
-"całkowicie wyłączyć skirt."
-
-#: src/libslic3r/PrintConfig.cpp:1708
-msgid "Slow down if layer print time is below"
-msgstr "Zwolnij jeśli czas warstwy wynosi mniej niż"
-
-#: src/libslic3r/PrintConfig.cpp:1709
-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 ""
-"Jeśli szacowany czas druku warstwy będzie niższy niż ta wartość to prędkość "
-"ruchów drukujących będzie zmniejszona aby wydłużyć czas druku."
-
-#: src/libslic3r/PrintConfig.cpp:1720
-msgid "Small perimeters"
-msgstr "Małe obrysy"
-
-#: src/libslic3r/PrintConfig.cpp:1722
-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 ""
-"To ustawienie reguluje prędkość obrysów posiadających promień mniejszy lub "
-"równy 6.5 mm (zazwyczaj chodzi o otwory). Jeśli ustawisz wartość procentową "
-"(np. 80%) to zostanie obliczona z prędkości obrysów ustawionej powyżej. "
-"Ustaw zero aby użyć nastawów automatycznych."
-
-#: src/libslic3r/PrintConfig.cpp:1732
-msgid "Solid infill threshold area"
-msgstr "Próg powierzchni zwartego wypełnienia"
-
-#: src/libslic3r/PrintConfig.cpp:1734
-msgid ""
-"Force solid infill for regions having a smaller area than the specified "
-"threshold."
-msgstr "Wymuś zwarte wypełnienie dla obszarów mniejszych niż zadany próg."
-
-#: src/libslic3r/PrintConfig.cpp:1735
-msgid "mm²"
-msgstr "mm²"
-
-#: src/libslic3r/PrintConfig.cpp:1742
-msgid "Solid infill extruder"
-msgstr "Ekstruder do zwartego wypełnienia"
-
-#: src/libslic3r/PrintConfig.cpp:1744
-msgid "The extruder to use when printing solid infill."
-msgstr "Ekstruder używany do druku zwartego wypełnienia."
-
-#: src/libslic3r/PrintConfig.cpp:1751
-msgid "Solid infill every"
-msgstr "Zwarte wypełnienie co"
-
-#: src/libslic3r/PrintConfig.cpp:1753
-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."
-msgstr ""
-"Ta funkcja pozwoli wstawić zwartą warstwę wypełnienia pomiędzy określoną "
-"liczbą warstw. Ustaw zero aby wyłączyć. Możesz ustawić tu dowolną wartość "
-"(np. 9999) a Slic3r automatycznie wybierze maksymalną możliwą liczbę warstw "
-"biorąc pod uwagę średnicę dyszy i wysokość warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:1766
-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."
-msgstr ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstruzji wypełnienia powierzchni zwartych. Jeśli ustawisz zero, szerokość "
-"będzie miała wartość domyślną, czyli 1.125x średnicy dyszy. Jeśli ustawisz "
-"wartość procentową (np. 90%) to zostanie obliczona z wysokości warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:1777
-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 ""
-"Prędkość druku zwartych obszarów (góra/dół/poziome powłoki wewnętrzne). Może "
-"być wyrażona procentowo (np. 80%) ponad domyślną prędkość wypełnienia. Wpisz "
-"zero dla automatycznego ustawienia."
-
-#: src/libslic3r/PrintConfig.cpp:1789
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr "Liczba zwartych warstw górnych i dolnych."
-
-#: src/libslic3r/PrintConfig.cpp:1796
-msgid "Spiral vase"
-msgstr "Tryb wazy"
-
-#: src/libslic3r/PrintConfig.cpp:1797
-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 ""
-"Ta funkcja pozwala drukować modele z 1 zewnętrzną ścianką z ciągłym "
-"podnoszeniem Z, aby uniknąć widocznego szwu (czyli ekstruder nie będzie "
-"drukował po 1 warstwie na 1 wysokości, lecz będzie podnosił się płynnie w "
-"formie spirali). Wymaga użycia 1 obrysu, zerowego wypełnienia, braku warstw "
-"górnych i braku podpór. Możesz ustawić dowolną ilość dolnych warstw jak i "
-"obrysów skirt/brim. Nie zadziała przy druku więcej niż jednego modelu."
-
-#: src/libslic3r/PrintConfig.cpp:1806
-msgid "Temperature variation"
-msgstr "Zmiana temperatury"
-
-#: src/libslic3r/PrintConfig.cpp:1807
-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 ""
-"Różnica temperatur mająca zastosowanie gdy ekstruder nie jest używany. "
-"Włącza druk skirtu o wysokości równej wysokości modelu, dzięki której dysze "
-"będą co jakiś czas czyszczone."
-
-#: src/libslic3r/PrintConfig.cpp:1818
-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 ""
-"Ten skrypt jest wykonywany na początku, po tym jak stół roboczy osiągnie "
-"zadanÄ… temperaturÄ™ i ekstruder zacznie podgrzewanie, ale zanim nagrzeje siÄ™ "
-"do zadanej temperatury. Jeśli Slic3r wykryje komendy typu M104, M109, M140 "
-"lub M190, to nie zostaną one wykonane na początku, więc możesz określić "
-"kolejność komend dot. podgrzewania i innych dodanych akcji. 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:1834
-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 ""
-"Ten skrypt jest wykonywany na samym początku G-code. Może być użyty do "
-"nadpisania określonych ustawień filamentu. Jeśli Slic3r wykryje komendy typu "
-"M104, M109, M140 lub M190, to nie zostaną one wykonane na początku, więc "
-"możesz określić kolejność komend dot. podgrzewania i innych dodanych akcji. "
-"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. Jeśli posiadasz kilka ekstruderów, ten G-code jest "
-"wykonywany w ich kolejności."
-
-#: src/libslic3r/PrintConfig.cpp:1850
-msgid "Single Extruder Multi Material"
-msgstr "Multi Material z jednym ekstruderem"
-
-#: src/libslic3r/PrintConfig.cpp:1851
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr "Drukarka przechodzi pomiędzy filamentami używając jednego hotendu."
-
-#: src/libslic3r/PrintConfig.cpp:1857
-msgid "Prime all printing extruders"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1858
-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:1864
-msgid "Generate support material"
-msgstr "Generuj materiał podporowy"
-
-#: src/libslic3r/PrintConfig.cpp:1866
-msgid "Enable support material generation."
-msgstr "Włącz generowanie materiału podporowego."
-
-#: src/libslic3r/PrintConfig.cpp:1871
-msgid "Auto generated supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1873
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1880
-msgid "XY separation between an object and its support"
-msgstr "Odstęp materiału podporowego od modelu w osiach XY"
-
-#: src/libslic3r/PrintConfig.cpp:1882
-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 ""
-"Odstęp materiału podporowego od modelu w osiach XY. Jeśli ustawisz wartość "
-"procentową (np. 15%) to zostanie obliczona z szerokości ekstruzji obrysów "
-"zewnętrznych."
-
-#: src/libslic3r/PrintConfig.cpp:1893
-msgid "Pattern angle"
-msgstr "KÄ…t wzoru"
-
-#: src/libslic3r/PrintConfig.cpp:1895
-msgid ""
-"Use this setting to rotate the support material pattern on the horizontal "
-"plane."
-msgstr ""
-"To ustawienie odpowiada za obrót materiału podporowego w płaszczyźnie "
-"poziomej."
-
-#: src/libslic3r/PrintConfig.cpp:1906
-msgid ""
-"Only create support if it lies on a build plate. Don't create support on a "
-"print."
-msgstr "Tworzenie podpór tylko na stole. Nie będą tworzone na wydruku."
-
-#: src/libslic3r/PrintConfig.cpp:1913
-msgid "Contact Z distance"
-msgstr "Odstęp w osi Z"
-
-#: src/libslic3r/PrintConfig.cpp:1915
-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 ""
-"Dystans w pionie między modelem a warstwą łączącą materiału podporowego. "
-"Ustawienie na 0 wyłączy ustawienie mostu (prędkości i przepływu) dla "
-"pierwszej warstwy modelu nad warstwÄ… Å‚Ä…czÄ…cÄ…."
-
-#: src/libslic3r/PrintConfig.cpp:1923
-msgid "soluble"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1924
-msgid "detachable"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1929
-msgid "Enforce support for the first"
-msgstr "WymuÅ› podpory dla pierwszych"
-
-#: src/libslic3r/PrintConfig.cpp:1931
-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 ""
-"Generuj materiał podporowy dla określonej liczby warstw licząc od dołu, "
-"niezależnie od tego czy normalny materiał podporowy jest włączony i "
-"niezależnie od progu kąta. Przydaje się aby uzyskać lepszą przyczepność "
-"modelu, które mają bardzo małą powierzchnię kontaktu z powierzchnią druku."
-
-#: src/libslic3r/PrintConfig.cpp:1937
-msgid "Enforce support for the first n layers"
-msgstr "WymuÅ› podpory dla pierwszych n warstw"
-
-#: src/libslic3r/PrintConfig.cpp:1943
-msgid "Support material/raft/skirt extruder"
-msgstr "Ekstruder dla podpór/tratwy (raft)/skirtu"
-
-#: src/libslic3r/PrintConfig.cpp:1945
-msgid ""
-"The extruder to use when printing support material, raft and skirt (1+, 0 to "
-"use the current extruder to minimize tool changes)."
-msgstr ""
-"Ekstruder używany przy druku podpór, tratwy (raft) i skirtu (1+, zero aby "
-"użyć obecnie wybranego ekstrudera i zminimalizować zmiany filamentu)."
-
-#: src/libslic3r/PrintConfig.cpp:1955
-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."
-msgstr ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstruzji materiału podporowego. Jeśli ustawisz zero to szerokość będzie "
-"miała wartość domyślną, czyli będzie równa średnicy dyszy. Jeśli ustawisz "
-"wartość procentową (np. 90%) to zostanie obliczona z wysokości warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:1964
-msgid "Interface loops"
-msgstr "Warstwy Å‚Ä…czÄ…ce"
-
-#: src/libslic3r/PrintConfig.cpp:1966
-msgid ""
-"Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr "Pokryj pętlą górną warstwę podpór. Domyślnie wyłączone."
-
-#: src/libslic3r/PrintConfig.cpp:1972
-msgid "Support material/raft interface extruder"
-msgstr "Ekstruder dla podpór/warstw łączących raft z modelem"
-
-#: src/libslic3r/PrintConfig.cpp:1974
-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 ""
-"Ekstruder używany przy druku warstw łączących podpory z modelem (1+, zero "
-"aby użyć obecnie wybranego ekstrudera i zminimalizować zmiany filamentu). Ma "
-"wpływ również na druk tratwy (raftu)."
-
-#: src/libslic3r/PrintConfig.cpp:1982
-msgid "Interface layers"
-msgstr "Warstwy Å‚Ä…czÄ…ce"
-
-#: src/libslic3r/PrintConfig.cpp:1984
-msgid ""
-"Number of interface layers to insert between the object(s) and support "
-"material."
-msgstr "Liczba warstw łączących materiał podporowy z modelem właściwym."
-
-#: src/libslic3r/PrintConfig.cpp:1992
-msgid "Interface pattern spacing"
-msgstr "Rozmieszczenie wzoru warstw Å‚Ä…czÄ…cych"
-
-#: src/libslic3r/PrintConfig.cpp:1994
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr ""
-"Rozmieszczenie linii warstwy Å‚Ä…czÄ…cej. Ustaw zero dla zwartej warstwy "
-"Å‚Ä…czÄ…cej."
-
-#: src/libslic3r/PrintConfig.cpp:2004
-msgid ""
-"Speed for printing support material interface layers. If expressed as "
-"percentage (for example 50%) it will be calculated over support material "
-"speed."
-msgstr ""
-"Prędkość druku warstw łączących materiału podporowego. Jeśli ustawisz "
-"wartość procentową (np. 50%) to zostanie obliczona z prędkości druku "
-"materiału podporowego."
-
-#: src/libslic3r/PrintConfig.cpp:2013
-msgid "Pattern"
-msgstr "Wzór"
-
-#: src/libslic3r/PrintConfig.cpp:2015
-msgid "Pattern used to generate support material."
-msgstr "Wzór podpór."
-
-#: src/libslic3r/PrintConfig.cpp:2022
-msgid "Rectilinear grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2028
-msgid "Pattern spacing"
-msgstr "Rozmieszczenie wzoru"
-
-#: src/libslic3r/PrintConfig.cpp:2030
-msgid "Spacing between support material lines."
-msgstr "Rozmieszczenie linii materiału podporowego."
-
-#: src/libslic3r/PrintConfig.cpp:2040
-msgid "Speed for printing support material."
-msgstr "Prędkość druku materiału podporowego."
-
-#: src/libslic3r/PrintConfig.cpp:2047
-msgid "Synchronize with object layers"
-msgstr "Synchronizuj z warstwami modelu"
-
-#: src/libslic3r/PrintConfig.cpp:2049
-msgid ""
-"Synchronize support layers with the object print layers. This is useful with "
-"multi-material printers, where the extruder switch is expensive."
-msgstr ""
-"Synchronizuj warstwy podporowe z warstwami modelu. Przydaje siÄ™ przy "
-"drukarkach typu multi-material gdy zmiana używanego materiału jest kosztowna."
-
-#: src/libslic3r/PrintConfig.cpp:2056
-msgid "Overhang threshold"
-msgstr "Próg zwisu"
-
-#: src/libslic3r/PrintConfig.cpp:2058
-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 ""
-"Podpory nie będą generowane dla zwisów, których kąt przekracza zadany próg "
-"(90° = pion). Inaczej mówiąc, ta wartość określa największy kąt od poziomu "
-"(kąt mierzony od płaszczyzny poziomej), który będzie drukowany bez podpór."
-
-#: src/libslic3r/PrintConfig.cpp:2071
-msgid "With sheath around the support"
-msgstr "Z osłoną wokół podpór"
-
-#: src/libslic3r/PrintConfig.cpp:2073
-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 ""
-"Dodaj osłonę (pojedynczą linię) wokół podpory bazowej. Sprawi to, że podpory "
-"będą stabilniejsze, ale też trudniejsze do usunięcia."
-
-#: src/libslic3r/PrintConfig.cpp:2081
-msgid ""
-"Extruder temperature for layers after the first one. Set this to zero to "
-"disable temperature control commands in the output."
-msgstr ""
-"Temperatura ekstrudera dla warstw powyżej pierwszej. Ustaw zero aby wyłączyć "
-"komendy kontrolujące temperaturę w pliku wyjściowym."
-
-#: src/libslic3r/PrintConfig.cpp:2084
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: src/libslic3r/PrintConfig.cpp:2090
-msgid "Detect thin walls"
-msgstr "Wykrywanie cienkich ścian"
-
-#: src/libslic3r/PrintConfig.cpp:2092
-msgid ""
-"Detect single-width walls (parts where two extrusions don't fit and we need "
-"to collapse them into a single trace)."
-msgstr ""
-"Wykrywaj ściany o grubości jednego obrysu (obszary, gdzie 2 obrysy nie "
-"zmieszczą się i trzeba będzie połączyć je w jedną linię)."
-
-#: src/libslic3r/PrintConfig.cpp:2099
-msgid "Threads"
-msgstr "WÄ…tki"
-
-#: src/libslic3r/PrintConfig.cpp:2100
-msgid ""
-"Threads are used to parallelize long-running tasks. Optimal threads number "
-"is slightly above the number of available cores/processors."
-msgstr ""
-"Wątki są używane do równoległego przetwarzania zadań wymagających używa "
-"wielu zasobów. Optymalna liczba wątków powinna być odrobinę większa od "
-"dostępnej liczby rdzeni lub procesorów."
-
-#: src/libslic3r/PrintConfig.cpp:2112
-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 ""
-"Ten kod jest wykonywany przed każdą zmianą ekstrudera/filamentu. Pamiętaj, "
-"że możesz użyć zmiennych typu placeholder dla wszystkich ustawień Slic3r, "
-"jak np. [previous_extruder] (poprzedni ekstruder) i [next_extruder] "
-"(następny ekstruder)."
-
-#: src/libslic3r/PrintConfig.cpp:2125
-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."
-msgstr ""
-"Ustaw tą wartość jako niezerową aby pozwolić na ręczne ustawienie szerokości "
-"ekstruzji zwartego wypełnienia górnych warstw. Możesz ustawić mniejszą "
-"szerokość aby wypełnić szczeliny i uzyskać gładsze wykończenie. Jeśli "
-"ustawisz zero, szerokość będzie miała wartość domyślną, czyli będzie równa "
-"średnicy dyszy. Jeśli ustawisz wartość procentową (np. 90%) to zostanie "
-"obliczona z wysokości warstwy."
-
-#: src/libslic3r/PrintConfig.cpp:2137
-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."
-msgstr ""
-"Prędkość druku najwyższych warstw zwartych (dotyczy tylko najwyższych, "
-"zewnętrznych warstw i nie obejmuje zwartych warstw umieszczonych niżej). "
-"Warto obniżyć tą wartość dla ładniejszego wykończenia powierzchni. Jeśli "
-"ustawisz wartość procentową (np. 80%) to zosttanie obliczona z prędkości "
-"druku zwartego wypełnienia. Ustaw zero dla prędkości automatycznej."
-
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "Górne"
-
-#: src/libslic3r/PrintConfig.cpp:2151
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "Liczba zwartych warstw górnych."
-
-#: src/libslic3r/PrintConfig.cpp:2153
-msgid "Top solid layers"
-msgstr "Zwarte warstwy górne"
-
-#: src/libslic3r/PrintConfig.cpp:2159
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr "Prędkość ruchów jałowych (przeskoków pomiędzy punktami ekstruzji)."
-
-#: src/libslic3r/PrintConfig.cpp:2168
-msgid "Use firmware retraction"
-msgstr "Użyj retrakcji z firmware"
-
-#: src/libslic3r/PrintConfig.cpp:2169
-msgid ""
-"This experimental setting uses G10 and G11 commands to have the firmware "
-"handle the retraction. This is only supported in recent Marlin."
-msgstr ""
-"Ta eksperymentalna funkcja używa komend G10 i G11 aby przerzucić kontrolę "
-"retrakcji na firmware. Jest wspierana jedynie przez najnowsze wersje Marlina."
-
-#: src/libslic3r/PrintConfig.cpp:2176
-msgid "Use relative E distances"
-msgstr "Użyj względnych wartości E (ekstruzji)"
-
-#: src/libslic3r/PrintConfig.cpp:2177
-msgid ""
-"If your firmware requires relative E values, check this, otherwise leave it "
-"unchecked. Most firmwares use absolute values."
-msgstr ""
-"Jeśli Twój firmware wymaga względnych wartości E, zaznacz to pole. W innym "
-"przypadku zostaw puste. Większość układów obsługuje wartości absolutne."
-
-#: src/libslic3r/PrintConfig.cpp:2184
-msgid "Use volumetric E"
-msgstr "Użyj wolumetrycznej wartości E"
-
-#: src/libslic3r/PrintConfig.cpp:2185
-msgid ""
-"This experimental setting uses outputs the E values in cubic millimeters "
-"instead of linear millimeters. If your firmware doesn't already know "
-"filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] "
-"T0' in your start G-code in order to turn volumetric mode on and use the "
-"filament diameter associated to the filament selected in Slic3r. This is "
-"only supported in recent Marlin."
-msgstr ""
-"Ta eksperymentalna funkcja określa wyjściowe dane E (ilość ekstruzji) w "
-"milimetrach sześciennych zamiast długości. Jeśli średnica filamentu nie "
-"została jeszcze ustawiona w firmware, możesz użyć komendy \"M200 "
-"D[filament_diameter_0] T0\" w skrypcie startowym aby włączyć tryb "
-"objętościowy i użyć filamentu powiązanego z ustawionym w Slic3r. Ta funkcja "
-"jest wspierana jedynie przez najnowsze wersje Marlina."
-
-#: src/libslic3r/PrintConfig.cpp:2196
-msgid "Enable variable layer height feature"
-msgstr "Włącz funkcję zmiennej wysokości warstwy"
-
-#: src/libslic3r/PrintConfig.cpp:2197
-msgid ""
-"Some printers or printer setups may have difficulties printing with a "
-"variable layer height. Enabled by default."
-msgstr ""
-"Niektóre drukarki mogą mieć trudności z drukiem ze zmienną wysokością "
-"warstwy. Domyślnie włączone."
-
-#: src/libslic3r/PrintConfig.cpp:2204
-msgid "Wipe while retracting"
-msgstr "Czyszczenie przy retrakcji"
-
-#: src/libslic3r/PrintConfig.cpp:2205
-msgid ""
-"This flag will move the nozzle while retracting to minimize the possible "
-"blob on leaky extruders."
-msgstr ""
-"Ta flaga włączy ruch dyszy przy retrakcji aby zminimalizować formowanie się "
-"kropli filamentu wokół końcówki dyszy przy ekstruderach, które mają "
-"tendencjÄ™ do wyciekania filamentu."
-
-#: src/libslic3r/PrintConfig.cpp:2213
-msgid ""
-"Multi material printers may need to prime or purge extruders on tool "
-"changes. Extrude the excess material into the wipe tower."
-msgstr ""
-"Drukarki pracujÄ…ce z kilkoma filamentami na raz (multi-material) mogÄ… "
-"wymagać czyszczenia głowicy przy zmianie filamentu. Nadmiar materiału jest "
-"wytłaczany w formie wieży czyszczącej."
-
-#: src/libslic3r/PrintConfig.cpp:2220
-msgid "Purging volumes - load/unload volumes"
-msgstr "Objętość czyszczenia - objętość ładowania/rozładowania"
-
-#: src/libslic3r/PrintConfig.cpp:2221
-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 ""
-"To ustawienie określa wymaganą objętość wieży czyszczącej przy zmianie "
-"danego narzędzia. Te wartości używane są do uproszczenia określenia pełnych "
-"wartości czyszczenia poniżej. "
-
-#: src/libslic3r/PrintConfig.cpp:2228
-msgid "Purging volumes - matrix"
-msgstr "Objętości czyszczenia - formuła"
-
-#: src/libslic3r/PrintConfig.cpp:2229
-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 ""
-"Ta formuła określa objętość (w milimetrach sześciennych) wymaganą do "
-"wyczyszczenia filamentu na wieży czyszczącej dla danej pary narzędzi "
-"(filamentów). "
-
-#: src/libslic3r/PrintConfig.cpp:2239
-msgid "Position X"
-msgstr "Pozycja X"
-
-#: src/libslic3r/PrintConfig.cpp:2240
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr "Koordynata X wieży czyszczącej od przedniego lewego narożnika"
-
-#: src/libslic3r/PrintConfig.cpp:2247
-msgid "Position Y"
-msgstr "Pozycja Y"
-
-#: src/libslic3r/PrintConfig.cpp:2248
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr "Koordynata wieży czyszczącej w osi Y od przedniego lewego narożnika"
-
-#: src/libslic3r/PrintConfig.cpp:2256
-msgid "Width of a wipe tower"
-msgstr "Szerokość wieży czyszczącej"
-
-#: src/libslic3r/PrintConfig.cpp:2263
-msgid "Wipe tower rotation angle"
-msgstr "Kąt obrotu wieży czyszczącej"
-
-#: src/libslic3r/PrintConfig.cpp:2264
-msgid "Wipe tower rotation angle with respect to x-axis "
-msgstr "Obrót wieży czyszczącej względem osi X "
-
-#: src/libslic3r/PrintConfig.cpp:2265
-msgid "degrees"
-msgstr "stopni"
-
-#: src/libslic3r/PrintConfig.cpp:2272
-msgid "Wipe into this object's infill"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2273
-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:2281
-msgid "Wipe into this object"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2282
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2289
-msgid "Maximal bridging distance"
-msgstr "Maksymalna odległość drukowania mostów"
-
-#: src/libslic3r/PrintConfig.cpp:2290
-msgid "Maximal distance between supports on sparse infill sections. "
-msgstr "Minimalny odstęp pomiędzy podporami w sekcjach rzadkiego wypełnienia. "
-
-#: src/libslic3r/PrintConfig.cpp:2297
-msgid "XY Size Compensation"
-msgstr "Korekta wymiarów XY"
-
-#: src/libslic3r/PrintConfig.cpp:2299
-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 ""
-"Model zostanie zmniejszony lub zwiększony w osiach X i Y o zadaną wartość "
-"(ujemna = zmniejszenie, dotatnia = zwiększenie). Może być przydatne przy "
-"kalibracji średnic otworów."
-
-#: src/libslic3r/PrintConfig.cpp:2308
-msgid "Z offset"
-msgstr "Margines Z"
-
-#: src/libslic3r/PrintConfig.cpp:2309
-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)."
-msgstr ""
-"Wartość tego ustawienia zostanie dodana (lub odjęta) od wszystkich koordynat "
-"w osi Z w pliku wyjściowym G-code. Jest używana dla korekcji złego położenia "
-"wyłącznika krańcowego osi Z. Np. jeśli końcówka dyszy znajduje się 0.3 mm "
-"ponad położeniem zerowym, ustaw tutaj -0.3 (lub napraw krańcówkę)."
-
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
-msgid "Display width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2374
-msgid "Width of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2380
-msgid "Display height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2381
-msgid "Height of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2387
-msgid "Number of pixels in"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2389
-msgid "Number of pixels in X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2396
-msgid "Number of pixels in Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2402
-msgid "Display orientation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2403
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2410
-msgid "Landscape"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2411
-msgid "Portrait"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
-msgid "Printer scaling correction"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
-msgid "Initial layer height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
-msgid "Initial exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
-msgid "SLA print material notes"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2459
-msgid "You can put your notes regarding the SLA print material here."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
-msgid "Default SLA material profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2487
-msgid "Generate supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2489
-msgid "Generate supports for the models"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2494
-msgid "Support head front diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2496
-msgid "Diameter of the pointing side of the head"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2503
-msgid "Support head penetration"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2505
-msgid "How much the pinhead has to penetrate the model surface"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2512
-msgid "Support head width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2514
-msgid "Width from the back sphere center to the front sphere center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2521
-msgid "Support pillar diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2523
-msgid "Diameter in mm of the support pillars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2530
-msgid "Support pillar connection mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2531
-msgid ""
-"Controls the bridge type between two neigboring 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:2540
-msgid "Zig-Zag"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2541
-msgid "Cross"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2542
-msgid "Dynamic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2546
-msgid "Pillar widening factor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2548
-msgid ""
-"Merging bridges or pillars into another pillars can increase the radius. "
-"Zero means no increase, one means full increase."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2557
-msgid "Support base diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2559
-msgid "Diameter in mm of the pillar base"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2566
-msgid "Support base height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2568
-msgid "The height of the pillar base cone"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2575
-msgid "Critical angle"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2577
-msgid "The default angle for connecting support sticks and junctions."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2584
-msgid "Max bridge length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2586
-msgid "The max length of a bridge"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2593
-msgid "Object elevation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2595
-msgid "How much the supports should lift up the supported object."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
-msgid "Use pad"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2631
-msgid "Add a pad underneath the supported model"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2636
-msgid "Pad wall thickness"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2645
-msgid "Pad wall height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2654
-msgid "Max merge distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2663
-msgid "Pad edge radius"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3023
-msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid ""
-"Load and store settings at the given directory. This is useful for "
-"maintaining different profiles or including configurations from a network "
-"storage."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:176
-msgid "Mixed"
-msgstr "Mieszane"
-
-#: src/libslic3r/GCode/PreviewData.cpp:396
-msgid "Height (mm)"
-msgstr "Wysokość (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:398
-msgid "Width (mm)"
-msgstr "Szerokość (mm)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:400
-msgid "Speed (mm/s)"
-msgstr "Prędkość (mm/s)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:402
-msgid "Volumetric flow rate (mm3/s)"
-msgstr "Objętościowy współczynnik przepływu (mm3/s)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:491
-msgid "Default print color"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:495
-#, c-format
-msgid "up to %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:499
-#, c-format
-msgid "above %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:504
-#, c-format
-msgid "%.2f - %.2f mm"
-msgstr ""
diff --git a/resources/localization/uk/Slic3rPE.mo b/resources/localization/uk/Slic3rPE.mo
deleted file mode 100644
index 8c5c5437b..000000000
Binary files a/resources/localization/uk/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/uk/Slic3rPE_uk.po b/resources/localization/uk/Slic3rPE_uk.po
deleted file mode 100644
index 3845994bf..000000000
--- a/resources/localization/uk/Slic3rPE_uk.po
+++ /dev/null
@@ -1,5804 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: 2019-02-26 10:38+0100\n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language-Team: \n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.8\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"
-
-#: src/slic3r/GUI/AboutDialog.cpp:33
-msgid "About Slic3r"
-msgstr "Про Slic3r"
-
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
-msgid "Version"
-msgstr "Вер�і�"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:43
-msgid "Shape"
-msgstr "Вигл�д (Форма)"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
-msgid "Rectangular"
-msgstr "Пр�мокутний"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
-msgid "Size"
-msgstr "Розмір"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
-msgid "Size in X and Y of the rectangular plate."
-msgstr "Розмір пр�мокутної подложки за X та Y."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
-msgid "Origin"
-msgstr "Початок координат"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
-msgid "Distance of the 0,0 G-code coordinate from the front left corner of the rectangle."
-msgstr "Від�тань координат 0,0 G-коду від нижнього лівого кута пр�мокутника."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
-msgid "Circular"
-msgstr "Круговий"
-
-msgid "Switch to %s mode"
-msgstr "Перейти до режиму %s"
-
-msgid "Current mode is %s"
-msgstr "Поточний режим - %s"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
-msgid "mm"
-msgstr "мм"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
-msgid "Diameter"
-msgstr "Діаметр"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
-msgid "Diameter of the print bed. It is assumed that origin (0,0) is located in the center."
-msgstr "Діаметр подложки. Передбачаєть��, що початок координат (0,0) знаходить�� в центрі."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
-#: src/libslic3r/GCode/PreviewData.cpp:175
-msgid "Custom"
-msgstr "Кори�тувацький"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
-msgid "Load shape from STL..."
-msgstr "Завантажте форму з STL ..."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
-msgid "Settings"
-msgstr "�алаштуванн�"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Виберіть файл, щоб імпортувати форму полотна з (STL/OBJ/AMF/PRUSA):"
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
-msgid "Error! "
-msgstr "Помилка! "
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr "Обраний файл не мі�тить геометрії."
-
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
-msgid "The selected file contains several disjoint areas. This is not supported."
-msgstr "Обраний файл мі�тить декілька непере�ічних обла�тей. �е підтримуєть��."
-
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape"
-msgstr "Форма полотна"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:54
-msgid "Network lookup"
-msgstr ""
-
-#: src/slic3r/GUI/BonjourDialog.cpp:67
-msgid "Address"
-msgstr ""
-
-#: src/slic3r/GUI/BonjourDialog.cpp:68
-msgid "Hostname"
-msgstr ""
-
-#: src/slic3r/GUI/BonjourDialog.cpp:69
-msgid "Service name"
-msgstr ""
-
-#: src/slic3r/GUI/BonjourDialog.cpp:70
-msgid "OctoPrint version"
-msgstr "Вер�і� OctoPrint"
-
-#: src/slic3r/GUI/BonjourDialog.cpp:188
-msgid "Searching for devices"
-msgstr ""
-
-#: src/slic3r/GUI/BonjourDialog.cpp:195
-msgid "Finished"
-msgstr ""
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:15
-msgid "Buttons And Text Colors Description"
-msgstr ""
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:40
-msgid "Value is the same as the system value"
-msgstr ""
-
-#: src/slic3r/GUI/ButtonsDescription.cpp:57
-msgid "Value was changed and is not equal to the system value or the last saved preset"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
-msgid "Upgrade"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
-msgid "Downgrade"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
-msgid "Before roll back"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
-msgid "User"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
-msgid "Unknown"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
-msgid "Active: "
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
-msgid "slic3r version"
-msgstr "вер�і� slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
-msgid "print"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
-msgid "filaments"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
-msgid "printer"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
-msgid "vendor"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
-msgid "version"
-msgstr "вер�і�"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
-msgid "min slic3r version"
-msgstr "мінімальна вер�і� slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
-msgid "max slic3r version"
-msgstr "мак�имальна вер�і� slic3r"
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "model"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
-msgid "variants"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
-msgid "Incompatible with this Slic3r"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
-msgid "Activate"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
-msgid "Configuration Snapshots"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:92
-msgid "nozzle"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
-msgstr "за замовчанн�м"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
-msgstr "Вибрати в�е"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
-msgstr "�ічого"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-#, c-format
-msgid "Welcome to the Slic3r %s"
-msgstr "Ла�каво про�имо до Slic3r %s"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:226
-msgid "Welcome"
-msgstr "Ла�каво про�имо"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:234
-#, c-format
-msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:238
-msgid "Remove user profiles - install from scratch (a snapshot will be taken beforehand)"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Automatic updates"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:289
-msgid "Updates"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
-msgid "Check for application updates"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
-msgid "If enabled, Slic3r checks for new versions of Slic3r PE 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 ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
-msgid "Update built-in Presets automatically"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
-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 ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:308
-msgid "Updates are never applied without user's consent and never overwrite user's customized settings."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:313
-msgid "Additionally a backup snapshot of the whole configuration is created before an update is applied."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:320
-msgid "Other Vendors"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:322
-msgid "Pick another vendor supported by Slic3r PE:"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381
-msgid "Firmware Type"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
-msgid "Firmware"
-msgstr "Прошивка"
-
-#: src/slic3r/GUI/ConfigWizard.cpp:385
-msgid "Choose the type of firmware used by your printer."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:419
-msgid "Bed Shape and Size"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:422
-msgid "Set the shape of your printer's bed."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Filament and Nozzle Diameters"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:436
-msgid "Print Diameters"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:452
-msgid "Enter the diameter of your printer's hot end nozzle."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:455
-msgid "Nozzle Diameter:"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:465
-msgid "Enter the diameter of your filament."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:466
-msgid "Good precision is required, so use a caliper and do multiple measurements along the filament, then compute the average."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:469
-msgid "Filament Diameter:"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Extruder and Bed Temperatures"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:487
-msgid "Temperatures"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:503
-msgid "Enter the temperature needed for extruding your filament."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:504
-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:507
-msgid "Extrusion Temperature:"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
-msgid "°C"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:517
-msgid "Enter the bed temperature needed for getting your filament to stick to your heated bed."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:518
-msgid "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have no heated bed."
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:521
-msgid "Bed Temperature:"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:833
-msgid "< &Back"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:834
-msgid "&Next >"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:835
-msgid "&Finish"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:906
-msgid "Configuration Wizard"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:907
-msgid "Configuration &Wizard"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:909
-msgid "Configuration Assistant"
-msgstr ""
-
-#: src/slic3r/GUI/ConfigWizard.cpp:910
-msgid "Configuration &Assistant"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:109
-msgid "default value"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:112
-msgid "parameter name"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:140
-#, c-format
-msgid "%s doesn't support percentage"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:153
-msgid "Input value is out of range"
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:176
-#, c-format
-msgid ""
-"Do you mean %d%% instead of %d %s?\n"
-"Select YES if you want to change this value to %d%%, \n"
-"or NO if you are sure that %d %s is a correct value."
-msgstr ""
-
-#: src/slic3r/GUI/Field.cpp:179
-msgid "Parameter validation"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
-msgid "Flash!"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
-msgid "Flashing in progress. Please do not disconnect the printer!"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
-msgid "Flashing succeeded!"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
-msgid "Flashing failed. Please see the avrdude log below."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
-msgid "Flashing cancelled."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
-#, 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 ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
-msgid "Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at a time for flashing."
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
-#, c-format
-msgid "Error accessing port at %s: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
-msgid "Firmware flasher"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
-msgid "Firmware image:"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
-msgid "Serial port:"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
-msgid "Autodetected"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
-msgid "Rescan"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
-msgid "Progress:"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
-msgid "Status:"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
-msgid "Ready"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
-msgid ""
-"Are you sure you want to cancel firmware flashing?\n"
-"This could leave your printer in an unusable state!"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
-msgid "Confirmation"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
-msgid "Cancelling..."
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
-msgid "Detected object outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
-msgid "Detected toolpath outside print volume"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "Повернути"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "Ма�штаб"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr "Ліва кнопка миші - додати точку"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr "Права кнопка миші - видалити точку"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr "Генерувати точки автоматично"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr "Видалити в�і точки"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr "Точки SLA підтримки"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
-msgid "Rotate lower part upwards"
-msgstr "Повернути нижню ча�тину вгору"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
-msgid "Perform cut"
-msgstr "Виконати розріз"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2276
-msgid "Cut object:"
-msgstr "Розрізати об'єкт:"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
-msgid "Cut"
-msgstr "Розрізати"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2466
-msgid "Keep upper part"
-msgstr "Залишити верхню ча�тину"
-
-#: src/slic3r/GUI/GLGizmo.cpp:2467
-msgid "Keep lower part"
-msgstr "Залишити нижню ча�тину"
-
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
-msgstr "Зауваженн�"
-
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
-msgstr ""
-
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
-msgid "Warning"
-msgstr "За�тереженн�"
-
-#: src/slic3r/GUI/GUI_App.cpp:377
-msgid "Choose one file (3MF):"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:389
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Виберіть один чи кілька файлів (STL/OBJ/AMF/PRUSA):"
-
-#: src/slic3r/GUI/GUI_App.cpp:451
-msgid "Array of language names and identifiers should have the same size."
-msgstr "Ма�ив імен мов та їх ідентифікаторів має бути однакового розміру."
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Select the language"
-msgstr "Оберіть мову"
-
-#: src/slic3r/GUI/GUI_App.cpp:461
-msgid "Language"
-msgstr "Мова"
-
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
-msgid "Default"
-msgstr "За замовчуванн�м"
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "&Configuration Snapshots"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:609
-msgid "Inspect / activate configuration snapshots"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Take Configuration &Snapshot"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:610
-msgid "Capture a configuration snapshot"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "&Preferences"
-msgstr "&Преференції"
-
-#: src/slic3r/GUI/GUI_App.cpp:613
-msgid "Application preferences"
-msgstr "Преференції за�то�уванн�"
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple"
-msgstr "Про�тий"
-
-#: src/slic3r/GUI/GUI_App.cpp:616
-msgid "Simple View Mode"
-msgstr "Про�тий режим перегл�ду"
-
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
-msgid "Advanced"
-msgstr "Розширений"
-
-#: src/slic3r/GUI/GUI_App.cpp:617
-msgid "Advanced View Mode"
-msgstr "Розширений режим перегл�ду"
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert"
-msgstr "Ек�перт"
-
-#: src/slic3r/GUI/GUI_App.cpp:618
-msgid "Expert View Mode"
-msgstr "Режим перегл�ду Ек�перт"
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Mode"
-msgstr "Режим"
-
-#: src/slic3r/GUI/GUI_App.cpp:620
-msgid "Slic3r View Mode"
-msgstr "Режим перегл�ду Slic3r'у"
-
-#: src/slic3r/GUI/GUI_App.cpp:622
-msgid "Change Application &Language"
-msgstr "Змінити &мову за�то�уванн�"
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Flash printer &firmware"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:624
-msgid "Upload a firmware image into an Arduino based printer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Taking configuration snapshot"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:636
-msgid "Snapshot name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
-msgstr "За�то�уванн� буде перезапущене"
-
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
-msgstr "Увага!"
-
-#: src/slic3r/GUI/GUI_App.cpp:691
-msgid "&Configuration"
-msgstr "&Конфігураці�"
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid "You have unsaved changes "
-msgstr "У ва� є незбережені зміни "
-
-#: src/slic3r/GUI/GUI_App.cpp:711
-msgid ". Discard changes and continue anyway?"
-msgstr ". Відхилити зміни і продовжити в будь-�кому випадку?"
-
-#: src/slic3r/GUI/GUI_App.cpp:712
-msgid "Unsaved Presets"
-msgstr "�езбереженні налаштуванн�"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
-msgid "Layers and Perimeters"
-msgstr "Шари та периметри"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
-msgid "Infill"
-msgstr "Заповненн�"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
-msgid "Support material"
-msgstr "Підтримка"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "Швидкі�ть"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
-msgid "Extruders"
-msgstr "Ек�трудери"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
-msgid "Extrusion Width"
-msgstr "Ширина ек�трузії"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
-msgid "Supports"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
-msgid "Pad"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
-msgid "Name"
-msgstr "Ім'�"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
-msgid "Right button click the icon to change the object settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
-#, c-format
-msgid "Auto-repaired (%d errors):\n"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
-msgid "degenerate facets"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
-msgid "edges fixed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
-msgid "facets removed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
-msgid "facets added"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
-msgid "facets reversed"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
-msgid "backwards edges"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
-msgid "Right button click the icon to fix STL through Netfabb"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
-msgid "Extruder"
-msgstr "Ек�трудер"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
-msgid "Select showing settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
-msgid "Load"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
-msgid "Box"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Cylinder"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Sphere"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
-msgid "Slab"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
-msgid "Add part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
-msgid "Add modifier"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
-msgid "Add support enforcer"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
-msgid "Add support blocker"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
-msgid "Split to parts"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
-msgid "Add settings"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
-msgid "Change type"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
-msgid "You can't delete the last solid part from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
-msgid "You can't delete the last intance from object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
-msgid "The selected object couldn't be split because it contains only one part."
-msgstr "Вибраний об'єкт не можна розділити, о�кільки він мі�тить лише одну ча�тину."
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
-msgid "Group manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
-msgid "Object manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
-msgid "Object Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
-msgid "Part Settings to modify"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
-msgid "Part manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
-msgid "Instance manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
-msgid "You can't change a type of the last solid part of the object."
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
-msgid "Select type of part"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
-msgid "The supplied name is not valid;"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
-msgid "the following characters are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
-msgid "Object Manipulation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
-msgid "Object name"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
-msgid "Position"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
-msgid "Rotation"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
-msgid "Scale factors"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
-msgid "Translate"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:235
-msgid "View"
-msgstr "Вид"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:394
-msgid "Feature type"
-msgstr "Тип ознаки"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
-msgid "Height"
-msgstr "Ви�ота"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
-msgid "Width"
-msgstr "Ширина"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:242
-msgid "Volumetric flow rate"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
-msgid "Tool"
-msgstr "Ін�трумент"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
-#: src/libslic3r/GCode/PreviewData.cpp:406
-msgid "Color Print"
-msgstr ""
-
-#: src/slic3r/GUI/GUI_Preview.cpp:247
-msgid "Show"
-msgstr "Показати"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
-msgid "Feature types"
-msgstr "Типи ознак"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
-msgid "Perimeter"
-msgstr "Периметр"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
-msgid "External perimeter"
-msgstr "Зовнішній периметр"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
-msgid "Overhang perimeter"
-msgstr "�ави�аючий периметр"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
-msgid "Internal infill"
-msgstr "Внутрішнє наповненн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
-msgid "Solid infill"
-msgstr "Суцільне наповненн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
-msgid "Top solid infill"
-msgstr "Верхнє �уцільне наповненн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
-msgid "Bridge infill"
-msgstr "Мо�тове наповненн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
-#: src/libslic3r/GCode/PreviewData.cpp:170
-msgid "Gap fill"
-msgstr "Заповненн� розриву"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
-#: src/libslic3r/GCode/PreviewData.cpp:171
-msgid "Skirt"
-msgstr "Плінту�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
-#: src/libslic3r/GCode/PreviewData.cpp:173
-msgid "Support material interface"
-msgstr "Інтерфей� підтримуючого матеріалу"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
-#: src/libslic3r/GCode/PreviewData.cpp:174
-msgid "Wipe tower"
-msgstr "Вежа вичищуванн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
-msgid "Travel"
-msgstr "Пере�уванн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:270
-msgid "Retractions"
-msgstr "Перериванн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:271
-msgid "Unretractions"
-msgstr "�еперериванн�"
-
-#: src/slic3r/GUI/GUI_Preview.cpp:272
-msgid "Shells"
-msgstr "Оболонки"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
-msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
-msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
-msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
-msgid "Load Config from .ini/amf/3mf/gcode"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
-msgid "Export G-code"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
-msgid "Save project (3MF)"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
-msgid "Load Config from .ini/amf/3mf/gcode and merge"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
-msgid "(Re)slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
-msgid "Quick slice"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat last quick slice"
-msgstr "Повторити о�таннє швидке нарізанн�"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
-msgid "Select Plater Tab"
-msgstr "Вибрати вкладку Plater"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
-msgid "Quick slice and Save as"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
-msgid "Select Print Settings Tab"
-msgstr "Вибрати вкладку параметрів друку"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
-msgid "Select Filament Settings Tab"
-msgstr "Вибрати вкладку параметрів філаменту"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
-msgid "Select Printer Settings Tab"
-msgstr "Вибрати вкладку параметрів принтеру"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
-msgid "Switch to 3D"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
-msgid "Switch to Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
-msgid "Preferences"
-msgstr "Преференції"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
-msgid "Print host upload queue"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
-msgid "Camera view "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
-msgid "Add Instance to selected object "
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
-msgid "Remove Instance from selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
-msgid "Show keyboard shortcuts list"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
-msgid "Select multiple object/Move multiple object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
-msgid "Arrange"
-msgstr "Організувати"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
-msgid "Select All objects"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
-msgid "Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
-msgid "Delete All"
-msgstr "Видалити в�е"
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
-msgid "Gizmo move"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
-msgid "Gizmo scale"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
-msgid "Gizmo rotate"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
-msgid "Gizmo cut"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
-msgid "Gizmo Place face on bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
-msgid "Gizmo SLA support points"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:142
-msgid "Zoom to Bed"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:143
-msgid "Zoom to all objects in scene, if none selected"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:144
-msgid "Zoom to selected object"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:145
-msgid "Zoom in"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:146
-msgid "Zoom out"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:147
-msgid "Unselect gizmo, keep object selection"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:149
-msgid "Plater Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Arrow Up"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
-msgid "Upper Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Arrow Down"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
-msgid "Lower Layer"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
-msgid "Preview Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:53
-msgid " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
-msgstr " - Пам'�тайте оновлювати з http://github.com/prusa3d/slic3r/releases"
-
-#: src/slic3r/GUI/MainFrame.cpp:130
-msgid "Plater"
-msgstr "Платер"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
-msgstr "&Відкрити"
-
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "Open a project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "Save current project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save current project file as"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Import STL/OBJ/AM&F/3MF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:246
-msgid "Load a model"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Import &Config"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:249
-msgid "Load exported configuration file"
-msgstr "Завантажити ек�портований файл конфігурації"
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Import Config from &project"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:251
-msgid "Load configuration from project file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Import Config &Bundle"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:254
-msgid "Load presets from a bundle"
-msgstr "Завантажити налаштуванн� з пакету"
-
-#: src/slic3r/GUI/MainFrame.cpp:256
-msgid "&Import"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export &G-code"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:259
-msgid "Export current plate as G-code"
-msgstr "Ек�порт поточної пла�тини �к G-код"
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export plate as &STL"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:262
-msgid "Export current plate as STL"
-msgstr "Ек�порт поточної пла�тини �к STL"
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export plate as &AMF"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:264
-msgid "Export current plate as AMF"
-msgstr "Ек�порт поточної пла�тини �к AMF"
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export &Config"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:267
-msgid "Export current configuration to file"
-msgstr "Ек�портувати поточну конфігурацію в файл"
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export Config &Bundle"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:269
-msgid "Export all presets to file"
-msgstr "Ек�портувати в�і налаштуванн� у файл"
-
-#: src/slic3r/GUI/MainFrame.cpp:271
-msgid "&Export"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:277
-msgid "Slice a file into a G-code"
-msgstr "�арізати файл у G-код"
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Quick Slice and Save As"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:283
-msgid "Slice a file into a G-code, save as"
-msgstr "�арізати файл у G-код, зберегти �к"
-
-#: src/slic3r/GUI/MainFrame.cpp:289
-msgid "Repeat Last Quick Slice"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "(Re)Slice &Now"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:297
-msgid "Start new slicing process"
-msgstr "Почати новий проце� нарізанн�"
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "&Repair STL file"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:300
-msgid "Automatically repair an STL file"
-msgstr "�втоматично відновити �к STL-файл"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "&Quit"
-msgstr "Вихід"
-
-#: src/slic3r/GUI/MainFrame.cpp:303
-msgid "Quit Slic3r"
-msgstr "Вийти зі Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "&Select all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:321
-msgid "Selects all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "&Delete selected"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:324
-msgid "Deletes the current selection"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Delete &all"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:326
-msgid "Deletes all objects"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "&Plater Tab"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:339
-msgid "Show the plater"
-msgstr "Показати plater"
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "P&rint Settings Tab"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:346
-msgid "Show the print settings"
-msgstr "Показати параметри друку"
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "&Filament Settings Tab"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:348
-msgid "Show the filament settings"
-msgstr "Показати параметри філаменту"
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Print&er Settings Tab"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:350
-msgid "Show the printer settings"
-msgstr "Показати параметри принтеру"
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "3&D"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:354
-msgid "Show the 3D editing view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Pre&view"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:356
-msgid "Show the 3D slices preview"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Print &Host Upload Queue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:377
-msgid "Display the Print Host Upload Queue window"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr "&Iso"
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "Iso View"
-msgstr "Вид Iso"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr "З&верху"
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "Top View"
-msgstr "Вид зверху"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr "З&низу"
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "Bottom View"
-msgstr "Вид знизу"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr "С&переду"
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "Front View"
-msgstr "Вид �переду"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr "З&заду"
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "Rear View"
-msgstr "Вид ззаду"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr "З &лівого боку"
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "Left View"
-msgstr "Вид з лівого боку"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr "З &правого боку"
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "Right View"
-msgstr "Вид з правого боку"
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Prusa 3D &Drivers"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr "Відкрити �торінку завантаженн� драйверів Prusa3D у �воєму браузері"
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
-msgstr "Відкрити �торінку релізів Prusa Edition у �воєму браузері"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
-msgstr "Веб-�айт Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
-msgstr "Відкрити �торінку Slic3r у �воєму браузері"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr "По�ібник до Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr "Відкрити �торінку по�ібнику до Slic3r у �воєму браузері"
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "System &Info"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "Show system information"
-msgstr "Показати інформацію про �и�тему"
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show &Configuration Folder"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show user configuration folder (datadir)"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an I&ssue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
-msgstr "Повідомити про проблему на Slic3r Prusa Edition"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
-msgstr "&Про Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "Show about dialog"
-msgstr "Показати діалог Про Slic3r"
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "Show the list of the keyboard shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:439
-msgid "&File"
-msgstr "Файл"
-
-#: src/slic3r/GUI/MainFrame.cpp:440
-msgid "&Edit"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:441
-msgid "&Window"
-msgstr "Вікно"
-
-#: src/slic3r/GUI/MainFrame.cpp:442
-msgid "&View"
-msgstr "Вид"
-
-#: src/slic3r/GUI/MainFrame.cpp:445
-msgid "&Help"
-msgstr "Допомога"
-
-#: src/slic3r/GUI/MainFrame.cpp:472
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr "Вибрати файл дл� нарізанн� (STL/OBJ/AMF/3MF/PRUSA):"
-
-#: src/slic3r/GUI/MainFrame.cpp:486
-msgid "No previously sliced file."
-msgstr "�емає попередньо нарізаного файлу."
-
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
-msgid "Error"
-msgstr "Помилка"
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid "Previously sliced file ("
-msgstr "Попередньо нарізаний файл ("
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid ") not found."
-msgstr ") не знайдено."
-
-#: src/slic3r/GUI/MainFrame.cpp:493
-msgid "File Not Found"
-msgstr "Файл не знайдено"
-
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
-msgid "Save "
-msgstr "Зберегти "
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "SVG"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid "G-code"
-msgstr "G-код"
-
-#: src/slic3r/GUI/MainFrame.cpp:531
-msgid " file as:"
-msgstr " файл �к:"
-
-#: src/slic3r/GUI/MainFrame.cpp:548
-msgid "Save zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Slicing"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:560
-msgid "Processing "
-msgstr "Обробка "
-
-#: src/slic3r/GUI/MainFrame.cpp:583
-msgid " was successfully sliced."
-msgstr " був у�пішно нарізаний."
-
-#: src/slic3r/GUI/MainFrame.cpp:585
-msgid "Slicing Done!"
-msgstr "�арізанн� завершено!"
-
-#: src/slic3r/GUI/MainFrame.cpp:600
-msgid "Select the STL file to repair:"
-msgstr "Вибрати STL-файл дл� відновленн�:"
-
-#: src/slic3r/GUI/MainFrame.cpp:614
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr "Зберегти OBJ-файл (менш �хильний координувати помилки, ніж STL) �к:"
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Your file was repaired."
-msgstr "Ваш файл було відновлено."
-
-#: src/slic3r/GUI/MainFrame.cpp:629
-msgid "Repair"
-msgstr "Відновити"
-
-#: src/slic3r/GUI/MainFrame.cpp:643
-msgid "Save configuration as:"
-msgstr "Зберегти конфігурацію �к:"
-
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
-msgid "Select configuration to load:"
-msgstr "Вибрати конфігурацію дл� завантаженн�:"
-
-#: src/slic3r/GUI/MainFrame.cpp:700
-msgid "Save presets bundle as:"
-msgstr "Зберегти набір налаштувань �к:"
-
-#: src/slic3r/GUI/MainFrame.cpp:751
-#, c-format
-msgid "%d presets successfully imported."
-msgstr "%d налаштувань у�пішно імпортовано."
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r error"
-msgstr ""
-
-#: src/slic3r/GUI/MsgDialog.cpp:66
-msgid "Slic3r has encountered an error"
-msgstr ""
-
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr "Інфо"
-
-#: src/slic3r/GUI/Plater.cpp:126
-msgid "Volume"
-msgstr "Об��г"
-
-#: src/slic3r/GUI/Plater.cpp:127
-msgid "Facets"
-msgstr "Грані"
-
-#: src/slic3r/GUI/Plater.cpp:128
-msgid "Materials"
-msgstr "Матеріали"
-
-#: src/slic3r/GUI/Plater.cpp:131
-msgid "Manifold"
-msgstr "Різноманітт�"
-
-#: src/slic3r/GUI/Plater.cpp:174
-msgid "Sliced Info"
-msgstr "Інформаці� з нарізанн�"
-
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
-msgid "Used Filament (m)"
-msgstr "Викори�тано філаметну (м)"
-
-#: src/slic3r/GUI/Plater.cpp:194
-msgid "Used Filament (mm³)"
-msgstr "Викори�тано філаметну (мм³)"
-
-#: src/slic3r/GUI/Plater.cpp:195
-msgid "Used Filament (g)"
-msgstr "Викори�тано філаметну (г)"
-
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
-msgid "Cost"
-msgstr "Варті�ть"
-
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
-msgid "Estimated printing time"
-msgstr "Приблизний ча� друку"
-
-#: src/slic3r/GUI/Plater.cpp:198
-msgid "Number of tool changes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:364
-msgid "Select what kind of support do you need"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr "Жодне"
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
-msgid "Support on build plate only"
-msgstr "Підтримка тільки на збірній пла�тині"
-
-#: src/slic3r/GUI/Plater.cpp:367
-msgid "Everywhere"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
-msgid "Brim"
-msgstr "Край"
-
-#: src/slic3r/GUI/Plater.cpp:381
-msgid "This flag enables the brim that will be printed around each object on the first layer."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:390
-msgid "Purging volumes"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:556
-msgid "Print settings"
-msgstr "Параметри друку"
-
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
-msgid "Filament"
-msgstr "Філамент"
-
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
-msgid "SLA print"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
-msgid "SLA material"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:560
-msgid "Printer"
-msgstr "Принтер"
-
-#: src/slic3r/GUI/Plater.cpp:588
-msgid "Send to printer"
-msgstr "�аді�лати на принтер"
-
-#: src/slic3r/GUI/Plater.cpp:607
-msgid "Slice now"
-msgstr "�арізати зараз"
-
-#: src/slic3r/GUI/Plater.cpp:787
-#, c-format
-msgid "%d (%d shells)"
-msgstr "%d (%d оболонок)"
-
-#: src/slic3r/GUI/Plater.cpp:792
-#, c-format
-msgid "Auto-repaired (%d errors)"
-msgstr "�втоматичне відновленн� (%d помилок)"
-
-#: src/slic3r/GUI/Plater.cpp:795
-#, 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:805
-msgid "Yes"
-msgstr "Так"
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
-msgid "wipe tower"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:855
-msgid "normal mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:859
-msgid "silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1304
-msgid "Loading"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1314
-#, c-format
-msgid "Processing input file %s\n"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1366
-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"
-
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
-msgid "Multi-part object detected"
-msgstr "Ви�влено об'єкт, що �кладаєть�� з кількох ча�тин"
-
-#: src/slic3r/GUI/Plater.cpp:1388
-#, 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 ""
-
-#: src/slic3r/GUI/Plater.cpp:1408
-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"
-
-#: src/slic3r/GUI/Plater.cpp:1424
-msgid "Loaded"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1492
-msgid "Your object appears to be too large, so it was automatically scaled down to fit your print bed."
-msgstr "Ваш об'єкт видав�� занадто великим, тому він автоматично зменшив�� відповідно до вашої полотна друку."
-
-#: src/slic3r/GUI/Plater.cpp:1493
-msgid "Object too large?"
-msgstr "Об'єкт занадто великий?"
-
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1538
-msgid "Save file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1702
-msgid "Arranging canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1705
-msgid "Arranging"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1736
-msgid "Could not arrange model objects! Some geometries may be invalid."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1740
-msgid "Arranging done."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1782
-msgid "Orientation search canceled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1787
-msgid "Searching for optimal orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1797
-msgid "Orientation found."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1818
-msgid "The selected object can't be split because it contains more than one volume/material."
-msgstr "Вибраний об'єкт не можна розділити, о�кільки мі�тить більше одного об'єму/матеріалу."
-
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
-msgid "Cancelling"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1962
-msgid "Another export job is currently running."
-msgstr "�а даний ча� виконуєть�� інший ек�порт."
-
-#: src/slic3r/GUI/Plater.cpp:2215
-msgid "Export failed"
-msgstr "Ек�портувати не вдало��"
-
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
-msgstr "Видалити"
-
-#: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
-msgstr "Видалити вибраний об'єкт"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Increase copies"
-msgstr "Збільшити копії"
-
-#: src/slic3r/GUI/Plater.cpp:2349
-msgid "Place one more copy of the selected object"
-msgstr "Розташувати ще одну копію обраного об'єкта"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Decrease copies"
-msgstr "Зменшити копії"
-
-#: src/slic3r/GUI/Plater.cpp:2351
-msgid "Remove one copy of the selected object"
-msgstr "Вилучіть одну копію обраного об'єкта"
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Set number of copies"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2353
-msgid "Change the number of copies of the selected object"
-msgstr "Змінити кількі�ть копій обраного об'єкта"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload from Disk"
-msgstr "Перезавантажити з ди�ка"
-
-#: src/slic3r/GUI/Plater.cpp:2363
-msgid "Reload the selected file from Disk"
-msgstr "Перезавантажити вибраний файл із ди�ка"
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr "Ек�портувати цей окремий об'єкт �к STL-файл"
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Along X axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2375
-msgid "Mirror the selected object along the X axis"
-msgstr "Віддзеркалити виділений об'єкт уздовж о�і Х"
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Along Y axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2377
-msgid "Mirror the selected object along the Y axis"
-msgstr "Віддзеркалити виділений об'єкт уздовж о�і Y"
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Along Z axis"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2379
-msgid "Mirror the selected object along the Z axis"
-msgstr "Віддзеркалити виділений об'єкт уздовж о�і Z"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror"
-msgstr "Віддзеркалити"
-
-#: src/slic3r/GUI/Plater.cpp:2382
-msgid "Mirror the selected object"
-msgstr "Віддзеркалити виділений об'єкт"
-
-#: src/slic3r/GUI/Plater.cpp:2400
-msgid "To objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
-msgid "Split the selected object into individual objects"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402
-msgid "To parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
-msgid "Split the selected object into individual sub-parts"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
-msgid "Split"
-msgstr "Розділити"
-
-#: src/slic3r/GUI/Plater.cpp:2405
-msgid "Split the selected object"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize orientation"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2435
-msgid "Optimize the rotation of the object for better print results."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save G-code file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2845
-#, c-format
-msgid "STL file exported to %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2861
-#, c-format
-msgid "AMF file exported to %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2864
-#, c-format
-msgid "Error exporting AMF file %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2891
-#, c-format
-msgid "3MF file exported to %s"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2894
-#, c-format
-msgid "Error exporting 3MF file %s"
-msgstr ""
-
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
-msgid "General"
-msgstr "Загальне"
-
-#: src/slic3r/GUI/Preferences.cpp:34
-msgid "Remember output directory"
-msgstr "Пам'�тати вихідний каталог"
-
-#: src/slic3r/GUI/Preferences.cpp:36
-msgid "If this is enabled, Slic3r will prompt the last output directory instead of the one containing the input files."
-msgstr "Якщо вибрано, Slic3r запропонує о�танню вихідну директорію замі�ть тої, що вказана у вхідному файлі."
-
-#: src/slic3r/GUI/Preferences.cpp:42
-msgid "Auto-center parts"
-msgstr "�втоцентрувати ча�тини"
-
-#: src/slic3r/GUI/Preferences.cpp:44
-msgid "If this is enabled, Slic3r will auto-center objects around the print bed center."
-msgstr "Якщо вибрано, Slic3r автоматично орієнтує об'єкти навколо центру друку."
-
-#: src/slic3r/GUI/Preferences.cpp:50
-msgid "Background processing"
-msgstr "Фонова обробка"
-
-#: src/slic3r/GUI/Preferences.cpp:52
-msgid "If this is enabled, Slic3r will pre-process objects as soon as they're loaded in order to save time when exporting G-code."
-msgstr "Якщо вибрано, Slic3r буде попередньо обробл�ти об'єкти, �к тільки вони будуть завантажені, щоб заощадити ча� при ек�порті G-коду."
-
-#: src/slic3r/GUI/Preferences.cpp:74
-msgid "Suppress \" - default - \" presets"
-msgstr "Заборонити налаштуванн� \"- за замовчуванн�м -\""
-
-#: src/slic3r/GUI/Preferences.cpp:76
-msgid "Suppress \" - default - \" presets in the Print / Filament / Printer selections once there are any other valid presets available."
-msgstr "Заборонити налаштуванн� \"- за замовчуванн�м -\" у параметрах Друк / Філамент / Принтер, �кщо до�тупні інші діючі налаштуванн�."
-
-#: src/slic3r/GUI/Preferences.cpp:82
-msgid "Show incompatible print and filament presets"
-msgstr "Показувати не�умі�ні налаштуванн� друку та філаменту"
-
-#: src/slic3r/GUI/Preferences.cpp:84
-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:90
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr "Викори�товувати за�тарілий OpenGL 1.1 рендеринг"
-
-#: src/slic3r/GUI/Preferences.cpp:92
-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, �пробуйте вибрати цю опцію. Це призведе до вимкненн� редагуванн� ви�оти шару та згладжуванн�, тому краще оновити графічний драйвер."
-
-#: src/slic3r/GUI/Preferences.cpp:115
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr "З метою ефективно�ті зміни, Вам потрібно буде перезапу�тити Slic3r."
-
-#: src/slic3r/GUI/Preset.cpp:170
-msgid "modified"
-msgstr "модифікований"
-
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
-msgid "System presets"
-msgstr "Си�темні налаштуванн�"
-
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
-msgid "User presets"
-msgstr "�алаштуванн� кори�тувача"
-
-#: src/slic3r/GUI/Preset.cpp:1157
-msgid "filament"
-msgstr ""
-
-#: src/slic3r/GUI/PresetHints.cpp:28
-#, c-format
-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) ."
-
-#: src/slic3r/GUI/PresetHints.cpp:32
-#, c-format
-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%%."
-
-#: src/slic3r/GUI/PresetHints.cpp:36
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-"\n"
-"Під ча� друку інших шарів вентил�тор "
-
-#: src/slic3r/GUI/PresetHints.cpp:38
-msgid "Fan "
-msgstr "Вентил�тор "
-
-#: src/slic3r/GUI/PresetHints.cpp:43
-#, c-format
-msgid "will always run at %d%% "
-msgstr "буде завжди працювати на %d%% "
-
-#: src/slic3r/GUI/PresetHints.cpp:46
-#, c-format
-msgid "except for the first %d layers"
-msgstr "за вин�тком перших %d шарів"
-
-#: src/slic3r/GUI/PresetHints.cpp:50
-msgid "except for the first layer"
-msgstr "за вин�тком першого шару"
-
-#: src/slic3r/GUI/PresetHints.cpp:52
-msgid "will be turned off."
-msgstr "буде вимкнено."
-
-#: src/slic3r/GUI/PresetHints.cpp:153
-msgid "external perimeters"
-msgstr "зовнішні периметри"
-
-#: src/slic3r/GUI/PresetHints.cpp:162
-msgid "perimeters"
-msgstr "периметри"
-
-#: src/slic3r/GUI/PresetHints.cpp:171
-msgid "infill"
-msgstr "наповненн�"
-
-#: src/slic3r/GUI/PresetHints.cpp:181
-msgid "solid infill"
-msgstr "�уцільне наповненн�"
-
-#: src/slic3r/GUI/PresetHints.cpp:189
-msgid "top solid infill"
-msgstr "верхній �уцільне наповненн�"
-
-#: src/slic3r/GUI/PresetHints.cpp:200
-msgid "support"
-msgstr "підтримка"
-
-#: src/slic3r/GUI/PresetHints.cpp:210
-msgid "support interface"
-msgstr "інтерфей� підтримки"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "First layer volumetric"
-msgstr "Об'єм першого шару"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Bridging volumetric"
-msgstr "Об'єм мо�тів"
-
-#: src/slic3r/GUI/PresetHints.cpp:216
-msgid "Volumetric"
-msgstr "Об'ємний"
-
-#: src/slic3r/GUI/PresetHints.cpp:217
-msgid " flow rate is maximized "
-msgstr " швидкі�ть потоку мак�имізуєть�� "
-
-#: src/slic3r/GUI/PresetHints.cpp:220
-msgid "by the print profile maximum"
-msgstr "за профілем друку мак�имум"
-
-#: src/slic3r/GUI/PresetHints.cpp:221
-msgid "when printing "
-msgstr "коли друкуємо "
-
-#: src/slic3r/GUI/PresetHints.cpp:222
-msgid " with a volumetric rate "
-msgstr " з об'ємною швидкі�тю "
-
-#: src/slic3r/GUI/PresetHints.cpp:226
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr "%3.2f мм³/�"
-
-#: src/slic3r/GUI/PresetHints.cpp:228
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr " при швидко�ті філаменту %3.2f мм/�."
-
-#: src/slic3r/GUI/PresetHints.cpp:247
-msgid "Recommended object thin wall thickness: Not available due to invalid layer height."
-msgstr "Рекомендований об'єкт товщиною тонкої �тінки: �едо�тупний через невірне значенн� ви�оти шару."
-
-#: src/slic3r/GUI/PresetHints.cpp:264
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr "Рекомендована товщина �тінки дл� ви�оти шару %.2f та "
-
-#: src/slic3r/GUI/PresetHints.cpp:271
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr "%d р�дків: %.2lf мм"
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Send G-Code to printer host"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
-msgid "Upload to Printer Host with the following filename:"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
-msgid "Start printing after upload"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
-msgid "Use forward slashes ( / ) as a directory separator if needed."
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
-msgid "Cancel selected"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
-msgid "Show error message"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
-msgid "Enqueued"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
-msgid "Uploading"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
-msgid "Completed"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
-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
-msgid "Time"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
-msgid "s"
-msgstr ""
-
-#: src/slic3r/GUI/RammingChart.cpp:81
-msgid "Volumetric speed"
-msgstr ""
-
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
-msgid "Slic3r Prusa Edition - System Information"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
-msgid "Compatible printers"
-msgstr "Сумі�ні принтери"
-
-#: src/slic3r/GUI/Tab.cpp:50
-msgid "Select the printers this profile is compatible with."
-msgstr "Оберіть принтери, �умі�ні з цим профілем."
-
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
-msgid "Compatible print profiles"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:56
-msgid "Select the print profiles this profile is compatible with."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:118
-msgid "Save current "
-msgstr "Зберегти поточний "
-
-#: src/slic3r/GUI/Tab.cpp:119
-msgid "Delete this preset"
-msgstr "Видалити це налаштуванн�"
-
-#: src/slic3r/GUI/Tab.cpp:131
-msgid ""
-"Hover the cursor over buttons to find more information \n"
-"or click this button."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:824
-msgid "It's a default preset."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:825
-msgid "It's a system preset."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:826
-msgid "Current preset is inherited from "
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:831
-msgid "It can't be deleted or modified. "
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:832
-msgid "Any modifications should be saved as a new preset inherited from this one. "
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:833
-msgid "To do that please specify a new name for the preset."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:837
-msgid "Additional information:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:843
-msgid "printer model"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:851
-msgid "default print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:854
-msgid "default filament profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:868
-msgid "default SLA material profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:872
-msgid "default SLA print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
-msgid "Layers and perimeters"
-msgstr "Шари та периметри"
-
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
-msgid "Layer height"
-msgstr "Ви�ота шару"
-
-#: src/slic3r/GUI/Tab.cpp:924
-msgid "Vertical shells"
-msgstr "Вертикальні оболонки"
-
-#: src/slic3r/GUI/Tab.cpp:935
-msgid "Horizontal shells"
-msgstr "Горизонтальні оболонки"
-
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
-msgid "Solid layers"
-msgstr "Суцільні шари"
-
-#: src/slic3r/GUI/Tab.cpp:941
-msgid "Quality (slower slicing)"
-msgstr "Які�ть (повільне нарізанн�)"
-
-#: src/slic3r/GUI/Tab.cpp:958
-msgid "Reducing printing time"
-msgstr "Зниженн� ча�у друку"
-
-#: src/slic3r/GUI/Tab.cpp:970
-msgid "Skirt and brim"
-msgstr "Плінту� та край"
-
-#: src/slic3r/GUI/Tab.cpp:987
-msgid "Raft"
-msgstr "Пліт"
-
-#: src/slic3r/GUI/Tab.cpp:991
-msgid "Options for support material and raft"
-msgstr "Варіанти дл� опорного матеріалу та плоту"
-
-#: src/slic3r/GUI/Tab.cpp:1006
-msgid "Speed for print moves"
-msgstr "Швидкі�ть друкар�ьких рухів"
-
-#: src/slic3r/GUI/Tab.cpp:1018
-msgid "Speed for non-print moves"
-msgstr "Швидкі�ть недрукар�ьких рухів"
-
-#: src/slic3r/GUI/Tab.cpp:1021
-msgid "Modifiers"
-msgstr "Модифікатори"
-
-#: src/slic3r/GUI/Tab.cpp:1024
-msgid "Acceleration control (advanced)"
-msgstr "Контроль при�коренн� (розширений)"
-
-#: src/slic3r/GUI/Tab.cpp:1031
-msgid "Autospeed (advanced)"
-msgstr "�втоматична швидкі�ть (розширена)"
-
-#: src/slic3r/GUI/Tab.cpp:1037
-msgid "Multiple Extruders"
-msgstr "Кілька ек�трудерів"
-
-#: src/slic3r/GUI/Tab.cpp:1045
-msgid "Ooze prevention"
-msgstr "Профілактика про�очуванн�"
-
-#: src/slic3r/GUI/Tab.cpp:1062
-msgid "Extrusion width"
-msgstr "Ширина ек�трузії"
-
-#: src/slic3r/GUI/Tab.cpp:1072
-msgid "Overlap"
-msgstr "Перекритт�"
-
-#: src/slic3r/GUI/Tab.cpp:1075
-msgid "Flow"
-msgstr "Потік"
-
-#: src/slic3r/GUI/Tab.cpp:1078
-msgid "Other"
-msgstr "Інше"
-
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
-msgid "Output options"
-msgstr "Параметри виводу"
-
-#: src/slic3r/GUI/Tab.cpp:1086
-msgid "Sequential printing"
-msgstr "По�лідовне друкуванн�"
-
-#: src/slic3r/GUI/Tab.cpp:1088
-msgid "Extruder clearance (mm)"
-msgstr "Розмір ек�трудера (мм)"
-
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
-msgid "Output file"
-msgstr "Вихідний файл"
-
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
-msgid "Post-processing scripts"
-msgstr "Скрипти по�т-обробки"
-
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
-msgid "Notes"
-msgstr "Примітки"
-
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
-msgid "Dependencies"
-msgstr "Залежно�ті"
-
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
-msgid "Profile dependencies"
-msgstr "Залежно�ті профілю"
-
-#: src/slic3r/GUI/Tab.cpp:1161
-#, no-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"
-"- 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"
-"Чи потрібно змінити ці налаштуванн�, щоб увімкнути режим Спіральної вази?"
-
-#: src/slic3r/GUI/Tab.cpp:1168
-msgid "Spiral Vase"
-msgstr "Спіральна ваза"
-
-#: src/slic3r/GUI/Tab.cpp:1191
-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"
-"Чи потрібно коригувати ці налаштуванн�, щоб увімкнути вичіщуючу веж?"
-
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
-msgid "Wipe Tower"
-msgstr "Вичіщуюча веж"
-
-#: src/slic3r/GUI/Tab.cpp:1209
-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"
-"Чи потрібно �инхронізувати шари підтримки, щоб увімкнути вичіщуючу веж?"
-
-#: src/slic3r/GUI/Tab.cpp:1227
-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"
-"Чи потрібно змінити ці налаштуванн� дл� підтримки?"
-
-#: src/slic3r/GUI/Tab.cpp:1230
-msgid "Support Generator"
-msgstr "Створенн� підтримки"
-
-#: src/slic3r/GUI/Tab.cpp:1272
-msgid "The "
-msgstr "Шаблон наповненн� "
-
-#: src/slic3r/GUI/Tab.cpp:1272
-#, no-c-format
-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 шаблон заповненн�?"
-
-#: src/slic3r/GUI/Tab.cpp:1388
-msgid "Temperature "
-msgstr "Температура "
-
-#: src/slic3r/GUI/Tab.cpp:1394
-msgid "Bed"
-msgstr "Полотно"
-
-#: src/slic3r/GUI/Tab.cpp:1399
-msgid "Cooling"
-msgstr "Охолодженн�"
-
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
-msgid "Enable"
-msgstr "Увімкнути"
-
-#: src/slic3r/GUI/Tab.cpp:1411
-msgid "Fan settings"
-msgstr "�алаштуванн� вентил�тора"
-
-#: src/slic3r/GUI/Tab.cpp:1412
-msgid "Fan speed"
-msgstr "Швидкі�ть вентил�тора"
-
-#: src/slic3r/GUI/Tab.cpp:1420
-msgid "Cooling thresholds"
-msgstr "Пороги охолодженн�"
-
-#: src/slic3r/GUI/Tab.cpp:1426
-msgid "Filament properties"
-msgstr "Вла�тиво�ті філаменту"
-
-#: src/slic3r/GUI/Tab.cpp:1430
-msgid "Print speed override"
-msgstr "Перевизначенн� швидко�ті друку"
-
-#: src/slic3r/GUI/Tab.cpp:1440
-msgid "Toolchange parameters with single extruder MM printers"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1455
-msgid "Ramming settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
-msgid "Custom G-code"
-msgstr "Кори�тувацький G-код"
-
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
-msgid "Start G-code"
-msgstr "Початок G-коду"
-
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
-msgid "End G-code"
-msgstr "Закінченн� G-коду"
-
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
-msgid " Browse "
-msgstr " Перегл�нути "
-
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
-msgid "Test"
-msgstr "Перевірити"
-
-#: src/slic3r/GUI/Tab.cpp:1615
-msgid "Could not get a valid Printer Host reference"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
-msgid "Success!"
-msgstr "У�піх!"
-
-#: src/slic3r/GUI/Tab.cpp:1636
-msgid "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-signed certificate."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1648
-msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1649
-msgid "Open CA certificate file"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1676
-msgid ""
-"HTTPS CA File:\n"
-"\tOn this system, Slic3r uses HTTPS certificates from the system Certificate Store or Keychain.\n"
-"\tTo use a custom CA file, please import your CA file into Certificate Store / Keychain."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
-msgid "Size and coordinates"
-msgstr "Розмір і координати"
-
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
-msgid " Set "
-msgstr " В�тановити "
-
-#: src/slic3r/GUI/Tab.cpp:1740
-msgid "Capabilities"
-msgstr "Можливо�ті"
-
-#: src/slic3r/GUI/Tab.cpp:1745
-msgid "Number of extruders of the printer."
-msgstr "Кількі�ть ек�трудерів у принтері."
-
-#: src/slic3r/GUI/Tab.cpp:1773
-msgid "USB/Serial connection"
-msgstr "USB/по�лідовне з'єднанн�"
-
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
-msgid "Serial port"
-msgstr "По�лідовний порт"
-
-#: src/slic3r/GUI/Tab.cpp:1779
-msgid "Rescan serial ports"
-msgstr "Сканувати ще раз по�лідовні порти"
-
-#: src/slic3r/GUI/Tab.cpp:1801
-msgid "Connection to printer works correctly."
-msgstr "Підключенн� до принтера працює коректно."
-
-#: src/slic3r/GUI/Tab.cpp:1804
-msgid "Connection failed."
-msgstr "Підключенн� не вдало��."
-
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
-msgid "Print Host upload"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
-msgid "Before layer change G-code"
-msgstr "G-код перед зміною шару"
-
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
-msgid "After layer change G-code"
-msgstr "G-код пі�л� зміни шару"
-
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
-msgid "Tool change G-code"
-msgstr "G-код зміни ін�трументу"
-
-#: src/slic3r/GUI/Tab.cpp:1877
-msgid "Between objects G-code (for sequential printing)"
-msgstr "G-код між об'єктами (дл� по�лідовного друку)"
-
-#: src/slic3r/GUI/Tab.cpp:1938
-msgid "Display"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
-msgid "Corrections"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
-msgid "Machine limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2025
-msgid "Values in this column are for Full Power mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2026
-msgid "Full Power"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2031
-msgid "Values in this column are for Silent mode"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2032
-msgid "Silent"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2040
-msgid "Maximum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2045
-msgid "Maximum accelerations"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2052
-msgid "Jerk limits"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2057
-msgid "Minimum feedrates"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
-msgid "Single extruder MM setup"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2104
-msgid "Single extruder multimaterial parameters"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
-#, c-format
-msgid "Extruder %d"
-msgstr "Ек�трудер %d"
-
-#: src/slic3r/GUI/Tab.cpp:2125
-msgid "Layer height limits"
-msgstr "Межі ви�оти шару"
-
-#: src/slic3r/GUI/Tab.cpp:2130
-msgid "Position (for multi-extruder printers)"
-msgstr "Позиці� (дл� мульти-ек�трудерних принтерів)"
-
-#: src/slic3r/GUI/Tab.cpp:2133
-msgid "Retraction"
-msgstr "Перериванн�"
-
-#: src/slic3r/GUI/Tab.cpp:2136
-msgid "Only lift Z"
-msgstr "Межі підн�тт� Z"
-
-#: src/slic3r/GUI/Tab.cpp:2149
-msgid "Retraction when tool is disabled (advanced settings for multi-extruder setups)"
-msgstr "Перериванн� при відключенні ін�трумента (додаткові налаштуванн� дл� налагодженн� мульти-ек�трудерів)"
-
-#: src/slic3r/GUI/Tab.cpp:2153
-msgid "Preview"
-msgstr "Попередній перегл�д"
-
-#: src/slic3r/GUI/Tab.cpp:2284
-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:2286
-msgid "Firmware Retraction"
-msgstr "Програмне перериванн�"
-
-#: src/slic3r/GUI/Tab.cpp:2565
-#, c-format
-msgid "Default preset (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2566
-#, c-format
-msgid "Preset (%s)"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2583
-msgid "has the following unsaved changes:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2586
-msgid "is not compatible with printer"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2587
-msgid "is not compatible with print profile"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2589
-msgid "and it has the following unsaved changes:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2592
-msgid "Discard changes and continue anyway?"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2593
-msgid "Unsaved Changes"
-msgstr "�езбережені зміни"
-
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
-msgid "Please check your object list before preset changing."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2699
-msgid "The supplied name is empty. It can't be saved."
-msgstr "�адане ім'� порожнє. �е вдаєть�� зберегти."
-
-#: src/slic3r/GUI/Tab.cpp:2704
-msgid "Cannot overwrite a system profile."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2708
-msgid "Cannot overwrite an external profile."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "remove"
-msgstr "перемі�тити"
-
-#: src/slic3r/GUI/Tab.cpp:2734
-msgid "delete"
-msgstr "видалити"
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid "Are you sure you want to "
-msgstr "Ви впевнені, що хочете "
-
-#: src/slic3r/GUI/Tab.cpp:2735
-msgid " the selected preset?"
-msgstr " вибране налаштуванн�?"
-
-#: src/slic3r/GUI/Tab.cpp:2736
-msgid "Remove"
-msgstr "Перемі�тити"
-
-#: src/slic3r/GUI/Tab.cpp:2737
-msgid " Preset"
-msgstr " �алаштуванн�"
-
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr "В�і"
-
-#: src/slic3r/GUI/Tab.cpp:2869
-msgid "LOCKED LOCK;indicates that the settings are the same as the system values for the current option group"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2872
-msgid ""
-"UNLOCKED LOCK;indicates that some settings were changed and are not equal to the system values for the current option group.\n"
-"Click the UNLOCKED LOCK icon to reset all settings for current option group to the system values."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2878
-msgid ""
-"WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
-"for the right button: \tindicates that the settings hasn't been modified."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2882
-msgid ""
-"BACK ARROW;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 ""
-
-#: src/slic3r/GUI/Tab.cpp:2908
-msgid "LOCKED LOCK icon indicates that the settings are the same as the system values for the current option group"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2910
-msgid ""
-"UNLOCKED LOCK icon indicates that some settings were changed and are not equal to the system values for the current option group.\n"
-"Click to reset all settings for current option group to the system values."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2913
-msgid "WHITE BULLET icon indicates a non system preset."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2916
-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:2918
-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 ""
-
-#: src/slic3r/GUI/Tab.cpp:2924
-msgid "LOCKED LOCK icon indicates that the value is the same as the system value."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2925
-msgid ""
-"UNLOCKED LOCK icon indicates that the value was changed and is not equal to the system value.\n"
-"Click to reset current value to the system value."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2931
-msgid "WHITE BULLET icon indicates that the value is the same as in the last saved preset."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2932
-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 ""
-
-#: src/slic3r/GUI/Tab.cpp:3031
-msgid " as:"
-msgstr " �к:"
-
-#: src/slic3r/GUI/Tab.cpp:3075
-msgid "the following postfix are not allowed:"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3079
-msgid "The supplied name is not available."
-msgstr "�адане ім'� недій�не."
-
-#: src/slic3r/GUI/Tab.cpp:3092
-msgid "Material"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
-msgid "Layers"
-msgstr "Шари"
-
-#: src/slic3r/GUI/Tab.cpp:3098
-msgid "Exposure"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3183
-msgid "Support head"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3188
-msgid "Support pillar"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3196
-msgid "Connection of the support sticks and junctions"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:3200
-msgid "Automatic generation"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
-msgid "Print Settings"
-msgstr "Параметри друку"
-
-#: src/slic3r/GUI/Tab.hpp:311
-msgid "Filament Settings"
-msgstr "Параметри філаменту"
-
-#: src/slic3r/GUI/Tab.hpp:344
-msgid "Printer Settings"
-msgstr "Параметри принтеру"
-
-#: src/slic3r/GUI/Tab.hpp:367
-msgid "Material Settings"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.hpp:393
-msgid "Save preset"
-msgstr "Зберегти налаштуванн�"
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "Update available"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
-msgid "New version of Slic3r PE is available"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
-msgid "To download, follow the link below."
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
-msgid "Current version:"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
-msgid "New version:"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
-msgid "Don't notify about new releases any more"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
-msgid "Configuration update"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
-msgid "Configuration update is available"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
-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"
-"\n"
-"Updated configuration bundles:"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r incompatibility"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
-msgid "Slic3r configuration is incompatible"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
-msgid ""
-"This version of Slic3r PE is not compatible with currently installed configuration bundles.\n"
-"This probably happened as a result of running an older Slic3r PE after using a newer one.\n"
-"\n"
-"You may either exit Slic3r 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 Slic3r.\n"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
-#, c-format
-msgid "This Slic3r PE version: %s"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
-msgid "Incompatible bundles:"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
-msgid "Exit Slic3r"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
-msgid "Re-configure"
-msgstr ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
-#, c-format
-msgid ""
-"Slic3r PE 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 ""
-
-#: src/slic3r/GUI/UpdateDialogs.cpp:182
-msgid "For more information please visit our wiki page:"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
-msgid "Ramming customization"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
-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 ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78
-msgid "Total ramming time"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
-msgid "Total rammed volume"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
-msgid "Ramming line width"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
-msgid "Ramming line spacing"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
-msgid "Wipe tower - Purging volume adjustment"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
-msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
-msgid "Extruder changed to"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
-msgid "unloaded"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
-msgid "loaded"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
-msgid "Tool #"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
-msgid "Total purging volume is calculated by summing two values below, depending on which tools are loaded/unloaded."
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
-msgid "Volume to purge (mm³) when the filament is being"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
-msgid "From"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
-msgid ""
-"Switching to simple settings will discard changes done in the advanced mode!\n"
-"\n"
-"Do you want to proceed?"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show simplified settings"
-msgstr ""
-
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
-msgid "Show advanced settings"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:65
-#, c-format
-msgid "Mismatched type of print host: %s"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:80
-msgid "Connection to OctoPrint works correctly."
-msgstr "Підключенн� до OctoPrint працює правильно."
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Could not connect to OctoPrint"
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:86
-msgid "Note: OctoPrint version at least 1.1.0 is required."
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:181
-msgid "Connection to Prusa SLA works correctly."
-msgstr ""
-
-#: src/slic3r/Utils/OctoPrint.cpp:186
-msgid "Could not connect to Prusa SLA"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:571
-#, c-format
-msgid "requires min. %s and max. %s"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:576
-#, c-format
-msgid "requires min. %s"
-msgstr ""
-
-#: src/slic3r/Utils/PresetUpdater.cpp:578
-#, c-format
-msgid "requires max. %s"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:235
-msgid "Failed loading the input model."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:248
-msgid "Mesh repair failed."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the 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 ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
-msgid "Model fixing"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
-msgid "Exporting model..."
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
-msgid "Export of a temporary 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
-msgid "Import of the repaired 3mf file failed"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
-msgid "Model repair finished"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
-msgid "Model repair canceled"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-msgid "Model repaired successfully"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model Repair by the Netfabb service"
-msgstr ""
-
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
-msgid "Model repair failed: \n"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1175
-msgid "All objects are outside of the print volume."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1201
-msgid "Some objects are too close; your extruder will collide with them."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1216
-msgid "Some objects are too tall and cannot be printed without extruder collisions."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1226
-msgid "The Spiral Vase option can only be used when printing a single object."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1228
-msgid "The Spiral Vase option can only be used when printing single material objects."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1234
-msgid "All extruders must have the same diameter for single extruder multimaterial printer."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1239
-msgid "The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter and Repetier G-code flavors."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1241
-msgid "The Wipe Tower is currently only supported with the relative extruder addressing (use_relative_e_distances=1)."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1253
-msgid "The Wipe Tower is only supported for multiple objects if they have equal layer heigths"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1255
-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:1257
-msgid "The Wipe Tower is only supported for multiple objects if they are printed with the same support_material_contact_distance"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1259
-msgid "The Wipe Tower is only supported for multiple objects if they are sliced equally."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1281
-msgid "The Wipe tower is only supported if all objects have the same layer height profile"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1290
-msgid "The supplied settings will cause an empty print."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1307
-msgid "One or more object were assigned an extruder that the printer does not have."
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1316
-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 ""
-
-#: src/libslic3r/Print.cpp:1324
-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:1328
-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 ""
-
-#: src/libslic3r/Print.cpp:1335
-msgid "first_layer_height"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1350
-msgid "First layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/Print.cpp:1354
-msgid "Layer height can't be greater than nozzle diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
-msgid "Printer technology"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:41
-msgid "Bed shape"
-msgstr "Форма полотна"
-
-#: src/libslic3r/PrintConfig.cpp:48
-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:56
-msgid "Max print height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:57
-msgid "Set this to the maximum height that can be reached by your extruder while printing."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:73
-msgid "Avoid crossing perimeters"
-msgstr "Уникати перетинанн� периметрів"
-
-#: src/libslic3r/PrintConfig.cpp:74
-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:82 src/libslic3r/PrintConfig.cpp:2080
-msgid "Other layers"
-msgstr "Інші шари"
-
-#: src/libslic3r/PrintConfig.cpp:83
-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:86
-msgid "Bed temperature"
-msgstr "Температура полотна"
-
-#: src/libslic3r/PrintConfig.cpp:93
-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:104
-msgid "Between objects G-code"
-msgstr "G-код між об'єктами"
-
-#: src/libslic3r/PrintConfig.cpp:105
-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:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "�ижні"
-
-#: src/libslic3r/PrintConfig.cpp:116
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "Кількі�ть �уцільних шарів, генерованих на нижніх поверхн�х."
-
-#: src/libslic3r/PrintConfig.cpp:118
-msgid "Bottom solid layers"
-msgstr "�ижні �уцільні шари"
-
-#: src/libslic3r/PrintConfig.cpp:123
-msgid "Bridge"
-msgstr "Мі�т"
-
-#: src/libslic3r/PrintConfig.cpp:124
-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:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
-msgid "mm/s²"
-msgstr "мм/�²"
-
-#: src/libslic3r/PrintConfig.cpp:133
-msgid "Bridging angle"
-msgstr "Кут мо�та"
-
-#: src/libslic3r/PrintConfig.cpp:135
-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:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
-msgid "°"
-msgstr "°"
-
-#: src/libslic3r/PrintConfig.cpp:145
-msgid "Bridges fan speed"
-msgstr "Швидкі�ть вентил�тора дл� мо�тів"
-
-#: src/libslic3r/PrintConfig.cpp:146
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr "Ц� швидкі�ть вентил�тора виконуєть�� дл� в�іх мо�тів і ви�тупів."
-
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
-msgid "%"
-msgstr "%"
-
-#: src/libslic3r/PrintConfig.cpp:155
-msgid "Bridge flow ratio"
-msgstr "Співвідношенн� мо�тового потоку"
-
-#: src/libslic3r/PrintConfig.cpp:157
-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:168
-msgid "Bridges"
-msgstr "Мо�ти"
-
-#: src/libslic3r/PrintConfig.cpp:170
-msgid "Speed for printing bridges."
-msgstr "Швидкі�ть друку мо�тів."
-
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
-msgid "mm/s"
-msgstr "мм/�"
-
-#: src/libslic3r/PrintConfig.cpp:178
-msgid "Brim width"
-msgstr "Ширина краю"
-
-#: src/libslic3r/PrintConfig.cpp:179
-msgid "Horizontal width of the brim that will be printed around each object on the first layer."
-msgstr "Горизонтальна ширина краю, �ка буде надрукована навколо кожного об'єкта на першому шарі."
-
-#: src/libslic3r/PrintConfig.cpp:187
-msgid "Clip multi-part objects"
-msgstr "Обрізати об'єкти, що �кладають�� з кількох ча�тин"
-
-#: src/libslic3r/PrintConfig.cpp:188
-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:196
-msgid "Colorprint height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:197
-msgid "Heights at which a filament change is to occur. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:207
-msgid "Compatible printers condition"
-msgstr "Стан �умі�них принтерів"
-
-#: src/libslic3r/PrintConfig.cpp:208
-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."
-msgstr "Логічний вираз, що викори�товує значенн� конфігурації активного профілю принтера. Якщо цей вираз оцінюєть�� �к Правда, цей профіль вважаєть�� �умі�ним з активним профілем принтера."
-
-#: src/libslic3r/PrintConfig.cpp:220
-msgid "Compatible print profiles condition"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:221
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:235
-msgid "Complete individual objects"
-msgstr "Закінчити окремі об'єкти"
-
-#: src/libslic3r/PrintConfig.cpp:236
-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."
-msgstr "Під ча� друку декількох об'єктів або копій ц� функці� забезпечить завершенн� кожного об'єкту, перш ніж переходити до на�тупного (і почине його з нижнього шару). Ц� функці� кори�на дл� уникненн� ризику зіп�ованих відбитків. Slic3r має попередити та запобігти зіткненню ек�трудера, але будьте обережні."
-
-#: src/libslic3r/PrintConfig.cpp:245
-msgid "Enable auto cooling"
-msgstr "Увімкнути автоматичне охолодженн�"
-
-#: src/libslic3r/PrintConfig.cpp:246
-msgid "This flag enables the automatic cooling logic that adjusts print speed and fan speed according to layer printing time."
-msgstr "Цей прапорець дозвол�є автоматичну логіку охолодженн�, �ка регулює швидкі�ть друку та швидкі�ть вентил�ції відповідно до ча�у друку шару."
-
-#: src/libslic3r/PrintConfig.cpp:252
-msgid "Cooling tube position"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:253
-msgid "Distance of the center-point of the cooling tube from the extruder tip "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:261
-msgid "Cooling tube length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:262
-msgid "Length of the cooling tube to limit space for cooling moves inside it "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:271
-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."
-msgstr "Це при�коренн�, на �ке переключить�� ваш принтер пі�л� того, �к будуть викори�тані конкретні визначені при�коренн� (периметру / заповненн�). В�тановити 0, щоб запобігти �киданн�м при�коренн� взагалі."
-
-#: src/libslic3r/PrintConfig.cpp:281
-msgid "Default filament profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:282
-msgid "Default filament profile associated with the current printer profile. On selection of the current printer profile, this filament profile will be activated."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:287
-msgid "Default print profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
-msgid "Default print profile associated with the current printer profile. On selection of the current printer profile, this print profile will be activated."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:293
-msgid "Disable fan for the first"
-msgstr "Вимкнути вентил�тор дл� першого(их)"
-
-#: src/libslic3r/PrintConfig.cpp:294
-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:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
-msgid "layers"
-msgstr "шару(ів)"
-
-#: src/libslic3r/PrintConfig.cpp:304
-msgid "Don't support bridges"
-msgstr "�е підтримувати мо�ти"
-
-#: src/libslic3r/PrintConfig.cpp:306
-msgid "Experimental option for preventing support material from being generated under bridged areas."
-msgstr "Ек�периментальний варіант дл� запобіганн� утворенню допоміжного матеріалу в обла�т�х під мо�тами."
-
-#: src/libslic3r/PrintConfig.cpp:313
-msgid "Distance between copies"
-msgstr "Від�тань між копі�ми"
-
-#: src/libslic3r/PrintConfig.cpp:314
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "Від�тань викори�товуєть�� дл� автоматичного розташуванн� платеру."
-
-#: src/libslic3r/PrintConfig.cpp:322
-msgid "Elephant foot compensation"
-msgstr "Зрівноваженн� Стопи �лона"
-
-#: src/libslic3r/PrintConfig.cpp:324
-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:334
-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."
-
-#: src/libslic3r/PrintConfig.cpp:345
-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 обробл�єть�� в пор�дку ек�трудерів."
-
-#: src/libslic3r/PrintConfig.cpp:356
-msgid "Ensure vertical shell thickness"
-msgstr "Перевірте товщину вертикальної оболонки"
-
-#: src/libslic3r/PrintConfig.cpp:358
-msgid "Add solid infill near sloping surfaces to guarantee the vertical shell thickness (top+bottom solid layers)."
-msgstr "Додайте �уцільні наповнювачі біл� нахилених поверхонь, щоб гарантувати товщину вертикальної оболонки (верхній і нижній �уцільні шари)."
-
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "Верхній/нижній шаблон наповненн�"
-
-#: src/libslic3r/PrintConfig.cpp:367
-msgid "Fill pattern for top/bottom infill. This only affects the external visible layer, and not its adjacent solid shells."
-msgstr "Шаблон дл� верхнього/нижнього наповненн�. Це впливає лише на зовнішній видимий шар, а не на �у�ідні �уцільні оболонки."
-
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
-msgid "Rectilinear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
-msgid "Concentric"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
-msgid "Hilbert Curve"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
-msgid "Archimedean Chords"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
-msgid "Octagram Spiral"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
-msgid "External perimeters"
-msgstr "Зовнішні периметри"
-
-#: src/libslic3r/PrintConfig.cpp:388
-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:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
-msgid "mm or % (leave 0 for default)"
-msgstr "мм або % (залиште 0 за замовчанн�м)"
-
-#: src/libslic3r/PrintConfig.cpp:399
-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:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
-msgid "mm/s or %"
-msgstr "мм/� або %"
-
-#: src/libslic3r/PrintConfig.cpp:409
-msgid "External perimeters first"
-msgstr "Спочатку зовнішні периметри"
-
-#: src/libslic3r/PrintConfig.cpp:411
-msgid "Print contour perimeters from the outermost one to the innermost one instead of the default inverse order."
-msgstr "Друкувати контури периметра від найзовнішнього до найвнутрішнього, замі�ть інвер�ного пор�дку за замовчанн�м."
-
-#: src/libslic3r/PrintConfig.cpp:418
-msgid "Extra perimeters if needed"
-msgstr "Додаткові периметри, �кщо необхідно"
-
-#: src/libslic3r/PrintConfig.cpp:420
-#, no-c-format
-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:431
-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:444
-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."
-msgstr "У�тановіть значенн� �к вертикальну від�тань між наконечником �опла та (звичайно) шатунами X каретки. Іншими �ловами, це ви�ота циліндра очищенн� навколо вашого ек�трудера, і це �вл�є �обою мак�имальну глибину, �ку ек�трудер може розгл�дати до зіткненн� з іншими друкованими предметами."
-
-#: src/libslic3r/PrintConfig.cpp:455
-msgid "Radius"
-msgstr "Радіу�"
-
-#: src/libslic3r/PrintConfig.cpp:456
-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."
-msgstr "У�тановіть значенн� �к радіу� зазорів навколо вашої ек�трудера. Якщо ек�трудер не центрований, дл� безпеки виберіть найбільше значенн� . Цей параметр викори�товуєть�� дл� перевірки зіткнень та відображенн� графічного попереднього перегл�ду в панелі."
-
-#: src/libslic3r/PrintConfig.cpp:467
-msgid "Extruder Color"
-msgstr "Колір ек�трудера"
-
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr "Ц� опці� викори�товуєть�� лише у інтерфей�і Slic3r �к візуальна допомога."
-
-#: src/libslic3r/PrintConfig.cpp:475
-msgid "Extruder offset"
-msgstr "Зміщенн� ек�трудеру"
-
-#: src/libslic3r/PrintConfig.cpp:476
-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)."
-msgstr "Якщо ваша прошивка не �правл�єть�� з виті�ненн�м ек�трудера, вам потрібен G-код, щоб врахувати це. Ц� опці� дозвол�є вказати зміщенн� кожного ек�трудера відно�но першого. Він очікує позитивних координат (вони будуть віднімані від координати XY)."
-
-#: src/libslic3r/PrintConfig.cpp:486
-msgid "Extrusion axis"
-msgstr "О�ь ек�трузії"
-
-#: src/libslic3r/PrintConfig.cpp:487
-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)."
-
-#: src/libslic3r/PrintConfig.cpp:493
-msgid "Extrusion multiplier"
-msgstr "Коефіцієнт ек�трузії"
-
-#: src/libslic3r/PrintConfig.cpp:494
-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."
-msgstr "Цей фактор пропорційно змінює величину потоку. Вам може знадобити�� налаштувати цей параметр, щоб отримати хорошу обробку поверхні та правильно визначити ширину однієї �тіни. Звичайні значенн� - від 0,9 до 1,1. Якщо ви вважаєте, що його потрібно більше змінити, перевірте діаметр нитки та E кроки прошивки ."
-
-#: src/libslic3r/PrintConfig.cpp:503
-msgid "Default extrusion width"
-msgstr "Ширина ек�трузії за замовчанн�м"
-
-#: src/libslic3r/PrintConfig.cpp:505
-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:509
-msgid "mm or % (leave 0 for auto)"
-msgstr "мм або % (залиште 0 дл� автообчи�ленн�)"
-
-#: src/libslic3r/PrintConfig.cpp:515
-msgid "Keep fan always on"
-msgstr "Тримайте вентил�тор завжди"
-
-#: src/libslic3r/PrintConfig.cpp:516
-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:522
-msgid "Enable fan if layer print time is below"
-msgstr "Увімкнути вентил�тор, �кщо ча� друку шару нижче"
-
-#: src/libslic3r/PrintConfig.cpp:523
-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:525 src/libslic3r/PrintConfig.cpp:1711
-msgid "approximate seconds"
-msgstr "приблизні �екунди"
-
-#: src/libslic3r/PrintConfig.cpp:534
-msgid "Color"
-msgstr "Колір"
-
-#: src/libslic3r/PrintConfig.cpp:541
-msgid "Filament notes"
-msgstr "Примітки до філаменту"
-
-#: src/libslic3r/PrintConfig.cpp:542
-msgid "You can put your notes regarding the filament here."
-msgstr "Тут ви можете помі�тити �вої нотатки щодо філаменту."
-
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
-msgid "Max volumetric speed"
-msgstr "Мак�имальна об'ємна швидкі�ть"
-
-#: src/libslic3r/PrintConfig.cpp:552
-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:555 src/libslic3r/PrintConfig.cpp:1199
-msgid "mm³/s"
-msgstr "мм³/�"
-
-#: src/libslic3r/PrintConfig.cpp:562
-msgid "Loading speed"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:563
-msgid "Speed used for loading the filament on the wipe tower. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:571
-msgid "Loading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:572
-msgid "Speed used at the very beginning of loading phase. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:580
-msgid "Unloading speed"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:581
-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:590
-msgid "Unloading speed at the start"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:591
-msgid "Speed used for unloading the tip of the filament immediately after ramming. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:599
-msgid "Delay after unloading"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:600
-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. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:610
-msgid "Number of cooling moves"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:611
-msgid "Filament is cooled by being moved back and forth in the cooling tubes. Specify desired number of these moves "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:620
-msgid "Speed of the first cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:621
-msgid "Cooling moves are gradually accelerating beginning at this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:629
-msgid "Minimal purge on wipe tower"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:630
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:635
-msgid "mm³"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:641
-msgid "Speed of the last cooling move"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:642
-msgid "Cooling moves are gradually accelerating towards this speed. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:650
-msgid "Filament load time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:651
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:659
-msgid "Ramming parameters"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:660
-msgid "This string is edited by RammingDialog and contains ramming specific parameters "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:667
-msgid "Filament unload time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:668
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:677
-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."
-msgstr "Введіть тут діаметр �вого філаменту. �еобхідна ви�ока точні�ть, тому викори�товуйте �уматор і виконайте декілька вимірювань вздовж нитки, потім обчи�літь �ереднє значенн�."
-
-#: src/libslic3r/PrintConfig.cpp:685
-msgid "Density"
-msgstr "Щільні�ть"
-
-#: src/libslic3r/PrintConfig.cpp:686
-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."
-msgstr "Введіть тут щільні�ть �вого філаменту. Це тільки дл� �тати�тичної інформації. При�тойним �по�обом є зважуванн� відомої довжини нитки та обчи�ленн� �піввідношенн� довжини до об��гу. Краще обчи�лити об'єм безпо�ередньо через зміщенн�."
-
-#: src/libslic3r/PrintConfig.cpp:689
-msgid "g/cm³"
-msgstr "г/�м³"
-
-#: src/libslic3r/PrintConfig.cpp:695
-msgid "Filament type"
-msgstr "Тип філаменту"
-
-#: src/libslic3r/PrintConfig.cpp:696
-msgid "The filament material type for use in custom G-codes."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:712
-msgid "Soluble material"
-msgstr "Розчинний матеріал"
-
-#: src/libslic3r/PrintConfig.cpp:713
-msgid "Soluble material is most likely used for a soluble support."
-msgstr "Розчинний матеріал переважно викори�товуєть�� дл� розчинної підтримки."
-
-#: src/libslic3r/PrintConfig.cpp:719
-msgid "Enter your filament cost per kg here. This is only for statistical information."
-msgstr "Введіть тут �вою варті�ть філаменту на кг. Це тільки дл� �тати�тичної інформації."
-
-#: src/libslic3r/PrintConfig.cpp:720
-msgid "money/kg"
-msgstr "грошових одиниць/кг"
-
-#: src/libslic3r/PrintConfig.cpp:729
-msgid "Fill angle"
-msgstr "Кут наповненн�"
-
-#: src/libslic3r/PrintConfig.cpp:731
-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."
-msgstr "О�новний кут орієнтації наповненн� за замовчуванн�м. Дл� цього буде за�то�овувати�� кро�-штрих. Мо�ти будуть заповнені, викори�товуючи найкращий напр�м, �кий може ви�вити Slic3r, тому цей параметр на них не впливає."
-
-#: src/libslic3r/PrintConfig.cpp:744
-msgid "Fill density"
-msgstr "Щільні�ть заповненн�"
-
-#: src/libslic3r/PrintConfig.cpp:746
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "Щільні�ть внутрішнього заповненн�, виражена в діапазоні 0% - 100%."
-
-#: src/libslic3r/PrintConfig.cpp:782
-msgid "Fill pattern"
-msgstr "Шаблон заповненн�"
-
-#: src/libslic3r/PrintConfig.cpp:784
-msgid "Fill pattern for general low-density infill."
-msgstr "Шаблон заповненн� дл� загального низько-швидкі�ного наповненн�."
-
-#: src/libslic3r/PrintConfig.cpp:801
-msgid "Grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:802
-msgid "Triangles"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:803
-msgid "Stars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:804
-msgid "Cubic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:805
-msgid "Line"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
-msgid "Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:808
-msgid "3D Honeycomb"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:809
-msgid "Gyroid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
-msgid "First layer"
-msgstr "Перший шар"
-
-#: src/libslic3r/PrintConfig.cpp:817
-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:827
-msgid "Heated build plate temperature for the first layer. Set this to zero to disable bed temperature control commands in the output."
-msgstr "Температура підігрітої збірної пла�тини дл� першого шару. У�тановіть 0, щоб відключити команди керуванн� температурою полотна на виході."
-
-#: src/libslic3r/PrintConfig.cpp:837
-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."
-msgstr "В�тановіть ненульове значенн�, щоб в�тановити ручну ширину ек�трузії дл� першого шару. Ви можете викори�товувати цю опцію з метою навми�ного пом'�кшенн� ек�трудату дл� кращої адгезії. Якщо вона виражена у від�отках (наприклад, 120%), вона буде обчи�лена за ви�отою першого шару. Якщо в�тановлено на 0 - викори�товуватиме �тандартну ширину ек�трузії."
-
-#: src/libslic3r/PrintConfig.cpp:848
-msgid "First layer height"
-msgstr "Ви�ота першого шару"
-
-#: src/libslic3r/PrintConfig.cpp:850
-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:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
-msgid "mm or %"
-msgstr "мм або %"
-
-#: src/libslic3r/PrintConfig.cpp:860
-msgid "First layer speed"
-msgstr "Швидкі�ть першого шару"
-
-#: src/libslic3r/PrintConfig.cpp:861
-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:872
-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, щоб вимкнути команди керуванн� температурою у вихідному файлі."
-
-#: src/libslic3r/PrintConfig.cpp:882
-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:890
-msgid "Verbose G-code"
-msgstr "Докладний G-код"
-
-#: src/libslic3r/PrintConfig.cpp:891
-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:899
-msgid "G-code flavor"
-msgstr "О�обливі�ть G-коду"
-
-#: src/libslic3r/PrintConfig.cpp:900
-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 ек�портувати будь-�ке значенн� ек�трузії."
-
-#: src/libslic3r/PrintConfig.cpp:924
-msgid "No extrusion"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:929
-msgid "High extruder current on filament swap"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:930
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:939
-msgid "This is the acceleration your printer will use for infill. Set zero to disable acceleration control for infill."
-msgstr "Це при�коренн�, �ке ваш принтер викори�товуватиме дл� наповненн�. В�тановити 0, щоб вимкнути регул�тор при�коренн� дл� заповненн�."
-
-#: src/libslic3r/PrintConfig.cpp:948
-msgid "Combine infill every"
-msgstr "Об'єднати наповненн� кожні"
-
-#: src/libslic3r/PrintConfig.cpp:950
-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:954
-msgid "Combine infill every n layers"
-msgstr "Об'єднати наповненн� кожні n шарів"
-
-#: src/libslic3r/PrintConfig.cpp:960
-msgid "Infill extruder"
-msgstr "�аповнювач ек�трудера"
-
-#: src/libslic3r/PrintConfig.cpp:962
-msgid "The extruder to use when printing infill."
-msgstr "Ек�трудер, викори�товуваний під ча� друку наповненн�."
-
-#: src/libslic3r/PrintConfig.cpp:971
-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."
-msgstr "В�тановіть значенн� �к ненульове, щоб в�тановити ручну ширину ек�трузії дл� наповненн�. Якщо залишити 0, ширина ек�трузії за замовчуванн�м буде викори�тана, �кщо в�тановлено, інакше буде викори�тано 1,125 x діаметр �опла. Можливо, ви захочете викори�товувати більш тов�ті ек�труди, щоб при�корити наповненн� та зміцнити �вої деталі. Якщо він виражений у від�отках (наприклад, 90%), він буде обчи�лювати�� за ви�отою шару."
-
-#: src/libslic3r/PrintConfig.cpp:981
-msgid "Infill before perimeters"
-msgstr "Заповненн� перед периметрами"
-
-#: src/libslic3r/PrintConfig.cpp:982
-msgid "This option will switch the print order of perimeters and infill, making the latter first."
-msgstr "За допомогою цього параметра можна буде змінити пор�док друку периметрів та наповнювачів, зробивши о�таннє першим."
-
-#: src/libslic3r/PrintConfig.cpp:988
-msgid "Only infill where needed"
-msgstr "Заповнити тільки там, де потрібно"
-
-#: src/libslic3r/PrintConfig.cpp:990
-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."
-msgstr "Ц� опці� обмежить заповненн� обла�тей, фактично необхідних дл� підтримки �тель (це буде ді�ти �к внутрішній матеріал підтримки). Якщо це ввімкнено, �повільнюєть�� генераці� G-коду через декілька перевірок."
-
-#: src/libslic3r/PrintConfig.cpp:998
-msgid "Infill/perimeters overlap"
-msgstr "Перекритт� наповненн�/периметрів"
-
-#: src/libslic3r/PrintConfig.cpp:1000
-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."
-msgstr "Цей параметр за�то�овує додаткове перекритт� між заповненн�м та периметрами дл� кращого зчепленн�. Теоретично це не повинно бути необхідним, але люфт може �причинити розриви. Якщо він виражений у від�отках (приклад: 15%), його розраховують за шириною ек�трузії по периметру."
-
-#: src/libslic3r/PrintConfig.cpp:1012
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr "Швидкі�ть друку внутрішнього заповненн�. В�тановити 0 дл� автоматичного обчи�ленн�."
-
-#: src/libslic3r/PrintConfig.cpp:1020
-msgid "Inherits profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1021
-msgid "Name of the profile, from which this profile inherits."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1032
-msgid "Interface shells"
-msgstr "Інтерфей�ні оболонки"
-
-#: src/libslic3r/PrintConfig.cpp:1033
-msgid "Force the generation of solid shells between adjacent materials/volumes. Useful for multi-extruder prints with translucent materials or manual soluble support material."
-msgstr "Приму�ове �творенн� �уцільної оболонки між �уміжними матеріалами/об��гами. Кори�но дл� друку з багатьма ек�трудерами з напівпрозорими матеріалами або ручним розчинним матеріалом дл� підтримки."
-
-#: src/libslic3r/PrintConfig.cpp:1043
-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 "Цей кори�тувацький код в�тавл�єть�� при кожній зміні шару відразу пі�л� переміщенн� Z і перед тим, �к ек�трудер перемі�тить�� до точки першого шару. Зауважте, що ви можете викори�товувати змінні-заповнювачі дл� в�іх параметрів Slic3r, а також [layer_num] і [layer_z]."
-
-#: src/libslic3r/PrintConfig.cpp:1054
-msgid "Supports remaining times"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1055
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1063
-msgid "Supports silent mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1064
-msgid "Set silent mode for the G-code flavor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1087
-msgid "Maximum feedrate %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1089
-msgid "Maximum feedrate of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1097
-msgid "Maximum acceleration %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1099
-msgid "Maximum acceleration of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1107
-msgid "Maximum jerk %1%"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1109
-msgid "Maximum jerk of the %1% axis"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
-msgid "Minimum feedrate when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
-msgid "Minimum travel feedrate"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
-msgid "Maximum acceleration when extruding"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
-msgid "Maximum acceleration when retracting"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
-msgid "Max"
-msgstr "Мак�имально"
-
-#: src/libslic3r/PrintConfig.cpp:1164
-msgid "This setting represents the maximum speed of your fan."
-msgstr "Цей параметр відображає мак�имальну швидкі�ть вашого вентил�тора."
-
-#: src/libslic3r/PrintConfig.cpp:1174
-#, no-c-format
-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."
-msgstr "Це найбільша ви�ота друкованого шару дл� цього ек�трудера, що викори�товуєть�� дл� обмеженн� ви�оти змінного шару та ви�оти підтримуючого шару. Мак�имальна рекомендована ви�ота шару �тановить 75% ширини ек�трузії дл� до��гненн� розумної міжшарової адгезії. Якщо в�тановлено 0, ви�ота шару обмежена 75% діаметра �опла."
-
-#: src/libslic3r/PrintConfig.cpp:1185
-msgid "Max print speed"
-msgstr "Мак�имальна швидкі�ть друку"
-
-#: src/libslic3r/PrintConfig.cpp:1186
-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."
-msgstr "При в�тановленні інших параметрів швидко�ті до 0, Slic3r буде автоматично обчи�лювати оптимальну швидкі�ть, щоб підтримувати по�тійний ти�к ек�трудера. Цей ек�периментальний параметр викори�товуєть�� дл� в�тановленн� мак�имальної швидко�ті друку, �ку ви хочете дозволити."
-
-#: src/libslic3r/PrintConfig.cpp:1197
-msgid "This experimental setting is used to set the maximum volumetric speed your extruder supports."
-msgstr "Цей ек�периментальний параметр викори�товуєть�� дл� в�тановленн� мак�имальної об'ємної швидко�ті, �ку підтримує ек�трудер."
-
-#: src/libslic3r/PrintConfig.cpp:1206
-msgid "Max volumetric slope positive"
-msgstr "Мак�имальний об'ємний нахил позитивний"
-
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
-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."
-msgstr "Цей ек�периментальний параметр викори�товуєть�� дл� обмеженн� швидко�ті зміни швидко�ті ек�трузії. Значенн� 1,8 мм³/�² гарантує, що зміна швидко�ті ек�трузії 1,8 мм³/� (ширина ек�трузії 0,45 мм, ви�ота ек�трузії 0,2 мм, швидкі�ть подачі 20 мм/�) до 5,4 мм³/� (подача 60 мм/�) займе принаймні 2 �екунди."
-
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
-msgid "mm³/s²"
-msgstr "мм³/�²"
-
-#: src/libslic3r/PrintConfig.cpp:1218
-msgid "Max volumetric slope negative"
-msgstr "Мак�имальний об'ємний �хил негативний"
-
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
-msgid "Min"
-msgstr "Мінімально"
-
-#: src/libslic3r/PrintConfig.cpp:1231
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr "Цей параметр відповідає мінімальній ШІМ, на �кій повинен працювати ваш вентил�тор."
-
-#: src/libslic3r/PrintConfig.cpp:1241
-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."
-msgstr "Це найменша ви�ота друкованого шару дл� цього ек�трудера та обмежує роздільну здатні�ть дл� ви�оти змінного шару. Типові значенн� - від 0,05 мм до 0,1 мм."
-
-#: src/libslic3r/PrintConfig.cpp:1250
-msgid "Min print speed"
-msgstr "Мінімальна швидкі�ть друку"
-
-#: src/libslic3r/PrintConfig.cpp:1251
-msgid "Slic3r will not scale speed down below this speed."
-msgstr "Slic3r не буде ма�штабувати швидкі�ть нижче цієї швидко�ті."
-
-#: src/libslic3r/PrintConfig.cpp:1259
-msgid "Minimal filament extrusion length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1260
-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."
-msgstr "Створити не менше кілько�ті петель плінту�у, необхідних дл� �поживанн� зазначеної кілько�ті філаменту на нижньому шарі. Дл� машин із декількома ек�трудерами цей мінімум за�то�овуєть�� до кожного ек�трудера."
-
-#: src/libslic3r/PrintConfig.cpp:1270
-msgid "Configuration notes"
-msgstr "Примітки до конфігурації"
-
-#: src/libslic3r/PrintConfig.cpp:1271
-msgid "You can put here your personal notes. This text will be added to the G-code header comments."
-msgstr "Ви можете додати тут �вої о�оби�ті примітки. Цей тек�т буде додано до коментарів заголовка G-коду."
-
-#: src/libslic3r/PrintConfig.cpp:1281
-msgid "Nozzle diameter"
-msgstr "Діаметр �опла"
-
-#: src/libslic3r/PrintConfig.cpp:1282
-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:1288
-msgid "Host Type"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1289
-msgid "Slic3r can upload G-code files to a printer host. This field must contain the kind of the host."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
-msgid "Only retract when crossing perimeters"
-msgstr "Перервати тільки у разі перетину периметрів"
-
-#: src/libslic3r/PrintConfig.cpp:1326
-msgid "Disables retraction when the travel path does not exceed the upper layer's perimeters (and thus any ooze will be probably invisible)."
-msgstr "Вимикає перериванн�, коли шл�х не перевищує периметри верхніх шарів (і, таким чином, будь-�кий розр�дник буде, мабуть, невидимим)."
-
-#: src/libslic3r/PrintConfig.cpp:1334
-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:1342
-msgid "Output filename format"
-msgstr "Формат вихідного файлу"
-
-#: src/libslic3r/PrintConfig.cpp:1343
-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:1353
-msgid "Detect bridging perimeters"
-msgstr "Ви�вленн� ви��чих периметрів"
-
-#: src/libslic3r/PrintConfig.cpp:1355
-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:1362
-msgid "Filament parking position"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1363
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1372
-msgid "Extra loading distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1373
-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:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
-msgid "Perimeters"
-msgstr "Периметри"
-
-#: src/libslic3r/PrintConfig.cpp:1383
-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, щоб вимкнути регул�тор при�коренн� дл� периметрів."
-
-#: src/libslic3r/PrintConfig.cpp:1392
-msgid "Perimeter extruder"
-msgstr "Ек�трудер периметру"
-
-#: src/libslic3r/PrintConfig.cpp:1394
-msgid "The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr "Ек�трудер, що викори�товуєть�� при друці периметрів і краю. Перший ек�трудер - 1."
-
-#: src/libslic3r/PrintConfig.cpp:1404
-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."
-msgstr "У�тановіть значенн� ненульовим, щоб в�тановити ручну ширину ек�трузії дл� периметрів. Ви можете викори�товувати більш тонкі ек�труди, щоб отримати більш точні поверхні. Якщо залишити 0, буде викори�тана ширина ек�трузії за замовчуванн�м, в іншому випадку викори�товуватиметь�� значенн� 1,125 х діаметр �опла. Якщо він виражений у від�отках (наприклад, 200%), він буде обчи�лювати�� за ви�отою шару."
-
-#: src/libslic3r/PrintConfig.cpp:1417
-msgid "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr "Швидкі�ть дл� периметрів (контури, вертикальні оболонки). В�тановити 0 дл� автоматичного викори�танн�."
-
-#: src/libslic3r/PrintConfig.cpp:1427
-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:1431
-msgid "(minimum)"
-msgstr "(мінімум)"
-
-#: src/libslic3r/PrintConfig.cpp:1439
-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."
-msgstr "Якщо ви хочете обробл�ти вихідний G-код через вла�ні �ценарії, про�то перелічіть тут їх аб�олютні шл�хи. Кілька �криптів відокремте крапкою з комою. Сценарії буде передано аб�олютним шл�хам до файлу G-коду �к перший аргумент, і вони можуть отримати до�туп до параметрів конфігурації Slic3r, прочитавши змінні �ередовища."
-
-#: src/libslic3r/PrintConfig.cpp:1452
-msgid "Printer type"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1453
-msgid "Type of the printer."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1457
-msgid "Printer notes"
-msgstr "Примітки принтера"
-
-#: src/libslic3r/PrintConfig.cpp:1458
-msgid "You can put your notes regarding the printer here."
-msgstr "Тут ви можете помі�тити �вої нотатки щодо принтера."
-
-#: src/libslic3r/PrintConfig.cpp:1467
-msgid "Printer vendor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1468
-msgid "Name of the printer vendor."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1472
-msgid "Printer variant"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1473
-msgid "Name of the printer variant. For example, the printer variants may be differentiated by a nozzle diameter."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1483
-msgid "Raft layers"
-msgstr "Пло�кі шари"
-
-#: src/libslic3r/PrintConfig.cpp:1485
-msgid "The object will be raised by this number of layers, and support material will be generated under it."
-msgstr "Об'єкт буде підн�тий цією кількі�тю шарів, і під ним буде згенерований матеріал підтримки."
-
-#: src/libslic3r/PrintConfig.cpp:1494
-msgid "Resolution"
-msgstr "Роздільна здатні�ть"
-
-#: src/libslic3r/PrintConfig.cpp:1495
-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:1506
-msgid "Minimum travel after retraction"
-msgstr "Мінімальне переміщенн� пі�л� перериванн�"
-
-#: src/libslic3r/PrintConfig.cpp:1507
-msgid "Retraction is not triggered when travel moves are shorter than this length."
-msgstr "Перериванн� не �працьовує, коли переміщенн� коротше за цю довжину."
-
-#: src/libslic3r/PrintConfig.cpp:1514
-msgid "Retract amount before wipe"
-msgstr "Кількі�ть переривань перед чищенн�м"
-
-#: src/libslic3r/PrintConfig.cpp:1515
-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:1523
-msgid "Retract on layer change"
-msgstr "Перериванн� на зміну шарів"
-
-#: src/libslic3r/PrintConfig.cpp:1524
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr "Цей прапор забезпечує перериванн� кожного разу, коли виконуєть�� переміщенн� Z."
-
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
-msgid "Length"
-msgstr "Довжина"
-
-#: src/libslic3r/PrintConfig.cpp:1531
-msgid "Retraction Length"
-msgstr "Довжина перериванн�"
-
-#: src/libslic3r/PrintConfig.cpp:1532
-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:1534 src/libslic3r/PrintConfig.cpp:1544
-msgid "mm (zero to disable)"
-msgstr "мм (0, щоб вимкнути)"
-
-#: src/libslic3r/PrintConfig.cpp:1540
-msgid "Retraction Length (Toolchange)"
-msgstr "Довжина перериванн� (зміна ін�трумента)"
-
-#: src/libslic3r/PrintConfig.cpp:1541
-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:1550
-msgid "Lift Z"
-msgstr "Підн�ти Z"
-
-#: src/libslic3r/PrintConfig.cpp:1551
-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:1559
-msgid "Above Z"
-msgstr "Вище Z"
-
-#: src/libslic3r/PrintConfig.cpp:1560
-msgid "Only lift Z above"
-msgstr "Тільки піднімати Z"
-
-#: src/libslic3r/PrintConfig.cpp:1561
-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 "Якщо ви в�тановите це значенн� позитивним, Z буде лише піднімати�� нал вказаним аб�олютним Z. Ви можете налаштувати цей параметр так, що підн�тт� буде пропу�кати�� на перших шарах."
-
-#: src/libslic3r/PrintConfig.cpp:1569
-msgid "Below Z"
-msgstr "�ижче Z"
-
-#: src/libslic3r/PrintConfig.cpp:1570
-msgid "Only lift Z below"
-msgstr "Тільки опу�кати Z"
-
-#: src/libslic3r/PrintConfig.cpp:1571
-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 "Якщо ви в�тановите це значенн� позитивним, Z буде лише опу�кати�� нижче вказаного аб�олютного Z. Ви можете налаштувати цей параметр так, що підн�тт� буде обмежене на перших шарах."
-
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
-msgid "Extra length on restart"
-msgstr "Додаткова довжина при перезапу�ку"
-
-#: src/libslic3r/PrintConfig.cpp:1581
-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 "Коли перериванн� компен�уєть�� пі�л� руху переміщенн�, ек�трудер буде проштовхувати цю додаткову кількі�ть філамента. Цей параметр рідко потрібний."
-
-#: src/libslic3r/PrintConfig.cpp:1590
-msgid "When the retraction is compensated after changing tool, the extruder will push this additional amount of filament."
-msgstr "Коли перериванн� компен�уєть�� пі�л� зміни ін�трумента, ек�трудер буде проштовхувати цю додаткову кількі�ть філамента."
-
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
-msgid "Retraction Speed"
-msgstr "Швидкі�ть перериванн�"
-
-#: src/libslic3r/PrintConfig.cpp:1600
-msgid "The speed for retractions (it only applies to the extruder motor)."
-msgstr "Швидкі�ть перериванн� (це �то�уєть�� лише двигуна ек�трудера)."
-
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
-msgid "Deretraction Speed"
-msgstr "Швидкі�ть пі�л�-перериванн�"
-
-#: src/libslic3r/PrintConfig.cpp:1609
-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:1617
-msgid "Seam position"
-msgstr "Позиці� шва"
-
-#: src/libslic3r/PrintConfig.cpp:1619
-msgid "Position of perimeters starting points."
-msgstr "Позиці� �тартових точок периметра."
-
-#: src/libslic3r/PrintConfig.cpp:1626
-msgid "Random"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1627
-msgid "Nearest"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1628
-msgid "Aligned"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr "Ззаду"
-
-#: src/libslic3r/PrintConfig.cpp:1636
-msgid "Direction"
-msgstr "�апр�мок"
-
-#: src/libslic3r/PrintConfig.cpp:1638
-msgid "Preferred direction of the seam"
-msgstr "Бажаний напр�мок шва"
-
-#: src/libslic3r/PrintConfig.cpp:1639
-msgid "Seam preferred direction"
-msgstr "Бажаний напр�мок шва"
-
-#: src/libslic3r/PrintConfig.cpp:1647
-msgid "Jitter"
-msgstr "Джиттер"
-
-#: src/libslic3r/PrintConfig.cpp:1649
-msgid "Seam preferred direction jitter"
-msgstr "Бажаний напр�мок шва джитера"
-
-#: src/libslic3r/PrintConfig.cpp:1650
-msgid "Preferred direction of the seam - jitter"
-msgstr "Бажаний напр�мок шва - джитера"
-
-#: src/libslic3r/PrintConfig.cpp:1661
-msgid "USB/serial port for printer connection."
-msgstr "USB / по�лідовний порт дл� підключенн� принтера."
-
-#: src/libslic3r/PrintConfig.cpp:1669
-msgid "Serial port speed"
-msgstr "Швидкі�ть по�лідовного порту"
-
-#: src/libslic3r/PrintConfig.cpp:1670
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr "Швидкі�ть (бод) USB / по�лідовного порту дл� підключенн� принтера."
-
-#: src/libslic3r/PrintConfig.cpp:1679
-msgid "Distance from object"
-msgstr "Від�тань від об'єкту"
-
-#: src/libslic3r/PrintConfig.cpp:1680
-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:1688
-msgid "Skirt height"
-msgstr "Ви�ота плінту�у"
-
-#: src/libslic3r/PrintConfig.cpp:1689
-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:1697
-msgid "Loops (minimum)"
-msgstr "Петлі (мінімум)"
-
-#: src/libslic3r/PrintConfig.cpp:1698
-msgid "Skirt Loops"
-msgstr "Петлі плінту�у"
-
-#: src/libslic3r/PrintConfig.cpp:1699
-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 "Кількі�ть петель дл� плінту�у. Якщо в�тановлено параметр \"Мінімальна довжина ек�трузії\", кількі�ть петель може бути більшою, ніж налаштована тут. У�тановіть 0, щоб повні�тю вимкнути плінту�."
-
-#: src/libslic3r/PrintConfig.cpp:1708
-msgid "Slow down if layer print time is below"
-msgstr "Уповільненн�, �кщо ча� друку шару нижче"
-
-#: src/libslic3r/PrintConfig.cpp:1709
-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 "Якщо ча� друку шару оцінюєть�� нижче цієї кілько�ті �екунд, швидкі�ть друку рухів зменшуватиметь��, щоб збільшити тривалі�ть до цього значенн�."
-
-#: src/libslic3r/PrintConfig.cpp:1720
-msgid "Small perimeters"
-msgstr "Маленькі периметри"
-
-#: src/libslic3r/PrintConfig.cpp:1722
-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:1732
-msgid "Solid infill threshold area"
-msgstr "Порогова площа �уцільного наповненн�"
-
-#: src/libslic3r/PrintConfig.cpp:1734
-msgid "Force solid infill for regions having a smaller area than the specified threshold."
-msgstr "В�тановити �уцільне заповненн� дл� регіонів, що мають площу, меншу зазначеного порогу."
-
-#: src/libslic3r/PrintConfig.cpp:1735
-msgid "mm²"
-msgstr "мм²"
-
-#: src/libslic3r/PrintConfig.cpp:1742
-msgid "Solid infill extruder"
-msgstr "Ек�трудер �уцільних наповнень"
-
-#: src/libslic3r/PrintConfig.cpp:1744
-msgid "The extruder to use when printing solid infill."
-msgstr "Ек�трудер дл� друку �уцільних наповнень."
-
-#: src/libslic3r/PrintConfig.cpp:1751
-msgid "Solid infill every"
-msgstr "Суцільне наповненн� кожні"
-
-#: src/libslic3r/PrintConfig.cpp:1753
-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."
-msgstr "Ц� функці� дозвол�є закріпити �уцільні шари на задану кількі�ть шарів. 0 - щоб відключити. Ви можете в�тановити будь-�ке значенн� (наприклад, 9999); Slic3r автоматично вибере мак�имально можливу кількі�ть шарів дл� комбінуванн� відповідно до діаметра �опла та ви�оти шару."
-
-#: src/libslic3r/PrintConfig.cpp:1766
-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."
-msgstr "В�тановіть значенн� ненульовим, щоб в�тановити ручну ширину ек�трузії дл� наповненн� дл� твердих поверхонь. Якщо залишити 0, буде викори�тана ширина ек�трузії за замовчуванн�м, в іншому випадку викори�товуватиметь�� 1,125 х діаметр �опла. Якщо він виражений у від�отках (наприклад, 90%), він буде обчи�лювати�� за ви�отою шару."
-
-#: src/libslic3r/PrintConfig.cpp:1777
-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 "Швидкі�ть друку твердих обла�тей (верхн� / нижн� / внутрішн� горизонтальна оболонка). Може бути виражено у від�отках (наприклад: 80%) від вказаної вище швидко�ті заповненн� за замовчуванн�м. В�тановити 0 дл� автоматичного викори�танн�."
-
-#: src/libslic3r/PrintConfig.cpp:1789
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr "Кількі�ть �уцільних шарів дл� генеруванн� на верхній і нижній поверхні."
-
-#: src/libslic3r/PrintConfig.cpp:1796
-msgid "Spiral vase"
-msgstr "Спіральна ваза"
-
-#: src/libslic3r/PrintConfig.cpp:1797
-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 прот�гом друку одного-�тінного об'єкта дл� уникненн� будь-�кого видимого шву. Цей параметр вимагає одношарового периметру, від�утнє наповненн�, від�утні�ть верхніх �уцільних шарів і від�утні�ть матеріалу підтримки. Ви в�е ще можете в�тановити будь-�ку кількі�ть нижніх �уцільних шарів, а також петель плінту�у/краю. Це не �працює при друку більше, ніж одного об'єкта."
-
-#: src/libslic3r/PrintConfig.cpp:1806
-msgid "Temperature variation"
-msgstr "Варіаці� температури"
-
-#: src/libslic3r/PrintConfig.cpp:1807
-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:1818
-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]\" де завгодно."
-
-#: src/libslic3r/PrintConfig.cpp:1834
-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 обробл�єть�� в пор�дку ек�трудерів."
-
-#: src/libslic3r/PrintConfig.cpp:1850
-msgid "Single Extruder Multi Material"
-msgstr "Одиночний ек�трудер кількох матеріалів"
-
-#: src/libslic3r/PrintConfig.cpp:1851
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr "Принтер мультиплек�ує нитки в єдиний гар�чий кінець."
-
-#: src/libslic3r/PrintConfig.cpp:1857
-msgid "Prime all printing extruders"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1858
-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:1864
-msgid "Generate support material"
-msgstr "Створити підтримуючий матеріал"
-
-#: src/libslic3r/PrintConfig.cpp:1866
-msgid "Enable support material generation."
-msgstr "Увімкнути генерацію матеріалів підтримки."
-
-#: src/libslic3r/PrintConfig.cpp:1871
-msgid "Auto generated supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1873
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1880
-msgid "XY separation between an object and its support"
-msgstr "Розподіл XY між об'єктом та його підтримкою"
-
-#: src/libslic3r/PrintConfig.cpp:1882
-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 "Розподіл XY між об'єктом та його підтримкою. Якщо вона виражена у від�отках (наприклад, 50%), вона буде розрахована за зовнішньою шириною периметру."
-
-#: src/libslic3r/PrintConfig.cpp:1893
-msgid "Pattern angle"
-msgstr "Кут шаблону"
-
-#: src/libslic3r/PrintConfig.cpp:1895
-msgid "Use this setting to rotate the support material pattern on the horizontal plane."
-msgstr "Викори�товуйте цей параметр, щоб повернути шаблон підтримуючого матеріалу на горизонтальній площині."
-
-#: src/libslic3r/PrintConfig.cpp:1906
-msgid "Only create support if it lies on a build plate. Don't create support on a print."
-msgstr "Створити підтримку лише, дл� того, що лежить на збірній пла�тині. �е �творювати підтримку на друк."
-
-#: src/libslic3r/PrintConfig.cpp:1913
-msgid "Contact Z distance"
-msgstr "Контактна від�тань по о�і Z"
-
-#: src/libslic3r/PrintConfig.cpp:1915
-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 "Вертикальна від�тань між об'єктом та інтерфей�ом матеріалу підтримки. В�тановленн� значенн� 0 також захи�тить Slic3r від викори�танн� потоку мо�тів та швидко�ті дл� першого шару об'єктну."
-
-#: src/libslic3r/PrintConfig.cpp:1923
-msgid "soluble"
-msgstr "розчинний"
-
-#: src/libslic3r/PrintConfig.cpp:1924
-msgid "detachable"
-msgstr "відривний"
-
-#: src/libslic3r/PrintConfig.cpp:1929
-msgid "Enforce support for the first"
-msgstr "Забезпечити підтримку першого(их)"
-
-#: src/libslic3r/PrintConfig.cpp:1931
-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:1937
-msgid "Enforce support for the first n layers"
-msgstr "Забезпечити підтримку перших n шарів"
-
-#: src/libslic3r/PrintConfig.cpp:1943
-msgid "Support material/raft/skirt extruder"
-msgstr "Підтримуючий матеріал / пліт / плінту� ек�трудеру"
-
-#: src/libslic3r/PrintConfig.cpp:1945
-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:1955
-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."
-msgstr "В�тановіть значенн� ненульовим, щоб в�тановити ручну ширину ек�трузії матеріалу дл� підтримки. Якщо залишити 0, буде викори�тана ширина ек�трузії, в�тановлена за замовчуванн�м, інакше викори�товуватиметь�� діаметр �опла. Якщо він виражений у від�отках (наприклад, 90%), він буде обчи�лювати�� за ви�отою шару."
-
-#: src/libslic3r/PrintConfig.cpp:1964
-msgid "Interface loops"
-msgstr "Інтерфей�ні петлі"
-
-#: src/libslic3r/PrintConfig.cpp:1966
-msgid "Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr "Закрити петл�ми верхній контактний шар підтримки. За замовчанн�м вимкнено."
-
-#: src/libslic3r/PrintConfig.cpp:1972
-msgid "Support material/raft interface extruder"
-msgstr "Ек�трудер інтерфей�у підтримуючого матеріалу / плоту"
-
-#: src/libslic3r/PrintConfig.cpp:1974
-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:1982
-msgid "Interface layers"
-msgstr "Інтерфей�ні шари"
-
-#: src/libslic3r/PrintConfig.cpp:1984
-msgid "Number of interface layers to insert between the object(s) and support material."
-msgstr "Кількі�ть шарів інтерфей�у дл� в�тавки між об'єктом(ами) та підтримуючим матеріалом."
-
-#: src/libslic3r/PrintConfig.cpp:1992
-msgid "Interface pattern spacing"
-msgstr "Від�тань між шаблонами інтерфей�у"
-
-#: src/libslic3r/PrintConfig.cpp:1994
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr "Від�тань між інтерфей�ними ліні�ми. В�тановити 0, щоб отримати надійний інтерфей�."
-
-#: src/libslic3r/PrintConfig.cpp:2004
-msgid "Speed for printing support material interface layers. If expressed as percentage (for example 50%) it will be calculated over support material speed."
-msgstr "Швидкі�ть друку інтерфей�них шарів підтримуючого матеріалу. Якщо вона виражена у від�отках (наприклад, 50%), вона буде розрахована за швидкі�тю матеріалу підтримки."
-
-#: src/libslic3r/PrintConfig.cpp:2013
-msgid "Pattern"
-msgstr "Шаблон"
-
-#: src/libslic3r/PrintConfig.cpp:2015
-msgid "Pattern used to generate support material."
-msgstr "Шаблон, що викори�товуєть�� дл� �творенн� матеріалу підтримки."
-
-#: src/libslic3r/PrintConfig.cpp:2022
-msgid "Rectilinear grid"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2028
-msgid "Pattern spacing"
-msgstr "Від�тань між шаблонами"
-
-#: src/libslic3r/PrintConfig.cpp:2030
-msgid "Spacing between support material lines."
-msgstr "Від�тань між ліні�ми підтримуючого матеріалу."
-
-#: src/libslic3r/PrintConfig.cpp:2040
-msgid "Speed for printing support material."
-msgstr "Швидкі�ть друку підтримуючого матеріалу."
-
-#: src/libslic3r/PrintConfig.cpp:2047
-msgid "Synchronize with object layers"
-msgstr "Синхронізувати з шарами об'єкту"
-
-#: src/libslic3r/PrintConfig.cpp:2049
-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:2056
-msgid "Overhang threshold"
-msgstr "Порог нави�анн�"
-
-#: src/libslic3r/PrintConfig.cpp:2058
-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:2071
-msgid "With sheath around the support"
-msgstr "З оболонкою навколо підтримки"
-
-#: src/libslic3r/PrintConfig.cpp:2073
-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:2081
-msgid "Extruder temperature for layers after the first one. Set this to zero to disable temperature control commands in the output."
-msgstr "Температура ек�трудеру дл� шарів пі�л� першого. У�тановіть 0, щоб вимкнути команди керуванн� температурою на виході."
-
-#: src/libslic3r/PrintConfig.cpp:2084
-msgid "Temperature"
-msgstr "Температура"
-
-#: src/libslic3r/PrintConfig.cpp:2090
-msgid "Detect thin walls"
-msgstr "Ви�вленн� тонких �тін"
-
-#: src/libslic3r/PrintConfig.cpp:2092
-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:2099
-msgid "Threads"
-msgstr "�итки"
-
-#: src/libslic3r/PrintConfig.cpp:2100
-msgid "Threads are used to parallelize long-running tasks. Optimal threads number is slightly above the number of available cores/processors."
-msgstr "�итки викори�товують�� дл� паралелізації довготривалих завдань. Оптимальна кількі�ть ниток трохи перевищує кількі�ть до�тупних �дер / проце�орів."
-
-#: src/libslic3r/PrintConfig.cpp:2112
-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]."
-
-#: src/libslic3r/PrintConfig.cpp:2125
-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."
-msgstr "У�тановіть ненульове значенн�, щоб в�тановити ручну ширину ек�трузії дл� наповненн� верхньої поверхні. Ви можете викори�товувати більш тонкі ек�трудати, щоб заповнити в�і вузькі обла�ті і отримати більш гладкий результат. Якщо залишити 0, буде викори�тана ширина ек�трузії, в�тановлена за замовчуванн�м, інакше викори�товуватиметь�� діаметр �опла. Якщо вона виражена у від�отках (наприклад, 90%), вона буде обчи�лювати�� за ви�отою шару."
-
-#: src/libslic3r/PrintConfig.cpp:2137
-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."
-msgstr "Швидкі�ть друку верхніх �уцільних шарів (це �то�уєть�� тільки найвищих зовнішніх шарів, а не їхніх внутрішніх �уцільних шарів). Ви можете захотіти �повільненн�, щоб отримати більш гарну обробку поверхні. Це можна виразити від�отком (наприклад, 80%) звищенн� швидко�ті щільного наповненн� . В�тановити 0 дл� автоматичного обчи�ленн�."
-
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "Верхні"
-
-#: src/libslic3r/PrintConfig.cpp:2151
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "Кількі�ть �уцільних шарів, генерованих на верхніх поверхн�х."
-
-#: src/libslic3r/PrintConfig.cpp:2153
-msgid "Top solid layers"
-msgstr "Верхні �уцільні шари"
-
-#: src/libslic3r/PrintConfig.cpp:2159
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr "Швидкі�ть рухів пере�уванн� (�трибки між далекими точками ек�трузії)."
-
-#: src/libslic3r/PrintConfig.cpp:2168
-msgid "Use firmware retraction"
-msgstr "Викори�товувати відмову прошивки"
-
-#: src/libslic3r/PrintConfig.cpp:2169
-msgid "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-ом."
-
-#: src/libslic3r/PrintConfig.cpp:2176
-msgid "Use relative E distances"
-msgstr "Викори�товувати відно�ні E від�тані"
-
-#: src/libslic3r/PrintConfig.cpp:2177
-msgid "If your firmware requires relative E values, check this, otherwise leave it unchecked. Most firmwares use absolute values."
-msgstr "Якщо ваша прошивка потребує відно�не значенн� E, зазначте це, інакше залиште його незазначеним. Більші�ть прошивок викори�товують аб�олютні значенн�."
-
-#: src/libslic3r/PrintConfig.cpp:2184
-msgid "Use volumetric E"
-msgstr "Викори�товувати об'ємний Е"
-
-#: src/libslic3r/PrintConfig.cpp:2185
-msgid "This experimental setting uses outputs the E values in cubic millimeters instead of linear millimeters. If your firmware doesn't already know filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] T0' in your start G-code in order to turn volumetric mode on and use the filament diameter associated to the filament selected in Slic3r. This is only supported in recent Marlin."
-msgstr "Цей ек�периментальний параметр викори�товує виводи значенн� E в кубічних міліметрах замі�ть лінійних міліметрів. Якщо ваша прошивку ще не знає діаметр ниток, ви можете в�тановити такі команди, �к \"M200 D [filament_diameter_0] T0\" у вашому �тарті G-коду, щоб включити об'ємний режим і викори�товувати діаметр нитки, пов'�заний з вибраною ниткою в Slic3r. О�таннім ча�ом це підтримуєть�� лише Marlin-ом."
-
-#: src/libslic3r/PrintConfig.cpp:2196
-msgid "Enable variable layer height feature"
-msgstr "Увімкнути функцію шарів змінної ви�оти"
-
-#: src/libslic3r/PrintConfig.cpp:2197
-msgid "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default."
-msgstr "Де�кі принтери або налаштуванн� принтера можуть мати труднощі з друкуванн�м шарів змінної ви�оти. Увімкнено за умовчанн�м."
-
-#: src/libslic3r/PrintConfig.cpp:2204
-msgid "Wipe while retracting"
-msgstr "Вичіщувати при відмові"
-
-#: src/libslic3r/PrintConfig.cpp:2205
-msgid "This flag will move the nozzle while retracting to minimize the possible blob on leaky extruders."
-msgstr "Цей прапорець перемі�тить �опло під ча� відмови, щоб мінімізувати можливі�ть утворенн� краплі на витікаючих ек�трудерах."
-
-#: src/libslic3r/PrintConfig.cpp:2213
-msgid "Multi material printers may need to prime or purge extruders on tool changes. Extrude the excess material into the wipe tower."
-msgstr "Мульти-матеріальні принтери можуть потребувати заправки або вичищенн� ек�трудерів при зміні ін�трумента. Ек�трудуйте надлишок матеріалу до вичищуючої вежі."
-
-#: src/libslic3r/PrintConfig.cpp:2220
-msgid "Purging volumes - load/unload volumes"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2221
-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:2228
-msgid "Purging volumes - matrix"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2229
-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:2239
-msgid "Position X"
-msgstr "Позиці� X"
-
-#: src/libslic3r/PrintConfig.cpp:2240
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr "X координата лівого переднього кута вичищуючої вежі"
-
-#: src/libslic3r/PrintConfig.cpp:2247
-msgid "Position Y"
-msgstr "Позиці� Y"
-
-#: src/libslic3r/PrintConfig.cpp:2248
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr "Y координата лівого переднього кута вичищуючої вежі"
-
-#: src/libslic3r/PrintConfig.cpp:2256
-msgid "Width of a wipe tower"
-msgstr "Ширина вичищуючої вежі"
-
-#: src/libslic3r/PrintConfig.cpp:2263
-msgid "Wipe tower rotation angle"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2264
-msgid "Wipe tower rotation angle with respect to x-axis "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2265
-msgid "degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2272
-msgid "Wipe into this object's infill"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2273
-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:2281
-msgid "Wipe into this object"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2282
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2289
-msgid "Maximal bridging distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2290
-msgid "Maximal distance between supports on sparse infill sections. "
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2297
-msgid "XY Size Compensation"
-msgstr "Зрівноваженн� розміру за XY"
-
-#: src/libslic3r/PrintConfig.cpp:2299
-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 "Об'єкт буде збільшений / зменшений у площині XY за заданим значенн�м (негативний - внутрішній, позитивний - ззовнішній). Це може бути кори�ним дл� точного налаштуванн� розмірів отворів."
-
-#: src/libslic3r/PrintConfig.cpp:2308
-msgid "Z offset"
-msgstr "Зміщенн� Z"
-
-#: src/libslic3r/PrintConfig.cpp:2309
-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)."
-msgstr "Це значенн� буде додано/вилучено до/з у�іх координат Z у вихідному G-коді. Воно викори�товуєть�� дл� зрівноваженн� поганої кінцевої позиції Z: наприклад, �кщо ваш кінцевий нуль фактично залишає �опло на 0,3 мм від полотна друку, в�тановіть його на значенн� -0,3 (або виправте ваш endstop)."
-
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
-msgid "Display width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2374
-msgid "Width of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2380
-msgid "Display height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2381
-msgid "Height of the display"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2387
-msgid "Number of pixels in"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2389
-msgid "Number of pixels in X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2396
-msgid "Number of pixels in Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2402
-msgid "Display orientation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2403
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:2410
-msgid "Landscape"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2411
-msgid "Portrait"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
-msgid "Printer scaling correction"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
-msgid "Initial layer height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
-msgid "Initial exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
-msgid "SLA print material notes"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2459
-msgid "You can put your notes regarding the SLA print material here."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
-msgid "Default SLA material profile"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2487
-msgid "Generate supports"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2489
-msgid "Generate supports for the models"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2494
-msgid "Support head front diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2496
-msgid "Diameter of the pointing side of the head"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2503
-msgid "Support head penetration"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2505
-msgid "How much the pinhead has to penetrate the model surface"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2512
-msgid "Support head width"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2514
-msgid "Width from the back sphere center to the front sphere center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2521
-msgid "Support pillar diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2523
-msgid "Diameter in mm of the support pillars"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2530
-msgid "Support pillar connection mode"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2531
-msgid "Controls the bridge type between two neigboring 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:2540
-msgid "Zig-Zag"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2541
-msgid "Cross"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2542
-msgid "Dynamic"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2546
-msgid "Pillar widening factor"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2548
-msgid "Merging bridges or pillars into another pillars can increase the radius. Zero means no increase, one means full increase."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2557
-msgid "Support base diameter"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2559
-msgid "Diameter in mm of the pillar base"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2566
-msgid "Support base height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2568
-msgid "The height of the pillar base cone"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2575
-msgid "Critical angle"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2577
-msgid "The default angle for connecting support sticks and junctions."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2584
-msgid "Max bridge length"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2586
-msgid "The max length of a bridge"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2593
-msgid "Object elevation"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2595
-msgid "How much the supports should lift up the supported object."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid "How many support points (approximately) should be placed on horizontal surface."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid "How many support points (approximately) should be placed on surface sloping at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
-msgid "Use pad"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2631
-msgid "Add a pad underneath the supported model"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2636
-msgid "Pad wall thickness"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2645
-msgid "Pad wall height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2654
-msgid "Max merge distance"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2663
-msgid "Pad edge radius"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3017
-msgid "Cut model at the given Z."
-msgstr "Розрізати модель за заданим Z."
-
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3023
-msgid "Don't arrange the objects on the build plate. The model coordinates define the absolute positions on the build plate. The option --center will be ignored."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3031
-msgid "Load and store settings at the given directory. This is useful for maintaining different profiles or including configurations from a network storage."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr "Допомога"
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid "Forces the GUI launch instead of command line slicing (if you supply a model file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid "Load configuration from the specified file. It can be used more than once to load options from multiple files."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid "Forces the command line slicing instead of gui. This takes precedence over --gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid "The file where the output will be written (if not specified, it will be based on the input file)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:176
-msgid "Mixed"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:396
-msgid "Height (mm)"
-msgstr "Ви�ота (мм)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:398
-msgid "Width (mm)"
-msgstr "Ширина (мм)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:400
-msgid "Speed (mm/s)"
-msgstr "Швидкі�ть (мм/�)"
-
-#: src/libslic3r/GCode/PreviewData.cpp:402
-msgid "Volumetric flow rate (mm3/s)"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:491
-msgid "Default print color"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:495
-#, c-format
-msgid "up to %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:499
-#, c-format
-msgid "above %.2f mm"
-msgstr ""
-
-#: src/libslic3r/GCode/PreviewData.cpp:504
-#, c-format
-msgid "%.2f - %.2f mm"
-msgstr ""
diff --git a/resources/localization/zh_CN/Slic3rPE_zh_new.po b/resources/localization/zh_CN/PrusaSlicer_zh.po
similarity index 63%
rename from resources/localization/zh_CN/Slic3rPE_zh_new.po
rename to resources/localization/zh_CN/PrusaSlicer_zh.po
index cdb0e4baa..5bd8871e4 100644
--- a/resources/localization/zh_CN/Slic3rPE_zh_new.po
+++ b/resources/localization/zh_CN/PrusaSlicer_zh.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Slic3rPE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 13:39+0100\n"
-"PO-Revision-Date: 2019-01-21 12:21+0100\n"
+"POT-Creation-Date: 2019-04-09 14:34+0200\n"
+"PO-Revision-Date: 2019-04-09 16:44+0200\n"
 "Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -19,11 +19,11 @@ msgstr ""
 "X-Poedit-SearchPath-1: xs/xrc/slic3r/GUI\n"
 "X-Poedit-SearchPath-2: xs/xrc/slic3r\n"
 
-#: src/slic3r/GUI/AboutDialog.cpp:33
+#: src/slic3r/GUI/AboutDialog.cpp:35
 msgid "About Slic3r"
 msgstr ""
 
-#: src/slic3r/GUI/AboutDialog.cpp:68 src/slic3r/GUI/MainFrame.cpp:51
+#: src/slic3r/GUI/AboutDialog.cpp:64 src/slic3r/GUI/MainFrame.cpp:52
 msgid "Version"
 msgstr ""
 
@@ -31,135 +31,135 @@ msgstr ""
 msgid "Shape"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:50
+#: src/slic3r/GUI/BedShapeDialog.cpp:51
 msgid "Rectangular"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:54
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:207 src/slic3r/GUI/Plater.cpp:125
-#: src/slic3r/GUI/Tab.cpp:2122
+#: src/slic3r/GUI/BedShapeDialog.cpp:55
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:118 src/slic3r/GUI/Plater.cpp:136
+#: src/slic3r/GUI/Tab.cpp:2185
 msgid "Size"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:55
+#: src/slic3r/GUI/BedShapeDialog.cpp:56
 msgid "Size in X and Y of the rectangular plate."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:61
+#: src/slic3r/GUI/BedShapeDialog.cpp:62
 msgid "Origin"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:62
+#: src/slic3r/GUI/BedShapeDialog.cpp:63
 msgid ""
 "Distance of the 0,0 G-code coordinate from the front left corner of the "
 "rectangle."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:66
+#: src/slic3r/GUI/BedShapeDialog.cpp:67
 msgid "Circular"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92
-#: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:80
-#: src/libslic3r/PrintConfig.cpp:50 src/libslic3r/PrintConfig.cpp:58
-#: src/libslic3r/PrintConfig.cpp:180 src/libslic3r/PrintConfig.cpp:254
-#: src/libslic3r/PrintConfig.cpp:263 src/libslic3r/PrintConfig.cpp:315
-#: src/libslic3r/PrintConfig.cpp:326 src/libslic3r/PrintConfig.cpp:448
-#: src/libslic3r/PrintConfig.cpp:460 src/libslic3r/PrintConfig.cpp:480
-#: src/libslic3r/PrintConfig.cpp:679 src/libslic3r/PrintConfig.cpp:1178
-#: src/libslic3r/PrintConfig.cpp:1243 src/libslic3r/PrintConfig.cpp:1263
-#: src/libslic3r/PrintConfig.cpp:1283 src/libslic3r/PrintConfig.cpp:1365
-#: src/libslic3r/PrintConfig.cpp:1376 src/libslic3r/PrintConfig.cpp:1499
-#: src/libslic3r/PrintConfig.cpp:1508 src/libslic3r/PrintConfig.cpp:1554
-#: src/libslic3r/PrintConfig.cpp:1563 src/libslic3r/PrintConfig.cpp:1574
-#: src/libslic3r/PrintConfig.cpp:1583 src/libslic3r/PrintConfig.cpp:1592
-#: src/libslic3r/PrintConfig.cpp:1682 src/libslic3r/PrintConfig.cpp:1918
-#: src/libslic3r/PrintConfig.cpp:1995 src/libslic3r/PrintConfig.cpp:2031
-#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2249
-#: src/libslic3r/PrintConfig.cpp:2257 src/libslic3r/PrintConfig.cpp:2291
-#: src/libslic3r/PrintConfig.cpp:2302 src/libslic3r/PrintConfig.cpp:2313
-#: src/libslic3r/PrintConfig.cpp:2321 src/libslic3r/PrintConfig.cpp:2328
-#: src/libslic3r/PrintConfig.cpp:2424 src/libslic3r/PrintConfig.cpp:2497
-#: src/libslic3r/PrintConfig.cpp:2506 src/libslic3r/PrintConfig.cpp:2515
-#: src/libslic3r/PrintConfig.cpp:2524 src/libslic3r/PrintConfig.cpp:2560
-#: src/libslic3r/PrintConfig.cpp:2569 src/libslic3r/PrintConfig.cpp:2587
-#: src/libslic3r/PrintConfig.cpp:2596 src/libslic3r/PrintConfig.cpp:2623
-#: src/libslic3r/PrintConfig.cpp:2639 src/libslic3r/PrintConfig.cpp:2648
-#: src/libslic3r/PrintConfig.cpp:2657 src/libslic3r/PrintConfig.cpp:2666
+#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/slic3r/GUI/ConfigWizard.cpp:111
+#: src/slic3r/GUI/ConfigWizard.cpp:544 src/slic3r/GUI/ConfigWizard.cpp:558
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:115
+#: src/slic3r/GUI/RammingChart.cpp:81 src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/libslic3r/PrintConfig.cpp:59 src/libslic3r/PrintConfig.cpp:66
+#: src/libslic3r/PrintConfig.cpp:75 src/libslic3r/PrintConfig.cpp:209
+#: src/libslic3r/PrintConfig.cpp:284 src/libslic3r/PrintConfig.cpp:292
+#: src/libslic3r/PrintConfig.cpp:342 src/libslic3r/PrintConfig.cpp:352
+#: src/libslic3r/PrintConfig.cpp:472 src/libslic3r/PrintConfig.cpp:483
+#: src/libslic3r/PrintConfig.cpp:501 src/libslic3r/PrintConfig.cpp:679
+#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1226
+#: src/libslic3r/PrintConfig.cpp:1244 src/libslic3r/PrintConfig.cpp:1262
+#: src/libslic3r/PrintConfig.cpp:1314 src/libslic3r/PrintConfig.cpp:1324
+#: src/libslic3r/PrintConfig.cpp:1445 src/libslic3r/PrintConfig.cpp:1453
+#: src/libslic3r/PrintConfig.cpp:1494 src/libslic3r/PrintConfig.cpp:1502
+#: src/libslic3r/PrintConfig.cpp:1512 src/libslic3r/PrintConfig.cpp:1520
+#: src/libslic3r/PrintConfig.cpp:1528 src/libslic3r/PrintConfig.cpp:1611
+#: src/libslic3r/PrintConfig.cpp:1827 src/libslic3r/PrintConfig.cpp:1897
+#: src/libslic3r/PrintConfig.cpp:1931 src/libslic3r/PrintConfig.cpp:2123
+#: src/libslic3r/PrintConfig.cpp:2130 src/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2167 src/libslic3r/PrintConfig.cpp:2177
+#: src/libslic3r/PrintConfig.cpp:2187 src/libslic3r/PrintConfig.cpp:2293
+#: src/libslic3r/PrintConfig.cpp:2368 src/libslic3r/PrintConfig.cpp:2377
+#: src/libslic3r/PrintConfig.cpp:2386 src/libslic3r/PrintConfig.cpp:2396
+#: src/libslic3r/PrintConfig.cpp:2440 src/libslic3r/PrintConfig.cpp:2450
+#: src/libslic3r/PrintConfig.cpp:2469 src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:2488 src/libslic3r/PrintConfig.cpp:2506
+#: src/libslic3r/PrintConfig.cpp:2521 src/libslic3r/PrintConfig.cpp:2532
+#: src/libslic3r/PrintConfig.cpp:2545 src/libslic3r/PrintConfig.cpp:2555
 msgid "mm"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:70 src/libslic3r/PrintConfig.cpp:676
+#: src/slic3r/GUI/BedShapeDialog.cpp:71 src/libslic3r/PrintConfig.cpp:676
 msgid "Diameter"
 msgstr "直径"
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:71
+#: src/slic3r/GUI/BedShapeDialog.cpp:72
 msgid ""
 "Diameter of the print bed. It is assumed that origin (0,0) is located in the "
 "center."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:75 src/slic3r/GUI/GUI_Preview.cpp:265
+#: src/slic3r/GUI/BedShapeDialog.cpp:76 src/slic3r/GUI/GUI_Preview.cpp:239
 #: src/libslic3r/GCode/PreviewData.cpp:175
 msgid "Custom"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:79
+#: src/slic3r/GUI/BedShapeDialog.cpp:80
 msgid "Load shape from STL..."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:125
+#: src/slic3r/GUI/BedShapeDialog.cpp:126
 msgid "Settings"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:298
+#: src/slic3r/GUI/BedShapeDialog.cpp:299
 msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:315 src/slic3r/GUI/GUI_ObjectList.cpp:835
+#: src/slic3r/GUI/BedShapeDialog.cpp:316 src/slic3r/GUI/GUI_ObjectList.cpp:1252
 msgid "Error! "
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:324
+#: src/slic3r/GUI/BedShapeDialog.cpp:325
 msgid "The selected file contains no geometry."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.cpp:328
+#: src/slic3r/GUI/BedShapeDialog.cpp:329
 msgid ""
 "The selected file contains several disjoint areas. This is not supported."
 msgstr ""
 
-#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/BedShapeDialog.hpp:44 src/slic3r/GUI/ConfigWizard.cpp:507
 msgid "Bed Shape"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:54
+#: src/slic3r/GUI/BonjourDialog.cpp:55
 msgid "Network lookup"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:67
+#: src/slic3r/GUI/BonjourDialog.cpp:72
 msgid "Address"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:68
+#: src/slic3r/GUI/BonjourDialog.cpp:73
 msgid "Hostname"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:69
+#: src/slic3r/GUI/BonjourDialog.cpp:74
 msgid "Service name"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:70
+#: src/slic3r/GUI/BonjourDialog.cpp:76
 msgid "OctoPrint version"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:188
+#: src/slic3r/GUI/BonjourDialog.cpp:218
 msgid "Searching for devices"
 msgstr ""
 
-#: src/slic3r/GUI/BonjourDialog.cpp:195
+#: src/slic3r/GUI/BonjourDialog.cpp:225
 msgid "Finished"
 msgstr ""
 
@@ -177,146 +177,164 @@ msgid ""
 "preset"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:16
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:17
 msgid "Upgrade"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:18
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:19
 msgid "Downgrade"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:20
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:21
 msgid "Before roll back"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:22
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:23
 msgid "User"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:25
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:26
 msgid "Unknown"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:37
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:38
 msgid "Active: "
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:43
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44
 msgid "slic3r version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:44 src/slic3r/GUI/Preset.cpp:1156
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45 src/slic3r/GUI/Preset.cpp:1250
 msgid "print"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:45
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46
 msgid "filaments"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:46 src/slic3r/GUI/Preset.cpp:1160
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:47 src/slic3r/GUI/Preset.cpp:1254
 msgid "printer"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50 src/slic3r/GUI/Tab.cpp:838
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51 src/slic3r/GUI/Tab.cpp:872
 msgid "vendor"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:50
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
 msgid "version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:51
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:52
 msgid "min slic3r version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:53
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:54
 msgid "max slic3r version"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57
 msgid "model"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:56
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:57
 msgid "variants"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:68
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:69
 msgid "Incompatible with this Slic3r"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:71
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:72
 msgid "Activate"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:97
+#: src/slic3r/GUI/ConfigSnapshotDialog.cpp:98
 msgid "Configuration Snapshots"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:92
+#: src/slic3r/GUI/ConfigWizard.cpp:111
 msgid "nozzle"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:93
-msgid "default"
+#: src/slic3r/GUI/ConfigWizard.cpp:115
+msgid "Alternate nozzles:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:116
-msgid "Select all"
+#: src/slic3r/GUI/ConfigWizard.cpp:181
+msgid "All standard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:117
-msgid "Select none"
+#: src/slic3r/GUI/ConfigWizard.cpp:182 src/slic3r/GUI/Tab.cpp:2909
+msgid "All"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:183 src/slic3r/GUI/Plater.cpp:414
+#: src/libslic3r/GCode/PreviewData.cpp:162
+msgid "None"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:284
 #, c-format
 msgid "Welcome to the Slic3r %s"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:226
+#: src/slic3r/GUI/ConfigWizard.cpp:284
 msgid "Welcome"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:232 src/slic3r/GUI/GUI_App.cpp:606
+#: src/slic3r/GUI/ConfigWizard.cpp:288 src/slic3r/GUI/GUI_App.cpp:600
 #, c-format
 msgid "Run %s"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:234
+#: src/slic3r/GUI/ConfigWizard.cpp:290
 #, c-format
 msgid ""
 "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial "
 "configuration; just a few settings and you will be ready to print."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:238
+#: src/slic3r/GUI/ConfigWizard.cpp:294
 msgid ""
 "Remove user profiles - install from scratch (a snapshot will be taken "
 "beforehand)"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:263
-msgid "Other vendors"
+#: src/slic3r/GUI/ConfigWizard.cpp:325
+#, c-format
+msgid "%s Family"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:265
-msgid "Custom setup"
+#: src/slic3r/GUI/ConfigWizard.cpp:362
+msgid "Custom Printer Setup"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:362
+msgid "Custom Printer"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:364
+msgid "Define a custom printer profile"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:366
+msgid "Custom profile name:"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:390
 msgid "Automatic updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:289
+#: src/slic3r/GUI/ConfigWizard.cpp:390
 msgid "Updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:297 src/slic3r/GUI/Preferences.cpp:59
+#: src/slic3r/GUI/ConfigWizard.cpp:398 src/slic3r/GUI/Preferences.cpp:59
 msgid "Check for application updates"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:300 src/slic3r/GUI/Preferences.cpp:61
+#: src/slic3r/GUI/ConfigWizard.cpp:401 src/slic3r/GUI/Preferences.cpp:61
 msgid ""
 "If enabled, Slic3r checks for new versions of Slic3r PE online. When a new "
 "version becomes available a notification is displayed at the next "
@@ -324,11 +342,11 @@ msgid ""
 "notification mechanisms, no automatic installation is done."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:304 src/slic3r/GUI/Preferences.cpp:67
+#: src/slic3r/GUI/ConfigWizard.cpp:405 src/slic3r/GUI/Preferences.cpp:67
 msgid "Update built-in Presets automatically"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:307 src/slic3r/GUI/Preferences.cpp:69
+#: src/slic3r/GUI/ConfigWizard.cpp:408 src/slic3r/GUI/Preferences.cpp:69
 msgid ""
 "If enabled, Slic3r downloads updates of built-in system presets in the "
 "background. These updates are downloaded into a separate temporary location. "
@@ -336,168 +354,184 @@ msgid ""
 "startup."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:308
+#: src/slic3r/GUI/ConfigWizard.cpp:409
 msgid ""
 "Updates are never applied without user's consent and never overwrite user's "
 "customized settings."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:313
+#: src/slic3r/GUI/ConfigWizard.cpp:414
 msgid ""
 "Additionally a backup snapshot of the whole configuration is created before "
 "an update is applied."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:320
+#: src/slic3r/GUI/ConfigWizard.cpp:421
 msgid "Other Vendors"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:322
+#: src/slic3r/GUI/ConfigWizard.cpp:423
 msgid "Pick another vendor supported by Slic3r PE:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381
+#: src/slic3r/GUI/ConfigWizard.cpp:469
 msgid "Firmware Type"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:381 src/slic3r/GUI/Tab.cpp:1820
+#: src/slic3r/GUI/ConfigWizard.cpp:469 src/slic3r/GUI/Tab.cpp:1870
 msgid "Firmware"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:385
+#: src/slic3r/GUI/ConfigWizard.cpp:473
 msgid "Choose the type of firmware used by your printer."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:419
+#: src/slic3r/GUI/ConfigWizard.cpp:507
 msgid "Bed Shape and Size"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:422
+#: src/slic3r/GUI/ConfigWizard.cpp:510
 msgid "Set the shape of your printer's bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:524
 msgid "Filament and Nozzle Diameters"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:436
+#: src/slic3r/GUI/ConfigWizard.cpp:524
 msgid "Print Diameters"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:452
+#: src/slic3r/GUI/ConfigWizard.cpp:540
 msgid "Enter the diameter of your printer's hot end nozzle."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:455
+#: src/slic3r/GUI/ConfigWizard.cpp:543
 msgid "Nozzle Diameter:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:465
+#: src/slic3r/GUI/ConfigWizard.cpp:553
 msgid "Enter the diameter of your filament."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:466
+#: src/slic3r/GUI/ConfigWizard.cpp:554
 msgid ""
 "Good precision is required, so use a caliper and do multiple measurements "
 "along the filament, then compute the average."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:469
+#: src/slic3r/GUI/ConfigWizard.cpp:557
 msgid "Filament Diameter:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:575
 msgid "Extruder and Bed Temperatures"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:487
+#: src/slic3r/GUI/ConfigWizard.cpp:575
 msgid "Temperatures"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:503
+#: src/slic3r/GUI/ConfigWizard.cpp:591
 msgid "Enter the temperature needed for extruding your filament."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:504
+#: src/slic3r/GUI/ConfigWizard.cpp:592
 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:507
+#: src/slic3r/GUI/ConfigWizard.cpp:595
 msgid "Extrusion Temperature:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:508 src/slic3r/GUI/ConfigWizard.cpp:522
+#: src/slic3r/GUI/ConfigWizard.cpp:596 src/slic3r/GUI/ConfigWizard.cpp:610
 msgid "°C"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:517
+#: src/slic3r/GUI/ConfigWizard.cpp:605
 msgid ""
 "Enter the bed temperature needed for getting your filament to stick to your "
 "heated bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:518
+#: src/slic3r/GUI/ConfigWizard.cpp:606
 msgid ""
 "A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have "
 "no heated bed."
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:521
+#: src/slic3r/GUI/ConfigWizard.cpp:609
 msgid "Bed Temperature:"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:833
+#: src/slic3r/GUI/ConfigWizard.cpp:1001
+msgid "Select all standard printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1004
 msgid "< &Back"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:834
+#: src/slic3r/GUI/ConfigWizard.cpp:1005
 msgid "&Next >"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:835
+#: src/slic3r/GUI/ConfigWizard.cpp:1006
 msgid "&Finish"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:906
+#: src/slic3r/GUI/ConfigWizard.cpp:1007 src/slic3r/GUI/FirmwareDialog.cpp:142
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:37
+#: src/slic3r/GUI/ProgressStatusBar.cpp:28
+msgid "Cancel"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1021
+msgid "Prusa FFF Technology Printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1024
+msgid "Prusa MSLA Technology Printers"
+msgstr ""
+
+#: src/slic3r/GUI/ConfigWizard.cpp:1111
 msgid "Configuration Wizard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:907
+#: src/slic3r/GUI/ConfigWizard.cpp:1112
 msgid "Configuration &Wizard"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:909
+#: src/slic3r/GUI/ConfigWizard.cpp:1114
 msgid "Configuration Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/ConfigWizard.cpp:910
+#: src/slic3r/GUI/ConfigWizard.cpp:1115
 msgid "Configuration &Assistant"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:109
+#: src/slic3r/GUI/Field.cpp:112
 msgid "default value"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:112
+#: src/slic3r/GUI/Field.cpp:115
 msgid "parameter name"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:140
+#: src/slic3r/GUI/Field.cpp:143
 #, c-format
 msgid "%s doesn't support percentage"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:148 src/slic3r/GUI/Field.cpp:168
-msgid ""
-"Input value contains incorrect symbol(s).\n"
-"Use, please, only digits"
+#: src/slic3r/GUI/Field.cpp:157 src/slic3r/GUI/Field.cpp:180
+msgid "Invalid numeric input."
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:153
+#: src/slic3r/GUI/Field.cpp:162
 msgid "Input value is out of range"
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:176
+#: src/slic3r/GUI/Field.cpp:188
 #, c-format
 msgid ""
 "Do you mean %d%% instead of %d %s?\n"
@@ -505,40 +539,35 @@ msgid ""
 "or NO if you are sure that %d %s is a correct value."
 msgstr ""
 
-#: src/slic3r/GUI/Field.cpp:179
+#: src/slic3r/GUI/Field.cpp:191
 msgid "Parameter validation"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:133
+#: src/slic3r/GUI/FirmwareDialog.cpp:141
 msgid "Flash!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:134 src/slic3r/GUI/GLGizmo.cpp:2270
-msgid "Cancel"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:135
+#: src/slic3r/GUI/FirmwareDialog.cpp:143
 msgid "Flashing in progress. Please do not disconnect the printer!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:245
+#: src/slic3r/GUI/FirmwareDialog.cpp:187
+msgid "Flashing failed: "
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:268
 msgid "Flashing succeeded!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:246
+#: src/slic3r/GUI/FirmwareDialog.cpp:269
 msgid "Flashing failed. Please see the avrdude log below."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:247
+#: src/slic3r/GUI/FirmwareDialog.cpp:270
 msgid "Flashing cancelled."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:279
-#, c-format
-msgid "Flashing failed: %s"
-msgstr ""
-
-#: src/slic3r/GUI/FirmwareDialog.cpp:293
+#: src/slic3r/GUI/FirmwareDialog.cpp:308
 #, c-format
 msgid ""
 "This firmware hex file does not match the printer model.\n"
@@ -549,215 +578,322 @@ msgid ""
 "Please only continue if you are sure this is the right thing to do."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:380 src/slic3r/GUI/FirmwareDialog.cpp:414
+#: src/slic3r/GUI/FirmwareDialog.cpp:395 src/slic3r/GUI/FirmwareDialog.cpp:431
+#, c-format
 msgid ""
-"Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at "
-"a time for flashing."
+"Multiple %s devices found. Please only connect one at a time for flashing."
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:508
-msgid "The device could not have been found"
+#: src/slic3r/GUI/FirmwareDialog.cpp:412
+#, 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 ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:581
+#: src/slic3r/GUI/FirmwareDialog.cpp:525
+#, c-format
+msgid "The %s device could not have been found"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:603
 #, c-format
 msgid "Error accessing port at %s: %s"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:690
+#: src/slic3r/GUI/FirmwareDialog.cpp:605
+#, c-format
+msgid "Error: %s"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:735
 msgid "Firmware flasher"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:712
+#: src/slic3r/GUI/FirmwareDialog.cpp:762
 msgid "Firmware image:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:716
+#: src/slic3r/GUI/FirmwareDialog.cpp:766
 msgid "Serial port:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:718
+#: src/slic3r/GUI/FirmwareDialog.cpp:768
 msgid "Autodetected"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:719
+#: src/slic3r/GUI/FirmwareDialog.cpp:769
 msgid "Rescan"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:726
+#: src/slic3r/GUI/FirmwareDialog.cpp:776
 msgid "Progress:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:729
+#: src/slic3r/GUI/FirmwareDialog.cpp:779
 msgid "Status:"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:730
+#: src/slic3r/GUI/FirmwareDialog.cpp:780
 msgid "Ready"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:750
-msgid "Advanced: avrdude output log"
+#: src/slic3r/GUI/FirmwareDialog.cpp:800
+msgid "Advanced: Output log"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:809
+#: src/slic3r/GUI/FirmwareDialog.cpp:811
+#: src/slic3r/GUI/PrintHostDialogs.cpp:161
+msgid "Close"
+msgstr ""
+
+#: src/slic3r/GUI/FirmwareDialog.cpp:859
 msgid ""
 "Are you sure you want to cancel firmware flashing?\n"
 "This could leave your printer in an unusable state!"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:810
+#: src/slic3r/GUI/FirmwareDialog.cpp:860
 msgid "Confirmation"
 msgstr ""
 
-#: src/slic3r/GUI/FirmwareDialog.cpp:813
+#: src/slic3r/GUI/FirmwareDialog.cpp:863
 msgid "Cancelling..."
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:4640
+#: src/slic3r/GUI/GLCanvas3D.cpp:709
 msgid "Detected object outside print volume"
 msgstr ""
 
-#: src/slic3r/GUI/GLCanvas3D.cpp:7962
+#: src/slic3r/GUI/GLCanvas3D.cpp:710
 msgid "Detected toolpath outside print volume"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:751 src/slic3r/GUI/GUI_ObjectManipulation.cpp:300
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:322
-#: src/libslic3r/PrintConfig.cpp:3087
-msgid "Rotate"
-msgstr "旋转"
-
-#: src/slic3r/GUI/GLGizmo.cpp:785
-msgid "Rotation (deg)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:711
+msgid "Some objects are not visible when editing supports"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:841 src/slic3r/GUI/GUI_ObjectManipulation.cpp:206
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:301
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:323
-#: src/libslic3r/PrintConfig.cpp:3111
-msgid "Scale"
-msgstr "缩放"
-
-#: src/slic3r/GUI/GLGizmo.cpp:1072
-msgid "Scale (%)"
+#: src/slic3r/GUI/GLCanvas3D.cpp:713
+msgid ""
+"Detected object outside print volume\n"
+"Resolve a clash to continue slicing/export process correctly"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:1200
-msgid "Move"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Position (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1326
-msgid "Displacement (mm)"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:1430
-msgid "Place on face"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2207
-msgid "Left mouse click - add point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2208
-msgid "Right mouse click - remove point"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2211
-msgid "Generate points automatically"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2212
-msgid "Remove all points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2245
-msgid "SLA Support Points"
-msgstr ""
-
-#: src/slic3r/GUI/GLGizmo.cpp:2268 src/slic3r/GUI/GLGizmo.cpp:2468
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:35
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:195
 msgid "Rotate lower part upwards"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2269 src/slic3r/GUI/GLGizmo.cpp:2470
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:36
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:198
 msgid "Perform cut"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2276
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:43
 msgid "Cut object:"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2356 src/slic3r/GUI/GLGizmo.cpp:2461
-#: src/libslic3r/PrintConfig.cpp:3016
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:88
+msgid "Cut [C]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:188 src/libslic3r/PrintConfig.cpp:3006
 msgid "Cut"
 msgstr "切割"
 
-#: src/slic3r/GUI/GLGizmo.cpp:2466
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:193
 msgid "Keep upper part"
 msgstr ""
 
-#: src/slic3r/GUI/GLGizmo.cpp:2467
+#: src/slic3r/GUI/Gizmos/GLGizmoCut.cpp:194
 msgid "Keep lower part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:242
-msgid "Notice"
+#: src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:32
+msgid "Place on face [F]"
 msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:248
-msgid "Attempt to free unreferenced scalar"
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:51
+msgid "Move [M]"
 msgstr ""
 
-#: src/slic3r/GUI/GUI.cpp:250 src/slic3r/GUI/WipeTowerDialog.cpp:40
-#: src/slic3r/GUI/WipeTowerDialog.cpp:322
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:176
+msgid "Position (mm)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoMove.cpp:176
+msgid "Displacement (mm)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:458
+msgid "Rotate [R]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp:491
+msgid "Rotation (deg)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:51
+msgid "Scale [S]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoScale.cpp:276
+msgid "Scale (%)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:597
+msgid "Left mouse click - add point"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:598
+msgid "Right mouse click - remove point"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:599
+msgid "Shift + Left (+ drag) - select point(s)"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:606
+msgid "Head diameter: "
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:618
+msgid "Lock supports under new islands"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:622
+msgid "Remove selected points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:626
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:679
+msgid "Remove all points"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:631
+msgid "Apply changes"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:636
+msgid "Discard changes"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:644
+msgid "Minimal points distance: "
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:655
+msgid "Support points density: "
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:669
+msgid "Auto-generate points [A]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:675
+msgid "Manual editing [M]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:738
+msgid "SLA Support Points [L]"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:767
+msgid "Do you want to save your manually edited support points ?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:768
+msgid "Save changes?"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:897
+msgid ""
+"Autogeneration will erase all manually edited points.\n"
+"\n"
+"Are you sure you want to do it?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp:899 src/slic3r/GUI/GUI.cpp:288
+#: src/slic3r/GUI/WipeTowerDialog.cpp:44 src/slic3r/GUI/WipeTowerDialog.cpp:328
 msgid "Warning"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:377
+#: src/slic3r/GUI/GUI.cpp:147 src/slic3r/GUI/Tab.cpp:2720
+msgid "It's impossible to print multi-part object(s) with SLA technology."
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:148
+msgid "Please check and fix your object list."
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:149 src/slic3r/GUI/GUI_App.cpp:679
+#: src/slic3r/GUI/Tab.cpp:2722
+msgid "Attention!"
+msgstr ""
+
+#: src/slic3r/GUI/GUI.cpp:282
+msgid "Notice"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:318
+msgid "Changing of an application language"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:326 src/slic3r/GUI/GUI_App.cpp:335
+msgid "Recreating"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:339
+msgid "Loading of a current presets"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:347
+msgid "Loading of a mode view"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:429
 msgid "Choose one file (3MF):"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:389
+#: src/slic3r/GUI/GUI_App.cpp:441
 msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:451
+#: src/slic3r/GUI/GUI_App.cpp:454
 msgid "Array of language names and identifiers should have the same size."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:461
+#: src/slic3r/GUI/GUI_App.cpp:464
 msgid "Select the language"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:461
+#: src/slic3r/GUI/GUI_App.cpp:464
 msgid "Language"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:529 src/libslic3r/PrintConfig.cpp:270
+#: src/slic3r/GUI/GUI_App.cpp:534 src/slic3r/GUI/GUI_ObjectList.cpp:1067
+#: src/libslic3r/PrintConfig.cpp:298
 msgid "Default"
 msgstr "默认"
 
-#: src/slic3r/GUI/GUI_App.cpp:609
+#: src/slic3r/GUI/GUI_App.cpp:603
 msgid "&Configuration Snapshots"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:609
+#: src/slic3r/GUI/GUI_App.cpp:603
 msgid "Inspect / activate configuration snapshots"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:610
+#: src/slic3r/GUI/GUI_App.cpp:604
 msgid "Take Configuration &Snapshot"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:610
+#: src/slic3r/GUI/GUI_App.cpp:604
 msgid "Capture a configuration snapshot"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:613
+#: src/slic3r/GUI/GUI_App.cpp:607
 msgid "&Preferences"
 msgstr ""
 
@@ -765,7 +901,7 @@ msgstr ""
 msgid "Application preferences"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:616
+#: src/slic3r/GUI/GUI_App.cpp:616 src/slic3r/GUI/wxExtensions.cpp:2446
 msgid "Simple"
 msgstr ""
 
@@ -773,12 +909,14 @@ msgstr ""
 msgid "Simple View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39
-#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962
-#: src/slic3r/GUI/Tab.cpp:1058 src/slic3r/GUI/Tab.cpp:1061
-#: src/slic3r/GUI/Tab.cpp:1425 src/slic3r/GUI/Tab.cpp:1840
-#: src/libslic3r/PrintConfig.cpp:156 src/libslic3r/PrintConfig.cpp:323
-#: src/libslic3r/PrintConfig.cpp:999 src/libslic3r/PrintConfig.cpp:2298
+#: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:73
+#: src/slic3r/GUI/Tab.cpp:977 src/slic3r/GUI/Tab.cpp:992
+#: src/slic3r/GUI/Tab.cpp:1090 src/slic3r/GUI/Tab.cpp:1093
+#: src/slic3r/GUI/Tab.cpp:1466 src/slic3r/GUI/Tab.cpp:1890
+#: src/slic3r/GUI/Tab.cpp:3347 src/slic3r/GUI/wxExtensions.cpp:2447
+#: src/libslic3r/PrintConfig.cpp:72 src/libslic3r/PrintConfig.cpp:186
+#: src/libslic3r/PrintConfig.cpp:349 src/libslic3r/PrintConfig.cpp:987
+#: src/libslic3r/PrintConfig.cpp:2173
 msgid "Advanced"
 msgstr "高级"
 
@@ -786,7 +924,7 @@ msgstr "高级"
 msgid "Advanced View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:618
+#: src/slic3r/GUI/GUI_App.cpp:618 src/slic3r/GUI/wxExtensions.cpp:2448
 msgid "Expert"
 msgstr ""
 
@@ -794,572 +932,711 @@ msgstr ""
 msgid "Expert View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:620
+#: src/slic3r/GUI/GUI_App.cpp:623
 msgid "Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:620
+#: src/slic3r/GUI/GUI_App.cpp:623
 msgid "Slic3r View Mode"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:622
+#: src/slic3r/GUI/GUI_App.cpp:625
 msgid "Change Application &Language"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:624
+#: src/slic3r/GUI/GUI_App.cpp:627
 msgid "Flash printer &firmware"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:624
+#: src/slic3r/GUI/GUI_App.cpp:627
 msgid "Upload a firmware image into an Arduino based printer"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:636
+#: src/slic3r/GUI/GUI_App.cpp:639
 msgid "Taking configuration snapshot"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:636
+#: src/slic3r/GUI/GUI_App.cpp:639
 msgid "Snapshot name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:674
-msgid "Application will be restarted"
+#: src/slic3r/GUI/GUI_App.cpp:676
+msgid "Application will be restarted after language change."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:674 src/slic3r/GUI/Tab.cpp:2606
-msgid "Attention!"
+#: src/slic3r/GUI/GUI_App.cpp:677
+msgid "3D-Scene will be cleaned."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:691
+#: src/slic3r/GUI/GUI_App.cpp:678
+msgid "Please, check your changes before."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_App.cpp:706
 msgid "&Configuration"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:711
+#: src/slic3r/GUI/GUI_App.cpp:726
 msgid "You have unsaved changes "
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:711
+#: src/slic3r/GUI/GUI_App.cpp:726
 msgid ". Discard changes and continue anyway?"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_App.cpp:712
+#: src/slic3r/GUI/GUI_App.cpp:727
 msgid "Unsaved Presets"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:31 src/libslic3r/PrintConfig.cpp:47
-#: src/libslic3r/PrintConfig.cpp:115 src/libslic3r/PrintConfig.cpp:357
-#: src/libslic3r/PrintConfig.cpp:410 src/libslic3r/PrintConfig.cpp:419
-#: src/libslic3r/PrintConfig.cpp:849 src/libslic3r/PrintConfig.cpp:1037
-#: src/libslic3r/PrintConfig.cpp:1354 src/libslic3r/PrintConfig.cpp:1426
-#: src/libslic3r/PrintConfig.cpp:1618 src/libslic3r/PrintConfig.cpp:2091
-#: src/libslic3r/PrintConfig.cpp:2150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:28 src/slic3r/GUI/GUI_ObjectList.cpp:65
+#: src/libslic3r/PrintConfig.cpp:56 src/libslic3r/PrintConfig.cpp:149
+#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:437
+#: src/libslic3r/PrintConfig.cpp:445 src/libslic3r/PrintConfig.cpp:841
+#: src/libslic3r/PrintConfig.cpp:1025 src/libslic3r/PrintConfig.cpp:1304
+#: src/libslic3r/PrintConfig.cpp:1370 src/libslic3r/PrintConfig.cpp:1551
+#: src/libslic3r/PrintConfig.cpp:1986 src/libslic3r/PrintConfig.cpp:2042
 msgid "Layers and Perimeters"
 msgstr "层和轮廓"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:32 src/slic3r/GUI/Tab.cpp:952
-#: src/slic3r/GUI/Tab.cpp:953 src/slic3r/GUI/Tab.cpp:1274
-#: src/libslic3r/PrintConfig.cpp:134 src/libslic3r/PrintConfig.cpp:366
-#: src/libslic3r/PrintConfig.cpp:730 src/libslic3r/PrintConfig.cpp:745
-#: src/libslic3r/PrintConfig.cpp:783 src/libslic3r/PrintConfig.cpp:938
-#: src/libslic3r/PrintConfig.cpp:949 src/libslic3r/PrintConfig.cpp:969
-#: src/libslic3r/PrintConfig.cpp:989 src/libslic3r/PrintConfig.cpp:1010
-#: src/libslic3r/PrintConfig.cpp:1733 src/libslic3r/PrintConfig.cpp:1752
+#: src/slic3r/GUI/GUI_ObjectList.cpp:29 src/slic3r/GUI/GUI_ObjectList.cpp:66
+#: src/slic3r/GUI/Plater.cpp:431 src/slic3r/GUI/Tab.cpp:981
+#: src/slic3r/GUI/Tab.cpp:982 src/slic3r/GUI/Tab.cpp:1311
+#: src/libslic3r/PrintConfig.cpp:166 src/libslic3r/PrintConfig.cpp:388
+#: src/libslic3r/PrintConfig.cpp:728 src/libslic3r/PrintConfig.cpp:742
+#: src/libslic3r/PrintConfig.cpp:779 src/libslic3r/PrintConfig.cpp:932
+#: src/libslic3r/PrintConfig.cpp:942 src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:978 src/libslic3r/PrintConfig.cpp:997
+#: src/libslic3r/PrintConfig.cpp:1658 src/libslic3r/PrintConfig.cpp:1675
 msgid "Infill"
 msgstr "å¡«å……"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_Preview.cpp:262
-#: src/slic3r/GUI/Tab.cpp:980 src/slic3r/GUI/Tab.cpp:981
-#: src/libslic3r/PrintConfig.cpp:305 src/libslic3r/PrintConfig.cpp:1484
-#: src/libslic3r/PrintConfig.cpp:1865 src/libslic3r/PrintConfig.cpp:1872
-#: src/libslic3r/PrintConfig.cpp:1881 src/libslic3r/PrintConfig.cpp:1894
-#: src/libslic3r/PrintConfig.cpp:1905 src/libslic3r/PrintConfig.cpp:1914
-#: src/libslic3r/PrintConfig.cpp:1930 src/libslic3r/PrintConfig.cpp:1953
-#: src/libslic3r/PrintConfig.cpp:1965 src/libslic3r/PrintConfig.cpp:1983
-#: src/libslic3r/PrintConfig.cpp:1993 src/libslic3r/PrintConfig.cpp:2003
-#: src/libslic3r/PrintConfig.cpp:2014 src/libslic3r/PrintConfig.cpp:2029
-#: src/libslic3r/PrintConfig.cpp:2038 src/libslic3r/PrintConfig.cpp:2039
-#: src/libslic3r/PrintConfig.cpp:2048 src/libslic3r/PrintConfig.cpp:2057
-#: src/libslic3r/PrintConfig.cpp:2072 src/libslic3r/GCode/PreviewData.cpp:172
+#: src/slic3r/GUI/GUI_ObjectList.cpp:30 src/slic3r/GUI/GUI_ObjectList.cpp:67
+#: src/slic3r/GUI/GUI_Preview.cpp:236 src/slic3r/GUI/Tab.cpp:1010
+#: src/slic3r/GUI/Tab.cpp:1011 src/libslic3r/PrintConfig.cpp:333
+#: src/libslic3r/PrintConfig.cpp:1431 src/libslic3r/PrintConfig.cpp:1779
+#: src/libslic3r/PrintConfig.cpp:1785 src/libslic3r/PrintConfig.cpp:1793
+#: src/libslic3r/PrintConfig.cpp:1805 src/libslic3r/PrintConfig.cpp:1815
+#: src/libslic3r/PrintConfig.cpp:1823 src/libslic3r/PrintConfig.cpp:1838
+#: src/libslic3r/PrintConfig.cpp:1859 src/libslic3r/PrintConfig.cpp:1870
+#: src/libslic3r/PrintConfig.cpp:1886 src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1904 src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:1929 src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1938 src/libslic3r/PrintConfig.cpp:1947
+#: src/libslic3r/PrintConfig.cpp:1955 src/libslic3r/PrintConfig.cpp:1969
+#: src/libslic3r/GCode/PreviewData.cpp:172
 msgid "Support material"
 msgstr "支撑�料"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:34 src/slic3r/GUI/GUI_Preview.cpp:241
-#: src/slic3r/GUI/Tab.cpp:1005 src/libslic3r/PrintConfig.cpp:169
-#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:881
-#: src/libslic3r/PrintConfig.cpp:1011 src/libslic3r/PrintConfig.cpp:1416
-#: src/libslic3r/PrintConfig.cpp:1668 src/libslic3r/PrintConfig.cpp:1721
-#: src/libslic3r/PrintConfig.cpp:1776 src/libslic3r/PrintConfig.cpp:2136
-msgid "Speed"
-msgstr "速度"
-
-#: src/slic3r/GUI/GUI_ObjectList.cpp:35 src/slic3r/GUI/Tab.cpp:1038
-#: src/slic3r/GUI/Tab.cpp:1744 src/libslic3r/PrintConfig.cpp:430
-#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1393
-#: src/libslic3r/PrintConfig.cpp:1743 src/libslic3r/PrintConfig.cpp:1944
-#: src/libslic3r/PrintConfig.cpp:1973 src/libslic3r/PrintConfig.cpp:2271
-#: src/libslic3r/PrintConfig.cpp:2280
+#: src/slic3r/GUI/GUI_ObjectList.cpp:33 src/slic3r/GUI/GUI_ObjectList.cpp:69
+#: src/slic3r/GUI/Tab.cpp:1070 src/slic3r/GUI/Tab.cpp:1794
+#: src/libslic3r/PrintConfig.cpp:455 src/libslic3r/PrintConfig.cpp:953
+#: src/libslic3r/PrintConfig.cpp:1339 src/libslic3r/PrintConfig.cpp:1667
+#: src/libslic3r/PrintConfig.cpp:1851 src/libslic3r/PrintConfig.cpp:1877
+#: src/libslic3r/PrintConfig.cpp:2149 src/libslic3r/PrintConfig.cpp:2157
 msgid "Extruders"
 msgstr "挤出头"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:36 src/libslic3r/PrintConfig.cpp:387
-#: src/libslic3r/PrintConfig.cpp:504 src/libslic3r/PrintConfig.cpp:836
-#: src/libslic3r/PrintConfig.cpp:970 src/libslic3r/PrintConfig.cpp:1403
-#: src/libslic3r/PrintConfig.cpp:1765 src/libslic3r/PrintConfig.cpp:1954
-#: src/libslic3r/PrintConfig.cpp:2124
+#: src/slic3r/GUI/GUI_ObjectList.cpp:39
+msgid "Pad and Support"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:68 src/slic3r/GUI/GUI_Preview.cpp:215
+#: src/slic3r/GUI/Tab.cpp:1035 src/libslic3r/PrintConfig.cpp:198
+#: src/libslic3r/PrintConfig.cpp:425 src/libslic3r/PrintConfig.cpp:870
+#: src/libslic3r/PrintConfig.cpp:998 src/libslic3r/PrintConfig.cpp:1360
+#: src/libslic3r/PrintConfig.cpp:1597 src/libslic3r/PrintConfig.cpp:1646
+#: src/libslic3r/PrintConfig.cpp:1697 src/libslic3r/PrintConfig.cpp:2028
+msgid "Speed"
+msgstr "速度"
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:70 src/libslic3r/PrintConfig.cpp:415
+#: src/libslic3r/PrintConfig.cpp:522 src/libslic3r/PrintConfig.cpp:829
+#: src/libslic3r/PrintConfig.cpp:961 src/libslic3r/PrintConfig.cpp:1348
+#: src/libslic3r/PrintConfig.cpp:1687 src/libslic3r/PrintConfig.cpp:1860
+#: src/libslic3r/PrintConfig.cpp:2017
 msgid "Extrusion Width"
 msgstr "挤出宽度"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:41 src/slic3r/GUI/Tab.cpp:3179
-#: src/slic3r/GUI/Tab.cpp:3180 src/libslic3r/PrintConfig.cpp:2488
-#: src/libslic3r/PrintConfig.cpp:2495 src/libslic3r/PrintConfig.cpp:2504
-#: src/libslic3r/PrintConfig.cpp:2513 src/libslic3r/PrintConfig.cpp:2522
-#: src/libslic3r/PrintConfig.cpp:2547 src/libslic3r/PrintConfig.cpp:2558
-#: src/libslic3r/PrintConfig.cpp:2567 src/libslic3r/PrintConfig.cpp:2576
-#: src/libslic3r/PrintConfig.cpp:2585 src/libslic3r/PrintConfig.cpp:2594
-#: src/libslic3r/PrintConfig.cpp:2603 src/libslic3r/PrintConfig.cpp:2612
-#: src/libslic3r/PrintConfig.cpp:2621
+#: src/slic3r/GUI/GUI_ObjectList.cpp:75 src/slic3r/GUI/Plater.cpp:410
+#: src/slic3r/GUI/Tab.cpp:3309 src/slic3r/GUI/Tab.cpp:3310
+#: src/libslic3r/PrintConfig.cpp:2359 src/libslic3r/PrintConfig.cpp:2366
+#: src/libslic3r/PrintConfig.cpp:2375 src/libslic3r/PrintConfig.cpp:2384
+#: src/libslic3r/PrintConfig.cpp:2394 src/libslic3r/PrintConfig.cpp:2420
+#: src/libslic3r/PrintConfig.cpp:2427 src/libslic3r/PrintConfig.cpp:2438
+#: src/libslic3r/PrintConfig.cpp:2448 src/libslic3r/PrintConfig.cpp:2457
+#: src/libslic3r/PrintConfig.cpp:2467 src/libslic3r/PrintConfig.cpp:2476
+#: src/libslic3r/PrintConfig.cpp:2486 src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2504
 msgid "Supports"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:42 src/slic3r/GUI/Tab.cpp:3205
-#: src/slic3r/GUI/Tab.cpp:3206 src/libslic3r/PrintConfig.cpp:2630
-#: src/libslic3r/PrintConfig.cpp:2637 src/libslic3r/PrintConfig.cpp:2646
-#: src/libslic3r/PrintConfig.cpp:2655 src/libslic3r/PrintConfig.cpp:2664
+#: src/slic3r/GUI/GUI_ObjectList.cpp:76 src/slic3r/GUI/Tab.cpp:3337
+#: src/slic3r/GUI/Tab.cpp:3338 src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2519 src/libslic3r/PrintConfig.cpp:2530
+#: src/libslic3r/PrintConfig.cpp:2540 src/libslic3r/PrintConfig.cpp:2553
+#: src/libslic3r/PrintConfig.cpp:2562
 msgid "Pad"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:115
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:129
+#: src/slic3r/GUI/GUI_ObjectList.cpp:173
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:45
 msgid "Name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:134
+#: src/slic3r/GUI/GUI_ObjectList.cpp:201
 msgid "Right button click the icon to change the object settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:142
+#: src/slic3r/GUI/GUI_ObjectList.cpp:209
 #, c-format
 msgid "Auto-repaired (%d errors):\n"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:145
+#: src/slic3r/GUI/GUI_ObjectList.cpp:212
 msgid "degenerate facets"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:146
+#: src/slic3r/GUI/GUI_ObjectList.cpp:213
 msgid "edges fixed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:147
+#: src/slic3r/GUI/GUI_ObjectList.cpp:214
 msgid "facets removed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:148
+#: src/slic3r/GUI/GUI_ObjectList.cpp:215
 msgid "facets added"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:216
 msgid "facets reversed"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:150
+#: src/slic3r/GUI/GUI_ObjectList.cpp:217
 msgid "backwards edges"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:164
+#: src/slic3r/GUI/GUI_ObjectList.cpp:231
 msgid "Right button click the icon to fix STL through Netfabb"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:196 src/slic3r/GUI/Tab.cpp:1389
-#: src/libslic3r/PrintConfig.cpp:429
+#: src/slic3r/GUI/GUI_ObjectList.cpp:278 src/slic3r/GUI/Tab.cpp:1430
+#: src/libslic3r/PrintConfig.cpp:454
 msgid "Extruder"
 msgstr "挤出头"
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:615
+#: src/slic3r/GUI/GUI_ObjectList.cpp:683 src/slic3r/GUI/GUI_ObjectList.cpp:963
+#: src/slic3r/GUI/GUI_ObjectList.cpp:969 src/slic3r/GUI/GUI_ObjectList.cpp:1199
+#, c-format
+msgid "Quick Add Settings (%s)"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:746
 msgid "Select showing settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:874
 msgid "Load"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659 src/slic3r/GUI/GUI_ObjectList.cpp:688
-#: src/slic3r/GUI/GUI_ObjectList.cpp:691
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879 src/slic3r/GUI/GUI_ObjectList.cpp:911
+#: src/slic3r/GUI/GUI_ObjectList.cpp:914
 msgid "Box"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Cylinder"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Sphere"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:659
+#: src/slic3r/GUI/GUI_ObjectList.cpp:879
 msgid "Slab"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:671 src/slic3r/GUI/GUI_ObjectList.cpp:685
+#: src/slic3r/GUI/GUI_ObjectList.cpp:890 src/slic3r/GUI/GUI_ObjectList.cpp:906
 msgid "Add part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:672
+#: src/slic3r/GUI/GUI_ObjectList.cpp:891
 msgid "Add modifier"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:673 src/slic3r/GUI/GUI_ObjectList.cpp:687
+#: src/slic3r/GUI/GUI_ObjectList.cpp:892 src/slic3r/GUI/GUI_ObjectList.cpp:910
 msgid "Add support enforcer"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:674 src/slic3r/GUI/GUI_ObjectList.cpp:690
+#: src/slic3r/GUI/GUI_ObjectList.cpp:893 src/slic3r/GUI/GUI_ObjectList.cpp:913
 msgid "Add support blocker"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:711
+#: src/slic3r/GUI/GUI_ObjectList.cpp:934
 msgid "Split to parts"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:725
+#: src/slic3r/GUI/GUI_ObjectList.cpp:942
 msgid "Add settings"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:739
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
 msgid "Change type"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1009
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1016
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1153
+msgid "Set as a Separated Object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1024
+msgid "Rename"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1034
+msgid "Fix through the Netfabb"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1041 src/slic3r/GUI/Plater.cpp:2861
+msgid "Export as STL"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1048
+msgid "Change extruder"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1073
+msgid "Select new extruder for the object/part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1079 src/slic3r/GUI/Plater.cpp:2825
+#: src/slic3r/GUI/Plater.cpp:2843 src/slic3r/GUI/Tab.cpp:2860
+msgid "Delete"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1153
+msgid "Set as a Separated Objects"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1374
+msgid "Generic"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1516
 msgid "You can't delete the last solid part from object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1017
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1533
 msgid "You can't delete the last intance from object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1044 src/slic3r/GUI/Plater.cpp:1825
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1560 src/slic3r/GUI/Plater.cpp:2219
 msgid ""
 "The selected object couldn't be split because it contains only one part."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1138
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1676
 msgid "Group manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1149
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1688
 msgid "Object manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1159
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1698
 msgid "Object Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1163
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1702
 msgid "Part Settings to modify"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1173
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1711
 msgid "Part manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1180
+#: src/slic3r/GUI/GUI_ObjectList.cpp:1717
 msgid "Instance manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1655
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2240
+msgid "Object or Instance"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2240
+msgid "Part"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2242
+msgid "Unsupported selection"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2243
+#, c-format
+msgid "You started your selection with %s Item."
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2244
+#, c-format
+msgid "In this mode you can select only other %s Items%s"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2247
+msgid "of a current Object"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2252
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2325 src/slic3r/GUI/Plater.cpp:117
+msgid "Info"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2366
 msgid "You can't change a type of the last solid part of the object."
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1662
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2373
 msgid "Select type of part"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1744 src/slic3r/GUI/Tab.cpp:3070
-#: src/slic3r/GUI/Tab.cpp:3074
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
+msgid "Enter new name"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2538
+msgid "Renaming"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2554
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2632 src/slic3r/GUI/Tab.cpp:3191
+#: src/slic3r/GUI/Tab.cpp:3195
 msgid "The supplied name is not valid;"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectList.cpp:1745 src/slic3r/GUI/Tab.cpp:3071
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2555
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2633 src/slic3r/GUI/Tab.cpp:3192
 msgid "the following characters are not allowed:"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:21
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2653
+msgid "Set extruder for selected items"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2654
+msgid "Select extruder number for selected objects and/or parts"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2667
+msgid "Select extruder number:"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectList.cpp:2668
+msgid "This extruder will be set for selected items"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:25
 msgid "Object Manipulation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:132
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:47
 msgid "Object name"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:252
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:115
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:160
 msgid "Position"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:205
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:253
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:116
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:161
 msgid "Rotation"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:254
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:117
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:201
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:221
+#: src/libslic3r/PrintConfig.cpp:3070
+msgid "Scale"
+msgstr "缩放"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:162
 msgid "Scale factors"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:321
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:200
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:220
+#: src/libslic3r/PrintConfig.cpp:3055
+msgid "Rotate"
+msgstr "旋转"
+
+#: src/slic3r/GUI/GUI_ObjectManipulation.cpp:219
 msgid "Translate"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:235
+#: src/slic3r/GUI/GUI_ObjectSettings.cpp:58
+msgid "Additional Settings"
+msgstr ""
+
+#: src/slic3r/GUI/GUI_Preview.cpp:209
 msgid "View"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:212 src/slic3r/GUI/GUI_Preview.cpp:525
 #: src/libslic3r/GCode/PreviewData.cpp:394
 msgid "Feature type"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:239 src/libslic3r/PrintConfig.cpp:443
+#: src/slic3r/GUI/GUI_Preview.cpp:213 src/libslic3r/PrintConfig.cpp:467
 msgid "Height"
 msgstr "高度"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:240 src/libslic3r/PrintConfig.cpp:2255
+#: src/slic3r/GUI/GUI_Preview.cpp:214 src/libslic3r/PrintConfig.cpp:2135
 msgid "Width"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:242
+#: src/slic3r/GUI/GUI_Preview.cpp:216
 msgid "Volumetric flow rate"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:243 src/slic3r/GUI/GUI_Preview.cpp:347
-#: src/slic3r/GUI/GUI_Preview.cpp:496 src/slic3r/GUI/GUI_Preview.cpp:718
-#: src/libslic3r/GCode/PreviewData.cpp:404
+#: src/slic3r/GUI/GUI_Preview.cpp:217 src/slic3r/GUI/GUI_Preview.cpp:315
+#: src/slic3r/GUI/GUI_Preview.cpp:469 src/slic3r/GUI/GUI_Preview.cpp:525
+#: src/slic3r/GUI/GUI_Preview.cpp:701 src/libslic3r/GCode/PreviewData.cpp:404
 msgid "Tool"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:244 src/slic3r/GUI/GUI_Preview.cpp:550
+#: src/slic3r/GUI/GUI_Preview.cpp:218 src/slic3r/GUI/GUI_Preview.cpp:523
 #: src/libslic3r/GCode/PreviewData.cpp:406
 msgid "Color Print"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:247
+#: src/slic3r/GUI/GUI_Preview.cpp:221
 msgid "Show"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:250 src/slic3r/GUI/GUI_Preview.cpp:251
+#: src/slic3r/GUI/GUI_Preview.cpp:224 src/slic3r/GUI/GUI_Preview.cpp:225
 msgid "Feature types"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:253 src/libslic3r/GCode/PreviewData.cpp:163
+#: src/slic3r/GUI/GUI_Preview.cpp:227 src/libslic3r/GCode/PreviewData.cpp:163
 msgid "Perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:254 src/libslic3r/GCode/PreviewData.cpp:164
+#: src/slic3r/GUI/GUI_Preview.cpp:228 src/libslic3r/GCode/PreviewData.cpp:164
 msgid "External perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:255 src/libslic3r/GCode/PreviewData.cpp:165
+#: src/slic3r/GUI/GUI_Preview.cpp:229 src/libslic3r/GCode/PreviewData.cpp:165
 msgid "Overhang perimeter"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:256 src/libslic3r/GCode/PreviewData.cpp:166
+#: src/slic3r/GUI/GUI_Preview.cpp:230 src/libslic3r/GCode/PreviewData.cpp:166
 msgid "Internal infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:257 src/libslic3r/PrintConfig.cpp:1764
-#: src/libslic3r/PrintConfig.cpp:1775 src/libslic3r/GCode/PreviewData.cpp:167
+#: src/slic3r/GUI/GUI_Preview.cpp:231 src/libslic3r/PrintConfig.cpp:1686
+#: src/libslic3r/PrintConfig.cpp:1696 src/libslic3r/GCode/PreviewData.cpp:167
 msgid "Solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:258 src/libslic3r/PrintConfig.cpp:2123
-#: src/libslic3r/PrintConfig.cpp:2135 src/libslic3r/GCode/PreviewData.cpp:168
+#: src/slic3r/GUI/GUI_Preview.cpp:232 src/libslic3r/PrintConfig.cpp:2016
+#: src/libslic3r/PrintConfig.cpp:2027 src/libslic3r/GCode/PreviewData.cpp:168
 msgid "Top solid infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:259 src/libslic3r/GCode/PreviewData.cpp:169
+#: src/slic3r/GUI/GUI_Preview.cpp:233 src/libslic3r/GCode/PreviewData.cpp:169
 msgid "Bridge infill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:260 src/libslic3r/PrintConfig.cpp:880
+#: src/slic3r/GUI/GUI_Preview.cpp:234 src/libslic3r/PrintConfig.cpp:869
 #: src/libslic3r/GCode/PreviewData.cpp:170
 msgid "Gap fill"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:261 src/slic3r/GUI/Tab.cpp:971
+#: src/slic3r/GUI/GUI_Preview.cpp:235 src/slic3r/GUI/Tab.cpp:1001
 #: src/libslic3r/GCode/PreviewData.cpp:171
 msgid "Skirt"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:263 src/libslic3r/PrintConfig.cpp:2002
+#: src/slic3r/GUI/GUI_Preview.cpp:237 src/libslic3r/PrintConfig.cpp:1903
 #: src/libslic3r/GCode/PreviewData.cpp:173
 msgid "Support material interface"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:264 src/slic3r/GUI/Tab.cpp:1049
+#: src/slic3r/GUI/GUI_Preview.cpp:238 src/slic3r/GUI/Tab.cpp:1081
 #: src/libslic3r/GCode/PreviewData.cpp:174
 msgid "Wipe tower"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:269 src/libslic3r/PrintConfig.cpp:2158
+#: src/slic3r/GUI/GUI_Preview.cpp:243 src/libslic3r/PrintConfig.cpp:2049
 msgid "Travel"
 msgstr "空程"
 
-#: src/slic3r/GUI/GUI_Preview.cpp:270
+#: src/slic3r/GUI/GUI_Preview.cpp:244
 msgid "Retractions"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:271
+#: src/slic3r/GUI/GUI_Preview.cpp:245
 msgid "Unretractions"
 msgstr ""
 
-#: src/slic3r/GUI/GUI_Preview.cpp:272
+#: src/slic3r/GUI/GUI_Preview.cpp:246
 msgid "Shells"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:12
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:13
 msgid "Slic3r Prusa Edition - Keyboard Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:47
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:126
-msgid "Main Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:100
 msgid "Open project STL/OBJ/AMF/3MF with config, delete bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:101
 msgid "Import STL/OBJ/AMF/3MF without config, keep bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:103
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:102
 msgid "Load Config from .ini/amf/3mf/gcode"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:104 src/slic3r/GUI/Plater.cpp:605
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:103 src/slic3r/GUI/Plater.cpp:725
+#: src/slic3r/GUI/Plater.cpp:3673 src/libslic3r/PrintConfig.cpp:2957
 msgid "Export G-code"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:104
 msgid "Save project (3MF)"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:105
 msgid "Load Config from .ini/amf/3mf/gcode and merge"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:106
 msgid "(Re)slice"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:108
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:107
 msgid "Quick slice"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:109 src/slic3r/GUI/MainFrame.cpp:289
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:108 src/slic3r/GUI/MainFrame.cpp:326
 msgid "Repeat last quick slice"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:109
 msgid "Select Plater Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:110
 msgid "Quick slice and Save as"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:111
 msgid "Select Print Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:112
 msgid "Select Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:113
 msgid "Select Printer Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:114
 msgid "Switch to 3D"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:116
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:115
 msgid "Switch to Preview"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:117 src/slic3r/GUI/Preferences.cpp:10
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:116 src/slic3r/GUI/Preferences.cpp:10
 msgid "Preferences"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
-#: src/slic3r/GUI/PrintHostDialogs.cpp:89
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:117
+#: src/slic3r/GUI/PrintHostDialogs.cpp:134
 msgid "Print host upload queue"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:118
 msgid "Camera view "
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:119
 msgid "Add Instance to selected object "
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:120
 msgid "Remove Instance from selected object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:121
 msgid "Show keyboard shortcuts list"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:123
-msgid "Switch between 3D and Preview"
-msgstr ""
-
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:122
 msgid "Select multiple object/Move multiple object"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:124
+msgid "Main Shortcuts"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:130
 msgid "Arrange"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:131
 msgid "Select All objects"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:132
 msgid "Delete selected"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:133
 msgid "Delete All"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:134
 msgid "Gizmo move"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:135
 msgid "Gizmo scale"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:136
 msgid "Gizmo rotate"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:137
 msgid "Gizmo cut"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:138
 msgid "Gizmo Place face on bed"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:139
 msgid "Gizmo SLA support points"
 msgstr ""
 
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:140
+#, no-c-format
+msgid ""
+"Press to snap by 5% in Gizmo scale\n"
+"or by 1mm in Gizmo move"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:141
+msgid ""
+"Press to scale or rotate selected objects\n"
+"around their own center"
+msgstr ""
+
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:142
 msgid "Zoom to Bed"
 msgstr ""
@@ -1388,919 +1665,1005 @@ msgstr ""
 msgid "Plater Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
 msgid "Arrow Up"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:155
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:164
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:166
 msgid "Upper Layer"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
 msgid "Arrow Down"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:156
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:165
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:167
 msgid "Lower Layer"
 msgstr ""
 
-#: src/slic3r/GUI/KBShortcutsDialog.cpp:158
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:169
 msgid "Preview Shortcuts"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:53
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:175
+msgid "Move current slider thump Up"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:176
+msgid "Move current slider thump Down"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+msgid "Arrow Left"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:177
+msgid "Set upper thumb to current slider thumb"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+msgid "Arrow Right"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:178
+msgid "Set lower thumb to current slider thumb"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:179
+msgid "Add color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:180
+msgid "Delete color change marker for current layer"
+msgstr ""
+
+#: src/slic3r/GUI/KBShortcutsDialog.cpp:182
+msgid "Layers Slider Shortcuts"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:54
 msgid ""
 " - Remember to check for updates at http://github.com/prusa3d/slic3r/releases"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:130
+#: src/slic3r/GUI/MainFrame.cpp:160
 msgid "Plater"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:236
-msgid "&Open"
+#: src/slic3r/GUI/MainFrame.cpp:273
+msgid "&Open Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:236
+#: src/slic3r/GUI/MainFrame.cpp:273
 msgid "Open a project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:238
-msgid "&Save"
+#: src/slic3r/GUI/MainFrame.cpp:275
+msgid "&Save Project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:238
+#: src/slic3r/GUI/MainFrame.cpp:275
 msgid "Save current project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:240
-msgid "Save &as"
+#: src/slic3r/GUI/MainFrame.cpp:277
+msgid "Save Project &as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:240
+#: src/slic3r/GUI/MainFrame.cpp:277
 msgid "Save current project file as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:283
 msgid "Import STL/OBJ/AM&F/3MF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:246
+#: src/slic3r/GUI/MainFrame.cpp:283
 msgid "Load a model"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:286
 msgid "Import &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:249
+#: src/slic3r/GUI/MainFrame.cpp:286
 msgid "Load exported configuration file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:288
 msgid "Import Config from &project"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:251
+#: src/slic3r/GUI/MainFrame.cpp:288
 msgid "Load configuration from project file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:291
 msgid "Import Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:254
+#: src/slic3r/GUI/MainFrame.cpp:291
 msgid "Load presets from a bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:256
+#: src/slic3r/GUI/MainFrame.cpp:293
 msgid "&Import"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:296
 msgid "Export &G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:259
+#: src/slic3r/GUI/MainFrame.cpp:296
 msgid "Export current plate as G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:299
 msgid "Export plate as &STL"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:262
+#: src/slic3r/GUI/MainFrame.cpp:299
 msgid "Export current plate as STL"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:301
 msgid "Export plate as &AMF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:264
+#: src/slic3r/GUI/MainFrame.cpp:301
 msgid "Export current plate as AMF"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:304
 msgid "Export &Config"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:267
+#: src/slic3r/GUI/MainFrame.cpp:304
 msgid "Export current configuration to file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:306
 msgid "Export Config &Bundle"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:269
+#: src/slic3r/GUI/MainFrame.cpp:306
 msgid "Export all presets to file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:271
+#: src/slic3r/GUI/MainFrame.cpp:308
 msgid "&Export"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:314
 msgid "Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:277
+#: src/slic3r/GUI/MainFrame.cpp:314
 msgid "Slice a file into a G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:320
 msgid "Quick Slice and Save As"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:283
+#: src/slic3r/GUI/MainFrame.cpp:320
 msgid "Slice a file into a G-code, save as"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:289
+#: src/slic3r/GUI/MainFrame.cpp:326
 msgid "Repeat Last Quick Slice"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:334
 msgid "(Re)Slice &Now"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:297
+#: src/slic3r/GUI/MainFrame.cpp:334
 msgid "Start new slicing process"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:337
 msgid "&Repair STL file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:300
+#: src/slic3r/GUI/MainFrame.cpp:337
 msgid "Automatically repair an STL file"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:303
+#: src/slic3r/GUI/MainFrame.cpp:340
 msgid "&Quit"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:303
+#: src/slic3r/GUI/MainFrame.cpp:340
 msgid "Quit Slic3r"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:374
 msgid "&Select all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:321
+#: src/slic3r/GUI/MainFrame.cpp:374
 msgid "Selects all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:377
 msgid "&Delete selected"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:324
+#: src/slic3r/GUI/MainFrame.cpp:377
 msgid "Deletes the current selection"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:379
 msgid "Delete &all"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:326
+#: src/slic3r/GUI/MainFrame.cpp:379
 msgid "Deletes all objects"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:392
 msgid "&Plater Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:339
+#: src/slic3r/GUI/MainFrame.cpp:392
 msgid "Show the plater"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:399
 msgid "P&rint Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:346
+#: src/slic3r/GUI/MainFrame.cpp:399
 msgid "Show the print settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:401
 msgid "&Filament Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:348
+#: src/slic3r/GUI/MainFrame.cpp:401
 msgid "Show the filament settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:403
 msgid "Print&er Settings Tab"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:350
+#: src/slic3r/GUI/MainFrame.cpp:403
 msgid "Show the printer settings"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:407
 msgid "3&D"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:354
+#: src/slic3r/GUI/MainFrame.cpp:407
 msgid "Show the 3D editing view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:409
 msgid "Pre&view"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:356
+#: src/slic3r/GUI/MainFrame.cpp:409
 msgid "Show the 3D slices preview"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:430
 msgid "Print &Host Upload Queue"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:377
+#: src/slic3r/GUI/MainFrame.cpp:430
 msgid "Display the Print Host Upload Queue window"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "&Iso"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:388
-msgid "Iso View"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "&Top"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:390
-msgid "Top View"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "&Bottom"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:391
-msgid "Bottom View"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "&Front"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:392
-msgid "Front View"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "R&ear"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:393
-msgid "Rear View"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "&Left"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:394
-msgid "Left View"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "&Right"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:395
-msgid "Right View"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Prusa 3D &Drivers"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:409
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Prusa Edition &Releases"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:411
-msgid "Open the Prusa Edition releases page in your browser"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Slic3r &Website"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:417
-msgid "Open the Slic3r website in your browser"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Slic3r &Manual"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:419
-msgid "Open the Slic3r manual in your browser"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "System &Info"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:422
-msgid "Show system information"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show &Configuration Folder"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:424
-msgid "Show user configuration folder (datadir)"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an I&ssue"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:426
-msgid "Report an issue on the Slic3r Prusa Edition"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "&About Slic3r"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:428
-msgid "Show about dialog"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "&Keyboard Shortcuts"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:431
-msgid "Show the list of the keyboard shortcuts"
+#: src/slic3r/GUI/MainFrame.cpp:439
+msgid "Iso"
 msgstr ""
 
 #: src/slic3r/GUI/MainFrame.cpp:439
-msgid "&File"
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:440
-msgid "&Edit"
+msgid "Iso View"
 msgstr ""
 
 #: src/slic3r/GUI/MainFrame.cpp:441
-msgid "&Window"
+msgid "Top"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2041
+msgctxt "Layers"
+msgid "Top"
+msgstr "顶部"
+
+#: src/slic3r/GUI/MainFrame.cpp:441
+msgid "Top View"
 msgstr ""
 
 #: src/slic3r/GUI/MainFrame.cpp:442
-msgid "&View"
+msgid "Bottom"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:148
+msgctxt "Layers"
+msgid "Bottom"
+msgstr "底部"
+
+#: src/slic3r/GUI/MainFrame.cpp:442
+msgid "Bottom View"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:443
+msgid "Front"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:443
+msgid "Front View"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:444 src/libslic3r/PrintConfig.cpp:1561
+msgid "Rear"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:444
+msgid "Rear View"
 msgstr ""
 
 #: src/slic3r/GUI/MainFrame.cpp:445
-msgid "&Help"
+msgid "Left"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:472
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
+#: src/slic3r/GUI/MainFrame.cpp:445
+msgid "Left View"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:486
-msgid "No previously sliced file."
+#: src/slic3r/GUI/MainFrame.cpp:446
+msgid "Right"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:487 src/slic3r/GUI/PrintHostDialogs.cpp:173
-msgid "Error"
+#: src/slic3r/GUI/MainFrame.cpp:446
+msgid "Right View"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:460
+msgid "Prusa 3D &Drivers"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:460
+msgid "Open the Prusa3D drivers download page in your browser"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:462
+msgid "Prusa Edition &Releases"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:462
+msgid "Open the Prusa Edition releases page in your browser"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:468
+msgid "Slic3r &Website"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:468
+msgid "Open the Slic3r website in your browser"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:470
+msgid "Slic3r &Manual"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:470
+msgid "Open the Slic3r manual in your browser"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:473
+msgid "System &Info"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:473
+msgid "Show system information"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:475
+msgid "Show &Configuration Folder"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:475
+msgid "Show user configuration folder (datadir)"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:477
+msgid "Report an I&ssue"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:477
+msgid "Report an issue on the Slic3r Prusa Edition"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:479
+msgid "&About Slic3r"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:479
+msgid "Show about dialog"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:482
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:482
+msgid "Show the list of the keyboard shortcuts"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:490
+msgid "&File"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:491
+msgid "&Edit"
 msgstr ""
 
 #: src/slic3r/GUI/MainFrame.cpp:492
-msgid "Previously sliced file ("
-msgstr ""
-
-#: src/slic3r/GUI/MainFrame.cpp:492
-msgid ") not found."
+msgid "&Window"
 msgstr ""
 
 #: src/slic3r/GUI/MainFrame.cpp:493
+msgid "&View"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:496
+msgid "&Help"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:524
+msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:538
+msgid "No previously sliced file."
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:539 src/slic3r/GUI/PrintHostDialogs.cpp:219
+msgid "Error"
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:544
+msgid "Previously sliced file ("
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:544
+msgid ") not found."
+msgstr ""
+
+#: src/slic3r/GUI/MainFrame.cpp:545
 msgid "File Not Found"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531 src/slic3r/GUI/Tab.cpp:3031
+#: src/slic3r/GUI/MainFrame.cpp:580 src/slic3r/GUI/Tab.cpp:3152
 msgid "Save "
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid "SVG"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid "G-code"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:531
+#: src/slic3r/GUI/MainFrame.cpp:580
 msgid " file as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:548
+#: src/slic3r/GUI/MainFrame.cpp:595
 msgid "Save zip file as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:560
+#: src/slic3r/GUI/MainFrame.cpp:607 src/slic3r/GUI/Plater.cpp:2352
+#: src/slic3r/GUI/Plater.cpp:3467 src/slic3r/GUI/Tab.cpp:1110
+#: src/slic3r/GUI/Tab.cpp:3348
 msgid "Slicing"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:560
+#: src/slic3r/GUI/MainFrame.cpp:607
 msgid "Processing "
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:583
+#: src/slic3r/GUI/MainFrame.cpp:630
 msgid " was successfully sliced."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:585
+#: src/slic3r/GUI/MainFrame.cpp:632
 msgid "Slicing Done!"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:600
+#: src/slic3r/GUI/MainFrame.cpp:647
 msgid "Select the STL file to repair:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:614
+#: src/slic3r/GUI/MainFrame.cpp:661
 msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676
 msgid "Your file was repaired."
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:629
+#: src/slic3r/GUI/MainFrame.cpp:676 src/libslic3r/PrintConfig.cpp:3051
 msgid "Repair"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:643
+#: src/slic3r/GUI/MainFrame.cpp:690
 msgid "Save configuration as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:663 src/slic3r/GUI/MainFrame.cpp:727
+#: src/slic3r/GUI/MainFrame.cpp:710 src/slic3r/GUI/MainFrame.cpp:774
 msgid "Select configuration to load:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:700
+#: src/slic3r/GUI/MainFrame.cpp:747
 msgid "Save presets bundle as:"
 msgstr ""
 
-#: src/slic3r/GUI/MainFrame.cpp:751
+#: src/slic3r/GUI/MainFrame.cpp:798
 #, c-format
 msgid "%d presets successfully imported."
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
+#: src/slic3r/GUI/MsgDialog.cpp:71
 msgid "Slic3r error"
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:66
+#: src/slic3r/GUI/MsgDialog.cpp:71
 msgid "Slic3r has encountered an error"
 msgstr ""
 
-#: src/slic3r/GUI/MsgDialog.cpp:84
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:107
-msgid "Info"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:126
+#: src/slic3r/GUI/Plater.cpp:137
 msgid "Volume"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:127
+#: src/slic3r/GUI/Plater.cpp:138
 msgid "Facets"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:128
+#: src/slic3r/GUI/Plater.cpp:139
 msgid "Materials"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:131
+#: src/slic3r/GUI/Plater.cpp:142
 msgid "Manifold"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:174
+#: src/slic3r/GUI/Plater.cpp:188
 msgid "Sliced Info"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:193 src/slic3r/GUI/Plater.cpp:823
+#: src/slic3r/GUI/Plater.cpp:207 src/slic3r/GUI/Plater.cpp:998
 msgid "Used Filament (m)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:194
+#: src/slic3r/GUI/Plater.cpp:208
 msgid "Used Filament (mm³)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:195
+#: src/slic3r/GUI/Plater.cpp:209
 msgid "Used Filament (g)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:196 src/slic3r/GUI/Plater.cpp:838
-#: src/libslic3r/PrintConfig.cpp:718
+#: src/slic3r/GUI/Plater.cpp:210
+msgid "Used Material (unit)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:211 src/slic3r/GUI/Plater.cpp:1013
+#: src/libslic3r/PrintConfig.cpp:716
 msgid "Cost"
 msgstr "�价"
 
-#: src/slic3r/GUI/Plater.cpp:197 src/slic3r/GUI/Plater.cpp:852
+#: src/slic3r/GUI/Plater.cpp:212 src/slic3r/GUI/Plater.cpp:985
+#: src/slic3r/GUI/Plater.cpp:1027
 msgid "Estimated printing time"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:198
+#: src/slic3r/GUI/Plater.cpp:213
 msgid "Number of tool changes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:361
-msgid "Support"
+#: src/slic3r/GUI/Plater.cpp:290
+msgid "Click to edit preset"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:364
+#: src/slic3r/GUI/Plater.cpp:413
 msgid "Select what kind of support do you need"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:365 src/libslic3r/GCode/PreviewData.cpp:162
-msgid "None"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:366 src/libslic3r/PrintConfig.cpp:1904
+#: src/slic3r/GUI/Plater.cpp:415 src/libslic3r/PrintConfig.cpp:1814
+#: src/libslic3r/PrintConfig.cpp:2419
 msgid "Support on build plate only"
 msgstr "仅在热床上生�支撑"
 
-#: src/slic3r/GUI/Plater.cpp:367
+#: src/slic3r/GUI/Plater.cpp:416
 msgid "Everywhere"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:379 src/slic3r/GUI/Tab.cpp:977
+#: src/slic3r/GUI/Plater.cpp:438 src/slic3r/GUI/Tab.cpp:1007
 msgid "Brim"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:381
+#: src/slic3r/GUI/Plater.cpp:440
 msgid ""
 "This flag enables the brim that will be printed around each object on the "
 "first layer."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:390
+#: src/slic3r/GUI/Plater.cpp:448
 msgid "Purging volumes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:556
+#: src/slic3r/GUI/Plater.cpp:673
 msgid "Print settings"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:557 src/slic3r/GUI/Tab.cpp:1380
-#: src/slic3r/GUI/Tab.cpp:1381
+#: src/slic3r/GUI/Plater.cpp:674 src/slic3r/GUI/Tab.cpp:1421
+#: src/slic3r/GUI/Tab.cpp:1422
 msgid "Filament"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:558 src/slic3r/GUI/Preset.cpp:1158
+#: src/slic3r/GUI/Plater.cpp:675 src/slic3r/GUI/Preset.cpp:1252
 msgid "SLA print"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:559 src/slic3r/GUI/Preset.cpp:1159
+#: src/slic3r/GUI/Plater.cpp:676 src/slic3r/GUI/Preset.cpp:1253
 msgid "SLA material"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:560
+#: src/slic3r/GUI/Plater.cpp:677
 msgid "Printer"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:588
+#: src/slic3r/GUI/Plater.cpp:707 src/slic3r/GUI/Plater.cpp:3674
 msgid "Send to printer"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:607
+#: src/slic3r/GUI/Plater.cpp:727 src/slic3r/GUI/Plater.cpp:2352
+#: src/slic3r/GUI/Plater.cpp:3470
 msgid "Slice now"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:787
+#: src/slic3r/GUI/Plater.cpp:860
+msgid "Hold Shift to Slice & Export G-code"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:931
 #, c-format
 msgid "%d (%d shells)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:792
+#: src/slic3r/GUI/Plater.cpp:936
 #, c-format
 msgid "Auto-repaired (%d errors)"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:795
+#: src/slic3r/GUI/Plater.cpp:939
 #, 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:805
+#: src/slic3r/GUI/Plater.cpp:949
 msgid "Yes"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:972
+msgid "Used Material (ml)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:975
+msgid "object(s)"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:975
+msgid "supports and pad"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1000 src/slic3r/GUI/Plater.cpp:1015
 msgid "objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:825 src/slic3r/GUI/Plater.cpp:840
+#: src/slic3r/GUI/Plater.cpp:1000 src/slic3r/GUI/Plater.cpp:1015
 msgid "wipe tower"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:855
+#: src/slic3r/GUI/Plater.cpp:1030
 msgid "normal mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:859
+#: src/slic3r/GUI/Plater.cpp:1034
 msgid "silent mode"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1304
+#: src/slic3r/GUI/Plater.cpp:1544
 msgid "Loading"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1314
+#: src/slic3r/GUI/Plater.cpp:1554
 #, c-format
 msgid "Processing input file %s\n"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1366
+#: src/slic3r/GUI/Plater.cpp:1612
 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 ""
 
-#: src/slic3r/GUI/Plater.cpp:1369 src/slic3r/GUI/Plater.cpp:1411
+#: src/slic3r/GUI/Plater.cpp:1615 src/slic3r/GUI/Plater.cpp:1707
 msgid "Multi-part object detected"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1388
+#: src/slic3r/GUI/Plater.cpp:1650
+msgid ""
+"This file cannot be loaded in simple mode. Do you want to switch to expert "
+"mode?\n"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1651
+msgid "Detected advanced data"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1684
 #, 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 ""
 
-#: src/slic3r/GUI/Plater.cpp:1408
+#: src/slic3r/GUI/Plater.cpp:1704
 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 ""
 
-#: src/slic3r/GUI/Plater.cpp:1424
+#: src/slic3r/GUI/Plater.cpp:1720
 msgid "Loaded"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1492
+#: src/slic3r/GUI/Plater.cpp:1812
 msgid ""
 "Your object appears to be too large, so it was automatically scaled down to "
 "fit your print bed."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1493
+#: src/slic3r/GUI/Plater.cpp:1813
 msgid "Object too large?"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1536
-msgid "Export print config"
+#: src/slic3r/GUI/Plater.cpp:1863
+msgid "Export STL file:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1538
+#: src/slic3r/GUI/Plater.cpp:1870
+msgid "Export AMF file:"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:1876
 msgid "Save file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1702
+#: src/slic3r/GUI/Plater.cpp:2042
 msgid "Arranging canceled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1705
+#: src/slic3r/GUI/Plater.cpp:2045
 msgid "Arranging"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1736
+#: src/slic3r/GUI/Plater.cpp:2079
 msgid "Could not arrange model objects! Some geometries may be invalid."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1740
+#: src/slic3r/GUI/Plater.cpp:2083
 msgid "Arranging done."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1782
+#: src/slic3r/GUI/Plater.cpp:2124
 msgid "Orientation search canceled"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1787
+#: src/slic3r/GUI/Plater.cpp:2129
 msgid "Searching for optimal orientation"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1797
+#: src/slic3r/GUI/Plater.cpp:2190
 msgid "Orientation found."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1818
+#: src/slic3r/GUI/Plater.cpp:2211
 msgid ""
 "The selected object can't be split because it contains more than one volume/"
 "material."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:1945 src/slic3r/GUI/PrintHostDialogs.cpp:174
-msgid "Cancelling"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:1962
-msgid "Another export job is currently running."
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2215
-msgid "Export failed"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2219 src/slic3r/GUI/PrintHostDialogs.cpp:175
-msgid "Cancelled"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2346 src/slic3r/GUI/Tab.cpp:2736
-msgid "Delete"
+#: src/slic3r/GUI/Plater.cpp:2337
+msgid "Invalid data"
 msgstr ""
 
 #: src/slic3r/GUI/Plater.cpp:2346
-msgid "Remove the selected object"
+msgid "Ready to slice"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2379 src/slic3r/GUI/PrintHostDialogs.cpp:220
+msgid "Cancelling"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2396
+msgid "Another export job is currently running."
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2656
+msgid "Export failed"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2661 src/slic3r/GUI/PrintHostDialogs.cpp:221
+msgid "Cancelled"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2747 src/slic3r/GUI/Plater.cpp:2759
+#: src/slic3r/GUI/Plater.cpp:2831
 msgid "Increase copies"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2349
+#: src/slic3r/GUI/Plater.cpp:2825 src/slic3r/GUI/Plater.cpp:2843
+msgid "Remove the selected object"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:2831
 msgid "Place one more copy of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2833
 msgid "Decrease copies"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2351
+#: src/slic3r/GUI/Plater.cpp:2833
 msgid "Remove one copy of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2835
 msgid "Set number of copies"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2353
+#: src/slic3r/GUI/Plater.cpp:2835
 msgid "Change the number of copies of the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2858
 msgid "Reload from Disk"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2363
+#: src/slic3r/GUI/Plater.cpp:2858
 msgid "Reload the selected file from Disk"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export object as STL"
+#: src/slic3r/GUI/Plater.cpp:2861
+msgid "Export the selected object as STL file"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2366
-msgid "Export this single object as STL file"
-msgstr ""
-
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2873
 msgid "Along X axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2375
+#: src/slic3r/GUI/Plater.cpp:2873
 msgid "Mirror the selected object along the X axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2875
 msgid "Along Y axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2377
+#: src/slic3r/GUI/Plater.cpp:2875
 msgid "Mirror the selected object along the Y axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2877
 msgid "Along Z axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2379
+#: src/slic3r/GUI/Plater.cpp:2877
 msgid "Mirror the selected object along the Z axis"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2880
 msgid "Mirror"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2382
+#: src/slic3r/GUI/Plater.cpp:2880
 msgid "Mirror the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2400
+#: src/slic3r/GUI/Plater.cpp:2898
 msgid "To objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2400 src/slic3r/GUI/Plater.cpp:2431
+#: src/slic3r/GUI/Plater.cpp:2898 src/slic3r/GUI/Plater.cpp:2920
 msgid "Split the selected object into individual objects"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2402
+#: src/slic3r/GUI/Plater.cpp:2900
 msgid "To parts"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2402 src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:2900 src/slic3r/GUI/Plater.cpp:2940
 msgid "Split the selected object into individual sub-parts"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2405 src/slic3r/GUI/Plater.cpp:2431
-#: src/slic3r/GUI/Plater.cpp:2451
+#: src/slic3r/GUI/Plater.cpp:2903 src/slic3r/GUI/Plater.cpp:2920
+#: src/slic3r/GUI/Plater.cpp:2940 src/libslic3r/PrintConfig.cpp:3075
 msgid "Split"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2405
+#: src/slic3r/GUI/Plater.cpp:2903
 msgid "Split the selected object"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:2926
 msgid "Optimize orientation"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2435
+#: src/slic3r/GUI/Plater.cpp:2926
 msgid "Optimize the rotation of the object for better print results."
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2795
+#: src/slic3r/GUI/Plater.cpp:3342
 msgid "Save G-code file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2795
-msgid "Save Zip file as:"
+#: src/slic3r/GUI/Plater.cpp:3342
+msgid "Save SL1 file as:"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2845
+#: src/slic3r/GUI/Plater.cpp:3397
 #, c-format
 msgid "STL file exported to %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2861
+#: src/slic3r/GUI/Plater.cpp:3413
 #, c-format
 msgid "AMF file exported to %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2864
+#: src/slic3r/GUI/Plater.cpp:3416
 #, c-format
 msgid "Error exporting AMF file %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2891
+#: src/slic3r/GUI/Plater.cpp:3442
 #, c-format
 msgid "3MF file exported to %s"
 msgstr ""
 
-#: src/slic3r/GUI/Plater.cpp:2894
+#: src/slic3r/GUI/Plater.cpp:3445
 #, c-format
 msgid "Error exporting 3MF file %s"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1712
-#: src/slic3r/GUI/Tab.cpp:1911
+#: src/slic3r/GUI/Plater.cpp:3673
+msgid "Export"
+msgstr ""
+
+#: src/slic3r/GUI/Plater.cpp:3674
+msgid "Send G-code"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:17 src/slic3r/GUI/Tab.cpp:1762
+#: src/slic3r/GUI/Tab.cpp:1963
 msgid "General"
 msgstr ""
 
@@ -2354,37 +2717,51 @@ msgid ""
 "even if they are marked as incompatible with the active printer"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:90
+#: src/slic3r/GUI/Preferences.cpp:91
 msgid "Use legacy OpenGL 1.1 rendering"
 msgstr ""
 
-#: src/slic3r/GUI/Preferences.cpp:92
+#: src/slic3r/GUI/Preferences.cpp:93
 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 ""
 
-#: src/slic3r/GUI/Preferences.cpp:115
+#: src/slic3r/GUI/Preferences.cpp:101
+msgid "Use Retina resolution for the 3D scene"
+msgstr ""
+
+#: src/slic3r/GUI/Preferences.cpp:103
+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 ""
+
+#: src/slic3r/GUI/Preferences.cpp:126
 msgid "You need to restart Slic3r to make the changes effective."
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:170
+#: src/slic3r/GUI/Preset.cpp:207
 msgid "modified"
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:862 src/slic3r/GUI/Preset.cpp:902
-#: src/slic3r/GUI/Preset.cpp:930 src/slic3r/GUI/Preset.cpp:962
-#: src/slic3r/GUI/PresetBundle.cpp:1459 src/slic3r/GUI/PresetBundle.cpp:1512
+#: src/slic3r/GUI/Preset.cpp:918 src/slic3r/GUI/Preset.cpp:958
+#: src/slic3r/GUI/Preset.cpp:1011 src/slic3r/GUI/Preset.cpp:1043
+#: src/slic3r/GUI/PresetBundle.cpp:1484 src/slic3r/GUI/PresetBundle.cpp:1537
 msgid "System presets"
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:906 src/slic3r/GUI/Preset.cpp:966
-#: src/slic3r/GUI/PresetBundle.cpp:1517
+#: src/slic3r/GUI/Preset.cpp:962 src/slic3r/GUI/Preset.cpp:1047
+#: src/slic3r/GUI/PresetBundle.cpp:1542
 msgid "User presets"
 msgstr ""
 
-#: src/slic3r/GUI/Preset.cpp:1157
+#: src/slic3r/GUI/Preset.cpp:991 src/slic3r/GUI/Tab.cpp:247
+msgid "Add a new printer"
+msgstr ""
+
+#: src/slic3r/GUI/Preset.cpp:1251
 msgid "filament"
 msgstr ""
 
@@ -2514,48 +2891,44 @@ msgstr ""
 msgid "%d lines: %.2lf mm"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
+#: src/slic3r/GUI/PrintHostDialogs.cpp:32
 msgid "Send G-Code to printer host"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:29
+#: src/slic3r/GUI/PrintHostDialogs.cpp:32
 msgid "Upload to Printer Host with the following filename:"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:31
+#: src/slic3r/GUI/PrintHostDialogs.cpp:34
 msgid "Start printing after upload"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:33
+#: src/slic3r/GUI/PrintHostDialogs.cpp:41
 msgid "Use forward slashes ( / ) as a directory separator if needed."
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:111
+#: src/slic3r/GUI/PrintHostDialogs.cpp:157
 msgid "Cancel selected"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:113
+#: src/slic3r/GUI/PrintHostDialogs.cpp:159
 msgid "Show error message"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:115
-msgid "Close"
-msgstr ""
-
-#: src/slic3r/GUI/PrintHostDialogs.cpp:152
-#: src/slic3r/GUI/PrintHostDialogs.cpp:171
+#: src/slic3r/GUI/PrintHostDialogs.cpp:198
+#: src/slic3r/GUI/PrintHostDialogs.cpp:217
 msgid "Enqueued"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:172
+#: src/slic3r/GUI/PrintHostDialogs.cpp:218
 msgid "Uploading"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:176
+#: src/slic3r/GUI/PrintHostDialogs.cpp:222
 msgid "Completed"
 msgstr ""
 
-#: src/slic3r/GUI/PrintHostDialogs.cpp:214
+#: src/slic3r/GUI/PrintHostDialogs.cpp:260
 msgid "Error uploading to print host:"
 msgstr ""
 
@@ -2568,10 +2941,10 @@ msgid "Time"
 msgstr ""
 
 #: src/slic3r/GUI/RammingChart.cpp:76 src/slic3r/GUI/RammingChart.cpp:81
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78 src/libslic3r/PrintConfig.cpp:603
-#: src/libslic3r/PrintConfig.cpp:653 src/libslic3r/PrintConfig.cpp:670
-#: src/libslic3r/PrintConfig.cpp:2352 src/libslic3r/PrintConfig.cpp:2360
-#: src/libslic3r/PrintConfig.cpp:2432 src/libslic3r/PrintConfig.cpp:2440
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82 src/libslic3r/PrintConfig.cpp:611
+#: src/libslic3r/PrintConfig.cpp:655 src/libslic3r/PrintConfig.cpp:670
+#: src/libslic3r/PrintConfig.cpp:2241 src/libslic3r/PrintConfig.cpp:2250
+#: src/libslic3r/PrintConfig.cpp:2308 src/libslic3r/PrintConfig.cpp:2315
 msgid "s"
 msgstr ""
 
@@ -2579,214 +2952,214 @@ msgstr ""
 msgid "Volumetric speed"
 msgstr ""
 
-#: src/slic3r/GUI/SysInfoDialog.cpp:40
+#: src/slic3r/GUI/SysInfoDialog.cpp:44
 msgid "Slic3r Prusa Edition - System Information"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:49 src/libslic3r/PrintConfig.cpp:202
+#: src/slic3r/GUI/Tab.cpp:50 src/libslic3r/PrintConfig.cpp:228
 msgid "Compatible printers"
 msgstr "兼容的打�机"
 
-#: src/slic3r/GUI/Tab.cpp:50
+#: src/slic3r/GUI/Tab.cpp:51
 msgid "Select the printers this profile is compatible with."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:55 src/libslic3r/PrintConfig.cpp:215
+#: src/slic3r/GUI/Tab.cpp:56 src/libslic3r/PrintConfig.cpp:243
 msgid "Compatible print profiles"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:56
+#: src/slic3r/GUI/Tab.cpp:57
 msgid "Select the print profiles this profile is compatible with."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:118
+#: src/slic3r/GUI/Tab.cpp:132
 msgid "Save current "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:119
+#: src/slic3r/GUI/Tab.cpp:133
 msgid "Delete this preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:131
+#: src/slic3r/GUI/Tab.cpp:145
 msgid ""
 "Hover the cursor over buttons to find more information \n"
 "or click this button."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:824
+#: src/slic3r/GUI/Tab.cpp:858
 msgid "It's a default preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:825
+#: src/slic3r/GUI/Tab.cpp:859
 msgid "It's a system preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:826
+#: src/slic3r/GUI/Tab.cpp:860
 msgid "Current preset is inherited from "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:831
+#: src/slic3r/GUI/Tab.cpp:865
 msgid "It can't be deleted or modified. "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:832
+#: src/slic3r/GUI/Tab.cpp:866
 msgid ""
 "Any modifications should be saved as a new preset inherited from this one. "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:833
+#: src/slic3r/GUI/Tab.cpp:867
 msgid "To do that please specify a new name for the preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:837
+#: src/slic3r/GUI/Tab.cpp:871
 msgid "Additional information:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:843
+#: src/slic3r/GUI/Tab.cpp:877
 msgid "printer model"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:851
+#: src/slic3r/GUI/Tab.cpp:885
 msgid "default print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:854
+#: src/slic3r/GUI/Tab.cpp:888
 msgid "default filament profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:868
+#: src/slic3r/GUI/Tab.cpp:902
 msgid "default SLA material profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:872
+#: src/slic3r/GUI/Tab.cpp:906
 msgid "default SLA print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:919 src/slic3r/GUI/Tab.cpp:3174
+#: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:3303
 msgid "Layers and perimeters"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:920 src/libslic3r/PrintConfig.cpp:46
+#: src/slic3r/GUI/Tab.cpp:949 src/libslic3r/PrintConfig.cpp:55
 msgid "Layer height"
 msgstr "层高"
 
-#: src/slic3r/GUI/Tab.cpp:924
+#: src/slic3r/GUI/Tab.cpp:953
 msgid "Vertical shells"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:935
+#: src/slic3r/GUI/Tab.cpp:964
 msgid "Horizontal shells"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:936 src/libslic3r/PrintConfig.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:965 src/libslic3r/PrintConfig.cpp:1709
 msgid "Solid layers"
 msgstr "��层数"
 
-#: src/slic3r/GUI/Tab.cpp:941
+#: src/slic3r/GUI/Tab.cpp:970
 msgid "Quality (slower slicing)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:958
+#: src/slic3r/GUI/Tab.cpp:988
 msgid "Reducing printing time"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:970
+#: src/slic3r/GUI/Tab.cpp:1000
 msgid "Skirt and brim"
 msgstr "环边和裙边"
 
-#: src/slic3r/GUI/Tab.cpp:987
+#: src/slic3r/GUI/Tab.cpp:1017
 msgid "Raft"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:991
+#: src/slic3r/GUI/Tab.cpp:1021
 msgid "Options for support material and raft"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1006
+#: src/slic3r/GUI/Tab.cpp:1036
 msgid "Speed for print moves"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1018
+#: src/slic3r/GUI/Tab.cpp:1048
 msgid "Speed for non-print moves"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1021
+#: src/slic3r/GUI/Tab.cpp:1051
 msgid "Modifiers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1024
+#: src/slic3r/GUI/Tab.cpp:1054
 msgid "Acceleration control (advanced)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1031
+#: src/slic3r/GUI/Tab.cpp:1061
 msgid "Autospeed (advanced)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1037
+#: src/slic3r/GUI/Tab.cpp:1069
 msgid "Multiple Extruders"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1045
+#: src/slic3r/GUI/Tab.cpp:1077
 msgid "Ooze prevention"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1062
+#: src/slic3r/GUI/Tab.cpp:1094
 msgid "Extrusion width"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1072
+#: src/slic3r/GUI/Tab.cpp:1104
 msgid "Overlap"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1075
+#: src/slic3r/GUI/Tab.cpp:1107
 msgid "Flow"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1078
+#: src/slic3r/GUI/Tab.cpp:1116
 msgid "Other"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1085 src/slic3r/GUI/Tab.cpp:3213
+#: src/slic3r/GUI/Tab.cpp:1119 src/slic3r/GUI/Tab.cpp:3351
 msgid "Output options"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1086
+#: src/slic3r/GUI/Tab.cpp:1120
 msgid "Sequential printing"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1088
+#: src/slic3r/GUI/Tab.cpp:1122
 msgid "Extruder clearance (mm)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1097 src/slic3r/GUI/Tab.cpp:3214
+#: src/slic3r/GUI/Tab.cpp:1131 src/slic3r/GUI/Tab.cpp:3352
 msgid "Output file"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1103 src/libslic3r/PrintConfig.cpp:1438
+#: src/slic3r/GUI/Tab.cpp:1138 src/libslic3r/PrintConfig.cpp:1382
 msgid "Post-processing scripts"
 msgstr "�处�脚本"
 
-#: src/slic3r/GUI/Tab.cpp:1109 src/slic3r/GUI/Tab.cpp:1110
-#: src/slic3r/GUI/Tab.cpp:1483 src/slic3r/GUI/Tab.cpp:1484
-#: src/slic3r/GUI/Tab.cpp:1883 src/slic3r/GUI/Tab.cpp:1884
-#: src/slic3r/GUI/Tab.cpp:1964 src/slic3r/GUI/Tab.cpp:1965
-#: src/slic3r/GUI/Tab.cpp:3119 src/slic3r/GUI/Tab.cpp:3120
+#: src/slic3r/GUI/Tab.cpp:1144 src/slic3r/GUI/Tab.cpp:1145
+#: src/slic3r/GUI/Tab.cpp:1527 src/slic3r/GUI/Tab.cpp:1528
+#: src/slic3r/GUI/Tab.cpp:1935 src/slic3r/GUI/Tab.cpp:1936
+#: src/slic3r/GUI/Tab.cpp:2027 src/slic3r/GUI/Tab.cpp:2028
+#: src/slic3r/GUI/Tab.cpp:3240 src/slic3r/GUI/Tab.cpp:3241
 msgid "Notes"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1116 src/slic3r/GUI/Tab.cpp:1491
-#: src/slic3r/GUI/Tab.cpp:1890 src/slic3r/GUI/Tab.cpp:1971
-#: src/slic3r/GUI/Tab.cpp:3127 src/slic3r/GUI/Tab.cpp:3219
+#: src/slic3r/GUI/Tab.cpp:1151 src/slic3r/GUI/Tab.cpp:1535
+#: src/slic3r/GUI/Tab.cpp:1942 src/slic3r/GUI/Tab.cpp:2034
+#: src/slic3r/GUI/Tab.cpp:3248 src/slic3r/GUI/Tab.cpp:3357
 msgid "Dependencies"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1117 src/slic3r/GUI/Tab.cpp:1492
-#: src/slic3r/GUI/Tab.cpp:1891 src/slic3r/GUI/Tab.cpp:1972
-#: src/slic3r/GUI/Tab.cpp:3128 src/slic3r/GUI/Tab.cpp:3220
+#: src/slic3r/GUI/Tab.cpp:1152 src/slic3r/GUI/Tab.cpp:1536
+#: src/slic3r/GUI/Tab.cpp:1943 src/slic3r/GUI/Tab.cpp:2035
+#: src/slic3r/GUI/Tab.cpp:3249 src/slic3r/GUI/Tab.cpp:3358
 msgid "Profile dependencies"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1161
+#: src/slic3r/GUI/Tab.cpp:1198
 #, no-c-format
 msgid ""
 "The Spiral Vase mode requires:\n"
@@ -2799,11 +3172,11 @@ msgid ""
 "Shall I adjust those settings in order to enable Spiral Vase?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1168
+#: src/slic3r/GUI/Tab.cpp:1205
 msgid "Spiral Vase"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1191
+#: src/slic3r/GUI/Tab.cpp:1228
 msgid ""
 "The Wipe Tower currently supports the non-soluble supports only\n"
 "if they are printed with the current extruder without triggering a tool "
@@ -2814,11 +3187,11 @@ msgid ""
 "Shall I adjust those settings in order to enable the Wipe Tower?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1195 src/slic3r/GUI/Tab.cpp:1212
+#: src/slic3r/GUI/Tab.cpp:1232 src/slic3r/GUI/Tab.cpp:1249
 msgid "Wipe Tower"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1209
+#: src/slic3r/GUI/Tab.cpp:1246
 msgid ""
 "For the Wipe Tower to work with the soluble supports, the support layers\n"
 "need to be synchronized with the object layers.\n"
@@ -2826,7 +3199,7 @@ msgid ""
 "Shall I synchronize support layers in order to enable the Wipe Tower?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1227
+#: src/slic3r/GUI/Tab.cpp:1264
 msgid ""
 "Supports work better, if the following feature is enabled:\n"
 "- Detect bridging perimeters\n"
@@ -2834,15 +3207,15 @@ msgid ""
 "Shall I adjust those settings for supports?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1230
+#: src/slic3r/GUI/Tab.cpp:1267
 msgid "Support Generator"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1272
+#: src/slic3r/GUI/Tab.cpp:1309
 msgid "The "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1272
+#: src/slic3r/GUI/Tab.cpp:1309
 #, no-c-format
 msgid ""
 " infill pattern is not supposed to work at 100% density.\n"
@@ -2850,96 +3223,96 @@ msgid ""
 "Shall I switch to rectilinear fill pattern?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1388
+#: src/slic3r/GUI/Tab.cpp:1429
 msgid "Temperature "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1394
+#: src/slic3r/GUI/Tab.cpp:1435
 msgid "Bed"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1399
+#: src/slic3r/GUI/Tab.cpp:1440
 msgid "Cooling"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1400 src/libslic3r/PrintConfig.cpp:1333
-#: src/libslic3r/PrintConfig.cpp:2212
+#: src/slic3r/GUI/Tab.cpp:1441 src/libslic3r/PrintConfig.cpp:1285
+#: src/libslic3r/PrintConfig.cpp:2097
 msgid "Enable"
 msgstr "使能"
 
-#: src/slic3r/GUI/Tab.cpp:1411
+#: src/slic3r/GUI/Tab.cpp:1452
 msgid "Fan settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1412
+#: src/slic3r/GUI/Tab.cpp:1453
 msgid "Fan speed"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1420
+#: src/slic3r/GUI/Tab.cpp:1461
 msgid "Cooling thresholds"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1426
+#: src/slic3r/GUI/Tab.cpp:1467
 msgid "Filament properties"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1430
+#: src/slic3r/GUI/Tab.cpp:1471
 msgid "Print speed override"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1440
+#: src/slic3r/GUI/Tab.cpp:1481
 msgid "Toolchange parameters with single extruder MM printers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1455
+#: src/slic3r/GUI/Tab.cpp:1496
 msgid "Ramming settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1470 src/slic3r/GUI/Tab.cpp:1846
+#: src/slic3r/GUI/Tab.cpp:1514 src/slic3r/GUI/Tab.cpp:1898
 msgid "Custom G-code"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1471 src/slic3r/GUI/Tab.cpp:1847
-#: src/libslic3r/PrintConfig.cpp:1817 src/libslic3r/PrintConfig.cpp:1833
+#: src/slic3r/GUI/Tab.cpp:1515 src/slic3r/GUI/Tab.cpp:1899
+#: src/libslic3r/PrintConfig.cpp:1735 src/libslic3r/PrintConfig.cpp:1750
 msgid "Start G-code"
 msgstr "起始G代�"
 
-#: src/slic3r/GUI/Tab.cpp:1477 src/slic3r/GUI/Tab.cpp:1853
-#: src/libslic3r/PrintConfig.cpp:333 src/libslic3r/PrintConfig.cpp:344
+#: src/slic3r/GUI/Tab.cpp:1521 src/slic3r/GUI/Tab.cpp:1905
+#: src/libslic3r/PrintConfig.cpp:358 src/libslic3r/PrintConfig.cpp:368
 msgid "End G-code"
 msgstr "结尾G代�"
 
-#: src/slic3r/GUI/Tab.cpp:1588 src/slic3r/GUI/Tab.cpp:1642
+#: src/slic3r/GUI/Tab.cpp:1632 src/slic3r/GUI/Tab.cpp:1689
 msgid " Browse "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1605 src/slic3r/GUI/Tab.cpp:1788
+#: src/slic3r/GUI/Tab.cpp:1651 src/slic3r/GUI/Tab.cpp:1838
 msgid "Test"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1615
+#: src/slic3r/GUI/Tab.cpp:1662
 msgid "Could not get a valid Printer Host reference"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1621 src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1668 src/slic3r/GUI/Tab.cpp:1851
 msgid "Success!"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1636
+#: src/slic3r/GUI/Tab.cpp:1683
 msgid ""
 "HTTPS CA file is optional. It is only needed if you use HTTPS with a self-"
 "signed certificate."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1648
+#: src/slic3r/GUI/Tab.cpp:1696
 msgid "Certificate files (*.crt, *.pem)|*.crt;*.pem|All files|*.*"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1649
+#: src/slic3r/GUI/Tab.cpp:1697
 msgid "Open CA certificate file"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1676
+#: src/slic3r/GUI/Tab.cpp:1725
 msgid ""
 "HTTPS CA File:\n"
 "\tOn this system, Slic3r uses HTTPS certificates from the system Certificate "
@@ -2948,250 +3321,254 @@ msgid ""
 "Store / Keychain."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1713 src/slic3r/GUI/Tab.cpp:1912
+#: src/slic3r/GUI/Tab.cpp:1763 src/slic3r/GUI/Tab.cpp:1964
 msgid "Size and coordinates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1717 src/slic3r/GUI/Tab.cpp:1916
-#: src/slic3r/GUI/Tab.cpp:2792
+#: src/slic3r/GUI/Tab.cpp:1767 src/slic3r/GUI/Tab.cpp:1968
+#: src/slic3r/GUI/Tab.cpp:2911
 msgid " Set "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1740
+#: src/slic3r/GUI/Tab.cpp:1790
 msgid "Capabilities"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1745
+#: src/slic3r/GUI/Tab.cpp:1795
 msgid "Number of extruders of the printer."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1773
+#: src/slic3r/GUI/Tab.cpp:1823
 msgid "USB/Serial connection"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1774 src/libslic3r/PrintConfig.cpp:1660
+#: src/slic3r/GUI/Tab.cpp:1824 src/libslic3r/PrintConfig.cpp:1590
 msgid "Serial port"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1779
+#: src/slic3r/GUI/Tab.cpp:1829
 msgid "Rescan serial ports"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1801
+#: src/slic3r/GUI/Tab.cpp:1851
 msgid "Connection to printer works correctly."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1804
+#: src/slic3r/GUI/Tab.cpp:1854
 msgid "Connection failed."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1817 src/slic3r/GUI/Tab.cpp:1961
+#: src/slic3r/GUI/Tab.cpp:1867 src/slic3r/GUI/Tab.cpp:2022
 msgid "Print Host upload"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1859 src/libslic3r/PrintConfig.cpp:92
+#: src/slic3r/GUI/Tab.cpp:1911 src/libslic3r/PrintConfig.cpp:128
 msgid "Before layer change G-code"
 msgstr "层改��的G代�"
 
-#: src/slic3r/GUI/Tab.cpp:1865 src/libslic3r/PrintConfig.cpp:1042
+#: src/slic3r/GUI/Tab.cpp:1917 src/libslic3r/PrintConfig.cpp:1030
 msgid "After layer change G-code"
 msgstr "层�化�G代�"
 
-#: src/slic3r/GUI/Tab.cpp:1871 src/libslic3r/PrintConfig.cpp:2111
+#: src/slic3r/GUI/Tab.cpp:1923 src/libslic3r/PrintConfig.cpp:2005
 msgid "Tool change G-code"
 msgstr "切�工具G代�"
 
-#: src/slic3r/GUI/Tab.cpp:1877
+#: src/slic3r/GUI/Tab.cpp:1929
 msgid "Between objects G-code (for sequential printing)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1938
+#: src/slic3r/GUI/Tab.cpp:1990
 msgid "Display"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:1949 src/slic3r/GUI/Tab.cpp:3102
+#: src/slic3r/GUI/Tab.cpp:2001
+msgid "Tilt"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2002
+msgid "Tilt time"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2008 src/slic3r/GUI/Tab.cpp:3223
 msgid "Corrections"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2011 src/slic3r/GUI/Tab.cpp:2073
-#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1098
-#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1121
-#: src/libslic3r/PrintConfig.cpp:1132 src/libslic3r/PrintConfig.cpp:1143
-#: src/libslic3r/PrintConfig.cpp:1154
+#: src/slic3r/GUI/Tab.cpp:2074 src/slic3r/GUI/Tab.cpp:2136
+#: src/libslic3r/PrintConfig.cpp:1076 src/libslic3r/PrintConfig.cpp:1086
+#: src/libslic3r/PrintConfig.cpp:1096 src/libslic3r/PrintConfig.cpp:1109
+#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1131
+#: src/libslic3r/PrintConfig.cpp:1142
 msgid "Machine limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2025
+#: src/slic3r/GUI/Tab.cpp:2088
 msgid "Values in this column are for Full Power mode"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2026
+#: src/slic3r/GUI/Tab.cpp:2089
 msgid "Full Power"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2031
+#: src/slic3r/GUI/Tab.cpp:2094
 msgid "Values in this column are for Silent mode"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2032
+#: src/slic3r/GUI/Tab.cpp:2095
 msgid "Silent"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2040
+#: src/slic3r/GUI/Tab.cpp:2103
 msgid "Maximum feedrates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2045
+#: src/slic3r/GUI/Tab.cpp:2108
 msgid "Maximum accelerations"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2052
+#: src/slic3r/GUI/Tab.cpp:2115
 msgid "Jerk limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2057
+#: src/slic3r/GUI/Tab.cpp:2120
 msgid "Minimum feedrates"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2095 src/slic3r/GUI/Tab.cpp:2103
+#: src/slic3r/GUI/Tab.cpp:2158 src/slic3r/GUI/Tab.cpp:2166
 msgid "Single extruder MM setup"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2104
+#: src/slic3r/GUI/Tab.cpp:2167
 msgid "Single extruder multimaterial parameters"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2118 src/libslic3r/GCode/PreviewData.cpp:475
+#: src/slic3r/GUI/Tab.cpp:2181 src/libslic3r/GCode/PreviewData.cpp:475
 #, c-format
 msgid "Extruder %d"
 msgstr "挤出头 %d"
 
-#: src/slic3r/GUI/Tab.cpp:2125
+#: src/slic3r/GUI/Tab.cpp:2188
 msgid "Layer height limits"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2130
+#: src/slic3r/GUI/Tab.cpp:2193
 msgid "Position (for multi-extruder printers)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2133
+#: src/slic3r/GUI/Tab.cpp:2196
 msgid "Retraction"
 msgstr "回缩"
 
-#: src/slic3r/GUI/Tab.cpp:2136
+#: src/slic3r/GUI/Tab.cpp:2199
 msgid "Only lift Z"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2149
+#: src/slic3r/GUI/Tab.cpp:2212
 msgid ""
 "Retraction when tool is disabled (advanced settings for multi-extruder "
 "setups)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2153
+#: src/slic3r/GUI/Tab.cpp:2216
 msgid "Preview"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2284
+#: src/slic3r/GUI/Tab.cpp:2352
 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 ""
 
-#: src/slic3r/GUI/Tab.cpp:2286
+#: src/slic3r/GUI/Tab.cpp:2354
 msgid "Firmware Retraction"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2565
+#: src/slic3r/GUI/Tab.cpp:2681
 #, c-format
 msgid "Default preset (%s)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2566
+#: src/slic3r/GUI/Tab.cpp:2682
 #, c-format
 msgid "Preset (%s)"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2583
+#: src/slic3r/GUI/Tab.cpp:2699
 msgid "has the following unsaved changes:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2586
+#: src/slic3r/GUI/Tab.cpp:2702
 msgid "is not compatible with printer"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2587
+#: src/slic3r/GUI/Tab.cpp:2703
 msgid "is not compatible with print profile"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2589
+#: src/slic3r/GUI/Tab.cpp:2705
 msgid "and it has the following unsaved changes:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2592
+#: src/slic3r/GUI/Tab.cpp:2708
 msgid "Discard changes and continue anyway?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2593
+#: src/slic3r/GUI/Tab.cpp:2709
 msgid "Unsaved Changes"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2604
-msgid "It's impossible to print multi-part object(s) with SLA technology."
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2605
+#: src/slic3r/GUI/Tab.cpp:2721
 msgid "Please check your object list before preset changing."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2699
+#: src/slic3r/GUI/Tab.cpp:2801
+msgid "Copy"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:2823
 msgid "The supplied name is empty. It can't be saved."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2704
+#: src/slic3r/GUI/Tab.cpp:2828
 msgid "Cannot overwrite a system profile."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2708
+#: src/slic3r/GUI/Tab.cpp:2832
 msgid "Cannot overwrite an external profile."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2858
 msgid "remove"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2734
+#: src/slic3r/GUI/Tab.cpp:2858
 msgid "delete"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2735
+#: src/slic3r/GUI/Tab.cpp:2859
 msgid "Are you sure you want to "
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2735
+#: src/slic3r/GUI/Tab.cpp:2859
 msgid " the selected preset?"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2736
+#: src/slic3r/GUI/Tab.cpp:2860
 msgid "Remove"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2737
+#: src/slic3r/GUI/Tab.cpp:2861
 msgid " Preset"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2791
-msgid "All"
-msgstr ""
-
-#: src/slic3r/GUI/Tab.cpp:2869
+#: src/slic3r/GUI/Tab.cpp:2989
 msgid ""
 "LOCKED LOCK;indicates that the settings are the same as the system values "
 "for the current option group"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2872
+#: src/slic3r/GUI/Tab.cpp:2992
 msgid ""
 "UNLOCKED LOCK;indicates that some settings were changed and are not equal to "
 "the system values for the current option group.\n"
@@ -3199,13 +3576,13 @@ msgid ""
 "to the system values."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2878
+#: src/slic3r/GUI/Tab.cpp:2998
 msgid ""
 "WHITE BULLET;for the left button: \tindicates a non-system preset,\n"
 "for the right button: \tindicates that the settings hasn't been modified."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2882
+#: src/slic3r/GUI/Tab.cpp:3002
 msgid ""
 "BACK ARROW;indicates that the settings were changed and are not equal to the "
 "last saved preset for the current option group.\n"
@@ -3213,30 +3590,30 @@ msgid ""
 "to the last saved preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2908
+#: src/slic3r/GUI/Tab.cpp:3028
 msgid ""
 "LOCKED LOCK icon indicates that the settings are the same as the system "
 "values for the current option group"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2910
+#: src/slic3r/GUI/Tab.cpp:3030
 msgid ""
 "UNLOCKED LOCK icon indicates that some settings were changed and are not "
 "equal to the system values for the current option group.\n"
 "Click to reset all settings for current option group to the system values."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2913
+#: src/slic3r/GUI/Tab.cpp:3033
 msgid "WHITE BULLET icon indicates a non system preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2916
+#: src/slic3r/GUI/Tab.cpp:3036
 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:2918
+#: src/slic3r/GUI/Tab.cpp:3038
 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"
@@ -3244,124 +3621,140 @@ msgid ""
 "preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2924
+#: src/slic3r/GUI/Tab.cpp:3044
 msgid ""
 "LOCKED LOCK icon indicates that the value is the same as the system value."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2925
+#: src/slic3r/GUI/Tab.cpp:3045
 msgid ""
 "UNLOCKED LOCK icon indicates that the value was changed and is not equal to "
 "the system value.\n"
 "Click to reset current value to the system value."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2931
+#: src/slic3r/GUI/Tab.cpp:3051
 msgid ""
 "WHITE BULLET icon indicates that the value is the same as in the last saved "
 "preset."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:2932
+#: src/slic3r/GUI/Tab.cpp:3052
 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 ""
 
-#: src/slic3r/GUI/Tab.cpp:3031
+#: src/slic3r/GUI/Tab.cpp:3152
 msgid " as:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3075
+#: src/slic3r/GUI/Tab.cpp:3196
 msgid "the following postfix are not allowed:"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3079
+#: src/slic3r/GUI/Tab.cpp:3200
 msgid "The supplied name is not available."
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3092
+#: src/slic3r/GUI/Tab.cpp:3213
 msgid "Material"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3094 src/slic3r/GUI/Tab.cpp:3176
+#: src/slic3r/GUI/Tab.cpp:3215 src/slic3r/GUI/Tab.cpp:3305
 msgid "Layers"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3098
+#: src/slic3r/GUI/Tab.cpp:3219
 msgid "Exposure"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3183
+#: src/slic3r/GUI/Tab.cpp:3313
 msgid "Support head"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3188
+#: src/slic3r/GUI/Tab.cpp:3318
 msgid "Support pillar"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3196
+#: src/slic3r/GUI/Tab.cpp:3328
 msgid "Connection of the support sticks and junctions"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.cpp:3200
+#: src/slic3r/GUI/Tab.cpp:3333
 msgid "Automatic generation"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:293 src/slic3r/GUI/Tab.hpp:381
+#: src/slic3r/GUI/Tab.cpp:3395
+msgid "Head penetration should not be greater than the head width."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3396
+msgid "Invalid Head penetration"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3408
+msgid "Pinhead diameter should be smaller than the pillar diameter."
+msgstr ""
+
+#: src/slic3r/GUI/Tab.cpp:3409
+msgid "Invalid pinhead diameter"
+msgstr ""
+
+#: src/slic3r/GUI/Tab.hpp:307 src/slic3r/GUI/Tab.hpp:395
 msgid "Print Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:311
+#: src/slic3r/GUI/Tab.hpp:325
 msgid "Filament Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:344
+#: src/slic3r/GUI/Tab.hpp:358
 msgid "Printer Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:367
+#: src/slic3r/GUI/Tab.hpp:381
 msgid "Material Settings"
 msgstr ""
 
-#: src/slic3r/GUI/Tab.hpp:393
+#: src/slic3r/GUI/Tab.hpp:407
 msgid "Save preset"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
+#: src/slic3r/GUI/UpdateDialogs.cpp:29
 msgid "Update available"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:28
+#: src/slic3r/GUI/UpdateDialogs.cpp:29
 msgid "New version of Slic3r PE is available"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:35
+#: src/slic3r/GUI/UpdateDialogs.cpp:36
 msgid "To download, follow the link below."
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:42
+#: src/slic3r/GUI/UpdateDialogs.cpp:44
 msgid "Current version:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:44
+#: src/slic3r/GUI/UpdateDialogs.cpp:46
 msgid "New version:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:52
+#: src/slic3r/GUI/UpdateDialogs.cpp:54
 msgid "Don't notify about new releases any more"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70 src/slic3r/GUI/UpdateDialogs.cpp:162
+#: src/slic3r/GUI/UpdateDialogs.cpp:72 src/slic3r/GUI/UpdateDialogs.cpp:164
 msgid "Configuration update"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:70
+#: src/slic3r/GUI/UpdateDialogs.cpp:72
 msgid "Configuration update is available"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:73
+#: src/slic3r/GUI/UpdateDialogs.cpp:75
 msgid ""
 "Would you like to install it?\n"
 "\n"
@@ -3371,15 +3764,15 @@ msgid ""
 "Updated configuration bundles:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
 msgid "Slic3r incompatibility"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:109
+#: src/slic3r/GUI/UpdateDialogs.cpp:111
 msgid "Slic3r configuration is incompatible"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:112
+#: src/slic3r/GUI/UpdateDialogs.cpp:114
 msgid ""
 "This version of Slic3r PE is not compatible with currently installed "
 "configuration bundles.\n"
@@ -3391,24 +3784,24 @@ msgid ""
 "existing configuration before installing files compatible with this Slic3r.\n"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:121
+#: src/slic3r/GUI/UpdateDialogs.cpp:123
 #, c-format
 msgid "This Slic3r PE version: %s"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:126
+#: src/slic3r/GUI/UpdateDialogs.cpp:128
 msgid "Incompatible bundles:"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:142
+#: src/slic3r/GUI/UpdateDialogs.cpp:144
 msgid "Exit Slic3r"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:145
+#: src/slic3r/GUI/UpdateDialogs.cpp:147
 msgid "Re-configure"
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:166
+#: src/slic3r/GUI/UpdateDialogs.cpp:168
 #, c-format
 msgid ""
 "Slic3r PE now uses an updated configuration structure.\n"
@@ -3424,15 +3817,15 @@ msgid ""
 "choose whether to enable automatic preset updates."
 msgstr ""
 
-#: src/slic3r/GUI/UpdateDialogs.cpp:182
+#: src/slic3r/GUI/UpdateDialogs.cpp:184
 msgid "For more information please visit our wiki page:"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:10
+#: src/slic3r/GUI/WipeTowerDialog.cpp:14
 msgid "Ramming customization"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:36
+#: src/slic3r/GUI/WipeTowerDialog.cpp:40
 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 "
@@ -3445,63 +3838,63 @@ msgid ""
 "jams, extruder wheel grinding into filament etc."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:78
+#: src/slic3r/GUI/WipeTowerDialog.cpp:82
 msgid "Total ramming time"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:80
+#: src/slic3r/GUI/WipeTowerDialog.cpp:84
 msgid "Total rammed volume"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:84
+#: src/slic3r/GUI/WipeTowerDialog.cpp:88
 msgid "Ramming line width"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:86
+#: src/slic3r/GUI/WipeTowerDialog.cpp:90
 msgid "Ramming line spacing"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:138
+#: src/slic3r/GUI/WipeTowerDialog.cpp:141
 msgid "Wipe tower - Purging volume adjustment"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:219
+#: src/slic3r/GUI/WipeTowerDialog.cpp:225
 msgid ""
 "Here you can adjust required purging volume (mm³) for any given pair of "
 "tools."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:220
+#: src/slic3r/GUI/WipeTowerDialog.cpp:226
 msgid "Extruder changed to"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:228
+#: src/slic3r/GUI/WipeTowerDialog.cpp:234
 msgid "unloaded"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:229
+#: src/slic3r/GUI/WipeTowerDialog.cpp:235
 msgid "loaded"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:234
+#: src/slic3r/GUI/WipeTowerDialog.cpp:240
 msgid "Tool #"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:241
+#: src/slic3r/GUI/WipeTowerDialog.cpp:247
 msgid ""
 "Total purging volume is calculated by summing two values below, depending on "
 "which tools are loaded/unloaded."
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:242
+#: src/slic3r/GUI/WipeTowerDialog.cpp:248
 msgid "Volume to purge (mm³) when the filament is being"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:256
+#: src/slic3r/GUI/WipeTowerDialog.cpp:262
 msgid "From"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:321
+#: src/slic3r/GUI/WipeTowerDialog.cpp:327
 msgid ""
 "Switching to simple settings will discard changes done in the advanced "
 "mode!\n"
@@ -3509,57 +3902,87 @@ msgid ""
 "Do you want to proceed?"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show simplified settings"
 msgstr ""
 
-#: src/slic3r/GUI/WipeTowerDialog.cpp:333
+#: src/slic3r/GUI/WipeTowerDialog.cpp:339
 msgid "Show advanced settings"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:65
+#: src/slic3r/GUI/wxExtensions.cpp:2398
+#, c-format
+msgid "Switch to the %s mode"
+msgstr ""
+
+#: src/slic3r/GUI/wxExtensions.cpp:2399
+#, c-format
+msgid "Current mode is %s"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:51
+msgid "Connection to Duet works correctly."
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:56
+msgid "Could not connect to Duet"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:84 src/slic3r/Utils/Duet.cpp:154
+msgid "Unknown error occured"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:148
+msgid "Wrong password"
+msgstr ""
+
+#: src/slic3r/Utils/Duet.cpp:151
+msgid "Could not get resources to create a new connection"
+msgstr ""
+
+#: src/slic3r/Utils/OctoPrint.cpp:69
 #, c-format
 msgid "Mismatched type of print host: %s"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:80
+#: src/slic3r/Utils/OctoPrint.cpp:84
 msgid "Connection to OctoPrint works correctly."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Could not connect to OctoPrint"
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:86
+#: src/slic3r/Utils/OctoPrint.cpp:90
 msgid "Note: OctoPrint version at least 1.1.0 is required."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:181
+#: src/slic3r/Utils/OctoPrint.cpp:195
 msgid "Connection to Prusa SLA works correctly."
 msgstr ""
 
-#: src/slic3r/Utils/OctoPrint.cpp:186
+#: src/slic3r/Utils/OctoPrint.cpp:200
 msgid "Could not connect to Prusa SLA"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:571
+#: src/slic3r/Utils/PresetUpdater.cpp:583
 #, c-format
 msgid "requires min. %s and max. %s"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:576
+#: src/slic3r/Utils/PresetUpdater.cpp:588
 #, c-format
 msgid "requires min. %s"
 msgstr ""
 
-#: src/slic3r/Utils/PresetUpdater.cpp:578
+#: src/slic3r/Utils/PresetUpdater.cpp:590
 #, c-format
 msgid "requires max. %s"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:219
-#: src/slic3r/Utils/FixModelByWin10.cpp:349
-msgid "Exporting the source model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:359
+msgid "Exporting source model"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:235
@@ -3567,7 +3990,7 @@ msgid "Failed loading the input model."
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:242
-msgid "Repairing the model by the Netfabb service"
+msgid "Repairing model by the Netfabb service"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:248
@@ -3575,8 +3998,8 @@ msgid "Mesh repair failed."
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:251
-#: src/slic3r/Utils/FixModelByWin10.cpp:367
-msgid "Loading the repaired model"
+#: src/slic3r/Utils/FixModelByWin10.cpp:378
+msgid "Loading repaired model"
 msgstr ""
 
 #: src/slic3r/Utils/FixModelByWin10.cpp:263
@@ -3585,124 +4008,308 @@ msgstr ""
 msgid "Saving mesh into the 3MF container failed."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:334
+#: src/slic3r/Utils/FixModelByWin10.cpp:340
 msgid "Model fixing"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:335
+#: src/slic3r/Utils/FixModelByWin10.cpp:341
 msgid "Exporting model..."
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:357
+#: src/slic3r/Utils/FixModelByWin10.cpp:368
 msgid "Export of a temporary 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:372
+#: src/slic3r/Utils/FixModelByWin10.cpp:383
 msgid "Import of the repaired 3mf file failed"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:375
+#: src/slic3r/Utils/FixModelByWin10.cpp:385
+msgid "Repaired 3MF file does not contain any object"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:387
+msgid "Repaired 3MF file contains more than one object"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:389
+msgid "Repaired 3MF file does not contain any volume"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:391
+msgid "Repaired 3MF file contains more than one volume"
+msgstr ""
+
+#: src/slic3r/Utils/FixModelByWin10.cpp:400
 msgid "Model repair finished"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:379
+#: src/slic3r/Utils/FixModelByWin10.cpp:406
 msgid "Model repair canceled"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
 msgid "Model repaired successfully"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:396
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:423
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model Repair by the Netfabb service"
 msgstr ""
 
-#: src/slic3r/Utils/FixModelByWin10.cpp:399
+#: src/slic3r/Utils/FixModelByWin10.cpp:426
 msgid "Model repair failed: \n"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1175
+#: src/libslic3r/Zipper.cpp:35
+msgid "undefined error"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:37
+msgid "too many files"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:39
+msgid "file too large"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:41
+msgid "unsupported method"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:43
+msgid "unsupported encryption"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:45
+msgid "unsupported feature"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:47
+msgid "failed finding central directory"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:49
+msgid "not a ZIP archive"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:51
+msgid "invalid header or archive is corrupted"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:53
+msgid "unsupported multidisk archive"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:55
+msgid "decompression failed or archive is corrupted"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:57
+msgid "compression failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:59
+msgid "unexpected decompressed size"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:61
+msgid "CRC-32 check failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:63
+msgid "unsupported central directory size"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:65
+msgid "allocation failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:67
+msgid "file open failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:69
+msgid "file create failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:71
+msgid "file write failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:73
+msgid "file read failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:75
+msgid "file close failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:77
+msgid "file seek failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:79
+msgid "file stat failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:81
+msgid "invalid parameter"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:83
+msgid "invalid filename"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:85
+msgid "buffer too small"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:87
+msgid "internal error"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:89
+msgid "file not found"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:91
+msgid "archive is too large"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:93
+msgid "validation failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:95
+msgid "write calledback failed"
+msgstr ""
+
+#: src/libslic3r/Zipper.cpp:105
+msgid "Error with zip archive"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2153
+msgid "Starting"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2154
+msgid "Filtering"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2155
+msgid "Generate pinheads"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2156
+msgid "Classification"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2157
+msgid "Routing to ground"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2158
+msgid "Routing supports to model surface"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2159
+msgid "Cascading pillars"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2160
+msgid "Processing small holes"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2161
+msgid "Done"
+msgstr ""
+
+#: src/libslic3r/SLA/SLASupportTree.cpp:2162
+msgid "Abort"
+msgstr ""
+
+#: src/libslic3r/Print.cpp:1136
 msgid "All objects are outside of the print volume."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1201
+#: src/libslic3r/Print.cpp:1165
 msgid "Some objects are too close; your extruder will collide with them."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1216
+#: src/libslic3r/Print.cpp:1180
 msgid ""
 "Some objects are too tall and cannot be printed without extruder collisions."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1226
+#: src/libslic3r/Print.cpp:1190
 msgid "The Spiral Vase option can only be used when printing a single object."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1228
+#: src/libslic3r/Print.cpp:1192
 msgid ""
 "The Spiral Vase option can only be used when printing single material "
 "objects."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1234
+#: src/libslic3r/Print.cpp:1198
 msgid ""
 "All extruders must have the same diameter for single extruder multimaterial "
 "printer."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1239
+#: src/libslic3r/Print.cpp:1203
 msgid ""
 "The Wipe Tower is currently only supported for the Marlin, RepRap/Sprinter "
 "and Repetier G-code flavors."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1241
+#: src/libslic3r/Print.cpp:1205
 msgid ""
 "The Wipe Tower is currently only supported with the relative extruder "
 "addressing (use_relative_e_distances=1)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1253
+#: src/libslic3r/Print.cpp:1226
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they have equal "
 "layer heigths"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1255
+#: src/libslic3r/Print.cpp:1228
 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:1257
+#: src/libslic3r/Print.cpp:1230
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are printed "
 "with the same support_material_contact_distance"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1259
+#: src/libslic3r/Print.cpp:1232
 msgid ""
 "The Wipe Tower is only supported for multiple objects if they are sliced "
 "equally."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1281
+#: src/libslic3r/Print.cpp:1261
 msgid ""
 "The Wipe tower is only supported if all objects have the same layer height "
 "profile"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1290
+#: src/libslic3r/Print.cpp:1271
 msgid "The supplied settings will cause an empty print."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1307
+#: src/libslic3r/Print.cpp:1288
 msgid ""
 "One or more object were assigned an extruder that the printer does not have."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1316
+#: src/libslic3r/Print.cpp:1297
 msgid ""
 "Printing with multiple extruders of differing nozzle diameters. If support "
 "is to be printed with the current extruder (support_material_extruder == 0 "
@@ -3710,13 +4317,13 @@ msgid ""
 "same diameter."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1324
+#: src/libslic3r/Print.cpp:1305
 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:1328
+#: src/libslic3r/Print.cpp:1309
 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 "
@@ -3724,27 +4331,82 @@ msgid ""
 "set to 0)."
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1335
+#: src/libslic3r/Print.cpp:1316
 msgid "first_layer_height"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1350
+#: src/libslic3r/Print.cpp:1331
 msgid "First layer height can't be greater than nozzle diameter"
 msgstr ""
 
-#: src/libslic3r/Print.cpp:1354
+#: src/libslic3r/Print.cpp:1335
 msgid "Layer height can't be greater than nozzle diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:32 src/libslic3r/PrintConfig.cpp:33
+#: src/libslic3r/SLAPrint.cpp:55
+msgid "Slicing model"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:56 src/libslic3r/SLAPrint.cpp:801
+msgid "Generating support points"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:57
+msgid "Generating support tree"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:58
+msgid "Generating pad"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:59
+msgid "Slicing supports"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:71
+msgid "Merging slices and calculating statistics"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:72
+msgid "Rasterizing layers"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:605
+msgid ""
+"Cannot proceed without support points! Add support points or disable support "
+"generation."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:617
+msgid "Elevation is too low for object."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:699
+msgid "Slicing had to be stopped due to an internal error."
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:849 src/libslic3r/SLAPrint.cpp:859
+#: src/libslic3r/SLAPrint.cpp:907
+msgid "Visualizing supports"
+msgstr ""
+
+#: src/libslic3r/SLAPrint.cpp:1449
+msgid "Slicing done"
+msgstr ""
+
+#: src/libslic3r/PrintBase.cpp:65
+msgid "Failed processing of the output_filename_format template."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:42 src/libslic3r/PrintConfig.cpp:43
 msgid "Printer technology"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:41
+#: src/libslic3r/PrintConfig.cpp:50
 msgid "Bed shape"
 msgstr "机床形状"
 
-#: src/libslic3r/PrintConfig.cpp:48
+#: src/libslic3r/PrintConfig.cpp:57
 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."
@@ -3752,21 +4414,52 @@ msgstr ""
 "该�数控制切片的高度（因此也控制总层数）。较薄的切片�以使精度更高，但花费的"
 "打�时间也更长。"
 
-#: src/libslic3r/PrintConfig.cpp:56
+#: src/libslic3r/PrintConfig.cpp:64
 msgid "Max print height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:57
+#: src/libslic3r/PrintConfig.cpp:65
 msgid ""
 "Set this to the maximum height that can be reached by your extruder while "
 "printing."
 msgstr ""
 
+#: src/libslic3r/PrintConfig.cpp:71
+msgid "Slice gap closing radius"
+msgstr ""
+
 #: src/libslic3r/PrintConfig.cpp:73
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:81
+msgid "Hostname, IP or URL"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:82
+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."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:88
+msgid "API Key / Password"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:89
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:111
 msgid "Avoid crossing perimeters"
 msgstr "��跨越轮廓"
 
-#: src/libslic3r/PrintConfig.cpp:74
+#: src/libslic3r/PrintConfig.cpp:112
 msgid ""
 "Optimize travel moves in order to minimize the crossing of perimeters. This "
 "is mostly useful with Bowden extruders which suffer from oozing. This "
@@ -3775,21 +4468,21 @@ msgstr ""
 "为了尽��少跨越轮廓，优化空程的移动方�。这�常适用于�渗�问题影�的�登挤"
 "出头。此功能会�慢打�速度和 G 代�生�速度。"
 
-#: src/libslic3r/PrintConfig.cpp:82 src/libslic3r/PrintConfig.cpp:2080
+#: src/libslic3r/PrintConfig.cpp:119 src/libslic3r/PrintConfig.cpp:1976
 msgid "Other layers"
 msgstr "其它层"
 
-#: src/libslic3r/PrintConfig.cpp:83
+#: src/libslic3r/PrintConfig.cpp:120
 msgid ""
 "Bed temperature for layers after the first one. Set this to zero to disable "
 "bed temperature control commands in the output."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:86
+#: src/libslic3r/PrintConfig.cpp:122
 msgid "Bed temperature"
 msgstr "机床温度"
 
-#: src/libslic3r/PrintConfig.cpp:93
+#: src/libslic3r/PrintConfig.cpp:129
 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 "
@@ -3798,11 +4491,11 @@ msgstr ""
 "这段自定义代�在层改�，�Z轴移动��入。注�除了�以使用[layer_num]和"
 "[layer_z]，也�以使用��符��替代所有的slic3r设置。"
 
-#: src/libslic3r/PrintConfig.cpp:104
+#: src/libslic3r/PrintConfig.cpp:139
 msgid "Between objects G-code"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:105
+#: src/libslic3r/PrintConfig.cpp:140
 msgid ""
 "This code is inserted between objects when using sequential printing. By "
 "default extruder and bed temperature are reset using non-wait command; "
@@ -3812,73 +4505,69 @@ msgid ""
 "S[first_layer_temperature]\" command wherever you want."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:114
-msgctxt "Layers"
-msgid "Bottom"
-msgstr "底部"
-
-#: src/libslic3r/PrintConfig.cpp:116
+#: src/libslic3r/PrintConfig.cpp:150
 msgid "Number of solid layers to generate on bottom surfaces."
 msgstr "底部表�生�的��层数。"
 
-#: src/libslic3r/PrintConfig.cpp:118
+#: src/libslic3r/PrintConfig.cpp:151
 msgid "Bottom solid layers"
 msgstr "底部��层"
 
-#: src/libslic3r/PrintConfig.cpp:123
+#: src/libslic3r/PrintConfig.cpp:156
 msgid "Bridge"
 msgstr "æ¡¥"
 
-#: src/libslic3r/PrintConfig.cpp:124
+#: src/libslic3r/PrintConfig.cpp:157
 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:126 src/libslic3r/PrintConfig.cpp:274
-#: src/libslic3r/PrintConfig.cpp:819 src/libslic3r/PrintConfig.cpp:941
-#: src/libslic3r/PrintConfig.cpp:1100 src/libslic3r/PrintConfig.cpp:1145
-#: src/libslic3r/PrintConfig.cpp:1156 src/libslic3r/PrintConfig.cpp:1386
+#: src/libslic3r/PrintConfig.cpp:159 src/libslic3r/PrintConfig.cpp:302
+#: src/libslic3r/PrintConfig.cpp:814 src/libslic3r/PrintConfig.cpp:935
+#: src/libslic3r/PrintConfig.cpp:1088 src/libslic3r/PrintConfig.cpp:1133
+#: src/libslic3r/PrintConfig.cpp:1144 src/libslic3r/PrintConfig.cpp:1333
 msgid "mm/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:133
+#: src/libslic3r/PrintConfig.cpp:165
 msgid "Bridging angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:135
+#: src/libslic3r/PrintConfig.cpp:167
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:138 src/libslic3r/PrintConfig.cpp:734
-#: src/libslic3r/PrintConfig.cpp:1637 src/libslic3r/PrintConfig.cpp:1648
-#: src/libslic3r/PrintConfig.cpp:1896 src/libslic3r/PrintConfig.cpp:2063
-#: src/libslic3r/PrintConfig.cpp:2578
+#: src/libslic3r/PrintConfig.cpp:170 src/libslic3r/PrintConfig.cpp:732
+#: src/libslic3r/PrintConfig.cpp:1569 src/libslic3r/PrintConfig.cpp:1579
+#: src/libslic3r/PrintConfig.cpp:1807 src/libslic3r/PrintConfig.cpp:1961
+#: src/libslic3r/PrintConfig.cpp:2459
 msgid "°"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:145
+#: src/libslic3r/PrintConfig.cpp:176
 msgid "Bridges fan speed"
 msgstr "桥风扇速度"
 
-#: src/libslic3r/PrintConfig.cpp:146
+#: src/libslic3r/PrintConfig.cpp:177
 msgid "This fan speed is enforced during all bridges and overhangs."
 msgstr "此项为在打�所有桥和悬垂部�时的风扇速度。"
 
-#: src/libslic3r/PrintConfig.cpp:147 src/libslic3r/PrintConfig.cpp:747
-#: src/libslic3r/PrintConfig.cpp:1165 src/libslic3r/PrintConfig.cpp:1232
-#: src/libslic3r/PrintConfig.cpp:1517
+#: src/libslic3r/PrintConfig.cpp:178 src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1216
+#: src/libslic3r/PrintConfig.cpp:1461 src/libslic3r/PrintConfig.cpp:2258
+#: src/libslic3r/PrintConfig.cpp:2498
 msgid "%"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:155
+#: src/libslic3r/PrintConfig.cpp:185
 msgid "Bridge flow ratio"
 msgstr "桥��比"
 
-#: src/libslic3r/PrintConfig.cpp:157
+#: src/libslic3r/PrintConfig.cpp:187
 msgid ""
 "This factor affects the amount of plastic for bridging. You can decrease it "
 "slightly to pull the extrudates and prevent sagging, although default "
@@ -3888,83 +4577,83 @@ msgstr ""
 "此因素影�桥接部�的塑料用�。�以略微�少该值以回撤挤出物��滴垂。但默认设"
 "置通常�说已��以满足使用，在修改�需通过冷�（使用风扇）进行测试。"
 
-#: src/libslic3r/PrintConfig.cpp:168
+#: src/libslic3r/PrintConfig.cpp:197
 msgid "Bridges"
 msgstr "桥接处"
 
-#: src/libslic3r/PrintConfig.cpp:170
+#: src/libslic3r/PrintConfig.cpp:199
 msgid "Speed for printing bridges."
 msgstr "打�桥接处的速度。"
 
-#: src/libslic3r/PrintConfig.cpp:171 src/libslic3r/PrintConfig.cpp:564
-#: src/libslic3r/PrintConfig.cpp:573 src/libslic3r/PrintConfig.cpp:583
-#: src/libslic3r/PrintConfig.cpp:592 src/libslic3r/PrintConfig.cpp:623
-#: src/libslic3r/PrintConfig.cpp:644 src/libslic3r/PrintConfig.cpp:884
-#: src/libslic3r/PrintConfig.cpp:1013 src/libslic3r/PrintConfig.cpp:1090
-#: src/libslic3r/PrintConfig.cpp:1110 src/libslic3r/PrintConfig.cpp:1123
-#: src/libslic3r/PrintConfig.cpp:1134 src/libslic3r/PrintConfig.cpp:1189
-#: src/libslic3r/PrintConfig.cpp:1252 src/libslic3r/PrintConfig.cpp:1418
-#: src/libslic3r/PrintConfig.cpp:1601 src/libslic3r/PrintConfig.cpp:1611
-#: src/libslic3r/PrintConfig.cpp:2041 src/libslic3r/PrintConfig.cpp:2160
+#: src/libslic3r/PrintConfig.cpp:200 src/libslic3r/PrintConfig.cpp:576
+#: src/libslic3r/PrintConfig.cpp:584 src/libslic3r/PrintConfig.cpp:593
+#: src/libslic3r/PrintConfig.cpp:601 src/libslic3r/PrintConfig.cpp:628
+#: src/libslic3r/PrintConfig.cpp:647 src/libslic3r/PrintConfig.cpp:873
+#: src/libslic3r/PrintConfig.cpp:1000 src/libslic3r/PrintConfig.cpp:1078
+#: src/libslic3r/PrintConfig.cpp:1098 src/libslic3r/PrintConfig.cpp:1111
+#: src/libslic3r/PrintConfig.cpp:1122 src/libslic3r/PrintConfig.cpp:1175
+#: src/libslic3r/PrintConfig.cpp:1234 src/libslic3r/PrintConfig.cpp:1362
+#: src/libslic3r/PrintConfig.cpp:1536 src/libslic3r/PrintConfig.cpp:1545
+#: src/libslic3r/PrintConfig.cpp:1940 src/libslic3r/PrintConfig.cpp:2051
 msgid "mm/s"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:178
+#: src/libslic3r/PrintConfig.cpp:207
 msgid "Brim width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:179
+#: src/libslic3r/PrintConfig.cpp:208
 msgid ""
 "Horizontal width of the brim that will be printed around each object on the "
 "first layer."
 msgstr "第一层�个物体周围打�的裙边水平宽度。"
 
-#: src/libslic3r/PrintConfig.cpp:187
+#: src/libslic3r/PrintConfig.cpp:215
 msgid "Clip multi-part objects"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:188
+#: src/libslic3r/PrintConfig.cpp:216
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:196
+#: src/libslic3r/PrintConfig.cpp:223
 msgid "Colorprint height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:197
+#: src/libslic3r/PrintConfig.cpp:224
 msgid "Heights at which a filament change is to occur. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:207
+#: src/libslic3r/PrintConfig.cpp:234
 msgid "Compatible printers condition"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:208
+#: src/libslic3r/PrintConfig.cpp:235
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:220
+#: src/libslic3r/PrintConfig.cpp:249
 msgid "Compatible print profiles condition"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:221
+#: src/libslic3r/PrintConfig.cpp:250
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:235
+#: src/libslic3r/PrintConfig.cpp:267
 msgid "Complete individual objects"
 msgstr "打�完��个物体"
 
-#: src/libslic3r/PrintConfig.cpp:236
+#: src/libslic3r/PrintConfig.cpp:268
 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). "
@@ -3975,33 +4664,33 @@ msgstr ""
 "（从底层开始）。此选项利于��打�掉物体。Slic3r应该给出警示，��挤出头碰"
 "撞，但请�心。"
 
-#: src/libslic3r/PrintConfig.cpp:245
+#: src/libslic3r/PrintConfig.cpp:276
 msgid "Enable auto cooling"
 msgstr "自动冷�使能"
 
-#: src/libslic3r/PrintConfig.cpp:246
+#: src/libslic3r/PrintConfig.cpp:277
 msgid ""
 "This flag enables the automatic cooling logic that adjusts print speed and "
 "fan speed according to layer printing time."
 msgstr "该选项�动自动冷�，使得�根�层打�时间调整打�速度和风扇速度。"
 
-#: src/libslic3r/PrintConfig.cpp:252
+#: src/libslic3r/PrintConfig.cpp:282
 msgid "Cooling tube position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:253
+#: src/libslic3r/PrintConfig.cpp:283
 msgid "Distance of the center-point of the cooling tube from the extruder tip "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:261
+#: src/libslic3r/PrintConfig.cpp:290
 msgid "Cooling tube length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:262
+#: src/libslic3r/PrintConfig.cpp:291
 msgid "Length of the cooling tube to limit space for cooling moves inside it "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:271
+#: src/libslic3r/PrintConfig.cpp:299
 msgid ""
 "This is the acceleration your printer will be reset to after the role-"
 "specific acceleration values are used (perimeter/infill). Set zero to "
@@ -4010,81 +4699,81 @@ msgstr ""
 "该值为打�机在使用了特定的加速度值（如轮廓/填充）�将�置的加速度值。设为0以"
 "防止�置加速度。"
 
-#: src/libslic3r/PrintConfig.cpp:281
+#: src/libslic3r/PrintConfig.cpp:308
 msgid "Default filament profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:282
+#: src/libslic3r/PrintConfig.cpp:309
 msgid ""
 "Default filament profile associated with the current printer profile. On "
 "selection of the current printer profile, this filament profile will be "
 "activated."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:287
+#: src/libslic3r/PrintConfig.cpp:315
 msgid "Default print profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:288 src/libslic3r/PrintConfig.cpp:2469
-#: src/libslic3r/PrintConfig.cpp:2479
+#: src/libslic3r/PrintConfig.cpp:316 src/libslic3r/PrintConfig.cpp:2337
+#: src/libslic3r/PrintConfig.cpp:2348
 msgid ""
 "Default print profile associated with the current printer profile. On "
 "selection of the current printer profile, this print profile will be "
 "activated."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:293
+#: src/libslic3r/PrintConfig.cpp:322
 msgid "Disable fan for the first"
 msgstr "�几层�用风扇"
 
-#: src/libslic3r/PrintConfig.cpp:294
+#: src/libslic3r/PrintConfig.cpp:323
 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:296 src/libslic3r/PrintConfig.cpp:952
-#: src/libslic3r/PrintConfig.cpp:1487 src/libslic3r/PrintConfig.cpp:1691
-#: src/libslic3r/PrintConfig.cpp:1757 src/libslic3r/PrintConfig.cpp:1935
-#: src/libslic3r/PrintConfig.cpp:1985
+#: src/libslic3r/PrintConfig.cpp:325 src/libslic3r/PrintConfig.cpp:945
+#: src/libslic3r/PrintConfig.cpp:1434 src/libslic3r/PrintConfig.cpp:1619
+#: src/libslic3r/PrintConfig.cpp:1680 src/libslic3r/PrintConfig.cpp:1843
+#: src/libslic3r/PrintConfig.cpp:1888
 msgid "layers"
 msgstr "层"
 
-#: src/libslic3r/PrintConfig.cpp:304
+#: src/libslic3r/PrintConfig.cpp:332
 msgid "Don't support bridges"
 msgstr "�支�桥接"
 
-#: src/libslic3r/PrintConfig.cpp:306
+#: src/libslic3r/PrintConfig.cpp:334
 msgid ""
 "Experimental option for preventing support material from being generated "
 "under bridged areas."
 msgstr "试验项，在桥接处�止生�支撑�料。"
 
-#: src/libslic3r/PrintConfig.cpp:313
+#: src/libslic3r/PrintConfig.cpp:340
 msgid "Distance between copies"
 msgstr "�制物体之间的�离"
 
-#: src/libslic3r/PrintConfig.cpp:314
+#: src/libslic3r/PrintConfig.cpp:341
 msgid "Distance used for the auto-arrange feature of the plater."
 msgstr "自动分布时所使用的�离。"
 
-#: src/libslic3r/PrintConfig.cpp:322
+#: src/libslic3r/PrintConfig.cpp:348
 msgid "Elephant foot compensation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:324
+#: src/libslic3r/PrintConfig.cpp:350
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:334
+#: src/libslic3r/PrintConfig.cpp:359
 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�数使用��符��。"
 
-#: src/libslic3r/PrintConfig.cpp:345
+#: src/libslic3r/PrintConfig.cpp:369
 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 "
@@ -4094,53 +4783,63 @@ msgstr ""
 "该部分将被�入输出文件的结尾，但在打�机结尾G代�之�。注��以对所有Slic3r�"
 "数使用��符��代替。如果有多个打�头，G代�将按打�头的顺��处�。"
 
-#: src/libslic3r/PrintConfig.cpp:356
+#: src/libslic3r/PrintConfig.cpp:379
 msgid "Ensure vertical shell thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:358
+#: src/libslic3r/PrintConfig.cpp:381
 msgid ""
 "Add solid infill near sloping surfaces to guarantee the vertical shell "
 "thickness (top+bottom solid layers)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:365
-msgid "Top/bottom fill pattern"
-msgstr "顶部/底部填充样�"
+#: src/libslic3r/PrintConfig.cpp:387
+msgid "Top fill pattern"
+msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:367
+#: src/libslic3r/PrintConfig.cpp:389
 msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
-msgstr "对顶部/底部内部填充的类型。这将影�外围��层，�影�其相邻的��层。"
+"Fill pattern for top infill. This only affects the top visible layer, and "
+"not its adjacent solid shells."
+msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:376 src/libslic3r/PrintConfig.cpp:800
-#: src/libslic3r/PrintConfig.cpp:2021
+#: src/libslic3r/PrintConfig.cpp:397 src/libslic3r/PrintConfig.cpp:795
+#: src/libslic3r/PrintConfig.cpp:1921
 msgid "Rectilinear"
 msgstr "折线�"
 
-#: src/libslic3r/PrintConfig.cpp:377 src/libslic3r/PrintConfig.cpp:806
+#: src/libslic3r/PrintConfig.cpp:398 src/libslic3r/PrintConfig.cpp:801
 msgid "Concentric"
 msgstr "�轴�"
 
-#: src/libslic3r/PrintConfig.cpp:378 src/libslic3r/PrintConfig.cpp:810
+#: src/libslic3r/PrintConfig.cpp:399 src/libslic3r/PrintConfig.cpp:805
 msgid "Hilbert Curve"
 msgstr "希尔伯特曲线�"
 
-#: src/libslic3r/PrintConfig.cpp:379 src/libslic3r/PrintConfig.cpp:811
+#: src/libslic3r/PrintConfig.cpp:400 src/libslic3r/PrintConfig.cpp:806
 msgid "Archimedean Chords"
 msgstr "阿基米德和铉�"
 
 # Not so sure about how to put "Octagram Spiral"  in Chinese. Or maybe "Octagram螺旋“ is good.
-#: src/libslic3r/PrintConfig.cpp:380 src/libslic3r/PrintConfig.cpp:812
+#: src/libslic3r/PrintConfig.cpp:401 src/libslic3r/PrintConfig.cpp:807
 msgid "Octagram Spiral"
 msgstr "八角星螺旋�"
 
-#: src/libslic3r/PrintConfig.cpp:386 src/libslic3r/PrintConfig.cpp:397
+#: src/libslic3r/PrintConfig.cpp:408
+msgid "Bottom fill pattern"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:409
+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:414 src/libslic3r/PrintConfig.cpp:424
 msgid "External perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:388
+#: src/libslic3r/PrintConfig.cpp:416
 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, "
@@ -4148,41 +4847,41 @@ msgid ""
 "(for example 200%), it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:391 src/libslic3r/PrintConfig.cpp:841
-#: src/libslic3r/PrintConfig.cpp:975 src/libslic3r/PrintConfig.cpp:1408
-#: src/libslic3r/PrintConfig.cpp:1769 src/libslic3r/PrintConfig.cpp:1958
-#: src/libslic3r/PrintConfig.cpp:2129
+#: src/libslic3r/PrintConfig.cpp:419 src/libslic3r/PrintConfig.cpp:834
+#: src/libslic3r/PrintConfig.cpp:966 src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1691 src/libslic3r/PrintConfig.cpp:1864
+#: src/libslic3r/PrintConfig.cpp:2022
 msgid "mm or % (leave 0 for default)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:399
+#: src/libslic3r/PrintConfig.cpp:426
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:402 src/libslic3r/PrintConfig.cpp:864
-#: src/libslic3r/PrintConfig.cpp:1725 src/libslic3r/PrintConfig.cpp:1780
-#: src/libslic3r/PrintConfig.cpp:2006 src/libslic3r/PrintConfig.cpp:2142
+#: src/libslic3r/PrintConfig.cpp:429 src/libslic3r/PrintConfig.cpp:855
+#: src/libslic3r/PrintConfig.cpp:1650 src/libslic3r/PrintConfig.cpp:1701
+#: src/libslic3r/PrintConfig.cpp:1907 src/libslic3r/PrintConfig.cpp:2034
 msgid "mm/s or %"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:409
+#: src/libslic3r/PrintConfig.cpp:436
 msgid "External perimeters first"
 msgstr "先打�外围轮廓"
 
-#: src/libslic3r/PrintConfig.cpp:411
+#: src/libslic3r/PrintConfig.cpp:438
 msgid ""
 "Print contour perimeters from the outermost one to the innermost one instead "
 "of the default inverse order."
 msgstr "从最外围轮廓�最内部的轮廓打�，而�是�方�。"
 
-#: src/libslic3r/PrintConfig.cpp:418
+#: src/libslic3r/PrintConfig.cpp:444
 msgid "Extra perimeters if needed"
 msgstr "如果需�的�，打�外围轮廓"
 
-#: src/libslic3r/PrintConfig.cpp:420
+#: src/libslic3r/PrintConfig.cpp:446
 #, no-c-format
 msgid ""
 "Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r "
@@ -4190,14 +4889,14 @@ msgid ""
 "is supported."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:431
+#: src/libslic3r/PrintConfig.cpp:456
 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:444
+#: src/libslic3r/PrintConfig.cpp:468
 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 "
@@ -4207,11 +4906,11 @@ msgstr ""
 "设置为喷嘴尖端和（通常）X架�之间的垂直�离。���说，这是在你的挤出机周围的"
 "空隙气缸的高度，它代表了挤出头在与其他�打�物体碰撞�科达到的最大深度。"
 
-#: src/libslic3r/PrintConfig.cpp:455
+#: src/libslic3r/PrintConfig.cpp:478
 msgid "Radius"
 msgstr "�径"
 
-#: src/libslic3r/PrintConfig.cpp:456
+#: src/libslic3r/PrintConfig.cpp:479
 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 "
@@ -4220,19 +4919,19 @@ msgstr ""
 "设置为挤出头周围的空隙�径。如果挤出头未置中，安全起�请选择最大值。该�数用"
 "于检查碰撞，并在界�中显示图形预览。"
 
-#: src/libslic3r/PrintConfig.cpp:467
+#: src/libslic3r/PrintConfig.cpp:489
 msgid "Extruder Color"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:468 src/libslic3r/PrintConfig.cpp:535
+#: src/libslic3r/PrintConfig.cpp:490 src/libslic3r/PrintConfig.cpp:550
 msgid "This is only used in the Slic3r interface as a visual help."
 msgstr "仅�供Slic3r界�的视觉帮助。"
 
-#: src/libslic3r/PrintConfig.cpp:475
+#: src/libslic3r/PrintConfig.cpp:496
 msgid "Extruder offset"
 msgstr "挤出头�置"
 
-#: src/libslic3r/PrintConfig.cpp:476
+#: src/libslic3r/PrintConfig.cpp:497
 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 "
@@ -4243,22 +4942,22 @@ msgstr ""
 "化�个挤出头相对第一个挤出头的�移�。一般为正�标（它们将从XY�标相�得"
 "到）。"
 
-#: src/libslic3r/PrintConfig.cpp:486
+#: src/libslic3r/PrintConfig.cpp:506
 msgid "Extrusion axis"
 msgstr "挤出轴"
 
-#: src/libslic3r/PrintConfig.cpp:487
+#: src/libslic3r/PrintConfig.cpp:507
 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)。"
 
-#: src/libslic3r/PrintConfig.cpp:493
+#: src/libslic3r/PrintConfig.cpp:512
 msgid "Extrusion multiplier"
 msgstr "挤出�数"
 
-#: src/libslic3r/PrintConfig.cpp:494
+#: src/libslic3r/PrintConfig.cpp:513
 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. "
@@ -4269,11 +4968,11 @@ msgstr ""
 "的宽度。通常值范围在0.9到1.1之间。如果你觉得有必�更改幅度更大，检查�料直径"
 "和你的固件E步骤。"
 
-#: src/libslic3r/PrintConfig.cpp:503
+#: src/libslic3r/PrintConfig.cpp:521
 msgid "Default extrusion width"
 msgstr "默认挤出宽度"
 
-#: src/libslic3r/PrintConfig.cpp:505
+#: src/libslic3r/PrintConfig.cpp:523
 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 "
@@ -4282,15 +4981,15 @@ msgid ""
 "height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:509
+#: src/libslic3r/PrintConfig.cpp:527
 msgid "mm or % (leave 0 for auto)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:515
+#: src/libslic3r/PrintConfig.cpp:532
 msgid "Keep fan always on"
 msgstr "��风扇总是打开"
 
-#: src/libslic3r/PrintConfig.cpp:516
+#: src/libslic3r/PrintConfig.cpp:533
 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."
@@ -4298,11 +4997,11 @@ msgstr ""
 "勾选此项，风扇将�会被关闭，在整个打�过程中将�续以�低于最低速开�。对于PLA"
 "�料有用，对ABS�料�适用。"
 
-#: src/libslic3r/PrintConfig.cpp:522
+#: src/libslic3r/PrintConfig.cpp:538
 msgid "Enable fan if layer print time is below"
 msgstr "如果打�时间低于该值，则气动风扇"
 
-#: src/libslic3r/PrintConfig.cpp:523
+#: src/libslic3r/PrintConfig.cpp:539
 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 "
@@ -4311,27 +5010,27 @@ msgstr ""
 "如果估算的打�时间低于该数值（��为秒），风扇将�用，而且速度值根��补最�"
 "速度值和最大速度值�计算。"
 
-#: src/libslic3r/PrintConfig.cpp:525 src/libslic3r/PrintConfig.cpp:1711
+#: src/libslic3r/PrintConfig.cpp:541 src/libslic3r/PrintConfig.cpp:1637
 msgid "approximate seconds"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:534
+#: src/libslic3r/PrintConfig.cpp:549
 msgid "Color"
 msgstr "颜色"
 
-#: src/libslic3r/PrintConfig.cpp:541
+#: src/libslic3r/PrintConfig.cpp:555
 msgid "Filament notes"
 msgstr "�料备注"
 
-#: src/libslic3r/PrintConfig.cpp:542
+#: src/libslic3r/PrintConfig.cpp:556
 msgid "You can put your notes regarding the filament here."
 msgstr "关于�料的备注�放这里。"
 
-#: src/libslic3r/PrintConfig.cpp:551 src/libslic3r/PrintConfig.cpp:1196
+#: src/libslic3r/PrintConfig.cpp:564 src/libslic3r/PrintConfig.cpp:1181
 msgid "Max volumetric speed"
 msgstr "最大体积速度"
 
-#: src/libslic3r/PrintConfig.cpp:552
+#: src/libslic3r/PrintConfig.cpp:565
 msgid ""
 "Maximum volumetric speed allowed for this filament. Limits the maximum "
 "volumetric speed of a print to the minimum of print and filament volumetric "
@@ -4340,79 +5039,79 @@ msgstr ""
 "该�料所�许的最大体积速度。把最大体积速度�定为打�速度和�料体积速度的最�"
 "值。设为0则无�制。"
 
-#: src/libslic3r/PrintConfig.cpp:555 src/libslic3r/PrintConfig.cpp:1199
+#: src/libslic3r/PrintConfig.cpp:568 src/libslic3r/PrintConfig.cpp:1184
 msgid "mm³/s"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:562
+#: src/libslic3r/PrintConfig.cpp:574
 msgid "Loading speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:563
+#: src/libslic3r/PrintConfig.cpp:575
 msgid "Speed used for loading the filament on the wipe tower. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:571
+#: src/libslic3r/PrintConfig.cpp:582
 msgid "Loading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:572
+#: src/libslic3r/PrintConfig.cpp:583
 msgid "Speed used at the very beginning of loading phase. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:580
+#: src/libslic3r/PrintConfig.cpp:590
 msgid "Unloading speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:581
+#: src/libslic3r/PrintConfig.cpp:591
 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:590
+#: src/libslic3r/PrintConfig.cpp:599
 msgid "Unloading speed at the start"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:591
+#: src/libslic3r/PrintConfig.cpp:600
 msgid ""
 "Speed used for unloading the tip of the filament immediately after ramming. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:599
+#: src/libslic3r/PrintConfig.cpp:607
 msgid "Delay after unloading"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:600
+#: src/libslic3r/PrintConfig.cpp:608
 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. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:610
+#: src/libslic3r/PrintConfig.cpp:617
 msgid "Number of cooling moves"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:611
+#: src/libslic3r/PrintConfig.cpp:618
 msgid ""
 "Filament is cooled by being moved back and forth in the cooling tubes. "
 "Specify desired number of these moves "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:620
+#: src/libslic3r/PrintConfig.cpp:626
 msgid "Speed of the first cooling move"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:621
+#: src/libslic3r/PrintConfig.cpp:627
 msgid "Cooling moves are gradually accelerating beginning at this speed. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:629
+#: src/libslic3r/PrintConfig.cpp:634
 msgid "Minimal purge on wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:630
+#: src/libslic3r/PrintConfig.cpp:635
 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 "
@@ -4421,44 +5120,44 @@ msgid ""
 "to produce successive infill or sacrificial object extrusions reliably."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:635
+#: src/libslic3r/PrintConfig.cpp:639
 msgid "mm³"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:641
+#: src/libslic3r/PrintConfig.cpp:645
 msgid "Speed of the last cooling move"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:642
+#: src/libslic3r/PrintConfig.cpp:646
 msgid "Cooling moves are gradually accelerating towards this speed. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:650
+#: src/libslic3r/PrintConfig.cpp:653
 msgid "Filament load time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:651
+#: src/libslic3r/PrintConfig.cpp:654
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:659
+#: src/libslic3r/PrintConfig.cpp:661
 msgid "Ramming parameters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:660
+#: src/libslic3r/PrintConfig.cpp:662
 msgid ""
 "This string is edited by RammingDialog and contains ramming specific "
 "parameters "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:667
+#: src/libslic3r/PrintConfig.cpp:668
 msgid "Filament unload time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:668
+#: src/libslic3r/PrintConfig.cpp:669
 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 "
@@ -4474,11 +5173,11 @@ msgstr ""
 "在这里输入你的�料直径。需�较高精度，所以请使用�尺，沿��料长��多次测"
 "�，计算平�值。"
 
-#: src/libslic3r/PrintConfig.cpp:685
+#: src/libslic3r/PrintConfig.cpp:684
 msgid "Density"
 msgstr "密度"
 
-#: src/libslic3r/PrintConfig.cpp:686
+#: src/libslic3r/PrintConfig.cpp:685
 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 "
@@ -4488,42 +5187,42 @@ msgstr ""
 "在这里输入你的�料密度。此仅为统计信�。一个�错的方法是测�一段已知长度�料"
 "的��，然�计算体积。更好的方法�直接通过�移计算体积。"
 
-#: src/libslic3r/PrintConfig.cpp:689
+#: src/libslic3r/PrintConfig.cpp:688
 msgid "g/cm³"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:695
+#: src/libslic3r/PrintConfig.cpp:693
 msgid "Filament type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:696
+#: src/libslic3r/PrintConfig.cpp:694
 msgid "The filament material type for use in custom G-codes."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:712
+#: src/libslic3r/PrintConfig.cpp:710
 msgid "Soluble material"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:713
+#: src/libslic3r/PrintConfig.cpp:711
 msgid "Soluble material is most likely used for a soluble support."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:719
+#: src/libslic3r/PrintConfig.cpp:717
 msgid ""
 "Enter your filament cost per kg here. This is only for statistical "
 "information."
 msgstr "在这里输入�料�公斤的价格。仅用于统计信�。"
 
 # Set this to be the local currency symbol.
-#: src/libslic3r/PrintConfig.cpp:720
+#: src/libslic3r/PrintConfig.cpp:718
 msgid "money/kg"
 msgstr "Â¥/kg"
 
-#: src/libslic3r/PrintConfig.cpp:729
+#: src/libslic3r/PrintConfig.cpp:727
 msgid "Fill angle"
 msgstr "填充角度"
 
-#: src/libslic3r/PrintConfig.cpp:731
+#: src/libslic3r/PrintConfig.cpp:729
 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, "
@@ -4532,72 +5231,72 @@ msgstr ""
 "填充的默认基础方�角。交�引线适用于此。桥接处将使用Slic3r所侦测的最好方��"
 "填充，所以此�数�影�它们。"
 
-#: src/libslic3r/PrintConfig.cpp:744
+#: src/libslic3r/PrintConfig.cpp:741
 msgid "Fill density"
 msgstr "填充密度"
 
-#: src/libslic3r/PrintConfig.cpp:746
+#: src/libslic3r/PrintConfig.cpp:743
 msgid "Density of internal infill, expressed in the range 0% - 100%."
 msgstr "内部填充的密度，以0% - 100% 表示。"
 
-#: src/libslic3r/PrintConfig.cpp:782
+#: src/libslic3r/PrintConfig.cpp:778
 msgid "Fill pattern"
 msgstr "填充样�"
 
-#: src/libslic3r/PrintConfig.cpp:784
+#: src/libslic3r/PrintConfig.cpp:780
 msgid "Fill pattern for general low-density infill."
 msgstr "一般低密度填充的填充样�。"
 
-#: src/libslic3r/PrintConfig.cpp:801
+#: src/libslic3r/PrintConfig.cpp:796
 msgid "Grid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:802
+#: src/libslic3r/PrintConfig.cpp:797
 msgid "Triangles"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:803
+#: src/libslic3r/PrintConfig.cpp:798
 msgid "Stars"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:804
+#: src/libslic3r/PrintConfig.cpp:799
 msgid "Cubic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:805
+#: src/libslic3r/PrintConfig.cpp:800
 msgid "Line"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:807 src/libslic3r/PrintConfig.cpp:2023
+#: src/libslic3r/PrintConfig.cpp:802 src/libslic3r/PrintConfig.cpp:1923
 msgid "Honeycomb"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:808
+#: src/libslic3r/PrintConfig.cpp:803
 msgid "3D Honeycomb"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:809
+#: src/libslic3r/PrintConfig.cpp:804
 msgid "Gyroid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:816 src/libslic3r/PrintConfig.cpp:826
-#: src/libslic3r/PrintConfig.cpp:835 src/libslic3r/PrintConfig.cpp:871
+#: src/libslic3r/PrintConfig.cpp:811 src/libslic3r/PrintConfig.cpp:820
+#: src/libslic3r/PrintConfig.cpp:828 src/libslic3r/PrintConfig.cpp:861
 msgid "First layer"
 msgstr "首层"
 
-#: src/libslic3r/PrintConfig.cpp:817
+#: src/libslic3r/PrintConfig.cpp:812
 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:827
+#: src/libslic3r/PrintConfig.cpp:821
 msgid ""
 "Heated build plate temperature for the first layer. Set this to zero to "
 "disable bed temperature control commands in the output."
 msgstr "首层的加热�温度。设为0，�在输出中�用机床温度控制指令。"
 
-#: src/libslic3r/PrintConfig.cpp:837
+#: src/libslic3r/PrintConfig.cpp:830
 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 "
@@ -4605,11 +5304,11 @@ msgid ""
 "layer height. If set to zero, it will use the default extrusion width."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:848
+#: src/libslic3r/PrintConfig.cpp:840
 msgid "First layer height"
 msgstr "首层高度"
 
-#: src/libslic3r/PrintConfig.cpp:850
+#: src/libslic3r/PrintConfig.cpp:842
 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 "
@@ -4619,16 +5318,16 @@ msgstr ""
 "当以�常低的层高打�时，对于�太�想的热床�说�能需�打�较厚的底层��高粘"
 "附效果。该值�被表示为一个�对值，或者一个相对于默认层高的百分数（如150%）。"
 
-#: src/libslic3r/PrintConfig.cpp:854 src/libslic3r/PrintConfig.cpp:1003
-#: src/libslic3r/PrintConfig.cpp:1884
+#: src/libslic3r/PrintConfig.cpp:846 src/libslic3r/PrintConfig.cpp:991
+#: src/libslic3r/PrintConfig.cpp:1796
 msgid "mm or %"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:860
+#: src/libslic3r/PrintConfig.cpp:851
 msgid "First layer speed"
 msgstr "首层速度"
 
-#: src/libslic3r/PrintConfig.cpp:861
+#: src/libslic3r/PrintConfig.cpp:852
 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 "
@@ -4637,7 +5336,7 @@ msgstr ""
 "如果表示为mm/s的数值，该值将被用于首层的打�动作，无关动作的类型。如果表示为"
 "百分数（如40%），则以默认速度值为基准。"
 
-#: src/libslic3r/PrintConfig.cpp:872
+#: src/libslic3r/PrintConfig.cpp:862
 msgid ""
 "Extruder temperature for first layer. If you want to control temperature "
 "manually during print, set this to zero to disable temperature control "
@@ -4646,18 +5345,18 @@ msgstr ""
 "首层挤出头温度。如果�在打�过程中手动控制温度，将该项设为0��止输出文件中的"
 "控制命令。"
 
-#: src/libslic3r/PrintConfig.cpp:882
+#: src/libslic3r/PrintConfig.cpp:871
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:890
+#: src/libslic3r/PrintConfig.cpp:879
 msgid "Verbose G-code"
 msgstr "详细的G代�"
 
-#: src/libslic3r/PrintConfig.cpp:891
+#: src/libslic3r/PrintConfig.cpp:880
 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 "
@@ -4666,11 +5365,11 @@ msgstr ""
 "�动该项�获得带注释的G代�文件，�一行都有对应的解释性文字。如果从SD�打�，"
 "文件冗余部分�能�缓你的固件�行速度。"
 
-#: src/libslic3r/PrintConfig.cpp:899
+#: src/libslic3r/PrintConfig.cpp:887
 msgid "G-code flavor"
 msgstr "G代�风格"
 
-#: src/libslic3r/PrintConfig.cpp:900
+#: src/libslic3r/PrintConfig.cpp:888
 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 "
@@ -4680,32 +5379,32 @@ msgstr ""
 "一些 G/M 代�的指令，包括温度控制和其他，但�通用。将此项设为打�机的固件�获"
 "�兼容性的输出。“无挤出�选项使得Slic3r�输出任何挤出值。"
 
-#: src/libslic3r/PrintConfig.cpp:924
+#: src/libslic3r/PrintConfig.cpp:911
 msgid "No extrusion"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:929
+#: src/libslic3r/PrintConfig.cpp:924
 msgid "High extruder current on filament swap"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:930
+#: src/libslic3r/PrintConfig.cpp:925
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:939
+#: src/libslic3r/PrintConfig.cpp:933
 msgid ""
 "This is the acceleration your printer will use for infill. Set zero to "
 "disable acceleration control for infill."
 msgstr "打�机填充加速度。设为0��用填充加速控制。"
 
-#: src/libslic3r/PrintConfig.cpp:948
+#: src/libslic3r/PrintConfig.cpp:941
 msgid "Combine infill every"
 msgstr "�几层��填充"
 
-#: src/libslic3r/PrintConfig.cpp:950
+#: src/libslic3r/PrintConfig.cpp:943
 msgid ""
 "This feature allows to combine infill and speed up your print by extruding "
 "thicker infill layers while preserving thin perimeters, thus accuracy."
@@ -4713,19 +5412,19 @@ msgstr ""
 "该功能�通过挤出更厚的填充层�实现��填充，并加速打�，�时�留了薄�，也就"
 "��了精度。"
 
-#: src/libslic3r/PrintConfig.cpp:954
+#: src/libslic3r/PrintConfig.cpp:946
 msgid "Combine infill every n layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:960
+#: src/libslic3r/PrintConfig.cpp:952
 msgid "Infill extruder"
 msgstr "填充挤出头"
 
-#: src/libslic3r/PrintConfig.cpp:962
+#: src/libslic3r/PrintConfig.cpp:954
 msgid "The extruder to use when printing infill."
 msgstr "打�填充时使用的挤出头。"
 
-#: src/libslic3r/PrintConfig.cpp:971
+#: src/libslic3r/PrintConfig.cpp:962
 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 "
@@ -4734,21 +5433,21 @@ msgid ""
 "example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:981
+#: src/libslic3r/PrintConfig.cpp:971
 msgid "Infill before perimeters"
 msgstr "先填充�打�轮廓"
 
-#: src/libslic3r/PrintConfig.cpp:982
+#: src/libslic3r/PrintConfig.cpp:972
 msgid ""
 "This option will switch the print order of perimeters and infill, making the "
 "latter first."
 msgstr "该选项将打�轮廓和填充的方�对调，使�者��。"
 
-#: src/libslic3r/PrintConfig.cpp:988
+#: src/libslic3r/PrintConfig.cpp:977
 msgid "Only infill where needed"
 msgstr "仅在需�时填充"
 
-#: src/libslic3r/PrintConfig.cpp:990
+#: src/libslic3r/PrintConfig.cpp:979
 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 "
@@ -4757,11 +5456,11 @@ msgstr ""
 "该选项将把填充�定用于支撑天花�（将充当内部支撑�料的作用）。如果�用，由于"
 "多个包�的选项将使G代�生�速度�慢。"
 
-#: src/libslic3r/PrintConfig.cpp:998
+#: src/libslic3r/PrintConfig.cpp:986
 msgid "Infill/perimeters overlap"
 msgstr "填充/轮廓��"
 
-#: src/libslic3r/PrintConfig.cpp:1000
+#: src/libslic3r/PrintConfig.cpp:988
 msgid ""
 "This setting applies an additional overlap between infill and perimeters for "
 "better bonding. Theoretically this shouldn't be needed, but backlash might "
@@ -4771,23 +5470,23 @@ msgstr ""
 "使得填充和轮廓间有�外的��部分，便于结�。�论上并�需�，但�移�能会导致"
 "间隙。如果表示为百分数（如15%），则以轮廓挤出宽度为基准。"
 
-#: src/libslic3r/PrintConfig.cpp:1012
+#: src/libslic3r/PrintConfig.cpp:999
 msgid "Speed for printing the internal fill. Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1020
+#: src/libslic3r/PrintConfig.cpp:1007
 msgid "Inherits profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1021
+#: src/libslic3r/PrintConfig.cpp:1008
 msgid "Name of the profile, from which this profile inherits."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1032
+#: src/libslic3r/PrintConfig.cpp:1021
 msgid "Interface shells"
 msgstr "表�外壳"
 
-#: src/libslic3r/PrintConfig.cpp:1033
+#: src/libslic3r/PrintConfig.cpp:1022
 msgid ""
 "Force the generation of solid shells between adjacent materials/volumes. "
 "Useful for multi-extruder prints with translucent materials or manual "
@@ -4796,7 +5495,7 @@ msgstr ""
 "在相邻的�料/包围体之间强制生���外壳层。适用于使用��明�料或手工�溶性支"
 "撑�料的多挤出头打�。"
 
-#: src/libslic3r/PrintConfig.cpp:1043
+#: src/libslic3r/PrintConfig.cpp:1031
 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 "
@@ -4806,11 +5505,11 @@ msgstr ""
 "这段G代�在�一层�化�，�Z轴移动�，挤出头移动到第一层的点之��入。注�除"
 "了使用如[layer_num]和[layer_z]，也�以使用��符���代替Slic3r的�数。"
 
-#: src/libslic3r/PrintConfig.cpp:1054
+#: src/libslic3r/PrintConfig.cpp:1042
 msgid "Supports remaining times"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1055
+#: src/libslic3r/PrintConfig.cpp:1043
 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. "
@@ -4818,63 +5517,63 @@ msgid ""
 "firmware supports M73 Qxx Sxx for the silent mode."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1063
+#: src/libslic3r/PrintConfig.cpp:1051
 msgid "Supports silent mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1064
+#: src/libslic3r/PrintConfig.cpp:1052
 msgid "Set silent mode for the G-code flavor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1087
+#: src/libslic3r/PrintConfig.cpp:1075
 msgid "Maximum feedrate %1%"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1089
+#: src/libslic3r/PrintConfig.cpp:1077
 msgid "Maximum feedrate of the %1% axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1097
+#: src/libslic3r/PrintConfig.cpp:1085
 msgid "Maximum acceleration %1%"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1099
+#: src/libslic3r/PrintConfig.cpp:1087
 msgid "Maximum acceleration of the %1% axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1107
+#: src/libslic3r/PrintConfig.cpp:1095
 msgid "Maximum jerk %1%"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1109
+#: src/libslic3r/PrintConfig.cpp:1097
 msgid "Maximum jerk of the %1% axis"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1120 src/libslic3r/PrintConfig.cpp:1122
+#: src/libslic3r/PrintConfig.cpp:1108 src/libslic3r/PrintConfig.cpp:1110
 msgid "Minimum feedrate when extruding"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1131 src/libslic3r/PrintConfig.cpp:1133
+#: src/libslic3r/PrintConfig.cpp:1119 src/libslic3r/PrintConfig.cpp:1121
 msgid "Minimum travel feedrate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1142 src/libslic3r/PrintConfig.cpp:1144
+#: src/libslic3r/PrintConfig.cpp:1130 src/libslic3r/PrintConfig.cpp:1132
 msgid "Maximum acceleration when extruding"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1153 src/libslic3r/PrintConfig.cpp:1155
+#: src/libslic3r/PrintConfig.cpp:1141 src/libslic3r/PrintConfig.cpp:1143
 msgid "Maximum acceleration when retracting"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1163 src/libslic3r/PrintConfig.cpp:1173
+#: src/libslic3r/PrintConfig.cpp:1151 src/libslic3r/PrintConfig.cpp:1160
 msgid "Max"
 msgstr "最大值"
 
-#: src/libslic3r/PrintConfig.cpp:1164
+#: src/libslic3r/PrintConfig.cpp:1152
 msgid "This setting represents the maximum speed of your fan."
 msgstr "该值表示风扇的最大速度。"
 
-#: src/libslic3r/PrintConfig.cpp:1174
+#: src/libslic3r/PrintConfig.cpp:1161
 #, no-c-format
 msgid ""
 "This is the highest printable layer height for this extruder, used to cap "
@@ -4883,11 +5582,11 @@ msgid ""
 "adhesion. If set to 0, layer height is limited to 75% of the nozzle diameter."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1185
+#: src/libslic3r/PrintConfig.cpp:1171
 msgid "Max print speed"
 msgstr "最大打�速度"
 
-#: src/libslic3r/PrintConfig.cpp:1186
+#: src/libslic3r/PrintConfig.cpp:1172
 msgid ""
 "When setting other speed settings to 0 Slic3r will autocalculate the optimal "
 "speed in order to keep constant extruder pressure. This experimental setting "
@@ -4896,17 +5595,17 @@ msgstr ""
 "当将其他速度�数设为0时，Slic3r会自动计算最优速度以��挤出头压力稳定。该试验"
 "�数用于设置所�许的最大打�速度。"
 
-#: src/libslic3r/PrintConfig.cpp:1197
+#: src/libslic3r/PrintConfig.cpp:1182
 msgid ""
 "This experimental setting is used to set the maximum volumetric speed your "
 "extruder supports."
 msgstr "该实验�数用于设置你的挤出头所支�的最大体积速度。"
 
-#: src/libslic3r/PrintConfig.cpp:1206
+#: src/libslic3r/PrintConfig.cpp:1191
 msgid "Max volumetric slope positive"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1207 src/libslic3r/PrintConfig.cpp:1219
+#: src/libslic3r/PrintConfig.cpp:1192 src/libslic3r/PrintConfig.cpp:1203
 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 "
@@ -4914,42 +5613,42 @@ msgid ""
 "s) to 5.4 mm³/s (feedrate 60 mm/s) will take at least 2 seconds."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1211 src/libslic3r/PrintConfig.cpp:1223
+#: src/libslic3r/PrintConfig.cpp:1196 src/libslic3r/PrintConfig.cpp:1207
 msgid "mm³/s²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1218
+#: src/libslic3r/PrintConfig.cpp:1202
 msgid "Max volumetric slope negative"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1230 src/libslic3r/PrintConfig.cpp:1240
+#: src/libslic3r/PrintConfig.cpp:1214 src/libslic3r/PrintConfig.cpp:1223
 msgid "Min"
 msgstr "最�值"
 
-#: src/libslic3r/PrintConfig.cpp:1231
+#: src/libslic3r/PrintConfig.cpp:1215
 msgid "This setting represents the minimum PWM your fan needs to work."
 msgstr "该�数表示你的风扇工作的最�PWM。"
 
-#: src/libslic3r/PrintConfig.cpp:1241
+#: src/libslic3r/PrintConfig.cpp:1224
 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."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1250
+#: src/libslic3r/PrintConfig.cpp:1232
 msgid "Min print speed"
 msgstr "最�打�速度"
 
-#: src/libslic3r/PrintConfig.cpp:1251
+#: src/libslic3r/PrintConfig.cpp:1233
 msgid "Slic3r will not scale speed down below this speed."
 msgstr "Slic3r的最�打�速度。"
 
-#: src/libslic3r/PrintConfig.cpp:1259
+#: src/libslic3r/PrintConfig.cpp:1240
 msgid "Minimal filament extrusion length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1260
+#: src/libslic3r/PrintConfig.cpp:1241
 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 "
@@ -4958,78 +5657,58 @@ msgstr ""
 "在底层上消耗指定�料�生�环边。对于多挤出头的机器，该最�值适用于�个挤出"
 "头。"
 
-#: src/libslic3r/PrintConfig.cpp:1270
+#: src/libslic3r/PrintConfig.cpp:1250
 msgid "Configuration notes"
 msgstr "�置备注"
 
-#: src/libslic3r/PrintConfig.cpp:1271
+#: src/libslic3r/PrintConfig.cpp:1251
 msgid ""
 "You can put here your personal notes. This text will be added to the G-code "
 "header comments."
 msgstr ""
 "你�以在这里输入你的个人备注。该段文字内容将被添加到G代�文件开头的注释里。"
 
-#: src/libslic3r/PrintConfig.cpp:1281
+#: src/libslic3r/PrintConfig.cpp:1260
 msgid "Nozzle diameter"
 msgstr "喷嘴直径"
 
-#: src/libslic3r/PrintConfig.cpp:1282
+#: src/libslic3r/PrintConfig.cpp:1261
 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:1288
+#: src/libslic3r/PrintConfig.cpp:1266
 msgid "Host Type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1289
+#: src/libslic3r/PrintConfig.cpp:1267
 msgid ""
 "Slic3r can upload G-code files to a printer host. This field must contain "
 "the kind of the host."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1301
-msgid "API Key / Password"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1302
-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 ""
-
-#: src/libslic3r/PrintConfig.cpp:1317
-msgid "Hostname, IP or URL"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1318
-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."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1325
+#: src/libslic3r/PrintConfig.cpp:1278
 msgid "Only retract when crossing perimeters"
 msgstr "仅在越过轮廓时回缩"
 
-#: src/libslic3r/PrintConfig.cpp:1326
+#: src/libslic3r/PrintConfig.cpp:1279
 msgid ""
 "Disables retraction when the travel path does not exceed the upper layer's "
 "perimeters (and thus any ooze will be probably invisible)."
 msgstr "当空程�超过上层轮廓时�用回撤（这样滴垂现象�能会看��）。"
 
-#: src/libslic3r/PrintConfig.cpp:1334
+#: src/libslic3r/PrintConfig.cpp:1286
 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:1342
+#: src/libslic3r/PrintConfig.cpp:1293
 msgid "Output filename format"
 msgstr "输出文件�称格�"
 
-#: src/libslic3r/PrintConfig.cpp:1343
+#: src/libslic3r/PrintConfig.cpp:1294
 msgid ""
 "You can use all configuration options as variables inside this template. For "
 "example: [layer_height], [fill_density] etc. You can also use [timestamp], "
@@ -5040,11 +5719,11 @@ msgstr ""
 "[timestamp], [year], [month], [day], [hour], [minute], [second], [version], "
 "[input_filename], [input_filename_base]。"
 
-#: src/libslic3r/PrintConfig.cpp:1353
+#: src/libslic3r/PrintConfig.cpp:1303
 msgid "Detect bridging perimeters"
 msgstr "侦测桥接轮廓"
 
-#: src/libslic3r/PrintConfig.cpp:1355
+#: src/libslic3r/PrintConfig.cpp:1305
 msgid ""
 "Experimental option to adjust flow for overhangs (bridge flow will be used), "
 "to apply bridge speed to them and enable fan."
@@ -5052,21 +5731,21 @@ msgstr ""
 "试验选项，用于调整悬空部�的��（使用桥接��），将桥接速度用于它们并�用风"
 "扇。"
 
-#: src/libslic3r/PrintConfig.cpp:1362
+#: src/libslic3r/PrintConfig.cpp:1311
 msgid "Filament parking position"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1363
+#: src/libslic3r/PrintConfig.cpp:1312
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1372
+#: src/libslic3r/PrintConfig.cpp:1320
 msgid "Extra loading distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1373
+#: src/libslic3r/PrintConfig.cpp:1321
 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 "
@@ -5074,12 +5753,12 @@ msgid ""
 "than unloading. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1382 src/libslic3r/PrintConfig.cpp:1402
-#: src/libslic3r/PrintConfig.cpp:1415 src/libslic3r/PrintConfig.cpp:1425
+#: src/libslic3r/PrintConfig.cpp:1329 src/libslic3r/PrintConfig.cpp:1347
+#: src/libslic3r/PrintConfig.cpp:1359 src/libslic3r/PrintConfig.cpp:1369
 msgid "Perimeters"
 msgstr "轮廓"
 
-#: src/libslic3r/PrintConfig.cpp:1383
+#: src/libslic3r/PrintConfig.cpp:1330
 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 "
@@ -5088,16 +5767,16 @@ msgstr ""
 "打�机将用于打�轮廓的加速度。如果你的硬件性能足够，一个9000这样的高数值通常"
 "会给出很好的打�效果。设为0将�用轮廓加速度控制。"
 
-#: src/libslic3r/PrintConfig.cpp:1392
+#: src/libslic3r/PrintConfig.cpp:1338
 msgid "Perimeter extruder"
 msgstr "轮廓挤出头"
 
-#: src/libslic3r/PrintConfig.cpp:1394
+#: src/libslic3r/PrintConfig.cpp:1340
 msgid ""
 "The extruder to use when printing perimeters and brim. First extruder is 1."
 msgstr "打�轮廓和裙边所使用的挤出头。第一个挤出头是1。"
 
-#: src/libslic3r/PrintConfig.cpp:1404
+#: src/libslic3r/PrintConfig.cpp:1349
 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 "
@@ -5106,12 +5785,12 @@ msgid ""
 "it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1417
+#: src/libslic3r/PrintConfig.cpp:1361
 msgid ""
 "Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1427
+#: src/libslic3r/PrintConfig.cpp:1371
 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 "
@@ -5121,11 +5800,11 @@ msgstr ""
 "该选项设置�一层生�的轮廓个数。注�，如果��外轮廓“选项被�动，Slic3r在侦测"
 "到斜�表�时�能会自动增加该数值，因为较多的轮廓有利于斜�表�的打�。"
 
-#: src/libslic3r/PrintConfig.cpp:1431
+#: src/libslic3r/PrintConfig.cpp:1375
 msgid "(minimum)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1439
+#: src/libslic3r/PrintConfig.cpp:1383
 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. "
@@ -5134,55 +5813,55 @@ msgid ""
 "environment variables."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1452
+#: src/libslic3r/PrintConfig.cpp:1395
 msgid "Printer type"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1453
+#: src/libslic3r/PrintConfig.cpp:1396
 msgid "Type of the printer."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1457
+#: src/libslic3r/PrintConfig.cpp:1401
 msgid "Printer notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1458
+#: src/libslic3r/PrintConfig.cpp:1402
 msgid "You can put your notes regarding the printer here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1467
+#: src/libslic3r/PrintConfig.cpp:1410
 msgid "Printer vendor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1468
+#: src/libslic3r/PrintConfig.cpp:1411
 msgid "Name of the printer vendor."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1472
+#: src/libslic3r/PrintConfig.cpp:1416
 msgid "Printer variant"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1473
+#: src/libslic3r/PrintConfig.cpp:1417
 msgid ""
 "Name of the printer variant. For example, the printer variants may be "
 "differentiated by a nozzle diameter."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1483
+#: src/libslic3r/PrintConfig.cpp:1430
 msgid "Raft layers"
 msgstr "��层"
 
-#: src/libslic3r/PrintConfig.cpp:1485
+#: src/libslic3r/PrintConfig.cpp:1432
 msgid ""
 "The object will be raised by this number of layers, and support material "
 "will be generated under it."
 msgstr "物体将被该数目的层数抬起，而支撑�料将在其下方生�。"
 
-#: src/libslic3r/PrintConfig.cpp:1494
+#: src/libslic3r/PrintConfig.cpp:1440
 msgid "Resolution"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1495
+#: src/libslic3r/PrintConfig.cpp:1441
 msgid ""
 "Minimum detail resolution, used to simplify the input file for speeding up "
 "the slicing job and reducing memory usage. High-resolution models often "
@@ -5192,42 +5871,42 @@ msgstr ""
 "最�细节分辨率，用�简化输入文件，加速切片，�少内存�用。打�机通常很难渲染"
 "出高精度模型的细节。设为0则�用任何简化，完全�照输入文件的精度。"
 
-#: src/libslic3r/PrintConfig.cpp:1506
+#: src/libslic3r/PrintConfig.cpp:1451
 msgid "Minimum travel after retraction"
 msgstr "回缩�最�空程"
 
-#: src/libslic3r/PrintConfig.cpp:1507
+#: src/libslic3r/PrintConfig.cpp:1452
 msgid ""
 "Retraction is not triggered when travel moves are shorter than this length."
 msgstr "当空程短于此长度时�会触�回缩。"
 
-#: src/libslic3r/PrintConfig.cpp:1514
+#: src/libslic3r/PrintConfig.cpp:1458
 msgid "Retract amount before wipe"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1515
+#: src/libslic3r/PrintConfig.cpp:1459
 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:1523
+#: src/libslic3r/PrintConfig.cpp:1466
 msgid "Retract on layer change"
 msgstr "层�化时回缩"
 
-#: src/libslic3r/PrintConfig.cpp:1524
+#: src/libslic3r/PrintConfig.cpp:1467
 msgid "This flag enforces a retraction whenever a Z move is done."
 msgstr "该项强制在Z轴移动完�时回缩。"
 
-#: src/libslic3r/PrintConfig.cpp:1530 src/libslic3r/PrintConfig.cpp:1539
+#: src/libslic3r/PrintConfig.cpp:1472 src/libslic3r/PrintConfig.cpp:1480
 msgid "Length"
 msgstr "长度"
 
-#: src/libslic3r/PrintConfig.cpp:1531
+#: src/libslic3r/PrintConfig.cpp:1473
 msgid "Retraction Length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1532
+#: src/libslic3r/PrintConfig.cpp:1474
 msgid ""
 "When retraction is triggered, filament is pulled back by the specified "
 "amount (the length is measured on raw filament, before it enters the "
@@ -5236,15 +5915,15 @@ msgstr ""
 "当触�回缩时，�料以指定值往回收缩（长度以在进入挤出头之�的原始�料为基础进"
 "行计算）。"
 
-#: src/libslic3r/PrintConfig.cpp:1534 src/libslic3r/PrintConfig.cpp:1544
+#: src/libslic3r/PrintConfig.cpp:1476 src/libslic3r/PrintConfig.cpp:1485
 msgid "mm (zero to disable)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1540
+#: src/libslic3r/PrintConfig.cpp:1481
 msgid "Retraction Length (Toolchange)"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1541
+#: src/libslic3r/PrintConfig.cpp:1482
 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 "
@@ -5253,11 +5932,11 @@ msgstr ""
 "当在改�工具�触�回缩时，�料以指定值回缩（长度以进入挤出头�的原始�料为基"
 "础测�）。"
 
-#: src/libslic3r/PrintConfig.cpp:1550
+#: src/libslic3r/PrintConfig.cpp:1490
 msgid "Lift Z"
 msgstr "抬高Z"
 
-#: src/libslic3r/PrintConfig.cpp:1551
+#: src/libslic3r/PrintConfig.cpp:1491
 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 "
@@ -5266,15 +5945,15 @@ msgstr ""
 "如果设为正值，�当回缩触�时Z轴会快速抬�。当使用多个挤出头时，仅会考虑第一个"
 "挤出头的该�数。"
 
-#: src/libslic3r/PrintConfig.cpp:1559
+#: src/libslic3r/PrintConfig.cpp:1498
 msgid "Above Z"
 msgstr "在Z上方"
 
-#: src/libslic3r/PrintConfig.cpp:1560
+#: src/libslic3r/PrintConfig.cpp:1499
 msgid "Only lift Z above"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1561
+#: src/libslic3r/PrintConfig.cpp:1500
 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 "
@@ -5283,15 +5962,15 @@ msgstr ""
 "如果设为正值，仅在指定的�对Z值上方�会抬高Z。�以调整该�数，用于跳过在�几"
 "层时跳过Z抬高的步骤。"
 
-#: src/libslic3r/PrintConfig.cpp:1569
+#: src/libslic3r/PrintConfig.cpp:1507
 msgid "Below Z"
 msgstr "Z下方"
 
-#: src/libslic3r/PrintConfig.cpp:1570
+#: src/libslic3r/PrintConfig.cpp:1508
 msgid "Only lift Z below"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1571
+#: src/libslic3r/PrintConfig.cpp:1509
 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 "
@@ -5300,131 +5979,127 @@ msgstr ""
 "如果设为正值，仅在指定的�对Z值选房�以调整该�数，用于将抬高Z的动作�制在�"
 "几层时。"
 
-#: src/libslic3r/PrintConfig.cpp:1580 src/libslic3r/PrintConfig.cpp:1589
+#: src/libslic3r/PrintConfig.cpp:1517 src/libslic3r/PrintConfig.cpp:1525
 msgid "Extra length on restart"
 msgstr "��时�外长度"
 
-#: src/libslic3r/PrintConfig.cpp:1581
+#: src/libslic3r/PrintConfig.cpp:1518
 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 ""
 "当在空程�回缩被补�时，挤出头会基础�外的指定��料。该�数一般�需设置。"
 
-#: src/libslic3r/PrintConfig.cpp:1590
+#: src/libslic3r/PrintConfig.cpp:1526
 msgid ""
 "When the retraction is compensated after changing tool, the extruder will "
 "push this additional amount of filament."
 msgstr "当在切�工具�回缩被补�时，挤出头会基础�外的指定��料。"
 
-#: src/libslic3r/PrintConfig.cpp:1598 src/libslic3r/PrintConfig.cpp:1599
+#: src/libslic3r/PrintConfig.cpp:1533 src/libslic3r/PrintConfig.cpp:1534
 msgid "Retraction Speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1600
+#: src/libslic3r/PrintConfig.cpp:1535
 msgid "The speed for retractions (it only applies to the extruder motor)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1607 src/libslic3r/PrintConfig.cpp:1608
+#: src/libslic3r/PrintConfig.cpp:1541 src/libslic3r/PrintConfig.cpp:1542
 msgid "Deretraction Speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1609
+#: src/libslic3r/PrintConfig.cpp:1543
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1617
+#: src/libslic3r/PrintConfig.cpp:1550
 msgid "Seam position"
 msgstr "接��置"
 
-#: src/libslic3r/PrintConfig.cpp:1619
+#: src/libslic3r/PrintConfig.cpp:1552
 msgid "Position of perimeters starting points."
 msgstr "轮廓开始点的�置。"
 
-#: src/libslic3r/PrintConfig.cpp:1626
+#: src/libslic3r/PrintConfig.cpp:1558
 msgid "Random"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1627
+#: src/libslic3r/PrintConfig.cpp:1559
 msgid "Nearest"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1628
+#: src/libslic3r/PrintConfig.cpp:1560
 msgid "Aligned"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1629
-msgid "Rear"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:1636
+#: src/libslic3r/PrintConfig.cpp:1568
 msgid "Direction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1638
+#: src/libslic3r/PrintConfig.cpp:1570
 msgid "Preferred direction of the seam"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1639
+#: src/libslic3r/PrintConfig.cpp:1571
 msgid "Seam preferred direction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1647
+#: src/libslic3r/PrintConfig.cpp:1578
 msgid "Jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1649
+#: src/libslic3r/PrintConfig.cpp:1580
 msgid "Seam preferred direction jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1650
+#: src/libslic3r/PrintConfig.cpp:1581
 msgid "Preferred direction of the seam - jitter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1661
+#: src/libslic3r/PrintConfig.cpp:1591
 msgid "USB/serial port for printer connection."
 msgstr "用于打�机连接的USB/串�。"
 
-#: src/libslic3r/PrintConfig.cpp:1669
+#: src/libslic3r/PrintConfig.cpp:1598
 msgid "Serial port speed"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1670
+#: src/libslic3r/PrintConfig.cpp:1599
 msgid "Speed (baud) of USB/serial port for printer connection."
 msgstr "用于打�机连接的USB/串�速度（波特率）。"
 
-#: src/libslic3r/PrintConfig.cpp:1679
+#: src/libslic3r/PrintConfig.cpp:1608
 msgid "Distance from object"
 msgstr "离物体的�离"
 
-#: src/libslic3r/PrintConfig.cpp:1680
+#: src/libslic3r/PrintConfig.cpp:1609
 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:1688
+#: src/libslic3r/PrintConfig.cpp:1616
 msgid "Skirt height"
 msgstr "环边高度"
 
-#: src/libslic3r/PrintConfig.cpp:1689
+#: src/libslic3r/PrintConfig.cpp:1617
 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:1697
+#: src/libslic3r/PrintConfig.cpp:1624
 msgid "Loops (minimum)"
 msgstr "圈数(最�)"
 
-#: src/libslic3r/PrintConfig.cpp:1698
+#: src/libslic3r/PrintConfig.cpp:1625
 msgid "Skirt Loops"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1699
+#: src/libslic3r/PrintConfig.cpp:1626
 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 "
@@ -5433,11 +6108,11 @@ msgstr ""
 "环边的圈数。如果设置了最�挤出长度，那么圈数必须比这里设置的值�大。设为0则完"
 "全�用环边。"
 
-#: src/libslic3r/PrintConfig.cpp:1708
+#: src/libslic3r/PrintConfig.cpp:1634
 msgid "Slow down if layer print time is below"
 msgstr "如果图层打�时间低于该值则�速"
 
-#: src/libslic3r/PrintConfig.cpp:1709
+#: src/libslic3r/PrintConfig.cpp:1635
 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."
@@ -5445,44 +6120,44 @@ msgstr ""
 "如果预计打�时间低于该值（��为秒），则打�速度将�低以使打�时间延长到该"
 "值。"
 
-#: src/libslic3r/PrintConfig.cpp:1720
+#: src/libslic3r/PrintConfig.cpp:1645
 msgid "Small perimeters"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1722
+#: src/libslic3r/PrintConfig.cpp:1647
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1732
+#: src/libslic3r/PrintConfig.cpp:1657
 msgid "Solid infill threshold area"
 msgstr "��填充阈值区域"
 
-#: src/libslic3r/PrintConfig.cpp:1734
+#: src/libslic3r/PrintConfig.cpp:1659
 msgid ""
 "Force solid infill for regions having a smaller area than the specified "
 "threshold."
 msgstr "对于比指定阈值�的区域强制进行��填充。"
 
-#: src/libslic3r/PrintConfig.cpp:1735
+#: src/libslic3r/PrintConfig.cpp:1660
 msgid "mm²"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1742
+#: src/libslic3r/PrintConfig.cpp:1666
 msgid "Solid infill extruder"
 msgstr "��填充挤出头"
 
-#: src/libslic3r/PrintConfig.cpp:1744
+#: src/libslic3r/PrintConfig.cpp:1668
 msgid "The extruder to use when printing solid infill."
 msgstr "当打���填充时使用的挤出头。"
 
-#: src/libslic3r/PrintConfig.cpp:1751
+#: src/libslic3r/PrintConfig.cpp:1674
 msgid "Solid infill every"
 msgstr "�几层��填充"
 
-#: src/libslic3r/PrintConfig.cpp:1753
+#: src/libslic3r/PrintConfig.cpp:1676
 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 "
@@ -5492,7 +6167,7 @@ msgstr ""
 "该功能使得�指定数目层强制进行一次��填充。设为0�用该功能。�以设为任�值"
 "（如9999）；Slic3r会根�喷嘴直径和层高�自动选择图层的最大�能个数。"
 
-#: src/libslic3r/PrintConfig.cpp:1766
+#: src/libslic3r/PrintConfig.cpp:1688
 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, "
@@ -5500,22 +6175,22 @@ msgid ""
 "(for example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1777
+#: src/libslic3r/PrintConfig.cpp:1698
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1789
+#: src/libslic3r/PrintConfig.cpp:1710
 msgid "Number of solid layers to generate on top and bottom surfaces."
 msgstr "在顶部和底部表�生�的��层数。"
 
-#: src/libslic3r/PrintConfig.cpp:1796
+#: src/libslic3r/PrintConfig.cpp:1716
 msgid "Spiral vase"
 msgstr "螺旋�容器"
 
-#: src/libslic3r/PrintConfig.cpp:1797
+#: src/libslic3r/PrintConfig.cpp:1717
 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, "
@@ -5527,18 +6202,18 @@ msgstr ""
 "廓，无填充，无顶部��层，无支撑。��以设置环边�裙边圈数，和底部��层。但"
 "在打�多个物体时�适用。"
 
-#: src/libslic3r/PrintConfig.cpp:1806
+#: src/libslic3r/PrintConfig.cpp:1725
 msgid "Temperature variation"
 msgstr "温度�化"
 
-#: src/libslic3r/PrintConfig.cpp:1807
+#: src/libslic3r/PrintConfig.cpp:1726
 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:1818
+#: src/libslic3r/PrintConfig.cpp:1736
 msgid ""
 "This start procedure is inserted at the beginning, after bed has reached the "
 "target temperature and extruder just started heating, and before extruder "
@@ -5549,7 +6224,7 @@ msgid ""
 "\"M109 S[first_layer_temperature]\" command wherever you want."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1834
+#: src/libslic3r/PrintConfig.cpp:1751
 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 "
@@ -5568,74 +6243,74 @@ msgstr ""
 "个“M109 S[ first_layer_temperature ]�命令放在任�处。如果你有多个挤出头，G代"
 "�将按挤出头顺�处�。"
 
-#: src/libslic3r/PrintConfig.cpp:1850
+#: src/libslic3r/PrintConfig.cpp:1766
 msgid "Single Extruder Multi Material"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1851
+#: src/libslic3r/PrintConfig.cpp:1767
 msgid "The printer multiplexes filaments into a single hot end."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1857
+#: src/libslic3r/PrintConfig.cpp:1772
 msgid "Prime all printing extruders"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1858
+#: src/libslic3r/PrintConfig.cpp:1773
 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:1864
+#: src/libslic3r/PrintConfig.cpp:1778
 msgid "Generate support material"
 msgstr "生�支撑�料"
 
-#: src/libslic3r/PrintConfig.cpp:1866
+#: src/libslic3r/PrintConfig.cpp:1780
 msgid "Enable support material generation."
 msgstr "�用支撑�料生�功能。"
 
-#: src/libslic3r/PrintConfig.cpp:1871
+#: src/libslic3r/PrintConfig.cpp:1784
 msgid "Auto generated supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1873
+#: src/libslic3r/PrintConfig.cpp:1786
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1880
+#: src/libslic3r/PrintConfig.cpp:1792
 msgid "XY separation between an object and its support"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1882
+#: src/libslic3r/PrintConfig.cpp:1794
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1893
+#: src/libslic3r/PrintConfig.cpp:1804
 msgid "Pattern angle"
 msgstr "样�角度"
 
-#: src/libslic3r/PrintConfig.cpp:1895
+#: src/libslic3r/PrintConfig.cpp:1806
 msgid ""
 "Use this setting to rotate the support material pattern on the horizontal "
 "plane."
 msgstr "使用该�数对支撑�料的样�在水平�上进行旋转。"
 
-#: src/libslic3r/PrintConfig.cpp:1906
+#: src/libslic3r/PrintConfig.cpp:1816 src/libslic3r/PrintConfig.cpp:2421
 msgid ""
 "Only create support if it lies on a build plate. Don't create support on a "
 "print."
 msgstr "仅在热床上生�支撑，�在打�出�的物体上生�。"
 
-#: src/libslic3r/PrintConfig.cpp:1913
+#: src/libslic3r/PrintConfig.cpp:1822
 msgid "Contact Z distance"
 msgstr "接触Z值"
 
-#: src/libslic3r/PrintConfig.cpp:1915
+#: src/libslic3r/PrintConfig.cpp:1824
 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 "
@@ -5643,19 +6318,19 @@ msgid ""
 msgstr ""
 "物体和支撑�料平�之间的垂直�离。设为0，则表�上第一层�会被当�桥�处�。"
 
-#: src/libslic3r/PrintConfig.cpp:1923
+#: src/libslic3r/PrintConfig.cpp:1831
 msgid "soluble"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1924
+#: src/libslic3r/PrintConfig.cpp:1832
 msgid "detachable"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1929
+#: src/libslic3r/PrintConfig.cpp:1837
 msgid "Enforce support for the first"
 msgstr "�几层增强支撑"
 
-#: src/libslic3r/PrintConfig.cpp:1931
+#: src/libslic3r/PrintConfig.cpp:1839
 msgid ""
 "Generate support material for the specified number of layers counting from "
 "bottom, regardless of whether normal support material is enabled or not and "
@@ -5665,21 +6340,21 @@ msgstr ""
 "从底部开始，对指定数目的图层生�支撑�料，无论正常的支撑�料是��用，也�管"
 "任何角度阈值。适用于在热床上脚太细�站��的物件，便于更好的粘附。"
 
-#: src/libslic3r/PrintConfig.cpp:1937
+#: src/libslic3r/PrintConfig.cpp:1844
 msgid "Enforce support for the first n layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1943
+#: src/libslic3r/PrintConfig.cpp:1850
 msgid "Support material/raft/skirt extruder"
 msgstr "支撑�料/�/环边挤出头"
 
-#: src/libslic3r/PrintConfig.cpp:1945
+#: src/libslic3r/PrintConfig.cpp:1852
 msgid ""
 "The extruder to use when printing support material, raft and skirt (1+, 0 to "
 "use the current extruder to minimize tool changes)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1955
+#: src/libslic3r/PrintConfig.cpp:1861
 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, "
@@ -5687,44 +6362,44 @@ msgid ""
 "example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1964
+#: src/libslic3r/PrintConfig.cpp:1869
 msgid "Interface loops"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1966
+#: src/libslic3r/PrintConfig.cpp:1871
 msgid ""
 "Cover the top contact layer of the supports with loops. Disabled by default."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:1972
+#: src/libslic3r/PrintConfig.cpp:1876
 msgid "Support material/raft interface extruder"
 msgstr "支撑�料/�表�挤出头"
 
-#: src/libslic3r/PrintConfig.cpp:1974
+#: src/libslic3r/PrintConfig.cpp:1878
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:1982
+#: src/libslic3r/PrintConfig.cpp:1885
 msgid "Interface layers"
 msgstr "表�层数"
 
-#: src/libslic3r/PrintConfig.cpp:1984
+#: src/libslic3r/PrintConfig.cpp:1887
 msgid ""
 "Number of interface layers to insert between the object(s) and support "
 "material."
 msgstr "在物体和支撑�料中间�入的表�层数。"
 
-#: src/libslic3r/PrintConfig.cpp:1992
+#: src/libslic3r/PrintConfig.cpp:1894
 msgid "Interface pattern spacing"
 msgstr "表�样�间隔"
 
-#: src/libslic3r/PrintConfig.cpp:1994
+#: src/libslic3r/PrintConfig.cpp:1896
 msgid "Spacing between interface lines. Set zero to get a solid interface."
 msgstr "表�直线间的间隔。设为0获得��表�。"
 
-#: src/libslic3r/PrintConfig.cpp:2004
+#: src/libslic3r/PrintConfig.cpp:1905
 msgid ""
 "Speed for printing support material interface layers. If expressed as "
 "percentage (for example 50%) it will be calculated over support material "
@@ -5733,45 +6408,45 @@ msgstr ""
 "打�支撑�料表�层的速度。若表示为百分数（如50%），则以支撑�料速度为基准计"
 "算。"
 
-#: src/libslic3r/PrintConfig.cpp:2013
+#: src/libslic3r/PrintConfig.cpp:1914
 msgid "Pattern"
 msgstr "样�"
 
-#: src/libslic3r/PrintConfig.cpp:2015
+#: src/libslic3r/PrintConfig.cpp:1916
 msgid "Pattern used to generate support material."
 msgstr "生�支撑�料的样�。"
 
-#: src/libslic3r/PrintConfig.cpp:2022
+#: src/libslic3r/PrintConfig.cpp:1922
 msgid "Rectilinear grid"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2028
+#: src/libslic3r/PrintConfig.cpp:1928
 msgid "Pattern spacing"
 msgstr "样�间隔"
 
-#: src/libslic3r/PrintConfig.cpp:2030
+#: src/libslic3r/PrintConfig.cpp:1930
 msgid "Spacing between support material lines."
 msgstr "支撑�料直线间的间隙。"
 
-#: src/libslic3r/PrintConfig.cpp:2040
+#: src/libslic3r/PrintConfig.cpp:1939
 msgid "Speed for printing support material."
 msgstr "打�支撑�料的速度。"
 
-#: src/libslic3r/PrintConfig.cpp:2047
+#: src/libslic3r/PrintConfig.cpp:1946
 msgid "Synchronize with object layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2049
+#: src/libslic3r/PrintConfig.cpp:1948
 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:2056
+#: src/libslic3r/PrintConfig.cpp:1954
 msgid "Overhang threshold"
 msgstr "悬空阈值"
 
-#: src/libslic3r/PrintConfig.cpp:2058
+#: src/libslic3r/PrintConfig.cpp:1956
 msgid ""
 "Support material will not be generated for overhangs whose slope angle (90° "
 "= vertical) is above the given threshold. In other words, this value "
@@ -5780,31 +6455,31 @@ msgid ""
 "detection (recommended)."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2071
+#: src/libslic3r/PrintConfig.cpp:1968
 msgid "With sheath around the support"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2073
+#: src/libslic3r/PrintConfig.cpp:1970
 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:2081
+#: src/libslic3r/PrintConfig.cpp:1977
 msgid ""
 "Extruder temperature for layers after the first one. Set this to zero to "
 "disable temperature control commands in the output."
 msgstr "第一层之�的挤出头温度。设为0以在输出文件中�用温度控制指令。"
 
-#: src/libslic3r/PrintConfig.cpp:2084
+#: src/libslic3r/PrintConfig.cpp:1979
 msgid "Temperature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2090
+#: src/libslic3r/PrintConfig.cpp:1985
 msgid "Detect thin walls"
 msgstr "检测薄�"
 
-#: src/libslic3r/PrintConfig.cpp:2092
+#: src/libslic3r/PrintConfig.cpp:1987
 msgid ""
 "Detect single-width walls (parts where two extrusions don't fit and we need "
 "to collapse them into a single trace)."
@@ -5812,17 +6487,17 @@ msgstr ""
 "检测�一厚度的薄�（两个挤出����，以至于需�把它们压缩�一�轨迹的地"
 "方）。"
 
-#: src/libslic3r/PrintConfig.cpp:2099
+#: src/libslic3r/PrintConfig.cpp:1993
 msgid "Threads"
 msgstr "线程"
 
-#: src/libslic3r/PrintConfig.cpp:2100
+#: src/libslic3r/PrintConfig.cpp:1994
 msgid ""
 "Threads are used to parallelize long-running tasks. Optimal threads number "
 "is slightly above the number of available cores/processors."
 msgstr "线程用于并行处�长时间任务。最优的线程数应比�用核/处�器的数目略多。"
 
-#: src/libslic3r/PrintConfig.cpp:2112
+#: src/libslic3r/PrintConfig.cpp:2006
 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 "
@@ -5831,7 +6506,7 @@ msgstr ""
 "该段自定义代�在�次挤出头切���入。注��以使用��符��代替Slic3r的所有"
 "�数，如 [previous_extruder] 和 [next_extruder]。"
 
-#: src/libslic3r/PrintConfig.cpp:2125
+#: src/libslic3r/PrintConfig.cpp:2018
 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 "
@@ -5840,7 +6515,7 @@ msgid ""
 "percentage (for example 90%) it will be computed over layer height."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2137
+#: src/libslic3r/PrintConfig.cpp:2029
 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 "
@@ -5849,49 +6524,44 @@ msgid ""
 "for auto."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2149
-msgctxt "Layers"
-msgid "Top"
-msgstr "顶部"
-
-#: src/libslic3r/PrintConfig.cpp:2151
+#: src/libslic3r/PrintConfig.cpp:2043
 msgid "Number of solid layers to generate on top surfaces."
 msgstr "在顶部表�上生�的��层数。"
 
-#: src/libslic3r/PrintConfig.cpp:2153
+#: src/libslic3r/PrintConfig.cpp:2044
 msgid "Top solid layers"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2159
+#: src/libslic3r/PrintConfig.cpp:2050
 msgid "Speed for travel moves (jumps between distant extrusion points)."
 msgstr "空程移动的速度（从一个挤出点结�调到�一个挤出点开始）。"
 
-#: src/libslic3r/PrintConfig.cpp:2168
+#: src/libslic3r/PrintConfig.cpp:2058
 msgid "Use firmware retraction"
 msgstr "使用固件回缩"
 
-#: src/libslic3r/PrintConfig.cpp:2169
+#: src/libslic3r/PrintConfig.cpp:2059
 msgid ""
 "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中支�该功能。"
 
-#: src/libslic3r/PrintConfig.cpp:2176
+#: src/libslic3r/PrintConfig.cpp:2065
 msgid "Use relative E distances"
 msgstr "使用相对E�离"
 
-#: src/libslic3r/PrintConfig.cpp:2177
+#: src/libslic3r/PrintConfig.cpp:2066
 msgid ""
 "If your firmware requires relative E values, check this, otherwise leave it "
 "unchecked. Most firmwares use absolute values."
 msgstr "如果固件需�相对E值，勾选此项，�则��勾选。大部分固件使用�对值。"
 
-#: src/libslic3r/PrintConfig.cpp:2184
+#: src/libslic3r/PrintConfig.cpp:2072
 msgid "Use volumetric E"
 msgstr "使用体积E"
 
-#: src/libslic3r/PrintConfig.cpp:2185
+#: src/libslic3r/PrintConfig.cpp:2073
 msgid ""
 "This experimental setting uses outputs the E values in cubic millimeters "
 "instead of linear millimeters. If your firmware doesn't already know "
@@ -5904,120 +6574,120 @@ msgstr ""
 "起始G代�中输入如'M200 D[filament_diameter_0] T0' 以开�体积模�，并使用在"
 "Slic3r中已选的�料直径。仅在最新Marlin中支�该功能。"
 
-#: src/libslic3r/PrintConfig.cpp:2196
+#: src/libslic3r/PrintConfig.cpp:2083
 msgid "Enable variable layer height feature"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2197
+#: src/libslic3r/PrintConfig.cpp:2084
 msgid ""
 "Some printers or printer setups may have difficulties printing with a "
 "variable layer height. Enabled by default."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2204
+#: src/libslic3r/PrintConfig.cpp:2090
 msgid "Wipe while retracting"
 msgstr "回缩时擦拭"
 
-#: src/libslic3r/PrintConfig.cpp:2205
+#: src/libslic3r/PrintConfig.cpp:2091
 msgid ""
 "This flag will move the nozzle while retracting to minimize the possible "
 "blob on leaky extruders."
 msgstr "在回缩时移动喷嘴以��挤出头滴�。"
 
-#: src/libslic3r/PrintConfig.cpp:2213
+#: src/libslic3r/PrintConfig.cpp:2098
 msgid ""
 "Multi material printers may need to prime or purge extruders on tool "
 "changes. Extrude the excess material into the wipe tower."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2220
+#: src/libslic3r/PrintConfig.cpp:2104
 msgid "Purging volumes - load/unload volumes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2221
+#: src/libslic3r/PrintConfig.cpp:2105
 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:2228
+#: src/libslic3r/PrintConfig.cpp:2111
 msgid "Purging volumes - matrix"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2229
+#: src/libslic3r/PrintConfig.cpp:2112
 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:2239
+#: src/libslic3r/PrintConfig.cpp:2121
 msgid "Position X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2240
+#: src/libslic3r/PrintConfig.cpp:2122
 msgid "X coordinate of the left front corner of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2247
+#: src/libslic3r/PrintConfig.cpp:2128
 msgid "Position Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2248
+#: src/libslic3r/PrintConfig.cpp:2129
 msgid "Y coordinate of the left front corner of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2256
+#: src/libslic3r/PrintConfig.cpp:2136
 msgid "Width of a wipe tower"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2263
+#: src/libslic3r/PrintConfig.cpp:2142
 msgid "Wipe tower rotation angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2264
+#: src/libslic3r/PrintConfig.cpp:2143
 msgid "Wipe tower rotation angle with respect to x-axis "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2265
+#: src/libslic3r/PrintConfig.cpp:2144 src/libslic3r/PrintConfig.cpp:2565
 msgid "degrees"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2272
+#: src/libslic3r/PrintConfig.cpp:2150
 msgid "Wipe into this object's infill"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2273
+#: src/libslic3r/PrintConfig.cpp:2151
 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:2281
+#: src/libslic3r/PrintConfig.cpp:2158
 msgid "Wipe into this object"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2282
+#: src/libslic3r/PrintConfig.cpp:2159
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2289
+#: src/libslic3r/PrintConfig.cpp:2165
 msgid "Maximal bridging distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2290
+#: src/libslic3r/PrintConfig.cpp:2166
 msgid "Maximal distance between supports on sparse infill sections. "
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2297
+#: src/libslic3r/PrintConfig.cpp:2172
 msgid "XY Size Compensation"
 msgstr "XY尺寸补�"
 
-#: src/libslic3r/PrintConfig.cpp:2299
+#: src/libslic3r/PrintConfig.cpp:2174
 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-"
@@ -6025,11 +6695,11 @@ msgid ""
 msgstr ""
 "该物体将以指定值（负=往内，正=往外）�大/收缩。对于精确调节孔洞尺寸�能有用。"
 
-#: src/libslic3r/PrintConfig.cpp:2308
+#: src/libslic3r/PrintConfig.cpp:2182
 msgid "Z offset"
 msgstr "Z补�"
 
-#: src/libslic3r/PrintConfig.cpp:2309
+#: src/libslic3r/PrintConfig.cpp:2183
 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 "
@@ -6040,425 +6710,578 @@ msgstr ""
 "��置进行补�，如果你的终点挡�为零时，喷嘴离打�热床还有0.3毫米，将该值设"
 "为-0.3（或者调整你的终点挡�）。"
 
-#: src/libslic3r/PrintConfig.cpp:2319
-msgid "Bed size X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2327
-#: src/libslic3r/PrintConfig.cpp:2334 src/libslic3r/PrintConfig.cpp:2343
-#: src/libslic3r/PrintConfig.cpp:2351 src/libslic3r/PrintConfig.cpp:2359
-msgid "Dwarf"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2326
-msgid "Bed size Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2333
-msgid "Picture resolution X"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2335 src/libslic3r/PrintConfig.cpp:2344
-msgid "px"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2342
-msgid "Picture resolution Y"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2350 src/libslic3r/PrintConfig.cpp:2430
-#: src/libslic3r/PrintConfig.cpp:2431
-msgid "Exposure time"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2358
-msgid "Exposure time first layers"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2373
+#: src/libslic3r/PrintConfig.cpp:2200
 msgid "Display width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2374
+#: src/libslic3r/PrintConfig.cpp:2201
 msgid "Width of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2380
+#: src/libslic3r/PrintConfig.cpp:2206
 msgid "Display height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2381
+#: src/libslic3r/PrintConfig.cpp:2207
 msgid "Height of the display"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2387
+#: src/libslic3r/PrintConfig.cpp:2212
 msgid "Number of pixels in"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2389
+#: src/libslic3r/PrintConfig.cpp:2214
 msgid "Number of pixels in X"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2396
+#: src/libslic3r/PrintConfig.cpp:2220
 msgid "Number of pixels in Y"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2402
+#: src/libslic3r/PrintConfig.cpp:2225
 msgid "Display orientation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2403
+#: src/libslic3r/PrintConfig.cpp:2226
 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 ""
 
-#: src/libslic3r/PrintConfig.cpp:2410
+#: src/libslic3r/PrintConfig.cpp:2232
 msgid "Landscape"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2411
+#: src/libslic3r/PrintConfig.cpp:2233
 msgid "Portrait"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2415 src/libslic3r/PrintConfig.cpp:2416
+#: src/libslic3r/PrintConfig.cpp:2238
+msgid "Fast"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2239
+msgid "Fast tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2240
+msgid "Time of the fast tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2247
+msgid "Slow"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2248
+msgid "Slow tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2249
+msgid "Time of the slow tilt"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2256
+msgid "Area fill"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2257
+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 ""
+
+#: src/libslic3r/PrintConfig.cpp:2264 src/libslic3r/PrintConfig.cpp:2265
+#: src/libslic3r/PrintConfig.cpp:2266
 msgid "Printer scaling correction"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2422 src/libslic3r/PrintConfig.cpp:2423
+#: src/libslic3r/PrintConfig.cpp:2272 src/libslic3r/PrintConfig.cpp:2273
+msgid "Printer absolute correction"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2274
+msgid ""
+"Will inflate or deflate the sliced 2D polygons according to the sign of the "
+"correction."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2280 src/libslic3r/PrintConfig.cpp:2281
+msgid "Printer gamma correction"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2282
+msgid "This will apply a gamm correction to the rasterized 2D polygons."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2291 src/libslic3r/PrintConfig.cpp:2292
 msgid "Initial layer height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2438 src/libslic3r/PrintConfig.cpp:2439
+#: src/libslic3r/PrintConfig.cpp:2298
+msgid "Faded layers"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2299
+msgid ""
+"Number of the layers needed for the exposure time fade from initial exposure "
+"time to the exposure time"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2306 src/libslic3r/PrintConfig.cpp:2307
+msgid "Exposure time"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2313 src/libslic3r/PrintConfig.cpp:2314
 msgid "Initial exposure time"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2446 src/libslic3r/PrintConfig.cpp:2447
-msgid "Correction for expansion when printing"
+#: src/libslic3r/PrintConfig.cpp:2320 src/libslic3r/PrintConfig.cpp:2321
+msgid "Correction for expansion"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2452 src/libslic3r/PrintConfig.cpp:2453
-msgid "Correction for expansion after curing"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2458
+#: src/libslic3r/PrintConfig.cpp:2327
 msgid "SLA print material notes"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2459
+#: src/libslic3r/PrintConfig.cpp:2328
 msgid "You can put your notes regarding the SLA print material here."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2468 src/libslic3r/PrintConfig.cpp:2478
+#: src/libslic3r/PrintConfig.cpp:2336 src/libslic3r/PrintConfig.cpp:2347
 msgid "Default SLA material profile"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2487
+#: src/libslic3r/PrintConfig.cpp:2358
 msgid "Generate supports"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2489
+#: src/libslic3r/PrintConfig.cpp:2360
 msgid "Generate supports for the models"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2494
+#: src/libslic3r/PrintConfig.cpp:2365
 msgid "Support head front diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2496
+#: src/libslic3r/PrintConfig.cpp:2367
 msgid "Diameter of the pointing side of the head"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2503
+#: src/libslic3r/PrintConfig.cpp:2374
 msgid "Support head penetration"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2505
+#: src/libslic3r/PrintConfig.cpp:2376
 msgid "How much the pinhead has to penetrate the model surface"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2512
+#: src/libslic3r/PrintConfig.cpp:2383
 msgid "Support head width"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2514
+#: src/libslic3r/PrintConfig.cpp:2385
 msgid "Width from the back sphere center to the front sphere center"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2521
+#: src/libslic3r/PrintConfig.cpp:2393
 msgid "Support pillar diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2523
+#: src/libslic3r/PrintConfig.cpp:2395
 msgid "Diameter in mm of the support pillars"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2530
+#: src/libslic3r/PrintConfig.cpp:2403
 msgid "Support pillar connection mode"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2531
+#: src/libslic3r/PrintConfig.cpp:2404
 msgid ""
 "Controls the bridge type between two neigboring 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:2540
+#: src/libslic3r/PrintConfig.cpp:2412
 msgid "Zig-Zag"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2541
+#: src/libslic3r/PrintConfig.cpp:2413
 msgid "Cross"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2542
+#: src/libslic3r/PrintConfig.cpp:2414
 msgid "Dynamic"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2546
+#: src/libslic3r/PrintConfig.cpp:2426
 msgid "Pillar widening factor"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2548
+#: src/libslic3r/PrintConfig.cpp:2428
 msgid ""
 "Merging bridges or pillars into another pillars can increase the radius. "
 "Zero means no increase, one means full increase."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2557
+#: src/libslic3r/PrintConfig.cpp:2437
 msgid "Support base diameter"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2559
+#: src/libslic3r/PrintConfig.cpp:2439
 msgid "Diameter in mm of the pillar base"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2566
+#: src/libslic3r/PrintConfig.cpp:2447
 msgid "Support base height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2568
+#: src/libslic3r/PrintConfig.cpp:2449
 msgid "The height of the pillar base cone"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2575
+#: src/libslic3r/PrintConfig.cpp:2456
 msgid "Critical angle"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2577
+#: src/libslic3r/PrintConfig.cpp:2458
 msgid "The default angle for connecting support sticks and junctions."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2584
+#: src/libslic3r/PrintConfig.cpp:2466
 msgid "Max bridge length"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2586
+#: src/libslic3r/PrintConfig.cpp:2468
 msgid "The max length of a bridge"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2593
+#: src/libslic3r/PrintConfig.cpp:2475
+msgid "Max pillar linking distance"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2477
+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:2485
 msgid "Object elevation"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2595
+#: src/libslic3r/PrintConfig.cpp:2487
 msgid "How much the supports should lift up the supported object."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2602
-msgid "Density on horizontal surfaces"
+#: src/libslic3r/PrintConfig.cpp:2495
+msgid "Support points density"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2604
-msgid ""
-"How many support points (approximately) should be placed on horizontal "
-"surface."
+#: src/libslic3r/PrintConfig.cpp:2497
+msgid "This is a relative measure of support points density."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2605 src/libslic3r/PrintConfig.cpp:2614
-msgid "points per square dm"
+#: src/libslic3r/PrintConfig.cpp:2503
+msgid "Minimal distance of the support points"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2611
-msgid "Density on surfaces at 45 degrees"
+#: src/libslic3r/PrintConfig.cpp:2505
+msgid "No support points will be placed closer than this threshold."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2613
-msgid ""
-"How many support points (approximately) should be placed on surface sloping "
-"at 45 degrees."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2620
-msgid "Minimal support point height"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2622
-msgid "No support points will be placed lower than this value from the bottom."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:2629
+#: src/libslic3r/PrintConfig.cpp:2511
 msgid "Use pad"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2631
+#: src/libslic3r/PrintConfig.cpp:2513
 msgid "Add a pad underneath the supported model"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2636
+#: src/libslic3r/PrintConfig.cpp:2518
 msgid "Pad wall thickness"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2645
+#: src/libslic3r/PrintConfig.cpp:2520
+msgid "The thickness of the pad and its optional cavity walls."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2528
 msgid "Pad wall height"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2654
+#: src/libslic3r/PrintConfig.cpp:2529
+msgid "Defines the cavity depth. Set to zero to disable the cavity."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2539
 msgid "Max merge distance"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:2663
+#: src/libslic3r/PrintConfig.cpp:2541
+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:2552
 msgid "Pad edge radius"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3017
+#: src/libslic3r/PrintConfig.cpp:2561
+msgid "Pad wall slope"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2563
+msgid ""
+"The slope of the pad wall relative to the bed plane. 90 degrees means "
+"straight walls."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2924
+msgid "Export SVG"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2925
+msgid "Export the model(s) as OBJ."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2936
+msgid "Export SLA"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2937
+msgid "Slice the model and export SLA printing layers as PNG."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2942
+msgid "Export 3MF"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2943
+msgid "Export the model(s) as 3MF."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2947
+msgid "Export AMF"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2948
+msgid "Export the model(s) as AMF."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2952
+msgid "Export STL"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2953
+msgid "Export the model(s) as STL."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2958
+msgid "Slice the model and export toolpaths as G-code."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2963
+msgid "Slice"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2964
+msgid ""
+"Slice the model as FFF or SLA based on the printer_technology configuration "
+"value."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2969
+msgid "Help"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2970
+msgid "Show this help."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2975
+msgid "Help (FFF options)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2976
+msgid "Show the full list of print/G-code configuration options."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2980
+msgid "Help (SLA options)"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2981
+msgid "Show the full list of SLA print configuration options."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:2985
+msgid "Output Model Info"
+msgstr "输出模型信�"
+
+#: src/libslic3r/PrintConfig.cpp:2986
+msgid "Write information about the model to the console."
+msgstr "给控制�写入模型的信�。"
+
+#: src/libslic3r/PrintConfig.cpp:2990
+msgid "Save config file"
+msgstr "�存�置文件"
+
+#: src/libslic3r/PrintConfig.cpp:2991
+msgid "Save configuration to the specified file."
+msgstr "将�置�数�存到指定文件。"
+
+#: src/libslic3r/PrintConfig.cpp:3001
+msgid "Align XY"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3002
+msgid "Align the model to the given point."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3007
 msgid "Cut model at the given Z."
 msgstr "在给定Z处切割模型。"
 
-#: src/libslic3r/PrintConfig.cpp:3022
-msgid "Dont arrange"
+#: src/libslic3r/PrintConfig.cpp:3028
+msgid "Center"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3023
+#: src/libslic3r/PrintConfig.cpp:3029
+msgid "Center the print around the given center."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3033
+msgid "Don't arrange"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3034
 msgid ""
-"Don't arrange the objects on the build plate. The model coordinates define "
-"the absolute positions on the build plate. The option --center will be "
-"ignored."
+"Do not rearrange the given models before merging and keep their original XY "
+"coordinates."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3030
-msgid "User data directory"
+#: src/libslic3r/PrintConfig.cpp:3037
+msgid "Duplicate"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3031
+#: src/libslic3r/PrintConfig.cpp:3038
+msgid "Multiply copies by this factor."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3042
+msgid "Duplicate by grid"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3043
+msgid "Multiply copies by creating a grid."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3046
+msgid "Merge"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3047
+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:3052
+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:3056
+msgid "Rotation angle around the Z axis in degrees."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3060
+msgid "Rotate around X"
+msgstr "绕X轴旋转"
+
+#: src/libslic3r/PrintConfig.cpp:3061
+msgid "Rotation angle around the X axis in degrees."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3065
+msgid "Rotate around Y"
+msgstr "绕Y轴旋转"
+
+#: src/libslic3r/PrintConfig.cpp:3066
+msgid "Rotation angle around the Y axis in degrees."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3071
+msgid "Scaling factor or percentage."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3076
+msgid ""
+"Detect unconnected parts in the given model(s) and split them into separate "
+"objects."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3079
+msgid "Scale to Fit"
+msgstr "缩放到�适大�"
+
+#: src/libslic3r/PrintConfig.cpp:3080
+msgid "Scale to fit the given volume."
+msgstr "缩放到适�于给定体积。"
+
+#: src/libslic3r/PrintConfig.cpp:3089
+msgid "Ignore non-existent config files"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3090
+msgid "Do not fail if a file supplied to --load does not exist."
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3093
+msgid "Load config file"
+msgstr "加载�置文件"
+
+#: src/libslic3r/PrintConfig.cpp:3094
+msgid ""
+"Load configuration from the specified file. It can be used more than once to "
+"load options from multiple files."
+msgstr "从指定文件加载�置。�多次使用以从多个文件中加载�数。"
+
+#: src/libslic3r/PrintConfig.cpp:3097
+msgid "Output File"
+msgstr "输出文件"
+
+#: src/libslic3r/PrintConfig.cpp:3098
+msgid ""
+"The file where the output will be written (if not specified, it will be "
+"based on the input file)."
+msgstr "输出的文件（如果未指定，则将��输入文件）。"
+
+#: src/libslic3r/PrintConfig.cpp:3108
+msgid "Data directory"
+msgstr ""
+
+#: src/libslic3r/PrintConfig.cpp:3109
 msgid ""
 "Load and store settings at the given directory. This is useful for "
 "maintaining different profiles or including configurations from a network "
 "storage."
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3038
-msgid "Export 3MF"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3039
-msgid "Slice the model and export slices as 3MF."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3044
-msgid "Slice"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3045
-msgid "Slice the model and export gcode."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3050
-msgid "Help"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3051
-msgid "Show this help."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3056
-msgid "Use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3057
-msgid ""
-"Forces the GUI launch instead of command line slicing (if you supply a model "
-"file, it will be loaded into the plater)"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3063
-msgid "Output Model Info"
-msgstr "输出模型信�"
-
-#: src/libslic3r/PrintConfig.cpp:3064
-msgid "Write information about the model to the console."
-msgstr "给控制�写入模型的信�。"
-
-#: src/libslic3r/PrintConfig.cpp:3069
-msgid "Load config file"
-msgstr "加载�置文件"
-
-#: src/libslic3r/PrintConfig.cpp:3070
-msgid ""
-"Load configuration from the specified file. It can be used more than once to "
-"load options from multiple files."
-msgstr "从指定文件加载�置。�多次使用以从多个文件中加载�数。"
-
-#: src/libslic3r/PrintConfig.cpp:3075
-msgid "Do not use GUI"
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3076
-msgid ""
-"Forces the command line slicing instead of gui. This takes precedence over --"
-"gui if both are present."
-msgstr ""
-
-#: src/libslic3r/PrintConfig.cpp:3081
-msgid "Output File"
-msgstr "输出文件"
-
-#: src/libslic3r/PrintConfig.cpp:3082
-msgid ""
-"The file where the output will be written (if not specified, it will be "
-"based on the input file)."
-msgstr "输出的文件（如果未指定，则将��输入文件）。"
-
-#: src/libslic3r/PrintConfig.cpp:3088
-msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-msgstr "绕Z轴旋转角度（0-360，默认：0）。"
-
-#: src/libslic3r/PrintConfig.cpp:3093
-msgid "Rotate around X"
-msgstr "绕X轴旋转"
-
-#: src/libslic3r/PrintConfig.cpp:3094
-msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-msgstr "绕X轴旋转角度（0-360，默认：0）。"
-
-#: src/libslic3r/PrintConfig.cpp:3099
-msgid "Rotate around Y"
-msgstr "绕Y轴旋转"
-
-#: src/libslic3r/PrintConfig.cpp:3100
-msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-msgstr "绕Y轴旋转角度（0-360，默认：0）。"
-
-#: src/libslic3r/PrintConfig.cpp:3105
-msgid "Save config file"
-msgstr "�存�置文件"
-
-#: src/libslic3r/PrintConfig.cpp:3106
-msgid "Save configuration to the specified file."
-msgstr "将�置�数�存到指定文件。"
-
 #: src/libslic3r/PrintConfig.cpp:3112
-msgid "Scaling factor (default: 1)."
-msgstr "缩放比例（默认：1）。"
-
-#: src/libslic3r/PrintConfig.cpp:3125
-msgid "Print center"
+msgid "Logging level"
 msgstr ""
 
-#: src/libslic3r/PrintConfig.cpp:3126
-msgid "Center the print around the given center (default: 100, 100)."
+#: src/libslic3r/PrintConfig.cpp:3113
+msgid ""
+"Messages with severity lower or eqal to the loglevel will be printed out. 0:"
+"trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal"
 msgstr ""
 
 #: src/libslic3r/GCode/PreviewData.cpp:176
@@ -6500,6 +7323,27 @@ msgstr ""
 msgid "%.2f - %.2f mm"
 msgstr ""
 
+#~ msgid "Top/bottom fill pattern"
+#~ msgstr "顶部/底部填充样�"
+
+#~ msgid ""
+#~ "Fill pattern for top/bottom infill. This only affects the external "
+#~ "visible layer, and not its adjacent solid shells."
+#~ msgstr ""
+#~ "对顶部/底部内部填充的类型。这将影�外围��层，�影�其相邻的��层。"
+
+#~ msgid "Rotation angle around the Z axis in degrees (0-360, default: 0)."
+#~ msgstr "绕Z轴旋转角度（0-360，默认：0）。"
+
+#~ msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
+#~ msgstr "绕X轴旋转角度（0-360，默认：0）。"
+
+#~ msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
+#~ msgstr "绕Y轴旋转角度（0-360，默认：0）。"
+
+#~ msgid "Scaling factor (default: 1)."
+#~ msgstr "缩放比例（默认：1）。"
+
 #~ msgid "Minimum extrusion length"
 #~ msgstr "最大挤出长度"
 
@@ -6886,9 +7730,3 @@ msgstr ""
 
 #~ msgid "Slice the model and export slices as SVG."
 #~ msgstr "切割模型并以SVG格�导出切片结果。"
-
-#~ msgid "Scale to Fit"
-#~ msgstr "缩放到�适大�"
-
-#~ msgid "Scale to fit the given volume."
-#~ msgstr "缩放到适�于给定体积。"
diff --git a/resources/localization/zh_CN/Slic3rPE.mo b/resources/localization/zh_CN/Slic3rPE.mo
deleted file mode 100644
index 7d298da02..000000000
Binary files a/resources/localization/zh_CN/Slic3rPE.mo and /dev/null differ
diff --git a/resources/localization/zh_CN/Slic3rPE_zh.po b/resources/localization/zh_CN/Slic3rPE_zh.po
deleted file mode 100644
index b48ca4b0b..000000000
--- a/resources/localization/zh_CN/Slic3rPE_zh.po
+++ /dev/null
@@ -1,4468 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: Slic3rPE\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-28 13:53+0100\n"
-"PO-Revision-Date: 2018-02-28 14:17+0100\n"
-"Last-Translator: Oleksandra Iushchenko <yusanka@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: L\n"
-"Language: zh_CN\n"
-"X-Poedit-SearchPath-0: xs/src/libslic3r\n"
-"X-Poedit-SearchPath-1: xs/xrc/slic3r/GUI\n"
-"X-Poedit-SearchPath-2: xs/xrc/slic3r\n"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:39
-msgid "Shape"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:46
-msgid "Rectangular"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:50
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1191
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:408
-msgid "Size"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:51
-msgid "Size in X and Y of the rectangular plate."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:57
-msgid "Origin"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:58
-msgid ""
-"Distance of the 0,0 G-code coordinate from the front left corner of the "
-"rectangle."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:62
-msgid "Circular"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:65
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:129
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:200
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:211
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:325
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:336
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:355
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:434
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:781
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:801
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:860
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:878
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:896
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1044
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1052
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1094
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1103
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1113
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1121
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1129
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1215
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1421
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1491
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1527
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1704
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1711
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1718
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1727
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1737
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1747
-msgid "mm"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:66
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:431
-msgid "Diameter"
-msgstr "直径"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:67
-msgid ""
-"Diameter of the print bed. It is assumed that origin (0,0) is located in the "
-"center."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:71
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:150
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:92
-msgid "Custom"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:75
-msgid "Load shape from STL..."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:120
-msgid "Settings"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:298
-msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:315
-msgid "Error! "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:324
-msgid "The selected file contains no geometry."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:328
-msgid ""
-"The selected file contains several disjoint areas. This is not supported."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.hpp:42
-msgid "Bed Shape"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:224
-msgid "Array of language names and identifiers should have the same size."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:235
-msgid "Select the language"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:235
-msgid "Language"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:300
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:170
-msgid "Default"
-msgstr "默认"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:325
-msgid "Change Application Language"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:332
-msgid "Application will be restarted"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:332
-msgid "Attention!"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:339
-msgid "&Localization"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:488
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:470
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1300
-msgid "Error"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:493
-msgid "Notice"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:498
-msgid "GLUquadricObjPtr | Attempt to free unreferenced scalar"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\GUI.cpp:500
-msgid "Warning"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:50
-msgid "Save current "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:51
-msgid "Delete this preset"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:313
-msgid "Layers and perimeters"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:314
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:777
-msgid "Layer height"
-msgstr "层高"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:318
-msgid "Vertical shells"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:329
-msgid "Horizontal shells"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:330
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1314
-msgid "Solid layers"
-msgstr "��层数"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:335
-msgid "Quality (slower slicing)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:342
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:356
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:449
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:452
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:831
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1113
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:107
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:208
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:736
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1733
-msgid "Advanced"
-msgstr "高级"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:346
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:347
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:664
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:87
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:247
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:488
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:502
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:540
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:681
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:691
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:709
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:727
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:746
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1263
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1280
-msgid "Infill"
-msgstr "å¡«å……"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:352
-msgid "Reducing printing time"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:364
-msgid "Skirt and brim"
-msgstr "环边和裙边"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:365
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:146
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:88
-msgid "Skirt"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:371
-msgid "Brim"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:374
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:375
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:191
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1030
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1380
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1387
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1399
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1409
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1417
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1432
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1453
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1464
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1480
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1489
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1498
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1509
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1525
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1533
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1534
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1543
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1551
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1565
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:147
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:89
-msgid "Support material"
-msgstr "支撑�料"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:380
-msgid "Raft"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:384
-msgid "Options for support material and raft"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:398
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:118
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:278
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:635
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:747
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:979
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1201
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1251
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1302
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1625
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:71
-msgid "Speed"
-msgstr "速度"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:399
-msgid "Speed for print moves"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:411
-msgid "Speed for non-print moves"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:414
-msgid "Modifiers"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:417
-msgid "Acceleration control (advanced)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:424
-msgid "Autospeed (advanced)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:430
-msgid "Multiple Extruders"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:431
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:966
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:308
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:702
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:958
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1272
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1445
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1471
-msgid "Extruders"
-msgstr "挤出头"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:438
-msgid "Ooze prevention"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:442
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:149
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:91
-msgid "Wipe tower"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:453
-msgid "Extrusion width"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:463
-msgid "Overlap"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:466
-msgid "Flow"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:469
-msgid "Other"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:476
-msgid "Output options"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:477
-msgid "Sequential printing"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:479
-msgid "Extruder clearance (mm)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:488
-msgid "Output file"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:494
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1001
-msgid "Post-processing scripts"
-msgstr "�处�脚本"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:500
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:501
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:859
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:860
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1156
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1157
-msgid "Notes"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:507
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:867
-msgid "Dependencies"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:508
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:868
-msgid "Profile dependencies"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:509
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:869
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1668
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:143
-msgid "Compatible printers"
-msgstr "兼容的打�机"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:533
-#, no-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"
-"- no ensure_vertical_shell_thickness\n"
-"\n"
-"Shall I adjust those settings in order to enable Spiral Vase?"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:540
-msgid "Spiral Vase"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:560
-msgid ""
-"The Wipe Tower currently supports only:\n"
-"- first layer height 0.2mm\n"
-"- layer height from 0.15mm to 0.35mm\n"
-"\n"
-"Shall I adjust those settings in order to enable the Wipe Tower?"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:564
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:585
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:602
-msgid "Wipe Tower"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:581
-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 ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:599
-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 ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:617
-msgid ""
-"Supports work better, if the following feature is enabled:\n"
-"- Detect bridging perimeters\n"
-"\n"
-"Shall I adjust those settings for supports?"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:620
-msgid "Support Generator"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:662
-msgid "The "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:662
-#, no-c-format
-msgid ""
-" infill pattern is not supposed to work at 100% density.\n"
-"\n"
-"Shall I switch to rectilinear fill pattern?"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:786
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:787
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:368
-msgid "Filament"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:794
-msgid "Temperature "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:795
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1234
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:307
-msgid "Extruder"
-msgstr "挤出头"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:800
-msgid "Bed"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:805
-msgid "Cooling"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:806
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:922
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1695
-msgid "Enable"
-msgstr "使能"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:817
-msgid "Fan settings"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:818
-msgid "Fan speed"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:826
-msgid "Cooling thresholds"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:832
-msgid "Filament properties"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:836
-msgid "Print speed override"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:846
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1119
-msgid "Custom G-code"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:847
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1120
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1342
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1357
-msgid "Start G-code"
-msgstr "起始G代�"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:853
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1126
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:217
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:227
-msgid "End G-code"
-msgstr "结尾G代�"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:937
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:11
-msgid "General"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:938
-msgid "Size and coordinates"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:940
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:34
-msgid "Bed shape"
-msgstr "机床形状"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:942
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1637
-msgid " Set "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:962
-msgid "Capabilities"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:967
-msgid "Number of extruders of the printer."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:989
-msgid "USB/Serial connection"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:990
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1193
-msgid "Serial port"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:995
-msgid "Rescan serial ports"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1004
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1072
-msgid "Test"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1017
-msgid "Connection to printer works correctly."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1017
-msgid "Success!"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1020
-msgid "Connection failed."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1032
-msgid "OctoPrint upload"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1035
-msgid " Browse "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1110
-msgid "Firmware"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1132
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:48
-msgid "Before layer change G-code"
-msgstr "层改��的G代�"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1138
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:766
-msgid "After layer change G-code"
-msgstr "层�化�G代�"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1144
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1602
-msgid "Tool change G-code"
-msgstr "切�工具G代�"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1150
-msgid "Between objects G-code (for sequential printing)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1187
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:400
-#, c-format
-msgid "Extruder %d"
-msgstr "挤出头 %d"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1194
-msgid "Layer height limits"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1199
-msgid "Position (for multi-extruder printers)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1202
-msgid "Retraction"
-msgstr "回缩"
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1205
-msgid "Only lift Z"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1218
-msgid ""
-"Retraction when tool is disabled (advanced settings for multi-extruder "
-"setups)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1222
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:150
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2125
-msgid "Preview"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1312
-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 ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1314
-msgid "Firmware Retraction"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1469
-msgid "Default "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1469
-msgid " preset"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1470
-msgid " preset\n"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1488
-msgid ""
-"\n"
-"\n"
-"is not compatible with printer\n"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1488
-msgid ""
-"\n"
-"\n"
-"and it has the following unsaved changes:"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1489
-msgid ""
-"\n"
-"\n"
-"has the following unsaved changes:"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1491
-msgid ""
-"\n"
-"\n"
-"Discard changes and continue anyway?"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1492
-msgid "Unsaved Changes"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1560
-msgid "The supplied name is empty. It can't be saved."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1580
-msgid "remove"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1580
-msgid "delete"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1581
-msgid "Are you sure you want to "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1581
-msgid " the selected preset?"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1582
-msgid "Remove"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1582
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:178
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:196
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2021
-msgid "Delete"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1583
-msgid " Preset"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1636
-msgid "All"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1667
-msgid "Select the printers this profile is compatible with."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:514
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1645
-msgid "Save "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1751
-msgid " as:"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1785
-msgid ""
-"The supplied name is not valid; the following characters are not allowed:"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1788
-msgid "The supplied name is not available."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:182
-msgid "Print Settings"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:202
-msgid "Filament Settings"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:228
-msgid "Printer Settings"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:248
-msgid "Save preset"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Field.cpp:42
-msgid "default"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:26
-#, c-format
-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 ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:30
-#, c-format
-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 ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:34
-msgid ""
-"\n"
-"During the other layers, fan "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:36
-msgid "Fan "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:41
-#, c-format
-msgid "will always run at %d%% "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:44
-#, c-format
-msgid "except for the first %d layers"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:48
-msgid "except for the first layer"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:50
-msgid "will be turned off."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:151
-msgid "external perimeters"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:160
-msgid "perimeters"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:169
-msgid "infill"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:179
-msgid "solid infill"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:187
-msgid "top solid infill"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:198
-msgid "support"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:208
-msgid "support interface"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
-msgid "First layer volumetric"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
-msgid "Bridging volumetric"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
-msgid "Volumetric"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:215
-msgid " flow rate is maximized "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:218
-msgid "by the print profile maximum"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:219
-msgid "when printing "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:220
-msgid " with a volumetric rate "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:224
-#, c-format
-msgid "%3.2f mm³/s"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:226
-#, c-format
-msgid " at filament speed %3.2f mm/s."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:245
-msgid ""
-"Recommended object thin wall thickness: Not available due to invalid layer "
-"height."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:262
-#, c-format
-msgid "Recommended object thin wall thickness for layer height %.2f and "
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:269
-#, c-format
-msgid "%d lines: %.2lf mm"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.hpp:17
-msgid "Preferences"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:27
-msgid "Remember output directory"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:29
-msgid ""
-"If this is enabled, Slic3r will prompt the last output directory instead of "
-"the one containing the input files."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:35
-msgid "Auto-center parts"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:37
-msgid ""
-"If this is enabled, Slic3r will auto-center objects around the print bed "
-"center."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:43
-msgid "Background processing"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:45
-msgid ""
-"If this is enabled, Slic3r will pre-process objects as soon as they're "
-"loaded in order to save time when exporting G-code."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:51
-msgid "Disable USB/serial connection"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:53
-msgid ""
-"Disable communication with the printer over a serial / USB cable. This "
-"simplifies the user interface in case the printer is never attached to the "
-"computer."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:59
-msgid "Suppress \" - default - \" presets"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:61
-msgid ""
-"Suppress \" - default - \" presets in the Print / Filament / Printer "
-"selections once there are any other valid presets available."
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:67
-msgid "Show incompatible print and filament presets"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:69
-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 ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:75
-msgid "Use legacy OpenGL 1.1 rendering"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:77
-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 ""
-
-#: c:\src\Slic3r\xs\src\slic3r\GUI\Preferences.cpp:101
-msgid "You need to restart Slic3r to make the changes effective."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:26
-msgid "Avoid crossing perimeters"
-msgstr "��跨越轮廓"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:27
-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 ""
-"为了尽��少跨越轮廓，优化空程的移动方�。这�常适用于�渗�问题影�的�登挤"
-"出头。此功能会�慢打�速度和 G 代�生�速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:38
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1572
-msgid "Other layers"
-msgstr "其它层"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:39
-msgid ""
-"Bed temperature for layers after the first one. Set this to zero to disable "
-"bed temperature control commands in the output."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:42
-msgid "Bed temperature"
-msgstr "机床温度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:49
-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轴移动��入。注�除了�以使用[layer_num]和"
-"[layer_z]，也�以使用��符��替代所有的slic3r设置。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:59
-msgid "Between objects G-code"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:60
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:68
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:370
-msgid "Bottom"
-msgstr "底部"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:69
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:239
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:290
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:298
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:604
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:762
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:778
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:941
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:989
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1152
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1583
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1639
-msgid "Layers and Perimeters"
-msgstr "层和轮廓"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:70
-msgid "Number of solid layers to generate on bottom surfaces."
-msgstr "底部表�生�的��层数。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:72
-msgid "Bottom solid layers"
-msgstr "底部��层"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:77
-msgid "Bridge"
-msgstr "æ¡¥"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:78
-msgid ""
-"This is the acceleration your printer will use for bridges. Set zero to "
-"disable acceleration control for bridges."
-msgstr "此项为打�机在打�桥时的加速度。设为0�以�用打�桥的加速度控制。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:80
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:174
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:576
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:684
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:952
-msgid "mm/s²"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:86
-msgid "Bridging angle"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:88
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:91
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:492
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1170
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1181
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1401
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1557
-msgid "°"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:97
-msgid "Bridges fan speed"
-msgstr "桥风扇速度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:98
-msgid "This fan speed is enforced during all bridges and overhangs."
-msgstr "此项为在打�所有桥和悬垂部�时的风扇速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:99
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:504
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:789
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:850
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1060
-msgid "%"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:106
-msgid "Bridge flow ratio"
-msgstr "桥��比"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:108
-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 ""
-"此因素影�桥接部�的塑料用�。�以略微�少该值以回撤挤出物��滴垂。但默认设"
-"置通常�说已��以满足使用，在修改�需通过冷�（使用风扇）进行测试。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:117
-msgid "Bridges"
-msgstr "桥接处"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:119
-msgid "Speed for printing bridges."
-msgstr "打�桥接处的速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:120
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:638
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:749
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:811
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:868
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:981
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1137
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1146
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1536
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1649
-msgid "mm/s"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:127
-msgid "Brim width"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:128
-msgid ""
-"Horizontal width of the brim that will be printed around each object on the "
-"first layer."
-msgstr "第一层�个物体周围打�的裙边水平宽度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:135
-msgid "Clip multi-part objects"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:136
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:147
-msgid "Compatible printers condition"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:148
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:154
-msgid "Complete individual objects"
-msgstr "打�完��个物体"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:155
-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."
-msgstr ""
-"勾选此项表示当打�多个物体或�制体时，先打�完一整个物体�继续打��续物体"
-"（从底层开始）。此选项利于��打�掉物体。Slic3r应该给出警示，��挤出头碰"
-"撞，但请�心。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:163
-msgid "Enable auto cooling"
-msgstr "自动冷�使能"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:164
-msgid ""
-"This flag enables the automatic cooling logic that adjusts print speed and "
-"fan speed according to layer printing time."
-msgstr "该选项�动自动冷�，使得�根�层打�时间调整打�速度和风扇速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:171
-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."
-msgstr ""
-"该值为打�机在使用了特定的加速度值（如轮廓/填充）�将�置的加速度值。设为0以"
-"防止�置加速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:180
-msgid "Disable fan for the first"
-msgstr "�几层�用风扇"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:181
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:183
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:694
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1033
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1224
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1285
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1437
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1482
-msgid "layers"
-msgstr "层"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:190
-msgid "Don't support bridges"
-msgstr "�支�桥接"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:192
-msgid ""
-"Experimental option for preventing support material from being generated "
-"under bridged areas."
-msgstr "试验项，在桥接处�止生�支撑�料。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:198
-msgid "Distance between copies"
-msgstr "�制物体之间的�离"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:199
-msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "自动分布时所使用的�离。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:207
-msgid "Elephant foot compensation"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:209
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:218
-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�数使用��符��。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:228
-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 ""
-"该部分将被�入输出文件的结尾，但在打�机结尾G代�之�。注��以对所有Slic3r�"
-"数使用��符��代替。如果有多个打�头，G代�将按打�头的顺��处�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:238
-msgid "Ensure vertical shell thickness"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:240
-msgid ""
-"Add solid infill near sloping surfaces to guarantee the vertical shell "
-"thickness (top+bottom solid layers)."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:246
-msgid "Top/bottom fill pattern"
-msgstr "顶部/底部填充样�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:248
-msgid ""
-"Fill pattern for top/bottom infill. This only affects the external visible "
-"layer, and not its adjacent solid shells."
-msgstr "对顶部/底部内部填充的类型。这将影�外围��层，�影�其相邻的��层。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:267
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:277
-msgid "External perimeters"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:268
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:377
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:592
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:710
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:967
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1292
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1454
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1614
-msgid "Extrusion Width"
-msgstr "挤出宽度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:269
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:272
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:597
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:715
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:972
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1296
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1458
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1619
-msgid "mm or % (leave 0 for default)"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:279
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:282
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:619
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1255
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1306
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1501
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1631
-msgid "mm/s or %"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:289
-msgid "External perimeters first"
-msgstr "先打�外围轮廓"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:291
-msgid ""
-"Print contour perimeters from the outermost one to the innermost one instead "
-"of the default inverse order."
-msgstr "从最外围轮廓�最内部的轮廓打�，而�是�方�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:297
-msgid "Extra perimeters if needed"
-msgstr "如果需�的�，打�外围轮廓"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:299
-#, no-c-format
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:309
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:320
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:69
-msgid "Height"
-msgstr "高度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:321
-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."
-msgstr ""
-"设置为喷嘴尖端和（通常）X架�之间的垂直�离。���说，这是在你的挤出机周围的"
-"空隙气缸的高度，它代表了挤出头在与其他�打�物体碰撞�科达到的最大深度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:331
-msgid "Radius"
-msgstr "�径"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:332
-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."
-msgstr ""
-"设置为挤出头周围的空隙�径。如果挤出头未置中，安全起�请选择最大值。该�数用"
-"于检查碰撞，并在界�中显示图形预览。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:342
-msgid "Extruder Color"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:343
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:406
-msgid "This is only used in the Slic3r interface as a visual help."
-msgstr "仅�供Slic3r界�的视觉帮助。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:350
-msgid "Extruder offset"
-msgstr "挤出头�置"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:351
-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)."
-msgstr ""
-"如果你的固件�能处�挤出头的�移�，需�使用G代�将其考虑进去。该选项�让你细"
-"化�个挤出头相对第一个挤出头的�移�。一般为正�标（它们将从XY�标相�得"
-"到）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:360
-msgid "Extrusion axis"
-msgstr "挤出轴"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:361
-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)。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:367
-msgid "Extrusion multiplier"
-msgstr "挤出�数"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:368
-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."
-msgstr ""
-"该选项按比例改���。你�能需�调整该设置�获�更好的表�尾处�，更正�层墙"
-"的宽度。通常值范围在0.9到1.1之间。如果你觉得有必�更改幅度更大，检查�料直径"
-"和你的固件E步骤。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:376
-msgid "Default extrusion width"
-msgstr "默认挤出宽度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:378
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:382
-msgid "mm or % (leave 0 for auto)"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:387
-msgid "Keep fan always on"
-msgstr "��风扇总是打开"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:388
-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�料�适用。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:394
-msgid "Enable fan if layer print time is below"
-msgstr "如果打�时间低于该值，则气动风扇"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:395
-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 ""
-"如果估算的打�时间低于该数值（��为秒），风扇将�用，而且速度值根��补最�"
-"速度值和最大速度值�计算。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:397
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1242
-msgid "approximate seconds"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:405
-msgid "Color"
-msgstr "颜色"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:412
-msgid "Filament notes"
-msgstr "�料备注"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:413
-msgid "You can put your notes regarding the filament here."
-msgstr "关于�料的备注�放这里。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:421
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:817
-msgid "Max volumetric speed"
-msgstr "最大体积速度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:422
-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则无�制。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:425
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:820
-msgid "mm³/s"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:432
-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."
-msgstr ""
-"在这里输入你的�料直径。需�较高精度，所以请使用�尺，沿��料长��多次测"
-"�，计算平�值。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:440
-msgid "Density"
-msgstr "密度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:441
-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."
-msgstr ""
-"在这里输入你的�料密度。此仅为统计信�。一个�错的方法是测�一段已知长度�料"
-"的��，然�计算体积。更好的方法�直接通过�移计算体积。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:444
-msgid "g/cm³"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:450
-msgid "Filament type"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:451
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1002
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:470
-msgid "Soluble material"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:471
-msgid "Soluble material is most likely used for a soluble support."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:476
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:450
-msgid "Cost"
-msgstr "�价"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:477
-msgid ""
-"Enter your filament cost per kg here. This is only for statistical "
-"information."
-msgstr "在这里输入�料�公斤的价格。仅用于统计信�。"
-
-# Set this to be the local currency symbol.
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:478
-msgid "money/kg"
-msgstr "Â¥/kg"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:487
-msgid "Fill angle"
-msgstr "填充角度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:489
-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."
-msgstr ""
-"填充的默认基础方�角。交�引线适用于此。桥接处将使用Slic3r所侦测的最好方��"
-"填充，所以此�数�影�它们。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:501
-msgid "Fill density"
-msgstr "填充密度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:503
-#, no-c-format
-msgid "Density of internal infill, expressed in the range 0% - 100%."
-msgstr "内部填充的密度，以0% - 100% 表示。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:539
-msgid "Fill pattern"
-msgstr "填充样�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:541
-msgid "Fill pattern for general low-density infill."
-msgstr "一般低密度填充的填充样�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:573
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:582
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:591
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:625
-msgid "First layer"
-msgstr "首层"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:574
-msgid ""
-"This is the acceleration your printer will use for first layer. Set zero to "
-"disable acceleration control for first layer."
-msgstr "此项为打�机对首层使用的加速度。设为0则对首层�用加速控制。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:583
-msgid ""
-"Heated build plate temperature for the first layer. Set this to zero to "
-"disable bed temperature control commands in the output."
-msgstr "首层的加热�温度。设为0，�在输出中�用机床温度控制指令。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:593
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:603
-msgid "First layer height"
-msgstr "首层高度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:605
-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%）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:609
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:740
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1390
-msgid "mm or %"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:615
-msgid "First layer speed"
-msgstr "首层速度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:616
-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 ""
-"如果表示为mm/s的数值，该值将被用于首层的打�动作，无关动作的类型。如果表示为"
-"百分数（如40%），则以默认速度值为基准。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:626
-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��止输出文件中的"
-"控制命令。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:634
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:145
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:87
-msgid "Gap fill"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:636
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:644
-msgid "Verbose G-code"
-msgstr "详细的G代�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:645
-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�打�，"
-"文件冗余部分�能�缓你的固件�行速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:652
-msgid "G-code flavor"
-msgstr "G代�风格"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:653
-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�输出任何挤出值。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:682
-msgid ""
-"This is the acceleration your printer will use for infill. Set zero to "
-"disable acceleration control for infill."
-msgstr "打�机填充加速度。设为0��用填充加速控制。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:690
-msgid "Combine infill every"
-msgstr "�几层��填充"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:692
-msgid ""
-"This feature allows to combine infill and speed up your print by extruding "
-"thicker infill layers while preserving thin perimeters, thus accuracy."
-msgstr ""
-"该功能�通过挤出更厚的填充层�实现��填充，并加速打�，�时�留了薄�，也就"
-"��了精度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:696
-msgid "Combine infill every n layers"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:701
-msgid "Infill extruder"
-msgstr "填充挤出头"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:703
-msgid "The extruder to use when printing infill."
-msgstr "打�填充时使用的挤出头。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:711
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:720
-msgid "Infill before perimeters"
-msgstr "先填充�打�轮廓"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:721
-msgid ""
-"This option will switch the print order of perimeters and infill, making the "
-"latter first."
-msgstr "该选项将打�轮廓和填充的方�对调，使�者��。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:726
-msgid "Only infill where needed"
-msgstr "仅在需�时填充"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:728
-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."
-msgstr ""
-"该选项将把填充�定用于支撑天花�（将充当内部支撑�料的作用）。如果�用，由于"
-"多个包�的选项将使G代�生�速度�慢。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:735
-msgid "Infill/perimeters overlap"
-msgstr "填充/轮廓��"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:737
-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."
-msgstr ""
-"使得填充和轮廓间有�外的��部分，便于结�。�论上并�需�，但�移�能会导致"
-"间隙。如果表示为百分数（如15%），则以轮廓挤出宽度为基准。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:748
-msgid "Speed for printing the internal fill. Set to zero for auto."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:757
-msgid "Interface shells"
-msgstr "表�外壳"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:758
-msgid ""
-"Force the generation of solid shells between adjacent materials/volumes. "
-"Useful for multi-extruder prints with translucent materials or manual "
-"soluble support material."
-msgstr ""
-"在相邻的�料/包围体之间强制生���外壳层。适用于使用��明�料或手工�溶性支"
-"撑�料的多挤出头打�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:767
-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 ""
-"这段G代�在�一层�化�，�Z轴移动�，挤出头移动到第一层的点之��入。注�除"
-"了使用如[layer_num]和[layer_z]，也�以使用��符���代替Slic3r的�数。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:779
-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 ""
-"该�数控制切片的高度（因此也控制总层数）。较薄的切片�以使精度更高，但花费的"
-"打�时间也更长。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:787
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:796
-msgid "Max"
-msgstr "最大值"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:788
-msgid "This setting represents the maximum speed of your fan."
-msgstr "该值表示风扇的最大速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:797
-#, no-c-format
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:807
-msgid "Max print speed"
-msgstr "最大打�速度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:808
-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."
-msgstr ""
-"当将其他速度�数设为0时，Slic3r会自动计算最优速度以��挤出头压力稳定。该试验"
-"�数用于设置所�许的最大打�速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:818
-msgid ""
-"This experimental setting is used to set the maximum volumetric speed your "
-"extruder supports."
-msgstr "该实验�数用于设置你的挤出头所支�的最大体积速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:826
-msgid "Max volumetric slope positive"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:827
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:838
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:831
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:842
-msgid "mm³/s²"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:837
-msgid "Max volumetric slope negative"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:848
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:857
-msgid "Min"
-msgstr "最�值"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:849
-msgid "This setting represents the minimum PWM your fan needs to work."
-msgstr "该�数表示你的风扇工作的最�PWM。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:858
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:866
-msgid "Min print speed"
-msgstr "最�打�速度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:867
-msgid "Slic3r will not scale speed down below this speed."
-msgstr "Slic3r的最�打�速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:874
-msgid "Minimum extrusion length"
-msgstr "最大挤出长度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:875
-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."
-msgstr ""
-"在底层上消耗指定�料�生�环边。对于多挤出头的机器，该最�值适用于�个挤出"
-"头。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:884
-msgid "Configuration notes"
-msgstr "�置备注"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:885
-msgid ""
-"You can put here your personal notes. This text will be added to the G-code "
-"header comments."
-msgstr ""
-"你�以在这里输入你的个人备注。该段文字内容将被添加到G代�文件开头的注释里。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:894
-msgid "Nozzle diameter"
-msgstr "喷嘴直径"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:895
-msgid ""
-"This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)"
-msgstr "这是你的挤出头喷嘴的直径(：0.5,0.35等。)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:901
-msgid "API Key"
-msgstr "API密钥"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:902
-msgid ""
-"Slic3r can upload G-code files to OctoPrint. This field should contain the "
-"API Key required for authentication."
-msgstr ""
-"Slic3r�以把G代�文件上传至Octoprint。此字段应包�API密钥，用于身份验�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:908
-msgid "Host or IP"
-msgstr "主机�或IP"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:909
-msgid ""
-"Slic3r can upload G-code files to OctoPrint. This field should contain the "
-"hostname or IP address of the OctoPrint instance."
-msgstr ""
-"Slic3r�以把G代�文件上传至Octoprint。此字段应包�OctoPrint实例的主机�称或IP"
-"地�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:915
-msgid "Only retract when crossing perimeters"
-msgstr "仅在越过轮廓时回缩"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:916
-msgid ""
-"Disables retraction when the travel path does not exceed the upper layer's "
-"perimeters (and thus any ooze will be probably invisible)."
-msgstr "当空程�超过上层轮廓时�用回撤（这样滴垂现象�能会看��）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:923
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:930
-msgid "Output filename format"
-msgstr "输出文件�称格�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:931
-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]。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:940
-msgid "Detect bridging perimeters"
-msgstr "侦测桥接轮廓"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:942
-msgid ""
-"Experimental option to adjust flow for overhangs (bridge flow will be used), "
-"to apply bridge speed to them and enable fan."
-msgstr ""
-"试验选项，用于调整悬空部�的��（使用桥接��），将桥接速度用于它们并�用风"
-"扇。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:948
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:966
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:978
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:988
-msgid "Perimeters"
-msgstr "轮廓"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:949
-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将�用轮廓加速度控制。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:957
-msgid "Perimeter extruder"
-msgstr "轮廓挤出头"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:959
-msgid ""
-"The extruder to use when printing perimeters and brim. First extruder is 1."
-msgstr "打�轮廓和裙边所使用的挤出头。第一个挤出头是1。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:968
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:980
-msgid ""
-"Speed for perimeters (contours, aka vertical shells). Set to zero for auto."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:990
-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在侦测"
-"到斜�表�时�能会自动增加该数值，因为较多的轮廓有利于斜�表�的打�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:994
-msgid "(minimum)"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1014
-msgid "Printer notes"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1015
-msgid "You can put your notes regarding the printer here."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1029
-msgid "Raft layers"
-msgstr "��层"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1031
-msgid ""
-"The object will be raised by this number of layers, and support material "
-"will be generated under it."
-msgstr "物体将被该数目的层数抬起，而支撑�料将在其下方生�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1039
-msgid "Resolution"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1040
-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则�用任何简化，完全�照输入文件的精度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1050
-msgid "Minimum travel after retraction"
-msgstr "回缩�最�空程"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1051
-msgid ""
-"Retraction is not triggered when travel moves are shorter than this length."
-msgstr "当空程短于此长度时�会触�回缩。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1057
-msgid "Retract amount before wipe"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1058
-msgid ""
-"With bowden extruders, it may be wise to do some amount of quick retract "
-"before doing the wipe movement."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1065
-msgid "Retract on layer change"
-msgstr "层�化时回缩"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1066
-msgid "This flag enforces a retraction whenever a Z move is done."
-msgstr "该项强制在Z轴移动完�时回缩。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1071
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1080
-msgid "Length"
-msgstr "长度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1072
-msgid "Retraction Length"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1073
-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 ""
-"当触�回缩时，�料以指定值往回收缩（长度以在进入挤出头之�的原始�料为基础进"
-"行计算）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1075
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1085
-msgid "mm (zero to disable)"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1081
-msgid "Retraction Length (Toolchange)"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1082
-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 ""
-"当在改�工具�触�回缩时，�料以指定值回缩（长度以进入挤出头�的原始�料为基"
-"础测�）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1090
-msgid "Lift Z"
-msgstr "抬高Z"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1091
-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轴会快速抬�。当使用多个挤出头时，仅会考虑第一个"
-"挤出头的该�数。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1099
-msgid "Above Z"
-msgstr "在Z上方"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1100
-msgid "Only lift Z above"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1101
-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 ""
-"如果设为正值，仅在指定的�对Z值上方�会抬高Z。�以调整该�数，用于跳过在�几"
-"层时跳过Z抬高的步骤。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1108
-msgid "Below Z"
-msgstr "Z下方"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1109
-msgid "Only lift Z below"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1110
-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 ""
-"如果设为正值，仅在指定的�对Z值选房�以调整该�数，用于将抬高Z的动作�制在�"
-"几层时。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1118
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1126
-msgid "Extra length on restart"
-msgstr "��时�外长度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1119
-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 ""
-"当在空程�回缩被补�时，挤出头会基础�外的指定��料。该�数一般�需设置。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1127
-msgid ""
-"When the retraction is compensated after changing tool, the extruder will "
-"push this additional amount of filament."
-msgstr "当在切�工具�回缩被补�时，挤出头会基础�外的指定��料。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1134
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1135
-msgid "Retraction Speed"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1136
-msgid "The speed for retractions (it only applies to the extruder motor)."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1142
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1143
-msgid "Deretraction Speed"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1144
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1151
-msgid "Seam position"
-msgstr "接��置"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1153
-msgid "Position of perimeters starting points."
-msgstr "轮廓开始点的�置。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1169
-msgid "Direction"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1171
-msgid "Preferred direction of the seam"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1172
-msgid "Seam preferred direction"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1180
-msgid "Jitter"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1182
-msgid "Seam preferred direction jitter"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1183
-msgid "Preferred direction of the seam - jitter"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1194
-msgid "USB/serial port for printer connection."
-msgstr "用于打�机连接的USB/串�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1202
-msgid "Serial port speed"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1203
-msgid "Speed (baud) of USB/serial port for printer connection."
-msgstr "用于打�机连接的USB/串�速度（波特率）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1212
-msgid "Distance from object"
-msgstr "离物体的�离"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1213
-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，则使环边紧贴物体，�获得裙边利于粘附。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1221
-msgid "Skirt height"
-msgstr "环边高度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1222
-msgid ""
-"Height of skirt expressed in layers. Set this to a tall value to use skirt "
-"as a shield against drafts."
-msgstr "图层中表示的环边高度。设为一个较高值，�将环边用作。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1229
-msgid "Loops (minimum)"
-msgstr "圈数(最�)"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1230
-msgid "Skirt Loops"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1231
-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 ""
-"环边的圈数。如果设置了最�挤出长度，那么圈数必须比这里设置的值�大。设为0则完"
-"全�用环边。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1239
-msgid "Slow down if layer print time is below"
-msgstr "如果图层打�时间低于该值则�速"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1240
-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 ""
-"如果预计打�时间低于该值（��为秒），则打�速度将�低以使打�时间延长到该"
-"值。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1250
-msgid "Small perimeters"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1252
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1262
-msgid "Solid infill threshold area"
-msgstr "��填充阈值区域"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1264
-msgid ""
-"Force solid infill for regions having a smaller area than the specified "
-"threshold."
-msgstr "对于比指定阈值�的区域强制进行��填充。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1265
-msgid "mm²"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1271
-msgid "Solid infill extruder"
-msgstr "��填充挤出头"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1273
-msgid "The extruder to use when printing solid infill."
-msgstr "当打���填充时使用的挤出头。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1279
-msgid "Solid infill every"
-msgstr "�几层��填充"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1281
-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."
-msgstr ""
-"该功能使得�指定数目层强制进行一次��填充。设为0�用该功能。�以设为任�值"
-"（如9999）；Slic3r会根�喷嘴直径和层高�自动选择图层的最大�能个数。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1291
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1301
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:142
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:84
-msgid "Solid infill"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1293
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1303
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1315
-msgid "Number of solid layers to generate on top and bottom surfaces."
-msgstr "在顶部和底部表�生�的��层数。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1322
-msgid "Spiral vase"
-msgstr "螺旋�容器"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1323
-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，以便移除��的��点。该选项�求�轮"
-"廓，无填充，无顶部��层，无支撑。��以设置环边�裙边圈数，和底部��层。但"
-"在打�多个物体时�适用。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1332
-msgid "Temperature variation"
-msgstr "温度�化"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1333
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1343
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1358
-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代�开头，在所有打�机起始G代���入。用于覆盖指定�料的�数。"
-"该段代�放在G代�开头，在热床达到目标温度�挤出头开始加热�，挤出头完�加热�"
-"�入。如果其中�包�有M104, M109, M140 或 M190，这段指令就会在Slic3r自动放置"
-"的M指令之�；�则Slic3r将�会自动生�M指令，这样你�以自由定义加热命令和其他"
-"自定义动作的顺�。注��以使用��符��替代所有Slic3r�数，所以你�以把一"
-"个“M109 S[ first_layer_temperature ]�命令放在任�处。如果你有多个挤出头，G代"
-"�将按挤出头顺�处�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1373
-msgid "Single Extruder Multi Material"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1374
-msgid "The printer multiplexes filaments into a single hot end."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1379
-msgid "Generate support material"
-msgstr "生�支撑�料"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1381
-msgid "Enable support material generation."
-msgstr "�用支撑�料生�功能。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1386
-msgid "XY separation between an object and its support"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1388
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1398
-msgid "Pattern angle"
-msgstr "样�角度"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1400
-msgid ""
-"Use this setting to rotate the support material pattern on the horizontal "
-"plane."
-msgstr "使用该�数对支撑�料的样�在水平�上进行旋转。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1408
-msgid "Support on build plate only"
-msgstr "仅在热床上生�支撑"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1410
-msgid ""
-"Only create support if it lies on a build plate. Don't create support on a "
-"print."
-msgstr "仅在热床上生�支撑，�在打�出�的物体上生�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1416
-msgid "Contact Z distance"
-msgstr "接触Z值"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1418
-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 ""
-"物体和支撑�料平�之间的垂直�离。设为0，则表�上第一层�会被当�桥�处�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1431
-msgid "Enforce support for the first"
-msgstr "�几层增强支撑"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1433
-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 ""
-"从底部开始，对指定数目的图层生�支撑�料，无论正常的支撑�料是��用，也�管"
-"任何角度阈值。适用于在热床上脚太细�站��的物件，便于更好的粘附。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1439
-msgid "Enforce support for the first n layers"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1444
-msgid "Support material/raft/skirt extruder"
-msgstr "支撑�料/�/环边挤出头"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1446
-msgid ""
-"The extruder to use when printing support material, raft and skirt (1+, 0 to "
-"use the current extruder to minimize tool changes)."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1455
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1463
-msgid "Interface loops"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1465
-msgid ""
-"Cover the top contact layer of the supports with loops. Disabled by default."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1470
-msgid "Support material/raft interface extruder"
-msgstr "支撑�料/�表�挤出头"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1472
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1479
-msgid "Interface layers"
-msgstr "表�层数"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1481
-msgid ""
-"Number of interface layers to insert between the object(s) and support "
-"material."
-msgstr "在物体和支撑�料中间�入的表�层数。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1488
-msgid "Interface pattern spacing"
-msgstr "表�样�间隔"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1490
-msgid "Spacing between interface lines. Set zero to get a solid interface."
-msgstr "表�直线间的间隔。设为0获得��表�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1497
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:148
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:90
-msgid "Support material interface"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1499
-msgid ""
-"Speed for printing support material interface layers. If expressed as "
-"percentage (for example 50%) it will be calculated over support material "
-"speed."
-msgstr ""
-"打�支撑�料表�层的速度。若表示为百分数（如50%），则以支撑�料速度为基准计"
-"算。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1508
-msgid "Pattern"
-msgstr "样�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1510
-msgid "Pattern used to generate support material."
-msgstr "生�支撑�料的样�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1524
-msgid "Pattern spacing"
-msgstr "样�间隔"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1526
-msgid "Spacing between support material lines."
-msgstr "支撑�料直线间的间隙。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1535
-msgid "Speed for printing support material."
-msgstr "打�支撑�料的速度。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1542
-msgid "Synchronize with object layers"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1544
-msgid ""
-"Synchronize support layers with the object print layers. This is useful with "
-"multi-material printers, where the extruder switch is expensive."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1550
-msgid "Overhang threshold"
-msgstr "悬空阈值"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1552
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1564
-msgid "With sheath around the support"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1566
-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 ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1573
-msgid ""
-"Extruder temperature for layers after the first one. Set this to zero to "
-"disable temperature control commands in the output."
-msgstr "第一层之�的挤出头温度。设为0以在输出文件中�用温度控制指令。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1576
-msgid "Temperature"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1582
-msgid "Detect thin walls"
-msgstr "检测薄�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1584
-msgid ""
-"Detect single-width walls (parts where two extrusions don't fit and we need "
-"to collapse them into a single trace)."
-msgstr ""
-"检测�一厚度的薄�（两个挤出����，以至于需�把它们压缩�一�轨迹的地"
-"方）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1590
-msgid "Threads"
-msgstr "线程"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1591
-msgid ""
-"Threads are used to parallelize long-running tasks. Optimal threads number "
-"is slightly above the number of available cores/processors."
-msgstr "线程用于并行处�长时间任务。最优的线程数应比�用核/处�器的数目略多。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1603
-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]。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1613
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1624
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:143
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:85
-msgid "Top solid infill"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1615
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1626
-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."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1638
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:369
-msgid "Top"
-msgstr "顶部"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1640
-msgid "Number of solid layers to generate on top surfaces."
-msgstr "在顶部表�上生�的��层数。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1642
-msgid "Top solid layers"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1647
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:95
-msgid "Travel"
-msgstr "空程"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1648
-msgid "Speed for travel moves (jumps between distant extrusion points)."
-msgstr "空程移动的速度（从一个挤出点结�调到�一个挤出点开始）。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1656
-msgid "Use firmware retraction"
-msgstr "使用固件回缩"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1657
-msgid ""
-"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中支�该功能。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1663
-msgid "Use relative E distances"
-msgstr "使用相对E�离"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1664
-msgid ""
-"If your firmware requires relative E values, check this, otherwise leave it "
-"unchecked. Most firmwares use absolute values."
-msgstr "如果固件需�相对E值，勾选此项，�则��勾选。大部分固件使用�对值。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1670
-msgid "Use volumetric E"
-msgstr "使用体积E"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1671
-msgid ""
-"This experimental setting uses outputs the E values in cubic millimeters "
-"instead of linear millimeters. If your firmware doesn't already know "
-"filament diameter(s), you can put commands like 'M200 D[filament_diameter_0] "
-"T0' in your start G-code in order to turn volumetric mode on and use the "
-"filament diameter associated to the filament selected in Slic3r. This is "
-"only supported in recent Marlin."
-msgstr ""
-"该试验�数在E值中使用立方米为��，而�毫米。如果固件�知��料直径，你�以在"
-"起始G代�中输入如'M200 D[filament_diameter_0] T0' 以开�体积模�，并使用在"
-"Slic3r中已选的�料直径。仅在最新Marlin中支�该功能。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1681
-msgid "Enable variable layer height feature"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1682
-msgid ""
-"Some printers or printer setups may have difficulties printing with a "
-"variable layer height. Enabled by default."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1688
-msgid "Wipe while retracting"
-msgstr "回缩时擦拭"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1689
-msgid ""
-"This flag will move the nozzle while retracting to minimize the possible "
-"blob on leaky extruders."
-msgstr "在回缩时移动喷嘴以��挤出头滴�。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1696
-msgid ""
-"Multi material printers may need to prime or purge extruders on tool "
-"changes. Extrude the excess material into the wipe tower."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1702
-msgid "Position X"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1703
-msgid "X coordinate of the left front corner of a wipe tower"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1709
-msgid "Position Y"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1710
-msgid "Y coordinate of the left front corner of a wipe tower"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1716
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:70
-msgid "Width"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1717
-msgid "Width of a wipe tower"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1723
-msgid "Per color change depth"
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1724
-msgid ""
-"Depth of a wipe color per color change. For N colors, there will be maximum "
-"(N-1) tool switches performed, therefore the total depth of the wipe tower "
-"will be (N-1) times this value."
-msgstr ""
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1732
-msgid "XY Size Compensation"
-msgstr "XY尺寸补�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1734
-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 ""
-"该物体将以指定值（负=往内，正=往外）�大/收缩。对于精确调节孔洞尺寸�能有用。"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1742
-msgid "Z offset"
-msgstr "Z补�"
-
-#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1743
-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)."
-msgstr ""
-"在输出G代�中，所有Z�标将在原基础上增大（或�少）该数值。用�对糟糕的Z终点挡"
-"��置进行补�，如果你的终点挡�为零时，喷嘴离打�热床还有0.3毫米，将该值设"
-"为-0.3（或者调整你的终点挡�）。"
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:137
-msgid "None"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:138
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:80
-msgid "Perimeter"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:139
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:81
-msgid "External perimeter"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:140
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:82
-msgid "Overhang perimeter"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:141
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:83
-msgid "Internal infill"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:144
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:86
-msgid "Bridge infill"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:151
-msgid "Mixed"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:330
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:68
-msgid "Feature type"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:332
-msgid "Height (mm)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:334
-msgid "Width (mm)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:336
-msgid "Speed (mm/s)"
-msgstr ""
-
-#: c:\src\Slic3r\xs\src\libslic3r\GCode\PreviewData.cpp:338
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:72
-msgid "Tool"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI.pm:286
-msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
-msgid "Version "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:66
-msgid ""
-" - Remember to check for updates at http://github.com/supermerill/slic3r/releases"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:118
-msgid "Plater"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:120
-msgid "Controller"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:192
-msgid "No Bonjour device found"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:192
-msgid "Device Browser"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:211
-msgid "Connection to OctoPrint works correctly."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:214
-msgid "I wasn't able to connect to OctoPrint ("
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:215
-msgid "). Check hostname and OctoPrint version (at least 1.1.0 is required)."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:251
-msgid "Open STL/OBJ/AMF…\tCtrl+O"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:251
-msgid "Open a model"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:254
-msgid "&Load Config…\tCtrl+L"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:254
-msgid "Load exported configuration file"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:257
-msgid "&Export Config…\tCtrl+E"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:257
-msgid "Export current configuration to file"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:260
-msgid "&Load Config Bundle…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:260
-msgid "Load presets from a bundle"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:263
-msgid "&Export Config Bundle…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:263
-msgid "Export all presets to file"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:268
-msgid "Q&uick Slice…\tCtrl+U"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:268
-msgid "Slice a file into a G-code"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:274
-msgid "Quick Slice and Save &As…\tCtrl+Alt+U"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:274
-msgid "Slice a file into a G-code, save as"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:280
-msgid "&Repeat Last Quick Slice\tCtrl+Shift+U"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:280
-msgid "Repeat last quick slice"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:287
-msgid "Slice to SV&G…\tCtrl+G"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:287
-msgid "Slice file to a multi-layer SVG"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:291
-msgid "(&Re)Slice Now\tCtrl+S"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:291
-msgid "Start new slicing process"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:294
-msgid "Repair STL file…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:294
-msgid "Automatically repair an STL file"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:299
-msgid "Preferences…\tCtrl+,"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:299
-msgid "Application preferences"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:304
-msgid "&Quit"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:304
-msgid "Quit Slic3r"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:314
-msgid "Export G-code..."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:314
-msgid "Export current plate as G-code"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:317
-msgid "Export plate as STL..."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:317
-msgid "Export current plate as STL"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:320
-msgid "Export plate as AMF..."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:320
-msgid "Export current plate as AMF"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:323
-msgid "Export plate as 3MF..."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:323
-msgid "Export current plate as 3MF"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:336
-msgid "Select &Plater Tab\tCtrl+1"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:336
-msgid "Show the plater"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:342
-msgid "Select &Controller Tab\tCtrl+T"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:342
-msgid "Show the printer controller"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:350
-msgid "Select P&rint Settings Tab\tCtrl+2"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:350
-msgid "Show the print settings"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:353
-msgid "Select &Filament Settings Tab\tCtrl+3"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:353
-msgid "Show the filament settings"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:356
-msgid "Select Print&er Settings Tab\tCtrl+4"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:356
-msgid "Show the printer settings"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:368
-msgid "Iso"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:368
-msgid "Iso View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:369
-msgid "Top View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:370
-msgid "Bottom View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:371
-msgid "Front"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:371
-msgid "Front View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:372
-msgid "Rear"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:372
-msgid "Rear View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:373
-msgid "Left"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:373
-msgid "Left View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:374
-msgid "Right"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:374
-msgid "Right View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:380
-msgid "&Configuration "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:380
-msgid "Run Configuration "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
-msgid "Prusa 3D Drivers"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
-msgid "Open the Prusa3D drivers download page in your browser"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
-msgid "Slic3r++ Releases"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:388
-msgid "Open the Slic3r++ releases page in your browser"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:395
-msgid "Slic3r &Website"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:395
-msgid "Open the Slic3r website in your browser"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:398
-msgid "Slic3r &Manual"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:398
-msgid "Open the Slic3r manual in your browser"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:402
-msgid "System Info"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:402
-msgid "Show system information"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
-msgid "Report an Issue"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:405
-msgid "Report an issue on the Slic3r Slic3r++"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:408
-msgid "&About Slic3r"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:408
-msgid "Show about dialog"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:418
-msgid "&File"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:419
-msgid "&Plater"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:420
-msgid "&Object"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:421
-msgid "&Window"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:422
-msgid "&View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:426
-msgid "&Help"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:457
-msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:469
-msgid "No previously sliced file."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:474
-msgid "Previously sliced file ("
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:474
-msgid ") not found."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:475
-msgid "File Not Found"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:514
-msgid "SVG"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:514
-msgid "G-code"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:514
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1645
-msgid " file as:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:528
-msgid "Slicing…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:528
-msgid "Processing "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:548
-msgid " was successfully sliced."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:550
-msgid "Slicing Done!"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:566
-msgid "Select the STL file to repair:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:580
-msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:594
-msgid "Your file was repaired."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:594
-msgid "Repair"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:605
-msgid "Save configuration as:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:623
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:667
-msgid "Select configuration to load:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:646
-msgid "Save presets bundle as:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:687
-#, perl-format
-msgid "%d presets successfully imported."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:749
-msgid "You have unsaved changes "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:749
-msgid ". Discard changes and continue anyway?"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:750
-msgid "Unsaved Presets"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:104
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2124
-msgid "3D"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:138
-msgid "2D"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:157
-msgid "Layers"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:177
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:195
-msgid "Add…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:179
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:197
-msgid "Delete All"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:180
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:198
-msgid "Arrange"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:182
-msgid "More"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:183
-msgid "Fewer"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:185
-msgid "45° ccw"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:186
-msgid "45° cw"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:187
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:203
-msgid "Scale…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:188
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:204
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2099
-msgid "Split"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:189
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:205
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
-msgid "Cut…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:191
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:206
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2106
-msgid "Settings…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:192
-msgid "Layer Editing"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:207
-msgid "Layer editing"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:220
-msgid "Name"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:221
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:900
-msgid "Copies"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:222
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1056
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1061
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2068
-msgid "Scale"
-msgstr "缩放"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:236
-msgid "Export G-code…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:237
-msgid "Slice now"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:238
-msgid "Print…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:239
-msgid "Send to printer"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:240
-msgid "Export STL…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:367
-msgid "Print settings"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:369
-msgid "Printer"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:398
-msgid "Info"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:409
-msgid "Volume"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:410
-msgid "Facets"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:411
-msgid "Materials"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:412
-msgid "Manifold"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:438
-msgid "Sliced Info"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:447
-msgid "Used Filament (m)"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:448
-msgid "Used Filament (mm³)"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:449
-msgid "Used Filament (g)"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:451
-msgid "Estimated printing time"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:629
-msgid "Loading…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:629
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:643
-msgid "Processing input file\n"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:663
-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 ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:666
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:683
-msgid "Multi-part object detected"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:680
-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 ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:692
-msgid "Loaded "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:744
-msgid ""
-"Your object appears to be too large, so it was automatically scaled down to "
-"fit your print bed."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:745
-msgid "Object too large?"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:900
-msgid "Enter the number of copies of the selected object:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:927
-msgid ""
-"\n"
-"Non-positive value."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:928
-msgid ""
-"\n"
-"Not a numeric value."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:929
-msgid "Slic3r Error"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:950
-msgid "Enter the rotation angle:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:950
-msgid "Rotate around "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:950
-msgid "Invalid rotation angle entered"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1030
-#, perl-format
-msgid "Enter the new size for the selected object (print bed: %smm):"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1031
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
-msgid "Scale along "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1031
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1056
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1061
-msgid "Invalid scaling value entered"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1061
-#, no-perl-format
-msgid "Enter the scale % for the selected object:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1056
-msgid "Enter the new max size for the selected object:"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1112
-msgid ""
-"The selected object can't be split because it contains more than one volume/"
-"material."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1121
-msgid ""
-"The selected object couldn't be split because it contains only one part."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1286
-msgid "Slicing cancelled"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1300
-msgid "Another export job is currently running."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1445
-msgid "File added to print queue"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1448
-msgid "Sending G-code file to the OctoPrint server..."
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1451
-msgid "G-code file exported to "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1454
-msgid "Export failed"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1524
-msgid "G-code file successfully uploaded to the OctoPrint server"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1526
-msgid "Error while uploading to the OctoPrint server: "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1539
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1581
-msgid "STL file exported to "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1592
-msgid "AMF file exported to "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1596
-msgid "Error exporting AMF file "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1608
-msgid "3MF file exported to "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1612
-msgid "Error exporting 3MF file "
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1958
-#, perl-format
-msgid "%d (%d shells)"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1960
-#, perl-format
-msgid "Auto-repaired (%d errors)"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1965
-#, perl-format
-msgid ""
-"%d degenerate facets, %d edges fixed, %d facets removed, %d facets added, %d "
-"facets reversed, %d backwards edges"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1970
-msgid "Yes"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2021
-msgid "Remove the selected object"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2024
-msgid "Increase copies"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2024
-msgid "Place one more copy of the selected object"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2027
-msgid "Decrease copies"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2027
-msgid "Remove one copy of the selected object"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2030
-msgid "Set number of copies…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2030
-msgid "Change the number of copies of the selected object"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2034
-msgid "Rotate 45° clockwise"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2034
-msgid "Rotate the selected object by 45° clockwise"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2037
-msgid "Rotate 45° counter-clockwise"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2037
-msgid "Rotate the selected object by 45° counter-clockwise"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2042
-msgid "Rotate"
-msgstr "旋转"
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2042
-msgid "Rotate the selected object by an arbitrary angle"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2044
-msgid "Around X axis…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2044
-msgid "Rotate the selected object by an arbitrary angle around X axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2047
-msgid "Around Y axis…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2047
-msgid "Rotate the selected object by an arbitrary angle around Y axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2050
-msgid "Around Z axis…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2050
-msgid "Rotate the selected object by an arbitrary angle around Z axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2055
-msgid "Mirror"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2055
-msgid "Mirror the selected object"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2057
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2073
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2089
-msgid "Along X axis…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2057
-msgid "Mirror the selected object along the X axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2060
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2076
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2092
-msgid "Along Y axis…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2060
-msgid "Mirror the selected object along the Y axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2063
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2079
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2095
-msgid "Along Z axis…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2063
-msgid "Mirror the selected object along the Z axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2068
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2084
-msgid "Scale the selected object along a single axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2070
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2086
-msgid "Uniformly…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2070
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2086
-msgid "Scale the selected object along the XYZ axes"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2073
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2089
-msgid "Scale the selected object along the X axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2076
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2092
-msgid "Scale the selected object along the Y axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2079
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2095
-msgid "Scale the selected object along the Z axis"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2084
-msgid "Scale to size"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2099
-msgid "Split the selected object into individual parts"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
-msgid "Open the 3D cutting tool"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2106
-msgid "Open the object editor dialog"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2110
-msgid "Reload from Disk"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2110
-msgid "Reload the selected file from Disk"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2113
-msgid "Export object as STL…"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2113
-msgid "Export this single object as STL file"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\2D.pm:131
-msgid "What do you want to print today? â„¢"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\2D.pm:132
-msgid "Drag your objects here"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:63
-msgid "1 Layer"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:65
-msgid "View"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:75
-msgid "Show"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:78
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:79
-msgid "Feature types"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:96
-msgid "Retractions"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:97
-msgid "Unretractions"
-msgstr ""
-
-#: c:\src\Slic3r\lib\Slic3r\GUI\Plater\3DPreview.pm:98
-msgid "Shells"
-msgstr ""
-
-#~ msgid "Rectilinear"
-#~ msgstr "折线�"
-
-#~ msgid "Concentric"
-#~ msgstr "�轴�"
-
-#~ msgid "Hilbert Curve"
-#~ msgstr "希尔伯特曲线�"
-
-#~ msgid "Archimedean Chords"
-#~ msgstr "阿基米德和铉�"
-
-# Not so sure about how to put "Octagram Spiral"  in Chinese. Or maybe "Octagram螺旋“ is good.
-#~ msgid "Octagram Spiral"
-#~ msgstr "八角星螺旋�"
-
-#~ msgid "Has heated bed"
-#~ msgstr "有热床"
-
-#~ msgid ""
-#~ "Unselecting this will suppress automatic generation of bed heating gcode."
-#~ msgstr "�勾选此项将�自动生�机床加热的G代�。"
-
-#~ msgid "Bed temperature for layers after the first one."
-#~ msgstr "第一层之�的机床温度。"
-
-#~ msgid "Bottom infill pattern"
-#~ msgstr "底部填充样�"
-
-#~ msgid ""
-#~ "Infill pattern for bottom layers. This only affects the external visible "
-#~ "layer, and not its adjacent solid shells."
-#~ msgstr "底层的填充样�。此项仅影�外部��层，�影�其相邻的��层。"
-
-#~ msgid "Speed > Acceleration"
-#~ msgstr "速度 > 加速度"
-
-#~ msgid "Brim connections width"
-#~ msgstr "裙边连接宽度"
-
-#~ msgid ""
-#~ "If set to a positive value, straight connections will be built on the "
-#~ "first layer between adjacent objects."
-#~ msgstr "如果设为正值，第一层相邻的物体间将建立直接连接。"
-
-#~ msgid "Exterior brim width"
-#~ msgstr "外围裙边宽度"
-
-#~ msgid ""
-#~ "This disables the fan completely for the first N layers to aid in the "
-#~ "adhesion of media to the bed. (default 3)"
-#~ msgstr "此项在打��N层时完全�用风扇，以帮助�料更好地��热床。(默认3)"
-
-#~ msgid "↳ external"
-#~ msgstr "↳外部的"
-
-#~ msgid "External perimeters extrusion width"
-#~ msgstr "外围轮廓挤出宽度"
-
-#~ msgid ""
-#~ "Set this to a non-zero value to set a manual extrusion width for external "
-#~ "perimeters. If auto is chosen, a value will be used that maximizes "
-#~ "accuracy of the external visible surfaces. If expressed as percentage "
-#~ "(for example 200%) it will be computed over layer height."
-#~ msgstr ""
-#~ "该值若�0，�为外围轮廓的手动挤出宽度。如果选择自动，将使用一个使得外围�"
-#~ "�层精度最高的值。如果表示为百分数（如200%），则该值以层高为基准。"
-
-#~ msgid "External perimeters speed"
-#~ msgstr "外围轮廓速度"
-
-#~ 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."
-#~ msgstr ""
-#~ "该�数将影�外围��层的打�速度。如果表示为百分数（如80%），数值将以上�"
-#~ "设置的外围速度�数为基准。"
-
-#~ msgid "Add more perimeters when needed for avoiding gaps in sloping walls."
-#~ msgstr "为��在打�倾斜的外墙中产生间隙，有必�时增加更多的轮廓。"
-
-#~ msgid ""
-#~ "The extruder to use (unless more specific extruder settings are "
-#~ "specified)."
-#~ msgstr "使用的挤出头（除�指明了更多详细的挤出头�数）。"
-
-#~ msgid ""
-#~ "Set this to a non-zero value to set a manual extrusion width. If "
-#~ "expressed as percentage (for example: 230%) it will be computed over "
-#~ "layer height."
-#~ msgstr ""
-#~ "该值若为�0，则代表手动挤出宽度。如果设为百分数（如230%），则值是以层高为"
-#~ "基准。"
-
-#~ msgid "Fill gaps"
-#~ msgstr "å¡«å……é—´éš™"
-
-#~ msgid ""
-#~ "If this is enabled, gaps will be filled with single passes. Enable this "
-#~ "for better quality, disable it for shorter printing times."
-#~ msgstr ""
-#~ "如果勾选该项，间隙将被�通�填充。�用该项�优化打�质�，�用则�以节�时"
-#~ "间。"
-
-#~ 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."
-#~ msgstr ""
-#~ "若为�0，则表示首层手动挤出宽度。�用于强制更宽的挤出�便于��。如果表示"
-#~ "为百分数（如120%），则该值是相对于首层高度。"
-
-#~ msgid "↳ gaps"
-#~ msgstr "↳ 间隙"
-
-#~ msgid ""
-#~ "Speed for filling gaps. Since these are usually single lines you might "
-#~ "want to use a low speed for better sticking. If expressed as percentage "
-#~ "(for example: 80%) it will be calculated on the infill speed setting "
-#~ "above."
-#~ msgstr ""
-#~ "填充间隙的速度。由于这些通常是独立的直线，所以尽�使用低速�����。如果"
-#~ "表示为百分数（如80%），则以上�设置的填充速度为基准。"
-
-#~ msgid "Use native G-code arcs"
-#~ msgstr "使用本地的G代�弧线"
-
-#~ msgid ""
-#~ "This experimental feature tries to detect arcs from segments and "
-#~ "generates G2/G3 arc commands instead of multiple straight G1 commands."
-#~ msgstr ""
-#~ "这个试验性能�试从段中侦测出弧线，生� G2/G3 弧线指令，而�是生�多个G1直"
-#~ "线指令。"
-
-#~ msgid ""
-#~ "Set this to a non-zero value to set a manual extrusion width for infill. "
-#~ "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，则表示填充的手动挤出宽度。�使用较宽的挤出�加速填充并使部件"
-#~ "牢固。如果表示为百分数（如90%），则该值以层高为基准。"
-
-#~ msgid "Speed for printing the internal fill."
-#~ msgstr "打�内部填充的速度。"
-
-#~ msgid "Interior brim width"
-#~ msgstr "内部裙边宽度"
-
-#~ msgid ""
-#~ "Horizontal width of the brim that will be printed inside object holes on "
-#~ "the first layer."
-#~ msgstr "第一层打�于物件孔洞内部的裙边宽度。"
-
-#~ msgid ""
-#~ "During multi-extruder prints, 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 ""
-#~ "在多挤出头的打�过程中，该选项将�低�活跃挤出头的温度以��滴垂现象。�动"
-#~ "它将自动使能一个高环边，并在改�温度时将挤出头移除该环边。"
-
-#~ msgid "Overridable options"
-#~ msgstr "�覆盖的选项"
-
-#~ 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 expressed as percentage (for example 200%) it will be "
-#~ "computed over layer height."
-#~ msgstr ""
-#~ "该值若�0，则表示轮廓的手动基础宽度。�以使用更细的挤出宽度�获得更精确的"
-#~ "表�。如果表示为百分数（如200%），则该值以层高为基准。"
-
-#~ msgid "Speed for perimeters (contours, aka vertical shells)."
-#~ msgstr "轮廓的打�速度（轮廓，��垂直外壳）。"
-
-#~ msgid ""
-#~ "If you want to process the output G-code through custom scripts, just "
-#~ "list their absolute paths here. Separate multiple scripts on individual "
-#~ "lines. 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 ""
-#~ "如果你想�通过自定义脚本�处�输出G代�，在这里列出它们的�对路径��。将"
-#~ "多个脚本分行输入。脚本的�对路径将被以第一个�数传递给G代�文件，而且它们"
-#~ "�以通过读�环境���获�Slic3r的�置�数。"
-
-#~ msgid "Pressure advance"
-#~ msgstr "压力高级设置"
-
-#~ msgid ""
-#~ "When set to a non-zero value, this experimental option enables pressure "
-#~ "regulation. It's the K constant for the advance algorithm that pushes "
-#~ "more or less filament upon speed changes. It's useful for Bowden-tube "
-#~ "extruders. Reasonable values are in range 0-10."
-#~ msgstr ""
-#~ "若为�0，该试验选项�用压力调节。该值为一个高级算法的K常数。这个算法根�速"
-#~ "度�化�改�推动�料多少。适用于�登管挤出头。��的值范围是0-10."
-
-#~ msgid "Raft offset"
-#~ msgstr "��置"
-
-#~ msgid "Horizontal margin between object base layer and raft contour."
-#~ msgstr "物体基层和�轮廓之间的水平�离。"
-
-#~ msgid "Resolution (deprecated)"
-#~ msgstr "精度(�赞�)"
-
-#~ msgid ""
-#~ "The speed for retractions (it only applies to the extruder motor). If you "
-#~ "use the Firmware Retraction option, please note this value still affects "
-#~ "the auto-speed pressure regulator."
-#~ msgstr ""
-#~ "回缩速度（仅适用于挤出头电机）。如果试用了固件回缩选项，请注�该值�影�自"
-#~ "动速度电压调节器。"
-
-#~ msgid "↳ small"
-#~ msgstr "↳ �"
-
-#~ 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."
-#~ msgstr ""
-#~ "该�数影��径 <= 6.5mm（通常是孔洞）的轮廓打�速度。如果表示为百分比（如"
-#~ "80%），则以上�设置的轮廓速度为基准计算。"
-
-#~ msgid "↳ solid"
-#~ msgstr "↳ ��的"
-
-#~ msgid ""
-#~ "Set this to a non-zero value to set a manual extrusion width for infill "
-#~ "for solid surfaces. If expressed as percentage (for example 90%) it will "
-#~ "be computed over layer height."
-#~ msgstr ""
-#~ "设为�0值，则表示��表�填充的手动挤出宽度。若表示为百分数（如90%），将以"
-#~ "层高为基准计算。"
-
-#~ 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."
-#~ msgstr ""
-#~ "打���区域的速度（顶部的/底部的/内部水平外壳）。以百分数（如80%）表示，"
-#~ "则以上述的默认填充速度为基准计算。"
-
-#~ 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 ""
-#~ "当挤出头处于�活跃状�时用到的温度差。�用一个全高度的环边，纯用于定期给喷"
-#~ "嘴擦拭。"
-
-#~ 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, 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."
-#~ msgstr ""
-#~ "该段代�放在G代�开头，在热床达到目标温度�挤出头开始加热�，挤出头完�加"
-#~ "热��入。如果其中�包�有M104, M109, M140 或 M190，这段指令就会在Slic3r自"
-#~ "动放置的M指令之�；�则Slic3r将�会自动生�M指令，这样你�以自由定义加热命"
-#~ "令和其他自定义动作的顺�。注��以使用��符��替代所有Slic3r�数，所以你"
-#~ "�以把一个“M109 S[ first_layer_temperature ]�命令放在任�处。"
-
-#~ msgid "The extruder to use when printing support material, raft and skirt."
-#~ msgstr "打�支撑�料��和环边时使用的挤出头。"
-
-#~ msgid ""
-#~ "Set this to a non-zero value to set a manual extrusion width for support "
-#~ "material. If expressed as percentage (for example 90%) it will be "
-#~ "computed over layer height."
-#~ msgstr ""
-#~ "设为�0值，表示对支撑�料的手动挤出宽度。如果表示为百分数（如90%），则以层"
-#~ "高为基准计算。"
-
-#~ msgid ""
-#~ "The extruder to use when printing support material interface. This "
-#~ "affects raft too."
-#~ msgstr "打�支撑�料表�时使用的挤出头。也影��。"
-
-#~ msgid "↳ interface"
-#~ msgstr "↳ 表�"
-
-#~ msgid "Interface Speed"
-#~ msgstr "表�速度"
-
-#~ msgid "Support material interface speed"
-#~ msgstr "支撑�料表�速度"
-
-# "% o“ format mistake?
-#~ 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 a percentage to "
-#~ "automatically detect based on some % of overhanging perimeter width "
-#~ "instead (recommended)."
-#~ msgstr ""
-#~ "对于倾斜度（90° = 垂直）高于指定阈值的悬空部�，�生�相应的支撑�料。��"
-#~ "�说，该值表示�用支撑�料所能打�的最水平的角度。设为百分数，则以悬空轮廓"
-#~ "宽度的 % o自动计算（推�）。"
-
-#~ msgid "↳ top solid"
-#~ msgstr "↳ 顶部��层"
-
-#~ 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 expressed as percentage (for "
-#~ "example 90%) it will be computed over layer height."
-#~ msgstr ""
-#~ "设为�0值，表示顶层表�填充的手动挤出宽度。�以使用较细的挤出宽度�对所有"
-#~ "的狭长区域进行填充并获得较光滑的尾部。如果表示为百分数（如90%），则以层高"
-#~ "为基准计算。"
-
-#~ msgid ""
-#~ "Infill pattern for top layers. This only affects the external visible "
-#~ "layer, and not its adjacent solid shells."
-#~ msgstr "顶层填充样�。仅影�外部��层，�影�其相邻��层。"
-
-#~ 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."
-#~ msgstr ""
-#~ "打�顶部��层的速度（仅适用于最外部的顶层，而�它们的内部��填充层）。�"
-#~ "�低该速度值以获得较好的表�尾处�。若表示为百分数（如80%），则以��填充"
-#~ "速度为基准计算。"
-
-#~ msgid "Vibration limit (deprecated)"
-#~ msgstr "振动�制(赞�)"
-
-#~ msgid ""
-#~ "This experimental option will slow down those moves hitting the "
-#~ "configured frequency limit. The purpose of limiting vibrations is to "
-#~ "avoid mechanical resonance. Set zero to disable."
-#~ msgstr ""
-#~ "该试验选项将�缓达到指定频率值的打�动作。目的为��机械共振。设为0以�"
-#~ "用。"
-
-#~ msgid "Z full steps/mm"
-#~ msgstr "Z全部步数/毫米"
-
-#~ msgid ""
-#~ "Set this to the number of *full* steps (not microsteps) needed for moving "
-#~ "the Z axis by 1mm; you can calculate this by dividing the number of "
-#~ "microsteps configured in your firmware by the microstepping amount (8, "
-#~ "16, 32). Slic3r will round your configured layer height to the nearest "
-#~ "multiple of that value in order to ensure the best accuracy. This is most "
-#~ "useful for machines with imperial leadscrews or belt-driven Z or for "
-#~ "unusual layer heights with metric leadscrews. Set to zero to disable this "
-#~ "experimental feature."
-#~ msgstr ""
-#~ "将该值设为移动Z轴1毫米所需的*全部*步数（而�是细分）；�以这样计算：把固件"
-#~ "中已�置的细分数除以�增系数（8，16，32）。Sli3r会把你设置的层高四�五入到"
-#~ "该值的最近�数以确�精度。此项设置对于使用英制���皮带传动Z轴的机器，或"
-#~ "者机器使用公制��且层高值特别时比较适用。设为0以�用该功能。"
-
-#~ msgid "Cut"
-#~ msgstr "切割"
-
-#~ msgid "Cut model at the given Z."
-#~ msgstr "在给定Z处切割模型。"
-
-#~ msgid "Cut model in the XY plane into tiles of the specified max size."
-#~ msgstr "将XY�的模型切割�指定最大尺寸的��。"
-
-#~ msgid "Cut model at the given X."
-#~ msgstr "在指定X处切割模型。"
-
-#~ msgid "Cut model at the given Y."
-#~ msgstr "在指定Y处切割模型。"
-
-#~ msgid "Export SVG"
-#~ msgstr "导出SVG"
-
-#~ msgid "Export the model as OBJ."
-#~ msgstr "将模型以OBJ格�导出。"
-
-#~ msgid "Export POV"
-#~ msgstr "导出POV"
-
-# POV-Ray?
-#~ msgid "Export the model as POV-Ray definition."
-#~ msgstr ""
-#~ "将模型以POV-Ray定义导出。（��开�射线�迹软件：http://www.povray."
-#~ "org/）。"
-
-#~ msgid "Slice the model and export slices as SVG."
-#~ msgstr "切割模型并以SVG格�导出切片结果。"
-
-#~ msgid "Output Model Info"
-#~ msgstr "输出模型信�"
-
-#~ msgid "Write information about the model to the console."
-#~ msgstr "给控制�写入模型的信�。"
-
-#~ 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 "Rotation angle around the Z axis in degrees (0-360, default: 0)."
-#~ msgstr "绕Z轴旋转角度（0-360，默认：0）。"
-
-#~ msgid "Rotate around X"
-#~ msgstr "绕X轴旋转"
-
-#~ msgid "Rotation angle around the X axis in degrees (0-360, default: 0)."
-#~ msgstr "绕X轴旋转角度（0-360，默认：0）。"
-
-#~ msgid "Rotate around Y"
-#~ msgstr "绕Y轴旋转"
-
-#~ msgid "Rotation angle around the Y axis in degrees (0-360, default: 0)."
-#~ msgstr "绕Y轴旋转角度（0-360，默认：0）。"
-
-#~ msgid "Save config file"
-#~ msgstr "�存�置文件"
-
-#~ msgid "Save configuration to the specified file."
-#~ msgstr "将�置�数�存到指定文件。"
-
-#~ msgid "Scaling factor (default: 1)."
-#~ msgstr "缩放比例（默认：1）。"
-
-#~ msgid "Scale to Fit"
-#~ msgstr "缩放到�适大�"
-
-#~ msgid "Scale to fit the given volume."
-#~ msgstr "缩放到适�于给定体积。"
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index a6f9deb28..f9849ad54 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,4 +1,9 @@
 min_slic3r_version = 1.42.0-alpha6
+0.8.0-rc Updated for the PrusaSlicer 2.0.0-rc release
+0.8.0-beta4 Updated SLA profiles
+0.8.0-beta3 Updated SLA profiles
+0.8.0-beta2 Updated SLA profiles
+0.8.0-beta1 Updated SLA profiles
 0.8.0-beta Updated SLA profiles
 0.8.0-alpha9 Updated SLA and FFF profiles
 0.8.0-alpha8 Updated SLA profiles
@@ -10,6 +15,7 @@ min_slic3r_version = 1.42.0-alpha
 0.4.0-alpha3 Update of SLA profiles
 0.4.0-alpha2 First SLA profiles
 min_slic3r_version = 1.41.3-alpha
+0.4.5 Enabled remaining time support for MK2/S/MMU1
 0.4.4 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
 0.4.3 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
 0.4.2 Changelog: https://github.com/prusa3d/Slic3r-settings/blob/master/live/PrusaResearch/changelog.txt
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index 2d455ffb6..24d592469 100644
--- a/resources/profiles/PrusaResearch.ini
+++ b/resources/profiles/PrusaResearch.ini
@@ -8,9 +8,10 @@ full_name = Prusa {technology} Technology Printers
 
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the Slic3r configuration to be downgraded.
-config_version = 0.8.0-beta
+config_version = 0.8.0-rc
 # Where to get the updates from?
 config_update_url = https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/PrusaResearch/
+changelog_url = http://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.
@@ -32,13 +33,13 @@ family = MK3
 
 [printer_model:MK3SMMU2S]
 name = Original Prusa i3 MK3S MMU2S
-variants = 0.4
+variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK3
 
 [printer_model:MK3MMU2]
 name = Original Prusa i3 MK3 MMU2
-variants = 0.4
+variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK3
 
@@ -56,13 +57,13 @@ family = MK2.5
 
 [printer_model:MK2.5SMMU2S]
 name = Original Prusa i3 MK2.5S MMU2S
-variants = 0.4
+variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK2.5
 
 [printer_model:MK2.5MMU2]
 name = Original Prusa i3 MK2.5 MMU2
-variants = 0.4
+variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK2.5
 
@@ -1312,7 +1313,7 @@ temperature = 220
 inherits = *PET*
 filament_cost = 27.82
 filament_density = 1.27
-filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG"
+filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nPlasty Mladec PETG"
 compatible_printers_condition = 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)
 
 [filament:Prusament PETG]
@@ -1327,7 +1328,7 @@ compatible_printers_condition = nozzle_diameter[0]!=0.6 and ! (printer_notes=~/.
 inherits = *PET06*
 filament_cost = 27.82
 filament_density = 1.27
-filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG"
+filament_notes = "List of manufacturers tested with standard PET print settings:\n\nE3D Edge\nPlasty Mladec PETG"
 
 [filament:Prusament PETG 0.6 nozzle]
 inherits = *PET06*
@@ -1551,6 +1552,7 @@ 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
@@ -1592,8 +1594,7 @@ compatible_prints_condition = layer_height == 0.05
 exposure_time = 12
 initial_exposure_time = 45
 initial_layer_height = 0.05
-material_correction_curing = 1,1,1
-material_correction_printing = 1,1,1
+material_correction = 1,1,1
 material_notes = 
 
 [sla_material:*common 0.025*]
@@ -1624,15 +1625,10 @@ inherits = *common 0.025*
 exposure_time = 8
 initial_exposure_time = 45
 
-[sla_material:Jamg He PJHC-30 Orange 0.025]
+[sla_material:Prusa Orange Solid 0.025]
 inherits = *common 0.025*
 exposure_time = 5
-initial_exposure_time = 35
-
-[sla_material:SL1 Orange solid 0.025]
-inherits = *common 0.025*
-exposure_time = 5
-initial_exposure_time = 35
+initial_exposure_time = 30
 
 ########### Materials 0.05
 
@@ -1676,30 +1672,25 @@ inherits = *common 0.05*
 exposure_time = 10
 initial_exposure_time = 60
 
-[sla_material:Jamg He PJHC-00 Yellow 0.05]
-inherits = *common 0.05*
-exposure_time = 7
-initial_exposure_time = 45
-
-[sla_material:Jamg He PJHC-19 Skin 0.05]
+[sla_material:Prusa Skin Solid 0.05]
 inherits = *common 0.05*
 exposure_time = 6
-initial_exposure_time = 45
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-30 Orange 0.05]
+[sla_material:Prusa Orange Solid 0.05]
 inherits = *common 0.05*
 exposure_time = 7.5
-initial_exposure_time = 45
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-60 Gray 0.05]
+[sla_material:Prusa Gray Solid 0.05]
 inherits = *common 0.05*
 exposure_time = 6
-initial_exposure_time = 45
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-70 Black 0.05]
+[sla_material:Prusa Black Solid 0.05]
 inherits = *common 0.05*
 exposure_time = 6
-initial_exposure_time = 45
+initial_exposure_time = 30
 
 [sla_material:Monocure 3D Black Rapid Resin 0.05]
 inherits = *common 0.05*
@@ -1756,129 +1747,109 @@ inherits = *common 0.05*
 exposure_time = 9
 initial_exposure_time = 40
 
-[sla_material:Jamg He LOC-19 Super Low Odor Skin 0.05]
-inherits = *common 0.05*
-exposure_time = 7.5
-initial_exposure_time = 40
+## [sla_material:Prusa Skin Super Low Odor 0.05]
+## inherits = *common 0.05*
+## exposure_time = 7.5
+## initial_exposure_time = 30
 
-[sla_material:Jamg He LOC-20 Super Low Odor White 0.05]
-inherits = *common 0.05*
-exposure_time = 6.5
-initial_exposure_time = 40
+## [sla_material:Prusa White Super Low Odor 0.05]
+## inherits = *common 0.05*
+## exposure_time = 6.5
+## initial_exposure_time = 30
 
-[sla_material:Jamg He LOC-60 Super Low Odor Grey 0.05]
-inherits = *common 0.05*
-exposure_time = 6.5
-initial_exposure_time = 40
+## [sla_material:Prusa Grey Super Low Odor 0.05]
+## inherits = *common 0.05*
+## exposure_time = 6.5
+## initial_exposure_time = 30
 
 [sla_material:Harz Labs Model Resin Cherry 0.05]
 inherits = *common 0.05*
 exposure_time = 8
 initial_exposure_time = 45
 
-[sla_material:Jamg He CRX-70C High Tenacity Black 0.05]
-inherits = *common 0.05*
-exposure_time = 7
-initial_exposure_time = 40
+## [sla_material:Prusa Black High Tenacity 0.05]
+## inherits = *common 0.05*
+## exposure_time = 7
+## initial_exposure_time = 30
 
-[sla_material:Jamg He MC-2000 Casting Green 0.05]
+[sla_material:Prusa Green Casting 0.05]
 inherits = *common 0.05*
 exposure_time = 13
-initial_exposure_time = 40
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-00 Solid Yellow 0.05]
+## [sla_material:Prusa Yellow Solid 0.05]
+## inherits = *common 0.05*
+## exposure_time = 7
+## initial_exposure_time = 30
+
+[sla_material:Prusa White Solid 0.05]
 inherits = *common 0.05*
 exposure_time = 7
-initial_exposure_time = 40
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-20 White 0.05]
+## [sla_material:Prusa Green Transparent 0.05]
+## inherits = *common 0.05*
+## exposure_time = 8
+## initial_exposure_time = 30
+
+[sla_material:Prusa Red Transparent 0.05]
 inherits = *common 0.05*
 exposure_time = 7
-initial_exposure_time = 45
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-80 Transparent Green 0.05]
+[sla_material:Prusa Maroon Solid 0.05]
 inherits = *common 0.05*
-exposure_time = 8
-initial_exposure_time = 45
+exposure_time = 9
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-80 Transparent Red 0.05]
+[sla_material:Prusa Pink Solid 0.05]
 inherits = *common 0.05*
 exposure_time = 7
-initial_exposure_time = 45
+initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-81 Solid Maroon 0.05]
-inherits = *common 0.05*
-exposure_time = 9
-initial_exposure_time = 45
+## [sla_material:Prusa Yellow Flexible 0.05]
+## inherits = *common 0.05*
+## exposure_time = 9
+## initial_exposure_time = 30
 
-[sla_material:Jamg He PJHC-90 Solid Pink 0.05]
-inherits = *common 0.05*
-exposure_time = 7
-initial_exposure_time = 40
+## [sla_material:Prusa Clear Flexible 0.05]
+## inherits = *common 0.05*
+## exposure_time = 9
+## initial_exposure_time = 30
 
-[sla_material:Jamg He RJHC-00 Yellow Flexible 0.05]
-inherits = *common 0.05*
-exposure_time = 9
-initial_exposure_time = 40
+## [sla_material:Prusa White Flexible 0.05]
+## inherits = *common 0.05*
+## exposure_time = 9
+## initial_exposure_time = 30
 
-[sla_material:Jamg He RJHC-10 Clear Flexible 0.05]
-inherits = *common 0.05*
-exposure_time = 9
-initial_exposure_time = 40
+## [sla_material:Prusa Blue Flexible 0.05]
+## inherits = *common 0.05*
+## exposure_time = 9
+## initial_exposure_time = 30
 
-[sla_material:Jamg He RJHC-20 White Flexible 0.05]
-inherits = *common 0.05*
-exposure_time = 9
-initial_exposure_time = 40
+## [sla_material:Prusa Black Flexible 0.05]
+## inherits = *common 0.05*
+## exposure_time = 9
+## initial_exposure_time = 30
 
-[sla_material:Jamg He RJHC-50 Blue Flexible 0.05]
-inherits = *common 0.05*
-exposure_time = 9
-initial_exposure_time = 40
-
-[sla_material:Jamg He RJHC-70 Black Flexible 0.05]
-inherits = *common 0.05*
-exposure_time = 9
-initial_exposure_time = 40
-
-[sla_material:Jamg He RJHC-81 Red Flexible 0.05]
-inherits = *common 0.05*
-exposure_time = 9
-initial_exposure_time = 40
-
-[sla_material:SL1 Orange solid 0.05]
-inherits = *common 0.05*
-exposure_time = 7.5
-initial_exposure_time = 45
-
-[sla_material:SL1 Red transparent 0.05]
-inherits = *common 0.05*
-exposure_time = 7.5
-initial_exposure_time = 45
+## [sla_material:Prusa Red Flexible 0.05]
+## inherits = *common 0.05*
+## exposure_time = 9
+## initial_exposure_time = 30
 
 ########### Materials 0.035
 
-[sla_material:Jamg He PJHC-30 Orange 0.035]
+[sla_material:Prusa Orange Solid 0.035]
 inherits = *common 0.035*
 exposure_time = 6
-initial_exposure_time = 35
-
-[sla_material:SL1 Orange solid 0.035]
-inherits = *common 0.035*
-exposure_time = 6
-initial_exposure_time = 35
+initial_exposure_time = 30
 
 ########### Materials 0.1
 
-[sla_material:Jamg He PJHC-30 Orange 0.1]
+[sla_material:Prusa Orange Solid 0.1]
 inherits = *common 0.1*
 exposure_time = 10
-initial_exposure_time = 45
-
-[sla_material:SL1 Orange solid 0.1]
-inherits = *common 0.1*
-exposure_time = 10
-initial_exposure_time = 45
+initial_exposure_time = 30
 
 [printer:*common*]
 printer_technology = FFF
@@ -1886,12 +1857,12 @@ bed_shape = 0x0,250x0,250x210,0x210
 before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n
 between_objects_gcode = 
 deretract_speed = 0
-end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200; home X axis\nM84 ; disable motors
+end_gcode = G4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors
 extruder_colour = #FFFF00
 extruder_offset = 0x0
 gcode_flavor = marlin
 silent_mode = 0
-remaining_times = 0
+remaining_times = 1
 machine_max_acceleration_e = 10000
 machine_max_acceleration_extruding = 2000
 machine_max_acceleration_retracting = 1500
@@ -1931,7 +1902,7 @@ retract_speed = 35
 serial_port = 
 serial_speed = 250000
 single_extruder_multi_material = 0
-start_gcode = M115 U3.1.0 ; tell printer latest fw version\nM83  ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; MK2 firmware only supports the old M204 format\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 = M115 U3.1.0 ; tell printer latest fw version\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; MK2 firmware only supports the old M204 format\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
 toolchange_gcode = 
 use_firmware_retraction = 0
 use_relative_e_distances = 1
@@ -1968,7 +1939,7 @@ printer_model = MK2SMM
 inherits = *multimaterial*
 end_gcode = G1 E-4 F2100.00000\nG91\nG1 Z1 F7200.000\nG90\nG1 X245 Y1\nG1 X240 E4\nG1 F4000\nG1 X190 E2.7  \nG1 F4600\nG1 X110 E2.8\nG1 F5200\nG1 X40 E3  \nG1 E-15.0000 F5000\nG1 E-50.0000 F5400\nG1 E-15.0000 F3000\nG1 E-12.0000 F2000\nG1 F1600\nG1 X0 Y1 E3.0000\nG1 X50 Y1 E-5.0000\nG1 F2000\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-5.0000\nG1 F2400\nG1 X0 Y1 E5.0000\nG1 X50 Y1 E-3.0000\nG4 S0\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nG28 X0  ; home X axis\nM84     ; disable motors\n\n
 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\nPRINTER_HAS_BOWDEN
-start_gcode = M115 U3.1.0 ; tell printer latest fw version\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; MK2 firmware only supports the old M204 format\n; Start G-Code sequence START\nT?\nM104 S[first_layer_temperature]\nM140 S[first_layer_bed_temperature]\nM109 S[first_layer_temperature]\nM190 S[first_layer_bed_temperature]\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG28 W\nG80\nG92 E0.0\nM203 E100\nM92 E140\nG1 Z0.250 F7200.000\nG1 X50.0 E80.0  F1000.0\nG1 X160.0 E20.0  F1000.0\nG1 Z0.200 F7200.000\nG1 X220.0 E13 F1000.0\nG1 X240.0 E0 F1000.0\nG92 E0.0
+start_gcode = M115 U3.1.0 ; tell printer latest fw version\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; MK2 firmware only supports the old M204 format\n; Start G-Code sequence START\nT?\nM104 S[first_layer_temperature]\nM140 S[first_layer_bed_temperature]\nM109 S[first_layer_temperature]\nM190 S[first_layer_bed_temperature]\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG28 W\nG80\nG92 E0.0\nM203 E100\nM92 E140\nG1 Z0.250 F7200.000\nG1 X50.0 E80.0 F1000.0\nG1 X160.0 E20.0 F1000.0\nG1 Z0.200 F7200.000\nG1 X220.0 E13 F1000.0\nG1 X240.0 E0 F1000.0\nG92 E0.0
 default_print_profile = 0.15mm OPTIMAL
 
 [printer:*mm-multi*]
@@ -1978,7 +1949,7 @@ end_gcode = {if not has_wipe_tower}\n; Pull the filament into the cooling tubes.
 extruder_colour = #FFAA55;#E37BA0;#4ECDD3;#FB7259
 nozzle_diameter = 0.4,0.4,0.4,0.4
 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\nPRINTER_HAS_BOWDEN
-start_gcode = M115 U3.1.0 ; tell printer latest fw version\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; MK2 firmware only supports the old M204 format\n; Start G-Code sequence START\nT[initial_tool]\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\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG28 W\nG80\nG92 E0.0\nM203 E100 ; set max feedrate\nM92 E140 ; E-steps per filament milimeter\n{if not has_single_extruder_multi_material_priming}\nG1 Z0.250 F7200.000\nG1 X50.0 E80.0  F1000.0\nG1 X160.0 E20.0  F1000.0\nG1 Z0.200 F7200.000\nG1 X220.0 E13 F1000.0\nG1 X240.0 E0 F1000.0\n{endif}\nG92 E0.0
+start_gcode = M115 U3.1.0 ; tell printer latest fw version\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting] ; MK2 firmware only supports the old M204 format\n; Start G-Code sequence START\nT[initial_tool]\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\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG28 W\nG80\nG92 E0.0\nM203 E100 ; set max feedrate\nM92 E140 ; E-steps per filament milimeter\n{if not has_single_extruder_multi_material_priming}\nG1 Z0.250 F7200.000\nG1 X50.0 E80.0 F1000.0\nG1 X160.0 E20.0 F1000.0\nG1 Z0.200 F7200.000\nG1 X220.0 E13 F1000.0\nG1 X240.0 E0 F1000.0\n{endif}\nG92 E0.0
 default_print_profile = 0.15mm OPTIMAL
 
 # XXXXXXXXXXXXXXXXX
@@ -2046,19 +2017,19 @@ min_layer_height = 0.1
 inherits = Original Prusa i3 MK2S
 printer_model = MK2.5
 remaining_times = 1
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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
 
 [printer:Original Prusa i3 MK2.5 0.25 nozzle]
 inherits = Original Prusa i3 MK2S 0.25 nozzle
 printer_model = MK2.5
 remaining_times = 1
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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
 
 [printer:Original Prusa i3 MK2.5 0.6 nozzle]
 inherits = Original Prusa i3 MK2S 0.6 nozzle
 printer_model = MK2.5
 remaining_times = 1
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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
 
 [printer:Original Prusa i3 MK2.5 MMU2 Single]
 inherits = Original Prusa i3 MK2.5; *mm2*
@@ -2087,8 +2058,16 @@ machine_min_travel_rate = 0
 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
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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 = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors
+
+[printer:Original Prusa i3 MK2.5 MMU2 Single 0.6 nozzle]
+inherits = Original Prusa i3 MK2.5S MMU2S Single 0.6 nozzle
+printer_model = MK2.5MMU2
+
+[printer:Original Prusa i3 MK2.5 MMU2 Single 0.25 nozzle]
+inherits = Original Prusa i3 MK2.5S MMU2S Single 0.25 nozzle
+printer_model = MK2.5MMU2
 
 [printer:Original Prusa i3 MK2.5 MMU2]
 inherits = Original Prusa i3 MK2.5; *mm2*
@@ -2121,23 +2100,23 @@ single_extruder_multi_material = 1
 # to be defined explicitely.
 nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
 extruder_colour = #FF8000;#DB5182;#00FFFF;#FF4F4F;#9FFF9F
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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}\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200; home X axis\nM84 ; disable motors\n
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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 = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors\n
 
 [printer:Original Prusa i3 MK2.5S]
 inherits = Original Prusa i3 MK2.5
 printer_model = MK2.5S
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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
 
 [printer:Original Prusa i3 MK2.5S 0.25 nozzle]
 inherits = Original Prusa i3 MK2.5 0.25 nozzle
 printer_model = MK2.5S
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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
 
 [printer:Original Prusa i3 MK2.5S 0.6 nozzle]
 inherits = Original Prusa i3 MK2.5 0.6 nozzle
 printer_model = MK2.5S
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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
 
 [printer:Original Prusa i3 MK2.5S MMU2S Single]
 inherits = Original Prusa i3 MK2.5; *mm2s*
@@ -2166,8 +2145,27 @@ machine_min_travel_rate = 0
 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
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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 = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors
+
+[printer:Original Prusa i3 MK2.5S MMU2S Single 0.6 nozzle]
+inherits = Original Prusa i3 MK2.5S MMU2S Single
+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\n
+max_layer_height = 0.35
+min_layer_height = 0.1
+nozzle_diameter = 0.6
+printer_variant = 0.6
+default_print_profile = 0.20mm NORMAL 0.6 nozzle
+
+[printer:Original Prusa i3 MK2.5S MMU2S Single 0.25 nozzle]
+inherits = Original Prusa i3 MK2.5S MMU2S Single
+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\n
+max_layer_height = 0.15
+min_layer_height = 0.05
+nozzle_diameter = 0.25
+printer_variant = 0.25
+default_print_profile = 0.10mm DETAIL 0.25 nozzle
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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
 
 [printer:Original Prusa i3 MK2.5S MMU2S]
 inherits = Original Prusa i3 MK2.5; *mm2s*
@@ -2200,8 +2198,8 @@ single_extruder_multi_material = 1
 # to be defined explicitely.
 nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
 extruder_colour = #FF8000;#DB5182;#00FFFF;#FF4F4F;#9FFF9F
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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}\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200; home X axis\nM84 ; disable motors\n
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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 = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors\n
 
 
 # XXXXXXXXXXXXXXXXX
@@ -2210,7 +2208,7 @@ end_gcode = {if has_wipe_tower}\nG1 E-15.0000 F3000\n{else}\nG1 X0 Y210 F7200\nG
 
 [printer:Original Prusa i3 MK3]
 inherits = *common*
-end_gcode = G4 ; wait\nM221 S100\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200; home X axis\nM84 ; disable motors
+end_gcode = G4 ; wait\nM221 S100\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors
 machine_max_acceleration_e = 5000,5000
 machine_max_acceleration_extruding = 1250,1250
 machine_max_acceleration_retracting = 1250,1250
@@ -2232,7 +2230,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
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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}
 printer_model = MK3
 default_print_profile = 0.15mm QUALITY MK3
 
@@ -2242,7 +2240,7 @@ nozzle_diameter = 0.25
 max_layer_height = 0.15
 min_layer_height = 0.05
 printer_variant = 0.25
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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}
+start_gcode = M115 U3.6.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}
 default_print_profile = 0.10mm DETAIL 0.25 nozzle MK3
 
 [printer:Original Prusa i3 MK3 0.6 nozzle]
@@ -2256,17 +2254,17 @@ default_print_profile = 0.30mm QUALITY 0.6 nozzle MK3
 [printer:Original Prusa i3 MK3S]
 inherits = Original Prusa i3 MK3
 printer_model = MK3S
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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}
 
 [printer:Original Prusa i3 MK3S 0.25 nozzle]
 inherits = Original Prusa i3 MK3 0.25 nozzle
 printer_model = MK3S
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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}
+start_gcode = M115 U3.6.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}
 
 [printer:Original Prusa i3 MK3S 0.6 nozzle]
 inherits = Original Prusa i3 MK3 0.6 nozzle
 printer_model = MK3S
-start_gcode = M115 U3.6.0 ; tell printer latest fw version\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 = M115 U3.6.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}
 
 [printer:*mm2*]
 inherits = Original Prusa i3 MK3
@@ -2296,8 +2294,27 @@ default_filament_profile = Prusament PLA MMU2
 inherits = *mm2*
 single_extruder_multi_material = 0
 default_filament_profile = Prusament PLA
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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}\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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
+end_gcode = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors
+
+[printer:Original Prusa i3 MK3 MMU2 Single 0.6 nozzle]
+inherits = Original Prusa i3 MK3 MMU2 Single
+single_extruder_multi_material = 0
+nozzle_diameter = 0.6
+max_layer_height = 0.40
+min_layer_height = 0.15
+printer_variant = 0.6
+default_print_profile = 0.30mm QUALITY 0.6 nozzle MK3
+
+[printer:Original Prusa i3 MK3 MMU2 Single 0.25 nozzle]
+inherits = Original Prusa i3 MK3 MMU2 Single
+single_extruder_multi_material = 0
+nozzle_diameter = 0.25
+max_layer_height = 0.15
+min_layer_height = 0.05
+printer_variant = 0.25
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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
+default_print_profile = 0.10mm DETAIL 0.25 nozzle MK3
 
 [printer:Original Prusa i3 MK3 MMU2]
 inherits = *mm2*
@@ -2307,31 +2324,60 @@ inherits = *mm2*
 machine_max_acceleration_e = 8000,8000
 nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
 extruder_colour = #FF8000;#DB5182;#00FFFF;#FF4F4F;#9FFF9F
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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}\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200; home X axis\nM84 ; disable motors\n
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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
+end_gcode = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors\n
 
 [printer:Original Prusa i3 MK3S MMU2S Single]
 inherits = *mm2s*
 single_extruder_multi_material = 0
 default_filament_profile = Prusament PLA
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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}\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200; home X axis\nM84 ; disable motors
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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
+end_gcode = G1 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\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors
+
+[printer:Original Prusa i3 MK3S MMU2S Single 0.6 nozzle]
+inherits = Original Prusa i3 MK3S MMU2S Single
+single_extruder_multi_material = 0
+nozzle_diameter = 0.6
+max_layer_height = 0.40
+min_layer_height = 0.15
+printer_variant = 0.6
+default_print_profile = 0.30mm QUALITY 0.6 nozzle MK3
+
+[printer:Original Prusa i3 MK3S MMU2S Single 0.25 nozzle]
+inherits = Original Prusa i3 MK3S MMU2S Single
+single_extruder_multi_material = 0
+nozzle_diameter = 0.25
+max_layer_height = 0.15
+min_layer_height = 0.05
+printer_variant = 0.25
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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
+default_print_profile = 0.10mm DETAIL 0.25 nozzle MK3
 
 [printer:Original Prusa i3 MK3S MMU2S]
 inherits = *mm2s*
 machine_max_acceleration_e = 8000,8000
 nozzle_diameter = 0.4,0.4,0.4,0.4,0.4
 extruder_colour = #FF8000;#DB5182;#00FFFF;#FF4F4F;#9FFF9F
-start_gcode = M107\nM115 U3.6.0 ; tell printer latest fw version\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\nG21 ; set units to millimeters\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}\nG90 ; use absolute coordinates\nM83 ; use relative distances for extrusion\nG92 E0.0\n
-end_gcode = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200; home X axis\nM84 ; disable motors\n
+start_gcode = M115 U3.6.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\nG21 ; set units to millimeters\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
+end_gcode = {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\n; Unload filament\nM702 C\n\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\n; Lift print head a bit\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+30, max_print_height)}{endif} ; Move print head up\nG1 X0 Y200 F3000 ; home X axis\nM84 ; disable motors\n
+
+# 0.6 nozzle MMU printer profile - only for single mode for now
+
+# [printer:Original Prusa i3 MK3S MMU2S 0.6 nozzle]
+# inherits = Original Prusa i3 MK3S MMU2S
+# 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
+# default_print_profile = 0.30mm QUALITY 0.6 nozzle MK3
 
 [printer:Original Prusa SL1]
 printer_technology = SLA
 printer_model = SL1
 printer_variant = default
-default_sla_material_profile = Jamg He PJHC-30 Orange 0.05
+default_sla_material_profile = Prusa Orange Solid 0.05
 default_sla_print_profile = 0.05 Normal
-bed_shape = 0.98x1.02,119.98x1.02,119.98x68.02,0.98x68.02
+bed_shape = 0.98x1.02,119.98x1.02,119.98x67.02,0.98x67.02
 display_height = 68.04
 display_orientation = portrait
 display_pixels_x = 2560
diff --git a/resources/shaders/gouraud.fs b/resources/shaders/gouraud.fs
index f6116eec7..09003f407 100644
--- a/resources/shaders/gouraud.fs
+++ b/resources/shaders/gouraud.fs
@@ -2,24 +2,21 @@
 
 const vec3 ZERO = vec3(0.0, 0.0, 0.0);
 
+varying vec3 clipping_planes_dots;
+
 // x = tainted, y = specular;
 varying vec2 intensity;
 
 varying vec3 delta_box_min;
 varying vec3 delta_box_max;
 
-varying float world_z;
-
 uniform vec4 uniform_color;
 
-// x = min z, y = max z;
-uniform vec2 z_range;
 
 void main()
 {
-    if ((world_z < z_range.x) || (z_range.y < world_z))
+    if (any(lessThan(clipping_planes_dots, ZERO)))
         discard;
-
     // if the fragment is outside the print volume -> use darker color
     vec3 color = (any(lessThan(delta_box_min, ZERO)) || any(greaterThan(delta_box_max, ZERO))) ? mix(uniform_color.rgb, ZERO, 0.3333) : uniform_color.rgb;
     gl_FragColor = vec4(vec3(intensity.y, intensity.y, intensity.y) + color * intensity.x, uniform_color.a);
diff --git a/resources/shaders/gouraud.vs b/resources/shaders/gouraud.vs
index 84ae51391..cc54c1c44 100644
--- a/resources/shaders/gouraud.vs
+++ b/resources/shaders/gouraud.vs
@@ -28,13 +28,18 @@ struct PrintBoxDetection
 
 uniform PrintBoxDetection print_box;
 
+// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
+uniform vec2 z_range;
+// Clipping plane - general orientation. Used by the SLA gizmo.
+uniform vec4 clipping_plane;
+
 // x = tainted, y = specular;
 varying vec2 intensity;
 
 varying vec3 delta_box_min;
 varying vec3 delta_box_max;
 
-varying float world_z;
+varying vec3 clipping_planes_dots;
 
 void main()
 {
@@ -66,8 +71,11 @@ void main()
     {
         delta_box_min = ZERO;
         delta_box_max = ZERO;
-    }    
+    }
 
     gl_Position = ftransform();
-    world_z = vec3(print_box.volume_world_matrix * gl_Vertex).z;
-} 
+    // Point in homogenous coordinates.
+    vec4 world_pos = print_box.volume_world_matrix * gl_Vertex;
+    // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded.
+    clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z);
+}
diff --git a/sandboxes/slabasebed/slabasebed.cpp b/sandboxes/slabasebed/slabasebed.cpp
index 323741609..0c34eb9f5 100644
--- a/sandboxes/slabasebed/slabasebed.cpp
+++ b/sandboxes/slabasebed/slabasebed.cpp
@@ -4,6 +4,7 @@
 
 #include <libslic3r/libslic3r.h>
 #include <libslic3r/TriangleMesh.hpp>
+#include <libslic3r/Tesselate.hpp>
 #include <libslic3r/SLA/SLABasePool.hpp>
 #include <libslic3r/SLA/SLABoilerPlate.hpp>
 #include <libnest2d/tools/benchmark.h>
@@ -14,7 +15,9 @@ const std::string USAGE_STR = {
 
 namespace Slic3r { namespace sla {
 
-Contour3D convert(const Polygons& triangles, coord_t z, bool dir);
+Contour3D create_base_pool(const ExPolygons &ground_layer, 
+                           const PoolConfig& cfg = PoolConfig());
+
 Contour3D walls(const Polygon& floor_plate, const Polygon& ceiling,
                 double floor_z_mm, double ceiling_z_mm,
                 double offset_difference_mm, ThrowOnCancel thr);
@@ -47,31 +50,38 @@ int main(const int argc, const char *argv[]) {
 
     if(ground_slice.empty()) return EXIT_FAILURE;
 
-    ExPolygon bottom_plate = ground_slice.front();
-    ExPolygon top_plate = bottom_plate;
-    sla::offset(top_plate, coord_t(3.0/SCALING_FACTOR));
-    sla::offset(bottom_plate, coord_t(1.0/SCALING_FACTOR));
+//    ExPolygon bottom_plate = ground_slice.front();
+//    ExPolygon top_plate = bottom_plate;
+//    sla::offset(top_plate, coord_t(3.0/SCALING_FACTOR));
+//    sla::offset(bottom_plate, coord_t(1.0/SCALING_FACTOR));
 
     bench.start();
 
-    Polygons top_plate_triangles, bottom_plate_triangles;
-    top_plate.triangulate_p2t(&top_plate_triangles);
-    bottom_plate.triangulate_p2t(&bottom_plate_triangles);
-
-    auto top_plate_mesh = sla::convert(top_plate_triangles, coord_t(3.0/SCALING_FACTOR), false);
-    auto bottom_plate_mesh = sla::convert(bottom_plate_triangles, 0, true);
-
-    mesh.merge(bottom_plate_mesh);
-    mesh.merge(top_plate_mesh);
-
-    sla::Contour3D w = sla::walls(bottom_plate.contour, top_plate.contour, 0, 3, 2.0, [](){});
-
-    mesh.merge(w);
-//    sla::create_base_pool(ground_slice, basepool);
+//    TriangleMesh pool;
+    sla::PoolConfig cfg;
+    cfg.min_wall_height_mm = 0;
+    cfg.edge_radius_mm = 0.2;
+    mesh = sla::create_base_pool(ground_slice, cfg);
+    
+//    mesh.merge(triangulate_expolygon_3d(top_plate, 3.0, false));
+//    mesh.merge(triangulate_expolygon_3d(bottom_plate, 0.0, true));
+//    mesh = sla::walls(bottom_plate.contour, top_plate.contour, 0, 3, 2.0, [](){});
+    
     bench.stop();
 
     cout << "Base pool creation time: " << std::setprecision(10)
          << bench.getElapsedSec() << " seconds." << endl;
+    
+//    auto point = []()
+    for(auto& trind : mesh.indices) {
+        Vec3d p0 = mesh.points[size_t(trind[0])];
+        Vec3d p1 = mesh.points[size_t(trind[1])];
+        Vec3d p2 = mesh.points[size_t(trind[2])];
+        Vec3d p01 = p1 - p0;
+        Vec3d p02 = p2 - p0;
+        auto a = p01.cross(p02).norm() / 2.0;
+        if(std::abs(a) < 1e-6) std::cout << "degenerate triangle" << std::endl;
+    }
 
 //    basepool.write_ascii("out.stl");
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 36e8d22fc..6a36bd752 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,6 @@ add_subdirectory(poly2tri)
 add_subdirectory(qhull)
 add_subdirectory(Shiny)
 add_subdirectory(semver)
-add_subdirectory(imgui)
 add_subdirectory(test)
 
 # Adding libnest2d project for bin packing...
@@ -22,33 +21,11 @@ add_subdirectory(libnest2d)
 include_directories(${LIBDIR}/qhull/src)
 #message(STATUS ${LIBDIR}/qhull/src)
 
-# ##############################################################################
-# Configure rasterizer target
-# ##############################################################################
-
-find_package(PNG QUIET)
-
-option(RASTERIZER_FORCE_BUILTIN_LIBPNG "Force the usage of builting libpng instead of the system version." OFF)
-
-if(PNG_FOUND AND NOT RASTERIZER_FORCE_BUILTIN_LIBPNG)
-    message(STATUS "Using system libpng.")
-else()
-    set(ZLIB_LIBRARY "")
-    message(WARNING "Using builtin libpng. This can cause crashes on some platforms.")
-    set(SKIP_INSTALL_ALL 1)   # Prevent png+zlib from creating install targets
-    add_subdirectory(png/zlib)
-    set(ZLIB_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/png/zlib ${CMAKE_CURRENT_BINARY_DIR}/png/zlib)
-    include_directories(${ZLIB_INCLUDE_DIR})
-    add_subdirectory(png/libpng)
-    set_target_properties(zlibstatic PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    set_target_properties(png_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    set(PNG_LIBRARIES png_static zlibstatic)
-    set(PNG_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/png/libpng ${CMAKE_CURRENT_BINARY_DIR}/png/libpng)
-endif()
-
 add_subdirectory(libslic3r)
 
 if (SLIC3R_GUI)
+    add_subdirectory(imgui)
+
     if(WIN32)
         message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
     elseif(UNIX)
@@ -66,6 +43,7 @@ if (SLIC3R_GUI)
             find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl)
         else ()
             find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl)
+
             if (NOT wxWidgets_FOUND)
                 message(FATAL_ERROR "\nCould not find wxWidgets 3.1.\n"
                     "Hint: On Linux you can set -DSLIC3R_WX_STABLE=1 to use wxWidgets 3.0\n")
@@ -80,27 +58,25 @@ if (SLIC3R_GUI)
     endif()
 
     include(${wxWidgets_USE_FILE})
+
+    add_subdirectory(slic3r)
 endif()
 
-add_subdirectory(slic3r)
 
 # Create a slic3r executable
 # Process mainfests for various platforms.
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/slic3r.rc.in ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/slic3r.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/slic3r.manifest @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/slic3r.manifest @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
 if (MSVC)
-    add_library(slic3r SHARED slic3r.cpp slic3r.hpp)
+    add_library(slic3r SHARED PrusaSlicer.cpp PrusaSlicer.hpp)
 else ()
-    add_executable(slic3r slic3r.cpp slic3r.hpp)
+    add_executable(slic3r PrusaSlicer.cpp PrusaSlicer.hpp)
 endif ()
-add_library(slic3r_lib STATIC slic3r.cpp slic3r.hpp)
+add_library(slic3r_lib STATIC PrusaSlicer.cpp PrusaSlicer.hpp)
 if (NOT MSVC)
-    if(SLIC3R_GUI)
-        set_target_properties(slic3r PROPERTIES OUTPUT_NAME "slic3r-gui")
-    else()
-        set_target_properties(slic3r PROPERTIES OUTPUT_NAME "slic3r-console")
-    endif()
+    # Binary name on unix like systems (OSX, Linux)
+    set_target_properties(slic3r PROPERTIES OUTPUT_NAME "slic3r++")
 endif ()
 
 target_link_libraries(slic3r libslic3r)
@@ -115,7 +91,8 @@ elseif (MSVC)
     # Manifest is provided through slic3r.rc, don't generate your own.
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
 else ()
-    target_link_libraries(slic3r ${CMAKE_DL_LIBS} -lstdc++)
+    # Boost on Raspberry-Pi does not link to pthreads explicitely.
+    target_link_libraries(slic3r ${CMAKE_DL_LIBS} -lstdc++ Threads::Threads)
     target_link_libraries(slic3r_lib ${CMAKE_DL_LIBS} -lstdc++)
 endif ()
 
@@ -124,10 +101,14 @@ if (SLIC3R_GUI)
     target_link_libraries(slic3r libslic3r_gui ${wxWidgets_LIBRARIES})
     target_link_libraries(slic3r_lib libslic3r_gui ${wxWidgets_LIBRARIES})
 
-    # Configure libcurl & OpenSSL
+    # Configure libcurl and its dependencies OpenSSL & zlib
     find_package(CURL REQUIRED)
+    if (NOT MSVC)
+        # Required by libcurl
+        find_package(ZLIB REQUIRED)
+    endif()
     target_include_directories(slic3r PRIVATE ${CURL_INCLUDE_DIRS})
-    target_link_libraries(slic3r CURL::libcurl)
+    target_link_libraries(slic3r ${CURL_LIBRARIES} ${ZLIB_LIBRARIES})
     target_include_directories(slic3r_lib PRIVATE ${CURL_INCLUDE_DIRS})
     target_link_libraries(slic3r_lib CURL::libcurl)
     if (SLIC3R_STATIC)
@@ -151,6 +132,8 @@ if (SLIC3R_GUI)
     endif()
 
     if (MSVC)
+        # Generate debug symbols even in release mode.
+        #target_link_options(slic3r PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
         target_link_libraries(slic3r user32.lib Setupapi.lib OpenGL32.Lib GlU32.Lib)
         target_link_libraries(slic3r_lib user32.lib Setupapi.lib OpenGL32.Lib GlU32.Lib)
     elseif (MINGW)
@@ -168,15 +151,19 @@ endif ()
 # On Windows, a shim application is required to produce a console / non console version of the Slic3r application.
 # Also the shim may load the Mesa software OpenGL renderer if the default renderer does not support OpenGL 2.0 and higher.
 if (MSVC)
-    add_executable(slic3r_app_gui WIN32 slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
+    add_executable(slic3r_app_gui WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
+    # Generate debug symbols even in release mode.
+    #target_link_options(slic3r_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
     target_compile_definitions(slic3r_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
     add_dependencies(slic3r_app_gui slic3r)
-    set_target_properties(slic3r_app_gui PROPERTIES OUTPUT_NAME "slic3r")
+    set_target_properties(slic3r_app_gui PROPERTIES OUTPUT_NAME "slic3r++")
 
-    add_executable(slic3r_app_console slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
+    add_executable(slic3r_app_console PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
+    # Generate debug symbols even in release mode.
+    #target_link_options(slic3r_app_console PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
     target_compile_definitions(slic3r_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE)
     add_dependencies(slic3r_app_console slic3r)
-    set_target_properties(slic3r_app_console PROPERTIES OUTPUT_NAME "slic3r-console")
+    set_target_properties(slic3r_app_console PROPERTIES OUTPUT_NAME "slic3r++_console")
 
 endif ()
 
@@ -205,7 +192,7 @@ if (MSVC)
         )
     endif ()
 elseif (XCODE)
-    # Because of Debug/Release/etc. configurations (similar to MSVC) the slic3r binary is located in an extra level
+    # Because of Debug/Release/etc. configurations (similar to MSVC) the slic3r binary is located in an extra level
     add_custom_command(TARGET slic3r POST_BUILD
         COMMAND ln -sf "${SLIC3R_RESOURCES_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/resources"
         COMMENT "Symlinking the resources directory into the build tree"
diff --git a/src/slic3r.cpp b/src/PrusaSlicer.cpp
similarity index 95%
rename from src/slic3r.cpp
rename to src/PrusaSlicer.cpp
index 7b37ba56c..90253cf38 100644
--- a/src/slic3r.cpp
+++ b/src/PrusaSlicer.cpp
@@ -6,10 +6,12 @@
     #define NOMINMAX
     #include <Windows.h>
     #include <wchar.h>
-    // Let the NVIDIA and AMD know we want to use their graphics card
-    // on a dual graphics card system.
-    __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
-    __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+    #ifdef SLIC3R_GUI
+        // Let the NVIDIA and AMD know we want to use their graphics card
+        // on a dual graphics card system.
+        __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
+        __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+    #endif /* SLIC3R_GUI */
 #endif /* WIN32 */
 
 #include <cstdio>
@@ -37,9 +39,12 @@
 #include "libslic3r/Format/OBJ.hpp"
 #include "libslic3r/Utils.hpp"
 
-#include "slic3r.hpp"
-#include "slic3r/GUI/GUI.hpp"
-#include "slic3r/GUI/GUI_App.hpp"
+#include "PrusaSlicer.hpp"
+
+#ifdef SLIC3R_GUI
+    #include "slic3r/GUI/GUI.hpp"
+    #include "slic3r/GUI/GUI_App.hpp"
+#endif /* SLIC3R_GUI */
 
 using namespace Slic3r;
 
@@ -361,6 +366,14 @@ int CLI::run(int argc, char **argv)
                 std::string outfile = m_config.opt_string("output");
                 Print       fff_print;
                 SLAPrint    sla_print;
+
+                sla_print.set_status_callback(
+                            [](const PrintBase::SlicingStatus& s)
+                {
+                    if(s.percent >= 0) // FIXME: is this sufficient?
+                        printf("%3d%s %s\n", s.percent, "% =>", s.text.c_str());
+                });
+
                 PrintBase  *print = (printer_technology == ptFFF) ? static_cast<PrintBase*>(&fff_print) : static_cast<PrintBase*>(&sla_print);
                 if (! m_config.opt_bool("dont_arrange")) {
                     //FIXME make the min_object_distance configurable.
@@ -389,9 +402,9 @@ int CLI::run(int argc, char **argv)
                             outfile_final = fff_print.print_statistics().finalize_output_path(outfile);
                         } else {
 							outfile = sla_print.output_filepath(outfile);
-                            //FIXME Tamas, please port it to miniz
-							// sla_print.export_raster<SLAZipFmt>(outfile);
-							outfile_final = sla_print.print_statistics().finalize_output_path(outfile);
+                            // We need to finalize the filename beforehand because the export function sets the filename inside the zip metadata
+                            outfile_final = sla_print.print_statistics().finalize_output_path(outfile);
+							sla_print.export_raster(outfile_final);
                         }
                         if (outfile != outfile_final && Slic3r::rename_file(outfile, outfile_final) != 0) {
 							boost::nowide::cerr << "Renaming file " << outfile << " to " << outfile_final << " failed" << std::endl;
@@ -440,7 +453,7 @@ int CLI::run(int argc, char **argv)
     }
     
 	if (start_gui) {
-#if 1
+#ifdef SLIC3R_GUI
 // #ifdef USE_WX
 		GUI::GUI_App *gui = new GUI::GUI_App();
 //		gui->autosave = m_config.opt_string("autosave");
@@ -469,12 +482,12 @@ int CLI::run(int argc, char **argv)
 				gui->mainframe->load_config(m_extra_config);
 		});
 		return wxEntry(argc, argv);
-#else
+#else /* SLIC3R_GUI */
 		// No GUI support. Just print out a help.
 		this->print_help(false);
 		// If started without a parameter, consider it to be OK, otherwise report an error code (no action etc).
 		return (argc == 0) ? 0 : 1;
-#endif   
+#endif /* SLIC3R_GUI */
     }
     
     return 0;
@@ -555,8 +568,14 @@ bool CLI::setup(int argc, char **argv)
 void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const 
 {
     boost::nowide::cout
-        << "Slic3r++ " << SLIC3R_BUILD << std::endl
-        << "https://github.com/prusa3d/Slic3r" << std::endl << std::endl
+		<< SLIC3R_BUILD_ID << " " << "based on Slic3r"
+#ifdef SLIC3R_GUI
+        << " (with GUI support)"
+#else /* SLIC3R_GUI */
+        << " (without GUI support)"
+#endif /* SLIC3R_GUI */
+        << std::endl
+        << "https://github.com/supermerill/slic3r" << std::endl << std::endl
         << "Usage: slic3r [ ACTIONS ] [ TRANSFORM ] [ OPTIONS ] [ file.stl ... ]" << std::endl
         << std::endl
         << "Actions:" << std::endl;
@@ -609,7 +628,7 @@ std::string CLI::output_filepath(const Model &model, IO::ExportFormat format) co
 {
     std::string ext;
     switch (format) {
-        case IO::AMF: ext = ".amf"; break;
+        case IO::AMF: ext = ".zip.amf"; break;
         case IO::OBJ: ext = ".obj"; break;
         case IO::STL: ext = ".stl"; break;
 		case IO::TMF: ext = ".3mf"; break;
diff --git a/src/slic3r.hpp b/src/PrusaSlicer.hpp
similarity index 100%
rename from src/slic3r.hpp
rename to src/PrusaSlicer.hpp
diff --git a/src/slic3r_app_msvc.cpp b/src/PrusaSlicer_app_msvc.cpp
similarity index 86%
rename from src/slic3r_app_msvc.cpp
rename to src/PrusaSlicer_app_msvc.cpp
index 48c166406..c100f8fd9 100644
--- a/src/slic3r_app_msvc.cpp
+++ b/src/PrusaSlicer_app_msvc.cpp
@@ -6,14 +6,20 @@
 #include <Windows.h>
 #include <shellapi.h>
 #include <wchar.h>
-// Let the NVIDIA and AMD know we want to use their graphics card
-// on a dual graphics card system.
-__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
-__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+
+#ifdef SLIC3R_GUI
+	// Let the NVIDIA and AMD know we want to use their graphics card
+	// on a dual graphics card system.
+	__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
+	__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
+#endif /* SLIC3R_GUI */
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <GL/GL.h>
+
+#ifdef SLIC3R_GUI
+	#include <GL/GL.h>
+#endif /* SLIC3R_GUI */
 
 #include <string>
 #include <vector>
@@ -23,6 +29,7 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
 
 #include <stdio.h>
 
+#ifdef SLIC3R_GUI
 class OpenGLVersionCheck
 {
 public:
@@ -188,6 +195,7 @@ protected:
 };
 
 bool OpenGLVersionCheck::message_pump_exit = false;
+#endif /* SLIC3R_GUI */
 
 extern "C" {
 	typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv);
@@ -206,13 +214,33 @@ int wmain(int argc, wchar_t **argv)
 
 	std::vector<wchar_t*> argv_extended;
 	argv_extended.emplace_back(argv[0]);
+
+#ifdef SLIC3R_GUI
 	// Here one may push some additional parameters based on the wrapper type.
-	for (int i = 1; i < argc; ++ i)
+	bool force_mesa = false;
+#endif /* SLIC3R_GUI */
+	for (int i = 1; i < argc; ++ i) {
+#ifdef SLIC3R_GUI
+		if (wcscmp(argv[i], L"--sw-renderer") == 0)
+			force_mesa = true;
+		else if (wcscmp(argv[i], L"--no-sw-renderer") == 0)
+			force_mesa = false;
+#endif /* SLIC3R_GUI */
 		argv_extended.emplace_back(argv[i]);
+	}
 	argv_extended.emplace_back(nullptr);
 
+#ifdef SLIC3R_GUI
 	OpenGLVersionCheck opengl_version_check;
-	bool load_mesa = ! opengl_version_check.load_opengl_dll() || ! opengl_version_check.is_version_greater_or_equal_to(2, 0);
+	bool load_mesa = 
+		// Forced from the command line.
+		force_mesa ||
+		// Running over a rempote desktop, and the RemoteFX is not enabled, therefore Windows will only provide SW OpenGL 1.1 context.
+		// In that case, use Mesa.
+		::GetSystemMetrics(SM_REMOTESESSION) ||
+		// Try to load the default OpenGL driver and test its context version.
+		! opengl_version_check.load_opengl_dll() || ! opengl_version_check.is_version_greater_or_equal_to(2, 0);
+#endif /* SLIC3R_GUI */
 
 	wchar_t path_to_exe[MAX_PATH + 1] = { 0 };
 	::GetModuleFileNameW(nullptr, path_to_exe, MAX_PATH);
@@ -223,6 +251,7 @@ int wmain(int argc, wchar_t **argv)
 	_wsplitpath(path_to_exe, drive, dir, fname, ext);
 	_wmakepath(path_to_exe, drive, dir, nullptr, nullptr);
 
+#ifdef SLIC3R_GUI
 // https://wiki.qt.io/Cross_compiling_Mesa_for_Windows
 // http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/
 	if (load_mesa) {
@@ -237,6 +266,8 @@ int wmain(int argc, wchar_t **argv)
 		} else
 			printf("MESA OpenGL library was loaded sucessfully\n");		
 	}
+#endif /* SLIC3R_GUI */
+
 
 	wchar_t path_to_slic3r[MAX_PATH + 1] = { 0 };
 	wcscpy(path_to_slic3r, path_to_exe);
@@ -262,5 +293,5 @@ int wmain(int argc, wchar_t **argv)
 		return -1;
 	}
 	// argc minus the trailing nullptr of the argv
-	return slic3r_main(argv_extended.size() - 1, argv_extended.data());
+	return slic3r_main((int)argv_extended.size() - 1, argv_extended.data());
 }
diff --git a/src/admesh/connect.cpp b/src/admesh/connect.cpp
index 5fc992b63..fb3213219 100644
--- a/src/admesh/connect.cpp
+++ b/src/admesh/connect.cpp
@@ -39,8 +39,7 @@ static void stl_record_neighbors(stl_file *stl,
                                  stl_hash_edge *edge_a, stl_hash_edge *edge_b);
 static void stl_initialize_facet_check_exact(stl_file *stl);
 static void stl_initialize_facet_check_nearby(stl_file *stl);
-static void stl_load_edge_exact(stl_file *stl, stl_hash_edge *edge,
-                                stl_vertex *a, stl_vertex *b);
+static void stl_load_edge_exact(stl_file *stl, stl_hash_edge *edge, const stl_vertex *a, const stl_vertex *b);
 static int stl_load_edge_nearby(stl_file *stl, stl_hash_edge *edge,
                                 stl_vertex *a, stl_vertex *b, float tolerance);
 static void insert_hash_edge(stl_file *stl, stl_hash_edge edge,
@@ -60,41 +59,40 @@ extern int stl_check_normal_vector(stl_file *stl,
                                    int facet_num, int normal_fix_flag);
 static void stl_update_connects_remove_1(stl_file *stl, int facet_num);
 
-
-void
-stl_check_facets_exact(stl_file *stl) {
-  /* This function builds the neighbors list.  No modifications are made
-   *  to any of the facets.  The edges are said to match only if all six
-   *  floats of the first edge matches all six floats of the second edge.
-   */
-
-  stl_hash_edge  edge;
-  stl_facet      facet;
-  int            i;
-  int            j;
-
-  if (stl->error) return;
+// This function builds the neighbors list.  No modifications are made
+// to any of the facets.  The edges are said to match only if all six
+// floats of the first edge matches all six floats of the second edge.
+void stl_check_facets_exact(stl_file *stl)
+{
+  if (stl->error)
+	  return;
 
   stl->stats.connected_edges = 0;
   stl->stats.connected_facets_1_edge = 0;
   stl->stats.connected_facets_2_edge = 0;
   stl->stats.connected_facets_3_edge = 0;
 
-  stl_initialize_facet_check_exact(stl);
+  // If any two of the three vertices are found to be exactally the same, call them degenerate and remove the facet.
+  // Do it before the next step, as the next step stores references to the face indices in the hash tables and removing a facet
+  // will break the references.
+  for (int i = 0; i < stl->stats.number_of_facets;) {
+	  stl_facet &facet = stl->facet_start[i];
+	  if (facet.vertex[0] == facet.vertex[1] || facet.vertex[1] == facet.vertex[2] || facet.vertex[0] == facet.vertex[2]) {
+		  // Remove the degenerate facet.
+		  facet = stl->facet_start[--stl->stats.number_of_facets];
+		  stl->stats.facets_removed += 1;
+		  stl->stats.degenerate_facets += 1;
+	  } else
+		  ++ i;
+  }
 
-  for(i = 0; i < stl->stats.number_of_facets; i++) {
-    facet = stl->facet_start[i];
-    // If any two of the three vertices are found to be exactally the same, call them degenerate and remove the facet.
-    if (facet.vertex[0] == facet.vertex[1] ||
-        facet.vertex[1] == facet.vertex[2] ||
-        facet.vertex[0] == facet.vertex[2]) {
-      stl->stats.degenerate_facets += 1;
-      stl_remove_facet(stl, i);
-      -- i;
-      continue;
-    }
-    for(j = 0; j < 3; j++) {
-      edge.facet_number = i;
+  // Connect neighbor edges.
+  stl_initialize_facet_check_exact(stl);
+  for (int i = 0; i < stl->stats.number_of_facets; i++) {
+	const stl_facet &facet = stl->facet_start[i];
+    for (int j = 0; j < 3; j++) {
+	  stl_hash_edge  edge;
+	  edge.facet_number = i;
       edge.which_edge = j;
       stl_load_edge_exact(stl, &edge, &facet.vertex[j], &facet.vertex[(j + 1) % 3]);
       insert_hash_edge(stl, edge, stl_record_neighbors);
@@ -109,9 +107,7 @@ stl_check_facets_exact(stl_file *stl) {
 #endif
 }
 
-static void
-stl_load_edge_exact(stl_file *stl, stl_hash_edge *edge,
-                    stl_vertex *a, stl_vertex *b) {
+static void stl_load_edge_exact(stl_file *stl, stl_hash_edge *edge, const stl_vertex *a, const stl_vertex *b) {
 
   if (stl->error) return;
 
@@ -333,7 +329,9 @@ static void stl_free_edges(stl_file *stl)
     }
   }
   free(stl->heads);
+  stl->heads = nullptr;
   free(stl->tail);
+  stl->tail = nullptr;
 }
 
 static void stl_initialize_facet_check_nearby(stl_file *stl)
diff --git a/src/admesh/normals.cpp b/src/admesh/normals.cpp
index a8faa44bd..ecf08b59c 100644
--- a/src/admesh/normals.cpp
+++ b/src/admesh/normals.cpp
@@ -108,6 +108,9 @@ stl_fix_normal_directions(stl_file *stl) {
 
   if (stl->error) return;
 
+  // this may happen for malformed models, see: https://github.com/prusa3d/PrusaSlicer/issues/2209
+  if (stl->stats.number_of_facets == 0) return;
+
   /* Initialize linked list. */
   head = (struct stl_normal*)malloc(sizeof(struct stl_normal));
   if(head == NULL) perror("stl_fix_normal_directions");
diff --git a/src/admesh/stl.h b/src/admesh/stl.h
index afff3deac..f867e197b 100644
--- a/src/admesh/stl.h
+++ b/src/admesh/stl.h
@@ -43,11 +43,21 @@ typedef Eigen::Matrix<float, 3, 1, Eigen::DontAlign> stl_normal;
 static_assert(sizeof(stl_vertex) == 12, "size of stl_vertex incorrect");
 static_assert(sizeof(stl_normal) == 12, "size of stl_normal incorrect");
 
-typedef struct {
+struct stl_facet {
   stl_normal normal;
   stl_vertex vertex[3];
   char       extra[2];
-} stl_facet;
+
+  stl_facet  rotated(const Eigen::Quaternion<float, Eigen::DontAlign> &rot) {
+    stl_facet out;
+    out.normal    = rot * this->normal;
+    out.vertex[0] = rot * this->vertex[0];
+    out.vertex[1] = rot * this->vertex[1];
+    out.vertex[2] = rot * this->vertex[2];
+    return out;
+  }
+};
+
 #define SIZEOF_STL_FACET       50
 
 static_assert(offsetof(stl_facet, normal) == 0, "stl_facet.normal has correct offset");
@@ -127,7 +137,6 @@ typedef struct {
 typedef struct {
   FILE          *fp;
   stl_facet     *facet_start;
-  stl_edge      *edge_start;
   stl_hash_edge **heads;
   stl_hash_edge *tail;
   int           M;
@@ -142,7 +151,6 @@ typedef struct {
 extern void stl_open(stl_file *stl, const char *file);
 extern void stl_close(stl_file *stl);
 extern void stl_stats_out(stl_file *stl, FILE *file, char *input_file);
-extern void stl_print_edges(stl_file *stl, FILE *file);
 extern void stl_print_neighbors(stl_file *stl, char *file);
 extern void stl_put_little_int(FILE *fp, int value_in);
 extern void stl_put_little_float(FILE *fp, float value_in);
@@ -172,8 +180,67 @@ extern void stl_rotate_z(stl_file *stl, float angle);
 extern void stl_mirror_xy(stl_file *stl);
 extern void stl_mirror_yz(stl_file *stl);
 extern void stl_mirror_xz(stl_file *stl);
-extern void stl_transform(stl_file *stl, float *trafo3x4);
-extern void stl_transform(stl_file *stl, const Eigen::Transform<double, 3, Eigen::Affine, Eigen::DontAlign>& t);
+
+extern void stl_get_size(stl_file *stl);
+
+template<typename T>
+extern void stl_transform(stl_file *stl, T *trafo3x4)
+{
+  if (stl->error)
+    return;
+
+  for (uint32_t i_face = 0; i_face < stl->stats.number_of_facets; ++ i_face) {
+    stl_facet &face = stl->facet_start[i_face];
+    for (int i_vertex = 0; i_vertex < 3; ++ i_vertex) {
+      stl_vertex &v_dst = face.vertex[i_vertex];
+      stl_vertex  v_src = v_dst;
+      v_dst(0) = T(trafo3x4[0] * v_src(0) + trafo3x4[1] * v_src(1) + trafo3x4[2]  * v_src(2) + trafo3x4[3]);
+      v_dst(1) = T(trafo3x4[4] * v_src(0) + trafo3x4[5] * v_src(1) + trafo3x4[6]  * v_src(2) + trafo3x4[7]);
+      v_dst(2) = T(trafo3x4[8] * v_src(0) + trafo3x4[9] * v_src(1) + trafo3x4[10] * v_src(2) + trafo3x4[11]);
+    }
+    stl_vertex &v_dst = face.normal;
+    stl_vertex  v_src = v_dst;
+    v_dst(0) = T(trafo3x4[0] * v_src(0) + trafo3x4[1] * v_src(1) + trafo3x4[2]  * v_src(2));
+    v_dst(1) = T(trafo3x4[4] * v_src(0) + trafo3x4[5] * v_src(1) + trafo3x4[6]  * v_src(2));
+    v_dst(2) = T(trafo3x4[8] * v_src(0) + trafo3x4[9] * v_src(1) + trafo3x4[10] * v_src(2));
+  }
+
+  stl_get_size(stl);
+}
+
+template<typename T>
+inline void stl_transform(stl_file *stl, const Eigen::Transform<T, 3, Eigen::Affine, Eigen::DontAlign>& t)
+{
+	if (stl->error)
+		return;
+
+	const Eigen::Matrix<double, 3, 3, Eigen::DontAlign> r = t.matrix().template block<3, 3>(0, 0);
+	for (size_t i = 0; i < stl->stats.number_of_facets; ++i) {
+		stl_facet &f = stl->facet_start[i];
+		for (size_t j = 0; j < 3; ++j)
+			f.vertex[j] = (t * f.vertex[j].template cast<T>()).template cast<float>().eval();
+		f.normal = (r * f.normal.template cast<T>()).template cast<float>().eval();
+	}
+
+	stl_get_size(stl);
+}
+
+template<typename T>
+inline void stl_transform(stl_file *stl, const Eigen::Matrix<T, 3, 3, Eigen::DontAlign>& m)
+{
+	if (stl->error)
+		return;
+
+	for (size_t i = 0; i < stl->stats.number_of_facets; ++i) {
+		stl_facet &f = stl->facet_start[i];
+		for (size_t j = 0; j < 3; ++j)
+			f.vertex[j] = (m * f.vertex[j].template cast<T>()).template cast<float>().eval();
+		f.normal = (m * f.normal.template cast<T>()).template cast<float>().eval();
+	}
+
+	stl_get_size(stl);
+}
+
 extern void stl_open_merge(stl_file *stl, char *file);
 extern void stl_invalidate_shared_vertices(stl_file *stl);
 extern void stl_generate_shared_vertices(stl_file *stl);
@@ -206,7 +273,6 @@ extern void stl_read(stl_file *stl, int first_facet, bool first);
 extern void stl_facet_stats(stl_file *stl, stl_facet facet, bool &first);
 extern void stl_reallocate(stl_file *stl);
 extern void stl_add_facet(stl_file *stl, stl_facet *new_facet);
-extern void stl_get_size(stl_file *stl);
 
 extern void stl_clear_error(stl_file *stl);
 extern int stl_get_error(stl_file *stl);
diff --git a/src/admesh/stl_io.cpp b/src/admesh/stl_io.cpp
index 71e434cbc..85f66785b 100644
--- a/src/admesh/stl_io.cpp
+++ b/src/admesh/stl_io.cpp
@@ -33,24 +33,6 @@
 #define SEEK_END 2
 #endif
 
-void
-stl_print_edges(stl_file *stl, FILE *file) {
-  int i;
-  int edges_allocated;
-
-  if (stl->error) return;
-
-  edges_allocated = stl->stats.number_of_facets * 3;
-  for(i = 0; i < edges_allocated; i++) {
-    fprintf(file, "%d, %f, %f, %f, %f, %f, %f\n",
-            stl->edge_start[i].facet_number,
-            stl->edge_start[i].p1(0), stl->edge_start[i].p1(1),
-            stl->edge_start[i].p1(2), stl->edge_start[i].p2(0),
-            stl->edge_start[i].p2(1), stl->edge_start[i].p2(2));
-  }
-}
-
-
 void
 stl_stats_out(stl_file *stl, FILE *file, char *input_file) {
   if (stl->error) return;
diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
index e2939b8af..911f4f5e8 100644
--- a/src/admesh/stlinit.cpp
+++ b/src/admesh/stlinit.cpp
@@ -41,10 +41,12 @@ stl_open(stl_file *stl, const char *file) {
   stl_count_facets(stl, file);
   stl_allocate(stl);
   stl_read(stl, 0, true);
-  if (!stl->error) fclose(stl->fp);
+  if (stl->fp != nullptr) {
+	  fclose(stl->fp);
+	  stl->fp = nullptr;
+  }
 }
 
-
 void
 stl_initialize(stl_file *stl) {
   memset(stl, 0, sizeof(stl_file));
@@ -118,7 +120,7 @@ stl_count_facets(stl_file *stl, const char *file) {
     }
 
     /* Read the int following the header.  This should contain # of facets */
-    bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, stl->fp);
+    bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, stl->fp) != 0;
 #ifndef BOOST_LITTLE_ENDIAN
     // Convert from little endian to big endian.
     stl_internal_reverse_quads((char*)&header_num_facets, 4);
@@ -257,7 +259,6 @@ stl_reallocate(stl_file *stl) {
    time running this for the stl and therefore we should reset our max and min stats. */
 void stl_read(stl_file *stl, int first_facet, bool first) {
   stl_facet facet;
-  int   i;
 
   if (stl->error) return;
 
@@ -268,7 +269,7 @@ void stl_read(stl_file *stl, int first_facet, bool first) {
   }
 
   char normal_buf[3][32];
-  for(i = first_facet; i < stl->stats.number_of_facets; i++) {
+  for(uint32_t i = first_facet; i < stl->stats.number_of_facets; i++) {
     if(stl->stats.type == binary)
       /* Read a single facet from a binary .STL file */
     {
@@ -366,17 +367,19 @@ void stl_facet_stats(stl_file *stl, stl_facet facet, bool &first)
   }
 }
 
-void
-stl_close(stl_file *stl) {
-  if (stl->error) return;
+void stl_close(stl_file *stl)
+{
+	assert(stl->fp == nullptr);
+	assert(stl->heads == nullptr);
+	assert(stl->tail == nullptr);
 
-  if(stl->neighbors_start != NULL)
-    free(stl->neighbors_start);
-  if(stl->facet_start != NULL)
-    free(stl->facet_start);
-  if(stl->v_indices != NULL)
-    free(stl->v_indices);
-  if(stl->v_shared != NULL)
-    free(stl->v_shared);
+	if (stl->facet_start != NULL)
+		free(stl->facet_start);
+	if (stl->neighbors_start != NULL)
+		free(stl->neighbors_start);
+	if (stl->v_indices != NULL)
+		free(stl->v_indices);
+	if (stl->v_shared != NULL)
+		free(stl->v_shared);
+	memset(stl, 0, sizeof(stl_file));
 }
-
diff --git a/src/admesh/util.cpp b/src/admesh/util.cpp
index 7cb69bccd..305a58e22 100644
--- a/src/admesh/util.cpp
+++ b/src/admesh/util.cpp
@@ -137,65 +137,6 @@ static void calculate_normals(stl_file *stl)
   }
 }
 
-void stl_transform(stl_file *stl, float *trafo3x4) {
-  int i_face, i_vertex;
-  if (stl->error)
-    return;
-  for (i_face = 0; i_face < stl->stats.number_of_facets; ++ i_face) {
-    stl_vertex *vertices = stl->facet_start[i_face].vertex;
-    for (i_vertex = 0; i_vertex < 3; ++ i_vertex) {
-      stl_vertex &v_dst = vertices[i_vertex];
-      stl_vertex  v_src = v_dst;
-      v_dst(0) = trafo3x4[0] * v_src(0) + trafo3x4[1] * v_src(1) + trafo3x4[2]  * v_src(2) + trafo3x4[3];
-      v_dst(1) = trafo3x4[4] * v_src(0) + trafo3x4[5] * v_src(1) + trafo3x4[6]  * v_src(2) + trafo3x4[7];
-      v_dst(2) = trafo3x4[8] * v_src(0) + trafo3x4[9] * v_src(1) + trafo3x4[10] * v_src(2) + trafo3x4[11];
-    }
-  }
-  stl_get_size(stl);
-  calculate_normals(stl);
-}
-
-void stl_transform(stl_file *stl, const Eigen::Transform<double, 3, Eigen::Affine, Eigen::DontAlign>& t)
-{
-    if (stl->error)
-        return;
-
-    unsigned int vertices_count = 3 * (unsigned int)stl->stats.number_of_facets;
-    if (vertices_count == 0)
-        return;
-
-    Eigen::MatrixXf src_vertices(3, vertices_count);
-    stl_facet* facet_ptr = stl->facet_start;
-    unsigned int v_id = 0;
-    while (facet_ptr < stl->facet_start + stl->stats.number_of_facets)
-    {
-        for (int i = 0; i < 3; ++i)
-        {
-            ::memcpy((void*)src_vertices.col(v_id).data(), (const void*)&facet_ptr->vertex[i], 3 * sizeof(float));
-            ++v_id;
-        }
-        facet_ptr += 1;
-    }
-
-    Eigen::MatrixXf dst_vertices(3, vertices_count);
-    dst_vertices = t.cast<float>() * src_vertices.colwise().homogeneous();
-
-    facet_ptr = stl->facet_start;
-    v_id = 0;
-    while (facet_ptr < stl->facet_start + stl->stats.number_of_facets)
-    {
-        for (int i = 0; i < 3; ++i)
-        {
-            ::memcpy((void*)&facet_ptr->vertex[i], (const void*)dst_vertices.col(v_id).data(), 3 * sizeof(float));
-            ++v_id;
-        }
-        facet_ptr += 1;
-    }
-
-    stl_get_size(stl);
-    calculate_normals(stl);
-}
-
 void
 stl_rotate_x(stl_file *stl, float angle) {
   int i;
diff --git a/src/avrdude/ac_cfg.h b/src/avrdude/ac_cfg.h
index 41d648bf1..1dd40de41 100644
--- a/src/avrdude/ac_cfg.h
+++ b/src/avrdude/ac_cfg.h
@@ -172,7 +172,7 @@
 #define PACKAGE "avrdude-slic3r"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://github.com/prusa3d/Slic3r/issues"
+#define PACKAGE_BUGREPORT "https://github.com/supermerill/Slic3r/issues"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "avrdude-slic3r"
@@ -184,7 +184,7 @@
 #define PACKAGE_TARNAME "avrdude-slic3r"
 
 /* Define to the home page for this package. */
-#define PACKAGE_URL "https://github.com/prusa3d/Slic3r"
+#define PACKAGE_URL "https://github.com/supermerill/Slic3r"
 
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "6.3-20160220"
diff --git a/src/libnest2d/include/libnest2d/backends/clipper/CMakeLists.txt b/src/libnest2d/include/libnest2d/backends/clipper/CMakeLists.txt
index 995afcc76..462d1dd06 100644
--- a/src/libnest2d/include/libnest2d/backends/clipper/CMakeLists.txt
+++ b/src/libnest2d/include/libnest2d/backends/clipper/CMakeLists.txt
@@ -64,6 +64,7 @@ endif()
 target_include_directories(ClipperBackend INTERFACE ${Boost_INCLUDE_DIRS} )
 target_sources(ClipperBackend INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/geometries.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/clipper_polygon.hpp
     ${SRC_DIR}/libnest2d/utils/boost_alg.hpp )
 
 target_compile_definitions(ClipperBackend INTERFACE LIBNEST2D_BACKEND_CLIPPER)
diff --git a/src/libnest2d/include/libnest2d/backends/clipper/clipper_polygon.hpp b/src/libnest2d/include/libnest2d/backends/clipper/clipper_polygon.hpp
new file mode 100644
index 000000000..e9fbfbd18
--- /dev/null
+++ b/src/libnest2d/include/libnest2d/backends/clipper/clipper_polygon.hpp
@@ -0,0 +1,72 @@
+#ifndef CLIPPER_POLYGON_HPP
+#define CLIPPER_POLYGON_HPP
+
+#include <clipper.hpp>
+
+namespace ClipperLib {
+
+struct Polygon {
+    Path Contour;
+    Paths Holes;
+
+    inline Polygon() = default;
+
+    inline explicit Polygon(const Path& cont): Contour(cont) {}
+    inline explicit Polygon(const Paths& holes):
+        Holes(holes) {}
+    inline Polygon(const Path& cont, const Paths& holes):
+        Contour(cont), Holes(holes) {}
+
+    inline explicit Polygon(Path&& cont): Contour(std::move(cont)) {}
+    inline explicit Polygon(Paths&& holes): Holes(std::move(holes)) {}
+    inline Polygon(Path&& cont, Paths&& holes):
+        Contour(std::move(cont)), Holes(std::move(holes)) {}
+};
+
+inline IntPoint& operator +=(IntPoint& p, const IntPoint& pa ) {
+    // This could be done with SIMD
+    p.X += pa.X;
+    p.Y += pa.Y;
+    return p;
+}
+
+inline IntPoint operator+(const IntPoint& p1, const IntPoint& p2) {
+    IntPoint ret = p1;
+    ret += p2;
+    return ret;
+}
+
+inline IntPoint& operator -=(IntPoint& p, const IntPoint& pa ) {
+    p.X -= pa.X;
+    p.Y -= pa.Y;
+    return p;
+}
+
+inline IntPoint operator -(IntPoint& p ) {
+    IntPoint ret = p;
+    ret.X = -ret.X;
+    ret.Y = -ret.Y;
+    return ret;
+}
+
+inline IntPoint operator-(const IntPoint& p1, const IntPoint& p2) {
+    IntPoint ret = p1;
+    ret -= p2;
+    return ret;
+}
+
+inline IntPoint& operator *=(IntPoint& p, const IntPoint& pa ) {
+    p.X *= pa.X;
+    p.Y *= pa.Y;
+    return p;
+}
+
+inline IntPoint operator*(const IntPoint& p1, const IntPoint& p2) {
+    IntPoint ret = p1;
+    ret *= p2;
+    return ret;
+}
+
+}
+
+#endif // CLIPPER_POLYGON_HPP
diff --git a/src/libnest2d/include/libnest2d/backends/clipper/geometries.hpp b/src/libnest2d/include/libnest2d/backends/clipper/geometries.hpp
index 9f881e7e0..232668f61 100644
--- a/src/libnest2d/include/libnest2d/backends/clipper/geometries.hpp
+++ b/src/libnest2d/include/libnest2d/backends/clipper/geometries.hpp
@@ -10,84 +10,15 @@
 #include <libnest2d/geometry_traits.hpp>
 #include <libnest2d/geometry_traits_nfp.hpp>
 
-#include <clipper.hpp>
-
-namespace ClipperLib {
-using PointImpl = IntPoint;
-using PathImpl = Path;
-using HoleStore = std::vector<PathImpl>;
-
-struct PolygonImpl {
-    PathImpl Contour;
-    HoleStore Holes;
-
-    inline PolygonImpl() = default;
-
-    inline explicit PolygonImpl(const PathImpl& cont): Contour(cont) {}
-    inline explicit PolygonImpl(const HoleStore& holes):
-        Holes(holes) {}
-    inline PolygonImpl(const Path& cont, const HoleStore& holes):
-        Contour(cont), Holes(holes) {}
-
-    inline explicit PolygonImpl(PathImpl&& cont): Contour(std::move(cont)) {}
-    inline explicit PolygonImpl(HoleStore&& holes): Holes(std::move(holes)) {}
-    inline PolygonImpl(Path&& cont, HoleStore&& holes):
-        Contour(std::move(cont)), Holes(std::move(holes)) {}
-};
-
-inline PointImpl& operator +=(PointImpl& p, const PointImpl& pa ) {
-    // This could be done with SIMD
-    p.X += pa.X;
-    p.Y += pa.Y;
-    return p;
-}
-
-inline PointImpl operator+(const PointImpl& p1, const PointImpl& p2) {
-    PointImpl ret = p1;
-    ret += p2;
-    return ret;
-}
-
-inline PointImpl& operator -=(PointImpl& p, const PointImpl& pa ) {
-    p.X -= pa.X;
-    p.Y -= pa.Y;
-    return p;
-}
-
-inline PointImpl operator -(PointImpl& p ) {
-    PointImpl ret = p;
-    ret.X = -ret.X;
-    ret.Y = -ret.Y;
-    return ret;
-}
-
-inline PointImpl operator-(const PointImpl& p1, const PointImpl& p2) {
-    PointImpl ret = p1;
-    ret -= p2;
-    return ret;
-}
-
-inline PointImpl& operator *=(PointImpl& p, const PointImpl& pa ) {
-    p.X *= pa.X;
-    p.Y *= pa.Y;
-    return p;
-}
-
-inline PointImpl operator*(const PointImpl& p1, const PointImpl& p2) {
-    PointImpl ret = p1;
-    ret *= p2;
-    return ret;
-}
-
-}
+#include "clipper_polygon.hpp"
 
 namespace libnest2d {
 
 // Aliases for convinience
-using ClipperLib::PointImpl;
-using ClipperLib::PathImpl;
-using ClipperLib::PolygonImpl;
-using ClipperLib::HoleStore;
+using PointImpl = ClipperLib::IntPoint;
+using PathImpl  = ClipperLib::Path;
+using HoleStore = ClipperLib::Paths;
+using PolygonImpl = ClipperLib::Polygon;
 
 // Type of coordinate units used by Clipper
 template<> struct CoordType<PointImpl> {
@@ -158,33 +89,24 @@ template<> inline TCoord<PointImpl>& y(PointImpl& p)
 #define DISABLE_BOOST_AREA
 
 namespace _smartarea {
+
 template<Orientation o>
 inline double area(const PolygonImpl& /*sh*/) {
     return std::nan("");
 }
 
 template<>
-inline double area<Orientation::CLOCKWISE>(const PolygonImpl& sh) {
-    double a = 0;
-
-    std::for_each(sh.Holes.begin(), sh.Holes.end(), [&a](const PathImpl& h)
-    {
-        a -= ClipperLib::Area(h);
+inline double area<Orientation::COUNTER_CLOCKWISE>(const PolygonImpl& sh) {
+    return std::accumulate(sh.Holes.begin(), sh.Holes.end(),
+                           ClipperLib::Area(sh.Contour),
+                           [](double a, const ClipperLib::Path& pt){
+        return a + ClipperLib::Area(pt);
     });
-
-    return -ClipperLib::Area(sh.Contour) + a;
 }
 
 template<>
-inline double area<Orientation::COUNTER_CLOCKWISE>(const PolygonImpl& sh) {
-    double a = 0;
-
-    std::for_each(sh.Holes.begin(), sh.Holes.end(), [&a](const PathImpl& h)
-    {
-        a += ClipperLib::Area(h);
-    });
-
-    return ClipperLib::Area(sh.Contour) + a;
+inline double area<Orientation::CLOCKWISE>(const PolygonImpl& sh) {
+    return -area<Orientation::COUNTER_CLOCKWISE>(sh);
 }
 
 }
@@ -228,9 +150,10 @@ template<> inline void offset(PolygonImpl& sh, TCoord<PointImpl> distance)
             // but throwing would be an overkill. Instead, we should warn the
             // caller about the inability to create correct geometries
             if(!found_the_contour) {
-                sh.Contour = r;
+                sh.Contour = std::move(r);
                 ClipperLib::ReversePath(sh.Contour);
-                sh.Contour.push_back(sh.Contour.front());
+                auto front_p = sh.Contour.front();
+                sh.Contour.emplace_back(std::move(front_p));
                 found_the_contour = true;
             } else {
                 dout() << "Warning: offsetting result is invalid!";
@@ -240,9 +163,10 @@ template<> inline void offset(PolygonImpl& sh, TCoord<PointImpl> distance)
             // TODO If there are multiple contours we can't be sure which hole
             // belongs to the first contour. (But in this case the situation is
             // bad enough to let it go...)
-            sh.Holes.push_back(r);
+            sh.Holes.emplace_back(std::move(r));
             ClipperLib::ReversePath(sh.Holes.back());
-            sh.Holes.back().push_back(sh.Holes.back().front());
+            auto front_p = sh.Holes.back().front();
+            sh.Holes.back().emplace_back(std::move(front_p));
         }
     }
 }
@@ -390,34 +314,53 @@ inline void rotate(PolygonImpl& sh, const Radians& rads)
 } // namespace shapelike
 
 #define DISABLE_BOOST_NFP_MERGE
-inline std::vector<PolygonImpl> _merge(ClipperLib::Clipper& clipper) {
+inline std::vector<PolygonImpl> clipper_execute(
+        ClipperLib::Clipper& clipper,
+        ClipperLib::ClipType clipType,
+        ClipperLib::PolyFillType subjFillType = ClipperLib::pftEvenOdd,
+        ClipperLib::PolyFillType clipFillType = ClipperLib::pftEvenOdd)
+{
     shapelike::Shapes<PolygonImpl> retv;
 
     ClipperLib::PolyTree result;
-    clipper.Execute(ClipperLib::ctUnion, result, ClipperLib::pftNegative);
+    clipper.Execute(clipType, result, subjFillType, clipFillType);
+
     retv.reserve(static_cast<size_t>(result.Total()));
 
     std::function<void(ClipperLib::PolyNode*, PolygonImpl&)> processHole;
 
     auto processPoly = [&retv, &processHole](ClipperLib::PolyNode *pptr) {
-        PolygonImpl poly(pptr->Contour);
-        poly.Contour.push_back(poly.Contour.front());
+        PolygonImpl poly;
+        poly.Contour.swap(pptr->Contour);
+
+        assert(!pptr->IsHole());
+
+        if(pptr->IsOpen()) {
+            auto front_p = poly.Contour.front();
+            poly.Contour.emplace_back(front_p);
+        }
+
         for(auto h : pptr->Childs) { processHole(h, poly); }
         retv.push_back(poly);
     };
 
     processHole = [&processPoly](ClipperLib::PolyNode *pptr, PolygonImpl& poly)
     {
-        poly.Holes.push_back(pptr->Contour);
-        poly.Holes.back().push_back(poly.Holes.back().front());
+        poly.Holes.emplace_back(std::move(pptr->Contour));
+
+        assert(pptr->IsHole());
+
+        if(pptr->IsOpen()) {
+            auto front_p = poly.Holes.back().front();
+            poly.Holes.back().emplace_back(front_p);
+        }
+
         for(auto c : pptr->Childs) processPoly(c);
     };
 
     auto traverse = [&processPoly] (ClipperLib::PolyNode *node)
     {
-        for(auto ch : node->Childs) {
-            processPoly(ch);
-        }
+        for(auto ch : node->Childs) processPoly(ch);
     };
 
     traverse(&result);
@@ -438,14 +381,13 @@ merge(const std::vector<PolygonImpl>& shapes)
     for(auto& path : shapes) {
         valid &= clipper.AddPath(path.Contour, ClipperLib::ptSubject, closed);
 
-        for(auto& hole : path.Holes) {
-            valid &= clipper.AddPath(hole, ClipperLib::ptSubject, closed);
-        }
+        for(auto& h : path.Holes)
+            valid &= clipper.AddPath(h, ClipperLib::ptSubject, closed);
     }
 
     if(!valid) throw GeometryException(GeomErr::MERGE);
 
-    return _merge(clipper);
+    return clipper_execute(clipper, ClipperLib::ctUnion, ClipperLib::pftNegative);
 }
 
 }
diff --git a/src/libnest2d/include/libnest2d/libnest2d.hpp b/src/libnest2d/include/libnest2d/libnest2d.hpp
index 49baa65f2..c7b252e5d 100644
--- a/src/libnest2d/include/libnest2d/libnest2d.hpp
+++ b/src/libnest2d/include/libnest2d/libnest2d.hpp
@@ -966,7 +966,7 @@ private:
 
         for(size_t i = 0; i < pckgrp.size(); i++) {
             auto items = pckgrp[i];
-            pg.push_back({});
+            pg.emplace_back();
             pg[i].reserve(items.size());
 
             for(Item& itemA : items) {
diff --git a/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp b/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp
index 6fb717a7a..91affe978 100644
--- a/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp
+++ b/src/libnest2d/include/libnest2d/placers/nfpplacer.hpp
@@ -261,7 +261,7 @@ template<class RawShape> class EdgeCache {
             while(next != endit) {
                 contour_.emap.emplace_back(*(first++), *(next++));
                 contour_.full_distance += contour_.emap.back().length();
-                contour_.distances.push_back(contour_.full_distance);
+                contour_.distances.emplace_back(contour_.full_distance);
             }
         }
 
@@ -276,10 +276,10 @@ template<class RawShape> class EdgeCache {
             while(next != endit) {
                 hc.emap.emplace_back(*(first++), *(next++));
                 hc.full_distance += hc.emap.back().length();
-                hc.distances.push_back(hc.full_distance);
+                hc.distances.emplace_back(hc.full_distance);
             }
 
-            holes_.push_back(hc);
+            holes_.emplace_back(std::move(hc));
         }
     }
 
diff --git a/src/libnest2d/include/libnest2d/placers/placer_boilerplate.hpp b/src/libnest2d/include/libnest2d/placers/placer_boilerplate.hpp
index 309a5007d..abcd86183 100644
--- a/src/libnest2d/include/libnest2d/placers/placer_boilerplate.hpp
+++ b/src/libnest2d/include/libnest2d/placers/placer_boilerplate.hpp
@@ -63,7 +63,7 @@ public:
     bool pack(Item& item, const Range& rem = Range()) {
         auto&& r = static_cast<Subclass*>(this)->trypack(item, rem);
         if(r) {
-            items_.push_back(*(r.item_ptr_));
+            items_.emplace_back(*(r.item_ptr_));
             farea_valid_ = false;
         }
         return r;
@@ -78,7 +78,7 @@ public:
         if(r) {
             r.item_ptr_->translation(r.move_);
             r.item_ptr_->rotation(r.rot_);
-            items_.push_back(*(r.item_ptr_));
+            items_.emplace_back(*(r.item_ptr_));
             farea_valid_ = false;
         }
     }
diff --git a/src/libnest2d/include/libnest2d/selections/djd_heuristic.hpp b/src/libnest2d/include/libnest2d/selections/djd_heuristic.hpp
index b03534dc4..25007e580 100644
--- a/src/libnest2d/include/libnest2d/selections/djd_heuristic.hpp
+++ b/src/libnest2d/include/libnest2d/selections/djd_heuristic.hpp
@@ -667,7 +667,7 @@ public:
                 addBin();
                 ItemList& not_packed = not_packeds[b];
                 for(unsigned idx = b; idx < store_.size(); idx+=bincount_guess) {
-                    not_packed.push_back(store_[idx]);
+                    not_packed.emplace_back(store_[idx]);
                 }
             }
 
diff --git a/src/libnest2d/include/libnest2d/utils/boost_alg.hpp b/src/libnest2d/include/libnest2d/utils/boost_alg.hpp
index a6988ca00..baf1c6a10 100644
--- a/src/libnest2d/include/libnest2d/utils/boost_alg.hpp
+++ b/src/libnest2d/include/libnest2d/utils/boost_alg.hpp
@@ -463,7 +463,7 @@ template<> inline std::string serialize<libnest2d::Formats::SVG>(
             auto& v = *it;
             hf.emplace_back(getX(v)*scale, getY(v)*scale);
         };
-        holes.push_back(hf);
+        holes.emplace_back(std::move(hf));
     }
 
     Polygonf poly;
diff --git a/src/libnest2d/tests/printer_parts.h b/src/libnest2d/tests/printer_parts.h
index b9a4eb8fa..1e65826bd 100644
--- a/src/libnest2d/tests/printer_parts.h
+++ b/src/libnest2d/tests/printer_parts.h
@@ -2,36 +2,10 @@
 #define PRINTER_PARTS_H
 
 #include <vector>
-#include <clipper.hpp>
-
-#ifndef CLIPPER_BACKEND_HPP
-namespace ClipperLib {
-using PointImpl = IntPoint;
-using PathImpl = Path;
-using HoleStore = std::vector<PathImpl>;
-
-struct PolygonImpl {
-    PathImpl Contour;
-    HoleStore Holes;
-
-    inline PolygonImpl() {}
-
-    inline explicit PolygonImpl(const PathImpl& cont): Contour(cont) {}
-    inline explicit PolygonImpl(const HoleStore& holes):
-        Holes(holes) {}
-    inline PolygonImpl(const Path& cont, const HoleStore& holes):
-        Contour(cont), Holes(holes) {}
-
-    inline explicit PolygonImpl(PathImpl&& cont): Contour(std::move(cont)) {}
-    inline explicit PolygonImpl(HoleStore&& holes): Holes(std::move(holes)) {}
-    inline PolygonImpl(Path&& cont, HoleStore&& holes):
-        Contour(std::move(cont)), Holes(std::move(holes)) {}
-};
-}
-#endif
+#include <libnest2d/backends/clipper/clipper_polygon.hpp>
 
 using TestData = std::vector<ClipperLib::Path>;
-using TestDataEx = std::vector<ClipperLib::PolygonImpl>;
+using TestDataEx = std::vector<ClipperLib::Polygon>;
 
 extern const TestData PRINTER_PART_POLYGONS;
 extern const TestData STEGOSAUR_POLYGONS;
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 7c248b095..b3e8f3500 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -165,6 +165,8 @@ add_library(libslic3r STATIC
     utils.cpp
     Utils.hpp
     MTUtils.hpp
+    Zipper.hpp
+    Zipper.cpp
     SLA/SLABoilerPlate.hpp
     SLA/SLABasePool.hpp
     SLA/SLABasePool.cpp
@@ -181,8 +183,8 @@ if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
     add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
 endif ()
 
-target_compile_definitions(libslic3r PUBLIC -DUSE_TBB ${PNG_DEFINITIONS})
-target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LIBNEST2D_INCLUDES} ${PNG_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+target_compile_definitions(libslic3r PUBLIC -DUSE_TBB)
+target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LIBNEST2D_INCLUDES} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(libslic3r
     libnest2d
     admesh
@@ -191,8 +193,6 @@ target_link_libraries(libslic3r
     clipper
     nowide
     ${EXPAT_LIBRARIES}
-    ${GLEW_LIBRARIES}
-    ${PNG_LIBRARIES}
     glu-libtess
     polypartition
     poly2tri
diff --git a/src/libslic3r/ClipperUtils.cpp b/src/libslic3r/ClipperUtils.cpp
index 9c685b0c3..649d52c0d 100644
--- a/src/libslic3r/ClipperUtils.cpp
+++ b/src/libslic3r/ClipperUtils.cpp
@@ -120,7 +120,7 @@ Slic3r::Polygon ClipperPath_to_Slic3rPolygon(const ClipperLib::Path &input)
 {
     Polygon retval;
     for (ClipperLib::Path::const_iterator pit = input.begin(); pit != input.end(); ++pit)
-        retval.points.push_back(Point( (*pit).X, (*pit).Y ));
+        retval.points.emplace_back(pit->X, pit->Y);
     return retval;
 }
 
@@ -128,7 +128,7 @@ Slic3r::Polyline ClipperPath_to_Slic3rPolyline(const ClipperLib::Path &input)
 {
     Polyline retval;
     for (ClipperLib::Path::const_iterator pit = input.begin(); pit != input.end(); ++pit)
-        retval.points.push_back(Point( (*pit).X, (*pit).Y ));
+        retval.points.emplace_back(pit->X, pit->Y);
     return retval;
 }
 
@@ -137,7 +137,7 @@ Slic3r::Polygons ClipperPaths_to_Slic3rPolygons(const ClipperLib::Paths &input)
     Slic3r::Polygons retval;
     retval.reserve(input.size());
     for (ClipperLib::Paths::const_iterator it = input.begin(); it != input.end(); ++it)
-        retval.push_back(ClipperPath_to_Slic3rPolygon(*it));
+        retval.emplace_back(ClipperPath_to_Slic3rPolygon(*it));
     return retval;
 }
 
@@ -146,7 +146,7 @@ Slic3r::Polylines ClipperPaths_to_Slic3rPolylines(const ClipperLib::Paths &input
     Slic3r::Polylines retval;
     retval.reserve(input.size());
     for (ClipperLib::Paths::const_iterator it = input.begin(); it != input.end(); ++it)
-        retval.push_back(ClipperPath_to_Slic3rPolyline(*it));
+        retval.emplace_back(ClipperPath_to_Slic3rPolyline(*it));
     return retval;
 }
 
@@ -171,7 +171,7 @@ Slic3rMultiPoint_to_ClipperPath(const MultiPoint &input)
 {
     ClipperLib::Path retval;
     for (Points::const_iterator pit = input.points.begin(); pit != input.points.end(); ++pit)
-        retval.push_back(ClipperLib::IntPoint( (*pit)(0), (*pit)(1) ));
+        retval.emplace_back((*pit)(0), (*pit)(1));
     return retval;
 }
 
@@ -181,7 +181,7 @@ Slic3rMultiPoint_to_ClipperPath_reversed(const Slic3r::MultiPoint &input)
     ClipperLib::Path output;
     output.reserve(input.points.size());
     for (Slic3r::Points::const_reverse_iterator pit = input.points.rbegin(); pit != input.points.rend(); ++pit)
-        output.push_back(ClipperLib::IntPoint( (*pit)(0), (*pit)(1) ));
+        output.emplace_back((*pit)(0), (*pit)(1));
     return output;
 }
 
@@ -189,7 +189,7 @@ ClipperLib::Paths Slic3rMultiPoints_to_ClipperPaths(const Polygons &input)
 {
     ClipperLib::Paths retval;
     for (Polygons::const_iterator it = input.begin(); it != input.end(); ++it)
-        retval.push_back(Slic3rMultiPoint_to_ClipperPath(*it));
+        retval.emplace_back(Slic3rMultiPoint_to_ClipperPath(*it));
     return retval;
 }
 
@@ -197,7 +197,7 @@ ClipperLib::Paths Slic3rMultiPoints_to_ClipperPaths(const Polylines &input)
 {
     ClipperLib::Paths retval;
     for (Polylines::const_iterator it = input.begin(); it != input.end(); ++it)
-        retval.push_back(Slic3rMultiPoint_to_ClipperPath(*it));
+        retval.emplace_back(Slic3rMultiPoint_to_ClipperPath(*it));
     return retval;
 }
 
@@ -226,7 +226,7 @@ ClipperLib::Paths _offset(ClipperLib::Paths &&input, ClipperLib::EndType endType
 ClipperLib::Paths _offset(ClipperLib::Path &&input, ClipperLib::EndType endType, const double delta, ClipperLib::JoinType joinType, double miterLimit)
 {
     ClipperLib::Paths paths;
-    paths.push_back(std::move(input));
+    paths.emplace_back(std::move(input));
 	return _offset(std::move(paths), endType, delta, joinType, miterLimit);
 }
 
@@ -585,7 +585,7 @@ Polylines _clipper_pl(ClipperLib::ClipType clipType, const Polygons &subject, co
     Polylines polylines;
     polylines.reserve(subject.size());
     for (Polygons::const_iterator polygon = subject.begin(); polygon != subject.end(); ++polygon)
-        polylines.push_back(*polygon);  // implicit call to split_at_first_point()
+        polylines.emplace_back(polygon->operator Polyline());  // implicit call to split_at_first_point()
     
     // perform clipping
     Polylines retval = _clipper_pl(clipType, polylines, clip, safety_offset_);
@@ -643,7 +643,7 @@ _clipper_ln(ClipperLib::ClipType clipType, const Lines &subject, const Polygons
     // convert Polylines to Lines
     Lines retval;
     for (Polylines::const_iterator polyline = polylines.begin(); polyline != polylines.end(); ++polyline)
-        retval.push_back(*polyline);
+        retval.emplace_back(polyline->operator Line());
     return retval;
 }
 
@@ -673,7 +673,7 @@ void traverse_pt(ClipperLib::PolyNodes &nodes, Polygons* retval)
     ordering_points.reserve(nodes.size());
     for (ClipperLib::PolyNodes::const_iterator it = nodes.begin(); it != nodes.end(); ++it) {
         Point p((*it)->Contour.front().X, (*it)->Contour.front().Y);
-        ordering_points.push_back(p);
+        ordering_points.emplace_back(p);
     }
     
     // perform the ordering
@@ -684,7 +684,7 @@ void traverse_pt(ClipperLib::PolyNodes &nodes, Polygons* retval)
     for (ClipperLib::PolyNodes::iterator it = ordered_nodes.begin(); it != ordered_nodes.end(); ++it) {
         // traverse the next depth
         traverse_pt((*it)->Childs, retval);
-        retval->push_back(ClipperPath_to_Slic3rPolygon((*it)->Contour));
+        retval->emplace_back(ClipperPath_to_Slic3rPolygon((*it)->Contour));
         if ((*it)->IsHole()) retval->back().reverse();  // ccw
     }
 }
@@ -791,8 +791,8 @@ Polygons top_level_islands(const Slic3r::Polygons &polygons)
     Polygons out;
     out.reserve(polytree.ChildCount());
     for (int i = 0; i < polytree.ChildCount(); ++i)
-        out.push_back(ClipperPath_to_Slic3rPolygon(polytree.Childs[i]->Contour));
+        out.emplace_back(ClipperPath_to_Slic3rPolygon(polytree.Childs[i]->Contour));
     return out;
 }
 
-}
\ No newline at end of file
+}
diff --git a/src/libslic3r/ClipperUtils.hpp b/src/libslic3r/ClipperUtils.hpp
index cf06f1b5f..4c8742279 100644
--- a/src/libslic3r/ClipperUtils.hpp
+++ b/src/libslic3r/ClipperUtils.hpp
@@ -28,8 +28,8 @@ namespace Slic3r {
 
 //-----------------------------------------------------------
 // legacy code from Clipper documentation
-void AddOuterPolyNodeToExPolygons(ClipperLib::PolyNode& polynode, Slic3r::ExPolygons& expolygons);
-void PolyTreeToExPolygons(ClipperLib::PolyTree& polytree, Slic3r::ExPolygons& expolygons);
+void AddOuterPolyNodeToExPolygons(ClipperLib::PolyNode& polynode, Slic3r::ExPolygons *expolygons);
+Slic3r::ExPolygons PolyTreeToExPolygons(ClipperLib::PolyTree& polytree);
 //-----------------------------------------------------------
 
 ClipperLib::Path   Slic3rMultiPoint_to_ClipperPath(const Slic3r::MultiPoint &input);
@@ -236,4 +236,4 @@ Polygons top_level_islands(const Slic3r::Polygons &polygons);
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp
index 968bcd474..94aa57533 100644
--- a/src/libslic3r/Config.cpp
+++ b/src/libslic3r/Config.cpp
@@ -280,7 +280,7 @@ std::ostream& ConfigDef::print_cli_help(std::ostream& out, bool show_defaults, s
             
             // right: option description
             std::string descr = def.tooltip;
-            if (show_defaults && def.default_value != nullptr && def.type != coBool
+            if (show_defaults && def.default_value && def.type != coBool
                 && (def.type != coString || !def.default_value->serialize().empty())) {
                 descr += " (";
                 if (!def.sidetext.empty()) {
@@ -653,7 +653,7 @@ ConfigOption* DynamicConfig::optptr(const t_config_option_key &opt_key, bool cre
         // Let the parent decide what to do if the opt_key is not defined by this->def().
         return nullptr;
     ConfigOption *opt = nullptr;
-    if (optdef->default_value != nullptr) {
+    if (optdef->default_value) {
         opt = (optdef->default_value->type() == coEnum) ?
             // Special case: For a DynamicConfig, convert a templated enum to a generic enum.
             new ConfigOptionEnumGeneric(optdef->enum_keys_map, optdef->default_value->getInt()) :
@@ -809,8 +809,8 @@ void StaticConfig::set_defaults()
         for (const std::string &key : this->keys()) {
             const ConfigOptionDef   *def = defs->get(key);
             ConfigOption            *opt = this->option(key);
-            if (def != nullptr && opt != nullptr && def->default_value != nullptr)
-                opt->set(def->default_value);
+            if (def != nullptr && opt != nullptr && def->default_value)
+                opt->set(def->default_value.get());
         }
     }
 }
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index 3505b7ef4..5835a7b07 100644
--- a/src/libslic3r/Config.hpp
+++ b/src/libslic3r/Config.hpp
@@ -12,6 +12,7 @@
 #include <string>
 #include <vector>
 #include "libslic3r.h"
+#include "clonable_ptr.hpp"
 #include "Point.hpp"
 
 #include <boost/format.hpp>
@@ -1031,7 +1032,10 @@ public:
     // What type? bool, int, string etc.
     ConfigOptionType                    type            = coNone;
     // Default value of this option. The default value object is owned by ConfigDef, it is released in its destructor.
-    const ConfigOption                 *default_value   = nullptr;
+    Slic3r::clonable_ptr<const ConfigOption> default_value;
+    void set_default_value(const ConfigOption* ptr) { this->default_value = Slic3r::clonable_ptr<const ConfigOption>(ptr); }
+    template<typename T>
+    const T* get_default_value() const { return static_cast<const T*>(this->default_value.get()); }
 
     // Usually empty. 
     // Special values - "i_enum_open", "f_enum_open" to provide combo box for int or float selection,
@@ -1120,12 +1124,6 @@ typedef std::map<t_config_option_key, ConfigOptionDef> t_optiondef_map;
 class ConfigDef
 {
 public:
-	~ConfigDef() { 
-		for (std::pair<const t_config_option_key, ConfigOptionDef> &def : this->options) 
-			delete def.second.default_value;
-        this->options.clear();
-	}
-
     t_optiondef_map         options;
 
     bool                    has(const t_config_option_key &opt_key) const { return this->options.count(opt_key) > 0; }
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 72e8616e5..f733dee21 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -173,7 +173,7 @@ std::string WipeTowerIntegration::append_tcr(GCode &gcodegen, const WipeTower::T
 
     // Toolchangeresult.gcode assumes the wipe tower corner is at the origin
     // We want to rotate and shift all extrusions (gcode postprocessing) and starting and ending position
-    float alpha = m_wipe_tower_rotation/180.f * M_PI;
+    float alpha = m_wipe_tower_rotation/180.f * float(M_PI);
     WipeTower::xy start_pos = tcr.start_pos;
     WipeTower::xy end_pos = tcr.end_pos;
     start_pos.rotate(alpha);
@@ -184,7 +184,7 @@ std::string WipeTowerIntegration::append_tcr(GCode &gcodegen, const WipeTower::T
     
 
     // Disable linear advance for the wipe tower operations.
-    gcode += "M900 K0\n";
+    gcode += (gcodegen.config().gcode_flavor == gcfRepRap ? std::string("M572 D0 S0\n") : std::string("M900 K0\n"));
     // Move over the wipe tower.
     // Retract for a tool change, using the toolchange retract value and setting the priming extra length.
     gcode += gcodegen.retract(true);
@@ -201,12 +201,13 @@ std::string WipeTowerIntegration::append_tcr(GCode &gcodegen, const WipeTower::T
     // Let the m_writer know the current extruder_id, but ignore the generated G-code.
 	if (new_extruder_id >= 0 && gcodegen.writer().need_toolchange(new_extruder_id))
         gcodegen.writer().toolchange(new_extruder_id);
+    gcodegen.placeholder_parser().set("current_extruder", new_extruder_id);
+
     // Always append the filament start G-code even if the extruder did not switch,
     // because the wipe tower resets the linear advance and we want it to be re-enabled.
     const std::string &start_filament_gcode = gcodegen.config().start_filament_gcode.get_at(new_extruder_id);
     if (! start_filament_gcode.empty()) {
         // Process the start_filament_gcode for the active filament only.
-        gcodegen.placeholder_parser().set("current_extruder", new_extruder_id);
         DynamicConfig config;
         config.set_key_value("filament_extruder_id", new ConfigOptionInt(new_extruder_id));
         gcode += gcodegen.placeholder_parser_process("start_filament_gcode", start_filament_gcode, new_extruder_id, &config);
@@ -289,7 +290,7 @@ std::string WipeTowerIntegration::prime(GCode &gcodegen)
 
     if (&m_priming != nullptr && ! m_priming.extrusions.empty()) {
         // Disable linear advance for the wipe tower operations.
-        gcode += "M900 K0\n";
+        gcode += (gcodegen.config().gcode_flavor == gcfRepRap ? std::string("M572 D0 S0\n") : std::string("M900 K0\n"));
         // Let the tool change be executed by the wipe tower class.
         // Inform the G-code writer about the changes done behind its back.
         gcode += m_priming.gcode;
@@ -519,43 +520,43 @@ void GCode::_do_export(Print &print, FILE *file)
     // this->print_machine_envelope(file, print);
     // shall be adjusted as well to produce a G-code block compatible with the particular firmware flavor.
     if (print.config().gcode_flavor.value == gcfMarlin) {
-        m_normal_time_estimator.set_max_acceleration(print.config().machine_max_acceleration_extruding.values[0]);
-        m_normal_time_estimator.set_retract_acceleration(print.config().machine_max_acceleration_retracting.values[0]);
-        m_normal_time_estimator.set_minimum_feedrate(print.config().machine_min_extruding_rate.values[0]);
-        m_normal_time_estimator.set_minimum_travel_feedrate(print.config().machine_min_travel_rate.values[0]);
-        m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::X, print.config().machine_max_acceleration_x.values[0]);
-        m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Y, print.config().machine_max_acceleration_y.values[0]);
-        m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Z, print.config().machine_max_acceleration_z.values[0]);
-        m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::E, print.config().machine_max_acceleration_e.values[0]);
-        m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::X, print.config().machine_max_feedrate_x.values[0]);
-        m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Y, print.config().machine_max_feedrate_y.values[0]);
-        m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Z, print.config().machine_max_feedrate_z.values[0]);
-        m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::E, print.config().machine_max_feedrate_e.values[0]);
-        m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::X, print.config().machine_max_jerk_x.values[0]);
-        m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Y, print.config().machine_max_jerk_y.values[0]);
-        m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Z, print.config().machine_max_jerk_z.values[0]);
-        m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::E, print.config().machine_max_jerk_e.values[0]);
+        m_normal_time_estimator.set_max_acceleration((float)print.config().machine_max_acceleration_extruding.values[0]);
+		m_normal_time_estimator.set_retract_acceleration((float)print.config().machine_max_acceleration_retracting.values[0]);
+		m_normal_time_estimator.set_minimum_feedrate((float)print.config().machine_min_extruding_rate.values[0]);
+		m_normal_time_estimator.set_minimum_travel_feedrate((float)print.config().machine_min_travel_rate.values[0]);
+		m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::X, (float)print.config().machine_max_acceleration_x.values[0]);
+		m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Y, (float)print.config().machine_max_acceleration_y.values[0]);
+		m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Z, (float)print.config().machine_max_acceleration_z.values[0]);
+		m_normal_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::E, (float)print.config().machine_max_acceleration_e.values[0]);
+		m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::X, (float)print.config().machine_max_feedrate_x.values[0]);
+		m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Y, (float)print.config().machine_max_feedrate_y.values[0]);
+		m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Z, (float)print.config().machine_max_feedrate_z.values[0]);
+		m_normal_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::E, (float)print.config().machine_max_feedrate_e.values[0]);
+		m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::X, (float)print.config().machine_max_jerk_x.values[0]);
+		m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Y, (float)print.config().machine_max_jerk_y.values[0]);
+		m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Z, (float)print.config().machine_max_jerk_z.values[0]);
+		m_normal_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::E, (float)print.config().machine_max_jerk_e.values[0]);
 
         if (m_silent_time_estimator_enabled && print.config().machine_max_acceleration_extruding.values.size() > 1)
         {
             m_silent_time_estimator.reset();
             m_silent_time_estimator.set_dialect(print.config().gcode_flavor);
-            m_silent_time_estimator.set_max_acceleration(print.config().machine_max_acceleration_extruding.values[1]);
-            m_silent_time_estimator.set_retract_acceleration(print.config().machine_max_acceleration_retracting.values[1]);
-            m_silent_time_estimator.set_minimum_feedrate(print.config().machine_min_extruding_rate.values[1]);
-            m_silent_time_estimator.set_minimum_travel_feedrate(print.config().machine_min_travel_rate.values[1]);
-            m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::X, print.config().machine_max_acceleration_x.values[1]);
-            m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Y, print.config().machine_max_acceleration_y.values[1]);
-            m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Z, print.config().machine_max_acceleration_z.values[1]);
-            m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::E, print.config().machine_max_acceleration_e.values[1]);
-            m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::X, print.config().machine_max_feedrate_x.values[1]);
-            m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Y, print.config().machine_max_feedrate_y.values[1]);
-            m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Z, print.config().machine_max_feedrate_z.values[1]);
-            m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::E, print.config().machine_max_feedrate_e.values[1]);
-            m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::X, print.config().machine_max_jerk_x.values[1]);
-            m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Y, print.config().machine_max_jerk_y.values[1]);
-            m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Z, print.config().machine_max_jerk_z.values[1]);
-            m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::E, print.config().machine_max_jerk_e.values[1]);
+			m_silent_time_estimator.set_max_acceleration((float)print.config().machine_max_acceleration_extruding.values[1]);
+			m_silent_time_estimator.set_retract_acceleration((float)print.config().machine_max_acceleration_retracting.values[1]);
+			m_silent_time_estimator.set_minimum_feedrate((float)print.config().machine_min_extruding_rate.values[1]);
+			m_silent_time_estimator.set_minimum_travel_feedrate((float)print.config().machine_min_travel_rate.values[1]);
+			m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::X, (float)print.config().machine_max_acceleration_x.values[1]);
+			m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Y, (float)print.config().machine_max_acceleration_y.values[1]);
+			m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::Z, (float)print.config().machine_max_acceleration_z.values[1]);
+			m_silent_time_estimator.set_axis_max_acceleration(GCodeTimeEstimator::E, (float)print.config().machine_max_acceleration_e.values[1]);
+			m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::X, (float)print.config().machine_max_feedrate_x.values[1]);
+			m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Y, (float)print.config().machine_max_feedrate_y.values[1]);
+			m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::Z, (float)print.config().machine_max_feedrate_z.values[1]);
+			m_silent_time_estimator.set_axis_max_feedrate(GCodeTimeEstimator::E, (float)print.config().machine_max_feedrate_e.values[1]);
+			m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::X, (float)print.config().machine_max_jerk_x.values[1]);
+			m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Y, (float)print.config().machine_max_jerk_y.values[1]);
+			m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::Z, (float)print.config().machine_max_jerk_z.values[1]);
+			m_silent_time_estimator.set_axis_max_jerk(GCodeTimeEstimator::E, (float)print.config().machine_max_jerk_e.values[1]);
             if (print.config().single_extruder_multi_material) {
                 // As of now the fields are shown at the UI dialog in the same combo box as the ramming values, so they
                 // are considered to be active for the single extruder multi-material printers only.
@@ -1051,6 +1052,15 @@ void GCode::_do_export(Print &print, FILE *file)
     }
     _write(file, m_writer.update_progress(m_layer_count, m_layer_count, true)); // 100%
     _write(file, m_writer.postamble());
+
+    // adds tags for time estimators
+    if (print.config().remaining_times.value)
+    {
+        _writeln(file, GCodeTimeEstimator::Normal_Last_M73_Output_Placeholder_Tag);
+        if (m_silent_time_estimator_enabled)
+            _writeln(file, GCodeTimeEstimator::Silent_Last_M73_Output_Placeholder_Tag);
+    }
+
     print.throw_if_canceled();
 
     // calculates estimated printing time
@@ -1062,26 +1072,54 @@ void GCode::_do_export(Print &print, FILE *file)
     print.m_print_statistics.clear();
     print.m_print_statistics.estimated_normal_print_time = m_normal_time_estimator.get_time_dhms();
     print.m_print_statistics.estimated_silent_print_time = m_silent_time_estimator_enabled ? m_silent_time_estimator.get_time_dhms() : "N/A";
-    for (const Extruder &extruder : m_writer.extruders()) {
-        double used_filament   = extruder.used_filament() + (has_wipe_tower ? print.wipe_tower_data().used_filament[extruder.id()] : 0.f);
-        double extruded_volume = extruder.extruded_volume() + (has_wipe_tower ? print.wipe_tower_data().used_filament[extruder.id()] * 2.4052f : 0.f); // assumes 1.75mm filament diameter
-        double filament_weight = extruded_volume * extruder.filament_density() * 0.001;
-        double filament_cost   = filament_weight * extruder.filament_cost()    * 0.001;
-        print.m_print_statistics.filament_stats.insert(std::pair<size_t, float>(extruder.id(), (float)used_filament));
-        _write_format(file, "; filament used = %.1lfmm (%.1lfcm3)\n", used_filament, extruded_volume * 0.001);
-        if (filament_weight > 0.) {
-            print.m_print_statistics.total_weight = print.m_print_statistics.total_weight + filament_weight;
-            _write_format(file, "; filament used = %.1lf\n", filament_weight);
-            if (filament_cost > 0.) {
-                print.m_print_statistics.total_cost = print.m_print_statistics.total_cost + filament_cost;
-                _write_format(file, "; filament cost = %.1lf\n", filament_cost);
+    std::vector<Extruder> extruders = m_writer.extruders();
+    if (! extruders.empty()) {
+        std::pair<std::string, unsigned int> out_filament_used_mm ("; filament used [mm] = ", 0);
+        std::pair<std::string, unsigned int> out_filament_used_cm3("; filament used [cm3] = ", 0);
+        std::pair<std::string, unsigned int> out_filament_used_g  ("; filament used [g] = ", 0);
+        std::pair<std::string, unsigned int> out_filament_cost    ("; filament cost = ", 0);
+        for (const Extruder &extruder : extruders) {
+            double used_filament   = extruder.used_filament() + (has_wipe_tower ? print.wipe_tower_data().used_filament[extruder.id()] : 0.f);
+            double extruded_volume = extruder.extruded_volume() + (has_wipe_tower ? print.wipe_tower_data().used_filament[extruder.id()] * 2.4052f : 0.f); // assumes 1.75mm filament diameter
+            double filament_weight = extruded_volume * extruder.filament_density() * 0.001;
+            double filament_cost   = filament_weight * extruder.filament_cost()    * 0.001;
+            auto append = [&extruder, &extruders](std::pair<std::string, unsigned int> &dst, const char *tmpl, double value) {
+                while (dst.second < extruder.id()) {
+                    // Fill in the non-printing extruders with zeros.
+                    dst.first += (dst.second > 0) ? ", 0" : "0";
+                    ++ dst.second;
+                }
+                if (dst.second > 0)
+                    dst.first += ", ";
+                char buf[64];
+				sprintf(buf, tmpl, value);
+                dst.first += buf;
+                ++ dst.second;
+            };
+            print.m_print_statistics.filament_stats.insert(std::pair<size_t, float>(extruder.id(), (float)used_filament));
+            append(out_filament_used_mm,  "%.1lf", used_filament);
+            append(out_filament_used_cm3, "%.1lf", extruded_volume * 0.001);
+            if (filament_weight > 0.) {
+                print.m_print_statistics.total_weight = print.m_print_statistics.total_weight + filament_weight;
+                append(out_filament_used_g, "%.1lf", filament_weight);
+                if (filament_cost > 0.) {
+                    print.m_print_statistics.total_cost = print.m_print_statistics.total_cost + filament_cost;
+                    append(out_filament_cost, "%.1lf", filament_cost);
+                }
             }
+            print.m_print_statistics.total_used_filament += used_filament;
+            print.m_print_statistics.total_extruded_volume += extruded_volume;
+            print.m_print_statistics.total_wipe_tower_filament += has_wipe_tower ? used_filament - extruder.used_filament() : 0.;
+            print.m_print_statistics.total_wipe_tower_cost += has_wipe_tower ? (extruded_volume - extruder.extruded_volume())* extruder.filament_density() * 0.001 * extruder.filament_cost() * 0.001 : 0.;
         }
-        print.m_print_statistics.total_used_filament += used_filament;
-        print.m_print_statistics.total_extruded_volume += extruded_volume;
-        print.m_print_statistics.total_wipe_tower_filament += has_wipe_tower ? used_filament - extruder.used_filament() : 0.;
-        print.m_print_statistics.total_wipe_tower_cost += has_wipe_tower ? (extruded_volume - extruder.extruded_volume())* extruder.filament_density() * 0.001 * extruder.filament_cost() * 0.001 : 0.;
+        _writeln(file, out_filament_used_mm.first);
+		_writeln(file, out_filament_used_cm3.first);
+		if (out_filament_used_g.second)
+			_writeln(file, out_filament_used_g.first);
+		if (out_filament_cost.second)
+			_writeln(file, out_filament_cost.first);
     }
+    _write_format(file, "; total filament used [g] = %.1lf\n", print.m_print_statistics.total_weight);
     _write_format(file, "; total filament cost = %.1lf\n", print.m_print_statistics.total_cost);
     _write_format(file, "; estimated printing time (normal mode) = %s\n", m_normal_time_estimator.get_time_dhms().c_str());
     if (m_silent_time_estimator_enabled)
@@ -1536,7 +1574,7 @@ void GCode::process_layer(
                             std::max<int>(region.config().perimeter_extruder.value - 1, 0);
 
                         // Let's recover vector of extruder overrides:
-                        const ExtruderPerCopy* entity_overrides = const_cast<LayerTools&>(layer_tools).wiping_extrusions().get_extruder_overrides(fill, correct_extruder_id, layer_to_print.object()->copies().size());
+                        const ExtruderPerCopy* entity_overrides = const_cast<LayerTools&>(layer_tools).wiping_extrusions().get_extruder_overrides(fill, correct_extruder_id, (int)layer_to_print.object()->copies().size());
 
                         // Now we must add this extrusion into the by_extruder map, once for each extruder that will print it:
                         for (unsigned int extruder : layer_tools.extruders)
@@ -2584,9 +2622,12 @@ std::string GCode::_extrude(const ExtrusionPath &path, const std::string &descri
     return gcode;
 }
 
-std::string GCode::_before_extrude(const ExtrusionPath &path, const std::string &description, double speed) {
+std::string GCode::_before_extrude(const ExtrusionPath &path, const std::string &description_in, double speed) {
     std::string gcode;
-
+    std::string description{ description_in };
+    if (is_bridge(path.role()))
+        description += " (bridge)";
+    
     // go to first point of extrusion path
     if (!m_last_pos_defined || m_last_pos != path.first_point()) {
         gcode += this->travel_to(
diff --git a/src/libslic3r/GCode/Analyzer.cpp b/src/libslic3r/GCode/Analyzer.cpp
index 1be26c722..53c2934dc 100644
--- a/src/libslic3r/GCode/Analyzer.cpp
+++ b/src/libslic3r/GCode/Analyzer.cpp
@@ -776,6 +776,9 @@ void GCodeAnalyzer::_calc_gcode_preview_extrusion_layers(GCodePreviewData& previ
     preview_data.ranges.width.update_from(width_range);
     preview_data.ranges.feedrate.update_from(feedrate_range);
     preview_data.ranges.volumetric_rate.update_from(volumetric_rate_range);
+
+    // we need to sort the layers by their z as they can be shuffled in case of sequential prints
+    std::sort(preview_data.extrusion.layers.begin(), preview_data.extrusion.layers.end(), [](const GCodePreviewData::Extrusion::Layer& l1, const GCodePreviewData::Extrusion::Layer& l2)->bool { return l1.z < l2.z; });
 }
 
 void GCodeAnalyzer::_calc_gcode_preview_travel(GCodePreviewData& preview_data, std::function<void()> cancel_callback)
@@ -855,6 +858,11 @@ void GCodeAnalyzer::_calc_gcode_preview_travel(GCodePreviewData& preview_data, s
     preview_data.ranges.height.update_from(height_range);
     preview_data.ranges.width.update_from(width_range);
     preview_data.ranges.feedrate.update_from(feedrate_range);
+
+    // we need to sort the polylines by their min z as they can be shuffled in case of sequential prints
+    std::sort(preview_data.travel.polylines.begin(), preview_data.travel.polylines.end(),
+        [](const GCodePreviewData::Travel::Polyline& p1, const GCodePreviewData::Travel::Polyline& p2)->bool
+    { return unscale<double>(p1.polyline.bounding_box().min(2)) < unscale<double>(p2.polyline.bounding_box().min(2)); });
 }
 
 void GCodeAnalyzer::_calc_gcode_preview_retractions(GCodePreviewData& preview_data, std::function<void()> cancel_callback)
@@ -877,6 +885,11 @@ void GCodeAnalyzer::_calc_gcode_preview_retractions(GCodePreviewData& preview_da
         Vec3crd position(scale_(move.start_position.x()), scale_(move.start_position.y()), scale_(move.start_position.z()));
         preview_data.retraction.positions.emplace_back(position, move.data.width, move.data.height);
     }
+
+    // we need to sort the positions by their z as they can be shuffled in case of sequential prints
+    std::sort(preview_data.retraction.positions.begin(), preview_data.retraction.positions.end(),
+        [](const GCodePreviewData::Retraction::Position& p1, const GCodePreviewData::Retraction::Position& p2)->bool
+    { return unscale<double>(p1.position(2)) < unscale<double>(p2.position(2)); });
 }
 
 void GCodeAnalyzer::_calc_gcode_preview_unretractions(GCodePreviewData& preview_data, std::function<void()> cancel_callback)
@@ -899,6 +912,11 @@ void GCodeAnalyzer::_calc_gcode_preview_unretractions(GCodePreviewData& preview_
         Vec3crd position(scale_(move.start_position.x()), scale_(move.start_position.y()), scale_(move.start_position.z()));
         preview_data.unretraction.positions.emplace_back(position, move.data.width, move.data.height);
     }
+
+    // we need to sort the positions by their z as they can be shuffled in case of sequential prints
+    std::sort(preview_data.unretraction.positions.begin(), preview_data.unretraction.positions.end(),
+        [](const GCodePreviewData::Retraction::Position& p1, const GCodePreviewData::Retraction::Position& p2)->bool
+    { return unscale<double>(p1.position(2)) < unscale<double>(p2.position(2)); });
 }
 
 // Return an estimate of the memory consumed by the time estimator.
diff --git a/src/libslic3r/GCode/PostProcessor.cpp b/src/libslic3r/GCode/PostProcessor.cpp
index df4acc1bf..25982959b 100644
--- a/src/libslic3r/GCode/PostProcessor.cpp
+++ b/src/libslic3r/GCode/PostProcessor.cpp
@@ -4,6 +4,7 @@
 #include <boost/log/trivial.hpp>
 #include <boost/format.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/nowide/convert.hpp>
 
 #ifdef WIN32
 
@@ -11,6 +12,7 @@
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
 #include <Windows.h>
+#include <shellapi.h>
 
 // https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
 // This routine appends the given argument to a command line such that CommandLineToArgvW will return the argument string unchanged.
diff --git a/src/libslic3r/GCode/WipeTowerPrusaMM.cpp b/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
index 6f9b488a3..85f6a4a87 100644
--- a/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
+++ b/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
@@ -40,7 +40,7 @@ namespace PrusaMultiMaterial {
 class Writer
 {
 public:
-	Writer(float layer_height, float line_width) :
+	Writer(float layer_height, float line_width, GCodeFlavor flavor) :
 		m_current_pos(std::numeric_limits<float>::max(), std::numeric_limits<float>::max()),
 		m_current_z(0.f),
 		m_current_feedrate(0.f),
@@ -48,7 +48,8 @@ public:
 		m_extrusion_flow(0.f),
 		m_preview_suppressed(false),
 		m_elapsed_time(0.f),
-        m_default_analyzer_line_width(line_width)
+        m_default_analyzer_line_width(line_width),
+        m_gcode_flavor(flavor)
         {
             // adds tag for analyzer:
             char buf[64];
@@ -333,7 +334,10 @@ public:
 	Writer& set_extruder_trimpot(int current) 
 	{
 		char buf[128];
-		sprintf(buf, "M907 E%d\n", current);
+        if (m_gcode_flavor == gcfRepRap)
+            sprintf(buf, "M906 E%d\n", current);
+        else
+            sprintf(buf, "M907 E%d\n", current);
 		m_gcode += buf;
 		return *this;
 	};
@@ -407,6 +411,7 @@ private:
     int           current_temp = -1;
     const float   m_default_analyzer_line_width;
     float         m_used_filament_length = 0.f;
+    GCodeFlavor   m_gcode_flavor;
 
 	std::string   set_format_X(float x)
 	{
@@ -540,7 +545,7 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::prime(
 	const float prime_section_width = std::min(240.f / tools.size(), 60.f);
 	box_coordinates cleaning_box(xy(5.f, 0.01f + m_perimeter_width/2.f), prime_section_width, 100.f);
 
-	PrusaMultiMaterial::Writer writer(m_layer_height, m_perimeter_width);
+	PrusaMultiMaterial::Writer writer(m_layer_height, m_perimeter_width, m_gcode_flavor);
 	writer.set_extrusion_flow(m_extrusion_flow)
 		  .set_z(m_z_pos)
 		  .set_initial_tool(m_current_tool)
@@ -642,7 +647,7 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::tool_change(unsigned int tool, boo
 		(tool != (unsigned int)(-1) ? /*m_layer_info->depth*/wipe_area+m_depth_traversed-0.5*m_perimeter_width
                                     : m_wipe_tower_depth-m_perimeter_width));
 
-	PrusaMultiMaterial::Writer writer(m_layer_height, m_perimeter_width);
+	PrusaMultiMaterial::Writer writer(m_layer_height, m_perimeter_width, m_gcode_flavor);
 	writer.set_extrusion_flow(m_extrusion_flow)
 		.set_z(m_z_pos)
 		.set_initial_tool(m_current_tool)
@@ -661,7 +666,7 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::tool_change(unsigned int tool, boo
 
     // Increase the extruder driver current to allow fast ramming.
 	if (m_set_extruder_trimpot)
-		writer.set_extruder_trimpot(550);
+		writer.set_extruder_trimpot(750);
 
     // Ram the hot material out of the melt zone, retract the filament into the cooling tubes and let it cool.
     if (tool != (unsigned int)-1){ 			// This is not the last change.
@@ -723,9 +728,7 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::toolchange_Brim(bool sideOnly, flo
 		m_wipe_tower_width,
 		m_wipe_tower_depth);
 
-    //use first layer width parameter
-
-    PrusaMultiMaterial::Writer writer(m_layer_height, m_brim_width);
+	PrusaMultiMaterial::Writer writer(m_layer_height, m_brim_width, m_gcode_flavor);
 	writer.set_extrusion_flow(m_extrusion_flow * 1.1f)
 		  .set_z(m_z_pos) // Let the writer know the current Z position as a base for Z-hop.
 		  .set_initial_tool(m_current_tool)
@@ -1056,7 +1059,7 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::finish_layer()
 	// Otherwise the caller would likely travel to the wipe tower in vain.
 	assert(! this->layer_finished());
 
-	PrusaMultiMaterial::Writer writer(m_layer_height, m_perimeter_width);
+	PrusaMultiMaterial::Writer writer(m_layer_height, m_perimeter_width, m_gcode_flavor);
 	writer.set_extrusion_flow(m_extrusion_flow)
 		.set_z(m_z_pos)
 		.set_initial_tool(m_current_tool)
diff --git a/src/libslic3r/GCode/WipeTowerPrusaMM.hpp b/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
index d9de2229b..b6bc5af47 100644
--- a/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
+++ b/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
@@ -9,6 +9,7 @@
 
 #include "PrintConfig.hpp"
 #include "WipeTower.hpp"
+#include "PrintConfig.hpp"
 
 
 namespace Slic3r
@@ -55,8 +56,7 @@ public:
 	// y			-- y coordinates of wipe tower in mm ( left bottom corner )
 	// width		-- width of wipe tower in mm ( default 60 mm - leave as it is )
 	// wipe_area	-- space available for one toolchange in mm
-    WipeTowerPrusaMM(PrintConfig &config,
-        const std::vector<std::vector<float>>& wiping_matrix, unsigned int initial_tool, float first_layer_width) :
+    WipeTowerPrusaMM(PrintConfig &config, const std::vector<std::vector<float>>& wiping_matrix, unsigned int initial_tool, float first_layer_width) :
         m_wipe_tower_pos(float(config.wipe_tower_x.value), float(config.wipe_tower_y.value)),
         m_wipe_tower_width(float(config.wipe_tower_width.value)),
         m_wipe_tower_rotation_angle(float(config.wipe_tower_rotation_angle.value)),
@@ -69,6 +69,7 @@ public:
         m_extra_loading_move(float(config.extra_loading_move.value)),
         m_bridging(float(config.wipe_tower_bridging)),
         m_set_extruder_trimpot(config.high_current_on_filament_swap.value),
+        m_gcode_flavor(config.gcode_flavor),
         m_current_tool(initial_tool),
         wipe_volumes(wiping_matrix),
         m_brim_width(first_layer_width),
@@ -206,7 +207,7 @@ private:
 
 
     const bool  m_peters_wipe_tower   = false; // sparse wipe tower inspired by Peter's post processor - not finished yet
-    const float Filament_Area         = M_PI * 1.75f * 1.75f / 4.f; // filament area in mm^2
+    const float Filament_Area         = float(M_PI * 1.75f * 1.75f / 4.f); // filament area in mm^2
     const float Width_To_Nozzle_Ratio = 1.25f; // desired line width (oval) in multiples of nozzle diameter - may not be actually neccessary to adjust
     const float WT_EPSILON            = 1e-3f;
 
@@ -233,11 +234,11 @@ private:
     bool            m_set_extruder_trimpot      = false;
     bool 			m_retain_speed_override		= true;
     bool            m_adhesion                  = true;
+    GCodeFlavor     m_gcode_flavor;
 
-    float m_perimeter_width = 0.4 * Width_To_Nozzle_Ratio; // Width of an extrusion line, also a perimeter spacing for 100% infill.
+    float m_perimeter_width = 0.4f * Width_To_Nozzle_Ratio; // Width of an extrusion line, also a perimeter spacing for 100% infill.
     float m_brim_width = 0.4 * Width_To_Nozzle_Ratio * Width_To_Nozzle_Ratio; // Width of an extrusion line, also a perimeter spacing for 100% infill.
-	float m_extrusion_flow = 0.038; //0.029f;// Extrusion flow is derived from m_perimeter_width, layer height and filament diameter.
-
+    float m_extrusion_flow = 0.038f; //0.029f;// Extrusion flow is derived from m_perimeter_width, layer height and filament diameter.
 
     struct FilamentParameters {
         material_type 	    material = PLA;
@@ -280,12 +281,12 @@ private:
 	{
 		if ( layer_height < 0 )
 			return m_extrusion_flow;
-		return layer_height * ( m_perimeter_width - layer_height * (1-M_PI/4.f)) / Filament_Area;
+		return layer_height * ( m_perimeter_width - layer_height * (1.f-float(M_PI)/4.f)) / Filament_Area;
 	}
 
 	// Calculates length of extrusion line to extrude given volume
 	float volume_to_length(float volume, float line_width, float layer_height) const {
-		return std::max(0., volume / (layer_height * (line_width - layer_height * (1. - M_PI / 4.))));
+		return std::max(0.f, volume / (layer_height * (line_width - layer_height * (1.f - float(M_PI) / 4.f))));
 	}
 
 	// Calculates depth for all layers and propagates them downwards
diff --git a/src/libslic3r/GCodeTimeEstimator.cpp b/src/libslic3r/GCodeTimeEstimator.cpp
index 461b4cd35..60d7a4cdf 100644
--- a/src/libslic3r/GCodeTimeEstimator.cpp
+++ b/src/libslic3r/GCodeTimeEstimator.cpp
@@ -38,7 +38,6 @@ static const std::string MOVE_TYPE_STR[Slic3r::GCodeTimeEstimator::Block::Num_Ty
 #endif // ENABLE_MOVE_STATS
 
 namespace Slic3r {
-
     void GCodeTimeEstimator::Feedrates::reset()
     {
         feedrate = 0.0f;
@@ -171,6 +170,8 @@ namespace Slic3r {
 
     const std::string GCodeTimeEstimator::Normal_First_M73_Output_Placeholder_Tag = "; NORMAL_FIRST_M73_OUTPUT_PLACEHOLDER";
     const std::string GCodeTimeEstimator::Silent_First_M73_Output_Placeholder_Tag = "; SILENT_FIRST_M73_OUTPUT_PLACEHOLDER";
+    const std::string GCodeTimeEstimator::Normal_Last_M73_Output_Placeholder_Tag = "; NORMAL_LAST_M73_OUTPUT_PLACEHOLDER";
+    const std::string GCodeTimeEstimator::Silent_Last_M73_Output_Placeholder_Tag = "; SILENT_LAST_M73_OUTPUT_PLACEHOLDER";
 
     GCodeTimeEstimator::GCodeTimeEstimator(EMode mode)
         : _mode(mode)
@@ -306,9 +307,17 @@ namespace Slic3r {
                 sprintf(time_line, time_mask.c_str(), "0", _get_time_minutes(_time).c_str());
                 gcode_line = time_line;
             }
+            // replaces placeholders for final line M73 with the real lines
+            else if (((_mode == Normal) && (gcode_line == Normal_Last_M73_Output_Placeholder_Tag)) ||
+                     ((_mode == Silent) && (gcode_line == Silent_Last_M73_Output_Placeholder_Tag)))
+            {
+                sprintf(time_line, time_mask.c_str(), "100", "0");
+                gcode_line = time_line;
+            }
             else
                gcode_line += "\n";
 
+
             // add remaining time lines where needed
             _parser.parse_line(gcode_line,
                 [this, &it_line_id, &g1_lines_count, &last_recorded_time, &time_line, &gcode_line, time_mask, interval](GCodeReader& reader, const GCodeReader::GCodeLine& line)
@@ -685,6 +694,8 @@ namespace Slic3r {
         set_axis_position(X, 0.0f);
         set_axis_position(Y, 0.0f);
         set_axis_position(Z, 0.0f);
+        if (get_e_local_positioning_type() == Absolute)
+            set_axis_position(E, 0.0f);
 
         set_additional_time(0.0f);
 
@@ -705,7 +716,6 @@ namespace Slic3r {
         _blocks.clear();
     }
 
-
     void GCodeTimeEstimator::_calculate_time()
     {
         PROFILE_FUNC();
diff --git a/src/libslic3r/GCodeTimeEstimator.hpp b/src/libslic3r/GCodeTimeEstimator.hpp
index ef91d5ff1..1fbc1c14b 100644
--- a/src/libslic3r/GCodeTimeEstimator.hpp
+++ b/src/libslic3r/GCodeTimeEstimator.hpp
@@ -19,6 +19,8 @@ namespace Slic3r {
     public:
         static const std::string Normal_First_M73_Output_Placeholder_Tag;
         static const std::string Silent_First_M73_Output_Placeholder_Tag;
+        static const std::string Normal_Last_M73_Output_Placeholder_Tag;
+        static const std::string Silent_Last_M73_Output_Placeholder_Tag;
 
         enum EMode : unsigned char
         {
diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp
index 80c40ca9d..1db8c2b70 100644
--- a/src/libslic3r/Geometry.cpp
+++ b/src/libslic3r/Geometry.cpp
@@ -1188,6 +1188,29 @@ Transformation Transformation::operator * (const Transformation& other) const
     return Transformation(get_matrix() * other.get_matrix());
 }
 
+Eigen::Quaterniond rotation_xyz_diff(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to)
+{
+    return
+        // From the current coordinate system to world.
+        Eigen::AngleAxisd(rot_xyz_to(2), Vec3d::UnitZ()) * Eigen::AngleAxisd(rot_xyz_to(1), Vec3d::UnitY()) * Eigen::AngleAxisd(rot_xyz_to(0), Vec3d::UnitX()) *
+        // From world to the initial coordinate system.
+        Eigen::AngleAxisd(-rot_xyz_from(0), Vec3d::UnitX()) * Eigen::AngleAxisd(-rot_xyz_from(1), Vec3d::UnitY()) * Eigen::AngleAxisd(-rot_xyz_from(2), Vec3d::UnitZ());
+}
+
+// This should only be called if it is known, that the two rotations only differ in rotation around the Z axis.
+double rotation_diff_z(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to)
+{
+    Eigen::AngleAxisd angle_axis(rotation_xyz_diff(rot_xyz_from, rot_xyz_to));
+    Vec3d  axis  = angle_axis.axis();
+    double angle = angle_axis.angle();
+#ifndef NDEBUG
+    if (std::abs(angle) > 1e-8) {
+        assert(std::abs(axis.x()) < 1e-8);
+        assert(std::abs(axis.y()) < 1e-8);
+    }
+#endif /* NDEBUG */
+    return (axis.z() < 0) ? -angle : angle;
+}
 //-------------- for tests ----------------------//
 
 Point
diff --git a/src/libslic3r/Geometry.hpp b/src/libslic3r/Geometry.hpp
index 72489d618..79cdc7a84 100644
--- a/src/libslic3r/Geometry.hpp
+++ b/src/libslic3r/Geometry.hpp
@@ -226,6 +226,7 @@ public:
 
     const Vec3d& get_mirror() const { return m_mirror; }
     double get_mirror(Axis axis) const { return m_mirror(axis); }
+    bool is_left_handed() const { return m_mirror.x() * m_mirror.y() * m_mirror.z() < 0.; }
 
     void set_mirror(const Vec3d& mirror);
     void set_mirror(Axis axis, double mirror);
@@ -241,6 +242,28 @@ public:
     Transformation operator * (const Transformation& other) const;
 };
 
+// Rotation when going from the first coordinate system with rotation rot_xyz_from applied
+// to a coordinate system with rot_xyz_to applied.
+extern Eigen::Quaterniond rotation_xyz_diff(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to);
+// Rotation by Z to align rot_xyz_from to rot_xyz_to.
+// This should only be called if it is known, that the two rotations only differ in rotation around the Z axis.
+extern double rotation_diff_z(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to);
+
+// Is the angle close to a multiple of 90 degrees?
+inline bool is_rotation_ninety_degrees(double a)
+{
+    a = fmod(std::abs(a), 0.5 * M_PI);
+    if (a > 0.25 * PI)
+        a = 0.5 * PI - a;
+    return a < 0.001;
+}
+
+// Is the angle close to a multiple of 90 degrees?
+inline bool is_rotation_ninety_degrees(const Vec3d &rotation)
+{
+    return is_rotation_ninety_degrees(rotation.x()) && is_rotation_ninety_degrees(rotation.y()) && is_rotation_ninety_degrees(rotation.z());
+}
+
 //------------for tests------------//
  
 /// Find the center of the circle corresponding to the vector of Points as an arc.
diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp
index 6b55f3234..370b01f1d 100644
--- a/src/libslic3r/LayerRegion.cpp
+++ b/src/libslic3r/LayerRegion.cpp
@@ -286,13 +286,18 @@ void LayerRegion::process_external_surfaces(const Layer* lower_layer)
                 #ifdef SLIC3R_DEBUG
                 printf("Processing bridge at layer " PRINTF_ZU ":\n", this->layer()->id());
                 #endif
-                if (bd.detect_angle(Geometry::deg2rad(this->region()->config().bridge_angle.value))) {
+				double custom_angle = Geometry::deg2rad(this->region()->config().bridge_angle.value);
+				if (bd.detect_angle(custom_angle)) {
                     bridges[idx_last].bridge_angle = bd.angle;
                     if (this->layer()->object()->config().support_material) {
                         polygons_append(this->bridged, intersection(bd.coverage(), to_polygons(initial)));
                         this->unsupported_bridge_edges.append(bd.unsupported_edges()); 
                     }
-                }
+				} else if (custom_angle > 0) {
+					// Bridge was not detected (likely it is only supported at one side). Still it is a surface filled in
+					// using a bridging flow, therefore it makes sense to respect the custom bridging direction.
+					bridges[idx_last].bridge_angle = custom_angle;
+				}
                 // without safety offset, artifacts are generated (GH #2494)
                 surfaces_append(bottom, union_ex(grown, true), bridges[idx_last]);
             }
diff --git a/src/libslic3r/MTUtils.hpp b/src/libslic3r/MTUtils.hpp
index 1f6ca1a23..7e91ace32 100644
--- a/src/libslic3r/MTUtils.hpp
+++ b/src/libslic3r/MTUtils.hpp
@@ -56,8 +56,18 @@ public:
     }
 };
 
-template<class Vector,
-         class Value = typename Vector::value_type>
+/// An std compatible random access iterator which uses indices to the source
+/// vector thus resistant to invalidation caused by relocations. It also "knows"
+/// its container. No comparison is neccesary to the container "end()" iterator.
+/// The template can be instantiated with a different value type than that of
+/// the container's but the types must be compatible. E.g. a base class of the
+/// contained objects is compatible.
+///
+/// For a constant iterator, one can instantiate this template with a value
+/// type preceded with 'const'.
+template<class Vector,  // The container type, must be random access...
+         class Value = typename Vector::value_type // The value type
+         >
 class IndexBasedIterator {
     static const size_t NONE = size_t(-1);
 
@@ -110,6 +120,8 @@ public:
 
     operator difference_type() { return difference_type(m_idx); }
 
+    /// Tesing the end of the container... this is not possible with std
+    /// iterators.
     inline bool is_end() const { return m_idx >= m_index_ref.get().size();}
 
     inline Value & operator*() const {
@@ -122,6 +134,7 @@ public:
         return &m_index_ref.get().operator[](m_idx);
     }
 
+    /// If both iterators point past the container, they are equal...
     inline bool operator ==(const IndexBasedIterator& other) {
         size_t e = m_index_ref.get().size();
         return m_idx == other.m_idx || (m_idx >= e && other.m_idx >= e);
@@ -148,17 +161,23 @@ public:
     }
 };
 
+/// A very simple range concept implementation with iterator-like objects.
 template<class It> class Range {
     It from, to;
 public:
+
+    // The class is ready for range based for loops.
     It begin() const { return from; }
     It end() const { return to; }
+
+    // The iterator type can be obtained this way.
     using Type = It;
 
     Range() = default;
     Range(It &&b, It &&e):
         from(std::forward<It>(b)), to(std::forward<It>(e)) {}
 
+    // Some useful container-like methods...
     inline size_t size() const { return end() - begin(); }
     inline bool empty() const { return size() == 0; }
 };
diff --git a/src/libslic3r/MedialAxis.cpp b/src/libslic3r/MedialAxis.cpp
index 4620e8881..f9b4c1954 100644
--- a/src/libslic3r/MedialAxis.cpp
+++ b/src/libslic3r/MedialAxis.cpp
@@ -1329,6 +1329,10 @@ void
 MedialAxis::simplify_polygon_frontier()
 {
     //simplify the boundary between us and the bounds.
+    ExPolygon simplified_poly = this->surface;
+    simplified_poly.contour.remove_colinear_points(SCALED_EPSILON);
+    for (Polygon &hole : simplified_poly.holes)
+        hole.remove_colinear_points(SCALED_EPSILON);
     //it will remove every point in the surface contour that aren't on the bounds contour
     this->expolygon = this->surface;
     this->expolygon.contour.remove_collinear_points(SCALED_EPSILON);
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 0528236f4..f43724538 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -24,6 +24,19 @@ unsigned int Model::s_auto_extruder_id = 1;
 
 size_t ModelBase::s_last_id = 0;
 
+// Unique object / instance ID for the wipe tower.
+ModelID wipe_tower_object_id()
+{
+    static ModelBase mine;
+    return mine.id();
+}
+
+ModelID wipe_tower_instance_id()
+{
+    static ModelBase mine;
+    return mine.id();
+}
+
 Model& Model::assign_copy(const Model &rhs)
 {
     this->copy_id(rhs);
@@ -61,7 +74,7 @@ Model& Model::assign_copy(Model &&rhs)
 	this->objects = std::move(rhs.objects);
     for (ModelObject *model_object : this->objects)
         model_object->set_model(this);
-	rhs.objects.clear();
+    rhs.objects.clear();
     return *this;
 }
 
@@ -556,19 +569,9 @@ std::string Model::propose_export_file_name_and_path() const
     for (const ModelObject *model_object : this->objects)
         for (ModelInstance *model_instance : model_object->instances)
             if (model_instance->is_printable()) {
-                input_file = model_object->input_file;
-                if (! model_object->name.empty()) {
-                    if (input_file.empty())
-                        // model_object->input_file was empty, just use model_object->name
-                        input_file = model_object->name;
-                    else {
-                        // Replace file name in input_file with model_object->name, but keep the path and file extension.
-						input_file = (boost::filesystem::path(model_object->name).parent_path().empty()) ?
-							(boost::filesystem::path(input_file).parent_path() / model_object->name).make_preferred().string() :
-							model_object->name;
-					}
-                }
-                if (! input_file.empty())
+                input_file = model_object->get_export_filename();
+
+                if (!input_file.empty())
                     goto end;
                 // Other instances will produce the same name, skip them.
                 break;
@@ -603,6 +606,8 @@ ModelObject& ModelObject::assign_copy(const ModelObject &rhs)
     this->origin_translation          = rhs.origin_translation;
     m_bounding_box                    = rhs.m_bounding_box;
     m_bounding_box_valid              = rhs.m_bounding_box_valid;
+    m_raw_bounding_box                = rhs.m_raw_bounding_box;
+    m_raw_bounding_box_valid          = rhs.m_raw_bounding_box_valid;
     m_raw_mesh_bounding_box           = rhs.m_raw_mesh_bounding_box;
     m_raw_mesh_bounding_box_valid     = rhs.m_raw_mesh_bounding_box_valid;
 
@@ -637,6 +642,8 @@ ModelObject& ModelObject::assign_copy(ModelObject &&rhs)
     this->origin_translation          = std::move(rhs.origin_translation);
     m_bounding_box                    = std::move(rhs.m_bounding_box);
     m_bounding_box_valid              = std::move(rhs.m_bounding_box_valid);
+    m_raw_bounding_box                = rhs.m_raw_bounding_box;
+    m_raw_bounding_box_valid          = rhs.m_raw_bounding_box_valid;
     m_raw_mesh_bounding_box           = rhs.m_raw_mesh_bounding_box;
     m_raw_mesh_bounding_box_valid     = rhs.m_raw_mesh_bounding_box_valid;
 
@@ -651,7 +658,7 @@ ModelObject& ModelObject::assign_copy(ModelObject &&rhs)
     for (ModelInstance *model_instance : this->instances)
         model_instance->set_model_object(this);
 
-	return *this;
+    return *this;
 }
 
 void ModelObject::assign_new_unique_ids_recursive()
@@ -873,7 +880,7 @@ TriangleMesh ModelObject::full_raw_mesh() const
     return mesh;
 }
 
-BoundingBoxf3 ModelObject::raw_mesh_bounding_box() const
+const BoundingBoxf3& ModelObject::raw_mesh_bounding_box() const
 {
     if (! m_raw_mesh_bounding_box_valid) {
         m_raw_mesh_bounding_box_valid = true;
@@ -894,33 +901,36 @@ BoundingBoxf3 ModelObject::full_raw_mesh_bounding_box() const
 }
 
 // A transformed snug bounding box around the non-modifier object volumes, without the translation applied.
-// This bounding box is only used for the actual slicing.
-BoundingBoxf3 ModelObject::raw_bounding_box() const
+// This bounding box is only used for the actual slicing and for layer editing UI to calculate the layers.
+const BoundingBoxf3& ModelObject::raw_bounding_box() const
 {
-    BoundingBoxf3 bb;
-#if ENABLE_GENERIC_SUBPARTS_PLACEMENT
-    if (this->instances.empty())
-        throw std::invalid_argument("Can't call raw_bounding_box() with no instances");
+    if (! m_raw_bounding_box_valid) {
+        m_raw_bounding_box_valid = true;
+        m_raw_bounding_box.reset();
+    #if ENABLE_GENERIC_SUBPARTS_PLACEMENT
+        if (this->instances.empty())
+            throw std::invalid_argument("Can't call raw_bounding_box() with no instances");
 
-    const Transform3d& inst_matrix = this->instances.front()->get_transformation().get_matrix(true);
-#endif // ENABLE_GENERIC_SUBPARTS_PLACEMENT
-    for (const ModelVolume *v : this->volumes)
-        if (v->is_model_part()) {
-#if !ENABLE_GENERIC_SUBPARTS_PLACEMENT
-            if (this->instances.empty())
-                throw std::invalid_argument("Can't call raw_bounding_box() with no instances");
-#endif // !ENABLE_GENERIC_SUBPARTS_PLACEMENT
+        const Transform3d& inst_matrix = this->instances.front()->get_transformation().get_matrix(true);
+    #endif // ENABLE_GENERIC_SUBPARTS_PLACEMENT
+        for (const ModelVolume *v : this->volumes)
+            if (v->is_model_part()) {
+    #if !ENABLE_GENERIC_SUBPARTS_PLACEMENT
+                if (this->instances.empty())
+                    throw std::invalid_argument("Can't call raw_bounding_box() with no instances");
+    #endif // !ENABLE_GENERIC_SUBPARTS_PLACEMENT
 
-            TriangleMesh vol_mesh(v->mesh);
-#if ENABLE_GENERIC_SUBPARTS_PLACEMENT
-            vol_mesh.transform(inst_matrix * v->get_matrix());
-            bb.merge(vol_mesh.bounding_box());
-#else
-            vol_mesh.transform(v->get_matrix());
-            bb.merge(this->instances.front()->transform_mesh_bounding_box(vol_mesh, true));
-#endif // ENABLE_GENERIC_SUBPARTS_PLACEMENT
-        }
-    return bb;
+    #if ENABLE_GENERIC_SUBPARTS_PLACEMENT
+				m_raw_bounding_box.merge(v->mesh.transformed_bounding_box(inst_matrix * v->get_matrix()));
+    #else
+                // unmaintaned
+                assert(false);
+                // vol_mesh.transform(v->get_matrix());
+                // m_raw_bounding_box_valid.merge(this->instances.front()->transform_mesh_bounding_box(vol_mesh, true));
+    #endif // ENABLE_GENERIC_SUBPARTS_PLACEMENT
+            }
+    }
+	return m_raw_bounding_box;
 }
 
 // This returns an accurate snug bounding box of the transformed object instance, without the translation applied.
@@ -934,13 +944,13 @@ BoundingBoxf3 ModelObject::instance_bounding_box(size_t instance_idx, bool dont_
     {
         if (v->is_model_part())
         {
-            TriangleMesh mesh(v->mesh);
 #if ENABLE_GENERIC_SUBPARTS_PLACEMENT
-            mesh.transform(inst_matrix * v->get_matrix());
-            bb.merge(mesh.bounding_box());
+            bb.merge(v->mesh.transformed_bounding_box(inst_matrix * v->get_matrix()));
 #else
-            mesh.transform(v->get_matrix());
-            bb.merge(this->instances[instance_idx]->transform_mesh_bounding_box(mesh, dont_translate));
+            // not maintained
+            assert(false);
+            //mesh.transform(v->get_matrix());
+            //bb.merge(this->instances[instance_idx]->transform_mesh_bounding_box(mesh, dont_translate));
 #endif // ENABLE_GENERIC_SUBPARTS_PLACEMENT
         }
     }
@@ -950,7 +960,7 @@ BoundingBoxf3 ModelObject::instance_bounding_box(size_t instance_idx, bool dont_
 // Calculate 2D convex hull of of a projection of the transformed printable volumes into the XY plane.
 // This method is cheap in that it does not make any unnecessary copy of the volume meshes.
 // This method is used by the auto arrange function.
-Polygon ModelObject::convex_hull_2d(const Transform3d &trafo_instance)
+Polygon ModelObject::convex_hull_2d(const Transform3d &trafo_instance) const
 {
     Points pts;
     for (const ModelVolume *v : this->volumes)
@@ -974,8 +984,8 @@ Polygon ModelObject::convex_hull_2d(const Transform3d &trafo_instance)
                 }
             }
         }
-	std::sort(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a(0) < b(0) || (a(0) == b(0) && a(1) < b(1)); });
-	pts.erase(std::unique(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a(0) == b(0) && a(1) == b(1); }), pts.end());
+    std::sort(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a(0) < b(0) || (a(0) == b(0) && a(1) < b(1)); });
+    pts.erase(std::unique(pts.begin(), pts.end(), [](const Point& a, const Point& b) { return a(0) == b(0) && a(1) == b(1); }), pts.end());
 
     Polygon hull;
     int n = (int)pts.size();
@@ -1191,10 +1201,12 @@ ModelObjectPtrs ModelObject::cut(size_t instance, coordf_t z, bool keep_upper, b
         else {
             TriangleMesh upper_mesh, lower_mesh;
 
-            // Transform the mesh by the combined transformation matrix
-            volume->mesh.transform(instance_matrix * volume_matrix);
+            // Transform the mesh by the combined transformation matrix.
+            // Flip the triangles in case the composite transformation is left handed.
+            volume->mesh.transform(instance_matrix * volume_matrix, true);
 
             // Perform cut
+            volume->mesh.require_shared_vertices(); // TriangleMeshSlicer needs this
             TriangleMeshSlicer tms(&volume->mesh);
             tms.cut(float(z), &upper_mesh, &lower_mesh);
 
@@ -1295,11 +1307,11 @@ void ModelObject::split(ModelObjectPtrs* new_objects)
         
         // XXX: this seems to be the only real usage of m_model, maybe refactor this so that it's not needed?
         ModelObject* new_object = m_model->add_object();    
-		new_object->name   = this->name;
-		new_object->config = this->config;
-		new_object->instances.reserve(this->instances.size());
-		for (const ModelInstance *model_instance : this->instances)
-			new_object->add_instance(*model_instance);
+        new_object->name   = this->name;
+        new_object->config = this->config;
+        new_object->instances.reserve(this->instances.size());
+        for (const ModelInstance *model_instance : this->instances)
+            new_object->add_instance(*model_instance);
         ModelVolume* new_vol = new_object->add_volume(*volume, std::move(*mesh));
 #if !ENABLE_VOLUMES_CENTERING_FIXES
         new_vol->center_geometry();
@@ -1325,6 +1337,58 @@ void ModelObject::repair()
         v->mesh.repair();
 }
 
+// Support for non-uniform scaling of instances. If an instance is rotated by angles, which are not multiples of ninety degrees,
+// then the scaling in world coordinate system is not representable by the Geometry::Transformation structure.
+// This situation is solved by baking in the instance transformation into the mesh vertices.
+// Rotation and mirroring is being baked in. In case the instance scaling was non-uniform, it is baked in as well.
+void ModelObject::bake_xy_rotation_into_meshes(size_t instance_idx)
+{
+    assert(instance_idx < this->instances.size());
+
+	const Geometry::Transformation reference_trafo = this->instances[instance_idx]->get_transformation();
+    if (Geometry::is_rotation_ninety_degrees(reference_trafo.get_rotation()))
+        // nothing to do, scaling in the world coordinate space is possible in the representation of Geometry::Transformation.
+        return;
+
+    bool   left_handed        = reference_trafo.is_left_handed();
+    bool   has_mirrorring     = ! reference_trafo.get_mirror().isApprox(Vec3d(1., 1., 1.));
+    bool   uniform_scaling    = std::abs(reference_trafo.get_scaling_factor().x() - reference_trafo.get_scaling_factor().y()) < EPSILON &&
+                                std::abs(reference_trafo.get_scaling_factor().x() - reference_trafo.get_scaling_factor().z()) < EPSILON;
+    double new_scaling_factor = uniform_scaling ? reference_trafo.get_scaling_factor().x() : 1.;
+
+    // Adjust the instances.
+    for (size_t i = 0; i < this->instances.size(); ++ i) {
+        ModelInstance &model_instance = *this->instances[i];
+        model_instance.set_rotation(Vec3d(0., 0., Geometry::rotation_diff_z(reference_trafo.get_rotation(), model_instance.get_rotation())));
+        model_instance.set_scaling_factor(Vec3d(new_scaling_factor, new_scaling_factor, new_scaling_factor));
+        model_instance.set_mirror(Vec3d(1., 1., 1.));
+    }
+
+    // Adjust the meshes.
+    // Transformation to be applied to the meshes.
+    Eigen::Matrix3d    mesh_trafo_3x3           = reference_trafo.get_matrix(true, false, uniform_scaling, ! has_mirrorring).matrix().block<3, 3>(0, 0);
+	Transform3d volume_offset_correction = this->instances[instance_idx]->get_transformation().get_matrix().inverse() * reference_trafo.get_matrix();
+    for (ModelVolume *model_volume : this->volumes) {
+        const Geometry::Transformation volume_trafo = model_volume->get_transformation();
+        bool   volume_left_handed        = volume_trafo.is_left_handed();
+        bool   volume_has_mirrorring     = ! volume_trafo.get_mirror().isApprox(Vec3d(1., 1., 1.));
+        bool   volume_uniform_scaling    = std::abs(volume_trafo.get_scaling_factor().x() - volume_trafo.get_scaling_factor().y()) < EPSILON &&
+                                           std::abs(volume_trafo.get_scaling_factor().x() - volume_trafo.get_scaling_factor().z()) < EPSILON;
+        double volume_new_scaling_factor = volume_uniform_scaling ? volume_trafo.get_scaling_factor().x() : 1.;
+        // Transform the mesh.
+		Matrix3d volume_trafo_3x3 = volume_trafo.get_matrix(true, false, volume_uniform_scaling, !volume_has_mirrorring).matrix().block<3, 3>(0, 0);
+		model_volume->transform_mesh(mesh_trafo_3x3 * volume_trafo_3x3, left_handed != volume_left_handed);
+        // Reset the rotation, scaling and mirroring.
+        model_volume->set_rotation(Vec3d(0., 0., 0.));
+        model_volume->set_scaling_factor(Vec3d(volume_new_scaling_factor, volume_new_scaling_factor, volume_new_scaling_factor));
+        model_volume->set_mirror(Vec3d(1., 1., 1.));
+        // Move the reference point of the volume to compensate for the change of the instance trafo.
+        model_volume->set_offset(volume_offset_correction * volume_trafo.get_offset());
+    }
+
+    this->invalidate_bounding_box();
+}
+
 double ModelObject::get_min_z() const
 {
     if (instances.empty())
@@ -1436,6 +1500,71 @@ void ModelObject::print_info() const
     cout << "volume = "           << mesh.volume()                  << endl;
 }
 
+std::string ModelObject::get_export_filename() const
+{
+    std::string ret = input_file;
+
+    if (!name.empty())
+    {
+        if (ret.empty())
+            // input_file was empty, just use name
+            ret = name;
+        else
+        {
+            // Replace file name in input_file with name, but keep the path and file extension.
+            ret = (boost::filesystem::path(name).parent_path().empty()) ?
+                (boost::filesystem::path(ret).parent_path() / name).make_preferred().string() : name;
+        }
+    }
+
+    return ret;
+}
+
+stl_stats ModelObject::get_object_stl_stats() const
+{
+    if (this->volumes.size() == 1)
+        return this->volumes[0]->mesh.stl.stats;
+
+    stl_stats full_stats;
+    memset(&full_stats, 0, sizeof(stl_stats));
+
+    // fill full_stats from all objet's meshes
+    for (ModelVolume* volume : this->volumes)
+    {
+        if (volume->id() == this->volumes[0]->id())
+            continue;
+
+        const stl_stats& stats = volume->mesh.stl.stats;
+
+        // initialize full_stats (for repaired errors)
+        full_stats.degenerate_facets    += stats.degenerate_facets;
+        full_stats.edges_fixed          += stats.edges_fixed;
+        full_stats.facets_removed       += stats.facets_removed;
+        full_stats.facets_added         += stats.facets_added;
+        full_stats.facets_reversed      += stats.facets_reversed;
+        full_stats.backwards_edges      += stats.backwards_edges;
+
+        // another used satistics value
+        if (volume->is_model_part()) {
+            full_stats.volume           += stats.volume;
+            full_stats.number_of_parts  += stats.number_of_parts;
+        }
+    }
+
+    return full_stats;
+}
+
+int ModelObject::get_mesh_errors_count(const int vol_idx /*= -1*/) const
+{
+    if (vol_idx >= 0)
+        return this->volumes[vol_idx]->get_mesh_errors_count();
+
+    const stl_stats& stats = get_object_stl_stats();
+
+    return  stats.degenerate_facets + stats.edges_fixed     + stats.facets_removed +
+            stats.facets_added      + stats.facets_reversed + stats.backwards_edges;
+}
+
 void ModelVolume::set_material_id(t_model_material_id material_id)
 {
     m_material_id = material_id;
@@ -1471,9 +1600,9 @@ int ModelVolume::extruder_id() const
 
 bool ModelVolume::is_splittable() const
 {
-    // the call mesh.has_multiple_patches() is expensive, so cache the value to calculate it only once
+    // the call mesh.is_splittable() is expensive, so cache the value to calculate it only once
     if (m_is_splittable == -1)
-        m_is_splittable = (int)mesh.has_multiple_patches();
+        m_is_splittable = (int)mesh.is_splittable();
 
     return m_is_splittable == 1;
 }
@@ -1501,6 +1630,14 @@ void ModelVolume::calculate_convex_hull()
     m_convex_hull = mesh.convex_hull_3d();
 }
 
+int ModelVolume::get_mesh_errors_count() const
+{
+    const stl_stats& stats = this->mesh.stl.stats;
+
+    return  stats.degenerate_facets + stats.edges_fixed     + stats.facets_removed +
+            stats.facets_added      + stats.facets_reversed + stats.backwards_edges;
+}
+
 const TriangleMesh& ModelVolume::get_convex_hull() const
 {
     return m_convex_hull;
@@ -1613,6 +1750,7 @@ void ModelVolume::rotate(double angle, Axis axis)
     case X: { rotate(angle, Vec3d::UnitX()); break; }
     case Y: { rotate(angle, Vec3d::UnitY()); break; }
     case Z: { rotate(angle, Vec3d::UnitZ()); break; }
+    default: break;
     }
 }
 
@@ -1629,6 +1767,7 @@ void ModelVolume::mirror(Axis axis)
     case X: { mirror(0) *= -1.0; break; }
     case Y: { mirror(1) *= -1.0; break; }
     case Z: { mirror(2) *= -1.0; break; }
+    default: break;
     }
     set_mirror(mirror);
 }
@@ -1639,6 +1778,22 @@ void ModelVolume::scale_geometry(const Vec3d& versor)
     m_convex_hull.scale(versor);
 }
 
+void ModelVolume::transform_mesh(const Transform3d &mesh_trafo, bool fix_left_handed)
+{
+    this->mesh.transform(mesh_trafo, fix_left_handed);
+    this->m_convex_hull.transform(mesh_trafo, fix_left_handed);
+    // Let the rest of the application know that the geometry changed, so the meshes have to be reloaded.
+    this->set_new_unique_id();
+}
+
+void ModelVolume::transform_mesh(const Matrix3d &matrix, bool fix_left_handed)
+{
+	this->mesh.transform(matrix, fix_left_handed);
+	this->m_convex_hull.transform(matrix, fix_left_handed);
+    // Let the rest of the application know that the geometry changed, so the meshes have to be reloaded.
+    this->set_new_unique_id();
+}
+
 void ModelInstance::transform_mesh(TriangleMesh* mesh, bool dont_translate) const
 {
     mesh->transform(get_matrix(dont_translate));
@@ -1715,7 +1870,6 @@ bool model_object_list_extended(const Model &model_old, const Model &model_new)
 
 bool model_volume_list_changed(const ModelObject &model_object_old, const ModelObject &model_object_new, const ModelVolumeType type)
 {
-    bool modifiers_differ = false;
     size_t i_old, i_new;
     for (i_old = 0, i_new = 0; i_old < model_object_old.volumes.size() && i_new < model_object_new.volumes.size();) {
         const ModelVolume &mv_old = *model_object_old.volumes[i_old];
diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index f05939276..307588960 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -54,6 +54,10 @@ struct ModelID
 	size_t	id;
 };
 
+// Unique object / instance ID for the wipe tower.
+extern ModelID wipe_tower_object_id();
+extern ModelID wipe_tower_instance_id();
+
 // Base for Model, ModelObject, ModelVolume, ModelInstance or ModelMaterial to provide a unique ID
 // to synchronize the front end (UI) with the back end (BackgroundSlicingProcess / Print / PrintObject).
 // Achtung! The s_last_id counter is not thread safe, so it is expected, that the ModelBase derived instances
@@ -85,6 +89,9 @@ private:
 
 	static inline ModelID   generate_new_id() { return ModelID(++ s_last_id); }
     static size_t           s_last_id;
+	
+	friend ModelID wipe_tower_object_id();
+	friend ModelID wipe_tower_instance_id();
 };
 
 #define MODELBASE_DERIVED_COPY_MOVE_CLONE(TYPE) \
@@ -212,7 +219,7 @@ public:
     // This bounding box is approximate and not snug.
     // This bounding box is being cached.
     const BoundingBoxf3& bounding_box() const;
-    void invalidate_bounding_box() { m_bounding_box_valid = false; m_raw_mesh_bounding_box_valid = false; }
+    void invalidate_bounding_box() { m_bounding_box_valid = false; m_raw_bounding_box_valid = false; m_raw_mesh_bounding_box_valid = false; }
 
     // A mesh containing all transformed instances of this object.
     TriangleMesh mesh() const;
@@ -223,18 +230,18 @@ public:
     TriangleMesh full_raw_mesh() const;
     // A transformed snug bounding box around the non-modifier object volumes, without the translation applied.
     // This bounding box is only used for the actual slicing.
-    BoundingBoxf3 raw_bounding_box() const;
+    const BoundingBoxf3& raw_bounding_box() const;
     // A snug bounding box around the transformed non-modifier object volumes.
     BoundingBoxf3 instance_bounding_box(size_t instance_idx, bool dont_translate = false) const;
 	// A snug bounding box of non-transformed (non-rotated, non-scaled, non-translated) sum of non-modifier object volumes.
-	BoundingBoxf3 raw_mesh_bounding_box() const;
+	const BoundingBoxf3& raw_mesh_bounding_box() const;
 	// A snug bounding box of non-transformed (non-rotated, non-scaled, non-translated) sum of all object volumes.
     BoundingBoxf3 full_raw_mesh_bounding_box() const;
 
     // Calculate 2D convex hull of of a projection of the transformed printable volumes into the XY plane.
     // This method is cheap in that it does not make any unnecessary copy of the volume meshes.
     // This method is used by the auto arrange function.
-    Polygon       convex_hull_2d(const Transform3d &trafo_instance);
+    Polygon       convex_hull_2d(const Transform3d &trafo_instance) const;
 
 #if ENABLE_VOLUMES_CENTERING_FIXES
     void center_around_origin(bool include_modifiers = true);
@@ -265,6 +272,11 @@ public:
     ModelObjectPtrs cut(size_t instance, coordf_t z, bool keep_upper = true, bool keep_lower = true, bool rotate_lower = false);    // Note: z is in world coordinates
     void split(ModelObjectPtrs* new_objects);
     void repair();
+    // Support for non-uniform scaling of instances. If an instance is rotated by angles, which are not multiples of ninety degrees,
+    // then the scaling in world coordinate system is not representable by the Geometry::Transformation structure.
+    // This situation is solved by baking in the instance transformation into the mesh vertices.
+    // Rotation and mirroring is being baked in. In case the instance scaling was non-uniform, it is baked in as well.
+    void bake_xy_rotation_into_meshes(size_t instance_idx);
 
     double get_min_z() const;
     double get_instance_min_z(size_t instance_idx) const;
@@ -275,6 +287,13 @@ public:
     // Print object statistics to console.
     void print_info() const;
 
+    std::string get_export_filename() const;
+
+    // Get full stl statistics for all object's meshes 
+    stl_stats   get_object_stl_stats() const;
+    // Get count of errors in the mesh( or all object's meshes, if volume index isn't defined) 
+    int         get_mesh_errors_count(const int vol_idx = -1) const;
+
 protected:
     friend class Print;
     friend class SLAPrint;
@@ -283,7 +302,7 @@ protected:
 
 private:
     ModelObject(Model *model) : m_model(model), origin_translation(Vec3d::Zero()), 
-        m_bounding_box_valid(false), m_raw_mesh_bounding_box_valid(false) {}
+        m_bounding_box_valid(false), m_raw_bounding_box_valid(false), m_raw_mesh_bounding_box_valid(false) {}
     ~ModelObject();
 
     /* To be able to return an object from own copy / clone methods. Hopefully the compiler will do the "Copy elision" */
@@ -302,6 +321,8 @@ private:
     // Bounding box, cached.
     mutable BoundingBoxf3 m_bounding_box;
     mutable bool          m_bounding_box_valid;
+    mutable BoundingBoxf3 m_raw_bounding_box;
+    mutable bool          m_raw_bounding_box_valid;
     mutable BoundingBoxf3 m_raw_mesh_bounding_box;
     mutable bool          m_raw_mesh_bounding_box_valid;    
 };
@@ -366,6 +387,8 @@ public:
 
     void                calculate_convex_hull();
     const TriangleMesh& get_convex_hull() const;
+    // Get count of errors in the mesh
+    int                 get_mesh_errors_count() const;
 
     // Helpers for loading / storing into AMF / 3MF files.
     static ModelVolumeType type_from_string(const std::string &s);
@@ -394,6 +417,7 @@ public:
 
     const Vec3d& get_mirror() const { return m_transformation.get_mirror(); }
     double get_mirror(Axis axis) const { return m_transformation.get_mirror(axis); }
+    bool is_left_handed() const { return m_transformation.is_left_handed(); }
 
     void set_mirror(const Vec3d& mirror) { m_transformation.set_mirror(mirror); }
     void set_mirror(Axis axis, double mirror) { m_transformation.set_mirror(axis, mirror); }
@@ -409,6 +433,8 @@ protected:
 
 	explicit ModelVolume(const ModelVolume &rhs) = default;
     void     set_model_object(ModelObject *model_object) { object = model_object; }
+    void     transform_mesh(const Transform3d& t, bool fix_left_handed);
+    void     transform_mesh(const Matrix3d& m, bool fix_left_handed);
 
 private:
     // Parent object owning this ModelVolume.
@@ -498,6 +524,7 @@ public:
 
     const Vec3d& get_mirror() const { return m_transformation.get_mirror(); }
     double get_mirror(Axis axis) const { return m_transformation.get_mirror(axis); }
+	bool is_left_handed() const { return m_transformation.is_left_handed(); }
 
     void set_mirror(const Vec3d& mirror) { m_transformation.set_mirror(mirror); }
     void set_mirror(Axis axis, double mirror) { m_transformation.set_mirror(axis, mirror); }
diff --git a/src/libslic3r/ModelArrange.cpp b/src/libslic3r/ModelArrange.cpp
index 4942e35b6..bf334bf46 100644
--- a/src/libslic3r/ModelArrange.cpp
+++ b/src/libslic3r/ModelArrange.cpp
@@ -1,5 +1,6 @@
 #include "ModelArrange.hpp"
 #include "Model.hpp"
+#include "Geometry.hpp"
 #include "SVG.hpp"
 
 #include <libnest2d.h>
@@ -538,7 +539,7 @@ public:
 // 2D shape from top view.
 using ShapeData2D = std::vector<std::pair<Slic3r::ModelInstance*, Item>>;
 
-ShapeData2D projectModelFromTop(const Slic3r::Model &model) {
+ShapeData2D projectModelFromTop(const Slic3r::Model &model, const WipeTowerInfo& wti) {
     ShapeData2D ret;
 
     // Count all the items on the bin (all the object's instances)
@@ -551,7 +552,7 @@ ShapeData2D projectModelFromTop(const Slic3r::Model &model) {
     ret.reserve(s);
 
     for(ModelObject* objptr : model.objects) {
-        if(objptr) {
+        if (! objptr->instances.empty()) {
 
             // TODO export the exact 2D projection. Cannot do it as libnest2d
             // does not support concave shapes (yet).
@@ -565,35 +566,62 @@ ShapeData2D projectModelFromTop(const Slic3r::Model &model) {
                 rotation.z() = 0.;
                 Transform3d trafo_instance = Geometry::assemble_transform(Vec3d::Zero(), rotation, finst->get_scaling_factor(), finst->get_mirror());
                 Polygon p = objptr->convex_hull_2d(trafo_instance);
-				assert(! p.points.empty());
-				p.reverse();
-				assert(! p.is_counter_clockwise());
+                assert(! p.points.empty());
+
+                // this may happen for malformed models, see: https://github.com/prusa3d/PrusaSlicer/issues/2209
+                if (p.points.empty())
+                    continue;
+
+                p.reverse();
+                assert(!p.is_counter_clockwise());
                 p.append(p.first_point());
                 clpath = Slic3rMultiPoint_to_ClipperPath(p);
             }
 
+            Vec3d rotation0 = objptr->instances.front()->get_rotation();
+            rotation0(2) = 0.;
             for(ModelInstance* objinst : objptr->instances) {
-                if(objinst) {
-                    ClipperLib::PolygonImpl pn;
-                    pn.Contour = clpath;
+                ClipperLib::Polygon pn;
+                pn.Contour = clpath;
 
-                    // Efficient conversion to item.
-                    Item item(std::move(pn));
+                // Efficient conversion to item.
+                Item item(std::move(pn));
 
-                    // Invalid geometries would throw exceptions when arranging
-                    if(item.vertexCount() > 3) {
-                        item.rotation(objinst->get_rotation(Z));
-                        item.translation({
-                        ClipperLib::cInt(objinst->get_offset(X)/SCALING_FACTOR),
-                        ClipperLib::cInt(objinst->get_offset(Y)/SCALING_FACTOR)
-                        });
-                        ret.emplace_back(objinst, item);
-                    }
+                // Invalid geometries would throw exceptions when arranging
+                if(item.vertexCount() > 3) {
+                    item.rotation(float(Geometry::rotation_diff_z(rotation0, objinst->get_rotation()))),
+                    item.translation({
+                    ClipperLib::cInt(objinst->get_offset(X)/SCALING_FACTOR),
+                    ClipperLib::cInt(objinst->get_offset(Y)/SCALING_FACTOR)
+                    });
+                    ret.emplace_back(objinst, item);
                 }
             }
         }
     }
 
+    // The wipe tower is a separate case (in case there is one), let's duplicate the code
+    if (wti.is_wipe_tower) {
+        Points pts;
+        pts.emplace_back(coord_t(scale_(0.)), coord_t(scale_(0.)));
+        pts.emplace_back(coord_t(scale_(wti.bb_size(0))), coord_t(scale_(0.)));
+        pts.emplace_back(coord_t(scale_(wti.bb_size(0))), coord_t(scale_(wti.bb_size(1))));
+        pts.emplace_back(coord_t(scale_(-0.)), coord_t(scale_(wti.bb_size(1))));
+        pts.emplace_back(coord_t(scale_(-0.)), coord_t(scale_(0.)));
+        Polygon p(std::move(pts));
+        ClipperLib::Path clpath = Slic3rMultiPoint_to_ClipperPath(p);
+        ClipperLib::Polygon pn;
+        pn.Contour = clpath;
+        // Efficient conversion to item.
+        Item item(std::move(pn));
+        item.rotation(wti.rotation),
+        item.translation({
+        ClipperLib::cInt(wti.pos(0)/SCALING_FACTOR),
+        ClipperLib::cInt(wti.pos(1)/SCALING_FACTOR)
+        });
+        ret.emplace_back(nullptr, item);
+    }
+
     return ret;
 }
 
@@ -602,7 +630,8 @@ ShapeData2D projectModelFromTop(const Slic3r::Model &model) {
 void applyResult(
         IndexedPackGroup::value_type& group,
         Coord batch_offset,
-        ShapeData2D& shapemap)
+        ShapeData2D& shapemap,
+        WipeTowerInfo& wti)
 {
     for(auto& r : group) {
         auto idx = r.first;     // get the original item index
@@ -611,18 +640,25 @@ void applyResult(
         // Get the model instance from the shapemap using the index
         ModelInstance *inst_ptr = shapemap[idx].first;
 
-        // Get the transformation data from the item object and scale it
-        // appropriately
-        auto off = item.translation();
-        Radians rot = item.rotation();
+            // Get the transformation data from the item object and scale it
+            // appropriately
+            auto off = item.translation();
+            Radians rot = item.rotation();
 
-        Vec3d foff(off.X*SCALING_FACTOR + batch_offset,
-                   off.Y*SCALING_FACTOR,
-                   inst_ptr->get_offset()(Z));
+            Vec3d foff(off.X*SCALING_FACTOR + batch_offset,
+                       off.Y*SCALING_FACTOR,
+                       inst_ptr ? inst_ptr->get_offset()(Z) : 0.);
 
-        // write the transformation data into the model instance
-        inst_ptr->set_rotation(Z, rot);
-        inst_ptr->set_offset(foff);
+        if (inst_ptr) {
+            // write the transformation data into the model instance
+            inst_ptr->set_rotation(Z, rot);
+            inst_ptr->set_offset(foff);
+        }
+        else { // this is the wipe tower - we will modify the struct with the info
+               // and leave it up to the called to actually move the wipe tower
+            wti.pos = Vec2d(foff(0), foff(1));
+            wti.rotation = rot;
+        }
     }
 }
 
@@ -708,6 +744,7 @@ BedShapeHint bedShape(const Polyline &bed) {
 // The final client function to arrange the Model. A progress indicator and
 // a stop predicate can be also be passed to control the process.
 bool arrange(Model &model,              // The model with the geometries
+             WipeTowerInfo& wti,        // Wipe tower info
              coord_t min_obj_distance,  // Has to be in scaled (clipper) measure
              const Polyline &bed,       // The bed geometry.
              BedShapeHint bedhint,      // Hint about the bed geometry type.
@@ -720,7 +757,7 @@ bool arrange(Model &model,              // The model with the geometries
     bool ret = true;
 
     // Get the 2D projected shapes with their 3D model instance pointers
-    auto shapemap = arr::projectModelFromTop(model);
+    auto shapemap = arr::projectModelFromTop(model, wti);
 
     // Copy the references for the shapes only as the arranger expects a
     // sequence of objects convertible to Item or ClipperPolygon
@@ -790,7 +827,7 @@ bool arrange(Model &model,              // The model with the geometries
     if(result.empty() || stopcondition()) return false;
 
     if(first_bin_only) {
-        applyResult(result.front(), 0, shapemap);
+        applyResult(result.front(), 0, shapemap, wti);
     } else {
 
         const auto STRIDE_PADDING = 1.2;
@@ -800,7 +837,7 @@ bool arrange(Model &model,              // The model with the geometries
         Coord batch_offset = 0;
 
         for(auto& group : result) {
-            applyResult(group, batch_offset, shapemap);
+            applyResult(group, batch_offset, shapemap, wti);
 
             // Only the first pack group can be placed onto the print bed. The
             // other objects which could not fit will be placed next to the
@@ -817,10 +854,11 @@ bool arrange(Model &model,              // The model with the geometries
 void find_new_position(const Model &model,
                        ModelInstancePtrs toadd,
                        coord_t min_obj_distance,
-                       const Polyline &bed)
+                       const Polyline &bed,
+                       WipeTowerInfo& wti)
 {
     // Get the 2D projected shapes with their 3D model instance pointers
-    auto shapemap = arr::projectModelFromTop(model);
+    auto shapemap = arr::projectModelFromTop(model, wti);
 
     // Copy the references for the shapes only as the arranger expects a
     // sequence of objects convertible to Item or ClipperPolygon
diff --git a/src/libslic3r/ModelArrange.hpp b/src/libslic3r/ModelArrange.hpp
index d76769081..b61443da0 100644
--- a/src/libslic3r/ModelArrange.hpp
+++ b/src/libslic3r/ModelArrange.hpp
@@ -40,6 +40,13 @@ struct BedShapeHint {
 
 BedShapeHint bedShape(const Polyline& bed);
 
+struct WipeTowerInfo {
+    bool is_wipe_tower = false;
+    Vec2d pos;
+    Vec2d bb_size;
+    double rotation;
+};
+
 /**
  * \brief Arranges the model objects on the screen.
  *
@@ -66,7 +73,9 @@ BedShapeHint bedShape(const Polyline& bed);
  * packed. The unsigned argument is the number of items remaining to pack.
  * \param stopcondition A predicate returning true if abort is needed.
  */
-bool arrange(Model &model, coord_t min_obj_distance,
+bool arrange(Model &model,
+             WipeTowerInfo& wipe_tower_info,
+             coord_t min_obj_distance,
              const Slic3r::Polyline& bed,
              BedShapeHint bedhint,
              bool first_bin_only,
@@ -78,7 +87,8 @@ bool arrange(Model &model, coord_t min_obj_distance,
 void find_new_position(const Model& model,
                        ModelInstancePtrs instances_to_add,
                        coord_t min_obj_distance,
-                       const Slic3r::Polyline& bed);
+                       const Slic3r::Polyline& bed,
+                       WipeTowerInfo& wti);
 
 }   // arr
 }   // Slic3r
diff --git a/src/libslic3r/Point.hpp b/src/libslic3r/Point.hpp
index 2df30a61e..a411c6271 100644
--- a/src/libslic3r/Point.hpp
+++ b/src/libslic3r/Point.hpp
@@ -40,6 +40,11 @@ typedef std::vector<Vec3crd>                            Points3;
 typedef std::vector<Vec2d>                              Pointfs;
 typedef std::vector<Vec3d>                              Pointf3s;
 
+typedef Eigen::Matrix<float,  2, 2, Eigen::DontAlign> Matrix2f;
+typedef Eigen::Matrix<double, 2, 2, Eigen::DontAlign> Matrix2d;
+typedef Eigen::Matrix<float,  3, 3, Eigen::DontAlign> Matrix3f;
+typedef Eigen::Matrix<double, 3, 3, Eigen::DontAlign> Matrix3d;
+
 typedef Eigen::Transform<float,  2, Eigen::Affine, Eigen::DontAlign> Transform2f;
 typedef Eigen::Transform<double, 2, Eigen::Affine, Eigen::DontAlign> Transform2d;
 typedef Eigen::Transform<float,  3, Eigen::Affine, Eigen::DontAlign> Transform3f;
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 2a6fa7fce..dc91b1eca 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -10,7 +10,7 @@
 #include "GCode/WipeTowerPrusaMM.hpp"
 #include "Utils.hpp"
 
-#include "PrintExport.hpp"
+//#include "PrintExport.hpp"
 
 #include <libnest2d.h>
 
@@ -132,7 +132,6 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
         "first_layer_speed",
         "first_layer_infill_speed",
         "gcode_comments",
-        "gcode_flavor",
         "gcode_label_objects",
         "infill_acceleration",
         "layer_gcode",
@@ -1148,65 +1147,29 @@ std::string Print::validate() const
         // Check horizontal clearance.
         {
             Polygons convex_hulls_other;
-            for (const PrintObject *object : m_objects) {
-
-                // Get the 2D projected shapes with their 3D model instance pointers
-                //same method from ModelArrange.cpp. It's copy-pasted. 
-                // TODO: make a generic method used by that and modelarrange.
-                ClipperLib::Path clpath;
-                {
-                    TriangleMesh rmesh = object->model_object()->raw_mesh();
-                    ModelInstance * finst = object->model_object()->instances.front();
-                    // Object instances should carry the same scaling and
-                    // x, y rotation that is why we use the first instance.
-                    // The next line will apply only the full mirroring and scaling
-                    rmesh.transform(finst->get_matrix(true, true, false, false));
-                    rmesh.rotate_x(float(finst->get_rotation()(X)));
-                    rmesh.rotate_y(float(finst->get_rotation()(Y)));
-
-                    // TODO export the exact 2D projection. Cannot do it as libnest2d
-                    // does not support concave shapes (yet).
-                    auto p = rmesh.convex_hull();
-
-                    p.make_clockwise();
-                    p.append(p.first_point());
-                    clpath = Slic3rMultiPoint_to_ClipperPath(p);
-                }
-
-                std::vector<libnest2d::Item> convex_hull_items;
-                for (ModelInstance* objinst : object->model_object()->instances) {
-                    if (objinst) {
-                        ClipperLib::PolygonImpl pn;
-                        pn.Contour = clpath;
-                        // Efficient conversion to item.
-                        libnest2d::Item item(std::move(pn));
-                        // Invalid geometries would throw exceptions when arranging
-                        if (item.vertexCount() > 3) {
-                            item.rotation(objinst->get_rotation(Z));
-                            item.translation({
-                                ClipperLib::cInt(objinst->get_offset(X) / SCALING_FACTOR),
-                                ClipperLib::cInt(objinst->get_offset(Y) / SCALING_FACTOR)
-                            });
-                            convex_hull_items.push_back(item);
-                        }
-                    }
-                }
-                Polygons convex_hull;
-                for (libnest2d::Item &item : convex_hull_items){
-                    //conversion to Polygons
-                    ClipperLib::PolygonImpl var = item;
-                    ClipperLib::Path cont = var.Contour;
-                    convex_hull.push_back(ClipperPath_to_Slic3rPolygon(cont));
-                }
-                
-                // Now we check that no instance of convex_hull intersects any of the previously checked object instances.
-                for (Polygon p : convex_hull){
+            for (const PrintObject *print_object : m_objects) {
+                assert(! print_object->model_object()->instances.empty());
+                assert(! print_object->copies().empty());
+                // Get convex hull of all meshes assigned to this print object.
+                ModelInstance *model_instance0 = print_object->model_object()->instances.front();
+                Vec3d          rotation        = model_instance0->get_rotation();
+                rotation.z() = 0.;
+                // Calculate the convex hull of a printable object centered around X=0,Y=0. 
                     // Grow convex hull with the clearance margin.
-                    p = offset(p, scale_(m_config.min_object_distance() / 2), jtRound, scale_(0.1)).front();
-                    if (!intersection(convex_hulls_other, p).empty()){
+                // FIXME: Arrangement has different parameters for offsetting (jtMiter, limit 2)
+                // which causes that the warning will be showed after arrangement with the
+                // appropriate object distance. Even if I set this to jtMiter the warning still shows up.
+                Polygon        convex_hull0    = offset(
+                    print_object->model_object()->convex_hull_2d(
+                        Geometry::assemble_transform(Vec3d::Zero(), rotation, model_instance0->get_scaling_factor(), model_instance0->get_mirror())),
+                    scale_(m_config.extruder_clearance_radius.value) / 2., jtRound, scale_(0.1)).front();
+                // Now we check that no instance of convex_hull intersects any of the previously checked object instances.
+                for (const Point &copy : print_object->m_copies) {
+                    Polygon convex_hull = convex_hull0;
+                    convex_hull.translate(copy);
+                    if (! intersection(convex_hulls_other, convex_hull).empty())
                         return L("Some objects are too close; your extruder will collide with them.");
-                    }
-                    polygons_append(convex_hulls_other, p);
+                    polygons_append(convex_hulls_other, convex_hull);
                 }
             }
         }
@@ -1266,7 +1229,7 @@ std::string Print::validate() const
                 const SlicingParameters &slicing_params = object->slicing_parameters();
             if (std::abs(slicing_params.first_print_layer_height - slicing_params0.first_print_layer_height) > EPSILON ||
                 std::abs(slicing_params.layer_height             - slicing_params0.layer_height            ) > EPSILON)
-                return L("The Wipe Tower is only supported for multiple objects if they have equal layer heigths");
+                    return L("The Wipe Tower is only supported for multiple objects if they have equal layer heights");
             if (slicing_params.raft_layers() != slicing_params0.raft_layers())
                 return L("The Wipe Tower is only supported for multiple objects if they are printed over an equal number of raft layers");
             if (object->config().support_material_contact_distance_type != m_objects.front()->config().support_material_contact_distance_type
@@ -1358,7 +1321,7 @@ std::string Print::validate() const
             }
             
             // validate first_layer_height
-            double first_layer_height = object->config().get_abs_value(L("first_layer_height"));
+            double first_layer_height = object->config().get_abs_value("first_layer_height");
             double first_layer_min_nozzle_diameter;
             if (object->config().raft_layers > 0) {
                 // if we have raft layers, only support material extruder is used on first layer
@@ -1521,7 +1484,7 @@ void Print::process()
     BOOST_LOG_TRIVIAL(info) << "Staring the slicing process." << log_memory_info();
     for (PrintObject *obj : m_objects)
         obj->make_perimeters();
-    this->set_status(70, "Infilling layers");
+    this->set_status(70, L("Infilling layers"));
     for (PrintObject *obj : m_objects)
         obj->infill();
     for (PrintObject *obj : m_objects)
@@ -1529,7 +1492,7 @@ void Print::process()
     if (this->set_started(psSkirt)) {
         m_skirt.clear();
         if (this->has_skirt()) {
-            this->set_status(88, "Generating skirt");
+            this->set_status(88, L("Generating skirt"));
             if (config().complete_objects){
                 for (PrintObject *obj : m_objects){
                     //create a skirt "pattern" (one per object)
@@ -1548,7 +1511,7 @@ void Print::process()
 	if (this->set_started(psBrim)) {
         m_brim.clear();
         if (m_config.brim_width > 0) {
-            this->set_status(88, "Generating brim");
+            this->set_status(88, L("Generating brim"));
             if (config().complete_objects){
                 for (PrintObject *obj : m_objects){
                     //create a brim "pattern" (one per object)
@@ -1574,7 +1537,7 @@ void Print::process()
     if (this->set_started(psWipeTower)) {
         m_wipe_tower_data.clear();
         if (this->has_wipe_tower()) {
-            //this->set_status(95, "Generating wipe tower");
+            //this->set_status(95, L("Generating wipe tower"));
             this->_make_wipe_tower();
         }
        this->set_done(psWipeTower);
@@ -1591,12 +1554,14 @@ std::string Print::export_gcode(const std::string &path_template, GCodePreviewDa
     // output everything to a G-code file
     // The following call may die if the output_filename_format template substitution fails.
     std::string path = this->output_filepath(path_template);
-    std::string message = "Exporting G-code";
+    std::string message;
     if (! path.empty() && preview_data == nullptr) {
         // Only show the path if preview_data is not set -> running from command line.
+        message = L("Exporting G-code");
         message += " to ";
         message += path;
-    }
+    } else
+        message = L("Generating G-code");
     this->set_status(90, message);
 
     // The following line may die for multiple reasons.
@@ -1955,7 +1920,7 @@ void Print::_make_wipe_tower()
     // Check whether there are any layers in m_tool_ordering, which are marked with has_wipe_tower,
     // they print neither object, nor support. These layers are above the raft and below the object, and they
     // shall be added to the support layers to be printed.
-    // see https://github.com/prusa3d/Slic3r/issues/607
+    // see https://github.com/prusa3d/PrusaSlicer/issues/607
     {
         size_t idx_begin = size_t(-1);
         size_t idx_end   = m_wipe_tower_data.tool_ordering.layer_tools().size();
diff --git a/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp
index 8a1822f89..b06957cd4 100644
--- a/src/libslic3r/Print.hpp
+++ b/src/libslic3r/Print.hpp
@@ -132,7 +132,7 @@ public:
     // The slicing parameters are dependent on various configuration values
     // (layer height, first layer height, raft settings, print nozzle diameter etc).
     const SlicingParameters&    slicing_parameters() const { return m_slicing_params; }
-    static SlicingParameters    slicing_parameters(const DynamicPrintConfig &full_config, const ModelObject &model_object);
+    static SlicingParameters    slicing_parameters(const DynamicPrintConfig &full_config, const ModelObject &model_object, float object_max_z);
 
     // returns 0-based indices of extruders used to print the object (without brim, support and other helper extrusions)
     std::vector<unsigned int>   object_extruders() const;
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index f7f3ec366..1afe84985 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -14,7 +14,8 @@ namespace Slic3r {
 
 //! macro used to mark string used at localization, 
 //! return same string
-#define L(s) Slic3r::I18N::translate(s)
+#define L(s) (s)
+#define _(s) Slic3r::I18N::translate(s)
 
 static void assign_printer_technology_to_unknown(t_optiondef_map &options, PrinterTechnology printer_technology)
 {
@@ -45,12 +46,12 @@ void PrintConfigDef::init_common_params()
     def->enum_keys_map = &ConfigOptionEnum<PrinterTechnology>::get_enum_values();
     def->enum_values.push_back("FFF");
     def->enum_values.push_back("SLA");
-    def->default_value = new ConfigOptionEnum<PrinterTechnology>(ptFFF);
+    def->set_default_value(new ConfigOptionEnum<PrinterTechnology>(ptFFF));
 
     def = this->add("bed_shape", coPoints);
     def->label = L("Bed shape");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionPoints{ Vec2d(0, 0), Vec2d(200, 0), Vec2d(200, 200), Vec2d(0, 200) };
+    def->set_default_value(new ConfigOptionPoints{ Vec2d(0, 0), Vec2d(200, 0), Vec2d(200, 200), Vec2d(0, 200) });
     
     def = this->add("layer_height", coFloat);
     def->label = L("Base Layer height");
@@ -60,14 +61,14 @@ void PrintConfigDef::init_common_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0.3);
+    def->set_default_value(new ConfigOptionFloat(0.3));
 
     def = this->add("max_print_height", coFloat);
     def->label = L("Max print height");
     def->tooltip = L("Set this to the maximum height that can be reached by your extruder while printing.");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(200.0);
+    def->set_default_value(new ConfigOptionFloat(200.0));
 
     def = this->add("slice_closing_radius", coFloat);
     def->label = L("Slice gap closing radius");
@@ -77,28 +78,28 @@ void PrintConfigDef::init_common_params()
     def->sidetext = L("mm");
     def->min = 0;
 	def->mode = comAdvanced;
-	def->default_value = new ConfigOptionFloat(0.049);
+	def->set_default_value(new ConfigOptionFloat(0.049));
 
     def = this->add("print_host", coString);
     def->label = L("Hostname, IP or URL");
     def->tooltip = L("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.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("printhost_apikey", coString);
     def->label = L("API Key / Password");
     def->tooltip = L("Slic3r can upload G-code files to a printer host. This field should contain "
                    "the API Key or the password required for authentication.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
     
     def = this->add("printhost_cafile", coString);
-    def->label = "HTTPS CA File";
-    def->tooltip = "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.";
+    def->label = L("HTTPS CA File");
+    def->tooltip = L("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.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 }
 
 void PrintConfigDef::init_fff_params()
@@ -115,7 +116,7 @@ void PrintConfigDef::init_fff_params()
                    "This is mostly useful with Bowden extruders which suffer from oozing. "
                    "This feature slows down both the print and the G-code generation.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("bed_temperature", coInts);
     def->label = L("Other layers");
@@ -125,7 +126,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("°C");
     def->min = 0;
     def->max = 300;
-    def->default_value = new ConfigOptionInts { 0 };
+    def->set_default_value(new ConfigOptionInts { 0 });
 
     def = this->add("before_layer_gcode", coString);
     def->label = L("Before layer change G-code");
@@ -134,25 +135,26 @@ void PrintConfigDef::init_fff_params()
                    "as [layer_num] and [layer_z].");
     def->multiline = true;
     def->full_width = true;
-    def->height = 50;
+    def->height = 5;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("between_objects_gcode", coString);
     def->label = L("Between objects G-code");
     def->tooltip = L("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.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 120;
+    def->height = 12;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("bottom_solid_layers", coInt);
+    //TRN To be shown in Print Settings "Bottom solid layers"
     def->label = L("Bottom");
     def->category = L("Layers and Perimeters");
     def->tooltip = L("Number of solid layers to generate on bottom surfaces.");
     def->full_label = L("Bottom solid layers");    def->min = 0;
-    def->default_value = new ConfigOptionInt(3);
+    def->set_default_value(new ConfigOptionInt(3));
 
     def = this->add("bridge_acceleration", coFloat);
     def->label = L("Bridge");
@@ -162,7 +164,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s²");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("bridge_angle", coFloat);
     def->label = L("Bridging");
@@ -174,7 +176,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("°");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0.);
+    def->set_default_value(new ConfigOptionFloat(0.));
 
     def = this->add("bridge_fan_speed", coInts);
     def->label = L("Bridges fan speed");
@@ -183,7 +185,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 100;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInts { 100 };
+    def->set_default_value(new ConfigOptionInts { 100 });
 
     def = this->add("top_fan_speed", coInts);
     def->label = L("Top fan speed");
@@ -192,7 +194,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 100;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInts{ 100 };
+    def->set_default_value(new ConfigOptionInts{ 100 });
 
     def = this->add("bridge_flow_ratio", coFloat);
     def->label = L("Bridge");
@@ -205,7 +207,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 2;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(1);
+	def->set_default_value(new ConfigOptionFloat(1));
 
     def = this->add("over_bridge_flow_ratio", coFloat);
     def->label = L("Above the bridges");
@@ -216,7 +218,7 @@ void PrintConfigDef::init_fff_params()
         " You can increase it slightly to pull the top layer at the correct height. Recommended maximum: 1.2.");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(1);
+    def->set_default_value(new ConfigOptionFloat(1));
 
     def = this->add("bridge_speed", coFloat);
     def->label = L("Bridges");
@@ -227,7 +229,7 @@ void PrintConfigDef::init_fff_params()
     def->aliases = { "bridge_feed_rate" };
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(60);
+    def->set_default_value(new ConfigOptionFloat(60));
 
     def = this->add("brim_width", coFloat);
     def->label = L("Brim width");
@@ -235,13 +237,13 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comSimple;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("brim_ears", coBool);
     def->label = L(" ");
     def->full_label = L("Brim ears");
     def->tooltip = L("Only draw brim over the sharp edges of the model.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("brim_ears_max_angle", coFloat);
     def->label = L("max angle");
@@ -249,7 +251,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("°");
     def->min = 0;
     def->max = 180;
-    def->default_value = new ConfigOptionFloat(125);
+    def->set_default_value(new ConfigOptionFloat(125));
 
     def = this->add("chamber_temperature", coInts);
     def->label = L("Chamber");
@@ -259,25 +261,25 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 300;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInts{ 0 };
+    def->set_default_value(new ConfigOptionInts{ 0 });
 
     def = this->add("clip_multipart_objects", coBool);
     def->label = L("Clip multi-part objects");
-    def->tooltip = L("When printing multi-material objects, this settings will make slic3r "
+    def->tooltip = L("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).");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("colorprint_heights", coFloats);
     def->label = L("Colorprint height");
     def->tooltip = L("Heights at which a filament change is to occur. ");
-    def->default_value = new ConfigOptionFloats { };
+    def->set_default_value(new ConfigOptionFloats { });
 
     def = this->add("compatible_printers", coStrings);
     def->label = L("Compatible printers");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionStrings();
+    def->set_default_value(new ConfigOptionStrings());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("compatible_printers_condition", coString);
@@ -286,13 +288,13 @@ void PrintConfigDef::init_fff_params()
                    "If this expression evaluates to true, this profile is considered compatible "
                    "with the active printer profile.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("compatible_prints", coStrings);
     def->label = L("Compatible print profiles");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionStrings();
+    def->set_default_value(new ConfigOptionStrings());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("compatible_prints_condition", coString);
@@ -301,16 +303,16 @@ void PrintConfigDef::init_fff_params()
                    "If this expression evaluates to true, this profile is considered compatible "
                    "with the active print profile.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     // The following value is to be stored into the project file (AMF, 3MF, Config ...)
     // and it contains a sum of "compatible_printers_condition" values over the print and filament profiles.
     def = this->add("compatible_printers_condition_cummulative", coStrings);
-    def->default_value = new ConfigOptionStrings();
+    def->set_default_value(new ConfigOptionStrings());
     def->cli = ConfigOptionDef::nocli;
     def = this->add("compatible_prints_condition_cummulative", coStrings);
-    def->default_value = new ConfigOptionStrings();
+    def->set_default_value(new ConfigOptionStrings());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("complete_objects", coBool);
@@ -320,30 +322,30 @@ void PrintConfigDef::init_fff_params()
                    "This feature is useful to avoid the risk of ruined prints. "
                    "Slic3r should warn and prevent you from extruder collisions, but beware.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("cooling", coBools);
     def->label = L("Enable auto cooling");
     def->tooltip = L("This flag enables the automatic cooling logic that adjusts print speed "
                    "and fan speed according to layer printing time.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBools { true };
+    def->set_default_value(new ConfigOptionBools { true });
 
     def = this->add("cooling_tube_retraction", coFloat);
     def->label = L("Cooling tube position");
-    def->tooltip = L("Distance of the center-point of the cooling tube from the extruder tip ");
+    def->tooltip = L("Distance of the center-point of the cooling tube from the extruder tip.");
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(91.5f);
+    def->set_default_value(new ConfigOptionFloat(91.5f));
 
     def = this->add("cooling_tube_length", coFloat);
     def->label = L("Cooling tube length");
-    def->tooltip = L("Length of the cooling tube to limit space for cooling moves inside it ");
+    def->tooltip = L("Length of the cooling tube to limit space for cooling moves inside it.");
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(5.f);
+    def->set_default_value(new ConfigOptionFloat(5.f));
 
     def = this->add("default_acceleration", coFloat);
     def->label = L("Default");
@@ -354,20 +356,20 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s²");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("default_filament_profile", coStrings);
     def->label = L("Default filament profile");
     def->tooltip = L("Default filament profile associated with the current printer profile. "
                    "On selection of the current printer profile, this filament profile will be activated.");
-    def->default_value = new ConfigOptionStrings();
+    def->set_default_value(new ConfigOptionStrings());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("default_print_profile", coString);
     def->label = L("Default print profile");
     def->tooltip = L("Default print profile associated with the current printer profile. "
                    "On selection of the current printer profile, this print profile will be activated.");
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("disable_fan_first_layers", coInts);
@@ -378,7 +380,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 1000;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInts { 3 };
+    def->set_default_value(new ConfigOptionInts { 3 });
 
     def = this->add("dont_support_bridges", coBool);
     def->label = L("Don't support bridges");
@@ -386,7 +388,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Experimental option for preventing support material from being generated "
                    "under bridged areas.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("duplicate_distance", coFloat);
     def->label = L("Distance between copies");
@@ -394,7 +396,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->aliases = { "multiply_distance" };
     def->min = 0;
-    def->default_value = new ConfigOptionFloat(6);
+    def->set_default_value(new ConfigOptionFloat(6));
 
     def = this->add("elefant_foot_compensation", coFloat);
     def->label = L("First layer");
@@ -404,7 +406,7 @@ void PrintConfigDef::init_fff_params()
                    "to compensate for the 1st layer squish aka an Elephant Foot effect. (should be negative = inwards)");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("end_gcode", coString);
     def->label = L("End G-code");
@@ -412,9 +414,9 @@ void PrintConfigDef::init_fff_params()
                    "Note that you can use placeholder variables for all Slic3r settings.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 120;
+    def->height = 12;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString("M104 S0 ; turn off temperature\nG28 X0  ; home X axis\nM84     ; disable motors\n");
+    def->set_default_value(new ConfigOptionString("M104 S0 ; turn off temperature\nG28 X0  ; home X axis\nM84     ; disable motors\n"));
 
     def = this->add("end_filament_gcode", coStrings);
     def->label = L("End G-code");
@@ -426,7 +428,7 @@ void PrintConfigDef::init_fff_params()
     def->full_width = true;
     def->height = 120;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionStrings { "; Filament-specific end gcode \n;END gcode for filament\n" };
+    def->set_default_value(new ConfigOptionStrings { "; Filament-specific end gcode \n;END gcode for filament\n" });
 
     def = this->add("ensure_vertical_shell_thickness", coBool);
     def->label = L("Ensure vertical shell thickness");
@@ -434,7 +436,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Add solid infill near sloping surfaces to guarantee the vertical shell thickness "
                    "(top+bottom solid layers).");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("top_fill_pattern", coEnum);
     def->label = L("Top");
@@ -463,7 +465,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Octagram Spiral"));
     def->enum_labels.push_back(L("Sawtooth"));
     def->enum_labels.push_back(L("Ironing"));
-    def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinear);
+    def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipRectilinear));
 
     def = this->add("bottom_fill_pattern", coEnum);
     def->label = L("Bottom");
@@ -489,7 +491,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Octagram Spiral"));
     def->enum_labels.push_back(L("Ironing"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinear);
+    def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipRectilinear));
 
     def = this->add("solid_fill_pattern", coEnum);
     def->label = L("Solid pattern");
@@ -514,7 +516,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Archimedean Chords"));
     def->enum_labels.push_back(L("Octagram Spiral"));
     def->mode = comExpert;
-    def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinearWGapFill);
+    def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipRectilinearWGapFill));
 
     def = this->add("enforce_full_fill_volume", coBool);
     def->label = L("Enforce 100% fill volume");
@@ -524,7 +526,7 @@ void PrintConfigDef::init_fff_params()
         "but it can go as high as +50% for infill in very small areas where rectilinear doesn't have good coverage). It has the advantage "
         "to remove the over-extrusion seen in thin infill areas, from the overlap ratio");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("external_infill_margin", coFloatOrPercent);
     def->label = L("Default");
@@ -534,7 +536,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloatOrPercent(150, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(150, true));
 
     def = this->add("bridged_infill_margin", coFloatOrPercent);
     def->label = L("Bridged");
@@ -544,7 +546,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloatOrPercent(200, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(200, true));
 
     def = this->add("external_perimeter_extrusion_width", coFloatOrPercent);
     def->label = L("External perimeters");
@@ -553,9 +555,9 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("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 112.5%), it will be computed over nozzle diameter.");
-    def->sidetext = L("mm or % (leave 0 for default)");
+    def->sidetext = L("mm or %");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
 
     def = this->add("external_perimeter_speed", coFloatOrPercent);
     def->label = L("External");
@@ -568,7 +570,7 @@ void PrintConfigDef::init_fff_params()
     def->ratio_over = "perimeter_speed";
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(50, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(50, true));
 
     def = this->add("external_perimeters_first", coBool);
     def->label = L("External perimeters first");
@@ -576,7 +578,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Print contour perimeters from the outermost one to the innermost one "
         "instead of the default inverse order.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("perimeter_loop", coBool);
     def->label = L(" ");
@@ -585,7 +587,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Join the perimeters to create only one continuous extrusion without any z-hop."
         " Long inside travel (from external to holes) are not extruded to give some space to the infill.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
     
     def = this->add("perimeter_loop_seam", coEnum);
     def->label = L("Seam position");
@@ -598,7 +600,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Nearest"));
     def->enum_labels.push_back(L("Rear"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<SeamPosition>(spRear); 
+    def->set_default_value(new ConfigOptionEnum<SeamPosition>(spRear)); 
     
     def = this->add("extra_perimeters", coBool);
     def->label = L("Extra perimeters if needed");
@@ -608,13 +610,13 @@ void PrintConfigDef::init_fff_params()
                    "is supported, and keep adding periemter until all overhangs are filled."
                    "\n!! this is a very slow algorithm !!");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("only_one_perimeter_top", coBool);
     def->label = "Only one perimeter on Top surfaces";
     def->category = "Layers and Perimeters";
     def->tooltip = "Use only one perimeter on flat top surface, to let more space to the top infill pattern.";
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
 
     def = this->add("extruder", coInt);
@@ -645,7 +647,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(20);
+    def->set_default_value(new ConfigOptionFloat(20));
 
     def = this->add("extruder_clearance_radius", coFloat);
     def->label = L("Radius");
@@ -657,7 +659,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(20);
+    def->set_default_value(new ConfigOptionFloat(20));
 
     def = this->add("extruder_colour", coStrings);
     def->label = L("Extruder Color");
@@ -665,7 +667,7 @@ void PrintConfigDef::init_fff_params()
     def->gui_type = "color";
     // Empty string means no color assigned yet.
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionStrings { "" };
+    def->set_default_value(new ConfigOptionStrings{ "" });
 
     def = this->add("extruder_offset", coPoints);
     def->label = L("Extruder offset");
@@ -675,13 +677,13 @@ void PrintConfigDef::init_fff_params()
                    "from the XY coordinate).");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionPoints { Vec2d(0,0) };
+    def->set_default_value(new ConfigOptionPoints { Vec2d(0,0) });
 
     def = this->add("extrusion_axis", coString);
     def->label = L("Extrusion axis");
     def->tooltip = L("Use this option to set the axis letter associated to your printer's extruder "
                    "(usually E but some printers use A).");
-    def->default_value = new ConfigOptionString("E");
+    def->set_default_value(new ConfigOptionString("E"));
 
     def = this->add("extrusion_multiplier", coFloats);
     def->label = L("Extrusion multiplier");
@@ -690,7 +692,7 @@ void PrintConfigDef::init_fff_params()
                    "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.");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionFloats { 1. };
+    def->set_default_value(new ConfigOptionFloats { 1. });
     
     def = this->add("extrusion_width", coFloatOrPercent);
     def->label = L("Default extrusion width");
@@ -699,27 +701,27 @@ void PrintConfigDef::init_fff_params()
                    "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: 105%), it will be computed over nozzle diameter.");
-    def->sidetext = L("mm or % (leave 0 for auto)");
+    def->sidetext = L("mm or %");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
 
     def = this->add("fan_always_on", coBools);
     def->label = L("Keep fan always on");
     def->tooltip = L("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.");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionBools { false };
+    def->set_default_value(new ConfigOptionBools{ false });
 
     def = this->add("fan_below_layer_time", coInts);
     def->label = L("Enable fan if layer print time is below");
     def->tooltip = L("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.");
     def->sidetext = L("approximate seconds");
-    def->width = 60;
+    def->width = 6;
     def->min = 0;
     def->max = 1000;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInts { 60 };
+    def->set_default_value(new ConfigOptionInts { 60 });
 
     def = this->add("filament_colour", coStrings);
     def->label = L("Color");
@@ -727,16 +729,16 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("This is only used in the Slic3r interface as a visual help.");
     def->gui_type = "color";
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionStrings { "#29B2B2" };
+    def->set_default_value(new ConfigOptionStrings{ "#29B2B2" });
 
     def = this->add("filament_notes", coStrings);
     def->label = L("Filament notes");
     def->tooltip = L("You can put your notes regarding the filament here.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 130;
+    def->height = 13;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionStrings { "" };
+    def->set_default_value(new ConfigOptionStrings { "" });
 
     def = this->add("filament_max_volumetric_speed", coFloats);
     def->label = L("Max volumetric speed");
@@ -746,7 +748,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm³/s");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("filament_max_wipe_tower_speed", coFloats);
     def->label = L("Max speed on the wipe tower");
@@ -755,7 +757,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 200;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 0 };
+    def->set_default_value(new ConfigOptionFloats { 0 });
 
     def = this->add("filament_loading_speed", coFloats);
     def->label = L("Loading speed");
@@ -763,7 +765,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 28. };
+    def->set_default_value(new ConfigOptionFloats { 28. });
 
     def = this->add("filament_loading_speed_start", coFloats);
     def->label = L("Loading speed at the start");
@@ -771,7 +773,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 3. };
+    def->set_default_value(new ConfigOptionFloats { 3. });
 
     def = this->add("filament_unloading_speed", coFloats);
     def->label = L("Unloading speed");
@@ -780,7 +782,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 90. };
+    def->set_default_value(new ConfigOptionFloats { 90. });
 
     def = this->add("filament_unloading_speed_start", coFloats);
     def->label = L("Unloading speed at the start");
@@ -788,7 +790,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 100. };
+    def->set_default_value(new ConfigOptionFloats { 100. });
 
     def = this->add("filament_toolchange_delay", coFloats);
     def->label = L("Delay after unloading");
@@ -798,16 +800,16 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("filament_cooling_moves", coInts);
     def->label = L("Number of cooling moves");
     def->tooltip = L("Filament is cooled by being moved back and forth in the "
-                   "cooling tubes. Specify desired number of these moves ");
+                   "cooling tubes. Specify desired number of these moves.");
     def->max = 0;
     def->max = 20;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInts { 4 };
+    def->set_default_value(new ConfigOptionInts { 4 });
 
     def = this->add("filament_cooling_initial_speed", coFloats);
     def->label = L("Speed of the first cooling move");
@@ -815,7 +817,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 2.2f };
+    def->set_default_value(new ConfigOptionFloats { 2.2f });
 
     def = this->add("filament_minimal_purge_on_wipe_tower", coFloats);
     def->label = L("Minimal purge on wipe tower");
@@ -826,7 +828,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm³");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 15.f };
+    def->set_default_value(new ConfigOptionFloats { 15.f });
 
     def = this->add("filament_cooling_final_speed", coFloats);
     def->label = L("Speed of the last cooling move");
@@ -834,7 +836,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 3.4f };
+    def->set_default_value(new ConfigOptionFloats { 3.4f });
 
     def = this->add("filament_load_time", coFloats);
     def->label = L("Filament load time");
@@ -842,14 +844,14 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 0.0f };
+    def->set_default_value(new ConfigOptionFloats { 0.0f });
 
     def = this->add("filament_ramming_parameters", coStrings);
     def->label = L("Ramming parameters");
-    def->tooltip = L("This string is edited by RammingDialog and contains ramming specific parameters ");
+    def->tooltip = L("This string is edited by RammingDialog and contains ramming specific parameters.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionStrings { "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0|"
-       " 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" };
+    def->set_default_value(new ConfigOptionStrings { "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0|"
+	   " 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" });
 
     def = this->add("filament_unload_time", coFloats);
     def->label = L("Filament unload time");
@@ -857,7 +859,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 0.0f };
+    def->set_default_value(new ConfigOptionFloats { 0.0f });
 
     def = this->add("filament_diameter", coFloats);
     def->label = L("Diameter");
@@ -866,7 +868,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0; 
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 3. };
+    def->set_default_value(new ConfigOptionFloats{ 1.75 });
 
     def = this->add("filament_density", coFloats);
     def->label = L("Density");
@@ -876,7 +878,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("g/cm³");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats{ 0. });
 
     def = this->add("filament_type", coStrings);
     def->label = L("Filament type");
@@ -903,23 +905,23 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("other8");
     def->enum_values.push_back("other9");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionStrings { "PLA" };
+    def->set_default_value(new ConfigOptionStrings { "PLA" });
 
     def = this->add("filament_soluble", coBools);
     def->label = L("Soluble material");
     def->tooltip = L("Soluble material is most likely used for a soluble support.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBools { false };
+    def->set_default_value(new ConfigOptionBools { false });
 
     def = this->add("filament_cost", coFloats);
     def->label = L("Cost");
     def->tooltip = L("Enter your filament cost per kg here. This is only for statistical information.");
     def->sidetext = L("money/kg");
     def->min = 0;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
     
     def = this->add("filament_settings_id", coStrings);
-    def->default_value = new ConfigOptionStrings { "" };
+    def->set_default_value(new ConfigOptionStrings { "" });
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("fill_angle", coFloat);
@@ -933,7 +935,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 360;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(45);
+    def->set_default_value(new ConfigOptionFloat(45));
 
     def = this->add("fill_density", coPercent);
     def->gui_type = "f_enum_open";
@@ -973,6 +975,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back("80%");
     def->enum_labels.push_back("90%");
     def->enum_labels.push_back("100%");
+    def->set_default_value(new ConfigOptionPercent(20);
     */
     def->enum_values.push_back("0");
     def->enum_values.push_back("4");
@@ -1000,7 +1003,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back("55");
     def->enum_labels.push_back("75");
     def->enum_labels.push_back("100");
-    def->default_value = new ConfigOptionPercent(18);
+    def->set_default_value(new ConfigOptionPercent(18));
 
     def = this->add("fill_pattern", coEnum);
     def->label = L("Pattern");
@@ -1036,7 +1039,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Archimedean Chords"));
     def->enum_labels.push_back(L("Octagram Spiral"));
     def->enum_labels.push_back(L("Scattered Rectilinear"));
-    def->default_value = new ConfigOptionEnum<InfillPattern>(ipStars);
+    def->set_default_value( new ConfigOptionEnum<InfillPattern>(ipStars));
 
     def = this->add("first_layer_acceleration", coFloat);
     def->label = L("First layer");
@@ -1046,7 +1049,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s²");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("first_layer_bed_temperature", coInts);
     def->label = L("First layer");
@@ -1056,7 +1059,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("°C");
     def->max = 0;
     def->max = 300;
-    def->default_value = new ConfigOptionInts { 0 };
+    def->set_default_value(new ConfigOptionInts { 0 });
 
     def = this->add("first_layer_extrusion_width", coFloatOrPercent);
     def->label = L("First layer");
@@ -1067,10 +1070,10 @@ void PrintConfigDef::init_fff_params()
                    "as percentage (for example 140%) it will be computed over the nozzle diameter "
                    "of the nozzle used for the type of extrusion. "
                    "If set to zero, it will use the default extrusion width.");
-    def->sidetext = L("mm or % (leave 0 for default)");
+    def->sidetext = L("mm or %");
     def->ratio_over = "first_layer_height";
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(140, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(140, true));
 
     def = this->add("first_layer_height", coFloatOrPercent);
     def->label = L("First layer height");
@@ -1082,7 +1085,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm or %");
     def->ratio_over = "layer_height";
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0.35, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0.35, false));
 
     def = this->add("first_layer_speed", coFloatOrPercent);
     def->label = L("Default");
@@ -1094,7 +1097,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s or %");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(30, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(30, false));
     
     def = this->add("first_layer_infill_speed", coFloatOrPercent);
     def->label = L("Infill");
@@ -1106,7 +1109,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s or %");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloatOrPercent(30, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(30, false));
     
     def = this->add("first_layer_temperature", coInts);
     def->label = L("First layer");
@@ -1116,7 +1119,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("°C");
     def->min = 0;
     def->max = max_temp;
-    def->default_value = new ConfigOptionInts{ 200 };
+    def->set_default_value(new ConfigOptionInts { 200 });
 
     def = this->add("gap_fill", coBool);
     def->label = L("Gap fill");
@@ -1124,7 +1127,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Enable gap fill algorithm. It will extrude small lines between perimeters "
         "when there is not enough space for another perimeter or an infill.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("gap_fill_speed", coFloat);
     def->label = L("Gap fill");
@@ -1135,7 +1138,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(20);
+    def->set_default_value(new ConfigOptionFloat(20));
 
     def = this->add("gcode_comments", coBool);
     def->label = L("Verbose G-code");
@@ -1143,7 +1146,7 @@ void PrintConfigDef::init_fff_params()
         "If you print from SD card, the additional weight of the file could make your firmware "
         "slow down.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(0);
+    def->set_default_value(new ConfigOptionBool(0));
 
     def = this->add("gcode_flavor", coEnum);
     def->label = L("G-code flavor");
@@ -1172,16 +1175,16 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back("Smoothie");
     def->enum_labels.push_back(L("No extrusion"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<GCodeFlavor>(gcfRepRap);
+    def->set_default_value(new ConfigOptionEnum<GCodeFlavor>(gcfRepRap));
 
     def = this->add("gcode_label_objects", coBool);
-    def->label = "Label objects";
-    def->tooltip = "Enable this to add comments into the G-Code labeling print moves with what object they belong to,"
+    def->label = L("Label objects");
+    def->tooltip = L("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.";
+                   "Single Extruder Multi Material setup and Wipe into Object / Wipe into Infill.");
     def->aliases = { "label_printed_objects" };
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(1);
+    def->set_default_value(new ConfigOptionBool(1));
 
     def = this->add("high_current_on_filament_swap", coBool);
     def->label = L("High extruder current on filament swap");
@@ -1189,7 +1192,7 @@ void PrintConfigDef::init_fff_params()
                    " sequence to allow for rapid ramming feed rates and to overcome resistance when loading"
                    " a filament with an ugly shaped tip.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(0);
+    def->set_default_value(new ConfigOptionBool(0));
 
     def = this->add("infill_acceleration", coFloat);
     def->label = L("Infill");
@@ -1199,7 +1202,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s²");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("infill_every_layers", coInt);
     def->label = L("Combine infill every");
@@ -1210,7 +1213,7 @@ void PrintConfigDef::init_fff_params()
     def->full_label = L("Combine infill every n layers");
     def->min = 1;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
 
     def = this->add("infill_dense", coBool);
     def->label = ("");
@@ -1219,14 +1222,14 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Enables the creation of a support layer under the first solid layer. This allows you to use a lower infill ratio without compromising the top quality."
         " The dense infill is laid out with a 50% infill density.");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("infill_not_connected", coBool);
     def->label = ("Do not connect infill lines to each other");
     def->category = L("Infill");
     def->tooltip = L("If checked, the infill algorithm will try to not connect the lines near the infill. Can be useful for art or with high infill/perimeter overlap.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
     
     def = this->add("infill_dense_algo", coEnum);
     def->label = L("Algorithm");
@@ -1242,7 +1245,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Automatic, only for small areas"));
     def->enum_labels.push_back(L("Anchored"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<DenseInfillAlgo>(dfaAutomatic);
+    def->set_default_value(new ConfigOptionEnum<DenseInfillAlgo>(dfaAutomatic));
 
     def = this->add("infill_extruder", coInt);
     def->label = L("Infill extruder");
@@ -1250,7 +1253,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The extruder to use when printing infill.");
     def->min = 1;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
 
     def = this->add("infill_extrusion_width", coFloatOrPercent);
     def->label = L("Infill");
@@ -1259,16 +1262,16 @@ void PrintConfigDef::init_fff_params()
                    "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 110%) it will be computed over nozzle diameter.");
-    def->sidetext = L("mm or % (leave 0 for default)");
+    def->sidetext = L("mm or %");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
 
     def = this->add("infill_first", coBool);
     def->label = L("Infill before perimeters");
     def->category = L("Infill");
     def->tooltip = L("This option will switch the print order of perimeters and infill, making the latter first.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("infill_only_where_needed", coBool);
     def->label = L("Only infill where needed");
@@ -1277,7 +1280,7 @@ void PrintConfigDef::init_fff_params()
                    "(it will act as internal support material). If enabled, slows down the G-code generation "
                    "due to the multiple checks involved.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("infill_overlap", coFloatOrPercent);
     def->label = L("Infill/perimeters overlap");
@@ -1288,7 +1291,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm or %");
     def->ratio_over = "perimeter_extrusion_width";
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloatOrPercent(25, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(25, true));
 
     def = this->add("infill_speed", coFloat);
     def->label = L("Sparse");
@@ -1299,20 +1302,20 @@ void PrintConfigDef::init_fff_params()
     def->aliases = { "print_feed_rate", "infill_feed_rate" };
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(80);
+    def->set_default_value(new ConfigOptionFloat(80));
 
     def = this->add("inherits", coString);
     def->label = L("Inherits profile");
     def->tooltip = L("Name of the profile, from which this profile inherits.");
     def->full_width = true;
-    def->height = 50;
-    def->default_value = new ConfigOptionString();
+    def->height = 5;
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     // The following value is to be stored into the project file (AMF, 3MF, Config ...)
     // and it contains a sum of "inherits" values over the print and filament profiles.
     def = this->add("inherits_cummulative", coStrings);
-    def->default_value = new ConfigOptionStrings();
+    def->set_default_value(new ConfigOptionStrings());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("interface_shells", coBool);
@@ -1322,7 +1325,7 @@ void PrintConfigDef::init_fff_params()
                    "support material.");
     def->category = L("Layers and Perimeters");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("layer_gcode", coString);
     def->label = L("After layer change G-code");
@@ -1332,16 +1335,16 @@ void PrintConfigDef::init_fff_params()
     def->cli = "after-layer-gcode|layer-gcode";
     def->multiline = true;
     def->full_width = true;
-    def->height = 50;
+    def->height = 5;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("exact_last_layer_height", coBool);
     def->label = L("Exact last layer height");
     def->category = L("Layers and Perimeters");
     def->tooltip = L("This setting controls the height of last object layers to put the last layer at the exact highest height possible. Experimental.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("remaining_times", coBool);
     def->label = L("Supports remaining times");
@@ -1351,14 +1354,14 @@ void PrintConfigDef::init_fff_params()
                      " As of now only the Prusa i3 MK3 firmware recognizes M73."
                      " Also the i3 MK3 firmware supports M73 Qxx Sxx for the silent mode.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
 	def = this->add("silent_mode", coBool);
-    def->label = L("Supports silent mode");
+    def->label = L("Supports stealth mode");
     def->category = L("Firmware");
-	def->tooltip = L("Set silent mode for the G-code flavor");
+    def->tooltip = L("The firmware supports stealth mode");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("fan_speedup_time", coFloat);
     def->label = L("fan startup delay");
@@ -1367,7 +1370,7 @@ void PrintConfigDef::init_fff_params()
         " It assume infinite acceleration for this time estimation, and only takes into account G1 and G0 moves. Use 0 to deactivate, negative to remove the 'D' option.");
     def->sidetext = L("s");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
 	const int machine_limits_opt_width = 70;
 	{
@@ -1388,34 +1391,58 @@ void PrintConfigDef::init_fff_params()
 			std::string axis_upper = boost::to_upper_copy<std::string>(axis.name);
 			// Add the machine feedrate limits for XYZE axes. (M203)
 			def = this->add("machine_max_feedrate_" + axis.name, coFloats);
-			def->full_label = (boost::format(L("Maximum feedrate %1%")) % axis_upper).str();
+			def->full_label = (boost::format("Maximum feedrate %1%") % axis_upper).str();
+			L("Maximum feedrate X");
+			L("Maximum feedrate Y");
+			L("Maximum feedrate Z");
+			L("Maximum feedrate E");
 			def->category = L("Machine limits");
-			def->tooltip  = (boost::format(L("Maximum feedrate of the %1% axis")) % axis_upper).str();
+			def->tooltip  = (boost::format("Maximum feedrate of the %1% axis") % axis_upper).str();
+			L("Maximum feedrate of the X axis");
+			L("Maximum feedrate of the Y axis");
+			L("Maximum feedrate of the Z axis");
+			L("Maximum feedrate of the E axis");
 			def->sidetext = L("mm/s");
 			def->min = 0;
 			def->width = machine_limits_opt_width;
             def->mode = comAdvanced;
-			def->default_value = new ConfigOptionFloats(axis.max_feedrate);
+			def->set_default_value(new ConfigOptionFloats(axis.max_feedrate));
 			// Add the machine acceleration limits for XYZE axes (M201)
 			def = this->add("machine_max_acceleration_" + axis.name, coFloats);
-			def->full_label = (boost::format(L("Maximum acceleration %1%")) % axis_upper).str();
+			def->full_label = (boost::format("Maximum acceleration %1%") % axis_upper).str();
+			L("Maximum acceleration X");
+			L("Maximum acceleration Y");
+			L("Maximum acceleration Z");
+			L("Maximum acceleration E");
 			def->category = L("Machine limits");
-			def->tooltip  = (boost::format(L("Maximum acceleration of the %1% axis")) % axis_upper).str();
+			def->tooltip  = (boost::format("Maximum acceleration of the %1% axis") % axis_upper).str();
+			L("Maximum acceleration of the X axis");
+			L("Maximum acceleration of the Y axis");
+			L("Maximum acceleration of the Z axis");
+			L("Maximum acceleration of the E axis");
 			def->sidetext = L("mm/s²");
 			def->min = 0;
 			def->width = machine_limits_opt_width;
             def->mode = comAdvanced;
-			def->default_value = new ConfigOptionFloats(axis.max_acceleration);
+			def->set_default_value(new ConfigOptionFloats(axis.max_acceleration));
 			// Add the machine jerk limits for XYZE axes (M205)
 			def = this->add("machine_max_jerk_" + axis.name, coFloats);
-			def->full_label = (boost::format(L("Maximum jerk %1%")) % axis_upper).str();
+			def->full_label = (boost::format("Maximum jerk %1%") % axis_upper).str();
+			L("Maximum jerk X");
+			L("Maximum jerk Y");
+			L("Maximum jerk Z");
+			L("Maximum jerk E");
 			def->category = L("Machine limits");
-			def->tooltip  = (boost::format(L("Maximum jerk of the %1% axis")) % axis_upper).str();
+			def->tooltip  = (boost::format("Maximum jerk of the %1% axis") % axis_upper).str();
+			L("Maximum jerk of the X axis");
+			L("Maximum jerk of the Y axis");
+			L("Maximum jerk of the Z axis");
+			L("Maximum jerk of the E axis");
 			def->sidetext = L("mm/s");
 			def->min = 0;
 			def->width = machine_limits_opt_width;
             def->mode = comAdvanced;
-			def->default_value = new ConfigOptionFloats(axis.max_jerk);
+			def->set_default_value(new ConfigOptionFloats(axis.max_jerk));
 		}
 	}
 
@@ -1423,45 +1450,45 @@ void PrintConfigDef::init_fff_params()
     def = this->add("machine_min_extruding_rate", coFloats);
     def->full_label = L("Minimum feedrate when extruding");
     def->category = L("Machine limits");
-    def->tooltip = L("Minimum feedrate when extruding") + " (M205 S)";
+    def->tooltip = L("Minimum feedrate when extruding (M205 S)");
     def->sidetext = L("mm/s");
     def->min = 0;
     def->width = machine_limits_opt_width;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats{ 0., 0. };
+	def->set_default_value(new ConfigOptionFloats{ 0., 0. });
 
     // M205 T... [mm/sec]
     def = this->add("machine_min_travel_rate", coFloats);
     def->full_label = L("Minimum travel feedrate");
     def->category = L("Machine limits");
-    def->tooltip = L("Minimum travel feedrate") + " (M205 T)";
+    def->tooltip = L("Minimum travel feedrate (M205 T)");
     def->sidetext = L("mm/s");
     def->min = 0;
     def->width = machine_limits_opt_width;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats{ 0., 0. };
+	def->set_default_value(new ConfigOptionFloats{ 0., 0. });
 
     // M204 S... [mm/sec^2]
     def = this->add("machine_max_acceleration_extruding", coFloats);
     def->full_label = L("Maximum acceleration when extruding");
     def->category = L("Machine limits");
-    def->tooltip = L("Maximum acceleration when extruding") + " (M204 S)";
+    def->tooltip = L("Maximum acceleration when extruding (M204 S)");
     def->sidetext = L("mm/s²");
     def->min = 0;
     def->width = machine_limits_opt_width;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats{ 1500., 1250. };
+    def->set_default_value(new ConfigOptionFloats{ 1500., 1250. });
 
     // M204 T... [mm/sec^2]
     def = this->add("machine_max_acceleration_retracting", coFloats);
     def->full_label = L("Maximum acceleration when retracting");
     def->category = L("Machine limits");
-    def->tooltip = L("Maximum acceleration when retracting") + " (M204 T)";
+    def->tooltip = L("Maximum acceleration when retracting (M204 T)");
     def->sidetext = L("mm/s²");
     def->min = 0;
     def->width = machine_limits_opt_width;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats{ 1500., 1250. };
+    def->set_default_value(new ConfigOptionFloats{ 1500., 1250. });
 
     def = this->add("max_fan_speed", coInts);
     def->label = L("Max");
@@ -1471,7 +1498,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 100;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInts { 100 };
+    def->set_default_value(new ConfigOptionInts { 100 });
 
     def = this->add("max_layer_height", coFloats);
     def->label = L("Max");
@@ -1483,7 +1510,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comSimple;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("max_print_speed", coFloat);
     def->label = L("Max print speed");
@@ -1493,7 +1520,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 1;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(80);
+    def->set_default_value(new ConfigOptionFloat(80));
 
     def = this->add("max_volumetric_speed", coFloat);
     def->label = L("Max volumetric speed");
@@ -1502,7 +1529,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm³/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
 #ifdef HAS_PRESSURE_EQUALIZER
     def = this->add("max_volumetric_extrusion_rate_slope_positive", coFloat);
@@ -1514,7 +1541,8 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm³/s²");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("max_volumetric_extrusion_rate_slope_negative", coFloat);
     def->label = L("Max volumetric slope negative");
@@ -1525,7 +1553,8 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm³/s²");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 #endif /* HAS_PRESSURE_EQUALIZER */
 
     def = this->add("min_fan_speed", coInts);
@@ -1536,7 +1565,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 100;
     def->mode = comSimple;
-    def->default_value = new ConfigOptionInts { 35 };
+    def->set_default_value(new ConfigOptionInts { 35 });
 
     def = this->add("min_layer_height", coFloats);
     def->label = L("Min");
@@ -1546,7 +1575,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comSimple;
-    def->default_value = new ConfigOptionFloats { 0.07 };
+    def->set_default_value(new ConfigOptionFloats { 0.07 });
 
     def = this->add("min_print_speed", coFloats);
     def->label = L("Min print speed");
@@ -1554,7 +1583,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 10. };
+    def->set_default_value(new ConfigOptionFloats { 10. });
 
     def = this->add("min_skirt_length", coFloat);
     def->label = L("Minimal filament extrusion length");
@@ -1564,7 +1593,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("notes", coString);
     def->label = L("Configuration notes");
@@ -1572,16 +1601,16 @@ void PrintConfigDef::init_fff_params()
                    "header comments.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 130;
+    def->height = 13;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("nozzle_diameter", coFloats);
     def->label = L("Nozzle diameter");
     def->tooltip = L("This is the diameter of your extruder nozzle (for example: 0.5, 0.35 etc.)");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 0.5 };
+    def->set_default_value(new ConfigOptionFloats{ 0.4 });
 
     def = this->add("host_type", coEnum);
     def->label = L("Host Type");
@@ -1593,35 +1622,35 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back("OctoPrint");
     def->enum_labels.push_back("Duet");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<PrintHostType>(htOctoPrint);
+    def->set_default_value(new ConfigOptionEnum<PrintHostType>(htOctoPrint));
 
     def = this->add("printhost_apikey", coString);
     def->label = L("API Key / Password");
     def->tooltip = L("Slic3r can upload G-code files to a printer host. This field should contain "
                    "the API Key or the password required for authentication.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
     
     def = this->add("printhost_cafile", coString);
     def->label = L("HTTPS CA File");
     def->tooltip = "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.";
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("print_host", coString);
     def->label = L("Hostname, IP or URL");
     def->tooltip = L("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.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("only_retract_when_crossing_perimeters", coBool);
     def->label = L("Only retract when crossing perimeters");
     def->tooltip = L("Disables retraction when the travel path does not exceed the upper layer's perimeters "
                    "(and thus any ooze will be probably invisible).");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("ooze_prevention", coBool);
     def->label = L("Enable");
@@ -1629,7 +1658,7 @@ void PrintConfigDef::init_fff_params()
                    "It will enable a tall skirt automatically and move extruders outside such "
                    "skirt when changing temperatures.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("output_filename_format", coString);
     def->label = L("Output filename format");
@@ -1639,7 +1668,7 @@ void PrintConfigDef::init_fff_params()
                    "[input_filename_base].");
     def->full_width = true;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString("[input_filename_base]");
+    def->set_default_value(new ConfigOptionString("[input_filename_base]"));
 
     def = this->add("overhangs", coBool);
     def->label = L("Detect bridging perimeters");
@@ -1647,7 +1676,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Experimental option to adjust flow for overhangs (bridge flow will be used), "
         "to apply bridge speed to them and enable fan.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
     
     def = this->add("no_perimeter_unsupported_algo", coEnum);
     def->label = L("No perimeters on bridge areas");
@@ -1669,7 +1698,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Keep bridges and overhangs"));
     def->enum_labels.push_back(L("Fill the voids with bridges"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<NoPerimeterUnsupportedAlgo>(npuaNone);
+    def->set_default_value(new ConfigOptionEnum<NoPerimeterUnsupportedAlgo>(npuaNone));
 
     def = this->add("parking_pos_retraction", coFloat);
     def->label = L("Filament parking position");
@@ -1678,7 +1707,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(92.f);
+    def->set_default_value(new ConfigOptionFloat(92.f));
 
     def = this->add("extra_loading_move", coFloat);
     def->label = L("Extra loading distance");
@@ -1687,7 +1716,7 @@ void PrintConfigDef::init_fff_params()
                       " if negative, the loading move is shorter than unloading. ");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(-2.f);
+    def->set_default_value(new ConfigOptionFloat(-2.f));
 
     def = this->add("perimeter_acceleration", coFloat);
     def->label = L("Perimeters");
@@ -1697,7 +1726,7 @@ void PrintConfigDef::init_fff_params()
                    "Set zero to disable acceleration control for perimeters.");
     def->sidetext = L("mm/s²");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("perimeter_extruder", coInt);
     def->label = L("Perimeter extruder");
@@ -1706,7 +1735,7 @@ void PrintConfigDef::init_fff_params()
     def->aliases = { "perimeters_extruder" };
     def->min = 1;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
 
     def = this->add("perimeter_extrusion_width", coFloatOrPercent);
     def->label = L("Perimeters");
@@ -1716,10 +1745,10 @@ void PrintConfigDef::init_fff_params()
                    "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 105%) it will be computed over nozzle diameter.");
-    def->sidetext = L("mm or % (leave 0 for default)");
+    def->sidetext = L("mm or %");
     def->aliases = { "perimeters_extrusion_width" };
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
 
     def = this->add("perimeter_speed", coFloat);
     def->label = L("Default");
@@ -1730,7 +1759,7 @@ void PrintConfigDef::init_fff_params()
     def->aliases = { "perimeter_feed_rate" };
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(60);
+    def->set_default_value(new ConfigOptionFloat(60));
 
     def = this->add("perimeters", coInt);
     def->label = L("Perimeters");
@@ -1744,7 +1773,7 @@ void PrintConfigDef::init_fff_params()
     def->aliases = { "perimeter_offsets" };
     def->min = 0;
     def->max = 10000;
-    def->default_value = new ConfigOptionInt(3);
+    def->set_default_value(new ConfigOptionInt(3));
 
     def = this->add("post_process", coStrings);
     def->label = L("Post-processing scripts");
@@ -1755,14 +1784,14 @@ void PrintConfigDef::init_fff_params()
     def->gui_flags = "serialized";
     def->multiline = true;
     def->full_width = true;
-    def->height = 60;
+	def->height = 6;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionStrings();
+	def->set_default_value(new ConfigOptionStrings());
 
     def = this->add("printer_model", coString);
     def->label = L("Printer type");
     def->tooltip = L("Type of the printer.");
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("printer_notes", coString);
@@ -1770,28 +1799,28 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("You can put your notes regarding the printer here.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 130;
+    def->height = 13;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("printer_vendor", coString);
     def->label = L("Printer vendor");
     def->tooltip = L("Name of the printer vendor.");
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("printer_variant", coString);
     def->label = L("Printer variant");
     def->tooltip = L("Name of the printer variant. For example, the printer variants may be differentiated by a nozzle diameter.");
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("print_settings_id", coString);
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
     def->cli = ConfigOptionDef::nocli;
     
     def = this->add("printer_settings_id", coString);
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("support_material_solid_first_layer", coBool);
@@ -1799,7 +1828,7 @@ void PrintConfigDef::init_fff_params()
     def->category = L("Support material");
     def->tooltip = L("Use a solid layer instead of a raft for the layer that touch the build plate.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("raft_layers", coInt);
     def->label = L("Raft layers");
@@ -1809,7 +1838,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("layers");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(0);
+    def->set_default_value(new ConfigOptionInt(0));
 
     def = this->add("resolution", coFloat);
     def->label = L("Resolution");
@@ -1821,14 +1850,14 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("retract_before_travel", coFloats);
     def->label = L("Minimum travel after retraction");
     def->tooltip = L("Retraction is not triggered when travel moves are shorter than this length.");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 2. };
+    def->set_default_value(new ConfigOptionFloats { 2. });
 
     def = this->add("retract_before_wipe", coPercents);
     def->label = L("Retract amount before wipe");
@@ -1836,13 +1865,13 @@ void PrintConfigDef::init_fff_params()
                    "before doing the wipe movement.");
     def->sidetext = L("%");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionPercents { 0. };
+    def->set_default_value(new ConfigOptionPercents { 0. });
     
     def = this->add("retract_layer_change", coBools);
     def->label = L("Retract on layer change");
     def->tooltip = L("This flag enforces a retraction whenever a Z move is done.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBools { false };
+    def->set_default_value(new ConfigOptionBools { false });
 
     def = this->add("retract_length", coFloats);
     def->label = L("Length");
@@ -1851,7 +1880,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("When retraction is triggered, filament is pulled back by the specified amount "
                    "(the length is measured on raw filament, before it enters the extruder).");
     def->sidetext = L("mm (zero to disable)");
-    def->default_value = new ConfigOptionFloats { 2. };
+    def->set_default_value(new ConfigOptionFloats { 2. });
 
     def = this->add("retract_length_toolchange", coFloats);
     def->label = L("Length");
@@ -1862,7 +1891,7 @@ void PrintConfigDef::init_fff_params()
                    "the extruder).");
     def->sidetext = L("mm (zero to disable)");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 10. };
+    def->set_default_value(new ConfigOptionFloats { 10. });
 
     def = this->add("retract_lift", coFloats);
     def->label = L("Lift Z");
@@ -1870,7 +1899,7 @@ void PrintConfigDef::init_fff_params()
                    "is triggered. When using multiple extruders, only the setting for the first extruder "
                    "will be considered.");
     def->sidetext = L("mm");
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("retract_lift_above", coFloats);
     def->label = L("Above Z");
@@ -1880,7 +1909,7 @@ void PrintConfigDef::init_fff_params()
                    "absolute Z. You can tune this setting for skipping lift on the first layers.");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("retract_lift_below", coFloats);
     def->label = L("Below Z");
@@ -1891,7 +1920,7 @@ void PrintConfigDef::init_fff_params()
                    "to the first layers.");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("retract_lift_not_last_layer", coBools);
     def->label = L("Not on top");
@@ -1899,7 +1928,7 @@ void PrintConfigDef::init_fff_params()
     def->category = L("Support material");
     def->tooltip = L("Select this option to not use the z-lift on a top surface.");
     def->mode = comAdvanced;
-	def->default_value = new ConfigOptionBools { false };
+	def->set_default_value(new ConfigOptionBools { false });
 
     def = this->add("retract_restart_extra", coFloats);
     def->label = L("Extra length on restart");
@@ -1907,7 +1936,7 @@ void PrintConfigDef::init_fff_params()
                    "this additional amount of filament. This setting is rarely needed.");
     def->sidetext = L("mm");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("retract_restart_extra_toolchange", coFloats);
     def->label = L("Extra length on restart");
@@ -1916,7 +1945,7 @@ void PrintConfigDef::init_fff_params()
                    "this additional amount of filament.");
     def->sidetext = L("mm");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("retract_speed", coFloats);
     def->label = L("Retraction Speed");
@@ -1924,7 +1953,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The speed for retractions (it only applies to the extruder motor).");
     def->sidetext = L("mm/s");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 40. };
+    def->set_default_value(new ConfigOptionFloats { 40. });
 
     def = this->add("deretract_speed", coFloats);
     def->label = L("Deretraction Speed");
@@ -1933,7 +1962,7 @@ void PrintConfigDef::init_fff_params()
                    "(it only applies to the extruder motor). If left to zero, the retraction speed is used.");
     def->sidetext = L("mm/s");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloats { 0. };
+    def->set_default_value(new ConfigOptionFloats { 0. });
 
     def = this->add("seam_position", coEnum);
     def->label = L("Seam position");
@@ -1951,7 +1980,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Rear"));
     def->enum_labels.push_back(L("Hidden"));
     def->mode = comSimple;
-    def->default_value = new ConfigOptionEnum<SeamPosition>(spHidden);
+    def->set_default_value(new ConfigOptionEnum<SeamPosition>(spHidden));
 
     def = this->add("seam_travel", coBool);
     def->label = L("Travel move reduced");
@@ -1959,7 +1988,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Add a big cost to travel paths when possible (when going into a loop), so it will prefer a less optimal seam posistion if it's nearer.");
     def->cli = "seam-travel!";
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
 #if 0
     def = this->add("seam_preferred_direction", coFloat);
@@ -1970,7 +1999,8 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Seam preferred direction");
     def->min = 0;
     def->max = 360;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("seam_preferred_direction_jitter", coFloat);
 //    def->gui_type = "slider";
@@ -1980,7 +2010,8 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Preferred direction of the seam - jitter");
     def->min = 0;
     def->max = 360;
-    def->default_value = new ConfigOptionFloat(30);
+    def->set_default_value(new ConfigOptionFloat(30);
+    def->set_default_value(new ConfigOptionFloat(30));
 #endif
 
     def = this->add("serial_port", coString);
@@ -1988,8 +2019,8 @@ void PrintConfigDef::init_fff_params()
     def->label = "";
     def->full_label = L("Serial port");
     def->tooltip = L("USB/serial port for printer connection.");
-    def->width = 200;
-    def->default_value = new ConfigOptionString("");
+    def->width = 20;
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("serial_speed", coInt);
     def->gui_type = "i_enum_open";
@@ -2001,7 +2032,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("115200");
     def->enum_values.push_back("250000");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(250000);
+    def->set_default_value(new ConfigOptionInt(250000));
 
     def = this->add("skirt_distance", coFloat);
     def->label = L("Distance from object");
@@ -2010,7 +2041,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(6);
+    def->set_default_value(new ConfigOptionFloat(6));
 
     def = this->add("skirt_height", coInt);
     def->label = L("Skirt height");
@@ -2018,7 +2049,7 @@ void PrintConfigDef::init_fff_params()
                    "as a shield against drafts.");
     def->sidetext = L("layers");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
 
     def = this->add("skirts", coInt);
     def->label = L("Loops (minimum)");
@@ -2028,18 +2059,18 @@ void PrintConfigDef::init_fff_params()
                    "to disable skirt completely.");
     def->min = 0;
     def->mode = comSimple;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
     
     def = this->add("slowdown_below_layer_time", coInts);
     def->label = L("Slow down if layer print time is below");
     def->tooltip = L("If layer print time is estimated below this number of seconds, print moves "
                    "speed will be scaled down to extend duration to this value.");
     def->sidetext = L("approximate seconds");
-    def->width = 60;
+    def->width = 6;
     def->min = 0;
     def->max = 1000;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInts { 5 };
+    def->set_default_value(new ConfigOptionInts { 5 });
 
     def = this->add("small_perimeter_speed", coFloatOrPercent);
     def->label = L("Small");
@@ -2052,7 +2083,7 @@ void PrintConfigDef::init_fff_params()
     def->ratio_over = "perimeter_speed";
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(15, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(15, false));
 
     def = this->add("curve_smoothing_angle", coFloat);
     def->label = L("Min angle");
@@ -2066,7 +2097,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 180;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("curve_smoothing_precision", coFloat);
     def->label = L("Precision");
@@ -2081,7 +2112,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->cli = "curve-smoothing-precision=f";
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("solid_infill_below_area", coFloat);
     def->label = L("Solid infill threshold area");
@@ -2090,7 +2121,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm²");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(70);
+    def->set_default_value(new ConfigOptionFloat(70));
 
     def = this->add("solid_infill_extruder", coInt);
     def->label = L("Solid infill extruder");
@@ -2098,7 +2129,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The extruder to use when printing solid infill.");
     def->min = 1;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
 
     def = this->add("solid_infill_every_layers", coInt);
     def->label = L("Solid infill every");
@@ -2110,7 +2141,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("layers");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInt(0);
+    def->set_default_value(new ConfigOptionInt(0));
 
     def = this->add("solid_infill_extrusion_width", coFloatOrPercent);
     def->label = L("Solid infill");
@@ -2119,9 +2150,9 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("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 110%) it will be computed over nozzle diameter.");
-    def->sidetext = L("mm or % (leave 0 for default)");
+    def->sidetext = L("mm or %");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
 
     def = this->add("solid_infill_speed", coFloatOrPercent);
     def->label = L("Solid");
@@ -2135,7 +2166,7 @@ void PrintConfigDef::init_fff_params()
     def->aliases = { "solid_infill_feed_rate" };
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(20, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(20, false));
 
     def = this->add("solid_layers", coInt);
     def->label = L("Solid layers");
@@ -2151,7 +2182,7 @@ void PrintConfigDef::init_fff_params()
                    "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.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("standby_temperature_delta", coInt);
     def->label = L("Temperature variation");
@@ -2161,7 +2192,7 @@ void PrintConfigDef::init_fff_params()
     def->min = -max_temp;
     def->max = max_temp;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInt(-5);
+    def->set_default_value(new ConfigOptionInt(-5));
 
     def = this->add("start_gcode", coString);
     def->label = L("Start G-code");
@@ -2174,9 +2205,9 @@ void PrintConfigDef::init_fff_params()
                    "a \"M109 S[first_layer_temperature]\" command wherever you want.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 120;
+    def->height = 12;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString("G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle\n");
+    def->set_default_value(new ConfigOptionString("G28 ; home all axes\nG1 Z5 F5000 ; lift nozzle\n"));
 
     def = this->add("start_filament_gcode", coStrings);
     def->label = L("Start G-code");
@@ -2191,9 +2222,9 @@ void PrintConfigDef::init_fff_params()
                    "in extruder order.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 120;
+    def->height = 12;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionStrings { "; Filament gcode\n" };
+    def->set_default_value(new ConfigOptionStrings { "; Filament gcode\n" });
 
 
     def = this->add("model_precision", coFloat);
@@ -2206,25 +2237,25 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0.0001);
+    def->set_default_value(new ConfigOptionFloat(0.0001));
 
     def = this->add("single_extruder_multi_material", coBool);
     def->label = L("Single Extruder Multi Material");
     def->tooltip = L("The printer multiplexes filaments into a single hot end.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(false);
+	def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("single_extruder_multi_material_priming", coBool);
     def->label = L("Prime all printing extruders");
     def->tooltip = L("If enabled, all printing extruders will be primed at the front edge of the print bed at the start of the print.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("support_material", coBool);
     def->label = L("Generate support material");
     def->category = L("Support material");
     def->tooltip = L("Enable support material generation.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("support_material_auto", coBool);
     def->label = L("Auto generated supports");
@@ -2232,7 +2263,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("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.");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("support_material_xy_spacing", coFloatOrPercent);
     def->label = L("XY separation between an object and its support");
@@ -2244,7 +2275,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->mode = comAdvanced;
     // Default is half the external perimeter width.
-    def->default_value = new ConfigOptionFloatOrPercent(50, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(50, true));
 
     def = this->add("support_material_angle", coFloat);
     def->label = L("Pattern angle");
@@ -2255,14 +2286,14 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 359;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("support_material_buildplate_only", coBool);
     def->label = L("Support on build plate only");
     def->category = L("Support material");
     def->tooltip = L("Only create support if it lies on a build plate. Don't create support on a print.");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("support_material_contact_distance_type", coEnum);
     def->label = L("Type");
@@ -2280,7 +2311,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back("From plane");
     def->enum_labels.push_back("None");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<SupportZDistanceType>(zdPlane);
+    def->set_default_value(new ConfigOptionEnum<SupportZDistanceType>(zdPlane));
 
     def = this->add("support_material_contact_distance_top", coFloatOrPercent);
     def->label = L("Top");
@@ -2289,27 +2320,27 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The vertical distance between support material interface and the object"
         "(when the object is printed on top of the support). "
         "Setting this to 0 will also prevent Slic3r from using bridge flow and speed "
-        "for the first object layer. Can be a % of the extruder size used for the interface layers.");
+        "for the first object layer. Can be a % of the extruding width used for the interface layers.");
     def->sidetext = L("mm");
     def->enum_labels.push_back((boost::format("0.2 (%1%)") % L("detachable")).str());
 //    def->min = 0;
     def->enum_values.push_back("0");
     def->enum_values.push_back("0.2");
-	def->enum_labels.push_back((boost::format("0 (%1%)") % L("soluble")).str());
-	def->enum_labels.push_back((boost::format("0.2 (%1%)") % L("detachable")).str());
+	def->enum_labels.push_back(L("0 (soluble)"));
+	def->enum_labels.push_back(L("0.2 (detachable)"));
     def->mode = comAdvanced;
     def->aliases = { "support_material_contact_distance" };
-    def->default_value = new ConfigOptionFloatOrPercent(100,true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0.2, false));
 
     def = this->add("support_material_contact_distance_bottom", coFloatOrPercent);
     def->label = L("Bottom");
     def->full_label = ("Contact distance under the bottom of supports");
     def->category = L("Support material");
     def->tooltip = L("The vertical distance between object and support material interface"
-        "(when the support is printed on top of the object). Can be a % of the extruder size used for the interface layers.");
+        "(when the support is printed on top of the object). Can be a % of the extruding width used for the interface layers.");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(100,true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0.2,false));
 
     def = this->add("support_material_enforce_layers", coInt);
     def->label = L("Enforce support for the first");
@@ -2322,7 +2353,7 @@ void PrintConfigDef::init_fff_params()
     def->full_label = L("Enforce support for the first n layers");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInt(0);
+    def->set_default_value(new ConfigOptionInt(0));
 
     def = this->add("support_material_extruder", coInt);
     def->label = L("Support material/raft/skirt extruder");
@@ -2331,7 +2362,7 @@ void PrintConfigDef::init_fff_params()
                    "(1+, 0 to use the current extruder to minimize tool changes).");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
 
     def = this->add("support_material_extrusion_width", coFloatOrPercent);
     def->label = L("Support material");
@@ -2340,16 +2371,16 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("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 110%) it will be computed over nozzle diameter.");
-    def->sidetext = L("mm or % (leave 0 for default)");
+    def->sidetext = L("mm or %");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
 
     def = this->add("support_material_interface_contact_loops", coBool);
     def->label = L("Interface loops");
     def->category = L("Support material");
     def->tooltip = L("Cover the top contact layer of the supports with loops. Disabled by default.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("support_material_interface_extruder", coInt);
     def->label = L("Support material/raft interface extruder");
@@ -2358,7 +2389,7 @@ void PrintConfigDef::init_fff_params()
                    "(1+, 0 to use the current extruder to minimize tool changes). This affects raft too.");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(1);
+    def->set_default_value(new ConfigOptionInt(1));
 
     def = this->add("support_material_interface_layers", coInt);
     def->label = L("Interface layers");
@@ -2367,7 +2398,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("layers");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(3);
+    def->set_default_value(new ConfigOptionInt(3));
 
     def = this->add("support_material_interface_spacing", coFloat);
     def->label = L("Interface pattern spacing");
@@ -2376,7 +2407,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("support_material_interface_speed", coFloatOrPercent);
     def->label = L("Interface");
@@ -2388,7 +2419,7 @@ void PrintConfigDef::init_fff_params()
     def->ratio_over = "support_material_speed";
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(100, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(100, true));
 
     def = this->add("support_material_pattern", coEnum);
     def->label = L("Pattern");
@@ -2403,7 +2434,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Rectilinear grid"));
     def->enum_labels.push_back(L("Honeycomb"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<SupportMaterialPattern>(smpRectilinear);
+    def->set_default_value(new ConfigOptionEnum<SupportMaterialPattern>(smpRectilinear));
 
     def = this->add("support_material_interface_pattern", coEnum);
     def->label = L("Pattern");
@@ -2424,7 +2455,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Sawtooth"));
     def->enum_labels.push_back(L("Ironing"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<InfillPattern>(ipRectilinear);
+    def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipRectilinear));
     
     def = this->add("support_material_spacing", coFloat);
     def->label = L("Pattern spacing");
@@ -2433,7 +2464,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(2.5);
+    def->set_default_value(new ConfigOptionFloat(2.5));
 
     def = this->add("support_material_speed", coFloat);
     def->label = L("Default");
@@ -2443,7 +2474,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("mm/s");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(60);
+    def->set_default_value(new ConfigOptionFloat(60));
 
     def = this->add("support_material_synchronize_layers", coBool);
     def->label = L("Synchronize with object layers");
@@ -2451,7 +2482,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Synchronize support layers with the object print layers. This is useful "
                    "with multi-material printers, where the extruder switch is expensive.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("support_material_threshold", coInt);
     def->label = L("Overhang threshold");
@@ -2465,7 +2496,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 0;
     def->max = 90;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionInt(0);
+    def->set_default_value(new ConfigOptionInt(0));
 
     def = this->add("support_material_with_sheath", coBool);
     def->label = L("With sheath around the support");
@@ -2473,7 +2504,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Add a sheath (a single perimeter line) around the base support. This makes "
                    "the support more reliable, but also more difficult to remove.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("temperature", coInts);
     def->label = L("Other layers");
@@ -2484,7 +2515,7 @@ void PrintConfigDef::init_fff_params()
     def->sidetext = L("°C");
     def->min = 0;
     def->max = max_temp;
-    def->default_value = new ConfigOptionInts { 200 };
+    def->set_default_value(new ConfigOptionInts { 200 });
     
     def = this->add("thin_walls", coBool);
     def->label = L("");
@@ -2494,7 +2525,7 @@ void PrintConfigDef::init_fff_params()
                    "to collapse them into a single trace). If unchecked, slic3r may try to fit perimeters "
                    "where it's not possible, creating some overlap leading to over-extrusion.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("thin_walls_min_width", coFloatOrPercent);
     def->label = L("min width");
@@ -2505,7 +2536,7 @@ void PrintConfigDef::init_fff_params()
         " The default behavior of slic3r and slic3rPE is with a 33% value. Put 100% to avoid any sort of over-extrusion.");
     def->mode = comExpert;
     def->min = 0;
-    def->default_value = new ConfigOptionFloatOrPercent(33, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(33, true));
 
     def = this->add("thin_walls_overlap", coFloatOrPercent);
     def->label = L("overlap");
@@ -2514,7 +2545,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Overlap between the thin wall and the perimeters. Can be a % of the external perimeter width (default 50%)");
     def->mode = comExpert;
     def->min = 0;
-    def->default_value = new ConfigOptionFloatOrPercent(50, true);
+    def->set_default_value(new ConfigOptionFloatOrPercent(50, true));
 
     def = this->add("threads", coInt);
     def->label = L("Threads");
@@ -2524,7 +2555,7 @@ void PrintConfigDef::init_fff_params()
     def->min = 1;
     {
         int threads = (unsigned int)boost::thread::hardware_concurrency();
-        def->default_value = new ConfigOptionInt(threads > 0 ? threads : 2);
+        def->set_default_value(new ConfigOptionInt(threads > 0 ? threads : 2));
         def->cli == ConfigOptionDef::nocli;
     }
     
@@ -2535,9 +2566,9 @@ void PrintConfigDef::init_fff_params()
                    "as [previous_extruder] and [next_extruder].");
     def->multiline = true;
     def->full_width = true;
-    def->height = 50;
+    def->height = 5;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("top_infill_extrusion_width", coFloatOrPercent);
     def->label = L("Top solid infill");
@@ -2546,9 +2577,9 @@ void PrintConfigDef::init_fff_params()
                    "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 110%) it will be computed over nozzle diameter.");
-    def->sidetext = L("mm or % (leave 0 for default)");
+    def->sidetext = L("mm or %");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(0, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(0, false));
 
     def = this->add("top_solid_infill_speed", coFloatOrPercent);
     def->label = L("Top solid");
@@ -2563,16 +2594,17 @@ void PrintConfigDef::init_fff_params()
     def->ratio_over = "solid_infill_speed";
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloatOrPercent(15, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(15, false));
 
     def = this->add("top_solid_layers", coInt);
+    //TRN To be shown in Print Settings "Top solid layers"
     def->label = L("Top");
     def->full_label = L("Top layers");
     def->category = L("Layers and Perimeters");
     def->tooltip = L("Number of solid layers to generate on top surfaces.");
     def->full_label = L("Top solid layers");
     def->min = 0;
-    def->default_value = new ConfigOptionInt(3);
+    def->set_default_value(new ConfigOptionInt(3));
 
     def = this->add("travel_speed", coFloat);
     def->label = L("Travel");
@@ -2582,21 +2614,21 @@ void PrintConfigDef::init_fff_params()
     def->aliases = { "travel_feed_rate" };
     def->min = 1;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(130);
+    def->set_default_value(new ConfigOptionFloat(130));
 
     def = this->add("use_firmware_retraction", coBool);
     def->label = L("Use firmware retraction");
     def->tooltip = L("This experimental setting uses G10 and G11 commands to have the firmware "
                    "handle the retraction. This is only supported in recent Marlin.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("use_relative_e_distances", coBool);
     def->label = L("Use relative E distances");
     def->tooltip = L("If your firmware requires relative E values, check this, "
                    "otherwise leave it unchecked. Most firmwares use absolute values.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("use_volumetric_e", coBool);
     def->label = L("Use volumetric E");
@@ -2607,21 +2639,21 @@ void PrintConfigDef::init_fff_params()
                    "diameter associated to the filament selected in Slic3r. This is only supported "
                    "in recent Marlin.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("variable_layer_height", coBool);
     def->label = L("Enable variable layer height feature");
     def->tooltip = L("Some printers or printer setups may have difficulties printing "
                    "with a variable layer height. Enabled by default.");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("wipe", coBools);
     def->label = L("Wipe while retracting");
     def->tooltip = L("This flag will move the nozzle while retracting to minimize the possible blob "
                    "on leaky extruders.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBools { false };
+    def->set_default_value(new ConfigOptionBools { false });
 
     def = this->add("wipe_tower", coBool);
     def->label = L("Enable");
@@ -2629,38 +2661,38 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Multi material printers may need to prime or purge extruders on tool changes. "
                    "Extrude the excess material into the wipe tower.");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("wiping_volumes_extruders", coFloats);
     def->label = L("Purging volumes - load/unload volumes");
     def->tooltip = L("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. ");
-    def->default_value = new ConfigOptionFloats { 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f  };
+    def->set_default_value(new ConfigOptionFloats { 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f, 70.f  });
 
     def = this->add("wiping_volumes_matrix", coFloats);
     def->label = L("Purging volumes - matrix");
     def->tooltip = L("This matrix describes volumes (in cubic milimetres) required to purge the"
                      " new filament on the wipe tower for any given pair of tools. ");
-    def->default_value = new ConfigOptionFloats {   0.f, 140.f, 140.f, 140.f, 140.f,
+    def->set_default_value(new ConfigOptionFloats {   0.f, 140.f, 140.f, 140.f, 140.f,
                                                   140.f,   0.f, 140.f, 140.f, 140.f,
                                                   140.f, 140.f,   0.f, 140.f, 140.f,
                                                   140.f, 140.f, 140.f,   0.f, 140.f,
-                                                  140.f, 140.f, 140.f, 140.f,   0.f };
+                                                    140.f, 140.f, 140.f, 140.f,   0.f });
 
 
     def = this->add("wipe_advanced", coBool);
     def->label = L("Enable advanced wiping volume");
     def->tooltip = L("Allow slic3r to compute the purge volume via smart computations. Use the pigment% of each filament and following parameters");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("wipe_advanced_nozzle_melted_volume", coFloat);
     def->label = L("Nozzle volume");
     def->tooltip = L("The volume of melted plastic inside your nozlle. Used by 'advanced wiping'.");
     def->sidetext = L("mm3");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(120);
+    def->set_default_value(new ConfigOptionFloat(120));
 
     def = this->add("filament_wipe_advanced_pigment", coFloats);
     def->label = L("Pigment percentage");
@@ -2668,7 +2700,7 @@ void PrintConfigDef::init_fff_params()
     def->mode = comExpert;
     def->min = 0;
     def->max = 1;
-    def->default_value = new ConfigOptionFloats{ 0.5 };
+    def->set_default_value(new ConfigOptionFloats{ 0.5 });
 
     def = this->add("wipe_advanced_multiplier", coFloat);
     def->label = L("Multiplier");
@@ -2676,7 +2708,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("The volume multiplier used to compute the final volume to extrude by the algorithm.");
     def->sidetext = L("mm3");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(60);
+    def->set_default_value(new ConfigOptionFloat(60));
 
 
     def = this->add("wipe_advanced_algo", coEnum);
@@ -2694,7 +2726,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_labels.push_back(L("Quadratric"));
     def->enum_labels.push_back(L("Hyperbola"));
     def->mode = comExpert;
-    def->default_value = new ConfigOptionEnum<WipeAlgo>(waLinear);
+    def->set_default_value(new ConfigOptionEnum<WipeAlgo>(waLinear));
 
     def = this->add("wipe_tower_x", coFloat);
     def->label = L("X");
@@ -2702,7 +2734,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("X coordinate of the left front corner of a wipe tower");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(180.);
+    def->set_default_value(new ConfigOptionFloat(180.));
 
     def = this->add("wipe_tower_y", coFloat);
     def->label = L("Y");
@@ -2710,7 +2742,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Y coordinate of the left front corner of a wipe tower");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(140.);
+    def->set_default_value(new ConfigOptionFloat(140.));
 
     def = this->add("wipe_tower_width", coFloat);
     def->label = L("Width");
@@ -2718,14 +2750,14 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Width of a wipe tower");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(60.);
+    def->set_default_value(new ConfigOptionFloat(60.));
 
     def = this->add("wipe_tower_rotation_angle", coFloat);
     def->label = L("Wipe tower rotation angle");
-    def->tooltip = L("Wipe tower rotation angle with respect to x-axis ");
-    def->sidetext = L("degrees");
+    def->tooltip = L("Wipe tower rotation angle with respect to x-axis.");
+    def->sidetext = L("°");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0.);
+    def->set_default_value(new ConfigOptionFloat(0.));
 
     def = this->add("wipe_into_infill", coBool);
     def->category = L("Extruders");
@@ -2733,7 +2765,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("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.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("wipe_into_objects", coBool);
     def->category = L("Extruders");
@@ -2741,14 +2773,14 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("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.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("wipe_tower_bridging", coFloat);
     def->label = L("Maximal bridging distance");
     def->tooltip = L("Maximal distance between supports on sparse infill sections. ");
     def->sidetext = L("mm");
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(10.);
+    def->set_default_value(new ConfigOptionFloat(10.));
 
     def = this->add("xy_size_compensation", coFloat);
     def->label = L("All layers");
@@ -2759,7 +2791,7 @@ void PrintConfigDef::init_fff_params()
                    "for fine-tuning sizes.");
     def->sidetext = L("mm");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("hole_size_compensation", coFloat);
     def->label = L("Holes");
@@ -2770,7 +2802,7 @@ void PrintConfigDef::init_fff_params()
                    " This might be useful for fine-tuning hole sizes.");
     def->sidetext = L("mm");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 
     def = this->add("z_offset", coFloat);
     def->label = L("Z offset");
@@ -2780,7 +2812,7 @@ void PrintConfigDef::init_fff_params()
                    "from the print bed, set this to -0.3 (or fix your endstop).");
     def->sidetext = L("mm");
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 }
 
 void PrintConfigDef::init_sla_params()
@@ -2794,26 +2826,26 @@ void PrintConfigDef::init_sla_params()
     def->label = L("Display width");
     def->tooltip = L("Width of the display");
     def->min = 1;
-    def->default_value = new ConfigOptionFloat(120.);
+    def->set_default_value(new ConfigOptionFloat(120.));
 
     def = this->add("display_height", coFloat);
     def->label = L("Display height");
     def->tooltip = L("Height of the display");
     def->min = 1;
-    def->default_value = new ConfigOptionFloat(68.);
+    def->set_default_value(new ConfigOptionFloat(68.));
 
     def = this->add("display_pixels_x", coInt);
     def->full_label = L("Number of pixels in");
     def->label = ("X");
     def->tooltip = L("Number of pixels in X");
     def->min = 100;
-    def->default_value = new ConfigOptionInt(2560);
+    def->set_default_value(new ConfigOptionInt(2560));
 
     def = this->add("display_pixels_y", coInt);
     def->label = ("Y");
     def->tooltip = L("Number of pixels in Y");
     def->min = 100;
-    def->default_value = new ConfigOptionInt(1440);
+    def->set_default_value(new ConfigOptionInt(1440));
 
     def = this->add("display_orientation", coEnum);
     def->label = L("Display orientation");
@@ -2826,7 +2858,7 @@ void PrintConfigDef::init_sla_params()
     def->enum_labels.push_back(L("Landscape"));
     def->enum_labels.push_back(L("Portrait"));
     def->mode = comExpert;
-    def->default_value = new ConfigOptionEnum<SLADisplayOrientation>(sladoPortrait);
+    def->set_default_value(new ConfigOptionEnum<SLADisplayOrientation>(sladoPortrait));
 
     def = this->add("fast_tilt_time", coFloat);
     def->label = L("Fast");
@@ -2835,7 +2867,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(5.);
+    def->set_default_value(new ConfigOptionFloat(5.));
 
     def = this->add("slow_tilt_time", coFloat);
     def->label = L("Slow");
@@ -2844,7 +2876,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("s");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(8.);
+    def->set_default_value(new ConfigOptionFloat(8.));
 
     def = this->add("area_fill", coFloat);
     def->label = L("Area fill");
@@ -2852,13 +2884,35 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("%");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(50.);
+    def->set_default_value(new ConfigOptionFloat(50.));
 
-    def = this->add("printer_correction", coFloats);
+    def = this->add("relative_correction", coFloats);
+    def->label = L("Printer scaling correction");
     def->full_label = L("Printer scaling correction");
     def->tooltip  = L("Printer scaling correction");
     def->min = 0;
-    def->default_value = new ConfigOptionFloats( { 1., 1., 1. } );
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionFloats( { 1., 1. } ));
+
+    def = this->add("absolute_correction", coFloat);
+    def->label = L("Printer absolute correction");
+    def->full_label = L("Printer absolute correction");
+    def->tooltip  = L("Will inflate or deflate the sliced 2D polygons according "
+                      "to the sign of the correction.");
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionFloat(0.0));
+    
+    def = this->add("gamma_correction", coFloat);
+    def->label = L("Printer gamma correction");
+    def->full_label = L("Printer gamma correction");
+    def->tooltip  = L("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.");
+    def->min = 0;
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionFloat(1.0));
+    
 
     // SLA Material settings.
     def = this->add("initial_layer_height", coFloat);
@@ -2866,7 +2920,7 @@ void PrintConfigDef::init_sla_params()
     def->tooltip = L("Initial layer height");
     def->sidetext = L("mm");
     def->min = 0;
-    def->default_value = new ConfigOptionFloat(0.3);
+    def->set_default_value(new ConfigOptionFloat(0.3));
 
     def = this->add("faded_layers", coInt);
     def->label = L("Faded layers");
@@ -2874,63 +2928,58 @@ void PrintConfigDef::init_sla_params()
     def->min = 3;
     def->max = 20;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionInt(10);
+    def->set_default_value(new ConfigOptionInt(10));
 
     def = this->add("exposure_time", coFloat);
     def->label = L("Exposure time");
     def->tooltip = L("Exposure time");
     def->sidetext = L("s");
     def->min = 0;
-    def->default_value = new ConfigOptionFloat(10);
+    def->set_default_value(new ConfigOptionFloat(10));
 
     def = this->add("initial_exposure_time", coFloat);
     def->label = L("Initial exposure time");
     def->tooltip = L("Initial exposure time");
     def->sidetext = L("s");
     def->min = 0;
-    def->default_value = new ConfigOptionFloat(15);
+    def->set_default_value(new ConfigOptionFloat(15));
 
-    def = this->add("material_correction_printing", coFloats);
-    def->full_label = L("Correction for expansion when printing");
-    def->tooltip  = L("Correction for expansion when printing");
+    def = this->add("material_correction", coFloats);
+    def->full_label = L("Correction for expansion");
+    def->tooltip  = L("Correction for expansion");
     def->min = 0;
-    def->default_value = new ConfigOptionFloats( { 1. , 1., 1. } );
-
-    def = this->add("material_correction_curing", coFloats);
-    def->full_label = L("Correction for expansion after curing");
-    def->tooltip  = L("Correction for expansion after curing");
-    def->min = 0;
-    def->default_value = new ConfigOptionFloats( { 1. , 1., 1. } );
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionFloats( { 1. , 1. } ));
 
     def = this->add("material_notes", coString);
     def->label = L("SLA print material notes");
     def->tooltip = L("You can put your notes regarding the SLA print material here.");
     def->multiline = true;
     def->full_width = true;
-    def->height = 130;
+    def->height = 13;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
 
     def = this->add("default_sla_material_profile", coString);
     def->label = L("Default SLA material profile");
     def->tooltip = L("Default print profile associated with the current printer profile. "
                    "On selection of the current printer profile, this print profile will be activated.");
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("sla_material_settings_id", coString);
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("default_sla_print_profile", coString);
     def->label = L("Default SLA material profile");
     def->tooltip = L("Default print profile associated with the current printer profile. "
                    "On selection of the current printer profile, this print profile will be activated.");
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("sla_print_settings_id", coString);
-    def->default_value = new ConfigOptionString("");
+    def->set_default_value(new ConfigOptionString(""));
     def->cli = ConfigOptionDef::nocli;
 
     def = this->add("supports_enable", coBool);
@@ -2938,7 +2987,7 @@ void PrintConfigDef::init_sla_params()
     def->category = L("Supports");
     def->tooltip = L("Generate supports for the models");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("support_head_front_diameter", coFloat);
     def->label = L("Support head front diameter");
@@ -2947,7 +2996,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(0.4);
+    def->set_default_value(new ConfigOptionFloat(0.4));
 
     def = this->add("support_head_penetration", coFloat);
     def->label = L("Support head penetration");
@@ -2956,7 +3005,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("mm");
     def->mode = comAdvanced;
     def->min = 0;
-    def->default_value = new ConfigOptionFloat(0.2);
+    def->set_default_value(new ConfigOptionFloat(0.2));
 
     def = this->add("support_head_width", coFloat);
     def->label = L("Support head width");
@@ -2966,7 +3015,7 @@ void PrintConfigDef::init_sla_params()
     def->min = 0;
     def->max = 20;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(1.0);
+    def->set_default_value(new ConfigOptionFloat(1.0));
 
     def = this->add("support_pillar_diameter", coFloat);
     def->label = L("Support pillar diameter");
@@ -2976,11 +3025,11 @@ void PrintConfigDef::init_sla_params()
     def->min = 0;
     def->max = 15;
     def->mode = comSimple;
-    def->default_value = new ConfigOptionFloat(1.0);
+    def->set_default_value(new ConfigOptionFloat(1.0));
 
     def = this->add("support_pillar_connection_mode", coEnum);
     def->label = L("Support pillar connection mode");
-    def->tooltip = L("Controls the bridge type between two neigboring pillars."
+    def->tooltip = L("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.");
@@ -2992,14 +3041,14 @@ void PrintConfigDef::init_sla_params()
     def->enum_labels.push_back(L("Cross"));
     def->enum_labels.push_back(L("Dynamic"));
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionEnum<SLAPillarConnectionMode>(slapcmDynamic);
+    def->set_default_value(new ConfigOptionEnum<SLAPillarConnectionMode>(slapcmDynamic));
 
     def = this->add("support_buildplate_only", coBool);
     def->label = L("Support on build plate only");
     def->category = L("Supports");
     def->tooltip = L("Only create support if it lies on a build plate. Don't create support on a print.");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("support_pillar_widening_factor", coFloat);
     def->label = L("Pillar widening factor");
@@ -3010,7 +3059,7 @@ void PrintConfigDef::init_sla_params()
     def->min = 0;
     def->max = 1;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(0.0);
+    def->set_default_value(new ConfigOptionFloat(0.0));
 
     def = this->add("support_base_diameter", coFloat);
     def->label = L("Support base diameter");
@@ -3020,7 +3069,7 @@ void PrintConfigDef::init_sla_params()
     def->min = 0;
     def->max = 30;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(4.0);
+    def->set_default_value(new ConfigOptionFloat(4.0));
 
     def = this->add("support_base_height", coFloat);
     def->label = L("Support base height");
@@ -3029,7 +3078,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(1.0);
+    def->set_default_value(new ConfigOptionFloat(1.0));
 
     def = this->add("support_critical_angle", coFloat);
     def->label = L("Critical angle");
@@ -3039,7 +3088,7 @@ void PrintConfigDef::init_sla_params()
     def->min = 0;
     def->max = 90;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(45);
+    def->set_default_value(new ConfigOptionFloat(45));
 
     def = this->add("support_max_bridge_length", coFloat);
     def->label = L("Max bridge length");
@@ -3048,7 +3097,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(15.0);
+    def->set_default_value(new ConfigOptionFloat(15.0));
 
     def = this->add("support_max_pillar_link_distance", coFloat);
     def->label = L("Max pillar linking distance");
@@ -3058,7 +3107,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("mm");
     def->min = 0;   // 0 means no linking
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(10.0);
+    def->set_default_value(new ConfigOptionFloat(10.0));
 
     def = this->add("support_object_elevation", coFloat);
     def->label = L("Object elevation");
@@ -3068,7 +3117,7 @@ void PrintConfigDef::init_sla_params()
     def->min = 0;
     def->max = 150; // This is the max height of print on SL1
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(5.0);
+    def->set_default_value(new ConfigOptionFloat(5.0));
 
     def = this->add("support_points_density_relative", coInt);
     def->label = L("Support points density");
@@ -3076,7 +3125,7 @@ void PrintConfigDef::init_sla_params()
     def->tooltip = L("This is a relative measure of support points density.");
     def->sidetext = L("%");
     def->min = 0;
-    def->default_value = new ConfigOptionInt(100);
+    def->set_default_value(new ConfigOptionInt(100));
 
     def = this->add("support_points_minimal_distance", coFloat);
     def->label = L("Minimal distance of the support points");
@@ -3084,14 +3133,14 @@ void PrintConfigDef::init_sla_params()
     def->tooltip = L("No support points will be placed closer than this threshold.");
     def->sidetext = L("mm");
     def->min = 0;
-    def->default_value = new ConfigOptionFloat(0.f);
+    def->set_default_value(new ConfigOptionFloat(1.f));
 
     def = this->add("pad_enable", coBool);
     def->label = L("Use pad");
     def->category = L("Pad");
     def->tooltip = L("Add a pad underneath the supported model");
     def->mode = comSimple;
-    def->default_value = new ConfigOptionBool(true);
+    def->set_default_value(new ConfigOptionBool(true));
 
     def = this->add("pad_wall_thickness", coFloat);
     def->label = L("Pad wall thickness");
@@ -3101,18 +3150,21 @@ void PrintConfigDef::init_sla_params()
     def->min = 0;
     def->max = 30;
     def->mode = comSimple;
-    def->default_value = new ConfigOptionFloat(2.0);
+    def->set_default_value(new ConfigOptionFloat(2.0));
 
     def = this->add("pad_wall_height", coFloat);
     def->label = L("Pad wall height");
-    def->tooltip = L("Defines the cavity depth. Set to zero to disable the cavity.");
+    def->tooltip = L("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.");
     def->category = L("Pad");
 //     def->tooltip = L("");
     def->sidetext = L("mm");
     def->min = 0;
     def->max = 30;
-    def->mode = comSimple;
-    def->default_value = new ConfigOptionFloat(5.0);
+    def->mode = comExpert;
+    def->set_default_value(new ConfigOptionFloat(0.));
 
     def = this->add("pad_max_merge_distance", coFloat);
     def->label = L("Max merge distance");
@@ -3124,7 +3176,7 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comExpert;
-    def->default_value = new ConfigOptionFloat(50.0);
+    def->set_default_value(new ConfigOptionFloat(50.0));
 
     // This is disabled on the UI. I hope it will never be enabled.
     def = this->add("pad_edge_radius", coFloat);
@@ -3134,18 +3186,18 @@ void PrintConfigDef::init_sla_params()
     def->sidetext = L("mm");
     def->min = 0;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(1.0);
+    def->set_default_value(new ConfigOptionFloat(1.0));
 
     def = this->add("pad_wall_slope", coFloat);
     def->label = L("Pad wall slope");
     def->category = L("Pad");
     def->tooltip = L("The slope of the pad wall relative to the bed plane. "
                      "90 degrees means straight walls.");
-    def->sidetext = L("degrees");
+    def->sidetext = L("°");
     def->min = 45;
     def->max = 90;
     def->mode = comAdvanced;
-    def->default_value = new ConfigOptionFloat(45.0);
+    def->set_default_value(new ConfigOptionFloat(45.0));
 }
 
 void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &value)
@@ -3333,6 +3385,7 @@ double PrintConfig::min_object_distance(const ConfigBase *config)
     return base_dist;
 }
 
+//FIXME localize this function.
 std::string FullPrintConfig::validate()
 {
     // --layer-height
@@ -3539,75 +3592,76 @@ CLIActionsConfigDef::CLIActionsConfigDef()
     
     // Actions:
     def = this->add("export_obj", coBool);
-    def->label = L("Export SVG");
+    def->label = L("Export OBJ");
     def->tooltip = L("Export the model(s) as OBJ.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
     
 /*
     def = this->add("export_svg", coBool);
     def->label = L("Export SVG");
     def->tooltip = L("Slice the model and export solid slices as SVG.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 */
     
     def = this->add("export_sla", coBool);
     def->label = L("Export SLA");
     def->tooltip = L("Slice the model and export SLA printing layers as PNG.");
     def->cli = "export-sla|sla";
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("export_3mf", coBool);
     def->label = L("Export 3MF");
     def->tooltip = L("Export the model(s) as 3MF.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("export_amf", coBool);
     def->label = L("Export AMF");
     def->tooltip = L("Export the model(s) as AMF.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("export_stl", coBool);
     def->label = L("Export STL");
     def->tooltip = L("Export the model(s) as STL.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("export_gcode", coBool);
     def->label = L("Export G-code");
     def->tooltip = L("Slice the model and export toolpaths as G-code.");
     def->cli = "export-gcode|gcode|g";
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("slice", coBool);
     def->label = L("Slice");
     def->tooltip = L("Slice the model as FFF or SLA based on the printer_technology configuration value.");
     def->cli = "slice|s";
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("help", coBool);
     def->label = L("Help");
     def->tooltip = L("Show this help.");
     def->cli = "help|h";
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("help_fff", coBool);
     def->label = L("Help (FFF options)");
     def->tooltip = L("Show the full list of print/G-code configuration options.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("help_sla", coBool);
     def->label = L("Help (SLA options)");
     def->tooltip = L("Show the full list of SLA print configuration options.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
     
     def = this->add("info", coBool);
     def->label = L("Output Model Info");
     def->tooltip = L("Write information about the model to the console.");
-    def->default_value = new ConfigOptionBool(false);
+    def->set_default_value(new ConfigOptionBool(false));
     
     def = this->add("save", coString);
     def->label = L("Save config file");
     def->tooltip = L("Save configuration to the specified file.");
-    def->default_value = new ConfigOptionString();
+    def->set_default_value(new ConfigOptionString());
 }
 
 CLITransformConfigDef::CLITransformConfigDef()
@@ -3618,34 +3672,37 @@ CLITransformConfigDef::CLITransformConfigDef()
     def = this->add("align_xy", coPoint);
     def->label = L("Align XY");
     def->tooltip = L("Align the model to the given point.");
-    def->default_value = new ConfigOptionPoint(Vec2d(100,100));
+    def->set_default_value(new ConfigOptionPoint(Vec2d(100,100)));
     
     def = this->add("cut", coFloat);
     def->label = L("Cut");
     def->tooltip = L("Cut model at the given Z.");
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
     
 /*
     def = this->add("cut_grid", coFloat);
     def->label = L("Cut");
     def->tooltip = L("Cut model in the XY plane into tiles of the specified max size.");
-    def->default_value = new ConfigOptionPoint();
+    def->set_default_value(new ConfigOptionPoint();
+    def->set_default_value(new ConfigOptionPoint());
     
     def = this->add("cut_x", coFloat);
     def->label = L("Cut");
     def->tooltip = L("Cut model at the given X.");
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
     
     def = this->add("cut_y", coFloat);
     def->label = L("Cut");
     def->tooltip = L("Cut model at the given Y.");
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
 */
     
     def = this->add("center", coPoint);
     def->label = L("Center");
     def->tooltip = L("Center the print around the given center.");
-    def->default_value = new ConfigOptionPoint(Vec2d(100,100));
+    def->set_default_value(new ConfigOptionPoint(Vec2d(100,100)));
 
     def = this->add("dont_arrange", coBool);
     def->label = L("Don't arrange");
@@ -3672,22 +3729,22 @@ CLITransformConfigDef::CLITransformConfigDef()
     def = this->add("rotate", coFloat);
     def->label = L("Rotate");
     def->tooltip = L("Rotation angle around the Z axis in degrees.");
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
     
     def = this->add("rotate_x", coFloat);
     def->label = L("Rotate around X");
     def->tooltip = L("Rotation angle around the X axis in degrees.");
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
     
     def = this->add("rotate_y", coFloat);
     def->label = L("Rotate around Y");
     def->tooltip = L("Rotation angle around the Y axis in degrees.");
-    def->default_value = new ConfigOptionFloat(0);
+    def->set_default_value(new ConfigOptionFloat(0));
     
     def = this->add("scale", coFloatOrPercent);
     def->label = L("Scale");
     def->tooltip = L("Scaling factor or percentage.");
-    def->default_value = new ConfigOptionFloatOrPercent(1, false);
+    def->set_default_value(new ConfigOptionFloatOrPercent(1, false));
 
     def = this->add("split", coBool);
     def->label = L("Split");
@@ -3696,7 +3753,7 @@ CLITransformConfigDef::CLITransformConfigDef()
     def = this->add("scale_to_fit", coPoint3);
     def->label = L("Scale to Fit");
     def->tooltip = L("Scale to fit the given volume.");
-    def->default_value = new ConfigOptionPoint3(Vec3d(0,0,0));
+    def->set_default_value(new ConfigOptionPoint3(Vec3d(0,0,0)));
 }
 
 CLIMiscConfigDef::CLIMiscConfigDef()
@@ -3730,6 +3787,13 @@ CLIMiscConfigDef::CLIMiscConfigDef()
     def->label = L("Logging level");
     def->tooltip = L("Messages with severity lower or eqal to the loglevel will be printed out. 0:trace, 1:debug, 2:info, 3:warning, 4:error, 5:fatal");
     def->min = 0;
+
+#if defined(_MSC_VER) && defined(SLIC3R_GUI)
+    def = this->add("sw_renderer", coBool);
+    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 */
 }
 
 const CLIActionsConfigDef    cli_actions_config_def;
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index ecc514196..8873e9ffa 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -387,8 +387,8 @@ protected:
                 m_keys.emplace_back(kvp.first);
                 const ConfigOptionDef *def = defs->get(kvp.first);
                 assert(def != nullptr);
-                if (def->default_value != nullptr)
-                    opt->set(def->default_value);
+                if (def->default_value)
+                    opt->set(def->default_value.get());
             }
         }
 
@@ -1212,16 +1212,14 @@ public:
     ConfigOptionFloat                       initial_layer_height;
     ConfigOptionFloat                       exposure_time;
     ConfigOptionFloat                       initial_exposure_time;
-    ConfigOptionFloats                      material_correction_printing;
-    ConfigOptionFloats                      material_correction_curing;
+    ConfigOptionFloats                      material_correction;
 protected:
     void initialize(StaticCacheBase &cache, const char *base_ptr)
     {
         OPT_PTR(initial_layer_height);
         OPT_PTR(exposure_time);
         OPT_PTR(initial_exposure_time);
-        OPT_PTR(material_correction_printing);
-        OPT_PTR(material_correction_curing);
+        OPT_PTR(material_correction);
     }
 };
 
@@ -1237,7 +1235,9 @@ public:
     ConfigOptionInt                         display_pixels_x;
     ConfigOptionInt                         display_pixels_y;
     ConfigOptionEnum<SLADisplayOrientation> display_orientation;
-    ConfigOptionFloats                      printer_correction;
+    ConfigOptionFloats                      relative_correction;
+    ConfigOptionFloat                       absolute_correction;
+    ConfigOptionFloat                       gamma_correction;
     ConfigOptionFloat                       fast_tilt_time;
     ConfigOptionFloat                       slow_tilt_time;
     ConfigOptionFloat                       area_fill;
@@ -1252,7 +1252,9 @@ protected:
         OPT_PTR(display_pixels_x);
         OPT_PTR(display_pixels_y);
         OPT_PTR(display_orientation);
-        OPT_PTR(printer_correction);
+        OPT_PTR(relative_correction);
+        OPT_PTR(absolute_correction);
+        OPT_PTR(gamma_correction);
         OPT_PTR(fast_tilt_time);
         OPT_PTR(slow_tilt_time);
         OPT_PTR(area_fill);
diff --git a/src/libslic3r/PrintExport.hpp b/src/libslic3r/PrintExport.hpp
index df9446cf5..f6537ed32 100644
--- a/src/libslic3r/PrintExport.hpp
+++ b/src/libslic3r/PrintExport.hpp
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include <boost/log/trivial.hpp>
+#include <boost/filesystem/path.hpp>
 
 #include "Rasterizer/Rasterizer.hpp"
 //#include <tbb/parallel_for.h>
@@ -42,8 +43,9 @@ template<FilePrinterFormat format>
 class FilePrinter {
 public:
 
-    // Draw an ExPolygon which is a polygon inside a slice on the specified layer.
+    // Draw a polygon which is a polygon inside a slice on the specified layer.
     void draw_polygon(const ExPolygon& p, unsigned lyr);
+    void draw_polygon(const ClipperLib::Polygon& p, unsigned lyr);
 
     // Tell the printer how many layers should it consider.
     void layers(unsigned layernum);
@@ -71,7 +73,8 @@ public:
     void finish_layer();
 
     // Save all the layers into the file (or dir) specified in the path argument
-    void save(const std::string& path);
+    // An optional project name can be added to be used for the layer file names
+    void save(const std::string& path, const std::string& projectname = "");
 
     // Save only the selected layer to the file specified in path argument.
     void save_layer(unsigned lyr, const std::string& path);
@@ -80,28 +83,35 @@ public:
 // Provokes static_assert in the right way.
 template<class T = void> struct VeryFalse { static const bool value = false; };
 
-// This has to be explicitly implemented in the gui layer or a default zlib
-// based implementation is needed. I don't have time for that and I'm delegating
-// the implementation to the gui layer where the gui toolkit can cover this.
+// This can be explicitly implemented in the gui layer or the default Zipper
+// API in libslic3r with minz.
 template<class Fmt> class LayerWriter {
 public:
 
-    LayerWriter(const std::string& /*zipfile_path*/) {
+    LayerWriter(const std::string& /*zipfile_path*/)
+    {
         static_assert(VeryFalse<Fmt>::value,
                       "No layer writer implementation provided!");
     }
 
+    // Should create a new file within the zip with the given filename. It
+    // should also finish any previous entry.
     void next_entry(const std::string& /*fname*/) {}
 
-    std::string get_name() { return ""; }
+    // Should create a new file within the archive and write the provided data.
+    void binary_entry(const std::string& /*fname*/,
+                      const std::uint8_t* buf, size_t len);
 
+    // Test whether the object can still be used for writing.
     bool is_ok() { return false; }
 
-    template<class T> LayerWriter& operator<<(const T& /*arg*/) {
+    // Write some data (text) into the current file (entry) within the archive.
+    template<class T> LayerWriter& operator<<(T&& /*arg*/) {
         return *this;
     }
 
-    void close() {}
+    // Flush the current entry into the archive.
+    void finalize() {}
 };
 
 // Implementation for PNG raster output
@@ -110,14 +120,14 @@ public:
 template<> class FilePrinter<FilePrinterFormat::SLA_PNGZIP>
 {
     struct Layer {
-        Raster first;
-        std::stringstream second;
+        Raster raster;
+        RawBytes rawbytes;
 
         Layer() {}
 
         Layer(const Layer&) = delete;
         Layer(Layer&& m):
-            first(std::move(m.first))/*, second(std::move(m.second))*/ {}
+            raster(std::move(m.raster)) {}
     };
 
     // We will save the compressed PNG data into stringstreams which can be done
@@ -128,6 +138,7 @@ template<> class FilePrinter<FilePrinterFormat::SLA_PNGZIP>
     double m_exp_time_s = .0, m_exp_time_first_s = .0;
     double m_layer_height = .0;
     Raster::Origin m_o = Raster::Origin::TOP_LEFT;
+    double m_gamma;
 
     double m_used_material = 0.0;
     int    m_cnt_fade_layers = 0;
@@ -135,14 +146,11 @@ template<> class FilePrinter<FilePrinterFormat::SLA_PNGZIP>
     int    m_cnt_fast_layers = 0;
 
     std::string createIniContent(const std::string& projectname) {
-//         double layer_height = m_layer_height;
-
         using std::string;
         using std::to_string;
 
         auto expt_str = to_string(m_exp_time_s);
         auto expt_first_str = to_string(m_exp_time_first_s);
-//         auto stepnum_str = to_string(static_cast<unsigned>(800*layer_height));
         auto layerh_str = to_string(m_layer_height);
 
         const std::string cnt_fade_layers = to_string(m_cnt_fade_layers);
@@ -187,7 +195,8 @@ public:
                        unsigned width_px, unsigned height_px,
                        double layer_height,
                        double exp_time, double exp_time_first,
-                       RasterOrientation ro = RO_PORTRAIT):
+                       RasterOrientation ro = RO_PORTRAIT,
+                       double gamma = 1.0):
         m_res(width_px, height_px),
         m_pxdim(width_mm/width_px, height_mm/height_px),
         m_exp_time_s(exp_time),
@@ -196,7 +205,8 @@ public:
 
         // Here is the trick with the orientation.
         m_o(ro == RO_LANDSCAPE? Raster::Origin::BOTTOM_LEFT :
-                                Raster::Origin::TOP_LEFT )
+                                Raster::Origin::TOP_LEFT ),
+        m_gamma(gamma)
     {
     }
 
@@ -211,41 +221,48 @@ public:
 
     inline void draw_polygon(const ExPolygon& p, unsigned lyr) {
         assert(lyr < m_layers_rst.size());
-        m_layers_rst[lyr].first.draw(p);
+        m_layers_rst[lyr].raster.draw(p);
+    }
+
+    inline void draw_polygon(const ClipperLib::Polygon& p, unsigned lyr) {
+        assert(lyr < m_layers_rst.size());
+        m_layers_rst[lyr].raster.draw(p);
     }
 
     inline void begin_layer(unsigned lyr) {
         if(m_layers_rst.size() <= lyr) m_layers_rst.resize(lyr+1);
-        m_layers_rst[lyr].first.reset(m_res, m_pxdim, m_o);
+        m_layers_rst[lyr].raster.reset(m_res, m_pxdim, m_o, m_gamma);
     }
 
     inline void begin_layer() {
         m_layers_rst.emplace_back();
-        m_layers_rst.front().first.reset(m_res, m_pxdim, m_o);
+        m_layers_rst.front().raster.reset(m_res, m_pxdim, m_o, m_gamma);
     }
 
     inline void finish_layer(unsigned lyr_id) {
         assert(lyr_id < m_layers_rst.size());
-        m_layers_rst[lyr_id].first.save(m_layers_rst[lyr_id].second,
-                                       Raster::Compression::PNG);
-        m_layers_rst[lyr_id].first.reset();
+        m_layers_rst[lyr_id].rawbytes =
+                m_layers_rst[lyr_id].raster.save(Raster::Compression::PNG);
+        m_layers_rst[lyr_id].raster.reset();
     }
 
     inline void finish_layer() {
         if(!m_layers_rst.empty()) {
-            m_layers_rst.back().first.save(m_layers_rst.back().second,
-                                          Raster::Compression::PNG);
-            m_layers_rst.back().first.reset();
+            m_layers_rst.back().rawbytes =
+                    m_layers_rst.back().raster.save(Raster::Compression::PNG);
+            m_layers_rst.back().raster.reset();
         }
     }
 
     template<class LyrFmt>
-    inline void save(const std::string& path) {
+    inline void save(const std::string& fpath, const std::string& prjname = "")
+    {
         try {
-            LayerWriter<LyrFmt> writer(path);
+            LayerWriter<LyrFmt> writer(fpath);
             if(!writer.is_ok()) return;
 
-            std::string project = writer.get_name();
+            std::string project = prjname.empty()?
+                       boost::filesystem::path(fpath).stem().string() : prjname;
 
             writer.next_entry("config.ini");
             if(!writer.is_ok()) return;
@@ -254,20 +271,19 @@ public:
 
             for(unsigned i = 0; i < m_layers_rst.size() && writer.is_ok(); i++)
             {
-                if(m_layers_rst[i].second.rdbuf()->in_avail() > 0) {
+                if(m_layers_rst[i].rawbytes.size() > 0) {
                     char lyrnum[6];
                     std::sprintf(lyrnum, "%.5d", i);
                     auto zfilename = project + lyrnum + ".png";
-                    writer.next_entry(zfilename);
-
                     if(!writer.is_ok()) break;
 
-                    writer << m_layers_rst[i].second.str();
-                    // writer << m_layers_rst[i].second.rdbuf();
-                    // we can keep the date for later calls of this method
-                    //m_layers_rst[i].second.str("");
+                    writer.binary_entry(zfilename,
+                                        m_layers_rst[i].rawbytes.data(),
+                                        m_layers_rst[i].rawbytes.size());
                 }
             }
+
+            writer.finalize();
         } catch(std::exception& e) {
             BOOST_LOG_TRIVIAL(error) << e.what();
             // Rethrow the exception
@@ -285,13 +301,13 @@ public:
 
         std::fstream out(loc, std::fstream::out | std::fstream::binary);
         if(out.good()) {
-            m_layers_rst[i].first.save(out, Raster::Compression::PNG);
+            m_layers_rst[i].raster.save(out, Raster::Compression::PNG);
         } else {
             BOOST_LOG_TRIVIAL(error) << "Can't create file for layer";
         }
 
         out.close();
-        m_layers_rst[i].first.reset();
+        m_layers_rst[i].raster.reset();
     }
 
     void set_statistics(const std::vector<double> statistics)
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 7480e4ee4..964e9ced0 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -2,6 +2,7 @@
 #include "BoundingBox.hpp"
 #include "ClipperUtils.hpp"
 #include "Geometry.hpp"
+#include "I18N.hpp"
 #include "SupportMaterial.hpp"
 #include "Surface.hpp"
 #include "Slicing.hpp"
@@ -17,6 +18,10 @@
 
 #include <Shiny/Shiny.h>
 
+//! macro used to mark string used at localization, 
+//! return same string
+#define L(s) Slic3r::I18N::translate(s)
+
 #ifdef SLIC3R_DEBUG_SLICE_PROCESSING
 #define SLIC3R_DEBUG
 #endif
@@ -102,7 +107,7 @@ void PrintObject::slice()
 {
     if (! this->set_started(posSlice))
         return;
-    m_print->set_status(10, "Processing triangulated mesh");
+    m_print->set_status(10, L("Processing triangulated mesh"));
     std::vector<coordf_t> layer_height_profile;
     this->update_layer_height_profile(*this->model_object(), m_slicing_params, layer_height_profile);
     m_print->throw_if_canceled();
@@ -133,7 +138,7 @@ void PrintObject::make_perimeters()
     if (! this->set_started(posPerimeters))
         return;
 
-    m_print->set_status(20, "Generating perimeters");
+    m_print->set_status(20, L("Generating perimeters"));
     BOOST_LOG_TRIVIAL(info) << "Generating perimeters..." << log_memory_info();
     
     // merge slices if they were split into types
@@ -243,7 +248,7 @@ void PrintObject::prepare_infill()
     if (! this->set_started(posPrepareInfill))
         return;
 
-    m_print->set_status(30, "Preparing infill");
+    m_print->set_status(30, L("Preparing infill"));
 
     // This will assign a type (top/bottom/internal) to $layerm->slices.
     // Then the classifcation of $layerm->slices is transfered onto 
@@ -405,7 +410,7 @@ void PrintObject::generate_support_material()
     if (this->set_started(posSupportMaterial)) {
         this->clear_support_layers();
         if ((m_config.support_material || m_config.raft_layers > 0) && m_layers.size() > 1) {
-            m_print->set_status(85, "Generating support material");    
+            m_print->set_status(85, L("Generating support material"));    
             this->_generate_support_material();
             m_print->throw_if_canceled();
         } else {
@@ -1694,7 +1699,7 @@ void PrintObject::update_slicing_parameters()
             this->print()->config(), m_config, unscale<double>(this->size(2)), this->object_extruders());
 }
 
-SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig &full_config, const ModelObject &model_object)
+SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig &full_config, const ModelObject &model_object, float object_max_z)
 {
     PrintConfig         print_config;
     PrintObjectConfig   object_config;
@@ -1714,7 +1719,9 @@ SlicingParameters PrintObject::slicing_parameters(const DynamicPrintConfig &full
                 object_extruders);
     sort_remove_duplicates(object_extruders);
 
-    return SlicingParameters::create_from_config(print_config, object_config, model_object.bounding_box().max.z(), object_extruders);
+    if (object_max_z <= 0.f)
+        object_max_z = model_object.raw_bounding_box().size().z();
+	return SlicingParameters::create_from_config(print_config, object_config, object_max_z, object_extruders);
 }
 
 // returns 0-based indices of extruders used to print the object (without brim, support and other helper extrusions)
@@ -2253,21 +2260,28 @@ std::vector<ExPolygons> PrintObject::_slice_volumes(const std::vector<float> &z,
     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;
-        for (const ModelVolume *v : volumes)
-        {
-            TriangleMesh vol_mesh(v->mesh);
-            vol_mesh.transform(v->get_matrix());
+		TriangleMesh mesh(volumes.front()->mesh);
+        mesh.transform(volumes.front()->get_matrix(), true);
+		assert(mesh.repaired);
+		if (volumes.size() == 1 && mesh.repaired) {
+			//FIXME The admesh repair function may break the face connectivity, rather refresh it here as the slicing code relies on it.
+			stl_check_facets_exact(&mesh.stl);
+		}
+        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);
+            mesh.transform(m_trafo, true);
             // apply XY shift
             mesh.translate(- unscale<float>(m_copies_shift(0)), - unscale<float>(m_copies_shift(1)), 0);
             // perform actual slicing
             TriangleMeshSlicer mslicer(float(m_config.slice_closing_radius.value), float(m_config.model_precision.value));
             const Print *print = this->print();
             auto callback = TriangleMeshSlicer::throw_on_cancel_callback_type([print](){print->throw_if_canceled();});
+            mesh.require_shared_vertices(); // TriangleMeshSlicer needs this
             mslicer.init(&mesh, callback);
 			mslicer.slice(z, &layers, callback);
             m_print->throw_if_canceled();
@@ -2282,15 +2296,20 @@ std::vector<ExPolygons> PrintObject::_slice_volume(const std::vector<float> &z,
     // Compose mesh.
     //FIXME better to perform slicing over each volume separately and then to use a Boolean operation to merge them.
     TriangleMesh mesh(volume.mesh);
-    mesh.transform(volume.get_matrix());
+    mesh.transform(volume.get_matrix(), true);
+	if (mesh.repaired) {
+		//FIXME The admesh repair function may break the face connectivity, rather refresh it here as the slicing code relies on it.
+		stl_check_facets_exact(&mesh.stl);
+	}
     if (mesh.stl.stats.number_of_facets > 0) {
-        mesh.transform(m_trafo);
+        mesh.transform(m_trafo, true);
         // apply XY shift
         mesh.translate(- unscale<float>(m_copies_shift(0)), - unscale<float>(m_copies_shift(1)), 0);
         // perform actual slicing
         TriangleMeshSlicer mslicer(float(m_config.slice_closing_radius.value), float(m_config.model_precision.value));
         const Print *print = this->print();
         auto callback = TriangleMeshSlicer::throw_on_cancel_callback_type([print](){print->throw_if_canceled();});
+        mesh.require_shared_vertices(); // TriangleMeshSlicer needs this
         mslicer.init(&mesh, callback);
         mslicer.slice(z, &layers, callback);
         m_print->throw_if_canceled();
@@ -2704,7 +2723,7 @@ void PrintObject::discover_horizontal_shells()
                     // when spacing is added in Fill.pm
                     {
                         //FIXME Vojtech: Disable this and you will be sorry.
-                        // https://github.com/prusa3d/Slic3r/issues/26 bottom
+                        // https://github.com/prusa3d/PrusaSlicer/issues/26 bottom
                         float margin = 3.f * layerm->flow(frSolidInfill).scaled_width(); // require at least this size
                         // we use a higher miterLimit here to handle areas with acute angles
                         // in those cases, the default miterLimit would cut the corner and we'd
diff --git a/src/libslic3r/Rasterizer/Rasterizer.cpp b/src/libslic3r/Rasterizer/Rasterizer.cpp
index 5961d9b78..6384a241f 100644
--- a/src/libslic3r/Rasterizer/Rasterizer.cpp
+++ b/src/libslic3r/Rasterizer/Rasterizer.cpp
@@ -1,7 +1,6 @@
 #include "Rasterizer.hpp"
 #include <ExPolygon.hpp>
-
-#include <cstdint>
+#include <libnest2d/backends/clipper/clipper_polygon.hpp>
 
 // For rasterizing
 #include <agg/agg_basics.h>
@@ -15,11 +14,17 @@
 #include <agg/agg_rasterizer_scanline_aa.h>
 #include <agg/agg_path_storage.h>
 
-// For png compression
-#include <png/writer.hpp>
+// Experimental minz image write:
+#include <miniz/miniz_tdef.h>
 
 namespace Slic3r {
 
+const Polygon& contour(const ExPolygon& p) { return p.contour; }
+const ClipperLib::Path& contour(const ClipperLib::Polygon& p) { return p.Contour; }
+
+const Polygons& holes(const ExPolygon& p) { return p.holes; }
+const ClipperLib::Paths& holes(const ClipperLib::Polygon& p) { return p.Holes; }
+
 class Raster::Impl {
 public:
     using TPixelRenderer = agg::pixfmt_gray8; // agg::pixfmt_rgb24;
@@ -38,14 +43,17 @@ public:
 
 private:
     Raster::Resolution m_resolution;
-    Raster::PixelDim m_pxdim;
+//    Raster::PixelDim m_pxdim;
+    Raster::PixelDim m_pxdim_scaled;    // used for scaled coordinate polygons
     TBuffer m_buf;
     TRawBuffer m_rbuf;
     TPixelRenderer m_pixfmt;
     TRawRenderer m_raw_renderer;
     TRendererAA m_renderer;
+    
+    std::function<double(double)> m_gammafn;
     Origin m_o;
-
+    
     inline void flipy(agg::path_storage& path) const {
         path.flip_y(0, m_resolution.height_px);
     }
@@ -53,8 +61,10 @@ private:
 public:
 
     inline Impl(const Raster::Resolution& res, const Raster::PixelDim &pd,
-                Origin o):
-        m_resolution(res), m_pxdim(pd),
+                Origin o, double gamma = 1.0):
+        m_resolution(res), 
+//        m_pxdim(pd), 
+        m_pxdim_scaled(SCALING_FACTOR / pd.w_mm, SCALING_FACTOR / pd.h_mm),
         m_buf(res.pixels()),
         m_rbuf(reinterpret_cast<TPixelRenderer::value_type*>(m_buf.data()),
               res.width_px, res.height_px,
@@ -65,24 +75,26 @@ public:
         m_o(o)
     {
         m_renderer.color(ColorWhite);
-
-        // If we would like to play around with gamma
-        // ras.gamma(agg::gamma_power(1.0));
-
+        
+        if(gamma > 0) m_gammafn = agg::gamma_power(gamma);
+        else m_gammafn = agg::gamma_threshold(0.5);
+        
         clear();
     }
 
-    void draw(const ExPolygon &poly) {
+    template<class P> void draw(const P &poly) {
         agg::rasterizer_scanline_aa<> ras;
         agg::scanline_p8 scanlines;
+        
+        ras.gamma(m_gammafn);
 
-        auto&& path = to_path(poly.contour);
+        auto&& path = to_path(contour(poly));
 
         if(m_o == Origin::TOP_LEFT) flipy(path);
 
         ras.add_path(path);
 
-        for(auto h : poly.holes) {
+        for(auto& h : holes(poly)) {
             auto&& holepath = to_path(h);
             if(m_o == Origin::TOP_LEFT) flipy(holepath);
             ras.add_path(holepath);
@@ -102,22 +114,38 @@ public:
     inline Origin origin() const /*noexcept*/ { return m_o; }
 
 private:
-    double getPx(const Point& p) {
-        return p(0) * SCALING_FACTOR/m_pxdim.w_mm;
+    inline double getPx(const Point& p) {
+        return p(0) * m_pxdim_scaled.w_mm;
     }
 
-    double getPy(const Point& p) {
-        return p(1) * SCALING_FACTOR/m_pxdim.h_mm;
+    inline double getPy(const Point& p) {
+        return p(1) * m_pxdim_scaled.h_mm;
     }
 
-    agg::path_storage to_path(const Polygon& poly) {
+    inline agg::path_storage to_path(const Polygon& poly)
+    {
+        return to_path(poly.points);
+    }
+
+    inline double getPx(const ClipperLib::IntPoint& p) {
+        return p.X * m_pxdim_scaled.w_mm;
+    }
+
+    inline double getPy(const ClipperLib::IntPoint& p) {
+        return p.Y * m_pxdim_scaled.h_mm;
+    }
+
+    template<class PointVec> agg::path_storage to_path(const PointVec& poly)
+    {
         agg::path_storage path;
-        auto it = poly.points.begin();
+        
+        auto it = poly.begin();
         path.move_to(getPx(*it), getPy(*it));
-        while(++it != poly.points.end())
+        
+        while(++it != poly.end())
             path.line_to(getPx(*it), getPy(*it));
 
-        path.line_to(getPx(poly.points.front()), getPy(poly.points.front()));
+        path.line_to(getPx(poly.front()), getPy(poly.front()));
         return path;
     }
 
@@ -126,8 +154,8 @@ private:
 const Raster::Impl::TPixel Raster::Impl::ColorWhite = Raster::Impl::TPixel(255);
 const Raster::Impl::TPixel Raster::Impl::ColorBlack = Raster::Impl::TPixel(0);
 
-Raster::Raster(const Resolution &r, const PixelDim &pd, Origin o):
-    m_impl(new Impl(r, pd, o)) {}
+Raster::Raster(const Resolution &r, const PixelDim &pd, Origin o, double g):
+    m_impl(new Impl(r, pd, o, g)) {}
 
 Raster::Raster() {}
 
@@ -136,19 +164,20 @@ Raster::~Raster() {}
 Raster::Raster(Raster &&m):
     m_impl(std::move(m.m_impl)) {}
 
-void Raster::reset(const Raster::Resolution &r, const Raster::PixelDim &pd)
+void Raster::reset(const Raster::Resolution &r, const Raster::PixelDim &pd, 
+                   double g)
 {
     // Free up the unnecessary memory and make sure it stays clear after
     // an exception
     auto o = m_impl? m_impl->origin() : Origin::TOP_LEFT;
-    reset(r, pd, o);
+    reset(r, pd, o, g);
 }
 
 void Raster::reset(const Raster::Resolution &r, const Raster::PixelDim &pd,
-                   Raster::Origin o)
+                   Raster::Origin o, double gamma)
 {
     m_impl.reset();
-    m_impl.reset(new Impl(r, pd, o));
+    m_impl.reset(new Impl(r, pd, o, gamma));
 }
 
 void Raster::reset()
@@ -169,38 +198,36 @@ void Raster::clear()
     m_impl->clear();
 }
 
-void Raster::draw(const ExPolygon &poly)
+void Raster::draw(const ExPolygon &expoly)
+{
+    m_impl->draw(expoly);
+}
+
+void Raster::draw(const ClipperLib::Polygon &poly)
 {
-    assert(m_impl);
     m_impl->draw(poly);
 }
 
 void Raster::save(std::ostream& stream, Compression comp)
 {
     assert(m_impl);
+    if(!stream.good()) return;
+
     switch(comp) {
     case Compression::PNG: {
-
-        png::writer<std::ostream> wr(stream);
-
-        wr.set_bit_depth(8);
-        wr.set_color_type(png::color_type_gray);
-        wr.set_width(resolution().width_px);
-        wr.set_height(resolution().height_px);
-        wr.set_compression_type(png::compression_type_default);
-
-        wr.write_info();
-
         auto& b = m_impl->buffer();
-        auto ptr = reinterpret_cast<png::byte*>( b.data() );
-        unsigned stride =
-                sizeof(Impl::TBuffer::value_type) *  resolution().width_px;
+        size_t out_len = 0;
+        void * rawdata = tdefl_write_image_to_png_file_in_memory(
+                    b.data(),
+                    int(resolution().width_px),
+                    int(resolution().height_px), 1, &out_len);
 
-        for(unsigned r = 0; r < resolution().height_px; r++, ptr+=stride) {
-            wr.write_row(ptr);
-        }
+        if(rawdata == nullptr) break;
 
-        wr.write_end_info();
+        stream.write(static_cast<const char*>(rawdata),
+                     std::streamsize(out_len));
+
+        MZ_FREE(rawdata);
 
         break;
     }
@@ -217,4 +244,46 @@ void Raster::save(std::ostream& stream, Compression comp)
     }
 }
 
+RawBytes Raster::save(Raster::Compression comp)
+{
+    assert(m_impl);
+
+    std::vector<std::uint8_t> data; size_t s = 0;
+
+    switch(comp) {
+    case Compression::PNG: {
+        void *rawdata = tdefl_write_image_to_png_file_in_memory(
+                    m_impl->buffer().data(),
+                    int(resolution().width_px),
+                    int(resolution().height_px), 1, &s);
+
+        if(rawdata == nullptr) break;
+        auto ptr = static_cast<std::uint8_t*>(rawdata);
+        
+        data.reserve(s); std::copy(ptr, ptr + s, std::back_inserter(data));
+        
+        MZ_FREE(rawdata);
+        break;
+    }
+    case Compression::RAW: {
+        auto header = std::string("P5 ") +
+                std::to_string(m_impl->resolution().width_px) + " " +
+                std::to_string(m_impl->resolution().height_px) + " " + "255 ";
+
+        auto sz = m_impl->buffer().size()*sizeof(Impl::TBuffer::value_type);
+        s = sz + header.size();
+        
+        data.reserve(s);
+        
+        auto buff = reinterpret_cast<std::uint8_t*>(m_impl->buffer().data());
+        std::copy(header.begin(), header.end(), std::back_inserter(data));
+        std::copy(buff, buff+sz, std::back_inserter(data));
+        
+        break;
+    }
+    }
+
+    return {std::move(data)};
+}
+
 }
diff --git a/src/libslic3r/Rasterizer/Rasterizer.hpp b/src/libslic3r/Rasterizer/Rasterizer.hpp
index 06d5b88c6..3fffe1a36 100644
--- a/src/libslic3r/Rasterizer/Rasterizer.hpp
+++ b/src/libslic3r/Rasterizer/Rasterizer.hpp
@@ -3,11 +3,43 @@
 
 #include <ostream>
 #include <memory>
+#include <vector>
+#include <cstdint>
+
+namespace ClipperLib { struct Polygon; }
 
 namespace Slic3r {
 
 class ExPolygon;
 
+// Raw byte buffer paired with its size. Suitable for compressed PNG data.
+class RawBytes {
+
+    std::vector<std::uint8_t> m_buffer;
+public:
+
+    RawBytes() = default;
+    RawBytes(std::vector<std::uint8_t>&& data): m_buffer(std::move(data)) {}
+    
+    size_t size() const { return m_buffer.size(); }
+    const uint8_t * data() { return m_buffer.data(); }
+
+    // /////////////////////////////////////////////////////////////////////////
+    // FIXME: the following is needed for MSVC2013 compatibility
+    // /////////////////////////////////////////////////////////////////////////
+
+    RawBytes(const RawBytes&) = delete;
+    RawBytes(RawBytes&& mv) : m_buffer(std::move(mv.m_buffer)) {}
+
+    RawBytes& operator=(const RawBytes&) = delete;
+    RawBytes& operator=(RawBytes&& mv) {
+        m_buffer = std::move(mv.m_buffer);
+        return *this;
+    }
+
+    // /////////////////////////////////////////////////////////////////////////
+};
+
 /**
  * @brief Raster captures an anti-aliased monochrome canvas where vectorial
  * polygons can be rasterized. Fill color is always white and the background is
@@ -58,8 +90,9 @@ public:
     };
 
     /// Constructor taking the resolution and the pixel dimension.
-    explicit Raster(const Resolution& r, const PixelDim& pd,
-                    Origin o = Origin::BOTTOM_LEFT );
+    Raster(const Resolution& r,  const PixelDim& pd, 
+           Origin o = Origin::BOTTOM_LEFT, double gamma = 1.0);
+    
     Raster();
     Raster(const Raster& cpy) = delete;
     Raster& operator=(const Raster& cpy) = delete;
@@ -67,8 +100,8 @@ public:
     ~Raster();
 
     /// Reallocated everything for the given resolution and pixel dimension.
-    void reset(const Resolution& r, const PixelDim& pd);
-    void reset(const Resolution& r, const PixelDim& pd, Origin o);
+    void reset(const Resolution& r, const PixelDim& pd, double gamma = 1.0);
+    void reset(const Resolution& r, const PixelDim& pd, Origin o, double gamma);
 
     /**
      * Release the allocated resources. Drawing in this state ends in
@@ -84,9 +117,12 @@ public:
 
     /// Draw a polygon with holes.
     void draw(const ExPolygon& poly);
+    void draw(const ClipperLib::Polygon& poly);
 
     /// Save the raster on the specified stream.
     void save(std::ostream& stream, Compression comp = Compression::RAW);
+
+    RawBytes save(Compression comp = Compression::RAW);
 };
 
 }
diff --git a/src/libslic3r/SLA/SLAAutoSupports.cpp b/src/libslic3r/SLA/SLAAutoSupports.cpp
index 2a605a27b..97c6d61f5 100644
--- a/src/libslic3r/SLA/SLAAutoSupports.cpp
+++ b/src/libslic3r/SLA/SLAAutoSupports.cpp
@@ -49,8 +49,8 @@ float SLAAutoSupports::distance_limit(float angle) const
 }*/
 
 SLAAutoSupports::SLAAutoSupports(const TriangleMesh& mesh, const sla::EigenMesh3D& emesh, const std::vector<ExPolygons>& slices, const std::vector<float>& heights,
-                                   const Config& config, std::function<void(void)> throw_on_cancel)
-: m_config(config), m_emesh(emesh), m_throw_on_cancel(throw_on_cancel)
+                                   const Config& config, std::function<void(void)> throw_on_cancel, std::function<void(int)> statusfn)
+: m_config(config), m_emesh(emesh), m_throw_on_cancel(throw_on_cancel), m_statusfn(statusfn)
 {
     process(slices, heights);
     project_onto_mesh(m_output);
@@ -197,6 +197,9 @@ void SLAAutoSupports::process(const std::vector<ExPolygons>& slices, const std::
     PointGrid3D point_grid;
     point_grid.cell_size = Vec3f(10.f, 10.f, 10.f);
 
+    double increment = 100.0 / layers.size();
+    double status    = 0;
+
     for (unsigned int layer_id = 0; layer_id < layers.size(); ++ layer_id) {
         SLAAutoSupports::MyLayer *layer_top     = &layers[layer_id];
         SLAAutoSupports::MyLayer *layer_bottom  = (layer_id > 0) ? &layers[layer_id - 1] : nullptr;
@@ -252,6 +255,9 @@ void SLAAutoSupports::process(const std::vector<ExPolygons>& slices, const std::
 
         m_throw_on_cancel();
 
+        status += increment;
+        m_statusfn(int(std::round(status)));
+
 #ifdef SLA_AUTOSUPPORTS_DEBUG
         /*std::string layer_num_str = std::string((i<10 ? "0" : "")) + std::string((i<100 ? "0" : "")) + std::to_string(i);
         output_expolygons(expolys_top, "top" + layer_num_str + ".svg");
diff --git a/src/libslic3r/SLA/SLAAutoSupports.hpp b/src/libslic3r/SLA/SLAAutoSupports.hpp
index 15a5033bd..171cf854a 100644
--- a/src/libslic3r/SLA/SLAAutoSupports.hpp
+++ b/src/libslic3r/SLA/SLAAutoSupports.hpp
@@ -19,12 +19,12 @@ public:
             float minimal_distance;
             float head_diameter;
             ///////////////
-            inline float support_force() const { return 10.f / density_relative; } // a force one point can support       (arbitrary force unit)
+            inline float support_force() const { return 7.7f / density_relative; } // a force one point can support       (arbitrary force unit)
             inline float tear_pressure() const { return 1.f; }  // pressure that the display exerts    (the force unit per mm2)
         };
 
     SLAAutoSupports(const TriangleMesh& mesh, const sla::EigenMesh3D& emesh, const std::vector<ExPolygons>& slices,
-                     const std::vector<float>& heights, const Config& config, std::function<void(void)> throw_on_cancel);
+                     const std::vector<float>& heights, const Config& config, std::function<void(void)> throw_on_cancel, std::function<void(int)> statusfn);
     const std::vector<sla::SupportPoint>& output() { return m_output; }
 
 	struct MyLayer;
@@ -196,12 +196,13 @@ private:
     static void output_structures(const std::vector<Structure> &structures);
 #endif // SLA_AUTOSUPPORTS_DEBUG
 
-    std::function<void(void)> m_throw_on_cancel;
     const sla::EigenMesh3D& m_emesh;
+    std::function<void(void)> m_throw_on_cancel;
+    std::function<void(int)>  m_statusfn;
 };
 
 
 } // namespace Slic3r
 
 
-#endif // SLAAUTOSUPPORTS_HPP_
\ No newline at end of file
+#endif // SLAAUTOSUPPORTS_HPP_
diff --git a/src/libslic3r/SLA/SLABasePool.cpp b/src/libslic3r/SLA/SLABasePool.cpp
index 6518ede07..69f7b91ca 100644
--- a/src/libslic3r/SLA/SLABasePool.cpp
+++ b/src/libslic3r/SLA/SLABasePool.cpp
@@ -552,6 +552,7 @@ void base_plate(const TriangleMesh &mesh, ExPolygons &output, float h,
                 float layerh, ThrowOnCancel thrfn)
 {
     TriangleMesh m = mesh;
+    m.require_shared_vertices(); // TriangleMeshSlicer needs this
     TriangleMeshSlicer slicer(&m);
 
     auto bb = mesh.bounding_box();
@@ -581,8 +582,8 @@ void base_plate(const TriangleMesh &mesh, ExPolygons &output, float h,
     }
 }
 
-void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out,
-                      const PoolConfig& cfg)
+Contour3D create_base_pool(const ExPolygons &ground_layer, 
+                           const PoolConfig& cfg = PoolConfig()) 
 {
     // for debugging:
     // Benchmark bench;
@@ -617,7 +618,7 @@ void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out,
     Contour3D pool;
 
     for(ExPolygon& concaveh : concavehs) {
-        if(concaveh.contour.points.empty()) return;
+        if(concaveh.contour.points.empty()) return pool;
 
         // Get rid of any holes in the concave hull output.
         concaveh.holes.clear();
@@ -682,7 +683,7 @@ void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out,
 
 
         // Generate the smoothed edge geometry
-        pool.merge(round_edges(ob,
+        if(s_eradius > 0) pool.merge(round_edges(ob,
                                r,
                                phi,
                                0,    // z position of the input plane
@@ -697,7 +698,8 @@ void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out,
 
         if(wingheight > 0) {
             // Generate the smoothed edge geometry
-            pool.merge(round_edges(middle_base,
+            wh = 0;
+            if(s_eradius) pool.merge(round_edges(middle_base,
                                    r,
                                    phi - 90, // from tangent lines
                                    0,  // z position of the input plane
@@ -721,6 +723,14 @@ void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out,
             pool.merge(triangulate_expolygon_3d(inner_base, -wingheight));
 
     }
+    
+    return pool;
+}
+
+void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out,
+                      const PoolConfig& cfg)
+{
+    
 
     // For debugging:
     // bench.stop();
@@ -728,7 +738,7 @@ void create_base_pool(const ExPolygons &ground_layer, TriangleMesh& out,
     // std::fstream fout("pad_debug.obj", std::fstream::out);
     // if(fout.good()) pool.to_obj(fout);
 
-    out.merge(mesh(pool));
+    out.merge(mesh(create_base_pool(ground_layer, cfg)));
 }
 
 }
diff --git a/src/libslic3r/SLA/SLASupportTree.cpp b/src/libslic3r/SLA/SLASupportTree.cpp
index 7c4bf96bf..ffcc3a911 100644
--- a/src/libslic3r/SLA/SLASupportTree.cpp
+++ b/src/libslic3r/SLA/SLASupportTree.cpp
@@ -817,6 +817,10 @@ public:
 
         meshcache = mesh(merged);
 
+        // The mesh will be passed by const-pointer to TriangleMeshSlicer,
+        // which will need this.
+        meshcache.require_shared_vertices();
+
         // TODO: Is this necessary?
         //meshcache.repair();
 
@@ -842,6 +846,16 @@ public:
         if(!meshcache_valid) merged_mesh();
         return model_height;
     }
+    
+    // Intended to be called after the generation is fully complete
+    void clear_support_data() {
+        merged_mesh(); // in case the mesh is not generated, it should be...
+        m_heads.clear();
+        m_pillars.clear();
+        m_junctions.clear();
+        m_bridges.clear();
+        m_compact_bridges.clear();
+    }
 
 };
 
@@ -1572,10 +1586,8 @@ public:
             auto hit = bridge_mesh_intersect(headjp, n, r);
 
             if(std::isinf(hit.distance())) ground_head_indices.emplace_back(i);
-            else {
-                if(m_cfg.ground_facing_only) head.invalidate();
-                m_iheads_onmodel.emplace_back(std::make_pair(i, hit));
-            }
+            else if(m_cfg.ground_facing_only)  head.invalidate();
+            else m_iheads_onmodel.emplace_back(std::make_pair(i, hit));
         }
 
         // We want to search for clusters of points that are far enough
@@ -1872,7 +1884,7 @@ public:
         }
     }
 
-    void cascade_pillars() {
+    void interconnect_pillars() {
         // Now comes the algorithm that connects pillars with each other.
         // Ideally every pillar should be connected with at least one of its
         // neighbors if that neighbor is within max_pillar_link_distance
@@ -2121,7 +2133,7 @@ bool SLASupportTree::generate(const std::vector<SupportPoint> &support_points,
 
         std::bind(&Algorithm::routing_to_model, &alg),
 
-        std::bind(&Algorithm::cascade_pillars, &alg),
+        std::bind(&Algorithm::interconnect_pillars, &alg),
 
         std::bind(&Algorithm::routing_headless, &alg),
 
@@ -2150,16 +2162,16 @@ bool SLASupportTree::generate(const std::vector<SupportPoint> &support_points,
     // Let's define a simple automaton that will run our program.
     auto progress = [&ctl, &pc] () {
         static const std::array<std::string, NUM_STEPS> stepstr {
-            L("Starting"),
-            L("Filtering"),
-            L("Generate pinheads"),
-            L("Classification"),
-            L("Routing to ground"),
-            L("Routing supports to model surface"),
-            L("Cascading pillars"),
-            L("Processing small holes"),
-            L("Done"),
-            L("Abort")
+            "Starting",
+            "Filtering",
+            "Generate pinheads",
+            "Classification",
+            "Routing to ground",
+            "Routing supports to model surface",
+            "Interconnecting pillars",
+            "Processing small holes",
+            "Done",
+            "Abort"
         };
 
         static const std::array<unsigned, NUM_STEPS> stepstate {
@@ -2233,6 +2245,7 @@ SlicedSupports SLASupportTree::slice(float layerh, float init_layerh) const
 
     TriangleMesh fullmesh = m_impl->merged_mesh();
     fullmesh.merge(get_pad());
+    fullmesh.require_shared_vertices(); // TriangleMeshSlicer needs this
     TriangleMeshSlicer slicer(&fullmesh);
     SlicedSupports ret;
     slicer.slice(heights, &ret, get().ctl().cancelfn);
@@ -2245,6 +2258,7 @@ SlicedSupports SLASupportTree::slice(const std::vector<float> &heights,
 {
     TriangleMesh fullmesh = m_impl->merged_mesh();
     fullmesh.merge(get_pad());
+    fullmesh.require_shared_vertices(); // TriangleMeshSlicer needs this
     TriangleMeshSlicer slicer(cr, 0);
     //TriangleMeshSlicer slicer(&fullmesh);
     slicer.init(&fullmesh, []() {});
@@ -2283,6 +2297,7 @@ SLASupportTree::SLASupportTree(const std::vector<SupportPoint> &points,
 {
     m_impl->ground_level = emesh.ground_level() - cfg.object_elevation_mm;
     generate(points, emesh, cfg, ctl);
+    m_impl->clear_support_data();
 }
 
 SLASupportTree::SLASupportTree(const SLASupportTree &c):
diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp
index 6d8b77ec9..83736161c 100644
--- a/src/libslic3r/SLAPrint.cpp
+++ b/src/libslic3r/SLAPrint.cpp
@@ -3,6 +3,7 @@
 #include "SLA/SLABasePool.hpp"
 #include "SLA/SLAAutoSupports.hpp"
 #include "ClipperUtils.hpp"
+#include "Geometry.hpp"
 #include "MTUtils.hpp"
 
 #include <unordered_set>
@@ -12,6 +13,9 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/log/trivial.hpp>
 
+// For geometry algorithms with native Clipper types (no copies and conversions)
+#include <libnest2d/backends/clipper/geometries.hpp>
+
 //#include <tbb/spin_mutex.h>//#include "tbb/mutex.h"
 
 #include "I18N.hpp"
@@ -39,35 +43,43 @@ namespace {
 // should add up to 100 (%)
 const std::array<unsigned, slaposCount>     OBJ_STEP_LEVELS =
 {
-    10,     // slaposObjectSlice,
-    30,     // slaposSupportPoints,
-    25,     // slaposSupportTree,
-    25,     // slaposBasePool,
-    5,      // slaposSliceSupports,
-    5       // slaposIndexSlices
+    30,     // slaposObjectSlice,
+    20,     // slaposSupportPoints,
+    10,     // slaposSupportTree,
+    10,     // slaposBasePool,
+    30,     // slaposSliceSupports,
 };
 
-const std::array<std::string, slaposCount> OBJ_STEP_LABELS =
+// Object step to status label. The labels are localized at the time of calling, thus supporting language switching.
+std::string OBJ_STEP_LABELS(size_t idx) 
 {
-    L("Slicing model"),                 // slaposObjectSlice,
-    L("Generating support points"),      // slaposSupportPoints,
-    L("Generating support tree"),       // slaposSupportTree,
-    L("Generating pad"),                // slaposBasePool,
-    L("Slicing supports"),              // slaposSliceSupports,
-    L("Slicing supports")               // slaposIndexSlices,
+    switch (idx) {
+    case slaposObjectSlice:     return L("Slicing model");
+    case slaposSupportPoints:   return L("Generating support points");
+    case slaposSupportTree:     return L("Generating support tree");
+    case slaposBasePool:        return L("Generating pad");
+    case slaposSliceSupports:   return L("Slicing supports");
+    default:;
+    }
+    assert(false); return "Out of bounds!";
 };
 
 // Should also add up to 100 (%)
 const std::array<unsigned, slapsCount> PRINT_STEP_LEVELS =
 {
-    80,     // slapsRasterize
-    20,     // slapsValidate
+    10,      // slapsMergeSlicesAndEval
+    90,      // slapsRasterize
 };
 
-const std::array<std::string, slapsCount> PRINT_STEP_LABELS =
+// Print step to status label. The labels are localized at the time of calling, thus supporting language switching.
+std::string PRINT_STEP_LABELS(size_t idx)
 {
-    L("Rasterizing layers"),         // slapsRasterize
-    L("Validating"),                 // slapsValidate
+    switch (idx) {
+    case slapsMergeSlicesAndEval:   return L("Merging slices and calculating statistics");
+    case slapsRasterize:            return L("Rasterizing layers");
+    default:;
+    }
+    assert(false); return "Out of bounds!";
 };
 
 }
@@ -84,28 +96,51 @@ void SLAPrint::clear()
 }
 
 // Transformation without rotation around Z and without a shift by X and Y.
-static Transform3d sla_trafo(const ModelObject &model_object)
+static Transform3d sla_trafo(const SLAPrint& p, const ModelObject &model_object)
 {
+
+    Vec3d corr = p.relative_correction();
+
     ModelInstance &model_instance = *model_object.instances.front();
     Vec3d          offset         = model_instance.get_offset();
     Vec3d          rotation       = model_instance.get_rotation();
     offset(0) = 0.;
     offset(1) = 0.;
     rotation(2) = 0.;
-    return Geometry::assemble_transform(offset, rotation, model_instance.get_scaling_factor(), model_instance.get_mirror());
+
+    offset(Z) *= corr(Z);
+
+    auto trafo = Transform3d::Identity();
+    trafo.translate(offset);
+    trafo.scale(corr);
+    trafo.rotate(Eigen::AngleAxisd(rotation(2), Vec3d::UnitZ()));
+    trafo.rotate(Eigen::AngleAxisd(rotation(1), Vec3d::UnitY()));
+    trafo.rotate(Eigen::AngleAxisd(rotation(0), Vec3d::UnitX()));
+    trafo.scale(model_instance.get_scaling_factor());
+    trafo.scale(model_instance.get_mirror());
+
+    if (model_instance.is_left_handed())
+        trafo = Eigen::Scaling(Vec3d(-1., 1., 1.)) * trafo;
+
+    return trafo;
 }
 
 // List of instances, where the ModelInstance transformation is a composite of sla_trafo and the transformation defined by SLAPrintObject::Instance.
 static std::vector<SLAPrintObject::Instance> sla_instances(const ModelObject &model_object)
 {
     std::vector<SLAPrintObject::Instance> instances;
-    for (ModelInstance *model_instance : model_object.instances)
-        if (model_instance->is_printable()) {
-            instances.emplace_back(SLAPrintObject::Instance(
-                model_instance->id(),
-                Point::new_scale(model_instance->get_offset(X), model_instance->get_offset(Y)),
-                float(model_instance->get_rotation(Z))));
-        }
+    assert(! model_object.instances.empty());
+    if (! model_object.instances.empty()) {
+        Vec3d rotation0 = model_object.instances.front()->get_rotation();
+        rotation0(2) = 0.;
+        for (ModelInstance *model_instance : model_object.instances)
+            if (model_instance->is_printable()) {
+                instances.emplace_back(
+                    model_instance->id(),
+                    Point::new_scale(model_instance->get_offset(X), model_instance->get_offset(Y)),
+                    float(Geometry::rotation_diff_z(rotation0, model_instance->get_rotation())));
+            }
+    }
     return instances;
 }
 
@@ -117,12 +152,12 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
 
     // Make a copy of the config, normalize it.
     DynamicPrintConfig config(config_in);
-	config.option("sla_print_settings_id",    true);
-	config.option("sla_material_settings_id", true);
-	config.option("printer_settings_id",      true);
+    config.option("sla_print_settings_id",    true);
+    config.option("sla_material_settings_id", true);
+    config.option("printer_settings_id",      true);
     config.normalize();
     // Collect changes to print config.
-    t_config_option_keys print_diff    = m_print_config.diff(config);    
+    t_config_option_keys print_diff    = m_print_config.diff(config);
     t_config_option_keys printer_diff  = m_printer_config.diff(config);
     t_config_option_keys material_diff = m_material_config.diff(config);
     t_config_option_keys object_diff   = m_default_object_config.diff(config);
@@ -139,23 +174,24 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
     tbb::mutex::scoped_lock lock(this->state_mutex());
 
     // The following call may stop the background processing.
+    bool invalidate_all_model_objects = false;
     if (! print_diff.empty())
-        update_apply_status(this->invalidate_state_by_config_options(print_diff));
+        update_apply_status(this->invalidate_state_by_config_options(print_diff, invalidate_all_model_objects));
     if (! printer_diff.empty())
-        update_apply_status(this->invalidate_state_by_config_options(printer_diff));
+        update_apply_status(this->invalidate_state_by_config_options(printer_diff, invalidate_all_model_objects));
     if (! material_diff.empty())
-        update_apply_status(this->invalidate_state_by_config_options(material_diff));
+        update_apply_status(this->invalidate_state_by_config_options(material_diff, invalidate_all_model_objects));
 
     // Apply variables to placeholder parser. The placeholder parser is currently used
     // only to generate the output file name.
-	if (! placeholder_parser_diff.empty()) {
+    if (! placeholder_parser_diff.empty()) {
         // update_apply_status(this->invalidate_step(slapsRasterize));
-		PlaceholderParser &pp = this->placeholder_parser();
-		pp.apply_config(config);
+        PlaceholderParser &pp = this->placeholder_parser();
+        pp.apply_config(config);
         // Set the profile aliases for the PrintBase::output_filename()
-		pp.set("print_preset",    config.option("sla_print_settings_id")->clone());
-		pp.set("material_preset", config.option("sla_material_settings_id")->clone());
-		pp.set("printer_preset",  config.option("printer_settings_id")->clone());
+        pp.set("print_preset",    config.option("sla_print_settings_id")->clone());
+        pp.set("material_preset", config.option("sla_material_settings_id")->clone());
+        pp.set("printer_preset",  config.option("printer_settings_id")->clone());
     }
 
     // It is also safe to change m_config now after this->invalidate_state_by_config_options() call.
@@ -183,7 +219,7 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
     std::set<ModelObjectStatus> model_object_status;
 
     // 1) Synchronize model objects.
-    if (model.id() != m_model.id()) {
+    if (model.id() != m_model.id() || invalidate_all_model_objects) {
         // Kill everything, initialize from scratch.
         // Stop background processing.
         this->call_cancel_callback();
@@ -204,7 +240,7 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
                 model_object_status.emplace(model_object->id(), ModelObjectStatus::Old);
         } else if (model_object_list_extended(m_model, model)) {
             // Add new objects. Their volumes and configs will be synchronized later.
-            update_apply_status(this->invalidate_step(slapsRasterize));
+            update_apply_status(this->invalidate_step(slapsMergeSlicesAndEval));
             for (const ModelObject *model_object : m_model.objects)
                 model_object_status.emplace(model_object->id(), ModelObjectStatus::Old);
             for (size_t i = m_model.objects.size(); i < model.objects.size(); ++ i) {
@@ -216,7 +252,7 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
             // Reorder the objects, add new objects.
             // First stop background processing before shuffling or deleting the PrintObjects in the object list.
             this->call_cancel_callback();
-            update_apply_status(this->invalidate_step(slapsRasterize));
+            update_apply_status(this->invalidate_step(slapsMergeSlicesAndEval));
             // Second create a new list of objects.
             std::vector<ModelObject*> model_objects_old(std::move(m_model.objects));
             m_model.objects.clear();
@@ -302,105 +338,93 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
         auto it_status = model_object_status.find(ModelObjectStatus(model_object.id()));
         assert(it_status != model_object_status.end());
         assert(it_status->status != ModelObjectStatus::Deleted);
-		// PrintObject for this ModelObject, if it exists.
-		auto it_print_object_status = print_object_status.end();
-		if (it_status->status != ModelObjectStatus::New) {
-			// Update the ModelObject instance, possibly invalidate the linked PrintObjects.
-			assert(it_status->status == ModelObjectStatus::Old || it_status->status == ModelObjectStatus::Moved);
-			const ModelObject &model_object_new       = *model.objects[idx_model_object];
-			it_print_object_status = print_object_status.lower_bound(PrintObjectStatus(model_object.id()));
-			if (it_print_object_status != print_object_status.end() && it_print_object_status->id != model_object.id())
-				it_print_object_status = print_object_status.end();
-			// Check whether a model part volume was added or removed, their transformations or order changed.
-			bool model_parts_differ = model_volume_list_changed(model_object, model_object_new, ModelVolumeType::MODEL_PART);
-			bool sla_trafo_differs  = model_object.instances.empty() != model_object_new.instances.empty() ||
-				(! model_object.instances.empty() && ! sla_trafo(model_object).isApprox(sla_trafo(model_object_new)));
-			if (model_parts_differ || sla_trafo_differs) {
-				// The very first step (the slicing step) is invalidated. One may freely remove all associated PrintObjects.
-				if (it_print_object_status != print_object_status.end()) {
-					update_apply_status(it_print_object_status->print_object->invalidate_all_steps());
-					const_cast<PrintObjectStatus&>(*it_print_object_status).status = PrintObjectStatus::Deleted;
-				}
-				// Copy content of the ModelObject including its ID, do not change the parent.
-				model_object.assign_copy(model_object_new);
-			} else {
-				// Synchronize Object's config.
-				bool object_config_changed = model_object.config != model_object_new.config;
-				if (object_config_changed)
-					model_object.config = model_object_new.config;
-				if (! object_diff.empty() || object_config_changed) {
-					SLAPrintObjectConfig new_config = m_default_object_config;
-					normalize_and_apply_config(new_config, model_object.config);
-					if (it_print_object_status != print_object_status.end()) {
-						t_config_option_keys diff = it_print_object_status->print_object->config().diff(new_config);
-						if (! diff.empty()) {
-							update_apply_status(it_print_object_status->print_object->invalidate_state_by_config_options(diff));
-							it_print_object_status->print_object->config_apply_only(new_config, diff, true);
-						}
-					}
-				}
-				/*if (model_object.sla_support_points != model_object_new.sla_support_points) {
-					model_object.sla_support_points = model_object_new.sla_support_points;
-					if (it_print_object_status != print_object_status.end())
-						update_apply_status(it_print_object_status->print_object->invalidate_step(slaposSupportPoints));
-				}
-				if (model_object.sla_points_status != model_object_new.sla_points_status) {
-					// Change of this status should invalidate support points. The points themselves are not enough, there are none
-					// in case that nothing was generated OR that points were autogenerated already and not copied to the front-end.
-					// These cases can only be differentiated by checking the status change. However, changing from 'Generating' should NOT
-					// invalidate - that would keep stopping the background processing without a reason.
-					if (model_object.sla_points_status != sla::PointsStatus::Generating)
-						if (it_print_object_status != print_object_status.end())
-							update_apply_status(it_print_object_status->print_object->invalidate_step(slaposSupportPoints));
-					model_object.sla_points_status = model_object_new.sla_points_status;
-				}*/
+        // PrintObject for this ModelObject, if it exists.
+        auto it_print_object_status = print_object_status.end();
+        if (it_status->status != ModelObjectStatus::New) {
+            // Update the ModelObject instance, possibly invalidate the linked PrintObjects.
+            assert(it_status->status == ModelObjectStatus::Old || it_status->status == ModelObjectStatus::Moved);
+            const ModelObject &model_object_new       = *model.objects[idx_model_object];
+            it_print_object_status = print_object_status.lower_bound(PrintObjectStatus(model_object.id()));
+            if (it_print_object_status != print_object_status.end() && it_print_object_status->id != model_object.id())
+                it_print_object_status = print_object_status.end();
+            // Check whether a model part volume was added or removed, their transformations or order changed.
+            bool model_parts_differ = model_volume_list_changed(model_object, model_object_new, ModelVolumeType::MODEL_PART);
+            bool sla_trafo_differs  =
+                model_object.instances.empty() != model_object_new.instances.empty() ||
+                (! model_object.instances.empty() &&
+                  (! sla_trafo(*this, model_object).isApprox(sla_trafo(*this, model_object_new)) ||
+                    model_object.instances.front()->is_left_handed() != model_object_new.instances.front()->is_left_handed()));
+            if (model_parts_differ || sla_trafo_differs) {
+                // The very first step (the slicing step) is invalidated. One may freely remove all associated PrintObjects.
+                if (it_print_object_status != print_object_status.end()) {
+                    update_apply_status(it_print_object_status->print_object->invalidate_all_steps());
+                    const_cast<PrintObjectStatus&>(*it_print_object_status).status = PrintObjectStatus::Deleted;
+                }
+                // Copy content of the ModelObject including its ID, do not change the parent.
+                model_object.assign_copy(model_object_new);
+            } else {
+                // Synchronize Object's config.
+                bool object_config_changed = model_object.config != model_object_new.config;
+                if (object_config_changed)
+                    model_object.config = model_object_new.config;
+                if (! object_diff.empty() || object_config_changed) {
+                    SLAPrintObjectConfig new_config = m_default_object_config;
+                    normalize_and_apply_config(new_config, model_object.config);
+                    if (it_print_object_status != print_object_status.end()) {
+                        t_config_option_keys diff = it_print_object_status->print_object->config().diff(new_config);
+                        if (! diff.empty()) {
+                            update_apply_status(it_print_object_status->print_object->invalidate_state_by_config_options(diff));
+                            it_print_object_status->print_object->config_apply_only(new_config, diff, true);
+                        }
+                    }
+                }
 
-				bool old_user_modified = model_object.sla_points_status == sla::PointsStatus::UserModified;
-				bool new_user_modified = model_object_new.sla_points_status == sla::PointsStatus::UserModified;
-				if ((old_user_modified && ! new_user_modified) || // switching to automatic supports from manual supports
-					(! old_user_modified && new_user_modified) || // switching to manual supports from automatic supports
-					(new_user_modified && model_object.sla_support_points != model_object_new.sla_support_points)) {
-					if (it_print_object_status != print_object_status.end())
-						update_apply_status(it_print_object_status->print_object->invalidate_step(slaposSupportPoints));
+                bool old_user_modified = model_object.sla_points_status == sla::PointsStatus::UserModified;
+                bool new_user_modified = model_object_new.sla_points_status == sla::PointsStatus::UserModified;
+                if ((old_user_modified && ! new_user_modified) || // switching to automatic supports from manual supports
+                    (! old_user_modified && new_user_modified) || // switching to manual supports from automatic supports
+                    (new_user_modified && model_object.sla_support_points != model_object_new.sla_support_points)) {
+                    if (it_print_object_status != print_object_status.end())
+                        update_apply_status(it_print_object_status->print_object->invalidate_step(slaposSupportPoints));
 
-					model_object.sla_points_status = model_object_new.sla_points_status;
-					model_object.sla_support_points = model_object_new.sla_support_points;
-				}
+                    model_object.sla_points_status = model_object_new.sla_points_status;
+                    model_object.sla_support_points = model_object_new.sla_support_points;
+                }
 
-				// Copy the ModelObject name, input_file and instances. The instances will compared against PrintObject instances in the next step.
-				model_object.name       = model_object_new.name;
-				model_object.input_file = model_object_new.input_file;
-				model_object.clear_instances();
-				model_object.instances.reserve(model_object_new.instances.size());
-				for (const ModelInstance *model_instance : model_object_new.instances) {
-					model_object.instances.emplace_back(new ModelInstance(*model_instance));
-					model_object.instances.back()->set_model_object(&model_object);
-				}
-			}
-		}
+                // Copy the ModelObject name, input_file and instances. The instances will compared against PrintObject instances in the next step.
+                model_object.name       = model_object_new.name;
+                model_object.input_file = model_object_new.input_file;
+                model_object.clear_instances();
+                model_object.instances.reserve(model_object_new.instances.size());
+                for (const ModelInstance *model_instance : model_object_new.instances) {
+                    model_object.instances.emplace_back(new ModelInstance(*model_instance));
+                    model_object.instances.back()->set_model_object(&model_object);
+                }
+            }
+        }
 
         std::vector<SLAPrintObject::Instance> new_instances = sla_instances(model_object);
         if (it_print_object_status != print_object_status.end() && it_print_object_status->status != PrintObjectStatus::Deleted) {
             // The SLAPrintObject is already there.
-			if (new_instances.empty()) {
-				const_cast<PrintObjectStatus&>(*it_print_object_status).status = PrintObjectStatus::Deleted;
-			} else {
-				if (new_instances != it_print_object_status->print_object->instances()) {
-					// Instances changed.
-					it_print_object_status->print_object->set_instances(new_instances);
-					update_apply_status(this->invalidate_step(slapsRasterize));
-				}
-				print_objects_new.emplace_back(it_print_object_status->print_object);
-				const_cast<PrintObjectStatus&>(*it_print_object_status).status = PrintObjectStatus::Reused;
-			}
-		} else if (! new_instances.empty()) {
+            if (new_instances.empty()) {
+                const_cast<PrintObjectStatus&>(*it_print_object_status).status = PrintObjectStatus::Deleted;
+            } else {
+                if (new_instances != it_print_object_status->print_object->instances()) {
+                    // Instances changed.
+                    it_print_object_status->print_object->set_instances(new_instances);
+                    update_apply_status(this->invalidate_step(slapsMergeSlicesAndEval));
+                }
+                print_objects_new.emplace_back(it_print_object_status->print_object);
+                const_cast<PrintObjectStatus&>(*it_print_object_status).status = PrintObjectStatus::Reused;
+            }
+        } else if (! new_instances.empty()) {
             auto print_object = new SLAPrintObject(this, &model_object);
 
             // FIXME: this invalidates the transformed mesh in SLAPrintObject
             // which is expensive to calculate (especially the raw_mesh() call)
-            print_object->set_trafo(sla_trafo(model_object));
+            print_object->set_trafo(sla_trafo(*this, model_object), model_object.instances.front()->is_left_handed());
 
-            print_object->set_instances(new_instances);
+            print_object->set_instances(std::move(new_instances));
             print_object->config_apply(config, true);
             print_objects_new.emplace_back(print_object);
             new_objects = true;
@@ -422,6 +446,12 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
         if (new_objects)
             update_apply_status(false);
     }
+    
+    if(m_objects.empty()) {
+        m_printer.release();
+        m_printer_input.clear();
+        m_print_statistics.clear();
+    }
 
 #ifdef _DEBUG
     check_model_ids_equal(m_model, model);
@@ -433,56 +463,56 @@ SLAPrint::ApplyStatus SLAPrint::apply(const Model &model, const DynamicPrintConf
 // After calling the apply() function, set_task() may be called to limit the task to be processed by process().
 void SLAPrint::set_task(const TaskParams &params)
 {
-	// Grab the lock for the Print / PrintObject milestones.
-	tbb::mutex::scoped_lock lock(this->state_mutex());
+    // Grab the lock for the Print / PrintObject milestones.
+    tbb::mutex::scoped_lock lock(this->state_mutex());
 
-	int n_object_steps = int(params.to_object_step) + 1;
-	if (n_object_steps == 0)
-		n_object_steps = (int)slaposCount;
+    int n_object_steps = int(params.to_object_step) + 1;
+    if (n_object_steps == 0)
+        n_object_steps = (int)slaposCount;
 
-	if (params.single_model_object.valid()) {
+    if (params.single_model_object.valid()) {
         // Find the print object to be processed with priority.
-		SLAPrintObject *print_object = nullptr;
-		size_t          idx_print_object = 0;
-		for (; idx_print_object < m_objects.size(); ++ idx_print_object)
-			if (m_objects[idx_print_object]->model_object()->id() == params.single_model_object) {
-				print_object = m_objects[idx_print_object];
-				break;
-			}
-		assert(print_object != nullptr);
+        SLAPrintObject *print_object = nullptr;
+        size_t          idx_print_object = 0;
+        for (; idx_print_object < m_objects.size(); ++ idx_print_object)
+            if (m_objects[idx_print_object]->model_object()->id() == params.single_model_object) {
+                print_object = m_objects[idx_print_object];
+                break;
+            }
+        assert(print_object != nullptr);
         // Find out whether the priority print object is being currently processed.
         bool running = false;
-		for (int istep = 0; istep < n_object_steps; ++ istep) {
-			if (! print_object->m_stepmask[istep])
+        for (int istep = 0; istep < n_object_steps; ++ istep) {
+            if (! print_object->m_stepmask[istep])
                 // Step was skipped, cancel.
-				break;
-			if (print_object->is_step_started_unguarded(SLAPrintObjectStep(istep))) {
+                break;
+            if (print_object->is_step_started_unguarded(SLAPrintObjectStep(istep))) {
                 // No step was skipped, and a wanted step is being processed. Don't cancel.
-				running = true;
-				break;
-			}
-		}
-		if (! running)
-			this->call_cancel_callback();
+                running = true;
+                break;
+            }
+        }
+        if (! running)
+            this->call_cancel_callback();
 
-		// Now the background process is either stopped, or it is inside one of the print object steps to be calculated anyway.
-		if (params.single_model_instance_only) {
-			// Suppress all the steps of other instances.
-			for (SLAPrintObject *po : m_objects)
-				for (int istep = 0; istep < (int)slaposCount; ++ istep)
-					po->m_stepmask[istep] = false;
-		} else if (! running) {
-			// Swap the print objects, so that the selected print_object is first in the row.
-			// At this point the background processing must be stopped, so it is safe to shuffle print objects.
-			if (idx_print_object != 0)
-				std::swap(m_objects.front(), m_objects[idx_print_object]);
-		}
+        // Now the background process is either stopped, or it is inside one of the print object steps to be calculated anyway.
+        if (params.single_model_instance_only) {
+            // Suppress all the steps of other instances.
+            for (SLAPrintObject *po : m_objects)
+                for (int istep = 0; istep < (int)slaposCount; ++ istep)
+                    po->m_stepmask[istep] = false;
+        } else if (! running) {
+            // Swap the print objects, so that the selected print_object is first in the row.
+            // At this point the background processing must be stopped, so it is safe to shuffle print objects.
+            if (idx_print_object != 0)
+                std::swap(m_objects.front(), m_objects[idx_print_object]);
+        }
         // and set the steps for the current object.
-		for (int istep = 0; istep < n_object_steps; ++ istep)
-			print_object->m_stepmask[istep] = true;
-		for (int istep = n_object_steps; istep < (int)slaposCount; ++ istep)
-			print_object->m_stepmask[istep] = false;
-	} else {
+        for (int istep = 0; istep < n_object_steps; ++ istep)
+            print_object->m_stepmask[istep] = true;
+        for (int istep = n_object_steps; istep < (int)slaposCount; ++ istep)
+            print_object->m_stepmask[istep] = false;
+    } else {
         // Slicing all objects.
         bool running = false;
         for (SLAPrintObject *print_object : m_objects)
@@ -511,9 +541,9 @@ void SLAPrint::set_task(const TaskParams &params)
 
     if (params.to_object_step != -1 || params.to_print_step != -1) {
         // Limit the print steps.
-		size_t istep = (params.to_object_step != -1) ? 0 : size_t(params.to_print_step) + 1;
-		for (; istep < m_stepmask.size(); ++ istep)
-			m_stepmask[istep] = false;
+        size_t istep = (params.to_object_step != -1) ? 0 : size_t(params.to_print_step) + 1;
+        for (; istep < m_stepmask.size(); ++ istep)
+            m_stepmask[istep] = false;
     }
 }
 
@@ -523,7 +553,7 @@ void SLAPrint::finalize()
 {
     for (SLAPrintObject *po : m_objects)
         for (int istep = 0; istep < (int)slaposCount; ++ istep)
-			po->m_stepmask[istep] = true;
+            po->m_stepmask[istep] = true;
     for (int istep = 0; istep < (int)slapsCount; ++ istep)
         m_stepmask[istep] = true;
 }
@@ -532,7 +562,7 @@ void SLAPrint::finalize()
 // (timestamps, object placeholders derived from the model, current placeholder prameters and print statistics.
 // Use the final print statistics if available, or just keep the print statistics placeholders if not available yet (before the output is finalized).
 std::string SLAPrint::output_filename() const
-{ 
+{
     DynamicConfig config = this->finished() ? this->print_statistics().config() : this->print_statistics().placeholders();
     return this->PrintBase::output_filename(m_print_config.output_filename_format.value, "sl1", &config);
 }
@@ -577,16 +607,21 @@ sla::PoolConfig make_pool_config(const SLAPrintObjectConfig& c) {
 
     return pcfg;
 }
-
-void swapXY(ExPolygon& expoly) {
-    for(auto& p : expoly.contour.points) std::swap(p(X), p(Y));
-    for(auto& h : expoly.holes) for(auto& p : h.points) std::swap(p(X), p(Y));
-}
 }
 
 std::string SLAPrint::validate() const
 {
     for(SLAPrintObject * po : m_objects) {
+
+        const ModelObject *mo = po->model_object();
+        bool supports_en = po->config().supports_enable.getBool();
+
+        if(supports_en &&
+           mo->sla_points_status == sla::PointsStatus::UserModified &&
+           mo->sla_support_points.empty())
+            return L("Cannot proceed without support points! "
+                     "Add support points or disable support generation.");
+
         sla::SupportConfig cfg = make_support_cfg(po->config());
 
         double pinhead_width =
@@ -595,20 +630,24 @@ std::string SLAPrint::validate() const
                 2 * cfg.head_back_radius_mm -
                 cfg.head_penetration_mm;
 
-        if(pinhead_width > cfg.object_elevation_mm)
-            return L("Elevetion is too low for object.");
+        if(supports_en && pinhead_width > cfg.object_elevation_mm)
+            return L("Elevation is too low for object.");
     }
 
     return "";
 }
 
-template<class...Args>
-void report_status(SLAPrint& p, int st, const std::string& msg, Args&&...args)
+bool SLAPrint::invalidate_step(SLAPrintStep step)
 {
-    BOOST_LOG_TRIVIAL(info) << st << "% " << msg;
-    p.set_status(st, msg, std::forward<Args>(args)...);
-}
+    bool invalidated = Inherited::invalidate_step(step);
 
+    // propagate to dependent steps
+    if (step == slapsMergeSlicesAndEval) {
+        invalidated |= this->invalidate_all_steps();
+    }
+
+    return invalidated;
+}
 
 void SLAPrint::process()
 {
@@ -623,15 +662,12 @@ void SLAPrint::process()
     // shortcut to initial layer height
     double ilhd = m_material_config.initial_layer_height.getFloat();
     auto   ilh  = float(ilhd);
-    double lhd  = m_objects.front()->m_config.layer_height.getFloat();
-    float  lh   = float(lhd);
 
-    auto ilhs = LevelID(ilhd / SCALING_FACTOR);
-    auto lhs  = LevelID(lhd  / SCALING_FACTOR);
+    auto ilhs = coord_t(ilhd / SCALING_FACTOR);
     const size_t objcount = m_objects.size();
 
     const unsigned min_objstatus = 0;   // where the per object operations start
-    const unsigned max_objstatus = PRINT_STEP_LEVELS[slapsRasterize];  // where the per object operations end
+    const unsigned max_objstatus = 50;  // where the per object operations end
 
     // the coefficient that multiplies the per object status values which
     // are set up for <0, 100>. They need to be scaled into the whole process
@@ -648,38 +684,45 @@ void SLAPrint::process()
 
     // Slicing the model object. This method is oversimplified and needs to
     // be compared with the fff slicing algorithm for verification
-    auto slice_model = [this, ilhs, lhs, ilh, lh](SLAPrintObject& po) {
-        TriangleMesh mesh = po.transformed_mesh();
+    auto slice_model = [this, ilhs, ilh, ilhd](SLAPrintObject& po) {
+        const TriangleMesh& mesh = po.transformed_mesh();
 
         // We need to prepare the slice index...
 
+        double lhd  = m_objects.front()->m_config.layer_height.getFloat();
+        float  lh   = float(lhd);
+        auto   lhs  = coord_t(lhd  / SCALING_FACTOR);
+
         auto&& bb3d = mesh.bounding_box();
         double minZ = bb3d.min(Z) - po.get_elevation();
         double maxZ = bb3d.max(Z);
 
-        auto minZs = LevelID(minZ / SCALING_FACTOR);
-        auto maxZs = LevelID(maxZ / SCALING_FACTOR);
+        auto minZs = coord_t(minZ / SCALING_FACTOR);
+        auto maxZs = coord_t(maxZ / SCALING_FACTOR);
 
         po.m_slice_index.clear();
-        po.m_slice_index.reserve(size_t(maxZs - (minZs + ilhs) / lhs) + 1);
-        po.m_slice_index.emplace_back(minZs + ilhs, float(minZ) + ilh / 2.f, ilh);
+        
+        size_t cap = size_t(1 + (maxZs - minZs - ilhs) / lhs);
+        po.m_slice_index.reserve(cap);
+        
+        po.m_slice_index.emplace_back(minZs + ilhs, minZ + ilhd / 2.0, ilh);
 
-        for(LevelID h = minZs + ilhs + lhs; h <= maxZs; h += lhs) {
-            po.m_slice_index.emplace_back(h, float(h*SCALING_FACTOR) - lh / 2.f, lh);
-        }
-
-        auto slindex_it = po.search_slice_index(float(bb3d.min(Z)));
+        for(coord_t h = minZs + ilhs + lhs; h <= maxZs; h += lhs) 
+            po.m_slice_index.emplace_back(h, h*SCALING_FACTOR - lhd / 2.0, lh);
+       
+        // Just get the first record that is form the model:
+        auto slindex_it =
+                po.closest_slice_record(po.m_slice_index, float(bb3d.min(Z)));
 
         if(slindex_it == po.m_slice_index.end())
+            //TRN To be shown at the status bar on SLA slicing error.
             throw std::runtime_error(L("Slicing had to be stopped "
                                        "due to an internal error."));
 
         po.m_model_height_levels.clear();
         po.m_model_height_levels.reserve(po.m_slice_index.size());
         for(auto it = slindex_it; it != po.m_slice_index.end(); ++it)
-        {
             po.m_model_height_levels.emplace_back(it->slice_level());
-        }
 
         TriangleMeshSlicer slicer(float(po.config().slice_closing_radius.value),0);
         slicer.init(&mesh, [](){});
@@ -690,17 +733,24 @@ void SLAPrint::process()
                      [this](){ throw_if_canceled(); });
 
         auto mit = slindex_it;
+        double doffs = m_printer_config.absolute_correction.getFloat();
+        coord_t clpr_offs = coord_t(doffs / SCALING_FACTOR);
         for(size_t id = 0;
             id < po.m_model_slices.size() && mit != po.m_slice_index.end();
             id++)
         {
-            mit->set_model_slice_idx(id); ++mit;
+            // We apply the printer correction offset here.
+            if(clpr_offs != 0)
+                po.m_model_slices[id] = 
+                        offset_ex(po.m_model_slices[id], clpr_offs);
+            
+            mit->set_model_slice_idx(po, id); ++mit;
         }
     };
 
     // In this step we check the slices, identify island and cover them with
     // support points. Then we sprinkle the rest of the mesh.
-    auto support_points = [this](SLAPrintObject& po) {
+    auto support_points = [this, ostepd](SLAPrintObject& po) {
         const ModelObject& mo = *po.m_model_object;
         po.m_supportdata.reset(
                     new SLAPrintObject::SupportData(po.transformed_mesh()) );
@@ -716,6 +766,12 @@ void SLAPrint::process()
         // into the backend cache.
         if (mo.sla_points_status != sla::PointsStatus::UserModified) {
 
+            // Hypotetical use of the slice index:
+            // auto bb = po.transformed_mesh().bounding_box();
+            // auto range = po.get_slice_records(bb.min(Z));
+            // std::vector<float> heights; heights.reserve(range.size());
+            // for(auto& record : range) heights.emplace_back(record.slice_level());
+
             // calculate heights of slices (slices are calculated already)
             const std::vector<float>& heights = po.m_model_height_levels;
 
@@ -728,14 +784,28 @@ void SLAPrint::process()
             config.minimal_distance = float(cfg.support_points_minimal_distance);
             config.head_diameter    = float(cfg.support_head_front_diameter);
 
+            // scaling for the sub operations
+            double d = ostepd * OBJ_STEP_LEVELS[slaposSupportPoints] / 100.0;
+            double init = m_report_status.status();
+
+            auto statuscb = [this, d, init](unsigned st)
+            {
+                double current = init + st * d;
+                if(std::round(m_report_status.status()) < std::round(current))
+                    m_report_status(*this, current,
+                                    OBJ_STEP_LABELS(slaposSupportPoints));
+
+            };
+
             // Construction of this object does the calculation.
             this->throw_if_canceled();
             SLAAutoSupports auto_supports(po.transformed_mesh(),
                                           po.m_supportdata->emesh,
                                           po.get_model_slices(),
                                           heights,
-                                          config, 
-                                          [this]() { throw_if_canceled(); });
+                                          config,
+                                          [this]() { throw_if_canceled(); },
+                                          statuscb);
 
             // Now let's extract the result.
             const std::vector<sla::SupportPoint>& points = auto_supports.output();
@@ -746,7 +816,7 @@ void SLAPrint::process()
                                      << po.m_supportdata->support_points.size();
 
             // Using RELOAD_SLA_SUPPORT_POINTS to tell the Plater to pass the update status to GLGizmoSlaSupports
-            report_status(*this, -1, L("Generating support points"), SlicingStatus::RELOAD_SLA_SUPPORT_POINTS);
+            m_report_status(*this, -1, L("Generating support points"), SlicingStatus::RELOAD_SLA_SUPPORT_POINTS);
         }
         else {
             // There are either some points on the front-end, or the user removed them on purpose. No calculation will be done.
@@ -755,7 +825,8 @@ void SLAPrint::process()
     };
 
     // In this step we create the supports
-    auto support_tree = [this, objcount, ostepd](SLAPrintObject& po) {
+    auto support_tree = [this, ostepd](SLAPrintObject& po)
+    {
         if(!po.m_supportdata) return;
 
         if(!po.m_config.supports_enable.getBool()) {
@@ -767,22 +838,17 @@ void SLAPrint::process()
         sla::SupportConfig scfg = make_support_cfg(po.m_config);
         sla::Controller ctl;
 
-        // some magic to scale the status values coming from the support
-        // tree creation into the whole print process
-        auto stfirst = OBJ_STEP_LEVELS.begin();
-        auto stthis = stfirst + slaposSupportTree;
-        // we need to add up the status portions until this operation
-        int init = std::accumulate(stfirst, stthis, 0);
-        init = int(init * ostepd);     // scale the init portion
-
         // scaling for the sub operations
-        double d = *stthis / (objcount * 100.0);
+        double d = ostepd * OBJ_STEP_LEVELS[slaposSupportTree] / 100.0;
+        double init = m_report_status.status();
 
-        ctl.statuscb = [this, init, d](unsigned st, const std::string& msg)
+        ctl.statuscb = [this, d, init](unsigned st, const std::string&)
         {
-            //FIXME this status line scaling does not seem to be correct.
-            // How does it account for an increasing object index?
-            report_status(*this, int(init + st*d), msg);
+            double current = init + st * d;
+            if(std::round(m_report_status.status()) < std::round(current))
+                m_report_status(*this, current,
+                                OBJ_STEP_LABELS(slaposSupportTree));
+
         };
 
         ctl.stopcondition = [this](){ return canceled(); };
@@ -798,7 +864,7 @@ void SLAPrint::process()
         auto rc = SlicingStatus::RELOAD_SCENE;
 
         // This is to prevent "Done." being displayed during merged_mesh()
-        report_status(*this, -1, L("Visualizing supports"));
+        m_report_status(*this, -1, L("Visualizing supports"));
         po.m_supportdata->support_tree_ptr->merged_mesh();
 
         BOOST_LOG_TRIVIAL(debug) << "Processed support point count "
@@ -808,8 +874,7 @@ void SLAPrint::process()
         if(po.support_mesh().empty())
             BOOST_LOG_TRIVIAL(warning) << "Support mesh is empty";
 
-        report_status(*this, -1, L("Visualizing supports"), rc);
-
+        m_report_status(*this, -1, L("Visualizing supports"), rc);
     };
 
     // This step generates the sla base pad
@@ -857,13 +922,13 @@ void SLAPrint::process()
 
         po.throw_if_canceled();
         auto rc = SlicingStatus::RELOAD_SCENE;
-        report_status(*this, -1, L("Visualizing supports"), rc);
+        m_report_status(*this, -1, L("Visualizing supports"), rc);
     };
 
     // Slicing the support geometries similarly to the model slicing procedure.
     // If the pad had been added previously (see step "base_pool" than it will
     // be part of the slices)
-    auto slice_supports = [](SLAPrintObject& po) {
+    auto slice_supports = [this](SLAPrintObject& po) {
         auto& sd = po.m_supportdata;
 
         if(sd) sd->support_slices.clear();
@@ -880,47 +945,343 @@ void SLAPrint::process()
                         heights, float(po.config().slice_closing_radius.value));
         }
 
+        double doffs = m_printer_config.absolute_correction.getFloat();
+        coord_t clpr_offs = coord_t(doffs / SCALING_FACTOR);
         for(size_t i = 0;
             i < sd->support_slices.size() && i < po.m_slice_index.size();
             ++i)
         {
-            po.m_slice_index[i].set_support_slice_idx(i);
+            // We apply the printer correction offset here.
+            if(clpr_offs != 0)
+                sd->support_slices[i] = 
+                        offset_ex(sd->support_slices[i], clpr_offs);
+            
+            po.m_slice_index[i].set_support_slice_idx(po, i);
         }
+
+        // Using RELOAD_SLA_PREVIEW to tell the Plater to pass the update status to the 3D preview to load the SLA slices.
+        m_report_status(*this, -2, "", SlicingStatus::RELOAD_SLA_PREVIEW);
     };
 
-    // We have the layer polygon collection but we need to unite them into
-    // an index where the key is the height level in discrete levels (clipper)
-    auto index_slices = [this/*, ilhd*/](SLAPrintObject& /*po*/) {
-        // Using RELOAD_SLA_PREVIEW to tell the Plater to pass the update status to the 3D preview to load the SLA slices.
-        report_status(*this, -2, "", SlicingStatus::RELOAD_SLA_PREVIEW);
+    // Merging the slices from all the print objects into one slice grid and
+    // calculating print statistics from the merge result.
+    auto merge_slices_and_eval_stats = [this, ilhs]() {
+
+        // clear the rasterizer input
+        m_printer_input.clear();
+
+        size_t mx = 0;
+        for(SLAPrintObject * o : m_objects) {
+            if(auto m = o->get_slice_index().size() > mx) mx = m;
+        }
+
+        m_printer_input.reserve(mx);
+
+        auto eps = coord_t(SCALED_EPSILON);
+
+        for(SLAPrintObject * o : m_objects) {
+            coord_t gndlvl = o->get_slice_index().front().print_level() - ilhs;
+
+            for(const SliceRecord& slicerecord : o->get_slice_index()) {
+                coord_t lvlid = slicerecord.print_level() - gndlvl;
+
+                // Neat trick to round the layer levels to the grid.
+                lvlid = eps * (lvlid / eps);
+
+                auto it = std::lower_bound(m_printer_input.begin(),
+                                           m_printer_input.end(),
+                                           PrintLayer(lvlid));
+
+                if(it == m_printer_input.end() || it->level() != lvlid)
+                    it = m_printer_input.insert(it, PrintLayer(lvlid));
+
+
+                it->add(slicerecord);
+            }
+        }
+
+        m_print_statistics.clear();
+
+        using ClipperPoint  = ClipperLib::IntPoint;
+        using ClipperPolygon = ClipperLib::Polygon; // see clipper_polygon.hpp in libnest2d
+        using ClipperPolygons = std::vector<ClipperPolygon>;
+        namespace sl = libnest2d::shapelike;    // For algorithms
+
+        // If the raster has vertical orientation, we will flip the coordinates
+        bool flpXY = m_printer_config.display_orientation.getInt() == SLADisplayOrientation::sladoPortrait;
+
+        // Set up custom union and diff functions for clipper polygons
+        auto polyunion = [] (const ClipperPolygons& subjects)
+        {
+            ClipperLib::Clipper clipper;
+
+            bool closed = true;
+
+            for(auto& path : subjects) {
+                clipper.AddPath(path.Contour, ClipperLib::ptSubject, closed);
+                clipper.AddPaths(path.Holes, ClipperLib::ptSubject, closed);
+            }
+
+            auto mode = ClipperLib::pftPositive;
+
+            return libnest2d::clipper_execute(clipper, ClipperLib::ctUnion, mode, mode);
+        };
+
+        auto polydiff = [](const ClipperPolygons& subjects, const ClipperPolygons& clips)
+        {
+            ClipperLib::Clipper clipper;
+
+            bool closed = true;
+
+            for(auto& path : subjects) {
+                clipper.AddPath(path.Contour, ClipperLib::ptSubject, closed);
+                clipper.AddPaths(path.Holes, ClipperLib::ptSubject, closed);
+            }
+
+            for(auto& path : clips) {
+                clipper.AddPath(path.Contour, ClipperLib::ptClip, closed);
+                clipper.AddPaths(path.Holes, ClipperLib::ptClip, closed);
+            }
+
+            auto mode = ClipperLib::pftPositive;
+
+            return libnest2d::clipper_execute(clipper, ClipperLib::ctDifference, mode, mode);
+        };
+
+        // libnest calculates positive area for clockwise polygons, Slic3r is in counter-clockwise
+        auto areafn = [](const ClipperPolygon& poly) { return - sl::area(poly); };
+
+        const double area_fill          = m_printer_config.area_fill.getFloat()*0.01;// 0.5 (50%);
+        const double fast_tilt          = m_printer_config.fast_tilt_time.getFloat();// 5.0;
+        const double slow_tilt          = m_printer_config.slow_tilt_time.getFloat();// 8.0;
+
+        const double init_exp_time      = m_material_config.initial_exposure_time.getFloat();
+        const double exp_time           = m_material_config.exposure_time.getFloat();
+
+        const int    fade_layers_cnt    = m_default_object_config.faded_layers.getInt();// 10 // [3;20]
+
+        const double width              = m_printer_config.display_width.getFloat() / SCALING_FACTOR;
+        const double height             = m_printer_config.display_height.getFloat() / SCALING_FACTOR;
+        const double display_area       = width*height;
+
+        // get polygons for all instances in the object
+        auto get_all_polygons =
+                [flpXY](const ExPolygons& input_polygons,
+                        const std::vector<SLAPrintObject::Instance>& instances,
+                        bool is_lefthanded)
+        {
+            ClipperPolygons polygons;
+            polygons.reserve(input_polygons.size() * instances.size());
+
+            for (const ExPolygon& polygon : input_polygons) {
+                if(polygon.contour.empty()) continue;
+
+                for (size_t i = 0; i < instances.size(); ++i)
+                {
+                    ClipperPolygon poly;
+
+                    // We need to reverse if flpXY OR is_lefthanded is true but
+                    // not if both are true which is a logical inequality (XOR)
+                    bool needreverse = flpXY != is_lefthanded;
+
+                    // should be a move
+                    poly.Contour.reserve(polygon.contour.size() + 1);
+
+                    auto& cntr = polygon.contour.points;
+                    if(needreverse)
+                        for(auto it = cntr.rbegin(); it != cntr.rend(); ++it)
+                            poly.Contour.emplace_back(it->x(), it->y());
+                    else
+                        for(auto& p : cntr)
+                            poly.Contour.emplace_back(p.x(), p.y());
+
+                    for(auto& h : polygon.holes) {
+                        poly.Holes.emplace_back();
+                        auto& hole = poly.Holes.back();
+                        hole.reserve(h.points.size() + 1);
+
+                        if(needreverse)
+                            for(auto it = h.points.rbegin(); it != h.points.rend(); ++it)
+                                hole.emplace_back(it->x(), it->y());
+                        else
+                            for(auto& p : h.points)
+                                hole.emplace_back(p.x(), p.y());
+                    }
+
+                    if(is_lefthanded) {
+                        for(auto& p : poly.Contour) p.X = -p.X;
+                        for(auto& h : poly.Holes) for(auto& p : h) p.X = -p.X;
+                    }
+
+                    sl::rotate(poly, double(instances[i].rotation));
+                    sl::translate(poly, ClipperPoint{instances[i].shift(X),
+                                                     instances[i].shift(Y)});
+
+                    if (flpXY) {
+                        for(auto& p : poly.Contour) std::swap(p.X, p.Y);
+                        for(auto& h : poly.Holes) for(auto& p : h) std::swap(p.X, p.Y);
+                    }
+
+                    polygons.emplace_back(std::move(poly));
+                }
+            }
+            return polygons;
+        };
+
+        double supports_volume(0.0);
+        double models_volume(0.0);
+
+        double estim_time(0.0);
+
+        size_t slow_layers = 0;
+        size_t fast_layers = 0;
+
+        const double delta_fade_time = (init_exp_time - exp_time) / (fade_layers_cnt + 1);
+        double fade_layer_time = init_exp_time;
+
+        SpinMutex mutex;
+        using Lock = std::lock_guard<SpinMutex>;
+
+        // Going to parallel:
+        auto printlayerfn = [this,
+                // functions and read only vars
+                get_all_polygons, polyunion, polydiff, areafn,
+                area_fill, display_area, exp_time, init_exp_time, fast_tilt, slow_tilt, delta_fade_time,
+
+                // write vars
+                &mutex, &models_volume, &supports_volume, &estim_time, &slow_layers,
+                &fast_layers, &fade_layer_time](size_t sliced_layer_cnt)
+        {
+            PrintLayer& layer = m_printer_input[sliced_layer_cnt];
+
+            // vector of slice record references
+            auto& slicerecord_references = layer.slices();
+
+            if(slicerecord_references.empty()) return;
+
+            // Layer height should match for all object slices for a given level.
+            const auto l_height = double(slicerecord_references.front().get().layer_height());
+
+            // Calculation of the consumed material
+
+            ClipperPolygons model_polygons;
+            ClipperPolygons supports_polygons;
+
+            size_t c = std::accumulate(layer.slices().begin(), layer.slices().end(), 0u, [](size_t a, const SliceRecord& sr) {
+                                           return a + sr.get_slice(soModel).size();
+                                       });
+
+            model_polygons.reserve(c);
+
+            c = std::accumulate(layer.slices().begin(), layer.slices().end(), 0u, [](size_t a, const SliceRecord& sr) {
+                                    return a + sr.get_slice(soModel).size();
+                                });
+
+            supports_polygons.reserve(c);
+
+            for(const SliceRecord& record : layer.slices()) {
+                const SLAPrintObject *po = record.print_obj();
+
+                const ExPolygons &modelslices = record.get_slice(soModel);
+                
+                bool is_lefth = record.print_obj()->is_left_handed();
+                if (!modelslices.empty()) {
+                    ClipperPolygons v = get_all_polygons(modelslices, po->instances(), is_lefth);
+                    for(ClipperPolygon& p_tmp : v) model_polygons.emplace_back(std::move(p_tmp));
+                }
+
+                const ExPolygons &supportslices = record.get_slice(soSupport);
+                
+                if (!supportslices.empty()) {
+                    ClipperPolygons v = get_all_polygons(supportslices, po->instances(), is_lefth);
+                    for(ClipperPolygon& p_tmp : v) supports_polygons.emplace_back(std::move(p_tmp));
+                }
+            }
+
+            model_polygons = polyunion(model_polygons);
+            double layer_model_area = 0;
+            for (const ClipperPolygon& polygon : model_polygons)
+                layer_model_area += areafn(polygon);
+
+            if (layer_model_area < 0 || layer_model_area > 0) {
+                Lock lck(mutex); models_volume += layer_model_area * l_height;
+            }
+
+            if(!supports_polygons.empty()) {
+                if(model_polygons.empty()) supports_polygons = polyunion(supports_polygons);
+                else supports_polygons = polydiff(supports_polygons, model_polygons);
+                // allegedly, union of subject is done withing the diff according to the pftPositive polyFillType
+            }
+
+            double layer_support_area = 0;
+            for (const ClipperPolygon& polygon : supports_polygons)
+                layer_support_area += areafn(polygon);
+
+            if (layer_support_area < 0 || layer_support_area > 0) {
+                Lock lck(mutex); supports_volume += layer_support_area * l_height;
+            }
+
+            // Here we can save the expensively calculated polygons for printing
+            ClipperPolygons trslices;
+            trslices.reserve(model_polygons.size() + supports_polygons.size());
+            for(ClipperPolygon& poly : model_polygons) trslices.emplace_back(std::move(poly));
+            for(ClipperPolygon& poly : supports_polygons) trslices.emplace_back(std::move(poly));
+
+            layer.transformed_slices(polyunion(trslices));
+
+            // Calculation of the slow and fast layers to the future controlling those values on FW
+
+            const bool is_fast_layer = (layer_model_area + layer_support_area) <= display_area*area_fill;
+            const double tilt_time = is_fast_layer ? fast_tilt : slow_tilt;
+
+            { Lock lck(mutex);
+                if (is_fast_layer)
+                    fast_layers++;
+                else
+                    slow_layers++;
+
+
+                // Calculation of the printing time
+
+                if (sliced_layer_cnt < 3)
+                    estim_time += init_exp_time;
+                else if (fade_layer_time > exp_time)
+                {
+                    fade_layer_time -= delta_fade_time;
+                    estim_time += fade_layer_time;
+                }
+                else
+                    estim_time += exp_time;
+
+                estim_time += tilt_time;
+            }
+        };
+
+        // sequential version for debugging:
+        // for(size_t i = 0; i < m_printer_input.size(); ++i) printlayerfn(i);
+        tbb::parallel_for<size_t, decltype(printlayerfn)>(0, m_printer_input.size(), printlayerfn);
+
+        m_print_statistics.support_used_material = supports_volume * SCALING_FACTOR * SCALING_FACTOR;
+        m_print_statistics.objects_used_material = models_volume  * SCALING_FACTOR * SCALING_FACTOR;
+
+        // Estimated printing time
+        // A layers count o the highest object
+        if (m_printer_input.size() == 0)
+            m_print_statistics.estimated_print_time = "N/A";
+        else
+            m_print_statistics.estimated_print_time = get_time_dhms(float(estim_time));
+
+        m_print_statistics.fast_layers_count = fast_layers;
+        m_print_statistics.slow_layers_count = slow_layers;
+
+        m_report_status(*this, -2, "", SlicingStatus::RELOAD_SLA_PREVIEW);
     };
 
     // Rasterizing the model objects, and their supports
     auto rasterize = [this, max_objstatus]() {
         if(canceled()) return;
 
-        // clear the rasterizer input
-        m_printer_input.clear();
-
-        for(SLAPrintObject * o : m_objects) {
-            LevelID gndlvl = o->get_slice_index().front().key();
-            for(auto& slicerecord : o->get_slice_index()) {
-                auto& lyrs = m_printer_input[slicerecord.key() - gndlvl];
-
-                const ExPolygons& objslices = o->get_slices_from_record(slicerecord, soModel);
-                const ExPolygons& supslices = o->get_slices_from_record(slicerecord, soSupport);
-
-                if(!objslices.empty())
-                    lyrs.emplace_back(objslices, o->instances());
-
-                if(!supslices.empty())
-                    lyrs.emplace_back(supslices, o->instances());
-            }
-        }
-
         // collect all the keys
-        std::vector<long long> keys; keys.reserve(m_printer_input.size());
-        for(auto& e : m_printer_input) keys.emplace_back(e.first);
 
         // If the raster has vertical orientation, we will flip the coordinates
         bool flpXY = m_printer_config.display_orientation.getInt() ==
@@ -939,12 +1300,16 @@ void SLAPrint::process()
             double lh = ocfg.layer_height.getFloat();
             double exp_t = matcfg.exposure_time.getFloat();
             double iexp_t = matcfg.initial_exposure_time.getFloat();
+            
+            double gamma = m_printer_config.gamma_correction.getFloat();
 
             if(flpXY) { std::swap(w, h); std::swap(pw, ph); }
 
-            m_printer.reset(new SLAPrinter(w, h, pw, ph, lh, exp_t, iexp_t,
-                                           flpXY? SLAPrinter::RO_PORTRAIT :
-                                                  SLAPrinter::RO_LANDSCAPE));
+            m_printer.reset(
+                new SLAPrinter(w, h, pw, ph, lh, exp_t, iexp_t,
+                               flpXY? SLAPrinter::RO_PORTRAIT : 
+                                      SLAPrinter::RO_LANDSCAPE, 
+                               gamma));
         }
 
         // Allocate space for all the layers
@@ -952,55 +1317,49 @@ void SLAPrint::process()
         auto lvlcnt = unsigned(m_printer_input.size());
         printer.layers(lvlcnt);
 
-        // slot is the portion of 100% that is realted to rasterization
-        unsigned slot = PRINT_STEP_LEVELS[slapsRasterize];
-        // ist: initial state; pst: previous state
-        unsigned ist = max_objstatus, pst = ist;
         // coefficient to map the rasterization state (0-99) to the allocated
         // portion (slot) of the process state
-        double sd = (100 - ist) / 100.0;
+        double sd = (100 - max_objstatus) / 100.0;
+
+        // slot is the portion of 100% that is realted to rasterization
+        unsigned slot = PRINT_STEP_LEVELS[slapsRasterize];
+
+        // pst: previous state
+        double pst = m_report_status.status();
+
+        double increment = (slot * sd) / m_printer_input.size();
+        double dstatus = m_report_status.status();
+
         SpinMutex slck;
 
         // procedure to process one height level. This will run in parallel
         auto lvlfn =
-        [this, &slck, &keys, &printer, slot, sd, ist, &pst, flpXY]
+        [this, &slck, &printer, increment, &dstatus, &pst]
             (unsigned level_id)
         {
             if(canceled()) return;
 
-            LayerRefs& lrange = m_printer_input[keys[level_id]];
+            PrintLayer& printlayer = m_printer_input[level_id];
 
             // Switch to the appropriate layer in the printer
             printer.begin_layer(level_id);
 
-            for(auto& lyrref : lrange) { // for all layers in the current level
-                if(canceled()) break;
-                const Layer& sl = lyrref.lref;   // get the layer reference
-                const LayerCopies& copies = lyrref.copies;
-
-                // Draw all the polygons in the slice to the actual layer.
-                for(auto& cp : copies) {
-                    for(ExPolygon slice : sl) {
-                        // The order is important here:
-                        // apply rotation before translation...
-                        slice.rotate(double(cp.rotation));
-                        slice.translate(cp.shift(X), cp.shift(Y));
-                        if(flpXY) swapXY(slice);
-                        printer.draw_polygon(slice, level_id);
-                    }
-                }
-            }
+            for(const ClipperLib::Polygon& poly : printlayer.transformed_slices())
+                printer.draw_polygon(poly, level_id);
 
             // Finish the layer for later saving it.
             printer.finish_layer(level_id);
 
             // Status indication guarded with the spinlock
-            auto st = ist + unsigned(sd*level_id*slot/m_printer_input.size());
-            { std::lock_guard<SpinMutex> lck(slck);
-            if( st > pst) {
-                report_status(*this, int(st), PRINT_STEP_LABELS[slapsRasterize]);
-                pst = st;
-            }
+            {
+                std::lock_guard<SpinMutex> lck(slck);
+                dstatus += increment;
+                double st = std::round(dstatus);
+                if(st > pst) {
+                    m_report_status(*this, st,
+                                    PRINT_STEP_LABELS(slapsRasterize));
+                    pst = st;
+                }
             }
         };
 
@@ -1013,8 +1372,6 @@ void SLAPrint::process()
         // Print all the layers in parallel
         tbb::parallel_for<unsigned, decltype(lvlfn)>(0, lvlcnt, lvlfn);
 
-        // Fill statistics
-        this->fill_statistics();
         // Set statistics values to the printer
         m_printer->set_statistics({(m_print_statistics.objects_used_material + m_print_statistics.support_used_material)/1000,
                                 double(m_default_object_config.faded_layers.getInt()),
@@ -1032,17 +1389,16 @@ void SLAPrint::process()
         support_points,
         support_tree,
         base_pool,
-        slice_supports,
-        index_slices
+        slice_supports
     };
 
     std::array<slapsFn, slapsCount> print_program =
     {
-        rasterize,
-        [](){}  // validate
+        merge_slices_and_eval_stats,
+        rasterize
     };
 
-    unsigned st = min_objstatus;
+    double st = min_objstatus;
     unsigned incr = 0;
 
     BOOST_LOG_TRIVIAL(info) << "Start slicing process.";
@@ -1056,18 +1412,18 @@ void SLAPrint::process()
 
             BOOST_LOG_TRIVIAL(info) << "Slicing object " << po->model_object()->name;
 
-            for (int s = (int)step_ranges[idx_range]; s < (int)step_ranges[idx_range + 1]; ++s) {
-                auto currentstep = (SLAPrintObjectStep)s;
+            for (int s = int(step_ranges[idx_range]); s < int(step_ranges[idx_range + 1]); ++s) {
+                auto currentstep = static_cast<SLAPrintObjectStep>(s);
 
                 // Cancellation checking. Each step will check for cancellation
                 // on its own and return earlier gracefully. Just after it returns
                 // execution gets to this point and throws the canceled signal.
                 throw_if_canceled();
 
-                st += unsigned(incr * ostepd);
+                st += incr * ostepd;
 
                 if(po->m_stepmask[currentstep] && po->set_started(currentstep)) {
-                    report_status(*this, int(st), OBJ_STEP_LABELS[currentstep]);
+                    m_report_status(*this, st, OBJ_STEP_LABELS(currentstep));
                     pobj_program[currentstep](*po);
                     throw_if_canceled();
                     po->set_done(currentstep);
@@ -1079,7 +1435,7 @@ void SLAPrint::process()
     }
 
     std::array<SLAPrintStep, slapsCount> printsteps = {
-        slapsRasterize, slapsValidate
+        slapsMergeSlicesAndEval, slapsRasterize
     };
 
     // this would disable the rasterization step
@@ -1094,37 +1450,42 @@ void SLAPrint::process()
 
         if(m_stepmask[currentstep] && set_started(currentstep))
         {
-            report_status(*this, int(st), PRINT_STEP_LABELS[currentstep]);
+            m_report_status(*this, st, PRINT_STEP_LABELS(currentstep));
             print_program[currentstep]();
             throw_if_canceled();
             set_done(currentstep);
         }
 
-        st += unsigned(PRINT_STEP_LEVELS[currentstep] * pstd);
+        st += PRINT_STEP_LEVELS[currentstep] * pstd;
     }
 
     // If everything vent well
-    report_status(*this, 100, L("Slicing done"));
+    m_report_status(*this, 100, L("Slicing done"));
 }
 
-bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys)
+bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys, bool &invalidate_all_model_objects)
 {
     if (opt_keys.empty())
         return false;
 
+    static std::unordered_set<std::string> steps_full = {
+        "initial_layer_height",
+        "material_correction",
+        "relative_correction",
+        "absolute_correction",
+        "gamma_correction"
+    };
+
     // Cache the plenty of parameters, which influence the final rasterization only,
     // or they are only notes not influencing the rasterization step.
     static std::unordered_set<std::string> steps_rasterize = {
         "exposure_time",
         "initial_exposure_time",
-        "material_correction_printing",
-        "material_correction_curing",
         "display_width",
         "display_height",
         "display_pixels_x",
         "display_pixels_y",
-        "display_orientation",
-        "printer_correction"
+        "display_orientation"
     };
 
     static std::unordered_set<std::string> steps_ignore = {
@@ -1132,8 +1493,8 @@ bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_opt
         "max_print_height",
         "printer_technology",
         "output_filename_format",
-        "fast_tilt_time", 
-        "slow_tilt_time", 
+        "fast_tilt_time",
+        "slow_tilt_time",
         "area_fill"
     };
 
@@ -1145,12 +1506,13 @@ bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_opt
         if (steps_rasterize.find(opt_key) != steps_rasterize.end()) {
             // These options only affect the final rasterization, or they are just notes without influence on the output,
             // so there is nothing to invalidate.
-            steps.emplace_back(slapsRasterize);
+            steps.emplace_back(slapsMergeSlicesAndEval);
         } else if (steps_ignore.find(opt_key) != steps_ignore.end()) {
             // These steps have no influence on the output. Just ignore them.
-        } else if (opt_key == "initial_layer_height") {
-            steps.emplace_back(slapsRasterize);
+        } else if (steps_full.find(opt_key) != steps_full.end()) {
+            steps.emplace_back(slapsMergeSlicesAndEval);
             osteps.emplace_back(slaposObjectSlice);
+            invalidate_all_model_objects = true;
         } else {
             // All values should be covered.
             assert(false);
@@ -1167,167 +1529,6 @@ bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_opt
     return invalidated;
 }
 
-void SLAPrint::fill_statistics()
-{
-    const double init_layer_height  = m_material_config.initial_layer_height.getFloat();
-    const double layer_height       = m_default_object_config.layer_height.getFloat();
-
-    const double area_fill          = m_printer_config.area_fill.getFloat()*0.01;// 0.5 (50%);
-    const double fast_tilt          = m_printer_config.fast_tilt_time.getFloat();// 5.0;
-    const double slow_tilt          = m_printer_config.slow_tilt_time.getFloat();// 8.0;
-
-    const double init_exp_time      = m_material_config.initial_exposure_time.getFloat();
-    const double exp_time           = m_material_config.exposure_time.getFloat();
-
-    const int    fade_layers_cnt    = m_default_object_config.faded_layers.getInt();// 10 // [3;20]
-
-    const double width              = m_printer_config.display_width.getFloat() / SCALING_FACTOR;
-    const double height             = m_printer_config.display_height.getFloat() / SCALING_FACTOR;
-    const double display_area       = width*height;
-
-    // get polygons for all instances in the object
-    auto get_all_polygons = [](const ExPolygons& input_polygons, const std::vector<SLAPrintObject::Instance>& instances) {
-        const size_t inst_cnt = instances.size();
-
-        size_t polygon_cnt = 0;
-        for (const ExPolygon& polygon : input_polygons)
-			polygon_cnt += polygon.holes.size() + 1;
-
-        Polygons polygons;
-        polygons.reserve(polygon_cnt * inst_cnt);
-        for (const ExPolygon& polygon : input_polygons) {
-            for (size_t i = 0; i < inst_cnt; ++i)
-            {
-                ExPolygon tmp = polygon;
-                tmp.rotate(Geometry::rad2deg(instances[i].rotation));
-                tmp.translate(instances[i].shift.x(), instances[i].shift.y());
-                polygons_append(polygons, to_polygons(std::move(tmp)));
-            }
-        }
-        return polygons;
-    };
-
-    double supports_volume = 0.0;
-    double models_volume = 0.0;
-
-    double estim_time = 0.0;
-
-    size_t slow_layers = 0;
-    size_t fast_layers = 0;
-
-    // find highest object
-    // Which is a better bet? To compare by max_z or by number of layers in the index?
-    float max_z = 0.;
-	size_t max_layers_cnt = 0;
-    size_t highest_obj_idx = 0;
-	for (SLAPrintObject *&po : m_objects) {
-        const SLAPrintObject::SliceIndex& slice_index = po->get_slice_index();
-        if (! slice_index.empty()) {
-            float z = (-- slice_index.end())->slice_level();
-            size_t cnt = slice_index.size();
-            //if (z > max_z) {
-            if (cnt > max_layers_cnt) {
-                max_layers_cnt = cnt;
-                max_z = z;
-                highest_obj_idx = &po - &m_objects.front();
-            }
-        }
-    }
-
-    const SLAPrintObject * highest_obj = m_objects[highest_obj_idx];
-    const SLAPrintObject::SliceIndex& highest_obj_slice_index = highest_obj->get_slice_index();
-
-    const double delta_fade_time = (init_exp_time - exp_time) / (fade_layers_cnt + 1);
-    double fade_layer_time = init_exp_time;
-
-    int sliced_layer_cnt = 0;
-    for (const auto& layer : highest_obj_slice_index)
-    {
-        const double l_height = (layer.key() == highest_obj_slice_index.begin()->key()) ? init_layer_height : layer_height;
-
-        // Calculation of the consumed material 
-
-        Polygons model_polygons;
-        Polygons supports_polygons;
-
-        for (SLAPrintObject * po : m_objects)
-        {
-            const SLAPrintObject::_SliceRecord *record = nullptr;
-            {
-                const SLAPrintObject::SliceIndex& index = po->get_slice_index();
-                auto it = po->search_slice_index(layer.slice_level() - float(EPSILON));
-                if (it == index.end() || it->slice_level() > layer.slice_level() + float(EPSILON))
-                    continue;
-                record = &(*it);
-            }
-
-            const ExPolygons &modelslices = po->get_slices_from_record(*record, soModel);
-            if (!modelslices.empty())
-                append(model_polygons, get_all_polygons(modelslices, po->instances()));
-
-            const ExPolygons &supportslices = po->get_slices_from_record(*record, soSupport);
-            if (!supportslices.empty())
-                append(supports_polygons, get_all_polygons(supportslices, po->instances()));
-        }
-        
-        model_polygons = union_(model_polygons);
-        double layer_model_area = 0;
-        for (const Polygon& polygon : model_polygons)
-            layer_model_area += polygon.area();
-
-        if (layer_model_area != 0)
-            models_volume += layer_model_area * l_height;
-
-        if (!supports_polygons.empty() && !model_polygons.empty())
-            supports_polygons = diff(supports_polygons, model_polygons);
-        double layer_support_area = 0;
-        for (const Polygon& polygon : supports_polygons)
-            layer_support_area += polygon.area();
-
-        if (layer_support_area != 0)
-            supports_volume += layer_support_area * l_height;
-
-        // Calculation of the slow and fast layers to the future controlling those values on FW
-
-        const bool is_fast_layer = (layer_model_area + layer_support_area) <= display_area*area_fill;
-        const double tilt_time = is_fast_layer ? fast_tilt : slow_tilt;
-        if (is_fast_layer)
-            fast_layers++;
-        else
-            slow_layers++;
-
-
-        // Calculation of the printing time
-
-        if (sliced_layer_cnt < 3)
-            estim_time += init_exp_time;
-        else if (fade_layer_time > exp_time)
-        {
-            fade_layer_time -= delta_fade_time;
-            estim_time += fade_layer_time;
-        }
-        else
-            estim_time += exp_time;
-
-        estim_time += tilt_time;
-
-        sliced_layer_cnt++;
-    }
-
-    m_print_statistics.support_used_material = supports_volume * SCALING_FACTOR * SCALING_FACTOR; 
-    m_print_statistics.objects_used_material = models_volume  * SCALING_FACTOR * SCALING_FACTOR;
-
-    // Estimated printing time
-    // A layers count o the highest object 
-    if (max_layers_cnt == 0)
-        m_print_statistics.estimated_print_time = "N/A";
-    else
-        m_print_statistics.estimated_print_time = get_time_dhms(float(estim_time));
-
-    m_print_statistics.fast_layers_count = fast_layers;
-    m_print_statistics.slow_layers_count = slow_layers;
-}
-
 // Returns true if an object step is done on all objects and there's at least one object.
 bool SLAPrint::is_step_done(SLAPrintObjectStep step) const
 {
@@ -1344,7 +1545,7 @@ SLAPrintObject::SLAPrintObject(SLAPrint *print, ModelObject *model_object):
     Inherited(print, model_object),
     m_stepmask(slaposCount, true),
     m_transformed_rmesh( [this](TriangleMesh& obj){
-            obj = m_model_object->raw_mesh(); obj.transform(m_trafo);
+            obj = m_model_object->raw_mesh(); obj.transform(m_trafo); obj.require_shared_vertices();
         })
 {
 }
@@ -1361,20 +1562,20 @@ bool SLAPrintObject::invalidate_state_by_config_options(const std::vector<t_conf
     std::vector<SLAPrintObjectStep> steps;
     bool invalidated = false;
     for (const t_config_option_key &opt_key : opt_keys) {
-		if (   opt_key == "layer_height"
+        if (   opt_key == "layer_height"
             || opt_key == "faded_layers"
             || opt_key == "pad_enable"
             || opt_key == "pad_wall_thickness"
             || opt_key == "supports_enable"
             || opt_key == "support_object_elevation"
             || opt_key == "slice_closing_radius") {
-			steps.emplace_back(slaposObjectSlice);
+            steps.emplace_back(slaposObjectSlice);
         } else if (
 
                opt_key == "support_points_density_relative"
             || opt_key == "support_points_minimal_distance") {
             steps.emplace_back(slaposSupportPoints);
-		} else if (
+        } else if (
                opt_key == "support_head_front_diameter"
             || opt_key == "support_head_penetration"
             || opt_key == "support_head_width"
@@ -1413,19 +1614,16 @@ bool SLAPrintObject::invalidate_step(SLAPrintObjectStep step)
     if (step == slaposObjectSlice) {
         invalidated |= this->invalidate_all_steps();
     } else if (step == slaposSupportPoints) {
-        invalidated |= this->invalidate_steps({ slaposSupportTree, slaposBasePool, slaposSliceSupports, slaposIndexSlices });
-        invalidated |= m_print->invalidate_step(slapsRasterize);
+        invalidated |= this->invalidate_steps({ slaposSupportTree, slaposBasePool, slaposSliceSupports });
+        invalidated |= m_print->invalidate_step(slapsMergeSlicesAndEval);
     } else if (step == slaposSupportTree) {
-        invalidated |= this->invalidate_steps({ slaposBasePool, slaposSliceSupports, slaposIndexSlices });
-        invalidated |= m_print->invalidate_step(slapsRasterize);
+        invalidated |= this->invalidate_steps({ slaposBasePool, slaposSliceSupports });
+        invalidated |= m_print->invalidate_step(slapsMergeSlicesAndEval);
     } else if (step == slaposBasePool) {
-        invalidated |= this->invalidate_steps({slaposSliceSupports, slaposIndexSlices});
-        invalidated |= m_print->invalidate_step(slapsRasterize);
+        invalidated |= this->invalidate_steps({slaposSliceSupports});
+        invalidated |= m_print->invalidate_step(slapsMergeSlicesAndEval);
     } else if (step == slaposSliceSupports) {
-        invalidated |= this->invalidate_step(slaposIndexSlices);
-        invalidated |= m_print->invalidate_step(slapsRasterize);
-    } else if(step == slaposIndexSlices) {
-        invalidated |= m_print->invalidate_step(slapsRasterize);
+        invalidated |= m_print->invalidate_step(slapsMergeSlicesAndEval);
     }
     return invalidated;
 }
@@ -1466,83 +1664,38 @@ double SLAPrintObject::get_current_elevation() const
     return get_elevation();
 }
 
+Vec3d SLAPrint::relative_correction() const
+{
+    Vec3d corr(1., 1., 1.);
+
+    if(printer_config().relative_correction.values.size() >= 2) {
+        corr(X) = printer_config().relative_correction.values[0];
+        corr(Y) = printer_config().relative_correction.values[0];
+        corr(Z) = printer_config().relative_correction.values.back();
+    } 
+
+    if(material_config().material_correction.values.size() >= 2) {
+        corr(X) *= material_config().material_correction.values[0];
+        corr(Y) *= material_config().material_correction.values[0];
+        corr(Z) *= material_config().material_correction.values.back();
+    }
+
+    return corr;
+}
+
 namespace { // dummy empty static containers for return values in some methods
 const std::vector<ExPolygons> EMPTY_SLICES;
 const TriangleMesh EMPTY_MESH;
 const ExPolygons EMPTY_SLICE;
 }
 
+const SliceRecord SliceRecord::EMPTY(0, std::nanf(""), 0.f);
+
 const std::vector<sla::SupportPoint>& SLAPrintObject::get_support_points() const
 {
     return m_supportdata->support_points;
 }
 
-SLAPrintObject::SliceIndex::iterator
-SLAPrintObject::search_slice_index(float slice_level)
-{
-    _SliceRecord query(0, slice_level, 0);
-    auto it = std::lower_bound(m_slice_index.begin(), m_slice_index.end(),
-                               query,
-                               [](const _SliceRecord& r1, const _SliceRecord& r2)
-    {
-        return r1.slice_level() < r2.slice_level();
-    });
-
-    return it;
-}
-
-SLAPrintObject::SliceIndex::const_iterator
-SLAPrintObject::search_slice_index(float slice_level) const
-{
-    _SliceRecord query(0, slice_level, 0);
-    auto it = std::lower_bound(m_slice_index.cbegin(), m_slice_index.cend(),
-                               query,
-                               [](const _SliceRecord& r1, const _SliceRecord& r2)
-    {
-        return r1.slice_level() < r2.slice_level();
-    });
-
-    return it;
-}
-
-SLAPrintObject::SliceIndex::iterator
-SLAPrintObject::search_slice_index(SLAPrintObject::_SliceRecord::Key key,
-                                   bool exact)
-{
-    _SliceRecord query(key, 0.f, 0.f);
-    auto it = std::lower_bound(m_slice_index.begin(), m_slice_index.end(),
-                               query,
-                               [](const _SliceRecord& r1, const _SliceRecord& r2)
-    {
-        return r1.key() < r2.key();
-    });
-
-    // Return valid iterator only if the keys really match
-    if(exact && it != m_slice_index.end() && it->key() != key)
-        it = m_slice_index.end();
-
-    return it;
-}
-
-SLAPrintObject::SliceIndex::const_iterator
-SLAPrintObject::search_slice_index(SLAPrintObject::_SliceRecord::Key key,
-                                   bool exact) const
-{
-    _SliceRecord query(key, 0.f, 0.f);
-    auto it = std::lower_bound(m_slice_index.cbegin(), m_slice_index.cend(),
-                               query,
-                               [](const _SliceRecord& r1, const _SliceRecord& r2)
-    {
-        return r1.key() < r2.key();
-    });
-
-    // Return valid iterator only if the keys really match
-    if(exact && it != m_slice_index.end() && it->key() != key)
-        it = m_slice_index.end();
-
-    return it;
-}
-
 const std::vector<ExPolygons> &SLAPrintObject::get_support_slices() const
 {
     // assert(is_step_done(slaposSliceSupports));
@@ -1550,41 +1703,21 @@ const std::vector<ExPolygons> &SLAPrintObject::get_support_slices() const
     return m_supportdata->support_slices;
 }
 
-const ExPolygons &SLAPrintObject::get_slices_from_record(
-        const _SliceRecord &rec,
-        SliceOrigin o) const
+const ExPolygons &SliceRecord::get_slice(SliceOrigin o) const
 {
-    size_t idx = o == soModel ? rec.get_model_slice_idx() :
-                                rec.get_support_slice_idx();
+    size_t idx = o == soModel ? m_model_slices_idx :
+                                m_support_slices_idx;
 
-    const std::vector<ExPolygons>& v = o == soModel? get_model_slices() :
-                                                     get_support_slices();
+    if(m_po == nullptr) return EMPTY_SLICE;
+
+    const std::vector<ExPolygons>& v = o == soModel? m_po->get_model_slices() :
+                                                     m_po->get_support_slices();
 
     if(idx >= v.size()) return EMPTY_SLICE;
 
     return idx >= v.size() ? EMPTY_SLICE : v[idx];
 }
 
-const ExPolygons &SLAPrintObject::get_slices_from_record(
-        SLAPrintObject::SliceRecordConstIterator it, SliceOrigin o) const
-{
-    if(it.is_end()) return EMPTY_SLICE;
-    return get_slices_from_record(*it, o);
-}
-
-const std::vector<SLAPrintObject::_SliceRecord>&
-SLAPrintObject::get_slice_index() const
-{
-    // assert(is_step_done(slaposIndexSlices));
-    return m_slice_index;
-}
-
-const std::vector<ExPolygons> &SLAPrintObject::get_model_slices() const
-{
-    // assert(is_step_done(slaposObjectSlice));
-    return m_model_slices;
-}
-
 bool SLAPrintObject::has_mesh(SLAPrintObjectStep step) const
 {
     switch (step) {
@@ -1676,7 +1809,8 @@ DynamicConfig SLAPrintStatistics::placeholders()
         "print_time", "total_cost", "total_weight",
         "objects_used_material", "support_used_material" })
         config.set_key_value(key, new ConfigOptionString(std::string("{") + key + "}"));
-        return config;
+
+    return config;
 }
 
 std::string SLAPrintStatistics::finalize_output_path(const std::string &path_in) const
@@ -1696,4 +1830,12 @@ std::string SLAPrintStatistics::finalize_output_path(const std::string &path_in)
     return final_path;
 }
 
+void SLAPrint::StatusReporter::operator()(
+        SLAPrint &p, double st, const std::string &msg, unsigned flags)
+{
+    m_st = st;
+    BOOST_LOG_TRIVIAL(info) << st << "% " << msg << log_memory_info();
+    p.set_status(int(std::round(st)), msg, flags);
+}
+
 } // namespace Slic3r
diff --git a/src/libslic3r/SLAPrint.hpp b/src/libslic3r/SLAPrint.hpp
index fbe2821b2..64b2160b0 100644
--- a/src/libslic3r/SLAPrint.hpp
+++ b/src/libslic3r/SLAPrint.hpp
@@ -6,13 +6,14 @@
 #include "PrintExport.hpp"
 #include "Point.hpp"
 #include "MTUtils.hpp"
-#include <iterator>
+#include <libnest2d/backends/clipper/clipper_polygon.hpp>
+#include "Zipper.hpp"
 
 namespace Slic3r {
 
 enum SLAPrintStep : unsigned int {
-	slapsRasterize,
-	slapsValidate,
+    slapsMergeSlicesAndEval,
+    slapsRasterize,
 	slapsCount
 };
 
@@ -21,8 +22,7 @@ enum SLAPrintObjectStep : unsigned int {
 	slaposSupportPoints,
 	slaposSupportTree,
 	slaposBasePool,
-	slaposSliceSupports,
-    slaposIndexSlices,
+    slaposSliceSupports,
 	slaposCount
 };
 
@@ -34,7 +34,7 @@ using _SLAPrintObjectBase =
 
 // Layers according to quantized height levels. This will be consumed by
 // the printer (rasterizer) in the SLAPrint class.
-using LevelID = long long;
+// using coord_t = long long;
 
 enum SliceOrigin { soSupport, soModel };
 
@@ -51,6 +51,7 @@ public:
 
     const SLAPrintObjectConfig& config() const { return m_config; }
     const Transform3d&          trafo()  const { return m_trafo; }
+    bool                        is_left_handed() const { return m_left_handed; }
 
     struct Instance {
     	Instance(ModelID instance_id, const Point &shift, float rotation) : instance_id(instance_id), shift(shift), rotation(rotation) {}
@@ -94,142 +95,144 @@ public:
     const std::vector<sla::SupportPoint>& get_support_points() const;
 
     // The public Slice record structure. It corresponds to one printable layer.
-    // To get the sliced polygons, use SLAPrintObject::get_slices_from_record
     class SliceRecord {
     public:
-        using Key = LevelID;
+        // this will be the max limit of size_t
+        static const size_t NONE = size_t(-1);
+
+        static const SliceRecord EMPTY;
 
     private:
-        Key   m_print_z = 0;      // Top of the layer
-        float m_slice_z = 0.f;    // Exact level of the slice
-        float m_height = 0.f;     // Height of the sliced layer
+        coord_t   m_print_z = 0;      // Top of the layer
+        float     m_slice_z = 0.f;    // Exact level of the slice
+        float     m_height  = 0.f;     // Height of the sliced layer
 
-    protected:
-        SliceRecord(Key key, float slicez, float height):
-            m_print_z(key), m_slice_z(slicez), m_height(height) {}
+        size_t m_model_slices_idx = NONE;
+        size_t m_support_slices_idx = NONE;
+        const SLAPrintObject *m_po = nullptr;
 
     public:
 
+        SliceRecord(coord_t key, float slicez, float height):
+            m_print_z(key), m_slice_z(slicez), m_height(height) {}
+
         // The key will be the integer height level of the top of the layer.
-        inline Key key() const { return m_print_z; }
+        coord_t print_level() const { return m_print_z; }
 
         // Returns the exact floating point Z coordinate of the slice
-        inline float slice_level() const { return m_slice_z; }
+        float slice_level() const { return m_slice_z; }
 
         // Returns the current layer height
-        inline float layer_height() const { return m_height; }
+        float layer_height() const { return m_height; }
+
+        bool is_valid() const { return ! std::isnan(m_slice_z); }
+
+        const SLAPrintObject* print_obj() const { assert(m_po); return m_po; }
+
+        // Methods for setting the indices into the slice vectors.
+        void set_model_slice_idx(const SLAPrintObject &po, size_t id) {
+            m_po = &po; m_model_slices_idx = id;
+        }
+
+        void set_support_slice_idx(const SLAPrintObject& po, size_t id) {
+            m_po = &po; m_support_slices_idx = id;
+        }
+
+        const ExPolygons& get_slice(SliceOrigin o) const;
     };
 
 private:
 
-    // An index record referencing the slices
-    // (get_model_slices(), get_support_slices()) where the keys are the height
-    // levels of the model in scaled-clipper coordinates. The levels correspond
-    // to the z coordinate of the object coordinate system.
-    class _SliceRecord: public SliceRecord {
-    public:
-        static const size_t NONE = size_t(-1); // this will be the max limit of size_t
-    private:
-        size_t m_model_slices_idx = NONE;
-        size_t m_support_slices_idx = NONE;
+    template <class T> inline static T level(const SliceRecord& sr) {
+        static_assert(std::is_arithmetic<T>::value, "Arithmetic only!");
+        return std::is_integral<T>::value ? T(sr.print_level()) : T(sr.slice_level());
+    }
 
-    public:
-        _SliceRecord(Key key, float slicez, float height):
-            SliceRecord(key, slicez, height) {}
+    template <class T> inline static SliceRecord create_slice_record(T val) {
+        static_assert(std::is_arithmetic<T>::value, "Arithmetic only!");
+        return std::is_integral<T>::value ? SliceRecord{ coord_t(val), 0.f, 0.f } : SliceRecord{ 0, float(val), 0.f };
+    }
 
-        // Methods for setting the indices into the slice vectors.
-        void set_model_slice_idx(size_t id) { m_model_slices_idx = id; }
-        void set_support_slice_idx(size_t id) { m_support_slices_idx = id; }
+    // This is a template method for searching the slice index either by
+    // an integer key: print_level or a floating point key: slice_level.
+    // The eps parameter gives the max deviation in + or - direction.
+    //
+    // This method can be used in const or non-const contexts as well.
+    template<class Container, class T>
+    static auto closest_slice_record(
+            Container& cont,
+            T lvl,
+            T eps = std::numeric_limits<T>::max()) -> decltype (cont.begin())
+    {
+        if(cont.empty()) return cont.end();
+        if(cont.size() == 1 && std::abs(level<T>(cont.front()) - lvl) > eps)
+            return cont.end();
 
-        inline size_t get_model_slice_idx() const { return m_model_slices_idx; }
-        inline size_t get_support_slice_idx() const { return m_support_slices_idx; }
-    };
+        SliceRecord query = create_slice_record(lvl);
 
-    // Slice index will be a plain vector sorted by the integer height levels
-    using SliceIndex = std::vector<_SliceRecord>;
+        auto it = std::lower_bound(cont.begin(), cont.end(), query,
+                                   [](const SliceRecord& r1,
+                                      const SliceRecord& r2)
+        {
+            return level<T>(r1) < level<T>(r2);
+        });
+        
+        if(it == cont.end()) return it;
 
-    // Retrieve the slice index which is readable only after slaposIndexSlices
-    // is done.
-    const SliceIndex& get_slice_index() const;
+        T diff = std::abs(level<T>(*it) - lvl);
 
-    // Search slice index for the closest slice to the given level
-    SliceIndex::iterator search_slice_index(float slice_level);
-    SliceIndex::const_iterator search_slice_index(float slice_level) const;
+        if(it != cont.begin()) {
+            auto it_prev = std::prev(it);
+            T diff_prev = std::abs(level<T>(*it_prev) - lvl);
+            if(diff_prev < diff) { diff = diff_prev; it = it_prev; }
+        }
 
-    // Search the slice index for a particular level in integer coordinates.
-    // If no such layer is present, it will return m_slice_index.end()
-    // This behavior can be suppressed by the second parameter. If it is true
-    // the method will return the closest (non-equal) record
-    SliceIndex::iterator search_slice_index(_SliceRecord::Key key, bool exact = false);
-    SliceIndex::const_iterator search_slice_index(_SliceRecord::Key key, bool = false) const;
+        if(diff > eps) it = cont.end();
 
-    const std::vector<ExPolygons>& get_model_slices() const;
+        return it;
+    }
+
+    const std::vector<ExPolygons>& get_model_slices() const { return m_model_slices; }
     const std::vector<ExPolygons>& get_support_slices() const;
 
 public:
 
-    // Should work as a polymorphic bidirectional iterator to the slice records
-    using SliceRecordConstIterator =
-        IndexBasedIterator<const SliceIndex, const _SliceRecord>;
-
     // /////////////////////////////////////////////////////////////////////////
     //
-    // These two methods should be callable on the client side (e.g. UI thread)
+    // These methods should be callable on the client side (e.g. UI thread)
     // when the appropriate steps slaposObjectSlice and slaposSliceSupports
     // are ready. All the print objects are processed before slapsRasterize so
     // it is safe to call them during and/or after slapsRasterize.
     //
     // /////////////////////////////////////////////////////////////////////////
 
-    // Get the slice records from a range of slice levels (inclusive). Floating
-    // point keys are the levels where the model was sliced with the mesh
-    // slicer. Integral keys are the keys of the slice records, which
-    // correspond to the top of each layer.. The end() method of the returned
-    // range points *after* the last valid element. This is for being
-    // consistent with std and makeing range based for loops work. use
-    // std::prev(range.end()) or --range.end() to get the last element.
-    template<class Key> Range<SliceRecordConstIterator>
-    get_slice_records(Key from, Key to = std::numeric_limits<Key>::max()) const
+    // Retrieve the slice index.
+    const std::vector<SliceRecord>& get_slice_index() const {
+        return m_slice_index;
+    }
+
+    // Search slice index for the closest slice to given print_level.
+    // max_epsilon gives the allowable deviation of the returned slice record's
+    // level.
+    const SliceRecord& closest_slice_to_print_level(
+            coord_t print_level,
+            coord_t max_epsilon = std::numeric_limits<coord_t>::max()) const
     {
-        SliceIndex::const_iterator it_from, it_to;
-        if(std::is_integral<Key>::value) {
-            it_from = search_slice_index(SliceRecord::Key(from));
-            it_to   = search_slice_index(SliceRecord::Key(to));
-        } else if(std::is_floating_point<Key>::value) {
-            it_from = search_slice_index(float(from));
-            it_to   = search_slice_index(float(to));
-        } else return {
-            SliceRecordConstIterator(m_slice_index, _SliceRecord::NONE ),
-            SliceRecordConstIterator(m_slice_index, _SliceRecord::NONE ),
-        };
-
-        auto start = m_slice_index.begin();
-
-        size_t bidx = it_from == m_slice_index.end() ? _SliceRecord::NONE :
-                                                        size_t(it_from - start);
-
-        size_t eidx = it_to   == m_slice_index.end() ? _SliceRecord::NONE :
-                                                       size_t(it_to - start) + 1;
-
-        return {
-            SliceRecordConstIterator(m_slice_index, bidx),
-            SliceRecordConstIterator(m_slice_index, eidx),
-        };
+        auto it = closest_slice_record(m_slice_index, print_level, max_epsilon);
+        return it == m_slice_index.end() ? SliceRecord::EMPTY : *it;
     }
 
-    // Get all the slice records as a range.
-    inline Range<SliceRecordConstIterator> get_slice_records() const {
-        return {
-            SliceRecordConstIterator(m_slice_index, 0),
-            SliceRecordConstIterator(m_slice_index, m_slice_index.size())
-        };
+    // Search slice index for the closest slice to given slice_level.
+    // max_epsilon gives the allowable deviation of the returned slice record's
+    // level. Use SliceRecord::is_valid() to check the result.
+    const SliceRecord& closest_slice_to_slice_level(
+            float slice_level,
+            float max_epsilon = std::numeric_limits<float>::max()) const
+    {
+        auto it = closest_slice_record(m_slice_index, slice_level, max_epsilon);
+        return it == m_slice_index.end() ? SliceRecord::EMPTY : *it;
     }
 
-    const ExPolygons& get_slices_from_record(SliceRecordConstIterator it,
-                                             SliceOrigin o) const;
-
-    const ExPolygons& get_slices_from_record(const _SliceRecord& rec,
-                                             SliceOrigin o) const;
 protected:
     // to be called from SLAPrint only.
     friend class SLAPrint;
@@ -241,11 +244,12 @@ protected:
     void                    config_apply_only(const ConfigBase &other, const t_config_option_keys &keys, bool ignore_nonexistent = false) 
     	{ this->m_config.apply_only(other, keys, ignore_nonexistent); }
 
-    void                    set_trafo(const Transform3d& trafo) {
-        m_transformed_rmesh.invalidate([this, &trafo](){ m_trafo = trafo; });
+    void                    set_trafo(const Transform3d& trafo, bool left_handed) {
+		m_transformed_rmesh.invalidate([this, &trafo, left_handed](){ m_trafo = trafo; m_left_handed = left_handed; });
     }
 
-    void                    set_instances(const std::vector<Instance> &instances) { m_instances = instances; }
+    template<class InstVec> inline void set_instances(InstVec&& instances) { m_instances = std::forward<InstVec>(instances); }
+
     // Invalidates the step, and its depending steps in SLAPrintObject and SLAPrint.
     bool                    invalidate_step(SLAPrintObjectStep step);
     bool                    invalidate_all_steps();
@@ -262,6 +266,8 @@ private:
 
     // Translation in Z + Rotation by Y and Z + Scaling / Mirroring.
     Transform3d                             m_trafo = Transform3d::Identity();
+    // m_trafo is left handed -> 3x3 affine transformation has negative determinant.
+    bool                                    m_left_handed = false;
 
     std::vector<Instance> 					m_instances;
 
@@ -270,7 +276,7 @@ private:
 
     // Exact (float) height levels mapped to the slices. Each record contains
     // the index to the model and the support slice vectors.
-    std::vector<_SliceRecord>               m_slice_index;
+    std::vector<SliceRecord>                m_slice_index;
 
     std::vector<float>                      m_model_height_levels;
 
@@ -283,6 +289,8 @@ private:
 
 using PrintObjects = std::vector<SLAPrintObject*>;
 
+using SliceRecord  = SLAPrintObject::SliceRecord;
+
 class TriangleMesh;
 
 struct SLAPrintStatistics
@@ -314,6 +322,37 @@ struct SLAPrintStatistics
     }
 };
 
+// The implementation of creating zipped archives with wxWidgets
+template<> class LayerWriter<Zipper> {
+    Zipper m_zip;
+public:
+
+    LayerWriter(const std::string& zipfile_path): m_zip(zipfile_path) {}
+
+    void next_entry(const std::string& fname) { m_zip.add_entry(fname); }
+
+    void binary_entry(const std::string& fname,
+                      const std::uint8_t* buf,
+                      size_t l)
+    {
+        m_zip.add_entry(fname, buf, l);
+    }
+
+    template<class T> inline LayerWriter& operator<<(T&& arg) {
+        m_zip << std::forward<T>(arg); return *this;
+    }
+
+    bool is_ok() const {
+        return true; // m_zip blows up if something goes wrong...
+    }
+
+    // After finalize, no writing to the archive will have an effect. The only
+    // valid operation is to dispose the object calling the destructor which
+    // should close the file. This method can throw and signal potential errors
+    // when flushing the archive. This is why its present.
+    void finalize() { m_zip.finalize(); }
+};
+
 /**
  * @brief This class is the high level FSM for the SLA printing process.
  *
@@ -328,6 +367,7 @@ private: // Prevents erroneous use by other classes.
     typedef PrintBaseWithState<SLAPrintStep, slapsCount> Inherited;
 
 public:
+
     SLAPrint(): m_stepmask(slapsCount, true) {}
 
     virtual ~SLAPrint() override { this->clear(); }
@@ -343,32 +383,81 @@ public:
     // Returns true if an object step is done on all objects and there's at least one object.    
     bool                is_step_done(SLAPrintObjectStep step) const;
     // Returns true if the last step was finished with success.
-	bool                finished() const override { return this->is_step_done(slaposIndexSlices) && this->Inherited::is_step_done(slapsRasterize); }
+    bool                finished() const override { return this->is_step_done(slaposSliceSupports) && this->Inherited::is_step_done(slapsRasterize); }
 
-    template<class Fmt> void export_raster(const std::string& fname) {
-        if(m_printer) m_printer->save<Fmt>(fname);
+    template<class Fmt = Zipper>
+    inline void export_raster(const std::string& fpath,
+                       const std::string& projectname = "")
+    {
+        if(m_printer) m_printer->save<Fmt>(fpath, projectname);
     }
+
     const PrintObjects& objects() const { return m_objects; }
 
-    const SLAPrintConfig&     print_config() const { return m_print_config; }
-    const SLAPrinterConfig&   printer_config() const { return m_printer_config; }
-    const SLAMaterialConfig&  material_config() const { return m_material_config; }
+    const SLAPrintConfig&       print_config() const { return m_print_config; }
+    const SLAPrinterConfig&     printer_config() const { return m_printer_config; }
+    const SLAMaterialConfig&    material_config() const { return m_material_config; }
+    const SLAPrintObjectConfig& default_object_config() const { return m_default_object_config; }
 
+    // Extracted value from the configuration objects
+    Vec3d                       relative_correction() const;
 
-	std::string         output_filename() const override;
+	std::string                 output_filename() const override;
 
     const SLAPrintStatistics&      print_statistics() const { return m_print_statistics; }
 
     std::string validate() const override;
 
+    // An aggregation of SliceRecord-s from all the print objects for each
+    // occupied layer. Slice record levels dont have to match exactly.
+    // They are unified if the level difference is within +/- SCALED_EPSILON
+    class PrintLayer {
+        coord_t m_level;
+
+        // The collection of slice records for the current level.
+        std::vector<std::reference_wrapper<const SliceRecord>> m_slices;
+
+        std::vector<ClipperLib::Polygon> m_transformed_slices;
+
+        template<class Container> void transformed_slices(Container&& c) {
+            m_transformed_slices = std::forward<Container>(c);
+        }
+
+        friend void SLAPrint::process();
+
+    public:
+
+        explicit PrintLayer(coord_t lvl) : m_level(lvl) {}
+
+        // for being sorted in their container (see m_printer_input)
+        bool operator<(const PrintLayer& other) const {
+            return m_level < other.m_level;
+        }
+
+        void add(const SliceRecord& sr) { m_slices.emplace_back(sr); }
+
+        coord_t level() const { return m_level; }
+
+        auto slices() const -> const decltype (m_slices)& { return m_slices; }
+
+        const std::vector<ClipperLib::Polygon> & transformed_slices() const {
+            return m_transformed_slices;
+        }
+    };
+
+    // The aggregated and leveled print records from various objects.
+    // TODO: use this structure for the preview in the future.
+    const std::vector<PrintLayer>& print_layers() const { return m_printer_input; }
+
 private:
     using SLAPrinter = FilePrinter<FilePrinterFormat::SLA_PNGZIP>;
     using SLAPrinterPtr = std::unique_ptr<SLAPrinter>;
 
-    // Invalidate steps based on a set of parameters changed.
-    bool invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys);
+    // Implement same logic as in SLAPrintObject
+    bool invalidate_step(SLAPrintStep st);
 
-    void fill_statistics();
+    // Invalidate steps based on a set of parameters changed.
+    bool invalidate_state_by_config_options(const std::vector<t_config_option_key> &opt_keys, bool &invalidate_all_model_objects);
 
     SLAPrintConfig                  m_print_config;
     SLAPrinterConfig                m_printer_config;
@@ -378,23 +467,8 @@ private:
     PrintObjects                    m_objects;
     std::vector<bool>               m_stepmask;
 
-    // Definition of the print input map. It consists of the slices indexed
-    // with scaled (clipper) Z coordinates. Also contains the instance
-    // transformations in scaled and filtered version. This is enough for the
-    // rasterizer to be able to draw every layer in the right position
-    using Layer = ExPolygons;
-    using LayerCopies = std::vector<SLAPrintObject::Instance>;
-    struct LayerRef {
-        std::reference_wrapper<const Layer> lref;
-        std::reference_wrapper<const LayerCopies> copies;
-        LayerRef(const Layer& lyr, const LayerCopies& cp) :
-            lref(std::cref(lyr)), copies(std::cref(cp)) {}
-    };
-
-    // One level may contain multiple slices from multiple objects and their
-    // supports
-    using LayerRefs = std::vector<LayerRef>;
-    std::map<LevelID, LayerRefs>            m_printer_input;
+    // Ready-made data for rasterization.
+    std::vector<PrintLayer>                 m_printer_input;
 
     // The printer itself
     SLAPrinterPtr                           m_printer;
@@ -402,6 +476,15 @@ private:
     // Estimated print time, material consumed.
     SLAPrintStatistics                      m_print_statistics;
 
+    class StatusReporter {
+        double m_st = 0;
+    public:
+        void operator() (SLAPrint& p, double st, const std::string& msg,
+                         unsigned flags = SlicingStatus::DEFAULT);
+        double status() const { return m_st; }
+    } m_report_status;
+
+
 	friend SLAPrintObject;
 };
 
diff --git a/src/libslic3r/SupportMaterial.cpp b/src/libslic3r/SupportMaterial.cpp
index 8dee9fd9e..fbbe2109d 100644
--- a/src/libslic3r/SupportMaterial.cpp
+++ b/src/libslic3r/SupportMaterial.cpp
@@ -161,15 +161,13 @@ PrintObjectSupportMaterial::PrintObjectSupportMaterial(const PrintObject *object
         m_support_material_interface_flow = m_support_material_flow;
     }
 
+    // Evaluate the XY gap between the object outer perimeters and the support structures.
     // Evaluate the XY gap between the object outer perimeters and the support structures.
     coordf_t external_perimeter_width = 0.;
-    for (size_t region_id = 0; region_id < object->region_volumes.size(); ++ region_id) {
-        if (! object->region_volumes[region_id].empty()) {
-            const Flow ext_peri_flow = object->print()->get_region(region_id)->flow(frExternalPerimeter,
-                slicing_params.layer_height, false, false, -1, *object);
-            external_perimeter_width = std::max(external_perimeter_width, (coordf_t)ext_peri_flow.width);
-        }
-    }
+    for (size_t region_id = 0; region_id < object->region_volumes.size(); ++ region_id)
+        if (! object->region_volumes[region_id].empty())
+            external_perimeter_width = std::max(external_perimeter_width,
+                (coordf_t)object->print()->get_region(region_id)->flow(frExternalPerimeter, slicing_params.layer_height, false, false, -1, *object).width);
     m_gap_xy = m_object_config->support_material_xy_spacing.get_abs_value(external_perimeter_width);
 
     m_can_merge_support_regions = m_object_config->support_material_extruder.value == m_object_config->support_material_interface_extruder.value;
diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp
index bb6fd4d58..3d03d2031 100644
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -11,6 +11,8 @@
 #define ENABLE_SELECTION_DEBUG_OUTPUT 0
 // Renders a small sphere in the center of the bounding box of the current selection when no gizmo is active
 #define ENABLE_RENDER_SELECTION_CENTER 0
+// Shows an imgui dialog with render related data
+#define ENABLE_RENDER_STATISTICS 0
 
 
 //====================
@@ -58,4 +60,12 @@
 
 
 #define DEBUG_EXTRUSION_OUTPUT 0
+//====================
+// 1.42.0.rc techs
+//====================
+#define ENABLE_1_42_0_RC 1
+
+// Disables Edit->Deselect all item menu item
+#define DISABLE_DESELECT_ALL_MENU_ITEM (1 && ENABLE_1_42_0_RC)
+
 #endif // _technologies_h_
diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
index 48224ce80..fb22986a9 100644
--- a/src/libslic3r/TriangleMesh.cpp
+++ b/src/libslic3r/TriangleMesh.cpp
@@ -55,7 +55,7 @@ TriangleMesh::TriangleMesh(const Pointf3s &points, const std::vector<Vec3i32>& f
     stl.stats.original_num_facets = stl.stats.number_of_facets;
     stl_allocate(&stl);
 
-    for (int i = 0; i < stl.stats.number_of_facets; i++) {
+    for (uint32_t i = 0; i < stl.stats.number_of_facets; i++) {
         stl_facet facet;
         facet.vertex[0] = points[facets[i](0)].cast<float>();
         facet.vertex[1] = points[facets[i](1)].cast<float>();
@@ -125,9 +125,9 @@ void TriangleMesh::repair()
 	float tolerance = stl.stats.shortest_edge;
     float increment = stl.stats.bounding_diameter / 10000.0;
     int iterations = 2;
-    if (stl.stats.connected_facets_3_edge < stl.stats.number_of_facets) {
+    if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
         for (int i = 0; i < iterations; i++) {
-            if (stl.stats.connected_facets_3_edge < stl.stats.number_of_facets) {
+            if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
                 //printf("Checking nearby. Tolerance= %f Iteration=%d of %d...", tolerance, i + 1, iterations);
 #ifdef SLIC3R_TRACE_REPAIR
 				BOOST_LOG_TRIVIAL(trace) << "\tstl_check_faces_nearby";
@@ -143,7 +143,7 @@ void TriangleMesh::repair()
     }
     
     // remove_unconnected
-    if (stl.stats.connected_facets_3_edge <  stl.stats.number_of_facets) {
+    if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
 #ifdef SLIC3R_TRACE_REPAIR
         BOOST_LOG_TRIVIAL(trace) << "\tstl_remove_unconnected_facets";
 #endif /* SLIC3R_TRACE_REPAIR */
@@ -212,9 +212,9 @@ void TriangleMesh::check_topology()
     float tolerance = stl.stats.shortest_edge;
     float increment = stl.stats.bounding_diameter / 10000.0;
     int iterations = 2;
-    if (stl.stats.connected_facets_3_edge < stl.stats.number_of_facets) {
+    if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
         for (int i = 0; i < iterations; i++) {
-            if (stl.stats.connected_facets_3_edge < stl.stats.number_of_facets) {
+            if (stl.stats.connected_facets_3_edge < (int)stl.stats.number_of_facets) {
                 //printf("Checking nearby. Tolerance= %f Iteration=%d of %d...", tolerance, i + 1, iterations);
                 stl_check_facets_nearby(&stl, tolerance);
                 //printf("  Fixed %d edges.\n", stl.stats.edges_fixed - last_edges_fixed);
@@ -273,6 +273,11 @@ void TriangleMesh::translate(float x, float y, float z)
     stl_invalidate_shared_vertices(&this->stl);
 }
 
+void TriangleMesh::translate(const Vec3f &displacement)
+{
+    translate(displacement(0), displacement(1), displacement(2));
+}
+
 void TriangleMesh::rotate(float angle, const Axis &axis)
 {
     if (angle == 0.f)
@@ -314,10 +319,26 @@ void TriangleMesh::mirror(const Axis &axis)
     stl_invalidate_shared_vertices(&this->stl);
 }
 
-void TriangleMesh::transform(const Transform3d& t)
+void TriangleMesh::transform(const Transform3d& t, bool fix_left_handed)
 {
     stl_transform(&stl, t);
     stl_invalidate_shared_vertices(&stl);
+	if (fix_left_handed && t.matrix().block(0, 0, 3, 3).determinant() < 0.) {
+		// Left handed transformation is being applied. It is a good idea to flip the faces and their normals.
+		this->repair();
+		stl_reverse_all_facets(&stl);
+}
+}
+
+void TriangleMesh::transform(const Matrix3d& m, bool fix_left_handed)
+{
+    stl_transform(&stl, m);
+    stl_invalidate_shared_vertices(&stl);
+    if (fix_left_handed && m.determinant() < 0.) {
+        // Left handed transformation is being applied. It is a good idea to flip the faces and their normals.
+        this->repair();
+        stl_reverse_all_facets(&stl);
+    }
 }
 
 void TriangleMesh::align_to_origin()
@@ -338,113 +359,79 @@ void TriangleMesh::rotate(double angle, Point* center)
     this->translate(c(0), c(1), 0);
 }
 
-bool TriangleMesh::has_multiple_patches() const
+/**
+ * Calculates whether or not the mesh is splittable.
+ */
+bool TriangleMesh::is_splittable() const
 {
-    // we need neighbors
-    if (!this->repaired)
-        throw std::runtime_error("split() requires repair()");
+    std::vector<unsigned char> visited;
+    find_unvisited_neighbors(visited);
     
-    if (this->stl.stats.number_of_facets == 0)
-        return false;
-
-    std::vector<int>  facet_queue(this->stl.stats.number_of_facets, 0);
-    std::vector<char> facet_visited(this->stl.stats.number_of_facets, false);
-    int               facet_queue_cnt = 1;
-    facet_queue[0] = 0;
-    facet_visited[0] = true;
-    while (facet_queue_cnt > 0) {
-        int facet_idx = facet_queue[-- facet_queue_cnt];
-        facet_visited[facet_idx] = true;
-        for (int j = 0; j < 3; ++ j) {
-            int neighbor_idx = this->stl.neighbors_start[facet_idx].neighbor[j];
-            if (neighbor_idx != -1 && ! facet_visited[neighbor_idx])
-                facet_queue[facet_queue_cnt ++] = neighbor_idx;
+    // Try finding an unvisited facet. If there are none, the mesh is not splittable.
+    auto it = std::find(visited.begin(), visited.end(), false);
+    return it != visited.end();
         }
-    }
 
-    // If any of the face was not visited at the first time, return "multiple bodies".
-    for (int facet_idx = 0; facet_idx < this->stl.stats.number_of_facets; ++ facet_idx)
-        if (! facet_visited[facet_idx])
-            return true;
-    return false;
-}
-
-size_t TriangleMesh::number_of_patches() const
+/**
+ * Visit all unvisited neighboring facets that are reachable from the first unvisited facet,
+ * and return them.
+ * 
+ * @param facet_visited A reference to a vector of booleans. Contains whether or not a
+ *                      facet with the same index has been visited.
+ * @return A deque with all newly visited facets.
+ */
+std::deque<uint32_t> TriangleMesh::find_unvisited_neighbors(std::vector<unsigned char> &facet_visited) const
 {
-    // we need neighbors
+    // Make sure we're not operating on a broken mesh.
     if (!this->repaired)
-        throw std::runtime_error("split() requires repair()");
+        throw std::runtime_error("find_unvisited_neighbors() requires repair()");
     
-    if (this->stl.stats.number_of_facets == 0)
-        return false;
+    // If the visited list is empty, populate it with false for every facet.
+    if (facet_visited.empty())
+        facet_visited = std::vector<unsigned char>(this->stl.stats.number_of_facets, false);
 
-    std::vector<int>  facet_queue(this->stl.stats.number_of_facets, 0);
-    std::vector<char> facet_visited(this->stl.stats.number_of_facets, false);
-    int               facet_queue_cnt = 0;
-    size_t            num_bodies = 0;
-    for (;;) {
-        // Find a seeding triangle for a new body.
-        int facet_idx = 0;
-        for (; facet_idx < this->stl.stats.number_of_facets; ++ facet_idx)
-            if (! facet_visited[facet_idx]) {
-                // A seed triangle was found.
-                facet_queue[facet_queue_cnt ++] = facet_idx;
-                facet_visited[facet_idx] = true;
-                break;
+    // Find the first unvisited facet.
+    std::queue<uint32_t> facet_queue;
+    std::deque<uint32_t> facets;
+    auto facet = std::find(facet_visited.begin(), facet_visited.end(), false);
+    if (facet != facet_visited.end()) {
+        uint32_t idx = uint32_t(facet - facet_visited.begin());
+        facet_queue.push(idx);
+        facet_visited[idx] = true;
+        facets.emplace_back(idx);
             }
-        if (facet_idx == this->stl.stats.number_of_facets)
-            // No seed found.
-            break;
-        ++ num_bodies;
-        while (facet_queue_cnt > 0) {
-            int facet_idx = facet_queue[-- facet_queue_cnt];
-            facet_visited[facet_idx] = true;
-            for (int j = 0; j < 3; ++ j) {
-                int neighbor_idx = this->stl.neighbors_start[facet_idx].neighbor[j];
-                if (neighbor_idx != -1 && ! facet_visited[neighbor_idx])
-                    facet_queue[facet_queue_cnt ++] = neighbor_idx;
+
+    // Traverse all reachable neighbors and mark them as visited.
+    while (! facet_queue.empty()) {
+        uint32_t facet_idx = facet_queue.front();
+        facet_queue.pop();
+        for (int neighbor_idx : this->stl.neighbors_start[facet_idx].neighbor)
+            if (neighbor_idx != -1 && ! facet_visited[neighbor_idx]) {
+                facet_queue.push(uint32_t(neighbor_idx));
+                facet_visited[neighbor_idx] = true;
+                facets.emplace_back(uint32_t(neighbor_idx));
             }
         }
-    }
 
-    return num_bodies;
+    return facets;
 }
 
+/**
+ * Splits a mesh into multiple meshes when possible.
+ * 
+ * @return A TriangleMeshPtrs with the newly created meshes.
+ */
 TriangleMeshPtrs TriangleMesh::split() const
 {
+    // Loop while we have remaining facets.
+    std::vector<unsigned char> facet_visited;
     TriangleMeshPtrs            meshes;
-    std::vector<unsigned char>  facet_visited(this->stl.stats.number_of_facets, false);
-    
-    // we need neighbors
-    if (!this->repaired)
-        throw std::runtime_error("split() requires repair()");
-    
-    // loop while we have remaining facets
     for (;;) {
-        // get the first facet
-        std::queue<int> facet_queue;
-        std::deque<int> facets;
-        for (int facet_idx = 0; facet_idx < this->stl.stats.number_of_facets; ++ facet_idx) {
-            if (! facet_visited[facet_idx]) {
-                // if facet was not seen put it into queue and start searching
-                facet_queue.push(facet_idx);
+        std::deque<uint32_t> facets = find_unvisited_neighbors(facet_visited);
+        if (facets.empty())
                 break;
-            }
-        }
-        if (facet_queue.empty())
-            break;
-
-        while (! facet_queue.empty()) {
-            int facet_idx = facet_queue.front();
-            facet_queue.pop();
-            if (! facet_visited[facet_idx]) {
-                facets.emplace_back(facet_idx);
-                for (int j = 0; j < 3; ++ j)
-                    facet_queue.push(this->stl.neighbors_start[facet_idx].neighbor[j]);
-                facet_visited[facet_idx] = true;
-            }
-        }
 
+        // Create a new mesh for the part that was just split off.
         TriangleMesh* mesh = new TriangleMesh;
         meshes.emplace_back(mesh);
         mesh->stl.stats.type = inmemory;
@@ -453,8 +440,9 @@ TriangleMeshPtrs TriangleMesh::split() const
         stl_clear_error(&mesh->stl);
         stl_allocate(&mesh->stl);
         
+        // Assign the facets to the new mesh.
         bool first = true;
-        for (std::deque<int>::const_iterator facet = facets.begin(); facet != facets.end(); ++ facet) {
+        for (auto facet = facets.begin(); facet != facets.end(); ++ facet) {
             mesh->stl.facet_start[facet - facets.begin()] = this->stl.facet_start[*facet];
             stl_facet_stats(&mesh->stl, this->stl.facet_start[*facet], first);
         }
@@ -476,7 +464,7 @@ void TriangleMesh::merge(const TriangleMesh &mesh)
     stl_reallocate(&this->stl);
     
     // copy facets
-    for (int i = 0; i < mesh.stl.stats.number_of_facets; ++ i)
+    for (uint32_t i = 0; i < mesh.stl.stats.number_of_facets; ++ i)
         this->stl.facet_start[number_of_facets + i] = mesh.stl.facet_start[i];
     
     // update size
@@ -489,7 +477,7 @@ ExPolygons TriangleMesh::horizontal_projection() const
 {
     Polygons pp;
     pp.reserve(this->stl.stats.number_of_facets);
-    for (int i = 0; i < this->stl.stats.number_of_facets; ++ i) {
+    for (uint32_t i = 0; i < this->stl.stats.number_of_facets; ++ i) {
         stl_facet* facet = &this->stl.facet_start[i];
         Polygon p;
         p.points.resize(3);
@@ -531,7 +519,7 @@ BoundingBoxf3 TriangleMesh::transformed_bounding_box(const Transform3d &trafo) c
     BoundingBoxf3 bbox;
     if (stl.v_shared == nullptr) {
         // Using the STL faces.
-        for (int i = 0; i < this->facets_count(); ++ i) {
+        for (size_t i = 0; i < this->facets_count(); ++ i) {
             const stl_facet &facet = this->stl.facet_start[i];
             for (size_t j = 0; j < 3; ++ j)
                 bbox.merge(trafo * facet.vertex[j].cast<double>());
@@ -630,10 +618,12 @@ void TriangleMesh::require_shared_vertices()
     BOOST_LOG_TRIVIAL(trace) << "TriangleMeshSlicer::require_shared_vertices - end";
 }
 
-void TriangleMeshSlicer::init(TriangleMesh *_mesh, throw_on_cancel_callback_type throw_on_cancel)
+void TriangleMeshSlicer::init(const TriangleMesh *_mesh, throw_on_cancel_callback_type throw_on_cancel)
 {
     mesh = _mesh;
-    _mesh->require_shared_vertices();
+    if (! mesh->has_shared_vertices())
+        throw std::invalid_argument("TriangleMeshSlicer was passed a mesh without shared vertices.");
+
     throw_on_cancel();
     facets_edges.assign(_mesh->stl.stats.number_of_facets * 3, -1);
     v_scaled_shared.assign(_mesh->stl.v_shared, _mesh->stl.v_shared + _mesh->stl.stats.shared_vertices);
@@ -656,7 +646,7 @@ void TriangleMeshSlicer::init(TriangleMesh *_mesh, throw_on_cancel_callback_type
     };
     std::vector<EdgeToFace> edges_map;
     edges_map.assign(this->mesh->stl.stats.number_of_facets * 3, EdgeToFace());
-    for (int facet_idx = 0; facet_idx < this->mesh->stl.stats.number_of_facets; ++ facet_idx)
+    for (uint32_t facet_idx = 0; facet_idx < this->mesh->stl.stats.number_of_facets; ++ facet_idx)
         for (int i = 0; i < 3; ++ i) {
             EdgeToFace &e2f = edges_map[facet_idx*3+i];
             e2f.vertex_low  = this->mesh->stl.v_indices[facet_idx].vertex[i];
@@ -716,6 +706,16 @@ void TriangleMeshSlicer::init(TriangleMesh *_mesh, throw_on_cancel_callback_type
     }
 }
 
+
+
+void TriangleMeshSlicer::set_up_direction(const Vec3f& up)
+{
+    m_quaternion.setFromTwoVectors(up, Vec3f::UnitZ());
+    m_use_quaternion = true;
+}
+
+
+
 void TriangleMeshSlicer::slice(const std::vector<float> &z, std::vector<Polygons>* layers, throw_on_cancel_callback_type throw_on_cancel) const
 {
     BOOST_LOG_TRIVIAL(debug) << "TriangleMeshSlicer::slice";
@@ -818,7 +818,7 @@ void TriangleMeshSlicer::slice(const std::vector<float> &z, std::vector<Polygons
 void TriangleMeshSlicer::_slice_do(size_t facet_idx, std::vector<IntersectionLines>* lines, boost::mutex* lines_mutex, 
     const std::vector<float> &z) const
 {
-    const stl_facet &facet = this->mesh->stl.facet_start[facet_idx];
+    const stl_facet &facet = m_use_quaternion ? this->mesh->stl.facet_start[facet_idx].rotated(m_quaternion) : this->mesh->stl.facet_start[facet_idx];
     
     // find facet extents
     const float min_z = fminf(facet.vertex[0](2), fminf(facet.vertex[1](2), facet.vertex[2](2)));
@@ -889,23 +889,39 @@ TriangleMeshSlicer::FacetSliceType TriangleMeshSlicer::slice_facet(
     // (external on the right of the line)
     const int *vertices = this->mesh->stl.v_indices[facet_idx].vertex;
     int i = (facet.vertex[1].z() == min_z) ? 1 : ((facet.vertex[2].z() == min_z) ? 2 : 0);
+
+    // These are used only if the cut plane is tilted:
+    stl_vertex rotated_a;
+    stl_vertex rotated_b;
+
     for (int j = i; j - i < 3; ++j) {  // loop through facet edges
         int        edge_id  = this->facets_edges[facet_idx * 3 + (j % 3)];
         int        a_id     = vertices[j % 3];
         int        b_id     = vertices[(j+1) % 3];
-        const stl_vertex *a = &this->v_scaled_shared[a_id];
-        const stl_vertex *b = &this->v_scaled_shared[b_id];
+        
+        const stl_vertex *a;
+        const stl_vertex *b;
+        if (m_use_quaternion) {
+            rotated_a = m_quaternion * this->v_scaled_shared[a_id];
+            rotated_b = m_quaternion * this->v_scaled_shared[b_id];
+            a = &rotated_a;
+            b = &rotated_b;
+        }
+        else {
+            a = &this->v_scaled_shared[a_id];
+            b = &this->v_scaled_shared[b_id];
+        }
         
         // Is edge or face aligned with the cutting plane?
         if (a->z() == slice_z && b->z() == slice_z) {
             // Edge is horizontal and belongs to the current layer.
-            const stl_vertex &v0 = this->v_scaled_shared[vertices[0]];
-            const stl_vertex &v1 = this->v_scaled_shared[vertices[1]];
-            const stl_vertex &v2 = this->v_scaled_shared[vertices[2]];
-            const stl_normal &normal = this->mesh->stl.facet_start[facet_idx].normal;
+            // The following rotation of the three vertices may not be efficient, but this branch happens rarely.
+            const stl_vertex &v0 = m_use_quaternion ? stl_vertex(m_quaternion * this->v_scaled_shared[vertices[0]]) : this->v_scaled_shared[vertices[0]];
+            const stl_vertex &v1 = m_use_quaternion ? stl_vertex(m_quaternion * this->v_scaled_shared[vertices[1]]) : this->v_scaled_shared[vertices[1]];
+            const stl_vertex &v2 = m_use_quaternion ? stl_vertex(m_quaternion * this->v_scaled_shared[vertices[2]]) : this->v_scaled_shared[vertices[2]];
+            const stl_normal &normal = facet.normal;
             // We may ignore this edge for slicing purposes, but we may still use it for object cutting.
             FacetSliceType    result = Slicing;
-            const stl_neighbors &nbr = this->mesh->stl.neighbors_start[facet_idx];
             if (min_z == max_z) {
                 // All three vertices are aligned with slice_z.
                 line_out->edge_type = feHorizontal;
@@ -917,8 +933,6 @@ TriangleMeshSlicer::FacetSliceType TriangleMeshSlicer::slice_facet(
                 }
             } else {
                 // Two vertices are aligned with the cutting plane, the third vertex is below or above the cutting plane.
-                int  nbr_idx     = j % 3;
-                int  nbr_face    = nbr.neighbor[nbr_idx];
                 // Is the third vertex below the cutting plane?
                 bool third_below = v0.z() < slice_z || v1.z() < slice_z || v2.z() < slice_z;
                 // Two vertices on the cutting plane, the third vertex is below the plane. Consider the edge to be part of the slice
@@ -1021,7 +1035,9 @@ TriangleMeshSlicer::FacetSliceType TriangleMeshSlicer::slice_facet(
             if (i == line_out->a_id || i == line_out->b_id)
                 i = vertices[2];
             assert(i != line_out->a_id && i != line_out->b_id);
-            line_out->edge_type = (this->v_scaled_shared[i].z() < slice_z) ? feTop : feBottom;
+            line_out->edge_type = ((m_use_quaternion ?
+                                    (m_quaternion * this->v_scaled_shared[i]).z()
+                                    : this->v_scaled_shared[i].z()) < slice_z) ? feTop : feBottom;
         }
 #endif
         return Slicing;
@@ -1705,7 +1721,7 @@ void TriangleMeshSlicer::cut(float z, TriangleMesh* upper, TriangleMesh* lower)
     
     BOOST_LOG_TRIVIAL(trace) << "TriangleMeshSlicer::cut - slicing object";
     float scaled_z = scale_(z);
-    for (int facet_idx = 0; facet_idx < this->mesh->stl.stats.number_of_facets; ++ facet_idx) {
+    for (uint32_t facet_idx = 0; facet_idx < this->mesh->stl.stats.number_of_facets; ++ facet_idx) {
         stl_facet* facet = &this->mesh->stl.facet_start[facet_idx];
         
         // find facet extents
@@ -1866,116 +1882,101 @@ TriangleMesh make_cube(double x, double y, double z) {
 // Generate the mesh for a cylinder and return it, using 
 // the generated angle to calculate the top mesh triangles.
 // Default is 360 sides, angle fa is in radians.
-TriangleMesh make_cylinder(double r, double h, double fa) {
+TriangleMesh make_cylinder(double r, double h, double fa)
+{
+	size_t n_steps    = (size_t)ceil(2. * PI / fa);
+	double angle_step = 2. * PI / n_steps;
+
     Pointf3s vertices;
     std::vector<Vec3i32> facets;
+	vertices.reserve(2 * n_steps + 2);
+	facets.reserve(4 * n_steps);
 
     // 2 special vertices, top and bottom center, rest are relative to this
     vertices.emplace_back(Vec3d(0.0, 0.0, 0.0));
     vertices.emplace_back(Vec3d(0.0, 0.0, h));
 
-    // adjust via rounding to get an even multiple for any provided angle.
-    double angle = (2*PI / floor(2*PI / fa));
-
     // for each line along the polygon approximating the top/bottom of the
     // circle, generate four points and four facets (2 for the wall, 2 for the
     // top and bottom.
     // Special case: Last line shares 2 vertices with the first line.
-    unsigned id = vertices.size() - 1;
-    vertices.emplace_back(Vec3d(sin(0) * r , cos(0) * r, 0));
-    vertices.emplace_back(Vec3d(sin(0) * r , cos(0) * r, h));
-    for (double i = 0; i < 2*PI; i+=angle) {
-        Vec2d p = Eigen::Rotation2Dd(i) * Eigen::Vector2d(0, r);
+	Vec2d p = Eigen::Rotation2Dd(0.) * Eigen::Vector2d(0, r);
         vertices.emplace_back(Vec3d(p(0), p(1), 0.));
         vertices.emplace_back(Vec3d(p(0), p(1), h));
-        id = vertices.size() - 1;
+	for (size_t i = 1; i < n_steps; ++i) {
+        p = Eigen::Rotation2Dd(angle_step * i) * Eigen::Vector2d(0, r);
+        vertices.emplace_back(Vec3d(p(0), p(1), 0.));
+        vertices.emplace_back(Vec3d(p(0), p(1), h));
+        int id = (int)vertices.size() - 1;
         facets.emplace_back(Vec3i32( 0, id - 1, id - 3)); // top
         facets.emplace_back(Vec3i32(id,      1, id - 2)); // bottom
         facets.emplace_back(Vec3i32(id, id - 2, id - 3)); // upper-right of side
         facets.emplace_back(Vec3i32(id, id - 3, id - 1)); // bottom-left of side
     }
     // Connect the last set of vertices with the first.
-    facets.emplace_back(Vec3i32( 2, 0, id - 1));
-    facets.emplace_back(Vec3i32( 1, 3,     id));
-    facets.emplace_back(Vec3i32(id, 3,      2));
-    facets.emplace_back(Vec3i32(id, 2, id - 1));
+	size_t id = vertices.size() - 1;
+    facets.emplace_back(Vec3i32( 0, 2, id - 1));
+    facets.emplace_back(Vec3i32( 3, 1,     id));
+	facets.emplace_back(Vec3i32(id, 2,      3));
+    facets.emplace_back(Vec3i32(id, id - 1, 2));
     
-    TriangleMesh mesh(vertices, facets);
-    return mesh;
+	return TriangleMesh(std::move(vertices), std::move(facets));
 }
 
 // Generates mesh for a sphere centered about the origin, using the generated angle
 // to determine the granularity. 
 // Default angle is 1 degree.
-TriangleMesh make_sphere(double rho, double fa) {
+//FIXME better to discretize an Icosahedron recursively http://www.songho.ca/opengl/gl_sphere.html
+TriangleMesh make_sphere(double radius, double fa)
+{
+    int   sectorCount = ceil(2. * M_PI / fa);
+    int   stackCount  = ceil(M_PI / fa);
+    float sectorStep  = 2. * M_PI / sectorCount;
+    float stackStep   = M_PI / stackCount;
+
     Pointf3s vertices;
+    vertices.reserve((stackCount - 1) * sectorCount + 2);
+    for (int i = 0; i <= stackCount; ++ i) {
+        // from pi/2 to -pi/2
+        double stackAngle = 0.5 * M_PI - stackStep * i;
+        double xy = radius * cos(stackAngle);
+        double z  = radius * sin(stackAngle);
+        if (i == 0 || i == stackCount)
+            vertices.emplace_back(Vec3d(xy, 0., z));
+        else
+            for (int j = 0; j < sectorCount; ++ j) {
+                // from 0 to 2pi
+                double sectorAngle = sectorStep * j;
+                vertices.emplace_back(Vec3d(xy * cos(sectorAngle), xy * sin(sectorAngle), z));
+    }
+    }
+
     std::vector<Vec3i32> facets;
-
-    // Algorithm: 
-    // Add points one-by-one to the sphere grid and form facets using relative coordinates.
-    // Sphere is composed effectively of a mesh of stacked circles.
-
-    // adjust via rounding to get an even multiple for any provided angle.
-    double angle = (2*PI / floor(2*PI / fa));
-
-    // Ring to be scaled to generate the steps of the sphere
-    std::vector<double> ring;
-    for (double i = 0; i < 2*PI; i+=angle) {
-        ring.emplace_back(i);
-    }
-    const size_t steps = ring.size(); 
-    const double increment = (double)(1.0 / (double)steps);
-
-    // special case: first ring connects to 0,0,0
-    // insert and form facets.
-    vertices.emplace_back(Vec3d(0.0, 0.0, -rho));
-    size_t id = vertices.size();
-    for (size_t i = 0; i < ring.size(); i++) {
-        // Fixed scaling 
-        const double z = -rho + increment*rho*2.0;
-        // radius of the circle for this step.
-        const double r = sqrt(abs(rho*rho - z*z));
-        Vec2d b = Eigen::Rotation2Dd(ring[i]) * Eigen::Vector2d(0, r);
-        vertices.emplace_back(Vec3d(b(0), b(1), z));
-        facets.emplace_back((i == 0) ? Vec3i32(1, 0, ring.size()) : Vec3i32(id, 0, id - 1));
-        ++ id;
-    }
-
-    // General case: insert and form facets for each step, joining it to the ring below it.
-    for (size_t s = 2; s < steps - 1; s++) {
-        const double z = -rho + increment*(double)s*2.0*rho;
-        const double r = sqrt(abs(rho*rho - z*z));
-
-        for (size_t i = 0; i < ring.size(); i++) {
-            Vec2d b = Eigen::Rotation2Dd(ring[i]) * Eigen::Vector2d(0, r);
-            vertices.emplace_back(Vec3d(b(0), b(1), z));
-            if (i == 0) {
-                // wrap around
-                facets.emplace_back(Vec3i32(id + ring.size() - 1 , id, id - 1)); 
-                facets.emplace_back(Vec3i32(id, id - ring.size(),  id - 1)); 
-            } else {
-                facets.emplace_back(Vec3i32(id , id - ring.size(), (id - 1) - ring.size())); 
-                facets.emplace_back(Vec3i32(id, id - 1 - ring.size() ,  id - 1)); 
+    facets.reserve(2 * (stackCount - 1) * sectorCount);
+    for (int i = 0; i < stackCount; ++ i) {
+        // Beginning of current stack.
+        int k1 = (i == 0) ? 0 : (1 + (i - 1) * sectorCount);
+        int k1_first = k1;
+        // Beginning of next stack.
+        int k2 = (i == 0) ? 1 : (k1 + sectorCount);
+        int k2_first = k2;
+        for (int j = 0; j < sectorCount; ++ j) {
+            // 2 triangles per sector excluding first and last stacks
+            int k1_next = k1;
+            int k2_next = k2;
+            if (i != 0) {
+                k1_next = (j + 1 == sectorCount) ? k1_first : (k1 + 1);
+                facets.emplace_back(Vec3i32(k1, k2, k1_next));
             }
-            id++;
+            if (i + 1 != stackCount) {
+                k2_next = (j + 1 == sectorCount) ? k2_first : (k2 + 1);
+                facets.emplace_back(Vec3i32(k1_next, k2, k2_next));
         } 
+            k1 = k1_next;
+            k2 = k2_next;
     }
-
-
-    // special case: last ring connects to 0,0,rho*2.0
-    // only form facets.
-    vertices.emplace_back(Vec3d(0.0, 0.0, rho));
-    for (size_t i = 0; i < ring.size(); i++) {
-        if (i == 0) {
-            // third vertex is on the other side of the ring.
-            facets.emplace_back(Vec3i32(id, id - ring.size(),  id - 1));
-        } else {
-            facets.emplace_back(Vec3i32(id, id - ring.size() + i,  id - ring.size() + (i - 1)));
         }
+    return TriangleMesh(std::move(vertices), std::move(facets));
     }
-    id++;
-    TriangleMesh mesh(vertices, facets);
-    return mesh;
-}
 
 }
diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp
index 340513adb..625bbaf7d 100644
--- a/src/libslic3r/TriangleMesh.hpp
+++ b/src/libslic3r/TriangleMesh.hpp
@@ -25,9 +25,10 @@ public:
     TriangleMesh(const Pointf3s &points, const std::vector<Vec3i32> &facets);
     TriangleMesh(const TriangleMesh &other) : repaired(false) { stl_initialize(&this->stl); *this = other; }
     TriangleMesh(TriangleMesh &&other) : repaired(false) { stl_initialize(&this->stl); this->swap(other); }
-    ~TriangleMesh() { stl_close(&this->stl); }
+    ~TriangleMesh() { clear(); }
     TriangleMesh& operator=(const TriangleMesh &other);
     TriangleMesh& operator=(TriangleMesh &&other) { this->swap(other); return *this; }
+    void clear() { stl_close(&this->stl); this->repaired = false; }
     void swap(TriangleMesh &other) { std::swap(this->stl, other.stl); std::swap(this->repaired, other.repaired); }
     void ReadSTLFile(const char* input_file) { stl_open(&stl, input_file); }
     void write_ascii(const char* output_file) { stl_write_ascii(&this->stl, output_file, ""); }
@@ -40,6 +41,7 @@ public:
     void scale(float factor);
     void scale(const Vec3d &versor);
     void translate(float x, float y, float z);
+    void translate(const Vec3f &displacement);
     void rotate(float angle, const Axis &axis);
     void rotate(float angle, const Vec3d& axis);
     void rotate_x(float angle) { this->rotate(angle, X); }
@@ -49,7 +51,8 @@ public:
     void mirror_x() { this->mirror(X); }
     void mirror_y() { this->mirror(Y); }
     void mirror_z() { this->mirror(Z); }
-    void transform(const Transform3d& t);
+    void transform(const Transform3d& t, bool fix_left_handed = false);
+	void transform(const Matrix3d& t, bool fix_left_handed = false);
     void align_to_origin();
     void rotate(double angle, Point* center);
     TriangleMeshPtrs split() const;
@@ -65,15 +68,11 @@ public:
     TriangleMesh convex_hull_3d() const;
     void reset_repair_stats();
     bool needed_repair() const;
+    void require_shared_vertices();
+    bool   has_shared_vertices() const { return stl.v_shared != NULL; }
     size_t facets_count() const { return this->stl.stats.number_of_facets; }
     bool   empty() const { return this->facets_count() == 0; }
-
-    // Returns true, if there are two and more connected patches in the mesh.
-    // Returns false, if one or zero connected patch is in the mesh.
-    bool has_multiple_patches() const;
-
-    // Count disconnected triangle patches.
-    size_t number_of_patches() const;
+    bool is_splittable() const;
 
     stl_file stl;
     bool repaired;
@@ -82,8 +81,7 @@ public:
     Pointf3s vertices();
     
 private:
-    void require_shared_vertices();
-    friend class TriangleMeshSlicer;
+    std::deque<uint32_t> find_unvisited_neighbors(std::vector<unsigned char> &facet_visited) const;
 };
 
 enum FacetEdgeType { 
@@ -167,9 +165,8 @@ public:
 
     typedef std::function<void()> throw_on_cancel_callback_type;
     TriangleMeshSlicer(float closing_radius, float model_precision) : mesh(nullptr), closing_radius(closing_radius), model_precision(model_precision) {}
-    // Not quite nice, but the constructor and init() methods require non-const mesh pointer to be able to call mesh->require_shared_vertices()
-    TriangleMeshSlicer(TriangleMesh* mesh) { this->init(mesh, [](){}); }
-    void init(TriangleMesh *mesh, throw_on_cancel_callback_type throw_on_cancel);
+    TriangleMeshSlicer(const TriangleMesh* mesh) : mesh(mesh), closing_radius(0), model_precision(0) { this->init(mesh, []() {}); }
+    void init(const TriangleMesh *mesh, throw_on_cancel_callback_type throw_on_cancel);
     void slice(const std::vector<float> &z, std::vector<Polygons>* layers, throw_on_cancel_callback_type throw_on_cancel) const;
     void slice(const std::vector<float> &z, std::vector<ExPolygons>* layers, throw_on_cancel_callback_type throw_on_cancel) const;
     enum FacetSliceType {
@@ -180,6 +177,7 @@ public:
     FacetSliceType slice_facet(float slice_z, const stl_facet &facet, const int facet_idx,
         const float min_z, const float max_z, IntersectionLine *line_out) const;
     void cut(float z, TriangleMesh* upper, TriangleMesh* lower) const;
+    void set_up_direction(const Vec3f& up);
     
 private:
     const TriangleMesh      *mesh;
@@ -187,6 +185,10 @@ private:
     std::vector<int>         facets_edges;
     // Scaled copy of this->mesh->stl.v_shared
     std::vector<stl_vertex>  v_scaled_shared;
+    // Quaternion that will be used to rotate every facet before the slicing
+    Eigen::Quaternion<float, Eigen::DontAlign> m_quaternion;
+    // Whether or not the above quaterion should be used
+    bool                     m_use_quaternion = false;
 
     void _slice_do(size_t facet_idx, std::vector<IntersectionLines>* lines, boost::mutex* lines_mutex, const std::vector<float> &z) const;
     void make_loops(std::vector<IntersectionLine> &lines, Polygons* loops) const;
diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
index c13df4546..e76fccdb8 100644
--- a/src/libslic3r/Utils.hpp
+++ b/src/libslic3r/Utils.hpp
@@ -64,7 +64,7 @@ extern int rename_file(const std::string &from, const std::string &to);
 extern int copy_file(const std::string &from, const std::string &to);
 
 // Ignore system and hidden files, which may be created by the DropBox synchronisation process.
-// https://github.com/prusa3d/Slic3r/issues/1298
+// https://github.com/prusa3d/PrusaSlicer/issues/1298
 extern bool is_plain_file(const boost::filesystem::directory_entry &path);
 extern bool is_ini_file(const boost::filesystem::directory_entry &path);
 extern bool is_idx_file(const boost::filesystem::directory_entry &path);
@@ -88,7 +88,7 @@ std::string string_printf(const char *format, ...);
 extern std::string timestamp_str();
 // Standard "generated by Slic3r version xxx timestamp xxx" header string, 
 // to be placed at the top of Slic3r generated files.
-inline std::string header_slic3r_generated() { return std::string("generated by " SLIC3R_FORK_NAME " " SLIC3R_VERSION " " ) + timestamp_str(); }
+inline std::string header_slic3r_generated() { return std::string("generated by " SLIC3R_APP_NAME " " SLIC3R_VERSION " " ) + timestamp_str(); }
 
 // getpid platform wrapper
 extern unsigned get_current_pid();
@@ -208,7 +208,7 @@ public:
 
 // Shorten the dhms time by removing the seconds, rounding the dhm to full minutes
 // and removing spaces.
-static std::string short_time(const std::string &time)
+inline std::string short_time(const std::string &time)
 {
     // Parse the dhms time format.
     int days = 0;
@@ -247,7 +247,7 @@ static std::string short_time(const std::string &time)
 }
 
 // Returns the given time is seconds in format DDd HHh MMm SSs
-static std::string get_time_dhms(float time_in_secs)
+inline std::string get_time_dhms(float time_in_secs)
 {
     int days = (int)(time_in_secs / 86400.0f);
     time_in_secs -= (float)days * 86400.0f;
diff --git a/src/libslic3r/Zipper.cpp b/src/libslic3r/Zipper.cpp
new file mode 100644
index 000000000..4466f1b04
--- /dev/null
+++ b/src/libslic3r/Zipper.cpp
@@ -0,0 +1,223 @@
+#include <exception>
+#include <sstream>
+#include <iostream>
+
+#include "Zipper.hpp"
+#include "miniz/miniz_zip.h"
+#include <boost/log/trivial.hpp>
+
+#include "I18N.hpp"
+
+//! macro used to mark string used at localization,
+//! return same string
+#define L(s) Slic3r::I18N::translate(s)
+
+#if defined(_MSC_VER) &&  _MSC_VER <= 1800 || __cplusplus < 201103L
+    #define SLIC3R_NORETURN
+#elif __cplusplus >= 201103L
+    #define SLIC3R_NORETURN [[noreturn]]
+#endif
+
+namespace Slic3r {
+
+class Zipper::Impl {
+public:
+    mz_zip_archive arch;
+    std::string m_zipname;
+
+    static std::string get_errorstr(mz_zip_error mz_err)
+    {
+        switch (mz_err)
+        {
+            case MZ_ZIP_NO_ERROR:
+                return "no error";
+            case MZ_ZIP_UNDEFINED_ERROR:
+                return L("undefined error");
+            case MZ_ZIP_TOO_MANY_FILES:
+                return L("too many files");
+            case MZ_ZIP_FILE_TOO_LARGE:
+                return L("file too large");
+            case MZ_ZIP_UNSUPPORTED_METHOD:
+                return L("unsupported method");
+            case MZ_ZIP_UNSUPPORTED_ENCRYPTION:
+                return L("unsupported encryption");
+            case MZ_ZIP_UNSUPPORTED_FEATURE:
+                return L("unsupported feature");
+            case MZ_ZIP_FAILED_FINDING_CENTRAL_DIR:
+                return L("failed finding central directory");
+            case MZ_ZIP_NOT_AN_ARCHIVE:
+                return L("not a ZIP archive");
+            case MZ_ZIP_INVALID_HEADER_OR_CORRUPTED:
+                return L("invalid header or archive is corrupted");
+            case MZ_ZIP_UNSUPPORTED_MULTIDISK:
+                return L("unsupported multidisk archive");
+            case MZ_ZIP_DECOMPRESSION_FAILED:
+                return L("decompression failed or archive is corrupted");
+            case MZ_ZIP_COMPRESSION_FAILED:
+                return L("compression failed");
+            case MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE:
+                return L("unexpected decompressed size");
+            case MZ_ZIP_CRC_CHECK_FAILED:
+                return L("CRC-32 check failed");
+            case MZ_ZIP_UNSUPPORTED_CDIR_SIZE:
+                return L("unsupported central directory size");
+            case MZ_ZIP_ALLOC_FAILED:
+                return L("allocation failed");
+            case MZ_ZIP_FILE_OPEN_FAILED:
+                return L("file open failed");
+            case MZ_ZIP_FILE_CREATE_FAILED:
+                return L("file create failed");
+            case MZ_ZIP_FILE_WRITE_FAILED:
+                return L("file write failed");
+            case MZ_ZIP_FILE_READ_FAILED:
+                return L("file read failed");
+            case MZ_ZIP_FILE_CLOSE_FAILED:
+                return L("file close failed");
+            case MZ_ZIP_FILE_SEEK_FAILED:
+                return L("file seek failed");
+            case MZ_ZIP_FILE_STAT_FAILED:
+                return L("file stat failed");
+            case MZ_ZIP_INVALID_PARAMETER:
+                return L("invalid parameter");
+            case MZ_ZIP_INVALID_FILENAME:
+                return L("invalid filename");
+            case MZ_ZIP_BUF_TOO_SMALL:
+                return L("buffer too small");
+            case MZ_ZIP_INTERNAL_ERROR:
+                return L("internal error");
+            case MZ_ZIP_FILE_NOT_FOUND:
+                return L("file not found");
+            case MZ_ZIP_ARCHIVE_TOO_LARGE:
+                return L("archive is too large");
+            case MZ_ZIP_VALIDATION_FAILED:
+                return L("validation failed");
+            case MZ_ZIP_WRITE_CALLBACK_FAILED:
+                return L("write calledback failed");
+            default:
+                break;
+        }
+
+        return "unknown error";
+    }
+
+    std::string formatted_errorstr() const
+    {
+        return L("Error with zip archive") + " " + m_zipname + ": " +
+               get_errorstr(arch.m_last_error) + "!";
+    }
+
+    SLIC3R_NORETURN void blow_up() const
+    {
+        throw std::runtime_error(formatted_errorstr());
+    }
+
+    bool is_alive()
+    {
+        return arch.m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED;
+    }
+};
+
+Zipper::Zipper(const std::string &zipfname, e_compression compression)
+{
+    m_impl.reset(new Impl());
+
+    m_compression = compression;
+    m_impl->m_zipname = zipfname;
+
+    memset(&m_impl->arch, 0, sizeof(m_impl->arch));
+
+    // Initialize the archive data
+    if(!mz_zip_writer_init_file(&m_impl->arch, zipfname.c_str(), 0))
+        m_impl->blow_up();
+}
+
+Zipper::~Zipper()
+{
+    if(m_impl->is_alive()) {
+        // Flush the current entry if not finished yet.
+        try { finish_entry(); } catch(...) {
+            BOOST_LOG_TRIVIAL(error) << m_impl->formatted_errorstr();
+        }
+
+        if(!mz_zip_writer_finalize_archive(&m_impl->arch))
+            BOOST_LOG_TRIVIAL(error) << m_impl->formatted_errorstr();
+    }
+
+    // The file should be closed no matter what...
+    if(!mz_zip_writer_end(&m_impl->arch))
+        BOOST_LOG_TRIVIAL(error) << m_impl->formatted_errorstr();
+}
+
+Zipper::Zipper(Zipper &&m):
+    m_impl(std::move(m.m_impl)),
+    m_data(std::move(m.m_data)),
+    m_entry(std::move(m.m_entry)),
+    m_compression(m.m_compression) {}
+
+Zipper &Zipper::operator=(Zipper &&m) {
+    m_impl = std::move(m.m_impl);
+    m_data = std::move(m.m_data);
+    m_entry = std::move(m.m_entry);
+    m_compression = m.m_compression;
+    return *this;
+}
+
+void Zipper::add_entry(const std::string &name)
+{
+    if(!m_impl->is_alive()) return;
+
+    finish_entry(); // finish previous business
+    m_entry = name;
+}
+
+void Zipper::add_entry(const std::string &name, const uint8_t *data, size_t l)
+{
+    if(!m_impl->is_alive()) return;
+
+    finish_entry();
+    mz_uint cmpr = MZ_NO_COMPRESSION;
+    switch (m_compression) {
+    case NO_COMPRESSION: cmpr = MZ_NO_COMPRESSION; break;
+    case FAST_COMPRESSION: cmpr = MZ_BEST_SPEED; break;
+    case TIGHT_COMPRESSION: cmpr = MZ_BEST_COMPRESSION; break;
+    }
+
+    if(!mz_zip_writer_add_mem(&m_impl->arch, name.c_str(), data, l, cmpr))
+        m_impl->blow_up();
+
+    m_entry.clear();
+    m_data.clear();
+}
+
+void Zipper::finish_entry()
+{
+    if(!m_impl->is_alive()) return;
+
+    if(!m_data.empty() && !m_entry.empty()) {
+        mz_uint compression = MZ_NO_COMPRESSION;
+
+        switch (m_compression) {
+        case NO_COMPRESSION: compression = MZ_NO_COMPRESSION; break;
+        case FAST_COMPRESSION: compression = MZ_BEST_SPEED; break;
+        case TIGHT_COMPRESSION: compression = MZ_BEST_COMPRESSION; break;
+        }
+
+        if(!mz_zip_writer_add_mem(&m_impl->arch, m_entry.c_str(),
+                                  m_data.c_str(),
+                                  m_data.size(),
+                                  compression)) m_impl->blow_up();
+    }
+
+    m_data.clear();
+    m_entry.clear();
+}
+
+void Zipper::finalize()
+{
+    finish_entry();
+
+    if(m_impl->is_alive()) if(!mz_zip_writer_finalize_archive(&m_impl->arch))
+        m_impl->blow_up();
+}
+
+}
diff --git a/src/libslic3r/Zipper.hpp b/src/libslic3r/Zipper.hpp
new file mode 100644
index 000000000..7d95ffdac
--- /dev/null
+++ b/src/libslic3r/Zipper.hpp
@@ -0,0 +1,90 @@
+#ifndef ZIPPER_HPP
+#define ZIPPER_HPP
+
+#include <string>
+#include <memory>
+
+namespace Slic3r {
+
+// Class for creating zip archives.
+class Zipper {
+public:
+    // Three compression levels supported
+    enum e_compression {
+        NO_COMPRESSION,
+        FAST_COMPRESSION,
+        TIGHT_COMPRESSION
+    };
+
+private:
+    class Impl;
+    std::unique_ptr<Impl> m_impl;
+    std::string m_data;
+    std::string m_entry;
+    e_compression m_compression;
+
+public:
+
+    // Will blow up in a runtime exception if the file cannot be created.
+    explicit Zipper(const std::string& zipfname,
+                    e_compression level = NO_COMPRESSION);
+    ~Zipper();
+
+    // No copies allwed, this is a file resource...
+    Zipper(const Zipper&) = delete;
+    Zipper& operator=(const Zipper&) = delete;
+
+    // Moving is fine.
+    // Zipper(Zipper&&) = default;
+    // Zipper& operator=(Zipper&&) = default;
+    // All becouse of VS2013:
+    Zipper(Zipper &&m);
+    Zipper& operator=(Zipper &&m);
+
+    /// Adding an entry means a file inside the new archive. Name param is the
+    /// name of the new file. To create directories, append a forward slash.
+    /// The previous entry is finished (see finish_entry)
+    void add_entry(const std::string& name);
+
+    /// Add a new binary file entry with an instantly given byte buffer.
+    /// This method throws exactly like finish_entry() does.
+    void add_entry(const std::string& name, const std::uint8_t* data, size_t l);
+
+    // Writing data to the archive works like with standard streams. The target
+    // within the zip file is the entry created with the add_entry method.
+
+    // Template taking only arithmetic values, that std::to_string can handle.
+    template<class T> inline
+    typename std::enable_if<std::is_arithmetic<T>::value, Zipper&>::type
+    operator<<(T &&val) {
+        return this->operator<<(std::to_string(std::forward<T>(val)));
+    }
+
+    // Template applied only for types that std::string can handle for append
+    // and copy. This includes c style strings...
+    template<class T> inline
+    typename std::enable_if<!std::is_arithmetic<T>::value, Zipper&>::type
+    operator<<(T &&val) {
+        if(m_data.empty()) m_data = std::forward<T>(val);
+        else m_data.append(val);
+        return *this;
+    }
+
+    /// Finishing an entry means that subsequent writes will no longer be
+    /// appended to the previous entry. They will be written into the internal
+    /// buffer and ones an entry is added, the buffer will bind to the new entry
+    /// If the buffer was written, but no entry was added, the buffer will be
+    /// cleared after this call.
+    ///
+    /// This method will throw a runtime exception if an error occures. The
+    /// entry will still be open (with the data intact) but the state of the
+    /// file is up to minz after the erroneous write.
+    void finish_entry();
+
+    void finalize();
+};
+
+
+}
+
+#endif // ZIPPER_HPP
diff --git a/src/libslic3r/clonable_ptr.hpp b/src/libslic3r/clonable_ptr.hpp
new file mode 100644
index 000000000..a3b7ee244
--- /dev/null
+++ b/src/libslic3r/clonable_ptr.hpp
@@ -0,0 +1,168 @@
+// clonable_ptr: a smart pointer with a usage similar to unique_ptr, with the exception, that
+// the copy constructor / copy assignment operator work by calling the ->clone() method.
+
+// derived from https://github.com/SRombauts/shared_ptr/blob/master/include/unique_ptr.hpp
+/**
+ * @file  clonable_ptr.hpp
+ * @brief clonable_ptr is a fake implementation to use in place of a C++11 std::clonable_ptr when compiling on an older compiler.
+ *
+ * @see http://www.cplusplus.com/reference/memory/clonable_ptr/
+ *
+ * Copyright (c) 2014-2019 Sebastien Rombauts (sebastien.rombauts@gmail.com)
+ *
+ * Distributed under the MIT License (MIT) (See accompanying file LICENSE.txt
+ * or copy at http://opensource.org/licenses/MIT)
+ */
+
+#include "assert.h"
+
+namespace Slic3r {
+
+// Detect whether the compiler supports C++11 noexcept exception specifications.
+#if defined(_MSC_VER) && _MSC_VER < 1900 && ! defined(noexcept)
+    #define noexcept throw()
+#endif
+
+template<class T>
+class clonable_ptr
+{
+public:
+    /// The type of the managed object, aliased as member type
+    typedef T element_type;
+
+    /// @brief Default constructor
+    clonable_ptr() noexcept :
+        px(nullptr)
+    {
+    }
+    /// @brief Constructor with the provided pointer to manage
+    explicit clonable_ptr(T* p) noexcept :
+        px(p)
+    {
+    }
+    /// @brief Copy constructor, clones by calling the rhs.clone() method
+    clonable_ptr(const clonable_ptr& rhs) :
+		px(rhs ? rhs.px->clone() : nullptr)
+    {
+    }
+    /// @brief Move constructor, never throws
+    clonable_ptr(clonable_ptr&& rhs) noexcept :
+        px(rhs.px)
+    {
+        rhs.px = nullptr;
+    }
+    /// @brief Assignment operator
+    clonable_ptr& operator=(const clonable_ptr& rhs)
+    {
+		delete px;
+		px = rhs ? rhs.px->clone() : nullptr;
+        return *this;
+    }
+    /// @brief Move operator, never throws
+    clonable_ptr& operator=(clonable_ptr&& rhs)
+    {
+		delete px;
+        px = rhs.px;
+        rhs.px = nullptr;
+        return *this;
+    }
+    /// @brief the destructor releases its ownership and destroy the object
+    inline ~clonable_ptr() noexcept
+    {
+        destroy();
+    }
+    /// @brief this reset releases its ownership and destroy the object
+    inline void reset() noexcept
+    {
+        destroy();
+    }
+    /// @brief this reset release its ownership and re-acquire another one
+    void reset(T* p) noexcept
+    {
+        assert((nullptr == p) || (px != p)); // auto-reset not allowed
+        destroy();
+        px = p;
+    }
+
+    /// @brief Swap method for the copy-and-swap idiom (copy constructor and swap method)
+    void swap(clonable_ptr& rhs) noexcept
+    {
+        T *tmp = px;
+        px = rhs.px;
+        rhs.px = tmp;
+    }
+
+    /// @brief release the ownership of the px pointer without destroying the object!
+    inline void release() noexcept
+    {
+        px = nullptr;
+    }
+
+    // reference counter operations :
+    inline operator bool() const noexcept
+    {
+        return (nullptr != px); // TODO nullptrptr
+    }
+
+    // underlying pointer operations :
+    inline T& operator*()  const noexcept
+    {
+        assert(nullptr != px);
+        return *px;
+    }
+    inline T* operator->() const noexcept
+    {
+        assert(nullptr != px);
+        return px;
+    }
+    inline T* get()  const noexcept
+    {
+        // no assert, can return nullptr
+        return px;
+    }
+
+private:
+    /// @brief release the ownership of the px pointer and destroy the object
+    inline void destroy() noexcept
+    {
+        delete px;
+        px = nullptr;
+    }
+
+    /// @brief hack: const-cast release the ownership of the px pointer without destroying the object!
+    inline void release() const noexcept
+    {
+        px = nullptr;
+    }
+
+private:
+    T* px; //!< Native pointer
+};
+
+// comparison operators
+template<class T, class U> inline bool operator==(const clonable_ptr<T>& l, const clonable_ptr<U>& r) noexcept
+{
+    return (l.get() == r.get());
+}
+template<class T, class U> inline bool operator!=(const clonable_ptr<T>& l, const clonable_ptr<U>& r) noexcept
+{
+    return (l.get() != r.get());
+}
+template<class T, class U> inline bool operator<=(const clonable_ptr<T>& l, const clonable_ptr<U>& r) noexcept
+{
+    return (l.get() <= r.get());
+}
+template<class T, class U> inline bool operator<(const clonable_ptr<T>& l, const clonable_ptr<U>& r) noexcept
+{
+    return (l.get() < r.get());
+}
+template<class T, class U> inline bool operator>=(const clonable_ptr<T>& l, const clonable_ptr<U>& r) noexcept
+{
+    return (l.get() >= r.get());
+}
+template<class T, class U> inline bool operator>(const clonable_ptr<T>& l, const clonable_ptr<U>& r) noexcept
+{
+    return (l.get() > r.get());
+}
+
+} // namespace Slic3r
diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in
index 2259b2302..26a67362b 100644
--- a/src/libslic3r/libslic3r_version.h.in
+++ b/src/libslic3r/libslic3r_version.h.in
@@ -1,8 +1,9 @@
 #ifndef __SLIC3R_VERSION_H
 #define __SLIC3R_VERSION_H
 
-#define SLIC3R_FORK_NAME "@SLIC3R_FORK_NAME@"
+#define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@"
+#define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@"
 #define SLIC3R_VERSION "@SLIC3R_VERSION@"
-#define SLIC3R_BUILD "@SLIC3R_BUILD@"
+#define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@"
 
 #endif /* __SLIC3R_VERSION_H */
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
index 4fc032471..3482f708a 100644
--- a/src/libslic3r/utils.cpp
+++ b/src/libslic3r/utils.cpp
@@ -247,7 +247,7 @@ int copy_file(const std::string &from, const std::string &to)
 }
 
 // Ignore system and hidden files, which may be created by the DropBox synchronisation process.
-// https://github.com/prusa3d/Slic3r/issues/1298
+// https://github.com/prusa3d/PrusaSlicer/issues/1298
 bool is_plain_file(const boost::filesystem::directory_entry &dir_entry)
 {
     if (! boost::filesystem::is_regular_file(dir_entry.status()))
diff --git a/src/nanosvg/nanosvg.h b/src/nanosvg/nanosvg.h
index 8c8b061cd..b9063213e 100644
--- a/src/nanosvg/nanosvg.h
+++ b/src/nanosvg/nanosvg.h
@@ -2897,6 +2897,8 @@ NSVGimage* nsvgParse(char* input, const char* units, float dpi)
 	return ret;
 }
 
+#include <boost/nowide/cstdio.hpp>
+
 NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
 {
 	FILE* fp = NULL;
@@ -2904,8 +2906,8 @@ NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
 	char* data = NULL;
 	NSVGimage* image = NULL;
 
-	fp = fopen(filename, "rb");
-	if (!fp) goto error;
+    fp = boost::nowide::fopen(filename, "rb");
+    if (!fp) goto error;
 	fseek(fp, 0, SEEK_END);
 	size = ftell(fp);
 	fseek(fp, 0, SEEK_SET);
diff --git a/src/platform/msw/slic3r.manifest.in b/src/platform/msw/PrusaSlicer.manifest.in
similarity index 100%
rename from src/platform/msw/slic3r.manifest.in
rename to src/platform/msw/PrusaSlicer.manifest.in
diff --git a/src/platform/msw/slic3r.rc.in b/src/platform/msw/PrusaSlicer.rc.in
similarity index 55%
rename from src/platform/msw/slic3r.rc.in
rename to src/platform/msw/PrusaSlicer.rc.in
index 159236878..731ceaa4e 100644
--- a/src/platform/msw/slic3r.rc.in
+++ b/src/platform/msw/PrusaSlicer.rc.in
@@ -7,12 +7,12 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@
   BLOCK "040904E4"
   {
    VALUE "CompanyName", "supermerill"
-   VALUE "FileDescription", "Slic3r++"
+   VALUE "FileDescription", "@SLIC3R_APP_NAME@"
    VALUE "FileVersion", "@SLIC3R_BUILD_ID@"
-   VALUE "ProductName", "Slic3r++"
+   VALUE "ProductName", "@SLIC3R_APP_NAME@"
    VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
-   VALUE "InternalName", "Slic3r++"
-   VALUE "LegalCopyright", "Copyright \251 2011-2017 Alessandro Ranelucci, \251 2016 Prusa Research, \251 2018 SuperMerill"
+   VALUE "InternalName", "@SLIC3R_APP_NAME@"
+   VALUE "LegalCopyright", "Copyright \251 2011-2019 Alessandro Ranelucci, \251 2016-2019 Prusa Research, \251 2018-2019 Supermerill"
    VALUE "OriginalFilename", "slic3r.exe"
   }
  }
@@ -21,5 +21,5 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@
    VALUE "Translation", 0x409, 1252
  }
 }
-2 ICON "@SLIC3R_RESOURCES_DIR@/icons/Slic3r.ico"
+2 ICON "@SLIC3R_RESOURCES_DIR@/icons/slic3r.ico"
 1 24 "slic3r.manifest" 
diff --git a/src/platform/osx/Info.plist.in b/src/platform/osx/Info.plist.in
index 35958acde..f4e298180 100644
--- a/src/platform/osx/Info.plist.in
+++ b/src/platform/osx/Info.plist.in
@@ -3,15 +3,15 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleExecutable</key>
-  <string>Slic3r</string>
+  <string>@SLIC3R_APP_KEY@</string>
   <key>CFBundleGetInfoString</key>
-  <string>Slic3r Copyright (C) 2011-2017 Alessandro Ranellucci, (C) 2016-2018 Prusa Reseach</string>
+  <string>@SLIC3R_APP_NAME@ Copyright (C) 2011-2019 Alessandro Ranellucci, (C) 2016-2019 Prusa Reseach</string>
   <key>CFBundleIconFile</key>
-  <string>Slic3r.icns</string>
+  <string>PrusaSlicer.icns</string>
   <key>CFBundleName</key>
-  <string>Slic3r</string>
+  <string>@SLIC3R_APP_KEY@</string>
   <key>CFBundleShortVersionString</key>
-  <string>Slic3r @SLIC3R_BUILD_ID@</string>
+  <string>@SLIC3R_APP_NAME@ @SLIC3R_BUILD_ID@</string>
   <key>CFBundleIdentifier</key>
   <string>com.prusa3d.slic3r/</string>
   <key>CFBundleInfoDictionaryVersion</key>
@@ -48,7 +48,7 @@
           <string>OBJ</string>
         </array>
         <key>CFBundleTypeIconFile</key>
-        <string>Slic3r.icns</string>
+        <string>PrusaSlicer.icns</string>
         <key>CFBundleTypeName</key>
         <string>STL</string>
         <key>CFBundleTypeRole</key>
@@ -65,7 +65,7 @@
           <string>AMF</string>
         </array>
         <key>CFBundleTypeIconFile</key>
-        <string>Slic3r.icns</string>
+        <string>PrusaSlicer.icns</string>
         <key>CFBundleTypeName</key>
         <string>AMF</string>
         <key>CFBundleTypeRole</key>
@@ -82,7 +82,7 @@
           <string>3MF</string>
         </array>
         <key>CFBundleTypeIconFile</key>
-        <string>Slic3r.icns</string>
+        <string>PrusaSlicer.icns</string>
         <key>CFBundleTypeName</key>
         <string>3MF</string>
         <key>CFBundleTypeRole</key>
diff --git a/src/png/AUTHORS b/src/png/AUTHORS
deleted file mode 100644
index 25aad54dc..000000000
--- a/src/png/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-png++ is written by Alexander Shulgin  (alex dot shulgin at gmail dot com)
-Copyright (C) 2007,2008
-
-When writing to me be sure to put png++: in the subject :-)
diff --git a/src/png/COPYING b/src/png/COPYING
deleted file mode 100644
index 04889ba11..000000000
--- a/src/png/COPYING
+++ /dev/null
@@ -1,25 +0,0 @@
-Copying png++ is subject to the following license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-   3. The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/png/NEWS b/src/png/NEWS
deleted file mode 100644
index cc006fbf5..000000000
--- a/src/png/NEWS
+++ /dev/null
@@ -1,60 +0,0 @@
-Version 0.2.7:
-
-  - Added solid_pixel_buffer (patch by Andrey Potapov).
-
-  - Fixed some compilation problems on Win32.
-
-Version 0.2.5:
-
-  - Fixed compatibility with newer libpng versions (>= 1.4)
-
-  - Fixed compilation on FreeBSD.
-
-  - Fixed tRNS handling with transformations.
-
-  - Added IO transformation debugging facility.
-
-  - Better organized test suite.
-
-Version 0.2.3:
-
-  - Fixed numerous `already defined' errors due to require_color_space
-    implementation.
-
-  - Added `config.hpp'.
-
-  - Fixed `strerror' usage.
-
-  - Minor docs fixes.
-
-
-Version 0.2.1:
-
-  - Added support for tRNS chunk.
-
-  - Added non-std IO streams support.
-
-  - Fixed 16-bit endianness problems.
-
-  - Improved test script.
-
-
-Version 0.2.0:
-
-  - Added support for 16-bit data (RGB, RGBA, Grayscale and Gray+Alpha
-    color types)
-
-  - Added support for packed 1-, 2- or 4-bit pixels (Grayscale and
-    Indexed colors)
-
-  - Fixed interlace handling code which was severely broken
-
-  - Added possibility to process images without reading the entire
-    image into memory
-
-  - Internals are refactored while the client interface is mostly
-    unchanged
-
-  - Added intensive test suite
-
-  - Added documentation
diff --git a/src/png/color.hpp b/src/png/color.hpp
deleted file mode 100644
index b5ffde2c4..000000000
--- a/src/png/color.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_COLOR_HPP_INCLUDED
-#define PNGPP_COLOR_HPP_INCLUDED
-
-#include "types.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief PNG color struct extension.  Adds constructors. 
-     */
-    struct color
-        : png_color
-    {
-        explicit color(byte r = 0, byte g = 0, byte b = 0)
-        {
-            this->red = r;
-            this->green = g;
-            this->blue = b;
-        }
-
-        /**
-         * \brief Initializes color with a copy of png_color object.
-         */
-        color(png_color const& other)
-        {
-            this->red = other.red;
-            this->green = other.green;
-            this->blue = other.blue;
-        }
-    };
-
-} // namespace png
-
-#endif // PNGPP_COLOR_HPP_INCLUDED
diff --git a/src/png/end_info.hpp b/src/png/end_info.hpp
deleted file mode 100644
index 09590596d..000000000
--- a/src/png/end_info.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_END_INFO_HPP_INCLUDED
-#define PNGPP_END_INFO_HPP_INCLUDED
-
-#include "info_base.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief Internal class to hold PNG ending %info.
-     *
-     * \see info, info_base
-     */
-    class end_info
-        : public info_base
-    {
-    public:
-        end_info(io_base& io, png_struct* png)
-            : info_base(io, png)
-        {
-        }
-
-        void destroy()
-        {
-            assert(m_info);
-            png_destroy_info_struct(m_png, & m_info);
-        }
-
-        void read()
-        {
-            png_read_end(m_png, m_info);
-        }
-        
-        void write() const
-        {
-            png_write_end(m_png, m_info);
-        }
-
-        // TODO: add methods to read/write text comments etc.
-    };
-
-} // namespace png
-
-#endif // PNGPP_END_INFO_HPP_INCLUDED
diff --git a/src/png/error.hpp b/src/png/error.hpp
deleted file mode 100644
index c67f97630..000000000
--- a/src/png/error.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_ERROR_HPP_INCLUDED
-#define PNGPP_ERROR_HPP_INCLUDED
-
-/* check if we have strerror_s or strerror_r, prefer the former which is C11 std */
-#ifdef __STDC_LIB_EXT1__
-#define __STDC_WANT_LIB_EXT1__ 1
-#include <string.h>
-
-#define HAVE_STRERROR_S 1
-#else
-#undef  HAVE_STRERROR_S
-#endif
-
-#include <string>
-#include <stdexcept>
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
-
-namespace png
-{
-
-    /**
-     * \brief Exception class to represent runtime errors related to
-     * png++ operation.
-     */
-    class error
-        : public std::runtime_error
-    {
-    public:
-        /**
-         * \param  message  error description
-         */
-        explicit error(std::string const& message)
-            : std::runtime_error(message)
-        {
-        }
-    };
-
-    /**
-     * \brief Exception class to represent standard library errors
-     * (generally IO).
-     *
-     * \see  reader, writer
-     */
-    class std_error
-        : public std::runtime_error
-    {
-    public:
-        /**
-         * Constructs an std_error object.  The \a message string is
-         * appended with <tt>": "</tt> and the error description as
-         * returned by \c strerror(\a error).
-         *
-         * \param  message  error description
-         * \param  error    error number
-         */
-        explicit std_error(std::string const& message, int errnum = errno)
-            : std::runtime_error((message + ": ") + thread_safe_strerror(errnum))
-        {
-        }
-
-    protected:
-        static std::string thread_safe_strerror(int errnum)
-        {
-#define ERRBUF_SIZE 512
-
-#ifdef HAVE_STRERROR_S
-            char buf[ERRBUF_SIZE] = { 0 };
-            strerror_s(buf, ERRBUF_SIZE, errnum);
-            return std::string(buf);
-#else
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE
-            char buf[ERRBUF_SIZE] = { 0 };
-            strerror_r(errnum, buf, ERRBUF_SIZE);
-            return std::string(buf);
-#elif _GNU_SOURCE
-            /* GNU variant can return a pointer to static buffer instead of buf */
-            char buf[ERRBUF_SIZE] = { 0 };
-            return std::string(strerror_r(errnum, buf, ERRBUF_SIZE));
-#else
-            return std::string("An error occured with errnum ") +
-                    std::to_string(errnum) +
-                    ". Converting to the appropriate error message is disabled"
-                    "in this instance of the png++ library.";
-#endif
-#endif
-
-#undef ERRBUF_SIZE
-        }
-    };
-
-} // namespace png
-
-#endif // PNGPP_ERROR_HPP_INCLUDED
diff --git a/src/png/image_info.hpp b/src/png/image_info.hpp
deleted file mode 100644
index 8407bc18b..000000000
--- a/src/png/image_info.hpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_IMAGE_INFO_HPP_INCLUDED
-#define PNGPP_IMAGE_INFO_HPP_INCLUDED
-
-#include "types.hpp"
-#include "palette.hpp"
-#include "tRNS.hpp"
-#include "pixel_traits.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief Holds information about PNG image.
-     *
-     * \see image, generator, consumer
-     */
-    class image_info
-    {
-    public:
-        /**
-         * \brief Constructs the image_info object with default values
-         * for color_type, interlace_type, compression_method and
-         * filter_type.
-         */
-        image_info()
-            : m_width(0),
-              m_height(0),
-              m_bit_depth(0),
-              m_color_type(color_type_none),
-              m_interlace_type(interlace_none),
-              m_compression_type(compression_type_default),
-              m_filter_type(filter_type_default),
-              m_gamma(0.0)
-        {
-        }
-
-        uint_32 get_width() const
-        {
-            return m_width;
-        }
-
-        void set_width(uint_32 width)
-        {
-            m_width = width;
-        }
-
-        uint_32 get_height() const
-        {
-            return m_height;
-        }
-
-        void set_height(uint_32 height)
-        {
-            m_height = height;
-        }
-
-        color_type get_color_type() const
-        {
-            return m_color_type;
-        }
-
-        void set_color_type(color_type color_space)
-        {
-            m_color_type = color_space;
-        }
-
-        int get_bit_depth() const
-        {
-            return m_bit_depth;
-        }
-
-        void set_bit_depth(int bit_depth)
-        {
-            m_bit_depth = bit_depth;
-        }
-
-        interlace_type get_interlace_type() const
-        {
-            return m_interlace_type;
-        }
-
-        void set_interlace_type(interlace_type interlace)
-        {
-            m_interlace_type = interlace;
-        }
-
-        compression_type get_compression_type() const
-        {
-            return m_compression_type;
-        }
-
-        void set_compression_type(compression_type compression)
-        {
-            m_compression_type = compression;
-        }
-
-        filter_type get_filter_type() const
-        {
-            return m_filter_type;
-        }
-
-        void set_filter_type(filter_type filter)
-        {
-            m_filter_type = filter;
-        }
-
-        palette const& get_palette() const
-        {
-            return m_palette;
-        }
-
-        palette& get_palette()
-        {
-            return m_palette;
-        }
-
-        void set_palette(palette const& plte)
-        {
-            m_palette = plte;
-        }
-
-        /**
-         * \brief Removes all entries from the palette.
-         */
-        void drop_palette()
-        {
-            m_palette.clear();
-        }
-
-        tRNS const& get_tRNS() const
-        {
-            return m_tRNS;
-        }
-
-        tRNS& get_tRNS()
-        {
-            return m_tRNS;
-        }
-
-        void set_tRNS(tRNS const& trns)
-        {
-            m_tRNS = trns;
-        }
-
-        double get_gamma() const
-        {
-            return m_gamma;
-        }
-
-        void set_gamma(double gamma)
-        {
-            m_gamma = gamma;
-        }
-
-    protected:
-        uint_32 m_width;
-        uint_32 m_height;
-        int m_bit_depth;
-        color_type m_color_type;
-        interlace_type m_interlace_type;
-        compression_type m_compression_type;
-        filter_type m_filter_type;
-        palette m_palette;
-        tRNS m_tRNS;
-        double m_gamma;
-    };
-
-    /**
-     * \brief Returns an image_info object with color_type and
-     * bit_depth fields setup appropriate for the \c pixel type.
-     */
-    template< typename pixel >
-    image_info
-    make_image_info()
-    {
-        typedef pixel_traits< pixel > traits;
-        image_info info;
-        info.set_color_type(traits::get_color_type());
-        info.set_bit_depth(traits::get_bit_depth());
-        return info;
-    }
-
-} // namespace png
-
-#endif // PNGPP_IMAGE_INFO_HPP_INCLUDED
diff --git a/src/png/info.hpp b/src/png/info.hpp
deleted file mode 100644
index 3f3cf09c3..000000000
--- a/src/png/info.hpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_INFO_HPP_INCLUDED
-#define PNGPP_INFO_HPP_INCLUDED
-
-#include <cassert>
-#include "info_base.hpp"
-#include "image_info.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief Holds information about PNG image.  Adapter class for IO
-     * image operations.
-     */
-    class info
-        : public info_base,
-          public image_info
-    {
-    public:
-        info(io_base& io, png_struct* png)
-            : info_base(io, png)
-        {
-        }
-
-        void read()
-        {
-            assert(m_png);
-            assert(m_info);
-
-            png_read_info(m_png, m_info);
-            png_get_IHDR(m_png,
-                         m_info,
-                         & m_width,
-                         & m_height,
-                         reinterpret_cast< int* >(& m_bit_depth),
-                         reinterpret_cast< int* >(& m_color_type),
-                         reinterpret_cast< int* >(& m_interlace_type),
-                         reinterpret_cast< int* >(& m_compression_type),
-                         reinterpret_cast< int* >(& m_filter_type));
-
-            if (png_get_valid(m_png, m_info, chunk_PLTE) == chunk_PLTE)
-            {
-                png_color* colors = 0;
-                int count = 0;
-                png_get_PLTE(m_png, m_info, & colors, & count);
-                m_palette.assign(colors, colors + count);
-            }
-
-#ifdef PNG_tRNS_SUPPORTED
-            if (png_get_valid(m_png, m_info, chunk_tRNS) == chunk_tRNS)
-            {
-                if (m_color_type == color_type_palette)
-                {
-                    int count;
-                    byte* values;
-                    if (png_get_tRNS(m_png, m_info, & values, & count, NULL)
-                        != PNG_INFO_tRNS)
-                    {
-                        throw error("png_get_tRNS() failed");
-                    }
-                    m_tRNS.assign(values, values + count);
-                }
-            }
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-            if (png_get_valid(m_png, m_info, chunk_gAMA) == chunk_gAMA)
-            {
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-                if (png_get_gAMA(m_png, m_info, &m_gamma) != PNG_INFO_gAMA)
-                {
-                    throw error("png_get_gAMA() failed");
-                }
-#else
-                png_fixed_point gamma = 0;
-                if (png_get_gAMA_fixed(m_png, m_info, &gamma) != PNG_INFO_gAMA)
-                {
-                    throw error("png_get_gAMA_fixed() failed");
-                }
-                m_gamma = gamma / 100000.0;
-#endif
-            }
-#endif
-        }
-
-        void write() const
-        {
-            assert(m_png);
-            assert(m_info);
-
-            sync_ihdr();
-            if (m_color_type == color_type_palette)
-            {
-                if (! m_palette.empty())
-                {
-                    png_set_PLTE(m_png, m_info,
-                                 const_cast< color* >(& m_palette[0]),
-                                 (int) m_palette.size());
-                }
-                if (! m_tRNS.empty())
-                {
-#ifdef PNG_tRNS_SUPPORTED
-                    png_set_tRNS(m_png, m_info,
-                                 const_cast< byte* >(& m_tRNS[0]),
-                                 m_tRNS.size(),
-                                 NULL);
-#else
-                    throw error("attempted to write tRNS chunk; recompile with PNG_tRNS_SUPPORTED");
-#endif
-                }
-            }
-
-            if (m_gamma > 0)
-            {
-#ifdef PNG_gAMA_SUPPORTED
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-                png_set_gAMA(m_png, m_info, m_gamma);
-#else
-                png_set_gAMA_fixed(m_png, m_info,
-                                   (png_fixed_point)(m_gamma * 100000));
-#endif
-#else
-                throw error("attempted to write gAMA chunk; recompile with PNG_gAMA_SUPPORTED");
-#endif
-            }
-
-            png_write_info(m_png, m_info);
-        }
-
-        void update()
-        {
-            assert(m_png);
-            assert(m_info);
-
-            sync_ihdr();
-            png_read_update_info(m_png, m_info);
-        }
-
-    protected:
-        void sync_ihdr(void) const
-        {
-            png_set_IHDR(m_png,
-                         m_info,
-                         m_width,
-                         m_height,
-                         m_bit_depth,
-                         m_color_type,
-                         m_interlace_type,
-                         m_compression_type,
-                         m_filter_type);
-        }
-    };
-
-} // namespace png
-
-#endif // PNGPP_INFO_HPP_INCLUDED
diff --git a/src/png/info_base.hpp b/src/png/info_base.hpp
deleted file mode 100644
index 45e154296..000000000
--- a/src/png/info_base.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_INFO_BASE_HPP_INCLUDED
-#define PNGPP_INFO_BASE_HPP_INCLUDED
-
-#include <cassert>
-#include "error.hpp"
-#include "types.hpp"
-
-namespace png
-{
-
-    class io_base;
-
-    /**
-     * \brief Internal class to hold PNG info or end_info.
-     */
-    class info_base
-    {
-        info_base(info_base const&);
-        info_base& operator=(info_base const&);
-
-    public:
-        info_base(io_base& io, png_struct* png)
-            : m_io(io),
-              m_png(png),
-              m_info(png_create_info_struct(m_png))
-        {
-        }
-
-        png_info* get_png_info() const
-        {
-            return m_info;
-        }
-
-        png_info** get_png_info_ptr()
-        {
-            return & m_info;
-        }
-
-    protected:
-        io_base& m_io;
-        png_struct* m_png;
-        png_info* m_info;
-    };
-
-} // namespace png
-
-#endif // PNGPP_INFO_BASE_HPP_INCLUDED
diff --git a/src/png/io_base.hpp b/src/png/io_base.hpp
deleted file mode 100644
index 3c2d83043..000000000
--- a/src/png/io_base.hpp
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_IO_BASE_HPP_INCLUDED
-#define PNGPP_IO_BASE_HPP_INCLUDED
-
-#include <cassert>
-#include <cstdio>
-#include <cstdarg>
-#include "error.hpp"
-#include "info.hpp"
-#include "end_info.hpp"
-
-static void
-trace_io_transform(char const* fmt, ...)
-{
-#ifdef DEBUG_IO_TRANSFORM
-    va_list va;
-    va_start(va, fmt);
-    fprintf(stderr, "TRANSFORM_IO: ");
-    vfprintf(stderr, fmt, va);
-    va_end(va);
-#endif
-}
-#define TRACE_IO_TRANSFORM trace_io_transform
-
-namespace png
-{
-
-    /**
-     * \brief Base class for PNG reader/writer classes.
-     *
-     * \see  reader, writer
-     */
-    class io_base
-    {
-        io_base(io_base const&);
-        io_base& operator=(io_base const&);
-
-    public:
-        explicit io_base(png_struct* png)
-            : m_png(png),
-              m_info(*this, m_png),
-              m_end_info(*this, m_png)
-        {
-        }
-
-        ~io_base()
-        {
-            assert(! m_png);
-            assert(! m_info.get_png_info());
-            assert(! m_end_info.get_png_info());
-        }
-
-        png_struct* get_png_struct() const
-        {
-            return m_png;
-        }
-
-        info& get_info()
-        {
-            return m_info;
-        }
-
-        info const& get_info() const
-        {
-            return m_info;
-        }
-
-        image_info const& get_image_info() const
-        {
-            return m_info;
-        }
-
-        void set_image_info(image_info const& info)
-        {
-            static_cast< image_info& >(m_info) = info; // slice it
-        }
-
-        end_info& get_end_info()
-        {
-            return m_end_info;
-        }
-
-        end_info const& get_end_info() const
-        {
-            return m_end_info;
-        }
-
-        //////////////////////////////////////////////////////////////////////
-        // info accessors
-        //
-        uint_32 get_width() const
-        {
-            return m_info.get_width();
-        }
-
-        void set_width(uint_32 width)
-        {
-            m_info.set_width(width);
-        }
-
-        uint_32 get_height() const
-        {
-            return m_info.get_height();
-        }
-
-        void set_height(uint_32 height)
-        {
-            m_info.set_height(height);
-        }
-
-        color_type get_color_type() const
-        {
-            return m_info.get_color_type();
-        }
-
-        void set_color_type(color_type color_space)
-        {
-            m_info.set_color_type(color_space);
-        }
-
-        int get_bit_depth() const
-        {
-            return m_info.get_bit_depth();
-        }
-
-        void set_bit_depth(int bit_depth)
-        {
-            m_info.set_bit_depth(bit_depth);
-        }
-
-        interlace_type get_interlace_type() const
-        {
-            return m_info.get_interlace_type();
-        }
-
-        void set_interlace_type(interlace_type interlace)
-        {
-            m_info.set_interlace_type(interlace);
-        }
-
-        compression_type get_compression_type() const
-        {
-            return m_info.get_compression_type();
-        }
-
-        void set_compression_type(compression_type compression)
-        {
-            m_info.set_compression_type(compression);
-        }
-
-        filter_type get_filter_type() const
-        {
-            return m_info.get_filter_type();
-        }
-
-        void set_filter_type(filter_type filter)
-        {
-            m_info.set_filter_type(filter);
-        }
-
-        //////////////////////////////////////////////////////////////////////
-
-        bool has_chunk(chunk id)
-        {
-            return png_get_valid(m_png,
-                                 m_info.get_png_info(),
-                                 uint_32(id)) == uint_32(id);
-        }
-
-#if defined(PNG_READ_EXPAND_SUPPORTED)
-        void set_gray_1_2_4_to_8() const
-        {
-            TRACE_IO_TRANSFORM("png_set_expand_gray_1_2_4_to_8\n");
-            png_set_expand_gray_1_2_4_to_8(m_png);
-        }
-
-        void set_palette_to_rgb() const
-        {
-            TRACE_IO_TRANSFORM("png_set_palette_to_rgb\n");
-            png_set_palette_to_rgb(m_png);
-        }
-
-        void set_tRNS_to_alpha() const
-        {
-            TRACE_IO_TRANSFORM("png_set_tRNS_to_alpha\n");
-            png_set_tRNS_to_alpha(m_png);
-        }
-#endif // defined(PNG_READ_EXPAND_SUPPORTED)
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-        void set_bgr() const
-        {
-            TRACE_IO_TRANSFORM("png_set_bgr\n");
-            png_set_bgr(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
-        void set_gray_to_rgb() const
-        {
-            TRACE_IO_TRANSFORM("png_set_gray_to_rgb\n");
-            png_set_gray_to_rgb(m_png);
-        }
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-        void set_rgb_to_gray(rgb_to_gray_error_action error_action
-                             = rgb_to_gray_silent,
-                             double red_weight   = -1.0,
-                             double green_weight = -1.0) const
-        {
-            TRACE_IO_TRANSFORM("png_set_rgb_to_gray: error_action=%d,"
-                               " red_weight=%lf, green_weight=%lf\n",
-                               error_action, red_weight, green_weight);
-
-            png_set_rgb_to_gray(m_png, error_action, red_weight, green_weight);
-        }
-#else
-        void set_rgb_to_gray(rgb_to_gray_error_action error_action
-                             = rgb_to_gray_silent,
-                             fixed_point red_weight   = -1,
-                             fixed_point green_weight = -1) const
-        {
-            TRACE_IO_TRANSFORM("png_set_rgb_to_gray_fixed: error_action=%d,"
-                               " red_weight=%d, green_weight=%d\n",
-                               error_action, red_weight, green_weight);
-
-            png_set_rgb_to_gray_fixed(m_png, error_action,
-                                      red_weight, green_weight);
-        }
-#endif // PNG_FLOATING_POINT_SUPPORTED
-
-        //////////////////////////////////////////////////////////////////////
-        // alpha channel transformations
-        //
-#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-        void set_strip_alpha() const
-        {
-            TRACE_IO_TRANSFORM("png_set_strip_alpha\n");
-            png_set_strip_alpha(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) \
-    || defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-        void set_swap_alpha() const
-        {
-            TRACE_IO_TRANSFORM("png_set_swap_alpha\n");
-            png_set_swap_alpha(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) \
-    || defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-        void set_invert_alpha() const
-        {
-            TRACE_IO_TRANSFORM("png_set_invert_alpha\n");
-            png_set_invert_alpha(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-        void set_filler(uint_32 filler, filler_type type) const
-        {
-            TRACE_IO_TRANSFORM("png_set_filler: filler=%08x, type=%d\n",
-                               filler, type);
-
-            png_set_filler(m_png, filler, type);
-        }
-
-#if !defined(PNG_1_0_X)
-        void set_add_alpha(uint_32 filler, filler_type type) const
-        {
-            TRACE_IO_TRANSFORM("png_set_add_alpha: filler=%08x, type=%d\n",
-                               filler, type);
-
-            png_set_add_alpha(m_png, filler, type);
-        }
-#endif
-#endif // PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-        void set_swap() const
-        {
-            TRACE_IO_TRANSFORM("png_set_swap\n");
-            png_set_swap(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-        void set_packing() const
-        {
-            TRACE_IO_TRANSFORM("png_set_packing\n");
-            png_set_packing(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) \
-    || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-        void set_packswap() const
-        {
-            TRACE_IO_TRANSFORM("png_set_packswap\n");
-            png_set_packswap(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-        void set_shift(byte red_bits, byte green_bits, byte blue_bits,
-                       byte alpha_bits = 0) const
-        {
-            TRACE_IO_TRANSFORM("png_set_shift: red_bits=%d, green_bits=%d,"
-                               " blue_bits=%d, alpha_bits=%d\n",
-                               red_bits, green_bits, blue_bits, alpha_bits);
-
-            if (get_color_type() != color_type_rgb
-                || get_color_type() != color_type_rgb_alpha)
-            {
-                throw error("set_shift: expected RGB or RGBA color type");
-            }
-            color_info bits;
-            bits.red = red_bits;
-            bits.green = green_bits;
-            bits.blue = blue_bits;
-            bits.alpha = alpha_bits;
-            png_set_shift(m_png, & bits);
-        }
-
-        void set_shift(byte gray_bits, byte alpha_bits = 0) const
-        {
-            TRACE_IO_TRANSFORM("png_set_shift: gray_bits=%d, alpha_bits=%d\n",
-                               gray_bits, alpha_bits);
-
-            if (get_color_type() != color_type_gray
-                || get_color_type() != color_type_gray_alpha)
-            {
-                throw error("set_shift: expected Gray or Gray+Alpha color type");
-            }
-            color_info bits;
-            bits.gray = gray_bits;
-            bits.alpha = alpha_bits;
-            png_set_shift(m_png, & bits);
-        }
-#endif // PNG_READ_SHIFT_SUPPORTED || PNG_WRITE_SHIFT_SUPPORTED
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) \
-    || defined(PNG_WRITE_INTERLACING_SUPPORTED)
-        int set_interlace_handling() const
-        {
-            TRACE_IO_TRANSFORM("png_set_interlace_handling\n");
-            return png_set_interlace_handling(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-        void set_invert_mono() const
-        {
-            TRACE_IO_TRANSFORM("png_set_invert_mono\n");
-            png_set_invert_mono(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_16_TO_8_SUPPORTED)
-        void set_strip_16() const
-        {
-            TRACE_IO_TRANSFORM("png_set_strip_16\n");
-            png_set_strip_16(m_png);
-        }
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-        void set_read_user_transform(png_user_transform_ptr transform_fn)
-        {
-            TRACE_IO_TRANSFORM("png_set_read_user_transform_fn\n");
-            png_set_read_user_transform_fn(m_png, transform_fn);
-        }
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) \
-    || defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-        void set_user_transform_info(void* info, int bit_depth, int channels)
-        {
-            TRACE_IO_TRANSFORM("png_set_user_transform_info: bit_depth=%d,"
-                               " channels=%d\n", bit_depth, channels);
-
-            png_set_user_transform_info(m_png, info, bit_depth, channels);
-        }
-#endif
-
-    protected:
-        void* get_io_ptr() const
-        {
-            return png_get_io_ptr(m_png);
-        }
-
-        void set_error(char const* message)
-        {
-            assert(message);
-            m_error = message;
-        }
-
-        void reset_error()
-        {
-            m_error.clear();
-        }
-
-/*
-        std::string const& get_error() const
-        {
-            return m_error;
-        }
-*/
-
-        bool is_error() const
-        {
-            return !m_error.empty();
-        }
-
-        void raise_error()
-        {
-            longjmp(png_jmpbuf(m_png), -1);
-        }
-
-        static void raise_error(png_struct* png, char const* message)
-        {
-            io_base* io = static_cast< io_base* >(png_get_error_ptr(png));
-            io->set_error(message);
-            io->raise_error();
-        }
-
-        png_struct* m_png;
-        info m_info;
-        end_info m_end_info;
-        std::string m_error;
-    };
-
-} // namespace png
-
-#endif // PNGPP_IO_BASE_HPP_INCLUDED
diff --git a/src/png/libpng/ANNOUNCE b/src/png/libpng/ANNOUNCE
deleted file mode 100644
index 0f66c0d1d..000000000
--- a/src/png/libpng/ANNOUNCE
+++ /dev/null
@@ -1,35 +0,0 @@
-Libpng 1.6.34 - September 29, 2017
-
-This is a public release of libpng, intended for use in production codes.
-
-Files available for download:
-
-Source files with LF line endings (for Unix/Linux) and with a
-"configure" script
-
-   libpng-1.6.34.tar.xz (LZMA-compressed, recommended)
-   libpng-1.6.34.tar.gz
-
-Source files with CRLF line endings (for Windows), without the
-"configure" script
-
-   lpng1634.7z  (LZMA-compressed, recommended)
-   lpng1634.zip
-
-Other information:
-
-   libpng-1.6.34-README.txt
-   libpng-1.6.34-LICENSE.txt
-   libpng-1.6.34-*.asc (armored detached GPG signatures)
-
-Changes since the last public release (1.6.33):
-  Removed contrib/pngsuite/i*.png; some of these were incorrect and caused
-    test failures.
-
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-(subscription required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
-or to glennrp at users.sourceforge.net
-
-Glenn R-P
diff --git a/src/png/libpng/CMakeLists.txt b/src/png/libpng/CMakeLists.txt
deleted file mode 100644
index 7697110c7..000000000
--- a/src/png/libpng/CMakeLists.txt
+++ /dev/null
@@ -1,937 +0,0 @@
-# CMakeLists.txt
-
-# Copyright (C) 2007,2009-2017 Glenn Randers-Pehrson
-# Written by Christian Ehrlicher, 2007
-# Revised by Roger Lowman, 2009-2010
-# Revised by Clifford Yapp, 2011-2012
-# Revised by Roger Leigh, 2016
-# Revised by Andreas Franek, 2016
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-cmake_minimum_required(VERSION 3.0.2)
-cmake_policy(VERSION 3.0.2)
-
-# Set MacOSX @rpath usage globally.
-if (POLICY CMP0020)
-  cmake_policy(SET CMP0020 NEW)
-endif(POLICY CMP0020)
-if (POLICY CMP0042)
-  cmake_policy(SET CMP0042 NEW)
-endif(POLICY CMP0042)
-# Use new variable expansion policy.
-if (POLICY CMP0053)
-  cmake_policy(SET CMP0053 NEW)
-endif(POLICY CMP0053)
-if (POLICY CMP0054)
-  cmake_policy(SET CMP0054 NEW)
-endif(POLICY CMP0054)
-
-set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo")
-
-project(libpng ASM C)
-
-set(PNGLIB_MAJOR 1)
-set(PNGLIB_MINOR 6)
-set(PNGLIB_RELEASE 34)
-set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
-
-# needed packages
-
-#Allow users to specify location of Zlib,
-# Useful if zlib is being built alongside this as a sub-project
-
-set(PNG_BUILD_ZLIB ${CMAKE_CURRENT_SOURCE_DIR}/zlib)
-
-if(NOT WIN32)
-  find_library(M_LIBRARY
-    NAMES m
-    PATHS /usr/lib /usr/local/lib
-  )
-  if(NOT M_LIBRARY)
-    message(STATUS "math lib 'libm' not found; floating point support disabled")
-  endif()
-else()
-  # not needed on windows
-  set(M_LIBRARY "")
-endif()
-
-# COMMAND LINE OPTIONS
-option(PNG_SHARED "Build shared lib" OFF)
-option(PNG_STATIC "Build static lib" ON)
-option(PNG_TESTS  "Build libpng tests" OFF)
-
-# Many more configuration options could be added here
-option(PNG_FRAMEWORK "Build OS X framework" OFF)
-option(PNG_DEBUG     "Build with debug output" OFF)
-option(PNGARG        "Disable ANSI-C prototypes" OFF)
-
-option(PNG_HARDWARE_OPTIMIZATIONS "Enable Hardware Optimizations" ON)
-
-set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names")
-set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings")
-
-if(PNG_HARDWARE_OPTIMIZATIONS)
-# set definitions and sources for arm
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
-  CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
-  set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
-  set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
-     check: (default) use internal checking code;
-     off: disable the optimizations;
-     on: turn on unconditionally.")
-  set_property(CACHE PNG_ARM_NEON PROPERTY STRINGS
-     ${PNG_ARM_NEON_POSSIBLE_VALUES})
-  list(FIND PNG_ARM_NEON_POSSIBLE_VALUES ${PNG_ARM_NEON} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-      " PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_ARM_NEON} STREQUAL "no")
-    set(libpng_arm_sources
-      arm/arm_init.c
-      arm/filter_neon.S
-      arm/filter_neon_intrinsics.c)
-
-    if(${PNG_ARM_NEON} STREQUAL "on")
-      add_definitions(-DPNG_ARM_NEON_OPT=2)
-    elseif(${PNG_ARM_NEON} STREQUAL "check")
-      add_definitions(-DPNG_ARM_NEON_CHECK_SUPPORTED)
-    endif()
-  else()
-    add_definitions(-DPNG_ARM_NEON_OPT=0)
-  endif()
-endif()
-
-# set definitions and sources for powerpc
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR
-  CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*" )
-  set(PNG_POWERPC_VSX_POSSIBLE_VALUES on off)
-  set(PNG_POWERPC_VSX "on" CACHE STRING "Enable POWERPC VSX optimizations:
-     off: disable the optimizations.")
-  set_property(CACHE PNG_POWERPC_VSX PROPERTY STRINGS
-     ${PNG_POWERPC_VSX_POSSIBLE_VALUES})
-  list(FIND PNG_POWERPC_VSX_POSSIBLE_VALUES ${PNG_POWERPC_VSX} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-      " PNG_POWERPC_VSX must be one of [${PNG_POWERPC_VSX_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_POWERPC_VSX} STREQUAL "no")
-    set(libpng_powerpc_sources
-      powerpc/powerpc_init.c
-      powerpc/filter_vsx_intrinsics.c)
-    if(${PNG_POWERPC_VSX} STREQUAL "on")
-      add_definitions(-DPNG_POWERPC_VSX_OPT=2)
-    endif()
-  else()
-    add_definitions(-DPNG_POWERPC_VSX_OPT=0)
-  endif()
-endif()
-
-# set definitions and sources for intel
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
-  CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*" )
-  set(PNG_INTEL_SSE_POSSIBLE_VALUES on off)
-  set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations:
-     off: disable the optimizations")
-  set_property(CACHE PNG_INTEL_SSE PROPERTY STRINGS
-     ${PNG_INTEL_SSE_POSSIBLE_VALUES})
-  list(FIND PNG_INTEL_SSE_POSSIBLE_VALUES ${PNG_INTEL_SSE} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-      " PNG_INTEL_SSE must be one of [${PNG_INTEL_SSE_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_INTEL_SSE} STREQUAL "no")
-    set(libpng_intel_sources
-      intel/intel_init.c
-      intel/filter_sse2_intrinsics.c)
-    if(${PNG_INTEL_SSE} STREQUAL "on")
-      add_definitions(-DPNG_INTEL_SSE_OPT=1)
-    endif()
-  else()
-    add_definitions(-DPNG_INTEL_SSE_OPT=0)
-  endif()
-endif()
-
-# set definitions and sources for MIPS
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR
-  CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*" )
-  set(PNG_MIPS_MSA_POSSIBLE_VALUES on off)
-  set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations:
-     off: disable the optimizations")
-  set_property(CACHE PNG_MIPS_MSA PROPERTY STRINGS
-     ${PNG_MIPS_MSA_POSSIBLE_VALUES})
-  list(FIND PNG_MIPS_MSA_POSSIBLE_VALUES ${PNG_MIPS_MSA} index)
-  if(index EQUAL -1)
-    message(FATAL_ERROR
-      " PNG_MIPS_MSA must be one of [${PNG_MIPS_MSA_POSSIBLE_VALUES}]")
-  elseif(NOT ${PNG_MIPS_MSA} STREQUAL "no")
-    set(libpng_mips_sources
-      mips/mips_init.c
-      mips/filter_msa_intrinsics.c)
-    if(${PNG_MIPS_MSA} STREQUAL "on")
-      add_definitions(-DPNG_MIPS_MSA_OPT=2)
-    endif()
-  else()
-    add_definitions(-DPNG_MIPS_MSA_OPT=0)
-  endif()
-endif()
-endif(PNG_HARDWARE_OPTIMIZATIONS)
-
-# SET LIBNAME
-set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-
-# to distinguish between debug and release lib
-set(CMAKE_DEBUG_POSTFIX "d")
-
-include(CheckCSourceCompiles)
-option(ld-version-script "Enable linker version script" ON)
-if(ld-version-script AND NOT APPLE)
-  # Check if LD supports linker scripts.
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map" "VERS_1 {
-        global: sym;
-        local: *;
-};
-
-VERS_2 {
-        global: sym2;
-                main;
-} VERS_1;
-")
-  set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/conftest.map'")
-  check_c_source_compiles("void sym(void) {}
-void sym2(void) {}
-int main(void) {return 0;}
-" HAVE_LD_VERSION_SCRIPT)
-  if(NOT HAVE_LD_VERSION_SCRIPT)
-    set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE} "-Wl,-M -Wl,${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
-  check_c_source_compiles("void sym(void) {}
-void sym2(void) {}
-int main(void) {return 0;}
-" HAVE_SOLARIS_LD_VERSION_SCRIPT)
-  endif()
-  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
-  file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map")
-endif()
-
-# Find symbol prefix.  Likely obsolete and unnecessary with recent
-# toolchains (it's not done in many other projects).
-function(symbol_prefix)
-  set(SYMBOL_PREFIX)
-
-  execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E" "-"
-                  INPUT_FILE /dev/null
-                  OUTPUT_VARIABLE OUT
-                  RESULT_VARIABLE STATUS)
-
-  if(CPP_FAIL)
-    message(WARNING "Failed to run the C preprocessor")
-  endif()
-
-  string(REPLACE "\n" ";" OUT "${OUT}")
-  foreach(line ${OUT})
-    string(REGEX MATCH "^PREFIX=" found_match "${line}")
-    if(found_match)
-      STRING(REGEX REPLACE "^PREFIX=(.*\)" "\\1" prefix "${line}")
-      string(REGEX MATCH "__USER_LABEL_PREFIX__" found_match "${prefix}")
-      if(found_match)
-        STRING(REGEX REPLACE "(.*)__USER_LABEL_PREFIX__(.*)" "\\1\\2" prefix "${prefix}")
-      endif()
-      set(SYMBOL_PREFIX "${prefix}")
-    endif()
-  endforeach()
-
-    message(STATUS "Symbol prefix: ${SYMBOL_PREFIX}")
-    set(SYMBOL_PREFIX "${SYMBOL_PREFIX}" PARENT_SCOPE)
-endfunction()
-
-if(UNIX)
-  symbol_prefix()
-endif()
-
-find_program(AWK NAMES gawk awk)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-if(NOT AWK OR ANDROID)
-  # No awk available to generate sources; use pre-built pnglibconf.h
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
-                 ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
-  add_custom_target(genfiles) # Dummy
-else()
-  include(CMakeParseArguments)
-  # Generate .chk from .out with awk
-  # generate_chk(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
-  function(generate_chk)
-    set(options)
-    set(oneValueArgs INPUT OUTPUT)
-    set(multiValueArgs DEPENDS)
-    cmake_parse_arguments(_GC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    if (NOT _GC_INPUT)
-      message(FATAL_ERROR "Invalid arguments.  generate_out requires input.")
-    endif()
-    if (NOT _GC_OUTPUT)
-      message(FATAL_ERROR "Invalid arguments.  generate_out requires output.")
-    endif()
-
-    add_custom_command(OUTPUT "${_GC_OUTPUT}"
-                       COMMAND "${CMAKE_COMMAND}"
-                               "-DINPUT=${_GC_INPUT}"
-                               "-DOUTPUT=${_GC_OUTPUT}"
-                               -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake"
-                       DEPENDS "${_GC_INPUT}" ${_GC_DEPENDS}
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endfunction()
-
-  # Generate .out from .c with awk
-  # generate_out(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
-  function(generate_out)
-    set(options)
-    set(oneValueArgs INPUT OUTPUT)
-    set(multiValueArgs DEPENDS)
-    cmake_parse_arguments(_GO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    if (NOT _GO_INPUT)
-      message(FATAL_ERROR "Invalid arguments.  generate_out requires input.")
-    endif()
-    if (NOT _GO_OUTPUT)
-      message(FATAL_ERROR "Invalid arguments.  generate_out requires output.")
-    endif()
-
-    add_custom_command(OUTPUT "${_GO_OUTPUT}"
-                       COMMAND "${CMAKE_COMMAND}"
-                               "-DINPUT=${_GO_INPUT}"
-                               "-DOUTPUT=${_GO_OUTPUT}"
-                               -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake"
-                       DEPENDS "${_GO_INPUT}" ${_GO_DEPENDS}
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endfunction()
-
-  # Generate specific source file with awk
-  # generate_source(OUTPUT outputfile [DEPENDS dep1 [dep2...]])
-  function(generate_source)
-    set(options)
-    set(oneValueArgs OUTPUT)
-    set(multiValueArgs DEPENDS)
-    cmake_parse_arguments(_GSO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    if (NOT _GSO_OUTPUT)
-      message(FATAL_ERROR "Invalid arguments.  generate_source requires output.")
-    endif()
-
-    add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_GSO_OUTPUT}"
-                       COMMAND "${CMAKE_COMMAND}"
-                               "-DOUTPUT=${_GSO_OUTPUT}"
-                               -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake"
-                       DEPENDS ${_GSO_DEPENDS}
-                       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  endfunction()
-
-  # Copy file
-  function(generate_copy source destination)
-    add_custom_command(OUTPUT "${destination}"
-                       COMMAND "${CMAKE_COMMAND}" -E remove "${destination}"
-                       COMMAND "${CMAKE_COMMAND}" -E copy "${source}"
-                                                          "${destination}"
-                       DEPENDS "${source}")
-  endfunction()
-
-  # Generate scripts/pnglibconf.h
-  generate_source(OUTPUT "scripts/pnglibconf.c"
-                  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
-
-  # Generate pnglibconf.c
-  generate_source(OUTPUT "pnglibconf.c"
-                  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
-                          "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
-
-  if(PNG_PREFIX)
-    set(PNGLIBCONF_H_EXTRA_DEPENDS
-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/macro.lst")
-    set(PNGPREFIX_H_EXTRA_DEPENDS
-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out")
-  endif()
-
-  generate_out(INPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
-
-  # Generate pnglibconf.h
-  generate_source(OUTPUT "pnglibconf.h"
-                  DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
-                          ${PNGLIBCONF_H_EXTRA_DEPENDS})
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/intprefix.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
-               DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/prefix.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
-                       "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
-
-  # Generate pngprefix.h
-  generate_source(OUTPUT "pngprefix.h"
-                  DEPENDS ${PNGPREFIX_H_EXTRA_DEPENDS})
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/sym.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
-               DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt")
-
-  generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/vers.c"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
-                       "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
-
-  generate_chk(INPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
-               OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
-               DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/checksym.awk"
-                       "${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.def")
-
-  add_custom_target(symbol-check DEPENDS
-                    "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk")
-
-  generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
-                "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
-  generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
-                "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
-
-  add_custom_target(genvers DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
-  add_custom_target(gensym DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
-
-  add_custom_target("genprebuilt"
-                    COMMAND "${CMAKE_COMMAND}"
-                            "-DOUTPUT=scripts/pnglibconf.h.prebuilt"
-                            -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake"
-                    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-  # A single target handles generation of all generated files.  If
-  # they are dependend upon separately by multiple targets, this
-  # confuses parallel make (it would require a separate top-level
-  # target for each file to track the dependencies properly).
-  add_custom_target(genfiles DEPENDS
-    "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym"
-    "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers"
-    "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
-    "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
-    "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/pnglibconf.c"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
-    "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out")
-endif(NOT AWK OR ANDROID)
-
-# OUR SOURCES
-set(libpng_public_hdrs
-  png.h
-  pngconf.h
-  "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
-)
-set(libpng_private_hdrs
-  pngpriv.h
-  pngdebug.h
-  pnginfo.h
-  pngstruct.h
-)
-if(AWK AND NOT ANDROID)
-  list(APPEND libpng_private_hdrs "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h")
-endif()
-set(libpng_sources
-  ${libpng_public_hdrs}
-  ${libpng_private_hdrs}
-  png.c
-  pngerror.c
-  pngget.c
-  pngmem.c
-  pngpread.c
-  pngread.c
-  pngrio.c
-  pngrtran.c
-  pngrutil.c
-  pngset.c
-  pngtrans.c
-  pngwio.c
-  pngwrite.c
-  pngwtran.c
-  pngwutil.c
-  ${libpng_arm_sources}
-  ${libpng_intel_sources}
-  ${libpng_mips_sources}
-  ${libpng_powerpc_sources}
-)
-set(pngtest_sources
-  pngtest.c
-)
-set(pngvalid_sources
-  contrib/libtests/pngvalid.c
-)
-set(pngstest_sources
-  contrib/libtests/pngstest.c
-)
-set(pngunknown_sources
-  contrib/libtests/pngunknown.c
-)
-set(pngimage_sources
-  contrib/libtests/pngimage.c
-)
-set(pngfix_sources
-  contrib/tools/pngfix.c
-)
-set(png_fix_itxt_sources
-  contrib/tools/png-fix-itxt.c
-)
-
-if(MSVC)
-  add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-endif(MSVC)
-
-if(PNG_DEBUG)
-  add_definitions(-DPNG_DEBUG)
-endif()
-
-# NOW BUILD OUR TARGET
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
-
-unset(PNG_LIB_TARGETS)
-
-if(PNG_SHARED)
-  add_library(png SHARED ${libpng_sources})
-  set(PNG_LIB_TARGETS png)
-  set_target_properties(png PROPERTIES OUTPUT_NAME ${PNG_LIB_NAME})
-  add_dependencies(png genfiles)
-  if(MSVC)
-    # msvc does not append 'lib' - do it here to have consistent name
-    set_target_properties(png PROPERTIES PREFIX "lib")
-    set_target_properties(png PROPERTIES IMPORT_PREFIX "lib")
-  endif()
-  target_link_libraries(png ${ZLIB_LIBRARY} ${M_LIBRARY})
-
-  if(UNIX AND AWK)
-    if(HAVE_LD_VERSION_SCRIPT)
-      set_target_properties(png PROPERTIES LINK_FLAGS
-        "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
-    elseif(HAVE_SOLARIS_LD_VERSION_SCRIPT)
-      set_target_properties(png PROPERTIES LINK_FLAGS
-        "-Wl,-M -Wl,'${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
-    endif()
-  endif()
-endif()
-
-if(PNG_STATIC)
-  # does not work without changing name
-  set(PNG_LIB_NAME_STATIC png_static)
-  add_library(png_static STATIC ${libpng_sources})
-  add_dependencies(png_static genfiles)
-  # MSVC doesn't use a different file extension for shared vs. static
-  # libs.  We are able to change OUTPUT_NAME to remove the _static
-  # for all other platforms.
-  if(NOT MSVC)
-    set_target_properties(png_static PROPERTIES
-      OUTPUT_NAME "${PNG_LIB_NAME}"
-      CLEAN_DIRECT_OUTPUT 1)
-  else()
-    set_target_properties(png_static PROPERTIES
-      OUTPUT_NAME "${PNG_LIB_NAME}_static"
-      CLEAN_DIRECT_OUTPUT 1)
-  endif()
-  list(APPEND PNG_LIB_TARGETS png_static)
-  if(MSVC)
-    # msvc does not append 'lib' - do it here to have consistent name
-    set_target_properties(png_static PROPERTIES PREFIX "lib")
-  endif()
-  target_link_libraries(png_static ${ZLIB_LIBRARY} ${M_LIBRARY})
-endif()
-
-if(PNG_FRAMEWORK)
-  set(PNG_LIB_NAME_FRAMEWORK png_framework)
-  add_library(png_framework SHARED ${libpng_sources})
-  add_dependencies(png_framework genfiles)
-  list(APPEND PNG_LIB_TARGETS png_framework)
-  set_target_properties(png_framework PROPERTIES
-    FRAMEWORK TRUE
-    FRAMEWORK_VERSION ${PNGLIB_VERSION}
-    MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PNGLIB_MAJOR}.${PNGLIB_MINOR}
-    MACOSX_FRAMEWORK_BUNDLE_VERSION ${PNGLIB_VERSION}
-    MACOSX_FRAMEWORK_IDENTIFIER org.libpng.libpng
-    XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
-    PUBLIC_HEADER "${libpng_public_hdrs}"
-    OUTPUT_NAME png)
-  target_link_libraries(png_framework ${ZLIB_LIBRARY} ${M_LIBRARY})
-endif()
-
-if(NOT PNG_LIB_TARGETS)
-  message(SEND_ERROR
-    "No library variant selected to build. "
-    "Please enable at least one of the following options: "
-    " PNG_STATIC, PNG_SHARED, PNG_FRAMEWORK")
-endif()
-
-if(PNG_SHARED AND WIN32)
-  set_target_properties(png PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
-endif()
-
-function(png_add_test)
-  set(options)
-  set(oneValueArgs NAME COMMAND)
-  set(multiValueArgs OPTIONS FILES)
-  cmake_parse_arguments(_PAT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  if (NOT _PAT_NAME)
-    message(FATAL_ERROR "Invalid arguments.  png_add_test requires name.")
-  endif()
-  if (NOT _PAT_COMMAND)
-    message(FATAL_ERROR "Invalid arguments.  png_add_test requires command.")
-  endif()
-
-  set(TEST_OPTIONS "${_PAT_OPTIONS}")
-  set(TEST_FILES "${_PAT_FILES}")
-
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scripts/test.cmake.in"
-                 "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake" @ONLY)
-  if(CMAKE_MAJOR_VERSION GREATER 2) # have generator expressions
-    add_test(NAME "${_PAT_NAME}"
-             COMMAND "${CMAKE_COMMAND}"
-             "-DLIBPNG=$<TARGET_FILE:png>"
-             "-DTEST_COMMAND=$<TARGET_FILE:${_PAT_COMMAND}>"
-             -P "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake")
-  else() # old 2.x add_test; limited and won't work well on Windows
-    # Note LIBPNG is a dummy value as there are no generator expressions
-    add_test("${_PAT_NAME}" "${CMAKE_COMMAND}"
-             "-DLIBPNG=${CMAKE_CURRENT_BINARY_DIR}/libpng.so"
-             "-DTEST_COMMAND=./${_PAT_COMMAND}"
-             -P "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake")
-  endif()
-endfunction()
-
-if(PNG_TESTS AND PNG_SHARED)
-  # Find test PNG files by globbing, but sort lists to ensure
-  # consistency between different filesystems.
-  file(GLOB PNGSUITE_PNGS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/*.png")
-  list(SORT PNGSUITE_PNGS)
-  file(GLOB TEST_PNGS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/testpngs/*.png")
-  list(SORT TEST_PNGS)
-
-  set(PNGTEST_PNG "${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png")
-
-  add_executable(pngtest ${pngtest_sources})
-  target_link_libraries(pngtest png)
-
-  png_add_test(NAME pngtest COMMAND pngtest FILES "${PNGTEST_PNG}")
-
-  add_executable(pngvalid ${pngvalid_sources})
-  target_link_libraries(pngvalid png)
-
-  png_add_test(NAME pngvalid-gamma-16-to-8
-               COMMAND pngvalid OPTIONS --gamma-16-to-8)
-  png_add_test(NAME pngvalid-gamma-alpha-mode
-               COMMAND pngvalid OPTIONS --gamma-alpha-mode)
-  png_add_test(NAME pngvalid-gamma-background
-               COMMAND pngvalid OPTIONS --gamma-background)
-  png_add_test(NAME pngvalid-gamma-expand16-alpha-mode
-               COMMAND pngvalid OPTIONS --gamma-alpha-mode --expand16)
-  png_add_test(NAME pngvalid-gamma-expand16-background
-               COMMAND pngvalid OPTIONS --gamma-background --expand16)
-  png_add_test(NAME pngvalid-gamma-expand16-transform
-               COMMAND pngvalid OPTIONS --gamma-transform --expand16)
-  png_add_test(NAME pngvalid-gamma-sbit
-               COMMAND pngvalid OPTIONS --gamma-sbit)
-  png_add_test(NAME pngvalid-gamma-threshold
-               COMMAND pngvalid OPTIONS --gamma-threshold)
-  png_add_test(NAME pngvalid-gamma-transform
-               COMMAND pngvalid OPTIONS --gamma-transform)
-  png_add_test(NAME pngvalid-progressive-interlace-standard
-               COMMAND pngvalid OPTIONS --standard --progressive-read --interlace)
-  png_add_test(NAME pngvalid-progressive-size
-               COMMAND pngvalid OPTIONS --size --progressive-read)
-  png_add_test(NAME pngvalid-progressive-standard
-               COMMAND pngvalid OPTIONS --standard --progressive-read)
-  png_add_test(NAME pngvalid-standard
-               COMMAND pngvalid OPTIONS --standard)
-  png_add_test(NAME pngvalid-transform
-               COMMAND pngvalid OPTIONS --transform)
-
-  add_executable(pngstest ${pngstest_sources})
-  target_link_libraries(pngstest png)
-
-  foreach(gamma_type 1.8 linear none sRGB)
-    foreach(alpha_type none alpha)
-      set(PNGSTEST_FILES)
-      foreach(test_png ${TEST_PNGS})
-        string(REGEX MATCH ".*-linear[-.].*" TEST_PNG_LINEAR "${test_png}")
-        string(REGEX MATCH ".*-sRGB[-.].*" TEST_PNG_SRGB "${test_png}")
-        string(REGEX MATCH ".*-1.8[-.].*" TEST_PNG_G18 "${test_png}")
-        string(REGEX MATCH ".*-alpha-.*" TEST_PNG_ALPHA "${test_png}")
-
-        set(TEST_PNG_VALID TRUE)
-
-        if(TEST_PNG_ALPHA)
-          if (NOT "${alpha_type}" STREQUAL "alpha")
-            set(TEST_PNG_VALID FALSE)
-          endif()
-        else()
-          if ("${alpha_type}" STREQUAL "alpha")
-            set(TEST_PNG_VALID FALSE)
-          endif()
-        endif()
-
-        if(TEST_PNG_LINEAR)
-          if(NOT "${gamma_type}" STREQUAL "linear")
-            set(TEST_PNG_VALID FALSE)
-          endif()
-        elseif(TEST_PNG_SRGB)
-          if(NOT "${gamma_type}" STREQUAL "sRGB")
-            set(TEST_PNG_VALID FALSE)
-          endif()
-        elseif(TEST_PNG_G18)
-          if(NOT "${gamma_type}" STREQUAL "1.8")
-            set(TEST_PNG_VALID FALSE)
-          endif()
-        else()
-          if(NOT "${gamma_type}" STREQUAL "none")
-            set(TEST_PNG_VALID FALSE)
-          endif()
-        endif()
-
-        if(TEST_PNG_VALID)
-          list(APPEND PNGSTEST_FILES "${test_png}")
-        endif()
-      endforeach()
-      # Should already be sorted, but sort anyway to be certain.
-      list(SORT PNGSTEST_FILES)
-      png_add_test(NAME pngstest-${gamma_type}-${alpha_type}
-                   COMMAND pngstest
-                   OPTIONS --tmpfile "${gamma_type}-${alpha_type}-" --log
-                   FILES ${PNGSTEST_FILES})
-    endforeach()
-  endforeach()
-
-  add_executable(pngunknown ${pngunknown_sources})
-  target_link_libraries(pngunknown png)
-
-  png_add_test(NAME pngunknown-discard COMMAND pngunknown OPTIONS --strict default=discard FILES "${PNGTEST_PNG}")
-  png_add_test(NAME pngunknown-IDAT COMMAND pngunknown OPTIONS --strict default=discard IDAT=save FILES "${PNGTEST_PNG}")
-  png_add_test(NAME pngunknown-if-safe COMMAND pngunknown OPTIONS --strict default=if-safe FILES "${PNGTEST_PNG}")
-  png_add_test(NAME pngunknown-sAPI COMMAND pngunknown OPTIONS --strict bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save FILES "${PNGTEST_PNG}")
-  png_add_test(NAME pngunknown-save COMMAND pngunknown OPTIONS --strict default=save FILES "${PNGTEST_PNG}")
-  png_add_test(NAME pngunknown-sTER COMMAND pngunknown OPTIONS --strict sTER=if-safe FILES "${PNGTEST_PNG}")
-  png_add_test(NAME pngunknown-vpAg COMMAND pngunknown OPTIONS --strict vpAg=if-safe FILES "${PNGTEST_PNG}")
-
-  add_executable(pngimage ${pngimage_sources})
-  target_link_libraries(pngimage png)
-
-  png_add_test(NAME pngimage-quick COMMAND pngimage OPTIONS --list-combos --log FILES ${PNGSUITE_PNGS})
-  png_add_test(NAME pngimage-full COMMAND pngimage OPTIONS --exhaustive --list-combos --log FILES ${PNGSUITE_PNGS})
-endif()
-
-if(PNG_SHARED)
-  add_executable(pngfix ${pngfix_sources})
-  target_link_libraries(pngfix png)
-  set(PNG_BIN_TARGETS pngfix)
-
-  add_executable(png-fix-itxt ${png_fix_itxt_sources})
-  target_link_libraries(png-fix-itxt ${ZLIB_LIBRARY} ${M_LIBRARY})
-  list(APPEND PNG_BIN_TARGETS png-fix-itxt)
-endif()
-
-# Set a variable with CMake code which:
-# Creates a symlink from src to dest (if possible) or alternatively
-# copies if different.
-include(CMakeParseArguments)
-
-function(CREATE_SYMLINK DEST_FILE)
-
-  cmake_parse_arguments(S "" "FILE;TARGET" "" ${ARGN})
-
-  if(NOT S_TARGET AND NOT S_FILE)
-    message(FATAL_ERROR "Specify either a TARGET or a FILE for CREATE_SYMLINK to link to.")
-  endif(NOT S_TARGET AND NOT S_FILE)
-
-  if(S_TARGET AND S_FILE)
-    message(FATAL_ERROR "CREATE_SYMLINK called with both source file ${S_FILE} and build target ${S_TARGET} arguments - can only handle 1 type per call.")
-  endif(S_TARGET AND S_FILE)
-
-  if(S_FILE)
-    # If we don't need to symlink something that's coming from a build target,
-    # we can go ahead and symlink/copy at configure time.
-
-    if(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS)
-      execute_process(
-  COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${S_FILE} ${DEST_FILE}
-  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-  )
-    else(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS)
-      execute_process(
-  COMMAND ${CMAKE_COMMAND} -E create_symlink ${S_FILE} ${DEST_FILE}
-  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-  )
-    endif(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS)
-  endif(S_FILE)
-
-  if(S_TARGET)
-    # We need to use generator expressions, which can be a bit tricky, so for
-    # simplicity make the symlink a POST_BUILD step and use the TARGET
-    # signature of add_custom_command.
-
-    if(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS)
-      add_custom_command(TARGET ${S_TARGET} POST_BUILD
-  COMMAND "${CMAKE_COMMAND}" -E copy_if_different $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE}
-  )
-    else(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS)
-      add_custom_command(TARGET ${S_TARGET} POST_BUILD
-  COMMAND "${CMAKE_COMMAND}" -E create_symlink $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE}
-  )
-    endif(CMAKE_HOST_WIN32 AND NOT CYGWIN AND NOT MSYS)
-
-  endif(S_TARGET)
-
-endfunction()
-
-# Create source generation scripts.
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genchk.cmake.in
-               ${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genout.cmake.in
-               ${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/gensrc.cmake.in
-               ${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake @ONLY)
-
-
-# libpng is a library so default to 'lib'
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-  set(CMAKE_INSTALL_LIBDIR lib)
-endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-
-# CREATE PKGCONFIG FILES
-# we use the same files like ./configure, so we have to set its vars
-# Only do this on Windows for Cygwin - the files don't make much sense outside
-# a UNIX look alike
-if(NOT WIN32 OR CYGWIN OR MINGW)
-  set(prefix      ${CMAKE_INSTALL_PREFIX})
-  set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-  set(libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-  set(includedir  ${CMAKE_INSTALL_PREFIX}/include)
-  set(LIBS        "-lz -lm")
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
-  CREATE_SYMLINK(libpng.pc FILE ${PNGLIB_NAME}.pc)
-
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
-  CREATE_SYMLINK(libpng-config FILE ${PNGLIB_NAME}-config)
-endif(NOT WIN32 OR CYGWIN OR MINGW)
-
-# SET UP LINKS
-if(PNG_SHARED)
-  set_target_properties(png PROPERTIES
-#   VERSION 16.${PNGLIB_RELEASE}.1.6.34
-    VERSION 16.${PNGLIB_RELEASE}.0
-    SOVERSION 16
-    CLEAN_DIRECT_OUTPUT 1)
-endif()
-
-# If CMake > 2.4.x, we set a variable used below to export
-# targets to an export file.
-# TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2
-if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4)
-  set(PNG_EXPORT_RULE EXPORT libpng)
-elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof
-  set(PNG_EXPORT_RULE EXPORT libpng)
-endif()
-
-# INSTALL
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-  install(TARGETS ${PNG_LIB_TARGETS}
-      ${PNG_EXPORT_RULE}
-      RUNTIME DESTINATION bin
-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-  if(PNG_SHARED)
-    # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-    if(CYGWIN OR MINGW)
-      CREATE_SYMLINK(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    endif(CYGWIN OR MINGW)
-
-    if(NOT WIN32)
-      CREATE_SYMLINK(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    endif(NOT WIN32)
-  endif(PNG_SHARED)
-
-  if(PNG_STATIC)
-    if(NOT WIN32 OR CYGWIN OR MINGW)
-      CREATE_SYMLINK( libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    endif(NOT WIN32 OR CYGWIN OR MINGW)
- endif()
-endif()
-
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-  install(FILES ${libpng_public_hdrs}   DESTINATION include)
-  install(FILES ${libpng_public_hdrs}   DESTINATION include/${PNGLIB_NAME})
-endif()
-if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL )
-  if(NOT WIN32 OR CYGWIN OR MINGW)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
-            DESTINATION bin)
-  endif(NOT WIN32 OR CYGWIN OR MINGW)
-endif()
-
-if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL )
-  install(TARGETS ${PNG_BIN_TARGETS}
-      RUNTIME DESTINATION bin)
-endif()
-
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-  # Install man pages
-  if(NOT PNG_MAN_DIR)
-    set(PNG_MAN_DIR "share/man")
-  endif()
-  install(FILES libpng.3 libpngpf.3      DESTINATION ${PNG_MAN_DIR}/man3)
-  install(FILES png.5                    DESTINATION ${PNG_MAN_DIR}/man5)
-  # Install pkg-config files
-  if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
-            DESTINATION bin)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
-            DESTINATION bin)
-  endif(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW)
-endif()
-
-# On versions of CMake that support it, create an export file CMake
-# users can include() to import our targets
-if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL )
-  install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
-endif()
-
-# what's with libpng-manual.txt and all the extra files?
-
-# UNINSTALL
-# do we need this?
-
-# DIST
-# do we need this?
-
-# to create msvc import lib for mingw compiled shared lib
-# pexports libpng.dll > libpng.def
-# lib /def:libpng.def /machine:x86
diff --git a/src/png/libpng/LICENSE b/src/png/libpng/LICENSE
deleted file mode 100644
index 4cda4fa0a..000000000
--- a/src/png/libpng/LICENSE
+++ /dev/null
@@ -1,133 +0,0 @@
-
-This copy of the libpng notices is provided for your convenience.  In case of
-any discrepancy between this copy and the notices in the file png.h that is
-included in the libpng distribution, the latter shall prevail.
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify libpng you may insert additional notices immediately following
-this sentence.
-
-This code is released under the libpng license.
-
-libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
-Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
-derived from libpng-1.0.6, and are distributed according to the same
-disclaimer and license as libpng-1.0.6 with the following individuals
-added to the list of Contributing Authors:
-
-   Simon-Pierre Cadieux
-   Eric S. Raymond
-   Mans Rullgard
-   Cosmin Truta
-   Gilles Vollant
-   James Yu
-   Mandar Sahastrabuddhe
-   Google Inc.
-   Vadim Barkov
-
-and with the following additions to the disclaimer:
-
-   There is no warranty against interference with your enjoyment of the
-   library or against infringement.  There is no warranty that our
-   efforts or the library will fulfill any of your particular purposes
-   or needs.  This library is provided with all faults, and the entire
-   risk of satisfactory quality, performance, accuracy, and effort is with
-   the user.
-
-Some files in the "contrib" directory and some configure-generated
-files that are distributed with libpng have other copyright owners and
-are released under other open source licenses.
-
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
-libpng-0.96, and are distributed according to the same disclaimer and
-license as libpng-0.96, with the following individuals added to the list
-of Contributing Authors:
-
-   Tom Lane
-   Glenn Randers-Pehrson
-   Willem van Schaik
-
-libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
-and are distributed according to the same disclaimer and license as
-libpng-0.88, with the following individuals added to the list of
-Contributing Authors:
-
-   John Bowler
-   Kevin Bracey
-   Sam Bushell
-   Magnus Holmgren
-   Greg Roelofs
-   Tom Tanner
-
-Some files in the "scripts" directory have other copyright owners
-but are released under this license.
-
-libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
-
-For the purposes of this copyright and license, "Contributing Authors"
-is defined as the following set of individuals:
-
-   Andreas Dilger
-   Dave Martindale
-   Guy Eric Schalnat
-   Paul Schmidt
-   Tim Wegner
-
-The PNG Reference Library is supplied "AS IS".  The Contributing Authors
-and Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and of
-fitness for any purpose.  The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,
-or consequential damages, which may result from the use of the PNG
-Reference Library, even if advised of the possibility of such damage.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-source code, or portions hereof, for any purpose, without fee, subject
-to the following restrictions:
-
-  1. The origin of this source code must not be misrepresented.
-
-  2. Altered versions must be plainly marked as such and must not
-     be misrepresented as being the original source.
-
-  3. This Copyright notice may not be removed or altered from any
-     source or altered source distribution.
-
-The Contributing Authors and Group 42, Inc. specifically permit, without
-fee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products.  If you use this
-source code in a product, acknowledgment is not required but would be
-appreciated.
-
-END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
-
-TRADEMARK:
-
-The name "libpng" has not been registered by the Copyright owner
-as a trademark in any jurisdiction.  However, because libpng has
-been distributed and maintained world-wide, continually since 1995,
-the Copyright owner claims "common-law trademark protection" in any
-jurisdiction where common-law trademark is recognized.
-
-OSI CERTIFICATION:
-
-Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
-a certification mark of the Open Source Initiative. OSI has not addressed
-the additional disclaimers inserted at version 1.0.7.
-
-EXPORT CONTROL:
-
-The Copyright owner believes that the Export Control Classification
-Number (ECCN) for libpng is EAR99, which means not subject to export
-controls or International Traffic in Arms Regulations (ITAR) because
-it is open source, publicly available software, that does not contain
-any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
-734.7(b).
-
-Glenn Randers-Pehrson
-glennrp at users.sourceforge.net
-September 29, 2017
diff --git a/src/png/libpng/arm/arm_init.c b/src/png/libpng/arm/arm_init.c
deleted file mode 100644
index 02df812e7..000000000
--- a/src/png/libpng/arm/arm_init.c
+++ /dev/null
@@ -1,135 +0,0 @@
-
-/* arm_init.c - NEON optimised filter functions
- *
- * Copyright (c) 2014,2016 Glenn Randers-Pehrson
- * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.6.22 [May 26, 2016]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
- * called.
- */
-#define _POSIX_SOURCE 1
-
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-#if PNG_ARM_NEON_OPT > 0
-#ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */
-/* WARNING: it is strongly recommended that you do not build libpng with
- * run-time checks for CPU features if at all possible.  In the case of the ARM
- * NEON instructions there is no processor-specific way of detecting the
- * presence of the required support, therefore run-time detection is extremely
- * OS specific.
- *
- * You may set the macro PNG_ARM_NEON_FILE to the file name of file containing
- * a fragment of C source code which defines the png_have_neon function.  There
- * are a number of implementations in contrib/arm-neon, but the only one that
- * has partial support is contrib/arm-neon/linux.c - a generic Linux
- * implementation which reads /proc/cpufino.
- */
-#ifndef PNG_ARM_NEON_FILE
-#  ifdef __linux__
-#     define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
-#  endif
-#endif
-
-#ifdef PNG_ARM_NEON_FILE
-
-#include <signal.h> /* for sig_atomic_t */
-static int png_have_neon(png_structp png_ptr);
-#include PNG_ARM_NEON_FILE
-
-#else  /* PNG_ARM_NEON_FILE */
-#  error "PNG_ARM_NEON_FILE undefined: no support for run-time ARM NEON checks"
-#endif /* PNG_ARM_NEON_FILE */
-#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
-
-#ifndef PNG_ALIGNED_MEMORY_SUPPORTED
-#  error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
-#endif
-
-void
-png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
-{
-   /* The switch statement is compiled in for ARM_NEON_API, the call to
-    * png_have_neon is compiled in for ARM_NEON_CHECK.  If both are defined
-    * the check is only performed if the API has not set the NEON option on
-    * or off explicitly.  In this case the check controls what happens.
-    *
-    * If the CHECK is not compiled in and the option is UNSET the behavior prior
-    * to 1.6.7 was to use the NEON code - this was a bug caused by having the
-    * wrong order of the 'ON' and 'default' cases.  UNSET now defaults to OFF,
-    * as documented in png.h
-    */
-   png_debug(1, "in png_init_filter_functions_neon");
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-   switch ((pp->options >> PNG_ARM_NEON) & 3)
-   {
-      case PNG_OPTION_UNSET:
-         /* Allow the run-time check to execute if it has been enabled -
-          * thus both API and CHECK can be turned on.  If it isn't supported
-          * this case will fall through to the 'default' below, which just
-          * returns.
-          */
-#endif /* PNG_ARM_NEON_API_SUPPORTED */
-#ifdef PNG_ARM_NEON_CHECK_SUPPORTED
-         {
-            static volatile sig_atomic_t no_neon = -1; /* not checked */
-
-            if (no_neon < 0)
-               no_neon = !png_have_neon(pp);
-
-            if (no_neon)
-               return;
-         }
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-         break;
-#endif
-#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
-
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-      default: /* OFF or INVALID */
-         return;
-
-      case PNG_OPTION_ON:
-         /* Option turned on */
-         break;
-   }
-#endif
-
-   /* IMPORTANT: any new external functions used here must be declared using
-    * PNG_INTERNAL_FUNCTION in ../pngpriv.h.  This is required so that the
-    * 'prefix' option to configure works:
-    *
-    *    ./configure --with-libpng-prefix=foobar_
-    *
-    * Verify you have got this right by running the above command, doing a build
-    * and examining pngprefix.h; it must contain a #define for every external
-    * function you add.  (Notice that this happens automatically for the
-    * initialization function.)
-    */
-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon;
-
-   if (bpp == 3)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-         png_read_filter_row_paeth3_neon;
-   }
-
-   else if (bpp == 4)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-          png_read_filter_row_paeth4_neon;
-   }
-}
-#endif /* PNG_ARM_NEON_OPT > 0 */
-#endif /* READ */
diff --git a/src/png/libpng/arm/filter_neon.S b/src/png/libpng/arm/filter_neon.S
deleted file mode 100644
index 000764cd2..000000000
--- a/src/png/libpng/arm/filter_neon.S
+++ /dev/null
@@ -1,253 +0,0 @@
-
-/* filter_neon.S - NEON optimised filter functions
- *
- * Copyright (c) 2014,2017 Glenn Randers-Pehrson
- * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.6.31 [July 27, 2017]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* This is required to get the symbol renames, which are #defines, and the
- * definitions (or not) of PNG_ARM_NEON_OPT and PNG_ARM_NEON_IMPLEMENTATION.
- */
-#define PNG_VERSION_INFO_ONLY
-#include "../pngpriv.h"
-
-#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
-#endif
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for
- * ARM64).  The code in arm/filter_neon_intrinsics.c supports ARM64, however it
- * only works if -mfpu=neon is specified on the GCC command line.  See pngpriv.h
- * for the logic which sets PNG_USE_ARM_NEON_ASM:
- */
-#if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */
-
-#if PNG_ARM_NEON_OPT > 0
-
-#ifdef __ELF__
-#   define ELF
-#else
-#   define ELF @
-#endif
-
-        .arch armv7-a
-        .fpu  neon
-
-.macro  func    name, export=0
-    .macro endfunc
-ELF     .size   \name, . - \name
-        .endfunc
-        .purgem endfunc
-    .endm
-        .text
-
-        /* Explicitly specifying alignment here because some versions of
-         * GAS don't align code correctly.  This is harmless in correctly
-         * written versions of GAS.
-         */
-        .align 2
-
-    .if \export
-        .global \name
-    .endif
-ELF     .type   \name, STT_FUNC
-        .func   \name
-\name:
-.endm
-
-func    png_read_filter_row_sub4_neon, export=1
-        ldr             r3,  [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-1:
-        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
-        vadd.u8         d0,  d3,  d4
-        vadd.u8         d1,  d0,  d5
-        vadd.u8         d2,  d1,  d6
-        vadd.u8         d3,  d2,  d7
-        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
-        subs            r3,  r3,  #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_sub3_neon, export=1
-        ldr             r3,  [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        mov             r0,  r1
-        mov             r2,  #3
-        mov             r12, #12
-        vld1.8          {q11},    [r0], r12
-1:
-        vext.8          d5,  d22, d23, #3
-        vadd.u8         d0,  d3,  d22
-        vext.8          d6,  d22, d23, #6
-        vadd.u8         d1,  d0,  d5
-        vext.8          d7,  d23, d23, #1
-        vld1.8          {q11},    [r0], r12
-        vst1.32         {d0[0]},  [r1,:32], r2
-        vadd.u8         d2,  d1,  d6
-        vst1.32         {d1[0]},  [r1], r2
-        vadd.u8         d3,  d2,  d7
-        vst1.32         {d2[0]},  [r1], r2
-        vst1.32         {d3[0]},  [r1], r2
-        subs            r3,  r3,  #12
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_up_neon, export=1
-        ldr             r3,  [r0, #4]           @ rowbytes
-1:
-        vld1.8          {q0}, [r1,:128]
-        vld1.8          {q1}, [r2,:128]!
-        vadd.u8         q0,  q0,  q1
-        vst1.8          {q0}, [r1,:128]!
-        subs            r3,  r3,  #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_avg4_neon, export=1
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-1:
-        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
-        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
-        vhadd.u8        d0,  d3,  d16
-        vadd.u8         d0,  d0,  d4
-        vhadd.u8        d1,  d0,  d17
-        vadd.u8         d1,  d1,  d5
-        vhadd.u8        d2,  d1,  d18
-        vadd.u8         d2,  d2,  d6
-        vhadd.u8        d3,  d2,  d19
-        vadd.u8         d3,  d3,  d7
-        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
-        subs            r12, r12, #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_avg3_neon, export=1
-        push            {r4,lr}
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        mov             r0,  r1
-        mov             r4,  #3
-        mov             lr,  #12
-        vld1.8          {q11},    [r0], lr
-1:
-        vld1.8          {q10},    [r2], lr
-        vext.8          d5,  d22, d23, #3
-        vhadd.u8        d0,  d3,  d20
-        vext.8          d17, d20, d21, #3
-        vadd.u8         d0,  d0,  d22
-        vext.8          d6,  d22, d23, #6
-        vhadd.u8        d1,  d0,  d17
-        vext.8          d18, d20, d21, #6
-        vadd.u8         d1,  d1,  d5
-        vext.8          d7,  d23, d23, #1
-        vld1.8          {q11},    [r0], lr
-        vst1.32         {d0[0]},  [r1,:32], r4
-        vhadd.u8        d2,  d1,  d18
-        vst1.32         {d1[0]},  [r1], r4
-        vext.8          d19, d21, d21, #1
-        vadd.u8         d2,  d2,  d6
-        vhadd.u8        d3,  d2,  d19
-        vst1.32         {d2[0]},  [r1], r4
-        vadd.u8         d3,  d3,  d7
-        vst1.32         {d3[0]},  [r1], r4
-        subs            r12, r12, #12
-        bgt             1b
-
-        pop             {r4,pc}
-endfunc
-
-.macro  paeth           rx,  ra,  rb,  rc
-        vaddl.u8        q12, \ra, \rb           @ a + b
-        vaddl.u8        q15, \rc, \rc           @ 2*c
-        vabdl.u8        q13, \rb, \rc           @ pa
-        vabdl.u8        q14, \ra, \rc           @ pb
-        vabd.u16        q15, q12, q15           @ pc
-        vcle.u16        q12, q13, q14           @ pa <= pb
-        vcle.u16        q13, q13, q15           @ pa <= pc
-        vcle.u16        q14, q14, q15           @ pb <= pc
-        vand            q12, q12, q13           @ pa <= pb && pa <= pc
-        vmovn.u16       d28, q14
-        vmovn.u16       \rx, q12
-        vbsl            d28, \rb, \rc
-        vbsl            \rx, \ra, d28
-.endm
-
-func    png_read_filter_row_paeth4_neon, export=1
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        vmov.i8         d20, #0
-1:
-        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
-        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
-        paeth           d0,  d3,  d16, d20
-        vadd.u8         d0,  d0,  d4
-        paeth           d1,  d0,  d17, d16
-        vadd.u8         d1,  d1,  d5
-        paeth           d2,  d1,  d18, d17
-        vadd.u8         d2,  d2,  d6
-        paeth           d3,  d2,  d19, d18
-        vmov            d20, d19
-        vadd.u8         d3,  d3,  d7
-        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
-        subs            r12, r12, #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_paeth3_neon, export=1
-        push            {r4,lr}
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        vmov.i8         d4,  #0
-        mov             r0,  r1
-        mov             r4,  #3
-        mov             lr,  #12
-        vld1.8          {q11},    [r0], lr
-1:
-        vld1.8          {q10},    [r2], lr
-        paeth           d0,  d3,  d20, d4
-        vext.8          d5,  d22, d23, #3
-        vadd.u8         d0,  d0,  d22
-        vext.8          d17, d20, d21, #3
-        paeth           d1,  d0,  d17, d20
-        vst1.32         {d0[0]},  [r1,:32], r4
-        vext.8          d6,  d22, d23, #6
-        vadd.u8         d1,  d1,  d5
-        vext.8          d18, d20, d21, #6
-        paeth           d2,  d1,  d18, d17
-        vext.8          d7,  d23, d23, #1
-        vld1.8          {q11},    [r0], lr
-        vst1.32         {d1[0]},  [r1], r4
-        vadd.u8         d2,  d2,  d6
-        vext.8          d19, d21, d21, #1
-        paeth           d3,  d2,  d19, d18
-        vst1.32         {d2[0]},  [r1], r4
-        vmov            d4,  d19
-        vadd.u8         d3,  d3,  d7
-        vst1.32         {d3[0]},  [r1], r4
-        subs            r12, r12, #12
-        bgt             1b
-
-        pop             {r4,pc}
-endfunc
-#endif /* PNG_ARM_NEON_OPT > 0 */
-#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 (assembler) */
-#endif /* READ */
diff --git a/src/png/libpng/arm/filter_neon_intrinsics.c b/src/png/libpng/arm/filter_neon_intrinsics.c
deleted file mode 100644
index ea7e356bc..000000000
--- a/src/png/libpng/arm/filter_neon_intrinsics.c
+++ /dev/null
@@ -1,387 +0,0 @@
-
-/* filter_neon_intrinsics.c - NEON optimised filter functions
- *
- * Copyright (c) 2014,2016 Glenn Randers-Pehrson
- * Written by James Yu <james.yu at linaro.org>, October 2013.
- * Based on filter_neon.S, written by Mans Rullgard, 2011.
- *
- * Last changed in libpng 1.6.22 [May 26, 2016]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* This code requires -mfpu=neon on the command line: */
-#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
-
-#include <arm_neon.h>
-
-/* libpng row pointers are not necessarily aligned to any particular boundary,
- * however this code will only work with appropriate alignment.  arm/arm_init.c
- * checks for this (and will not compile unless it is done). This code uses
- * variants of png_aligncast to avoid compiler warnings.
- */
-#define png_ptr(type,pointer) png_aligncast(type *,pointer)
-#define png_ptrc(type,pointer) png_aligncastconst(const type *,pointer)
-
-/* The following relies on a variable 'temp_pointer' being declared with type
- * 'type'.  This is written this way just to hide the GCC strict aliasing
- * warning; note that the code is safe because there never is an alias between
- * the input and output pointers.
- */
-#define png_ldr(type,pointer)\
-   (temp_pointer = png_ptr(type,pointer), *temp_pointer)
-
-#if PNG_ARM_NEON_OPT > 0
-
-void
-png_read_filter_row_up_neon(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp = row;
-   png_bytep rp_stop = row + row_info->rowbytes;
-   png_const_bytep pp = prev_row;
-
-   png_debug(1, "in png_read_filter_row_up_neon");
-
-   for (; rp < rp_stop; rp += 16, pp += 16)
-   {
-      uint8x16_t qrp, qpp;
-
-      qrp = vld1q_u8(rp);
-      qpp = vld1q_u8(pp);
-      qrp = vaddq_u8(qrp, qpp);
-      vst1q_u8(rp, qrp);
-   }
-}
-
-void
-png_read_filter_row_sub3_neon(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp = row;
-   png_bytep rp_stop = row + row_info->rowbytes;
-
-   uint8x16_t vtmp = vld1q_u8(rp);
-   uint8x8x2_t *vrpt = png_ptr(uint8x8x2_t, &vtmp);
-   uint8x8x2_t vrp = *vrpt;
-
-   uint8x8x4_t vdest;
-   vdest.val[3] = vdup_n_u8(0);
-
-   png_debug(1, "in png_read_filter_row_sub3_neon");
-
-   for (; rp < rp_stop;)
-   {
-      uint8x8_t vtmp1, vtmp2;
-      uint32x2_t *temp_pointer;
-
-      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3);
-      vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]);
-      vtmp2 = vext_u8(vrp.val[0], vrp.val[1], 6);
-      vdest.val[1] = vadd_u8(vdest.val[0], vtmp1);
-
-      vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1);
-      vdest.val[2] = vadd_u8(vdest.val[1], vtmp2);
-      vdest.val[3] = vadd_u8(vdest.val[2], vtmp1);
-
-      vtmp = vld1q_u8(rp + 12);
-      vrpt = png_ptr(uint8x8x2_t, &vtmp);
-      vrp = *vrpt;
-
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0);
-      rp += 3;
-   }
-
-   PNG_UNUSED(prev_row)
-}
-
-void
-png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp = row;
-   png_bytep rp_stop = row + row_info->rowbytes;
-
-   uint8x8x4_t vdest;
-   vdest.val[3] = vdup_n_u8(0);
-
-   png_debug(1, "in png_read_filter_row_sub4_neon");
-
-   for (; rp < rp_stop; rp += 16)
-   {
-      uint32x2x4_t vtmp = vld4_u32(png_ptr(uint32_t,rp));
-      uint8x8x4_t *vrpt = png_ptr(uint8x8x4_t,&vtmp);
-      uint8x8x4_t vrp = *vrpt;
-      uint32x2x4_t *temp_pointer;
-
-      vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]);
-      vdest.val[1] = vadd_u8(vdest.val[0], vrp.val[1]);
-      vdest.val[2] = vadd_u8(vdest.val[1], vrp.val[2]);
-      vdest.val[3] = vadd_u8(vdest.val[2], vrp.val[3]);
-      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
-   }
-
-   PNG_UNUSED(prev_row)
-}
-
-void
-png_read_filter_row_avg3_neon(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp = row;
-   png_const_bytep pp = prev_row;
-   png_bytep rp_stop = row + row_info->rowbytes;
-
-   uint8x16_t vtmp;
-   uint8x8x2_t *vrpt;
-   uint8x8x2_t vrp;
-   uint8x8x4_t vdest;
-   vdest.val[3] = vdup_n_u8(0);
-
-   vtmp = vld1q_u8(rp);
-   vrpt = png_ptr(uint8x8x2_t,&vtmp);
-   vrp = *vrpt;
-
-   png_debug(1, "in png_read_filter_row_avg3_neon");
-
-   for (; rp < rp_stop; pp += 12)
-   {
-      uint8x8_t vtmp1, vtmp2, vtmp3;
-
-      uint8x8x2_t *vppt;
-      uint8x8x2_t vpp;
-
-      uint32x2_t *temp_pointer;
-
-      vtmp = vld1q_u8(pp);
-      vppt = png_ptr(uint8x8x2_t,&vtmp);
-      vpp = *vppt;
-
-      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3);
-      vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]);
-      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
-
-      vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3);
-      vtmp3 = vext_u8(vrp.val[0], vrp.val[1], 6);
-      vdest.val[1] = vhadd_u8(vdest.val[0], vtmp2);
-      vdest.val[1] = vadd_u8(vdest.val[1], vtmp1);
-
-      vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 6);
-      vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1);
-
-      vtmp = vld1q_u8(rp + 12);
-      vrpt = png_ptr(uint8x8x2_t,&vtmp);
-      vrp = *vrpt;
-
-      vdest.val[2] = vhadd_u8(vdest.val[1], vtmp2);
-      vdest.val[2] = vadd_u8(vdest.val[2], vtmp3);
-
-      vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1);
-
-      vdest.val[3] = vhadd_u8(vdest.val[2], vtmp2);
-      vdest.val[3] = vadd_u8(vdest.val[3], vtmp1);
-
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0);
-      rp += 3;
-   }
-}
-
-void
-png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp = row;
-   png_bytep rp_stop = row + row_info->rowbytes;
-   png_const_bytep pp = prev_row;
-
-   uint8x8x4_t vdest;
-   vdest.val[3] = vdup_n_u8(0);
-
-   png_debug(1, "in png_read_filter_row_avg4_neon");
-
-   for (; rp < rp_stop; rp += 16, pp += 16)
-   {
-      uint32x2x4_t vtmp;
-      uint8x8x4_t *vrpt, *vppt;
-      uint8x8x4_t vrp, vpp;
-      uint32x2x4_t *temp_pointer;
-
-      vtmp = vld4_u32(png_ptr(uint32_t,rp));
-      vrpt = png_ptr(uint8x8x4_t,&vtmp);
-      vrp = *vrpt;
-      vtmp = vld4_u32(png_ptrc(uint32_t,pp));
-      vppt = png_ptr(uint8x8x4_t,&vtmp);
-      vpp = *vppt;
-
-      vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]);
-      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
-      vdest.val[1] = vhadd_u8(vdest.val[0], vpp.val[1]);
-      vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]);
-      vdest.val[2] = vhadd_u8(vdest.val[1], vpp.val[2]);
-      vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]);
-      vdest.val[3] = vhadd_u8(vdest.val[2], vpp.val[3]);
-      vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]);
-
-      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
-   }
-}
-
-static uint8x8_t
-paeth(uint8x8_t a, uint8x8_t b, uint8x8_t c)
-{
-   uint8x8_t d, e;
-   uint16x8_t p1, pa, pb, pc;
-
-   p1 = vaddl_u8(a, b); /* a + b */
-   pc = vaddl_u8(c, c); /* c * 2 */
-   pa = vabdl_u8(b, c); /* pa */
-   pb = vabdl_u8(a, c); /* pb */
-   pc = vabdq_u16(p1, pc); /* pc */
-
-   p1 = vcleq_u16(pa, pb); /* pa <= pb */
-   pa = vcleq_u16(pa, pc); /* pa <= pc */
-   pb = vcleq_u16(pb, pc); /* pb <= pc */
-
-   p1 = vandq_u16(p1, pa); /* pa <= pb && pa <= pc */
-
-   d = vmovn_u16(pb);
-   e = vmovn_u16(p1);
-
-   d = vbsl_u8(d, b, c);
-   e = vbsl_u8(e, a, d);
-
-   return e;
-}
-
-void
-png_read_filter_row_paeth3_neon(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp = row;
-   png_const_bytep pp = prev_row;
-   png_bytep rp_stop = row + row_info->rowbytes;
-
-   uint8x16_t vtmp;
-   uint8x8x2_t *vrpt;
-   uint8x8x2_t vrp;
-   uint8x8_t vlast = vdup_n_u8(0);
-   uint8x8x4_t vdest;
-   vdest.val[3] = vdup_n_u8(0);
-
-   vtmp = vld1q_u8(rp);
-   vrpt = png_ptr(uint8x8x2_t,&vtmp);
-   vrp = *vrpt;
-
-   png_debug(1, "in png_read_filter_row_paeth3_neon");
-
-   for (; rp < rp_stop; pp += 12)
-   {
-      uint8x8x2_t *vppt;
-      uint8x8x2_t vpp;
-      uint8x8_t vtmp1, vtmp2, vtmp3;
-      uint32x2_t *temp_pointer;
-
-      vtmp = vld1q_u8(pp);
-      vppt = png_ptr(uint8x8x2_t,&vtmp);
-      vpp = *vppt;
-
-      vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast);
-      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
-
-      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3);
-      vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3);
-      vdest.val[1] = paeth(vdest.val[0], vtmp2, vpp.val[0]);
-      vdest.val[1] = vadd_u8(vdest.val[1], vtmp1);
-
-      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 6);
-      vtmp3 = vext_u8(vpp.val[0], vpp.val[1], 6);
-      vdest.val[2] = paeth(vdest.val[1], vtmp3, vtmp2);
-      vdest.val[2] = vadd_u8(vdest.val[2], vtmp1);
-
-      vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1);
-      vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1);
-
-      vtmp = vld1q_u8(rp + 12);
-      vrpt = png_ptr(uint8x8x2_t,&vtmp);
-      vrp = *vrpt;
-
-      vdest.val[3] = paeth(vdest.val[2], vtmp2, vtmp3);
-      vdest.val[3] = vadd_u8(vdest.val[3], vtmp1);
-
-      vlast = vtmp2;
-
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0);
-      rp += 3;
-      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0);
-      rp += 3;
-   }
-}
-
-void
-png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp = row;
-   png_bytep rp_stop = row + row_info->rowbytes;
-   png_const_bytep pp = prev_row;
-
-   uint8x8_t vlast = vdup_n_u8(0);
-   uint8x8x4_t vdest;
-   vdest.val[3] = vdup_n_u8(0);
-
-   png_debug(1, "in png_read_filter_row_paeth4_neon");
-
-   for (; rp < rp_stop; rp += 16, pp += 16)
-   {
-      uint32x2x4_t vtmp;
-      uint8x8x4_t *vrpt, *vppt;
-      uint8x8x4_t vrp, vpp;
-      uint32x2x4_t *temp_pointer;
-
-      vtmp = vld4_u32(png_ptr(uint32_t,rp));
-      vrpt = png_ptr(uint8x8x4_t,&vtmp);
-      vrp = *vrpt;
-      vtmp = vld4_u32(png_ptrc(uint32_t,pp));
-      vppt = png_ptr(uint8x8x4_t,&vtmp);
-      vpp = *vppt;
-
-      vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast);
-      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
-      vdest.val[1] = paeth(vdest.val[0], vpp.val[1], vpp.val[0]);
-      vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]);
-      vdest.val[2] = paeth(vdest.val[1], vpp.val[2], vpp.val[1]);
-      vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]);
-      vdest.val[3] = paeth(vdest.val[2], vpp.val[3], vpp.val[2]);
-      vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]);
-
-      vlast = vpp.val[3];
-
-      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
-   }
-}
-
-#endif /* PNG_ARM_NEON_OPT > 0 */
-#endif /* PNG_ARM_NEON_IMPLEMENTATION == 1 (intrinsics) */
-#endif /* READ */
diff --git a/src/png/libpng/intel/filter_sse2_intrinsics.c b/src/png/libpng/intel/filter_sse2_intrinsics.c
deleted file mode 100644
index 5e8553fbb..000000000
--- a/src/png/libpng/intel/filter_sse2_intrinsics.c
+++ /dev/null
@@ -1,406 +0,0 @@
-
-/* filter_sse2_intrinsics.c - SSE2 optimized filter functions
- *
- * Copyright (c) 2016-2017 Glenn Randers-Pehrson
- * Written by Mike Klein and Matt Sarett
- * Derived from arm/filter_neon_intrinsics.c
- *
- * Last changed in libpng 1.6.31 [July 27, 2017]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-#if PNG_INTEL_SSE_IMPLEMENTATION > 0
-
-#include <immintrin.h>
-
-/* Functions in this file look at most 3 pixels (a,b,c) to predict the 4th (d).
- * They're positioned like this:
- *    prev:  c b
- *    row:   a d
- * The Sub filter predicts d=a, Avg d=(a+b)/2, and Paeth predicts d to be
- * whichever of a, b, or c is closest to p=a+b-c.
- */
-
-static __m128i load4(const void* p) {
-   return _mm_cvtsi32_si128(*(const int*)p);
-}
-
-static void store4(void* p, __m128i v) {
-   *(int*)p = _mm_cvtsi128_si32(v);
-}
-
-static __m128i load3(const void* p) {
-   /* We'll load 2 bytes, then 1 byte,
-    * then mask them together, and finally load into SSE.
-    */
-   const png_uint_16* p01 = (png_const_uint_16p)p;
-   const png_byte*    p2  = (const png_byte*)(p01+1);
-
-   png_uint_32 v012 = (png_uint_32)(*p01)
-                    | (png_uint_32)(*p2) << 16;
-   return load4(&v012);
-}
-
-static void store3(void* p, __m128i v) {
-   /* We'll pull from SSE as a 32-bit int, then write
-    * its bottom two bytes, then its third byte.
-    */
-   png_uint_32 v012;
-   png_uint_16* p01;
-   png_byte*    p2;
-
-   store4(&v012, v);
-
-   p01 = (png_uint_16p)p;
-   p2  = (png_byte*)(p01+1);
-   *p01 = (png_uint_16)v012;
-   *p2  = (png_byte)(v012 >> 16);
-}
-
-void png_read_filter_row_sub3_sse2(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev)
-{
-   /* The Sub filter predicts each pixel as the previous pixel, a.
-    * There is no pixel to the left of the first pixel.  It's encoded directly.
-    * That works with our main loop if we just say that left pixel was zero.
-    */
-   png_size_t rb;
-
-   __m128i a, d = _mm_setzero_si128();
-
-   png_debug(1, "in png_read_filter_row_sub3_sse2");
-
-   rb = row_info->rowbytes;
-   while (rb >= 4) {
-      a = d; d = load4(row);
-      d = _mm_add_epi8(d, a);
-      store3(row, d);
-
-      row += 3;
-      rb  -= 3;
-   }
-   if (rb > 0) {
-      a = d; d = load3(row);
-      d = _mm_add_epi8(d, a);
-      store3(row, d);
-
-      row += 3;
-      rb  -= 3;
-   }
-   PNG_UNUSED(prev)
-}
-
-void png_read_filter_row_sub4_sse2(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev)
-{
-   /* The Sub filter predicts each pixel as the previous pixel, a.
-    * There is no pixel to the left of the first pixel.  It's encoded directly.
-    * That works with our main loop if we just say that left pixel was zero.
-    */
-   png_size_t rb;
-
-   __m128i a, d = _mm_setzero_si128();
-
-   png_debug(1, "in png_read_filter_row_sub4_sse2");
-
-   rb = row_info->rowbytes+4;
-   while (rb > 4) {
-      a = d; d = load4(row);
-      d = _mm_add_epi8(d, a);
-      store4(row, d);
-
-      row += 4;
-      rb  -= 4;
-   }
-   PNG_UNUSED(prev)
-}
-
-void png_read_filter_row_avg3_sse2(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev)
-{
-   /* The Avg filter predicts each pixel as the (truncated) average of a and b.
-    * There's no pixel to the left of the first pixel.  Luckily, it's
-    * predicted to be half of the pixel above it.  So again, this works
-    * perfectly with our loop if we make sure a starts at zero.
-    */
-
-   png_size_t rb;
-
-   const __m128i zero = _mm_setzero_si128();
-
-   __m128i    b;
-   __m128i a, d = zero;
-
-   png_debug(1, "in png_read_filter_row_avg3_sse2");
-   rb = row_info->rowbytes;
-   while (rb >= 4) {
-      __m128i avg;
-             b = load4(prev);
-      a = d; d = load4(row );
-
-      /* PNG requires a truncating average, so we can't just use _mm_avg_epu8 */
-      avg = _mm_avg_epu8(a,b);
-      /* ...but we can fix it up by subtracting off 1 if it rounded up. */
-      avg = _mm_sub_epi8(avg, _mm_and_si128(_mm_xor_si128(a,b),
-                                            _mm_set1_epi8(1)));
-      d = _mm_add_epi8(d, avg);
-      store3(row, d);
-
-      prev += 3;
-      row  += 3;
-      rb   -= 3;
-   }
-   if (rb > 0) {
-      __m128i avg;
-             b = load3(prev);
-      a = d; d = load3(row );
-
-      /* PNG requires a truncating average, so we can't just use _mm_avg_epu8 */
-      avg = _mm_avg_epu8(a,b);
-      /* ...but we can fix it up by subtracting off 1 if it rounded up. */
-      avg = _mm_sub_epi8(avg, _mm_and_si128(_mm_xor_si128(a,b),
-                                            _mm_set1_epi8(1)));
-
-      d = _mm_add_epi8(d, avg);
-      store3(row, d);
-
-      prev += 3;
-      row  += 3;
-      rb   -= 3;
-   }
-}
-
-void png_read_filter_row_avg4_sse2(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev)
-{
-   /* The Avg filter predicts each pixel as the (truncated) average of a and b.
-    * There's no pixel to the left of the first pixel.  Luckily, it's
-    * predicted to be half of the pixel above it.  So again, this works
-    * perfectly with our loop if we make sure a starts at zero.
-    */
-   png_size_t rb;
-   const __m128i zero = _mm_setzero_si128();
-   __m128i    b;
-   __m128i a, d = zero;
-
-   png_debug(1, "in png_read_filter_row_avg4_sse2");
-
-   rb = row_info->rowbytes+4;
-   while (rb > 4) {
-      __m128i avg;
-             b = load4(prev);
-      a = d; d = load4(row );
-
-      /* PNG requires a truncating average, so we can't just use _mm_avg_epu8 */
-      avg = _mm_avg_epu8(a,b);
-      /* ...but we can fix it up by subtracting off 1 if it rounded up. */
-      avg = _mm_sub_epi8(avg, _mm_and_si128(_mm_xor_si128(a,b),
-                                            _mm_set1_epi8(1)));
-
-      d = _mm_add_epi8(d, avg);
-      store4(row, d);
-
-      prev += 4;
-      row  += 4;
-      rb   -= 4;
-   }
-}
-
-/* Returns |x| for 16-bit lanes. */
-static __m128i abs_i16(__m128i x) {
-#if PNG_INTEL_SSE_IMPLEMENTATION >= 2
-   return _mm_abs_epi16(x);
-#else
-   /* Read this all as, return x<0 ? -x : x.
-   * To negate two's complement, you flip all the bits then add 1.
-    */
-   __m128i is_negative = _mm_cmplt_epi16(x, _mm_setzero_si128());
-
-   /* Flip negative lanes. */
-   x = _mm_xor_si128(x, is_negative);
-
-   /* +1 to negative lanes, else +0. */
-   x = _mm_sub_epi16(x, is_negative);
-   return x;
-#endif
-}
-
-/* Bytewise c ? t : e. */
-static __m128i if_then_else(__m128i c, __m128i t, __m128i e) {
-#if PNG_INTEL_SSE_IMPLEMENTATION >= 3
-   return _mm_blendv_epi8(e,t,c);
-#else
-   return _mm_or_si128(_mm_and_si128(c, t), _mm_andnot_si128(c, e));
-#endif
-}
-
-void png_read_filter_row_paeth3_sse2(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev)
-{
-   /* Paeth tries to predict pixel d using the pixel to the left of it, a,
-    * and two pixels from the previous row, b and c:
-    *   prev: c b
-    *   row:  a d
-    * The Paeth function predicts d to be whichever of a, b, or c is nearest to
-    * p=a+b-c.
-    *
-    * The first pixel has no left context, and so uses an Up filter, p = b.
-    * This works naturally with our main loop's p = a+b-c if we force a and c
-    * to zero.
-    * Here we zero b and d, which become c and a respectively at the start of
-    * the loop.
-    */
-   png_size_t rb;
-   const __m128i zero = _mm_setzero_si128();
-   __m128i c, b = zero,
-           a, d = zero;
-
-   png_debug(1, "in png_read_filter_row_paeth3_sse2");
-
-   rb = row_info->rowbytes;
-   while (rb >= 4) {
-      /* It's easiest to do this math (particularly, deal with pc) with 16-bit
-       * intermediates.
-       */
-      __m128i pa,pb,pc,smallest,nearest;
-      c = b; b = _mm_unpacklo_epi8(load4(prev), zero);
-      a = d; d = _mm_unpacklo_epi8(load4(row ), zero);
-
-      /* (p-a) == (a+b-c - a) == (b-c) */
-   
-      pa = _mm_sub_epi16(b,c);
-
-      /* (p-b) == (a+b-c - b) == (a-c) */
-      pb = _mm_sub_epi16(a,c);
-
-      /* (p-c) == (a+b-c - c) == (a+b-c-c) == (b-c)+(a-c) */
-      pc = _mm_add_epi16(pa,pb);
-
-      pa = abs_i16(pa);  /* |p-a| */
-      pb = abs_i16(pb);  /* |p-b| */
-      pc = abs_i16(pc);  /* |p-c| */
-
-      smallest = _mm_min_epi16(pc, _mm_min_epi16(pa, pb));
-
-      /* Paeth breaks ties favoring a over b over c. */
-      nearest  = if_then_else(_mm_cmpeq_epi16(smallest, pa), a,
-                 if_then_else(_mm_cmpeq_epi16(smallest, pb), b,
-                                                             c));
-
-      /* Note `_epi8`: we need addition to wrap modulo 255. */
-      d = _mm_add_epi8(d, nearest);
-      store3(row, _mm_packus_epi16(d,d));
-
-      prev += 3;
-      row  += 3;
-      rb   -= 3;
-   }
-   if (rb > 0) {
-      /* It's easiest to do this math (particularly, deal with pc) with 16-bit
-       * intermediates.
-       */
-      __m128i pa,pb,pc,smallest,nearest;
-      c = b; b = _mm_unpacklo_epi8(load3(prev), zero);
-      a = d; d = _mm_unpacklo_epi8(load3(row ), zero);
-
-      /* (p-a) == (a+b-c - a) == (b-c) */
-      pa = _mm_sub_epi16(b,c);
-
-      /* (p-b) == (a+b-c - b) == (a-c) */
-      pb = _mm_sub_epi16(a,c);
-
-      /* (p-c) == (a+b-c - c) == (a+b-c-c) == (b-c)+(a-c) */
-      pc = _mm_add_epi16(pa,pb);
-
-      pa = abs_i16(pa);  /* |p-a| */
-      pb = abs_i16(pb);  /* |p-b| */
-      pc = abs_i16(pc);  /* |p-c| */
-
-      smallest = _mm_min_epi16(pc, _mm_min_epi16(pa, pb));
-
-      /* Paeth breaks ties favoring a over b over c. */
-      nearest  = if_then_else(_mm_cmpeq_epi16(smallest, pa), a,
-                         if_then_else(_mm_cmpeq_epi16(smallest, pb), b,
-                                                                     c));
-
-      /* Note `_epi8`: we need addition to wrap modulo 255. */
-      d = _mm_add_epi8(d, nearest);
-      store3(row, _mm_packus_epi16(d,d));
-
-      prev += 3;
-      row  += 3;
-      rb   -= 3;
-   }
-}
-
-void png_read_filter_row_paeth4_sse2(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev)
-{
-   /* Paeth tries to predict pixel d using the pixel to the left of it, a,
-    * and two pixels from the previous row, b and c:
-    *   prev: c b
-    *   row:  a d
-    * The Paeth function predicts d to be whichever of a, b, or c is nearest to
-    * p=a+b-c.
-    *
-    * The first pixel has no left context, and so uses an Up filter, p = b.
-    * This works naturally with our main loop's p = a+b-c if we force a and c
-    * to zero.
-    * Here we zero b and d, which become c and a respectively at the start of
-    * the loop.
-    */
-   png_size_t rb;
-   const __m128i zero = _mm_setzero_si128();
-   __m128i pa,pb,pc,smallest,nearest;
-   __m128i c, b = zero,
-           a, d = zero;
-
-   png_debug(1, "in png_read_filter_row_paeth4_sse2");
-
-   rb = row_info->rowbytes+4;
-   while (rb > 4) {
-      /* It's easiest to do this math (particularly, deal with pc) with 16-bit
-       * intermediates.
-       */
-      c = b; b = _mm_unpacklo_epi8(load4(prev), zero);
-      a = d; d = _mm_unpacklo_epi8(load4(row ), zero);
-
-      /* (p-a) == (a+b-c - a) == (b-c) */
-      pa = _mm_sub_epi16(b,c);
-
-      /* (p-b) == (a+b-c - b) == (a-c) */
-      pb = _mm_sub_epi16(a,c);
-
-      /* (p-c) == (a+b-c - c) == (a+b-c-c) == (b-c)+(a-c) */
-      pc = _mm_add_epi16(pa,pb);
-
-      pa = abs_i16(pa);  /* |p-a| */
-      pb = abs_i16(pb);  /* |p-b| */
-      pc = abs_i16(pc);  /* |p-c| */
-
-      smallest = _mm_min_epi16(pc, _mm_min_epi16(pa, pb));
-
-      /* Paeth breaks ties favoring a over b over c. */
-      nearest  = if_then_else(_mm_cmpeq_epi16(smallest, pa), a,
-                         if_then_else(_mm_cmpeq_epi16(smallest, pb), b,
-                                                                     c));
-
-      /* Note `_epi8`: we need addition to wrap modulo 255. */
-      d = _mm_add_epi8(d, nearest);
-      store4(row, _mm_packus_epi16(d,d));
-
-      prev += 4;
-      row  += 4;
-      rb   -= 4;
-   }
-}
-
-#endif /* PNG_INTEL_SSE_IMPLEMENTATION > 0 */
-#endif /* READ */
diff --git a/src/png/libpng/intel/intel_init.c b/src/png/libpng/intel/intel_init.c
deleted file mode 100644
index 8f08baf8c..000000000
--- a/src/png/libpng/intel/intel_init.c
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/* intel_init.c - SSE2 optimized filter functions
- *
- * Copyright (c) 2016-2017 Glenn Randers-Pehrson
- * Written by Mike Klein and Matt Sarett, Google, Inc.
- * Derived from arm/arm_init.c
- *
- * Last changed in libpng 1.6.29 [March 16, 2017]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-#if PNG_INTEL_SSE_IMPLEMENTATION > 0
-
-void
-png_init_filter_functions_sse2(png_structp pp, unsigned int bpp)
-{
-   /* The techniques used to implement each of these filters in SSE operate on
-    * one pixel at a time.
-    * So they generally speed up 3bpp images about 3x, 4bpp images about 4x.
-    * They can scale up to 6 and 8 bpp images and down to 2 bpp images,
-    * but they'd not likely have any benefit for 1bpp images.
-    * Most of these can be implemented using only MMX and 64-bit registers,
-    * but they end up a bit slower than using the equally-ubiquitous SSE2.
-   */
-   png_debug(1, "in png_init_filter_functions_sse2");
-   if (bpp == 3)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_sse2;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_sse2;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-         png_read_filter_row_paeth3_sse2;
-   }
-   else if (bpp == 4)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_sse2;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_sse2;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-          png_read_filter_row_paeth4_sse2;
-   }
-
-   /* No need optimize PNG_FILTER_VALUE_UP.  The compiler should
-    * autovectorize.
-    */
-}
-
-#endif /* PNG_INTEL_SSE_IMPLEMENTATION > 0 */
-#endif /* PNG_READ_SUPPORTED */
diff --git a/src/png/libpng/libpng-config.in b/src/png/libpng/libpng-config.in
deleted file mode 100644
index 69bf8e33f..000000000
--- a/src/png/libpng/libpng-config.in
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh
-
-# libpng-config
-# provides configuration info for libpng.
-
-# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Modeled after libxml-config.
-
-version="@PNGLIB_VERSION@"
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-libdir="@libdir@"
-includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
-I_opts="-I${includedir}"
-L_opts="-L${libdir}"
-R_opts=""
-cppflags=""
-ccopts=""
-ldopts=""
-
-usage()
-{
-    cat <<EOF
-Usage: $0 [OPTION] ...
-
-Known values for OPTION are:
-
-  --prefix        print libpng prefix
-  --libdir        print path to directory containing library
-  --libs          print library linking information
-  --ccopts        print compiler options
-  --cppflags      print pre-processor flags
-  --cflags        print preprocessor flags, I_opts, and compiler options
-  --I_opts        print "-I" include options
-  --L_opts        print linker "-L" flags for dynamic linking
-  --R_opts        print dynamic linker "-R" or "-rpath" flags
-  --ldopts        print linker options
-  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)
-  --static        revise subsequent outputs for static linking
-  --help          print this help and exit
-  --version       print version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-while test $# -gt 0; do
-    case "$1" in
-
-    --prefix)
-        echo ${prefix}
-        ;;
-
-    --version)
-        echo ${version}
-        exit 0
-        ;;
-
-    --help)
-        usage 0
-        ;;
-
-    --ccopts)
-        echo ${ccopts}
-        ;;
-
-    --cppflags)
-        echo ${cppflags}
-        ;;
-
-    --cflags)
-        echo ${I_opts} ${cppflags} ${ccopts}
-        ;;
-
-    --libdir)
-        echo ${libdir}
-        ;;
-
-    --libs)
-        echo ${libs}
-        ;;
-
-    --I_opts)
-        echo ${I_opts}
-        ;;
-
-    --L_opts)
-        echo ${L_opts}
-        ;;
-
-    --R_opts)
-        echo ${R_opts}
-        ;;
-
-    --ldopts)
-        echo ${ldopts}
-        ;;
-
-    --ldflags)
-        echo ${ldopts} ${L_opts} ${R_opts} ${libs}
-        ;;
-
-    --static)
-        R_opts=""
-        libs=${all_libs}
-        ;;
-
-    *)
-        usage
-        exit 1
-        ;;
-    esac
-    shift
-done
-
-exit 0
diff --git a/src/png/libpng/libpng.pc.in b/src/png/libpng/libpng.pc.in
deleted file mode 100644
index 9708e9af2..000000000
--- a/src/png/libpng/libpng.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-
-Name: libpng
-Description: Loads and saves PNG files
-Version: @PNGLIB_VERSION@
-Requires: zlib
-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-Libs.private: @LIBS@
-Cflags: -I${includedir}
diff --git a/src/png/libpng/mips/filter_msa_intrinsics.c b/src/png/libpng/mips/filter_msa_intrinsics.c
deleted file mode 100644
index 943bb3d05..000000000
--- a/src/png/libpng/mips/filter_msa_intrinsics.c
+++ /dev/null
@@ -1,807 +0,0 @@
-
-/* filter_msa_intrinsics.c - MSA optimised filter functions
- *
- * Copyright (c) 2016 Glenn Randers-Pehrson
- * Written by Mandar Sahastrabuddhe, August 2016.
- * Last changed in libpng 1.6.25 [September 1, 2016]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-#include <stdio.h>
-#include <stdint.h>
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* This code requires -mfpu=msa on the command line: */
-#if PNG_MIPS_MSA_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
-
-#include <msa.h>
-
-/* libpng row pointers are not necessarily aligned to any particular boundary,
- * however this code will only work with appropriate alignment. mips/mips_init.c
- * checks for this (and will not compile unless it is done). This code uses
- * variants of png_aligncast to avoid compiler warnings.
- */
-#define png_ptr(type,pointer) png_aligncast(type *,pointer)
-#define png_ptrc(type,pointer) png_aligncastconst(const type *,pointer)
-
-/* The following relies on a variable 'temp_pointer' being declared with type
- * 'type'.  This is written this way just to hide the GCC strict aliasing
- * warning; note that the code is safe because there never is an alias between
- * the input and output pointers.
- */
-#define png_ldr(type,pointer)\
-   (temp_pointer = png_ptr(type,pointer), *temp_pointer)
-
-#if PNG_MIPS_MSA_OPT > 0
-
-#ifdef CLANG_BUILD
-   #define MSA_SRLI_B(a, b)   __msa_srli_b((v16i8) a, b)
-
-   #define LW(psrc)                              \
-   ( {                                           \
-       uint8_t *psrc_lw_m = (uint8_t *) (psrc);  \
-       uint32_t val_m;                           \
-                                                 \
-       asm volatile (                            \
-           "lw  %[val_m],  %[psrc_lw_m]  \n\t"   \
-                                                 \
-           : [val_m] "=r" (val_m)                \
-           : [psrc_lw_m] "m" (*psrc_lw_m)        \
-       );                                        \
-                                                 \
-       val_m;                                    \
-   } )
-
-   #define SH(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sh_m = (uint8_t *) (pdst);  \
-       uint16_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sh  %[val_m],  %[pdst_sh_m]  \n\t"   \
-                                                 \
-           : [pdst_sh_m] "=m" (*pdst_sh_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SW(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sw_m = (uint8_t *) (pdst);  \
-       uint32_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sw  %[val_m],  %[pdst_sw_m]  \n\t"   \
-                                                 \
-           : [pdst_sw_m] "=m" (*pdst_sw_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-       #if (__mips == 64)
-        #define SD(val, pdst)                         \
-        {                                             \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);  \
-            uint64_t val_m = (val);                   \
-                                                      \
-            asm volatile (                            \
-                "sd  %[val_m],  %[pdst_sd_m]  \n\t"   \
-                                                      \
-                : [pdst_sd_m] "=m" (*pdst_sd_m)       \
-                : [val_m] "r" (val_m)                 \
-            );                                        \
-        }
-    #else
-        #define SD(val, pdst)                                          \
-        {                                                              \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);                   \
-            uint32_t val0_m, val1_m;                                   \
-                                                                       \
-            val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF);          \
-            val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF);  \
-                                                                       \
-            SW(val0_m, pdst_sd_m);                                     \
-            SW(val1_m, pdst_sd_m + 4);                                 \
-        }
-    #endif
-#else
-   #define MSA_SRLI_B(a, b)   (a >> b)
-
-#if (__mips_isa_rev >= 6)
-   #define LW(psrc)                              \
-   ( {                                           \
-       uint8_t *psrc_lw_m = (uint8_t *) (psrc);  \
-       uint32_t val_m;                           \
-                                                 \
-       asm volatile (                            \
-           "lw  %[val_m],  %[psrc_lw_m]  \n\t"   \
-                                                 \
-           : [val_m] "=r" (val_m)                \
-           : [psrc_lw_m] "m" (*psrc_lw_m)        \
-       );                                        \
-                                                 \
-       val_m;                                    \
-   } )
-
-   #define SH(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sh_m = (uint8_t *) (pdst);  \
-       uint16_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sh  %[val_m],  %[pdst_sh_m]  \n\t"   \
-                                                 \
-           : [pdst_sh_m] "=m" (*pdst_sh_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SW(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sw_m = (uint8_t *) (pdst);  \
-       uint32_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sw  %[val_m],  %[pdst_sw_m]  \n\t"   \
-                                                 \
-           : [pdst_sw_m] "=m" (*pdst_sw_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #if (__mips == 64)
-        #define SD(val, pdst)                         \
-        {                                             \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);  \
-            uint64_t val_m = (val);                   \
-                                                      \
-            asm volatile (                            \
-                "sd  %[val_m],  %[pdst_sd_m]  \n\t"   \
-                                                      \
-                : [pdst_sd_m] "=m" (*pdst_sd_m)       \
-                : [val_m] "r" (val_m)                 \
-            );                                        \
-        }
-    #else
-        #define SD(val, pdst)                                          \
-        {                                                              \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);                   \
-            uint32_t val0_m, val1_m;                                   \
-                                                                       \
-            val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF);          \
-            val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF);  \
-                                                                       \
-            SW(val0_m, pdst_sd_m);                                     \
-            SW(val1_m, pdst_sd_m + 4);                                 \
-        }
-    #endif
-#else  // !(__mips_isa_rev >= 6)
-   #define LW(psrc)                              \
-   ( {                                           \
-       uint8_t *psrc_lw_m = (uint8_t *) (psrc);  \
-       uint32_t val_m;                           \
-                                                 \
-       asm volatile (                            \
-           "ulw  %[val_m],  %[psrc_lw_m]  \n\t"  \
-                                                 \
-           : [val_m] "=r" (val_m)                \
-           : [psrc_lw_m] "m" (*psrc_lw_m)        \
-       );                                        \
-                                                 \
-       val_m;                                    \
-   } )
-
-   #define SH(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sh_m = (uint8_t *) (pdst);  \
-       uint16_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "ush  %[val_m],  %[pdst_sh_m]  \n\t"  \
-                                                 \
-           : [pdst_sh_m] "=m" (*pdst_sh_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SW(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sw_m = (uint8_t *) (pdst);  \
-       uint32_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "usw  %[val_m],  %[pdst_sw_m]  \n\t"  \
-                                                 \
-           : [pdst_sw_m] "=m" (*pdst_sw_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SD(val, pdst)                                          \
-    {                                                              \
-        uint8_t *pdst_sd_m = (uint8_t *) (pdst);                   \
-        uint32_t val0_m, val1_m;                                   \
-                                                                   \
-        val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF);          \
-        val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF);  \
-                                                                   \
-        SW(val0_m, pdst_sd_m);                                     \
-        SW(val1_m, pdst_sd_m + 4);                                 \
-    }
-
-    #define SW_ZERO(pdst)                      \
-    {                                          \
-        uint8_t *pdst_m = (uint8_t *) (pdst);  \
-                                               \
-        asm volatile (                         \
-            "usw  $0,  %[pdst_m]  \n\t"        \
-                                               \
-            : [pdst_m] "=m" (*pdst_m)          \
-            :                                  \
-        );                                     \
-    }
-#endif  // (__mips_isa_rev >= 6)
-#endif
-
-#define LD_B(RTYPE, psrc) *((RTYPE *) (psrc))
-#define LD_UB(...) LD_B(v16u8, __VA_ARGS__)
-#define LD_B2(RTYPE, psrc, stride, out0, out1)  \
-{                                               \
-    out0 = LD_B(RTYPE, (psrc));                 \
-    out1 = LD_B(RTYPE, (psrc) + stride);        \
-}
-#define LD_UB2(...) LD_B2(v16u8, __VA_ARGS__)
-#define LD_B4(RTYPE, psrc, stride, out0, out1, out2, out3)   \
-{                                                            \
-    LD_B2(RTYPE, (psrc), stride, out0, out1);                \
-    LD_B2(RTYPE, (psrc) + 2 * stride , stride, out2, out3);  \
-}
-#define LD_UB4(...) LD_B4(v16u8, __VA_ARGS__)
-
-#define ST_B(RTYPE, in, pdst) *((RTYPE *) (pdst)) = (in)
-#define ST_UB(...) ST_B(v16u8, __VA_ARGS__)
-#define ST_B2(RTYPE, in0, in1, pdst, stride)  \
-{                                             \
-    ST_B(RTYPE, in0, (pdst));                 \
-    ST_B(RTYPE, in1, (pdst) + stride);        \
-}
-#define ST_UB2(...) ST_B2(v16u8, __VA_ARGS__)
-#define ST_B4(RTYPE, in0, in1, in2, in3, pdst, stride)    \
-{                                                         \
-    ST_B2(RTYPE, in0, in1, (pdst), stride);               \
-    ST_B2(RTYPE, in2, in3, (pdst) + 2 * stride, stride);  \
-}
-#define ST_UB4(...) ST_B4(v16u8, __VA_ARGS__)
-
-#define ADD2(in0, in1, in2, in3, out0, out1)  \
-{                                             \
-    out0 = in0 + in1;                         \
-    out1 = in2 + in3;                         \
-}
-#define ADD3(in0, in1, in2, in3, in4, in5,  \
-             out0, out1, out2)              \
-{                                           \
-    ADD2(in0, in1, in2, in3, out0, out1);   \
-    out2 = in4 + in5;                       \
-}
-#define ADD4(in0, in1, in2, in3, in4, in5, in6, in7,  \
-             out0, out1, out2, out3)                  \
-{                                                     \
-    ADD2(in0, in1, in2, in3, out0, out1);             \
-    ADD2(in4, in5, in6, in7, out2, out3);             \
-}
-
-#define ILVR_B2(RTYPE, in0, in1, in2, in3, out0, out1)      \
-{                                                           \
-    out0 = (RTYPE) __msa_ilvr_b((v16i8) in0, (v16i8) in1);  \
-    out1 = (RTYPE) __msa_ilvr_b((v16i8) in2, (v16i8) in3);  \
-}
-#define ILVR_B2_SH(...) ILVR_B2(v8i16, __VA_ARGS__)
-
-#define HSUB_UB2(RTYPE, in0, in1, out0, out1)                 \
-{                                                             \
-    out0 = (RTYPE) __msa_hsub_u_h((v16u8) in0, (v16u8) in0);  \
-    out1 = (RTYPE) __msa_hsub_u_h((v16u8) in1, (v16u8) in1);  \
-}
-#define HSUB_UB2_SH(...) HSUB_UB2(v8i16, __VA_ARGS__)
-
-#define SLDI_B2_0(RTYPE, in0, in1, out0, out1, slide_val)                 \
-{                                                                         \
-    v16i8 zero_m = { 0 };                                                 \
-    out0 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in0, slide_val);  \
-    out1 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in1, slide_val);  \
-}
-#define SLDI_B2_0_UB(...) SLDI_B2_0(v16u8, __VA_ARGS__)
-
-#define SLDI_B3_0(RTYPE, in0, in1, in2, out0, out1, out2,  slide_val)     \
-{                                                                         \
-    v16i8 zero_m = { 0 };                                                 \
-    SLDI_B2_0(RTYPE, in0, in1, out0, out1, slide_val);                    \
-    out2 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in2, slide_val);  \
-}
-#define SLDI_B3_0_UB(...) SLDI_B3_0(v16u8, __VA_ARGS__)
-
-#define ILVEV_W2(RTYPE, in0, in1, in2, in3, out0, out1)      \
-{                                                            \
-    out0 = (RTYPE) __msa_ilvev_w((v4i32) in1, (v4i32) in0);  \
-    out1 = (RTYPE) __msa_ilvev_w((v4i32) in3, (v4i32) in2);  \
-}
-#define ILVEV_W2_UB(...) ILVEV_W2(v16u8, __VA_ARGS__)
-
-#define ADD_ABS_H3(RTYPE, in0, in1, in2, out0, out1, out2)  \
-{                                                           \
-    RTYPE zero = {0};                                       \
-                                                            \
-    out0 = __msa_add_a_h((v8i16) zero, in0);                \
-    out1 = __msa_add_a_h((v8i16) zero, in1);                \
-    out2 = __msa_add_a_h((v8i16) zero, in2);                \
-}
-#define ADD_ABS_H3_SH(...) ADD_ABS_H3(v8i16, __VA_ARGS__)
-
-#define VSHF_B2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1)       \
-{                                                                          \
-    out0 = (RTYPE) __msa_vshf_b((v16i8) mask0, (v16i8) in1, (v16i8) in0);  \
-    out1 = (RTYPE) __msa_vshf_b((v16i8) mask1, (v16i8) in3, (v16i8) in2);  \
-}
-#define VSHF_B2_UB(...) VSHF_B2(v16u8, __VA_ARGS__)
-
-#define CMP_AND_SELECT(inp0, inp1, inp2, inp3, inp4, inp5, out0)              \
-{                                                                             \
-   v8i16 _sel_h0, _sel_h1;                                                    \
-   v16u8 _sel_b0, _sel_b1;                                                    \
-   _sel_h0 = (v8i16) __msa_clt_u_h((v8u16) inp1, (v8u16) inp0);               \
-   _sel_b0 = (v16u8) __msa_pckev_b((v16i8) _sel_h0, (v16i8) _sel_h0);         \
-   inp0 = (v8i16) __msa_bmnz_v((v16u8) inp0, (v16u8) inp1, (v16u8) _sel_h0);  \
-   inp4 = (v16u8) __msa_bmnz_v(inp3, inp4, _sel_b0);                          \
-   _sel_h1 = (v8i16) __msa_clt_u_h((v8u16) inp2, (v8u16) inp0);               \
-   _sel_b1 = (v16u8) __msa_pckev_b((v16i8) _sel_h1, (v16i8) _sel_h1);         \
-   inp4 = (v16u8) __msa_bmnz_v(inp4, inp5, _sel_b1);                          \
-   out0 += inp4;                                                              \
-}
-
-void png_read_filter_row_up_msa(png_row_infop row_info, png_bytep row,
-                                png_const_bytep prev_row)
-{
-   png_size_t i, cnt, cnt16, cnt32;
-   png_size_t istop = row_info->rowbytes;
-   png_bytep rp = row;
-   png_const_bytep pp = prev_row;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7;
-
-   for (i = 0; i < (istop >> 6); i++)
-   {
-      LD_UB4(rp, 16, src0, src1, src2, src3);
-      LD_UB4(pp, 16, src4, src5, src6, src7);
-      pp += 64;
-
-	  ADD4(src0, src4, src1, src5, src2, src6, src3, src7,
-	       src0, src1, src2, src3);
-
-      ST_UB4(src0, src1, src2, src3, rp, 16);
-      rp += 64;
-   }
-
-   if (istop & 0x3F)
-   {
-      cnt32 = istop & 0x20;
-      cnt16 = istop & 0x10;
-      cnt = istop & 0xF;
-
-      if(cnt32)
-      {
-         if (cnt16 && cnt)
-         {
-            LD_UB4(rp, 16, src0, src1, src2, src3);
-            LD_UB4(pp, 16, src4, src5, src6, src7);
-
-            ADD4(src0, src4, src1, src5, src2, src6, src3, src7,
-	             src0, src1, src2, src3);
-
-            ST_UB4(src0, src1, src2, src3, rp, 16);
-            rp += 64;
-         }
-         else if (cnt16 || cnt)
-         {
-            LD_UB2(rp, 16, src0, src1);
-            LD_UB2(pp, 16, src4, src5);
-            pp += 32;
-            src2 = LD_UB(rp + 32);
-            src6 = LD_UB(pp);
-
-            ADD3(src0, src4, src1, src5, src2, src6, src0, src1, src2);
-
-            ST_UB2(src0, src1, rp, 16);
-            rp += 32;
-            ST_UB(src2, rp);
-            rp += 16;
-         }
-         else
-         {
-            LD_UB2(rp, 16, src0, src1);
-            LD_UB2(pp, 16, src4, src5);
-
-			ADD2(src0, src4, src1, src5, src0, src1);
-
-            ST_UB2(src0, src1, rp, 16);
-            rp += 32;
-         }
-      }
-      else if (cnt16 && cnt)
-      {
-         LD_UB2(rp, 16, src0, src1);
-         LD_UB2(pp, 16, src4, src5);
-
-         ADD2(src0, src4, src1, src5, src0, src1);
-
-         ST_UB2(src0, src1, rp, 16);
-         rp += 32;
-      }
-      else if (cnt16 || cnt)
-      {
-         src0 = LD_UB(rp);
-         src4 = LD_UB(pp);
-         pp += 16;
-
-         src0 += src4;
-
-         ST_UB(src0, rp);
-         rp += 16;
-      }
-   }
-}
-
-void png_read_filter_row_sub4_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t count;
-   png_size_t istop = row_info->rowbytes;
-   png_bytep src = row;
-   png_bytep nxt = row + 4;
-   int32_t inp0;
-   v16u8 src0, src1, src2, src3, src4;
-   v16u8 dst0, dst1;
-   v16u8 zero = { 0 };
-
-   istop -= 4;
-
-   inp0 = LW(src);
-   src += 4;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-
-   for (count = 0; count < istop; count += 16)
-   {
-      src1 = LD_UB(src);
-      src += 16;
-
-      src2 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 4);
-      src3 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 8);
-      src4 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 12);
-      src1 += src0;
-      src2 += src1;
-      src3 += src2;
-      src4 += src3;
-      src0 = src4;
-      ILVEV_W2_UB(src1, src2, src3, src4, dst0, dst1);
-      dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
-
-      ST_UB(dst0, nxt);
-      nxt += 16;
-   }
-}
-
-void png_read_filter_row_sub3_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t count;
-   png_size_t istop = row_info->rowbytes;
-   png_bytep src = row;
-   png_bytep nxt = row + 3;
-   int64_t out0;
-   int32_t inp0, out1;
-   v16u8 src0, src1, src2, src3, src4, dst0, dst1;
-   v16u8 zero = { 0 };
-   v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
-
-   istop -= 3;
-
-   inp0 = LW(src);
-   src += 3;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-
-   for (count = 0; count < istop; count += 12)
-   {
-      src1 = LD_UB(src);
-      src += 12;
-
-      src2 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 3);
-      src3 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 6);
-      src4 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 9);
-      src1 += src0;
-      src2 += src1;
-      src3 += src2;
-      src4 += src3;
-      src0 = src4;
-      VSHF_B2_UB(src1, src2, src3, src4, mask0, mask0, dst0, dst1);
-      dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
-      out0 = __msa_copy_s_d((v2i64) dst0, 0);
-      out1 = __msa_copy_s_w((v4i32) dst0, 2);
-
-      SD(out0, nxt);
-      nxt += 8;
-      SW(out1, nxt);
-      nxt += 4;
-   }
-}
-
-void png_read_filter_row_avg4_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_bytep src = row;
-   png_bytep nxt = row;
-   png_const_bytep pp = prev_row;
-   png_size_t istop = row_info->rowbytes - 4;
-   int32_t inp0, inp1, out0;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
-   v16u8 zero = { 0 };
-
-   inp0 = LW(pp);
-   pp += 4;
-   inp1 = LW(src);
-   src += 4;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-   src0 = (v16u8) MSA_SRLI_B(src0, 1);
-   src1 += src0;
-   out0 = __msa_copy_s_w((v4i32) src1, 0);
-   SW(out0, nxt);
-   nxt += 4;
-
-   for (i = 0; i < istop; i += 16)
-   {
-      src2 = LD_UB(pp);
-      pp += 16;
-      src6 = LD_UB(src);
-      src += 16;
-
-      SLDI_B2_0_UB(src2, src6, src3, src7, 4);
-      SLDI_B2_0_UB(src2, src6, src4, src8, 8);
-      SLDI_B2_0_UB(src2, src6, src5, src9, 12);
-      src2 = __msa_ave_u_b(src2, src1);
-      src6 += src2;
-      src3 = __msa_ave_u_b(src3, src6);
-      src7 += src3;
-      src4 = __msa_ave_u_b(src4, src7);
-      src8 += src4;
-      src5 = __msa_ave_u_b(src5, src8);
-      src9 += src5;
-      src1 = src9;
-      ILVEV_W2_UB(src6, src7, src8, src9, dst0, dst1);
-      dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
-
-      ST_UB(dst0, nxt);
-      nxt += 16;
-   }
-}
-
-void png_read_filter_row_avg3_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_bytep src = row;
-   png_bytep nxt = row;
-   png_const_bytep pp = prev_row;
-   png_size_t istop = row_info->rowbytes - 3;
-   int64_t out0;
-   int32_t inp0, inp1, out1;
-   int16_t out2;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
-   v16u8 zero = { 0 };
-   v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
-
-   inp0 = LW(pp);
-   pp += 3;
-   inp1 = LW(src);
-   src += 3;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-   src0 = (v16u8) MSA_SRLI_B(src0, 1);
-   src1 += src0;
-   out2 = __msa_copy_s_h((v8i16) src1, 0);
-   SH(out2, nxt);
-   nxt += 2;
-   nxt[0] = src1[2];
-   nxt++;
-
-   for (i = 0; i < istop; i += 12)
-   {
-      src2 = LD_UB(pp);
-      pp += 12;
-      src6 = LD_UB(src);
-      src += 12;
-
-      SLDI_B2_0_UB(src2, src6, src3, src7, 3);
-      SLDI_B2_0_UB(src2, src6, src4, src8, 6);
-      SLDI_B2_0_UB(src2, src6, src5, src9, 9);
-      src2 = __msa_ave_u_b(src2, src1);
-      src6 += src2;
-      src3 = __msa_ave_u_b(src3, src6);
-      src7 += src3;
-      src4 = __msa_ave_u_b(src4, src7);
-      src8 += src4;
-      src5 = __msa_ave_u_b(src5, src8);
-      src9 += src5;
-      src1 = src9;
-      VSHF_B2_UB(src6, src7, src8, src9, mask0, mask0, dst0, dst1);
-      dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
-      out0 = __msa_copy_s_d((v2i64) dst0, 0);
-      out1 = __msa_copy_s_w((v4i32) dst0, 2);
-
-      SD(out0, nxt);
-      nxt += 8;
-      SW(out1, nxt);
-      nxt += 4;
-   }
-}
-
-void png_read_filter_row_paeth4_msa(png_row_infop row_info,
-                                    png_bytep row,
-                                    png_const_bytep prev_row)
-{
-   int32_t count, rp_end;
-   png_bytep nxt;
-   png_const_bytep prev_nxt;
-   int32_t inp0, inp1, res0;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9;
-   v16u8 src10, src11, src12, src13, dst0, dst1;
-   v8i16 vec0, vec1, vec2;
-   v16u8 zero = { 0 };
-
-   nxt = row;
-   prev_nxt = prev_row;
-
-   inp0 = LW(nxt);
-   inp1 = LW(prev_nxt);
-   prev_nxt += 4;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-
-   src1 += src0;
-   res0 = __msa_copy_s_w((v4i32) src1, 0);
-
-   SW(res0, nxt);
-   nxt += 4;
-
-   /* Remainder */
-   rp_end = row_info->rowbytes - 4;
-
-   for (count = 0; count < rp_end; count += 16)
-   {
-      src2 = LD_UB(prev_nxt);
-      prev_nxt += 16;
-      src6 = LD_UB(prev_row);
-      prev_row += 16;
-      src10 = LD_UB(nxt);
-
-      SLDI_B3_0_UB(src2, src6, src10, src3, src7, src11, 4);
-      SLDI_B3_0_UB(src2, src6, src10, src4, src8, src12, 8);
-      SLDI_B3_0_UB(src2, src6, src10, src5, src9, src13, 12);
-      ILVR_B2_SH(src2, src6, src1, src6, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src1, src2, src6, src10);
-      ILVR_B2_SH(src3, src7, src10, src7, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src10, src3, src7, src11);
-      ILVR_B2_SH(src4, src8, src11, src8, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src11, src4, src8, src12);
-      ILVR_B2_SH(src5, src9, src12, src9, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src12, src5, src9, src13);
-      src1 = src13;
-      ILVEV_W2_UB(src10, src11, src12, src1, dst0, dst1);
-      dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
-
-      ST_UB(dst0, nxt);
-      nxt += 16;
-   }
-}
-
-void png_read_filter_row_paeth3_msa(png_row_infop row_info,
-                                    png_bytep row,
-                                    png_const_bytep prev_row)
-{
-   int32_t count, rp_end;
-   png_bytep nxt;
-   png_const_bytep prev_nxt;
-   int64_t out0;
-   int32_t inp0, inp1, out1;
-   int16_t out2;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
-   v16u8 src10, src11, src12, src13;
-   v8i16 vec0, vec1, vec2;
-   v16u8 zero = { 0 };
-   v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
-
-   nxt = row;
-   prev_nxt = prev_row;
-
-   inp0 = LW(nxt);
-   inp1 = LW(prev_nxt);
-   prev_nxt += 3;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-
-   src1 += src0;
-   out2 = __msa_copy_s_h((v8i16) src1, 0);
-
-   SH(out2, nxt);
-   nxt += 2;
-   nxt[0] = src1[2];
-   nxt++;
-
-   /* Remainder */
-   rp_end = row_info->rowbytes - 3;
-
-   for (count = 0; count < rp_end; count += 12)
-   {
-      src2 = LD_UB(prev_nxt);
-      prev_nxt += 12;
-      src6 = LD_UB(prev_row);
-      prev_row += 12;
-      src10 = LD_UB(nxt);
-
-      SLDI_B3_0_UB(src2, src6, src10, src3, src7, src11, 3);
-      SLDI_B3_0_UB(src2, src6, src10, src4, src8, src12, 6);
-      SLDI_B3_0_UB(src2, src6, src10, src5, src9, src13, 9);
-      ILVR_B2_SH(src2, src6, src1, src6, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src1, src2, src6, src10);
-      ILVR_B2_SH(src3, src7, src10, src7, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src10, src3, src7, src11);
-      ILVR_B2_SH(src4, src8, src11, src8, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src11, src4, src8, src12);
-      ILVR_B2_SH(src5, src9, src12, src9, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src12, src5, src9, src13);
-      src1 = src13;
-      VSHF_B2_UB(src10, src11, src12, src13, mask0, mask0, dst0, dst1);
-      dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
-      out0 = __msa_copy_s_d((v2i64) dst0, 0);
-      out1 = __msa_copy_s_w((v4i32) dst0, 2);
-
-      SD(out0, nxt);
-      nxt += 8;
-      SW(out1, nxt);
-      nxt += 4;
-   }
-}
-
-#endif /* PNG_MIPS_MSA_OPT > 0 */
-#endif /* PNG_MIPS_MSA_IMPLEMENTATION == 1 (intrinsics) */
-#endif /* READ */
diff --git a/src/png/libpng/mips/mips_init.c b/src/png/libpng/mips/mips_init.c
deleted file mode 100644
index 0bfb7a32e..000000000
--- a/src/png/libpng/mips/mips_init.c
+++ /dev/null
@@ -1,129 +0,0 @@
-
-/* mips_init.c - MSA optimised filter functions
- *
- * Copyright (c) 2016 Glenn Randers-Pehrson
- * Written by Mandar Sahastrabuddhe, 2016.
- * Last changed in libpng 1.6.25 [September 1, 2016]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
- * called.
- */
-#define _POSIX_SOURCE 1
-
-#include <stdio.h>
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-#if PNG_MIPS_MSA_OPT > 0
-#ifdef PNG_MIPS_MSA_CHECK_SUPPORTED /* Do run-time checks */
-/* WARNING: it is strongly recommended that you do not build libpng with
- * run-time checks for CPU features if at all possible.  In the case of the MIPS
- * MSA instructions there is no processor-specific way of detecting the
- * presence of the required support, therefore run-time detection is extremely
- * OS specific.
- *
- * You may set the macro PNG_MIPS_MSA_FILE to the file name of file containing
- * a fragment of C source code which defines the png_have_msa function.  There
- * are a number of implementations in contrib/mips-msa, but the only one that
- * has partial support is contrib/mips-msa/linux.c - a generic Linux
- * implementation which reads /proc/cpufino.
- */
-#ifndef PNG_MIPS_MSA_FILE
-#  ifdef __linux__
-#     define PNG_MIPS_MSA_FILE "contrib/mips-msa/linux.c"
-#  endif
-#endif
-
-#ifdef PNG_MIPS_MSA_FILE
-
-#include <signal.h> /* for sig_atomic_t */
-static int png_have_msa(png_structp png_ptr);
-#include PNG_MIPS_MSA_FILE
-
-#else  /* PNG_MIPS_MSA_FILE */
-#  error "PNG_MIPS_MSA_FILE undefined: no support for run-time MIPS MSA checks"
-#endif /* PNG_MIPS_MSA_FILE */
-#endif /* PNG_MIPS_MSA_CHECK_SUPPORTED */
-
-#ifndef PNG_ALIGNED_MEMORY_SUPPORTED
-#  error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
-#endif
-
-void
-png_init_filter_functions_msa(png_structp pp, unsigned int bpp)
-{
-   /* The switch statement is compiled in for MIPS_MSA_API, the call to
-    * png_have_msa is compiled in for MIPS_MSA_CHECK. If both are defined
-    * the check is only performed if the API has not set the MSA option on
-    * or off explicitly. In this case the check controls what happens.
-    */
-
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
-   switch ((pp->options >> PNG_MIPS_MSA) & 3)
-   {
-      case PNG_OPTION_UNSET:
-         /* Allow the run-time check to execute if it has been enabled -
-          * thus both API and CHECK can be turned on.  If it isn't supported
-          * this case will fall through to the 'default' below, which just
-          * returns.
-          */
-#endif /* PNG_MIPS_MSA_API_SUPPORTED */
-#ifdef PNG_MIPS_MSA_CHECK_SUPPORTED
-         {
-            static volatile sig_atomic_t no_msa = -1; /* not checked */
-
-            if (no_msa < 0)
-               no_msa = !png_have_msa(pp);
-
-            if (no_msa)
-               return;
-         }
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
-         break;
-#endif
-#endif /* PNG_MIPS_MSA_CHECK_SUPPORTED */
-
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
-      default: /* OFF or INVALID */
-         return;
-
-      case PNG_OPTION_ON:
-         /* Option turned on */
-         break;
-   }
-#endif
-
-   /* IMPORTANT: any new external functions used here must be declared using
-    * PNG_INTERNAL_FUNCTION in ../pngpriv.h.  This is required so that the
-    * 'prefix' option to configure works:
-    *
-    *    ./configure --with-libpng-prefix=foobar_
-    *
-    * Verify you have got this right by running the above command, doing a build
-    * and examining pngprefix.h; it must contain a #define for every external
-    * function you add.  (Notice that this happens automatically for the
-    * initialization function.)
-    */
-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_msa;
-
-   if (bpp == 3)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_msa;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_msa;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth3_msa;
-   }
-
-   else if (bpp == 4)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_msa;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_msa;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth4_msa;
-   }
-}
-#endif /* PNG_MIPS_MSA_OPT > 0 */
-#endif /* READ */
diff --git a/src/png/libpng/png.c b/src/png/libpng/png.c
deleted file mode 100644
index ff02c5651..000000000
--- a/src/png/libpng/png.c
+++ /dev/null
@@ -1,4614 +0,0 @@
-
-/* png.c - location for general purpose libpng functions
- *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_34 Your_png_h_is_not_version_1_6_34;
-
-#ifdef __GNUC__
-/* The version tests may need to be added to, but the problem warning has
- * consistently been fixed in GCC versions which obtain wide-spread release.
- * The problem is that many versions of GCC rearrange comparison expressions in
- * the optimizer in such a way that the results of the comparison will change
- * if signed integer overflow occurs.  Such comparisons are not permitted in
- * ANSI C90, however GCC isn't clever enough to work out that that do not occur
- * below in png_ascii_from_fp and png_muldiv, so it produces a warning with
- * -Wextra.  Unfortunately this is highly dependent on the optimizer and the
- * machine architecture so the warning comes and goes unpredictably and is
- * impossible to "fix", even were that a good idea.
- */
-#if __GNUC__ == 7 && __GNUC_MINOR__ == 1
-#define GCC_STRICT_OVERFLOW 1
-#endif /* GNU 7.1.x */
-#endif /* GNU */
-#ifndef GCC_STRICT_OVERFLOW
-#define GCC_STRICT_OVERFLOW 0
-#endif
-
-/* Tells libpng that we have already handled the first "num_bytes" bytes
- * of the PNG file signature.  If the PNG data is embedded into another
- * stream we can set num_bytes = 8 so that libpng will not attempt to read
- * or write any of the magic bytes before it starts on the IHDR.
- */
-
-#ifdef PNG_READ_SUPPORTED
-void PNGAPI
-png_set_sig_bytes(png_structrp png_ptr, int num_bytes)
-{
-   unsigned int nb = (unsigned int)num_bytes;
-
-   png_debug(1, "in png_set_sig_bytes");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (num_bytes < 0)
-      nb = 0;
-
-   if (nb > 8)
-      png_error(png_ptr, "Too many bytes for PNG signature");
-
-   png_ptr->sig_bytes = (png_byte)nb;
-}
-
-/* Checks whether the supplied bytes match the PNG signature.  We allow
- * checking less than the full 8-byte signature so that those apps that
- * already read the first few bytes of a file to determine the file type
- * can simply check the remaining bytes for extra assurance.  Returns
- * an integer less than, equal to, or greater than zero if sig is found,
- * respectively, to be less than, to match, or be greater than the correct
- * PNG signature (this is the same behavior as strcmp, memcmp, etc).
- */
-int PNGAPI
-png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)
-{
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
-   if (num_to_check > 8)
-      num_to_check = 8;
-
-   else if (num_to_check < 1)
-      return (-1);
-
-   if (start > 7)
-      return (-1);
-
-   if (start + num_to_check > 8)
-      num_to_check = 8 - start;
-
-   return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));
-}
-
-#endif /* READ */
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-/* Function to allocate memory for zlib */
-PNG_FUNCTION(voidpf /* PRIVATE */,
-png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
-{
-   png_alloc_size_t num_bytes = size;
-
-   if (png_ptr == NULL)
-      return NULL;
-
-   if (items >= (~(png_alloc_size_t)0)/size)
-   {
-      png_warning (png_voidcast(png_structrp, png_ptr),
-          "Potential overflow in png_zalloc()");
-      return NULL;
-   }
-
-   num_bytes *= items;
-   return png_malloc_warn(png_voidcast(png_structrp, png_ptr), num_bytes);
-}
-
-/* Function to free memory for zlib */
-void /* PRIVATE */
-png_zfree(voidpf png_ptr, voidpf ptr)
-{
-   png_free(png_voidcast(png_const_structrp,png_ptr), ptr);
-}
-
-/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
- * in case CRC is > 32 bits to leave the top bits 0.
- */
-void /* PRIVATE */
-png_reset_crc(png_structrp png_ptr)
-{
-   /* The cast is safe because the crc is a 32-bit value. */
-   png_ptr->crc = (png_uint_32)crc32(0, Z_NULL, 0);
-}
-
-/* Calculate the CRC over a section of data.  We can only pass as
- * much data to this routine as the largest single buffer size.  We
- * also check that this data will actually be used before going to the
- * trouble of calculating it.
- */
-void /* PRIVATE */
-png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
-{
-   int need_crc = 1;
-
-   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
-         need_crc = 0;
-   }
-
-   else /* critical */
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
-         need_crc = 0;
-   }
-
-   /* 'uLong' is defined in zlib.h as unsigned long; this means that on some
-    * systems it is a 64-bit value.  crc32, however, returns 32 bits so the
-    * following cast is safe.  'uInt' may be no more than 16 bits, so it is
-    * necessary to perform a loop here.
-    */
-   if (need_crc != 0 && length > 0)
-   {
-      uLong crc = png_ptr->crc; /* Should never issue a warning */
-
-      do
-      {
-         uInt safe_length = (uInt)length;
-#ifndef __COVERITY__
-         if (safe_length == 0)
-            safe_length = (uInt)-1; /* evil, but safe */
-#endif
-
-         crc = crc32(crc, ptr, safe_length);
-
-         /* The following should never issue compiler warnings; if they do the
-          * target system has characteristics that will probably violate other
-          * assumptions within the libpng code.
-          */
-         ptr += safe_length;
-         length -= safe_length;
-      }
-      while (length > 0);
-
-      /* And the following is always safe because the crc is only 32 bits. */
-      png_ptr->crc = (png_uint_32)crc;
-   }
-}
-
-/* Check a user supplied version number, called from both read and write
- * functions that create a png_struct.
- */
-int
-png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
-{
-   /* Libpng versions 1.0.0 and later are binary compatible if the version
-    * string matches through the second '.'; we must recompile any
-    * applications that use any older library version.
-    */
-
-   if (user_png_ver != NULL)
-   {
-      int i = -1;
-      int found_dots = 0;
-
-      do
-      {
-         i++;
-         if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i])
-            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-         if (user_png_ver[i] == '.')
-            found_dots++;
-      } while (found_dots < 2 && user_png_ver[i] != 0 &&
-            PNG_LIBPNG_VER_STRING[i] != 0);
-   }
-
-   else
-      png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-
-   if ((png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH) != 0)
-   {
-#ifdef PNG_WARNINGS_SUPPORTED
-      size_t pos = 0;
-      char m[128];
-
-      pos = png_safecat(m, (sizeof m), pos,
-          "Application built with libpng-");
-      pos = png_safecat(m, (sizeof m), pos, user_png_ver);
-      pos = png_safecat(m, (sizeof m), pos, " but running with ");
-      pos = png_safecat(m, (sizeof m), pos, PNG_LIBPNG_VER_STRING);
-      PNG_UNUSED(pos)
-
-      png_warning(png_ptr, m);
-#endif
-
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-      png_ptr->flags = 0;
-#endif
-
-      return 0;
-   }
-
-   /* Success return. */
-   return 1;
-}
-
-/* Generic function to create a png_struct for either read or write - this
- * contains the common initialization.
- */
-PNG_FUNCTION(png_structp /* PRIVATE */,
-png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-{
-   png_struct create_struct;
-#  ifdef PNG_SETJMP_SUPPORTED
-      jmp_buf create_jmp_buf;
-#  endif
-
-   /* This temporary stack-allocated structure is used to provide a place to
-    * build enough context to allow the user provided memory allocator (if any)
-    * to be called.
-    */
-   memset(&create_struct, 0, (sizeof create_struct));
-
-   /* Added at libpng-1.2.6 */
-#  ifdef PNG_USER_LIMITS_SUPPORTED
-      create_struct.user_width_max = PNG_USER_WIDTH_MAX;
-      create_struct.user_height_max = PNG_USER_HEIGHT_MAX;
-
-#     ifdef PNG_USER_CHUNK_CACHE_MAX
-      /* Added at libpng-1.2.43 and 1.4.0 */
-      create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
-#     endif
-
-#     ifdef PNG_USER_CHUNK_MALLOC_MAX
-      /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists
-       * in png_struct regardless.
-       */
-      create_struct.user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
-#     endif
-#  endif
-
-   /* The following two API calls simply set fields in png_struct, so it is safe
-    * to do them now even though error handling is not yet set up.
-    */
-#  ifdef PNG_USER_MEM_SUPPORTED
-      png_set_mem_fn(&create_struct, mem_ptr, malloc_fn, free_fn);
-#  else
-      PNG_UNUSED(mem_ptr)
-      PNG_UNUSED(malloc_fn)
-      PNG_UNUSED(free_fn)
-#  endif
-
-   /* (*error_fn) can return control to the caller after the error_ptr is set,
-    * this will result in a memory leak unless the error_fn does something
-    * extremely sophisticated.  The design lacks merit but is implicit in the
-    * API.
-    */
-   png_set_error_fn(&create_struct, error_ptr, error_fn, warn_fn);
-
-#  ifdef PNG_SETJMP_SUPPORTED
-      if (!setjmp(create_jmp_buf))
-#  endif
-      {
-#  ifdef PNG_SETJMP_SUPPORTED
-         /* Temporarily fake out the longjmp information until we have
-          * successfully completed this function.  This only works if we have
-          * setjmp() support compiled in, but it is safe - this stuff should
-          * never happen.
-          */
-         create_struct.jmp_buf_ptr = &create_jmp_buf;
-         create_struct.jmp_buf_size = 0; /*stack allocation*/
-         create_struct.longjmp_fn = longjmp;
-#  endif
-         /* Call the general version checker (shared with read and write code):
-          */
-         if (png_user_version_check(&create_struct, user_png_ver) != 0)
-         {
-            png_structrp png_ptr = png_voidcast(png_structrp,
-                png_malloc_warn(&create_struct, (sizeof *png_ptr)));
-
-            if (png_ptr != NULL)
-            {
-               /* png_ptr->zstream holds a back-pointer to the png_struct, so
-                * this can only be done now:
-                */
-               create_struct.zstream.zalloc = png_zalloc;
-               create_struct.zstream.zfree = png_zfree;
-               create_struct.zstream.opaque = png_ptr;
-
-#              ifdef PNG_SETJMP_SUPPORTED
-               /* Eliminate the local error handling: */
-               create_struct.jmp_buf_ptr = NULL;
-               create_struct.jmp_buf_size = 0;
-               create_struct.longjmp_fn = 0;
-#              endif
-
-               *png_ptr = create_struct;
-
-               /* This is the successful return point */
-               return png_ptr;
-            }
-         }
-      }
-
-   /* A longjmp because of a bug in the application storage allocator or a
-    * simple failure to allocate the png_struct.
-    */
-   return NULL;
-}
-
-/* Allocate the memory for an info_struct for the application. */
-PNG_FUNCTION(png_infop,PNGAPI
-png_create_info_struct,(png_const_structrp png_ptr),PNG_ALLOCATED)
-{
-   png_inforp info_ptr;
-
-   png_debug(1, "in png_create_info_struct");
-
-   if (png_ptr == NULL)
-      return NULL;
-
-   /* Use the internal API that does not (or at least should not) error out, so
-    * that this call always returns ok.  The application typically sets up the
-    * error handling *after* creating the info_struct because this is the way it
-    * has always been done in 'example.c'.
-    */
-   info_ptr = png_voidcast(png_inforp, png_malloc_base(png_ptr,
-       (sizeof *info_ptr)));
-
-   if (info_ptr != NULL)
-      memset(info_ptr, 0, (sizeof *info_ptr));
-
-   return info_ptr;
-}
-
-/* This function frees the memory associated with a single info struct.
- * Normally, one would use either png_destroy_read_struct() or
- * png_destroy_write_struct() to free an info struct, but this may be
- * useful for some applications.  From libpng 1.6.0 this function is also used
- * internally to implement the png_info release part of the 'struct' destroy
- * APIs.  This ensures that all possible approaches free the same data (all of
- * it).
- */
-void PNGAPI
-png_destroy_info_struct(png_const_structrp png_ptr, png_infopp info_ptr_ptr)
-{
-   png_inforp info_ptr = NULL;
-
-   png_debug(1, "in png_destroy_info_struct");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (info_ptr != NULL)
-   {
-      /* Do this first in case of an error below; if the app implements its own
-       * memory management this can lead to png_free calling png_error, which
-       * will abort this routine and return control to the app error handler.
-       * An infinite loop may result if it then tries to free the same info
-       * ptr.
-       */
-      *info_ptr_ptr = NULL;
-
-      png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-      memset(info_ptr, 0, (sizeof *info_ptr));
-      png_free(png_ptr, info_ptr);
-   }
-}
-
-/* Initialize the info structure.  This is now an internal function (0.89)
- * and applications using it are urged to use png_create_info_struct()
- * instead.  Use deprecated in 1.6.0, internal use removed (used internally it
- * is just a memset).
- *
- * NOTE: it is almost inconceivable that this API is used because it bypasses
- * the user-memory mechanism and the user error handling/warning mechanisms in
- * those cases where it does anything other than a memset.
- */
-PNG_FUNCTION(void,PNGAPI
-png_info_init_3,(png_infopp ptr_ptr, png_size_t png_info_struct_size),
-    PNG_DEPRECATED)
-{
-   png_inforp info_ptr = *ptr_ptr;
-
-   png_debug(1, "in png_info_init_3");
-
-   if (info_ptr == NULL)
-      return;
-
-   if ((sizeof (png_info)) > png_info_struct_size)
-   {
-      *ptr_ptr = NULL;
-      /* The following line is why this API should not be used: */
-      free(info_ptr);
-      info_ptr = png_voidcast(png_inforp, png_malloc_base(NULL,
-          (sizeof *info_ptr)));
-      if (info_ptr == NULL)
-         return;
-      *ptr_ptr = info_ptr;
-   }
-
-   /* Set everything to 0 */
-   memset(info_ptr, 0, (sizeof *info_ptr));
-}
-
-/* The following API is not called internally */
-void PNGAPI
-png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,
-    int freer, png_uint_32 mask)
-{
-   png_debug(1, "in png_data_freer");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (freer == PNG_DESTROY_WILL_FREE_DATA)
-      info_ptr->free_me |= mask;
-
-   else if (freer == PNG_USER_WILL_FREE_DATA)
-      info_ptr->free_me &= ~mask;
-
-   else
-      png_error(png_ptr, "Unknown freer parameter in png_data_freer");
-}
-
-void PNGAPI
-png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
-    int num)
-{
-   png_debug(1, "in png_free_data");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-#ifdef PNG_TEXT_SUPPORTED
-   /* Free text item num or (if num == -1) all text items */
-   if (info_ptr->text != NULL &&
-       ((mask & PNG_FREE_TEXT) & info_ptr->free_me) != 0)
-   {
-      if (num != -1)
-      {
-         png_free(png_ptr, info_ptr->text[num].key);
-         info_ptr->text[num].key = NULL;
-      }
-
-      else
-      {
-         int i;
-
-         for (i = 0; i < info_ptr->num_text; i++)
-            png_free(png_ptr, info_ptr->text[i].key);
-
-         png_free(png_ptr, info_ptr->text);
-         info_ptr->text = NULL;
-         info_ptr->num_text = 0;
-         info_ptr->max_text = 0;
-      }
-   }
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-   /* Free any tRNS entry */
-   if (((mask & PNG_FREE_TRNS) & info_ptr->free_me) != 0)
-   {
-      info_ptr->valid &= ~PNG_INFO_tRNS;
-      png_free(png_ptr, info_ptr->trans_alpha);
-      info_ptr->trans_alpha = NULL;
-      info_ptr->num_trans = 0;
-   }
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-   /* Free any sCAL entry */
-   if (((mask & PNG_FREE_SCAL) & info_ptr->free_me) != 0)
-   {
-      png_free(png_ptr, info_ptr->scal_s_width);
-      png_free(png_ptr, info_ptr->scal_s_height);
-      info_ptr->scal_s_width = NULL;
-      info_ptr->scal_s_height = NULL;
-      info_ptr->valid &= ~PNG_INFO_sCAL;
-   }
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-   /* Free any pCAL entry */
-   if (((mask & PNG_FREE_PCAL) & info_ptr->free_me) != 0)
-   {
-      png_free(png_ptr, info_ptr->pcal_purpose);
-      png_free(png_ptr, info_ptr->pcal_units);
-      info_ptr->pcal_purpose = NULL;
-      info_ptr->pcal_units = NULL;
-
-      if (info_ptr->pcal_params != NULL)
-         {
-            int i;
-
-            for (i = 0; i < info_ptr->pcal_nparams; i++)
-               png_free(png_ptr, info_ptr->pcal_params[i]);
-
-            png_free(png_ptr, info_ptr->pcal_params);
-            info_ptr->pcal_params = NULL;
-         }
-      info_ptr->valid &= ~PNG_INFO_pCAL;
-   }
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-   /* Free any profile entry */
-   if (((mask & PNG_FREE_ICCP) & info_ptr->free_me) != 0)
-   {
-      png_free(png_ptr, info_ptr->iccp_name);
-      png_free(png_ptr, info_ptr->iccp_profile);
-      info_ptr->iccp_name = NULL;
-      info_ptr->iccp_profile = NULL;
-      info_ptr->valid &= ~PNG_INFO_iCCP;
-   }
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-   /* Free a given sPLT entry, or (if num == -1) all sPLT entries */
-   if (info_ptr->splt_palettes != NULL &&
-       ((mask & PNG_FREE_SPLT) & info_ptr->free_me) != 0)
-   {
-      if (num != -1)
-      {
-         png_free(png_ptr, info_ptr->splt_palettes[num].name);
-         png_free(png_ptr, info_ptr->splt_palettes[num].entries);
-         info_ptr->splt_palettes[num].name = NULL;
-         info_ptr->splt_palettes[num].entries = NULL;
-      }
-
-      else
-      {
-         int i;
-
-         for (i = 0; i < info_ptr->splt_palettes_num; i++)
-         {
-            png_free(png_ptr, info_ptr->splt_palettes[i].name);
-            png_free(png_ptr, info_ptr->splt_palettes[i].entries);
-         }
-
-         png_free(png_ptr, info_ptr->splt_palettes);
-         info_ptr->splt_palettes = NULL;
-         info_ptr->splt_palettes_num = 0;
-         info_ptr->valid &= ~PNG_INFO_sPLT;
-      }
-   }
-#endif
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks != NULL &&
-       ((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0)
-   {
-      if (num != -1)
-      {
-          png_free(png_ptr, info_ptr->unknown_chunks[num].data);
-          info_ptr->unknown_chunks[num].data = NULL;
-      }
-
-      else
-      {
-         int i;
-
-         for (i = 0; i < info_ptr->unknown_chunks_num; i++)
-            png_free(png_ptr, info_ptr->unknown_chunks[i].data);
-
-         png_free(png_ptr, info_ptr->unknown_chunks);
-         info_ptr->unknown_chunks = NULL;
-         info_ptr->unknown_chunks_num = 0;
-      }
-   }
-#endif
-
-#ifdef PNG_eXIf_SUPPORTED
-   /* Free any eXIf entry */
-   if (((mask & PNG_FREE_EXIF) & info_ptr->free_me) != 0)
-   {
-# ifdef PNG_READ_eXIf_SUPPORTED
-      if (info_ptr->eXIf_buf)
-      {
-         png_free(png_ptr, info_ptr->eXIf_buf);
-         info_ptr->eXIf_buf = NULL;
-      }
-# endif
-      if (info_ptr->exif)
-      {
-         png_free(png_ptr, info_ptr->exif);
-         info_ptr->exif = NULL;
-      }
-      info_ptr->valid &= ~PNG_INFO_eXIf;
-   }
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-   /* Free any hIST entry */
-   if (((mask & PNG_FREE_HIST) & info_ptr->free_me) != 0)
-   {
-      png_free(png_ptr, info_ptr->hist);
-      info_ptr->hist = NULL;
-      info_ptr->valid &= ~PNG_INFO_hIST;
-   }
-#endif
-
-   /* Free any PLTE entry that was internally allocated */
-   if (((mask & PNG_FREE_PLTE) & info_ptr->free_me) != 0)
-   {
-      png_free(png_ptr, info_ptr->palette);
-      info_ptr->palette = NULL;
-      info_ptr->valid &= ~PNG_INFO_PLTE;
-      info_ptr->num_palette = 0;
-   }
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-   /* Free any image bits attached to the info structure */
-   if (((mask & PNG_FREE_ROWS) & info_ptr->free_me) != 0)
-   {
-      if (info_ptr->row_pointers != NULL)
-      {
-         png_uint_32 row;
-         for (row = 0; row < info_ptr->height; row++)
-            png_free(png_ptr, info_ptr->row_pointers[row]);
-
-         png_free(png_ptr, info_ptr->row_pointers);
-         info_ptr->row_pointers = NULL;
-      }
-      info_ptr->valid &= ~PNG_INFO_IDAT;
-   }
-#endif
-
-   if (num != -1)
-      mask &= ~PNG_FREE_MUL;
-
-   info_ptr->free_me &= ~mask;
-}
-#endif /* READ || WRITE */
-
-/* This function returns a pointer to the io_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy() or png_read_destroy() are called.
- */
-png_voidp PNGAPI
-png_get_io_ptr(png_const_structrp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return (png_ptr->io_ptr);
-}
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#  ifdef PNG_STDIO_SUPPORTED
-/* Initialize the default input/output functions for the PNG file.  If you
- * use your own read or write routines, you can call either png_set_read_fn()
- * or png_set_write_fn() instead of png_init_io().  If you have defined
- * PNG_NO_STDIO or otherwise disabled PNG_STDIO_SUPPORTED, you must use a
- * function of your own because "FILE *" isn't necessarily available.
- */
-void PNGAPI
-png_init_io(png_structrp png_ptr, png_FILE_p fp)
-{
-   png_debug(1, "in png_init_io");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = (png_voidp)fp;
-}
-#  endif
-
-#  ifdef PNG_SAVE_INT_32_SUPPORTED
-/* PNG signed integers are saved in 32-bit 2's complement format.  ANSI C-90
- * defines a cast of a signed integer to an unsigned integer either to preserve
- * the value, if it is positive, or to calculate:
- *
- *     (UNSIGNED_MAX+1) + integer
- *
- * Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the
- * negative integral value is added the result will be an unsigned value
- * correspnding to the 2's complement representation.
- */
-void PNGAPI
-png_save_int_32(png_bytep buf, png_int_32 i)
-{
-   png_save_uint_32(buf, (png_uint_32)i);
-}
-#  endif
-
-#  ifdef PNG_TIME_RFC1123_SUPPORTED
-/* Convert the supplied time into an RFC 1123 string suitable for use in
- * a "Creation Time" or other text-based time string.
- */
-int PNGAPI
-png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)
-{
-   static PNG_CONST char short_months[12][4] =
-        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
-   if (out == NULL)
-      return 0;
-
-   if (ptime->year > 9999 /* RFC1123 limitation */ ||
-       ptime->month == 0    ||  ptime->month > 12  ||
-       ptime->day   == 0    ||  ptime->day   > 31  ||
-       ptime->hour  > 23    ||  ptime->minute > 59 ||
-       ptime->second > 60)
-      return 0;
-
-   {
-      size_t pos = 0;
-      char number_buf[5]; /* enough for a four-digit year */
-
-#     define APPEND_STRING(string) pos = png_safecat(out, 29, pos, (string))
-#     define APPEND_NUMBER(format, value)\
-         APPEND_STRING(PNG_FORMAT_NUMBER(number_buf, format, (value)))
-#     define APPEND(ch) if (pos < 28) out[pos++] = (ch)
-
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, (unsigned)ptime->day);
-      APPEND(' ');
-      APPEND_STRING(short_months[(ptime->month - 1)]);
-      APPEND(' ');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->year);
-      APPEND(' ');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->hour);
-      APPEND(':');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->minute);
-      APPEND(':');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->second);
-      APPEND_STRING(" +0000"); /* This reliably terminates the buffer */
-      PNG_UNUSED (pos)
-
-#     undef APPEND
-#     undef APPEND_NUMBER
-#     undef APPEND_STRING
-   }
-
-   return 1;
-}
-
-#    if PNG_LIBPNG_VER < 10700
-/* To do: remove the following from libpng-1.7 */
-/* Original API that uses a private buffer in png_struct.
- * Deprecated because it causes png_struct to carry a spurious temporary
- * buffer (png_struct::time_buffer), better to have the caller pass this in.
- */
-png_const_charp PNGAPI
-png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime)
-{
-   if (png_ptr != NULL)
-   {
-      /* The only failure above if png_ptr != NULL is from an invalid ptime */
-      if (png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime) == 0)
-         png_warning(png_ptr, "Ignoring invalid time value");
-
-      else
-         return png_ptr->time_buffer;
-   }
-
-   return NULL;
-}
-#    endif /* LIBPNG_VER < 10700 */
-#  endif /* TIME_RFC1123 */
-
-#endif /* READ || WRITE */
-
-png_const_charp PNGAPI
-png_get_copyright(png_const_structrp png_ptr)
-{
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-#ifdef PNG_STRING_COPYRIGHT
-   return PNG_STRING_COPYRIGHT
-#else
-#  ifdef __STDC__
-   return PNG_STRING_NEWLINE \
-      "libpng version 1.6.34 - September 29, 2017" PNG_STRING_NEWLINE \
-      "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \
-      PNG_STRING_NEWLINE \
-      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
-      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
-      PNG_STRING_NEWLINE;
-#  else
-   return "libpng version 1.6.34 - September 29, 2017\
-      Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
-      Copyright (c) 1996-1997 Andreas Dilger\
-      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
-#  endif
-#endif
-}
-
-/* The following return the library version as a short string in the
- * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
- * used with your application, print out PNG_LIBPNG_VER_STRING, which
- * is defined in png.h.
- * Note: now there is no difference between png_get_libpng_ver() and
- * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
- * it is guaranteed that png.c uses the correct version of png.h.
- */
-png_const_charp PNGAPI
-png_get_libpng_ver(png_const_structrp png_ptr)
-{
-   /* Version of *.c files used when building libpng */
-   return png_get_header_ver(png_ptr);
-}
-
-png_const_charp PNGAPI
-png_get_header_ver(png_const_structrp png_ptr)
-{
-   /* Version of *.h files used when building libpng */
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-   return PNG_LIBPNG_VER_STRING;
-}
-
-png_const_charp PNGAPI
-png_get_header_version(png_const_structrp png_ptr)
-{
-   /* Returns longer string containing both version and date */
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-#ifdef __STDC__
-   return PNG_HEADER_VERSION_STRING
-#  ifndef PNG_READ_SUPPORTED
-      " (NO READ SUPPORT)"
-#  endif
-      PNG_STRING_NEWLINE;
-#else
-   return PNG_HEADER_VERSION_STRING;
-#endif
-}
-
-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-/* NOTE: this routine is not used internally! */
-/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
- * large of png_color.  This lets grayscale images be treated as
- * paletted.  Most useful for gamma correction and simplification
- * of code.  This API is not used internally.
- */
-void PNGAPI
-png_build_grayscale_palette(int bit_depth, png_colorp palette)
-{
-   int num_palette;
-   int color_inc;
-   int i;
-   int v;
-
-   png_debug(1, "in png_do_build_grayscale_palette");
-
-   if (palette == NULL)
-      return;
-
-   switch (bit_depth)
-   {
-      case 1:
-         num_palette = 2;
-         color_inc = 0xff;
-         break;
-
-      case 2:
-         num_palette = 4;
-         color_inc = 0x55;
-         break;
-
-      case 4:
-         num_palette = 16;
-         color_inc = 0x11;
-         break;
-
-      case 8:
-         num_palette = 256;
-         color_inc = 1;
-         break;
-
-      default:
-         num_palette = 0;
-         color_inc = 0;
-         break;
-   }
-
-   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
-   {
-      palette[i].red = (png_byte)(v & 0xff);
-      palette[i].green = (png_byte)(v & 0xff);
-      palette[i].blue = (png_byte)(v & 0xff);
-   }
-}
-#endif
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-int PNGAPI
-png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name)
-{
-   /* Check chunk_name and return "keep" value if it's on the list, else 0 */
-   png_const_bytep p, p_end;
-
-   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list == 0)
-      return PNG_HANDLE_CHUNK_AS_DEFAULT;
-
-   p_end = png_ptr->chunk_list;
-   p = p_end + png_ptr->num_chunk_list*5; /* beyond end */
-
-   /* The code is the fifth byte after each four byte string.  Historically this
-    * code was always searched from the end of the list, this is no longer
-    * necessary because the 'set' routine handles duplicate entries correcty.
-    */
-   do /* num_chunk_list > 0, so at least one */
-   {
-      p -= 5;
-
-      if (memcmp(chunk_name, p, 4) == 0)
-         return p[4];
-   }
-   while (p > p_end);
-
-   /* This means that known chunks should be processed and unknown chunks should
-    * be handled according to the value of png_ptr->unknown_default; this can be
-    * confusing because, as a result, there are two levels of defaulting for
-    * unknown chunks.
-    */
-   return PNG_HANDLE_CHUNK_AS_DEFAULT;
-}
-
-#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
-   defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-int /* PRIVATE */
-png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name)
-{
-   png_byte chunk_string[5];
-
-   PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name);
-   return png_handle_as_unknown(png_ptr, chunk_string);
-}
-#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */
-#endif /* SET_UNKNOWN_CHUNKS */
-
-#ifdef PNG_READ_SUPPORTED
-/* This function, added to libpng-1.0.6g, is untested. */
-int PNGAPI
-png_reset_zstream(png_structrp png_ptr)
-{
-   if (png_ptr == NULL)
-      return Z_STREAM_ERROR;
-
-   /* WARNING: this resets the window bits to the maximum! */
-   return (inflateReset(&png_ptr->zstream));
-}
-#endif /* READ */
-
-/* This function was added to libpng-1.0.7 */
-png_uint_32 PNGAPI
-png_access_version_number(void)
-{
-   /* Version of *.c files used when building libpng */
-   return((png_uint_32)PNG_LIBPNG_VER);
-}
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-/* Ensure that png_ptr->zstream.msg holds some appropriate error message string.
- * If it doesn't 'ret' is used to set it to something appropriate, even in cases
- * like Z_OK or Z_STREAM_END where the error code is apparently a success code.
- */
-void /* PRIVATE */
-png_zstream_error(png_structrp png_ptr, int ret)
-{
-   /* Translate 'ret' into an appropriate error string, priority is given to the
-    * one in zstream if set.  This always returns a string, even in cases like
-    * Z_OK or Z_STREAM_END where the error code is a success code.
-    */
-   if (png_ptr->zstream.msg == NULL) switch (ret)
-   {
-      default:
-      case Z_OK:
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return code");
-         break;
-
-      case Z_STREAM_END:
-         /* Normal exit */
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected end of LZ stream");
-         break;
-
-      case Z_NEED_DICT:
-         /* This means the deflate stream did not have a dictionary; this
-          * indicates a bogus PNG.
-          */
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("missing LZ dictionary");
-         break;
-
-      case Z_ERRNO:
-         /* gz APIs only: should not happen */
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("zlib IO error");
-         break;
-
-      case Z_STREAM_ERROR:
-         /* internal libpng error */
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("bad parameters to zlib");
-         break;
-
-      case Z_DATA_ERROR:
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("damaged LZ stream");
-         break;
-
-      case Z_MEM_ERROR:
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("insufficient memory");
-         break;
-
-      case Z_BUF_ERROR:
-         /* End of input or output; not a problem if the caller is doing
-          * incremental read or write.
-          */
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("truncated");
-         break;
-
-      case Z_VERSION_ERROR:
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unsupported zlib version");
-         break;
-
-      case PNG_UNEXPECTED_ZLIB_RETURN:
-         /* Compile errors here mean that zlib now uses the value co-opted in
-          * pngpriv.h for PNG_UNEXPECTED_ZLIB_RETURN; update the switch above
-          * and change pngpriv.h.  Note that this message is "... return",
-          * whereas the default/Z_OK one is "... return code".
-          */
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return");
-         break;
-   }
-}
-
-/* png_convert_size: a PNGAPI but no longer in png.h, so deleted
- * at libpng 1.5.5!
- */
-
-/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
-#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */
-static int
-png_colorspace_check_gamma(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA, int from)
-   /* This is called to check a new gamma value against an existing one.  The
-    * routine returns false if the new gamma value should not be written.
-    *
-    * 'from' says where the new gamma value comes from:
-    *
-    *    0: the new gamma value is the libpng estimate for an ICC profile
-    *    1: the new gamma value comes from a gAMA chunk
-    *    2: the new gamma value comes from an sRGB chunk
-    */
-{
-   png_fixed_point gtest;
-
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-       (png_muldiv(&gtest, colorspace->gamma, PNG_FP_1, gAMA) == 0  ||
-      png_gamma_significant(gtest) != 0))
-   {
-      /* Either this is an sRGB image, in which case the calculated gamma
-       * approximation should match, or this is an image with a profile and the
-       * value libpng calculates for the gamma of the profile does not match the
-       * value recorded in the file.  The former, sRGB, case is an error, the
-       * latter is just a warning.
-       */
-      if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)
-      {
-         png_chunk_report(png_ptr, "gamma value does not match sRGB",
-             PNG_CHUNK_ERROR);
-         /* Do not overwrite an sRGB value */
-         return from == 2;
-      }
-
-      else /* sRGB tag not involved */
-      {
-         png_chunk_report(png_ptr, "gamma value does not match libpng estimate",
-             PNG_CHUNK_WARNING);
-         return from == 1;
-      }
-   }
-
-   return 1;
-}
-
-void /* PRIVATE */
-png_colorspace_set_gamma(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA)
-{
-   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
-    * occur.  Since the fixed point representation is asymetrical it is
-    * possible for 1/gamma to overflow the limit of 21474 and this means the
-    * gamma value must be at least 5/100000 and hence at most 20000.0.  For
-    * safety the limits here are a little narrower.  The values are 0.00016 to
-    * 6250.0, which are truly ridiculous gamma values (and will produce
-    * displays that are all black or all white.)
-    *
-    * In 1.6.0 this test replaces the ones in pngrutil.c, in the gAMA chunk
-    * handling code, which only required the value to be >0.
-    */
-   png_const_charp errmsg;
-
-   if (gAMA < 16 || gAMA > 625000000)
-      errmsg = "gamma value out of range";
-
-#  ifdef PNG_READ_gAMA_SUPPORTED
-   /* Allow the application to set the gamma value more than once */
-   else if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-      (colorspace->flags & PNG_COLORSPACE_FROM_gAMA) != 0)
-      errmsg = "duplicate";
-#  endif
-
-   /* Do nothing if the colorspace is already invalid */
-   else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
-
-   else
-   {
-      if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,
-          1/*from gAMA*/) != 0)
-      {
-         /* Store this gamma value. */
-         colorspace->gamma = gAMA;
-         colorspace->flags |=
-            (PNG_COLORSPACE_HAVE_GAMMA | PNG_COLORSPACE_FROM_gAMA);
-      }
-
-      /* At present if the check_gamma test fails the gamma of the colorspace is
-       * not updated however the colorspace is not invalidated.  This
-       * corresponds to the case where the existing gamma comes from an sRGB
-       * chunk or profile.  An error message has already been output.
-       */
-      return;
-   }
-
-   /* Error exit - errmsg has been set. */
-   colorspace->flags |= PNG_COLORSPACE_INVALID;
-   png_chunk_report(png_ptr, errmsg, PNG_CHUNK_WRITE_ERROR);
-}
-
-void /* PRIVATE */
-png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
-{
-   if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-   {
-      /* Everything is invalid */
-      info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|
-         PNG_INFO_iCCP);
-
-#     ifdef PNG_COLORSPACE_SUPPORTED
-      /* Clean up the iCCP profile now if it won't be used. */
-      png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, -1/*not used*/);
-#     else
-      PNG_UNUSED(png_ptr)
-#     endif
-   }
-
-   else
-   {
-#     ifdef PNG_COLORSPACE_SUPPORTED
-      /* Leave the INFO_iCCP flag set if the pngset.c code has already set
-       * it; this allows a PNG to contain a profile which matches sRGB and
-       * yet still have that profile retrievable by the application.
-       */
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)
-         info_ptr->valid |= PNG_INFO_sRGB;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_sRGB;
-
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-         info_ptr->valid |= PNG_INFO_cHRM;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_cHRM;
-#     endif
-
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)
-         info_ptr->valid |= PNG_INFO_gAMA;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_gAMA;
-   }
-}
-
-#ifdef PNG_READ_SUPPORTED
-void /* PRIVATE */
-png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)
-{
-   if (info_ptr == NULL) /* reduce code size; check here not in the caller */
-      return;
-
-   info_ptr->colorspace = png_ptr->colorspace;
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-#endif
-#endif /* GAMMA */
-
-#ifdef PNG_COLORSPACE_SUPPORTED
-/* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for
- * cHRM, as opposed to using chromaticities.  These internal APIs return
- * non-zero on a parameter error.  The X, Y and Z values are required to be
- * positive and less than 1.0.
- */
-static int
-png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
-{
-   png_int_32 d, dwhite, whiteX, whiteY;
-
-   d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;
-   if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)
-      return 1;
-   if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)
-      return 1;
-   dwhite = d;
-   whiteX = XYZ->red_X;
-   whiteY = XYZ->red_Y;
-
-   d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;
-   if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)
-      return 1;
-   if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)
-      return 1;
-   dwhite += d;
-   whiteX += XYZ->green_X;
-   whiteY += XYZ->green_Y;
-
-   d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;
-   if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)
-      return 1;
-   if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)
-      return 1;
-   dwhite += d;
-   whiteX += XYZ->blue_X;
-   whiteY += XYZ->blue_Y;
-
-   /* The reference white is simply the sum of the end-point (X,Y,Z) vectors,
-    * thus:
-    */
-   if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)
-      return 1;
-   if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0)
-      return 1;
-
-   return 0;
-}
-
-static int
-png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
-{
-   png_fixed_point red_inverse, green_inverse, blue_scale;
-   png_fixed_point left, right, denominator;
-
-   /* Check xy and, implicitly, z.  Note that wide gamut color spaces typically
-    * have end points with 0 tristimulus values (these are impossible end
-    * points, but they are used to cover the possible colors).  We check
-    * xy->whitey against 5, not 0, to avoid a possible integer overflow.
-    */
-   if (xy->redx   < 0 || xy->redx > PNG_FP_1) return 1;
-   if (xy->redy   < 0 || xy->redy > PNG_FP_1-xy->redx) return 1;
-   if (xy->greenx < 0 || xy->greenx > PNG_FP_1) return 1;
-   if (xy->greeny < 0 || xy->greeny > PNG_FP_1-xy->greenx) return 1;
-   if (xy->bluex  < 0 || xy->bluex > PNG_FP_1) return 1;
-   if (xy->bluey  < 0 || xy->bluey > PNG_FP_1-xy->bluex) return 1;
-   if (xy->whitex < 0 || xy->whitex > PNG_FP_1) return 1;
-   if (xy->whitey < 5 || xy->whitey > PNG_FP_1-xy->whitex) return 1;
-
-   /* The reverse calculation is more difficult because the original tristimulus
-    * value had 9 independent values (red,green,blue)x(X,Y,Z) however only 8
-    * derived values were recorded in the cHRM chunk;
-    * (red,green,blue,white)x(x,y).  This loses one degree of freedom and
-    * therefore an arbitrary ninth value has to be introduced to undo the
-    * original transformations.
-    *
-    * Think of the original end-points as points in (X,Y,Z) space.  The
-    * chromaticity values (c) have the property:
-    *
-    *           C
-    *   c = ---------
-    *       X + Y + Z
-    *
-    * For each c (x,y,z) from the corresponding original C (X,Y,Z).  Thus the
-    * three chromaticity values (x,y,z) for each end-point obey the
-    * relationship:
-    *
-    *   x + y + z = 1
-    *
-    * This describes the plane in (X,Y,Z) space that intersects each axis at the
-    * value 1.0; call this the chromaticity plane.  Thus the chromaticity
-    * calculation has scaled each end-point so that it is on the x+y+z=1 plane
-    * and chromaticity is the intersection of the vector from the origin to the
-    * (X,Y,Z) value with the chromaticity plane.
-    *
-    * To fully invert the chromaticity calculation we would need the three
-    * end-point scale factors, (red-scale, green-scale, blue-scale), but these
-    * were not recorded.  Instead we calculated the reference white (X,Y,Z) and
-    * recorded the chromaticity of this.  The reference white (X,Y,Z) would have
-    * given all three of the scale factors since:
-    *
-    *    color-C = color-c * color-scale
-    *    white-C = red-C + green-C + blue-C
-    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
-    *
-    * But cHRM records only white-x and white-y, so we have lost the white scale
-    * factor:
-    *
-    *    white-C = white-c*white-scale
-    *
-    * To handle this the inverse transformation makes an arbitrary assumption
-    * about white-scale:
-    *
-    *    Assume: white-Y = 1.0
-    *    Hence:  white-scale = 1/white-y
-    *    Or:     red-Y + green-Y + blue-Y = 1.0
-    *
-    * Notice the last statement of the assumption gives an equation in three of
-    * the nine values we want to calculate.  8 more equations come from the
-    * above routine as summarised at the top above (the chromaticity
-    * calculation):
-    *
-    *    Given: color-x = color-X / (color-X + color-Y + color-Z)
-    *    Hence: (color-x - 1)*color-X + color.x*color-Y + color.x*color-Z = 0
-    *
-    * This is 9 simultaneous equations in the 9 variables "color-C" and can be
-    * solved by Cramer's rule.  Cramer's rule requires calculating 10 9x9 matrix
-    * determinants, however this is not as bad as it seems because only 28 of
-    * the total of 90 terms in the various matrices are non-zero.  Nevertheless
-    * Cramer's rule is notoriously numerically unstable because the determinant
-    * calculation involves the difference of large, but similar, numbers.  It is
-    * difficult to be sure that the calculation is stable for real world values
-    * and it is certain that it becomes unstable where the end points are close
-    * together.
-    *
-    * So this code uses the perhaps slightly less optimal but more
-    * understandable and totally obvious approach of calculating color-scale.
-    *
-    * This algorithm depends on the precision in white-scale and that is
-    * (1/white-y), so we can immediately see that as white-y approaches 0 the
-    * accuracy inherent in the cHRM chunk drops off substantially.
-    *
-    * libpng arithmetic: a simple inversion of the above equations
-    * ------------------------------------------------------------
-    *
-    *    white_scale = 1/white-y
-    *    white-X = white-x * white-scale
-    *    white-Y = 1.0
-    *    white-Z = (1 - white-x - white-y) * white_scale
-    *
-    *    white-C = red-C + green-C + blue-C
-    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
-    *
-    * This gives us three equations in (red-scale,green-scale,blue-scale) where
-    * all the coefficients are now known:
-    *
-    *    red-x*red-scale + green-x*green-scale + blue-x*blue-scale
-    *       = white-x/white-y
-    *    red-y*red-scale + green-y*green-scale + blue-y*blue-scale = 1
-    *    red-z*red-scale + green-z*green-scale + blue-z*blue-scale
-    *       = (1 - white-x - white-y)/white-y
-    *
-    * In the last equation color-z is (1 - color-x - color-y) so we can add all
-    * three equations together to get an alternative third:
-    *
-    *    red-scale + green-scale + blue-scale = 1/white-y = white-scale
-    *
-    * So now we have a Cramer's rule solution where the determinants are just
-    * 3x3 - far more tractible.  Unfortunately 3x3 determinants still involve
-    * multiplication of three coefficients so we can't guarantee to avoid
-    * overflow in the libpng fixed point representation.  Using Cramer's rule in
-    * floating point is probably a good choice here, but it's not an option for
-    * fixed point.  Instead proceed to simplify the first two equations by
-    * eliminating what is likely to be the largest value, blue-scale:
-    *
-    *    blue-scale = white-scale - red-scale - green-scale
-    *
-    * Hence:
-    *
-    *    (red-x - blue-x)*red-scale + (green-x - blue-x)*green-scale =
-    *                (white-x - blue-x)*white-scale
-    *
-    *    (red-y - blue-y)*red-scale + (green-y - blue-y)*green-scale =
-    *                1 - blue-y*white-scale
-    *
-    * And now we can trivially solve for (red-scale,green-scale):
-    *
-    *    green-scale =
-    *                (white-x - blue-x)*white-scale - (red-x - blue-x)*red-scale
-    *                -----------------------------------------------------------
-    *                                  green-x - blue-x
-    *
-    *    red-scale =
-    *                1 - blue-y*white-scale - (green-y - blue-y) * green-scale
-    *                ---------------------------------------------------------
-    *                                  red-y - blue-y
-    *
-    * Hence:
-    *
-    *    red-scale =
-    *          ( (green-x - blue-x) * (white-y - blue-y) -
-    *            (green-y - blue-y) * (white-x - blue-x) ) / white-y
-    * -------------------------------------------------------------------------
-    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
-    *
-    *    green-scale =
-    *          ( (red-y - blue-y) * (white-x - blue-x) -
-    *            (red-x - blue-x) * (white-y - blue-y) ) / white-y
-    * -------------------------------------------------------------------------
-    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
-    *
-    * Accuracy:
-    * The input values have 5 decimal digits of accuracy.  The values are all in
-    * the range 0 < value < 1, so simple products are in the same range but may
-    * need up to 10 decimal digits to preserve the original precision and avoid
-    * underflow.  Because we are using a 32-bit signed representation we cannot
-    * match this; the best is a little over 9 decimal digits, less than 10.
-    *
-    * The approach used here is to preserve the maximum precision within the
-    * signed representation.  Because the red-scale calculation above uses the
-    * difference between two products of values that must be in the range -1..+1
-    * it is sufficient to divide the product by 7; ceil(100,000/32767*2).  The
-    * factor is irrelevant in the calculation because it is applied to both
-    * numerator and denominator.
-    *
-    * Note that the values of the differences of the products of the
-    * chromaticities in the above equations tend to be small, for example for
-    * the sRGB chromaticities they are:
-    *
-    * red numerator:    -0.04751
-    * green numerator:  -0.08788
-    * denominator:      -0.2241 (without white-y multiplication)
-    *
-    *  The resultant Y coefficients from the chromaticities of some widely used
-    *  color space definitions are (to 15 decimal places):
-    *
-    *  sRGB
-    *    0.212639005871510 0.715168678767756 0.072192315360734
-    *  Kodak ProPhoto
-    *    0.288071128229293 0.711843217810102 0.000085653960605
-    *  Adobe RGB
-    *    0.297344975250536 0.627363566255466 0.075291458493998
-    *  Adobe Wide Gamut RGB
-    *    0.258728243040113 0.724682314948566 0.016589442011321
-    */
-   /* By the argument, above overflow should be impossible here. The return
-    * value of 2 indicates an internal error to the caller.
-    */
-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)
-      return 2;
-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)
-      return 2;
-   denominator = left - right;
-
-   /* Now find the red numerator. */
-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
-      return 2;
-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
-      return 2;
-
-   /* Overflow is possible here and it indicates an extreme set of PNG cHRM
-    * chunk values.  This calculation actually returns the reciprocal of the
-    * scale value because this allows us to delay the multiplication of white-y
-    * into the denominator, which tends to produce a small number.
-    */
-   if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||
-       red_inverse <= xy->whitey /* r+g+b scales = white scale */)
-      return 1;
-
-   /* Similarly for green_inverse: */
-   if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
-      return 2;
-   if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
-      return 2;
-   if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||
-       green_inverse <= xy->whitey)
-      return 1;
-
-   /* And the blue scale, the checks above guarantee this can't overflow but it
-    * can still produce 0 for extreme cHRM values.
-    */
-   blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -
-       png_reciprocal(green_inverse);
-   if (blue_scale <= 0)
-      return 1;
-
-
-   /* And fill in the png_XYZ: */
-   if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)
-      return 1;
-   if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0)
-      return 1;
-   if (png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1,
-       red_inverse) == 0)
-      return 1;
-
-   if (png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse) == 0)
-      return 1;
-   if (png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse) == 0)
-      return 1;
-   if (png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1,
-       green_inverse) == 0)
-      return 1;
-
-   if (png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1) == 0)
-      return 1;
-   if (png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1) == 0)
-      return 1;
-   if (png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale,
-       PNG_FP_1) == 0)
-      return 1;
-
-   return 0; /*success*/
-}
-
-static int
-png_XYZ_normalize(png_XYZ *XYZ)
-{
-   png_int_32 Y;
-
-   if (XYZ->red_Y < 0 || XYZ->green_Y < 0 || XYZ->blue_Y < 0 ||
-      XYZ->red_X < 0 || XYZ->green_X < 0 || XYZ->blue_X < 0 ||
-      XYZ->red_Z < 0 || XYZ->green_Z < 0 || XYZ->blue_Z < 0)
-      return 1;
-
-   /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1.
-    * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
-    * relying on addition of two positive values producing a negative one is not
-    * safe.
-    */
-   Y = XYZ->red_Y;
-   if (0x7fffffff - Y < XYZ->green_X)
-      return 1;
-   Y += XYZ->green_Y;
-   if (0x7fffffff - Y < XYZ->blue_X)
-      return 1;
-   Y += XYZ->blue_Y;
-
-   if (Y != PNG_FP_1)
-   {
-      if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)
-         return 1;
-
-      if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)
-         return 1;
-
-      if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)
-         return 1;
-   }
-
-   return 0;
-}
-
-static int
-png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)
-{
-   /* Allow an error of +/-0.01 (absolute value) on each chromaticity */
-   if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
-       PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
-       PNG_OUT_OF_RANGE(xy1->redx,   xy2->redx,  delta) ||
-       PNG_OUT_OF_RANGE(xy1->redy,   xy2->redy,  delta) ||
-       PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
-       PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
-       PNG_OUT_OF_RANGE(xy1->bluex,  xy2->bluex, delta) ||
-       PNG_OUT_OF_RANGE(xy1->bluey,  xy2->bluey, delta))
-      return 0;
-   return 1;
-}
-
-/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM
- * chunk chromaticities.  Earlier checks used to simply look for the overflow
- * condition (where the determinant of the matrix to solve for XYZ ends up zero
- * because the chromaticity values are not all distinct.)  Despite this it is
- * theoretically possible to produce chromaticities that are apparently valid
- * but that rapidly degrade to invalid, potentially crashing, sets because of
- * arithmetic inaccuracies when calculations are performed on them.  The new
- * check is to round-trip xy -> XYZ -> xy and then check that the result is
- * within a small percentage of the original.
- */
-static int
-png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)
-{
-   int result;
-   png_xy xy_test;
-
-   /* As a side-effect this routine also returns the XYZ endpoints. */
-   result = png_XYZ_from_xy(XYZ, xy);
-   if (result != 0)
-      return result;
-
-   result = png_xy_from_XYZ(&xy_test, XYZ);
-   if (result != 0)
-      return result;
-
-   if (png_colorspace_endpoints_match(xy, &xy_test,
-       5/*actually, the math is pretty accurate*/) != 0)
-      return 0;
-
-   /* Too much slip */
-   return 1;
-}
-
-/* This is the check going the other way.  The XYZ is modified to normalize it
- * (another side-effect) and the xy chromaticities are returned.
- */
-static int
-png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)
-{
-   int result;
-   png_XYZ XYZtemp;
-
-   result = png_XYZ_normalize(XYZ);
-   if (result != 0)
-      return result;
-
-   result = png_xy_from_XYZ(xy, XYZ);
-   if (result != 0)
-      return result;
-
-   XYZtemp = *XYZ;
-   return png_colorspace_check_xy(&XYZtemp, xy);
-}
-
-/* Used to check for an endpoint match against sRGB */
-static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
-{
-   /* color      x       y */
-   /* red   */ 64000, 33000,
-   /* green */ 30000, 60000,
-   /* blue  */ 15000,  6000,
-   /* white */ 31270, 32900
-};
-
-static int
-png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
-    int preferred)
-{
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   /* The consistency check is performed on the chromaticities; this factors out
-    * variations because of the normalization (or not) of the end point Y
-    * values.
-    */
-   if (preferred < 2 &&
-       (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      /* The end points must be reasonably close to any we already have.  The
-       * following allows an error of up to +/-.001
-       */
-      if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,
-          100) == 0)
-      {
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "inconsistent chromaticities");
-         return 0; /* failed */
-      }
-
-      /* Only overwrite with preferred values */
-      if (preferred == 0)
-         return 1; /* ok, but no change */
-   }
-
-   colorspace->end_points_xy = *xy;
-   colorspace->end_points_XYZ = *XYZ;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_ENDPOINTS;
-
-   /* The end points are normally quoted to two decimal digits, so allow +/-0.01
-    * on this test.
-    */
-   if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)
-      colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;
-
-   else
-      colorspace->flags &= PNG_COLORSPACE_CANCEL(
-         PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-
-   return 2; /* ok and changed */
-}
-
-int /* PRIVATE */
-png_colorspace_set_chromaticities(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_xy *xy, int preferred)
-{
-   /* We must check the end points to ensure they are reasonable - in the past
-    * color management systems have crashed as a result of getting bogus
-    * colorant values, while this isn't the fault of libpng it is the
-    * responsibility of libpng because PNG carries the bomb and libpng is in a
-    * position to protect against it.
-    */
-   png_XYZ XYZ;
-
-   switch (png_colorspace_check_xy(&XYZ, xy))
-   {
-      case 0: /* success */
-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,
-             preferred);
-
-      case 1:
-         /* We can't invert the chromaticities so we can't produce value XYZ
-          * values.  Likely as not a color management system will fail too.
-          */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "invalid chromaticities");
-         break;
-
-      default:
-         /* libpng is broken; this should be a warning but if it happens we
-          * want error reports so for the moment it is an error.
-          */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_error(png_ptr, "internal error checking chromaticities");
-   }
-
-   return 0; /* failed */
-}
-
-int /* PRIVATE */
-png_colorspace_set_endpoints(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
-{
-   png_XYZ XYZ = *XYZ_in;
-   png_xy xy;
-
-   switch (png_colorspace_check_XYZ(&xy, &XYZ))
-   {
-      case 0:
-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,
-             preferred);
-
-      case 1:
-         /* End points are invalid. */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "invalid end points");
-         break;
-
-      default:
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_error(png_ptr, "internal error checking chromaticities");
-   }
-
-   return 0; /* failed */
-}
-
-#if defined(PNG_sRGB_SUPPORTED) || defined(PNG_iCCP_SUPPORTED)
-/* Error message generation */
-static char
-png_icc_tag_char(png_uint_32 byte)
-{
-   byte &= 0xff;
-   if (byte >= 32 && byte <= 126)
-      return (char)byte;
-   else
-      return '?';
-}
-
-static void
-png_icc_tag_name(char *name, png_uint_32 tag)
-{
-   name[0] = '\'';
-   name[1] = png_icc_tag_char(tag >> 24);
-   name[2] = png_icc_tag_char(tag >> 16);
-   name[3] = png_icc_tag_char(tag >>  8);
-   name[4] = png_icc_tag_char(tag      );
-   name[5] = '\'';
-}
-
-static int
-is_ICC_signature_char(png_alloc_size_t it)
-{
-   return it == 32 || (it >= 48 && it <= 57) || (it >= 65 && it <= 90) ||
-      (it >= 97 && it <= 122);
-}
-
-static int
-is_ICC_signature(png_alloc_size_t it)
-{
-   return is_ICC_signature_char(it >> 24) /* checks all the top bits */ &&
-      is_ICC_signature_char((it >> 16) & 0xff) &&
-      is_ICC_signature_char((it >> 8) & 0xff) &&
-      is_ICC_signature_char(it & 0xff);
-}
-
-static int
-png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_alloc_size_t value, png_const_charp reason)
-{
-   size_t pos;
-   char message[196]; /* see below for calculation */
-
-   if (colorspace != NULL)
-      colorspace->flags |= PNG_COLORSPACE_INVALID;
-
-   pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
-   pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
-   pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */
-   if (is_ICC_signature(value) != 0)
-   {
-      /* So 'value' is at most 4 bytes and the following cast is safe */
-      png_icc_tag_name(message+pos, (png_uint_32)value);
-      pos += 6; /* total +8; less than the else clause */
-      message[pos++] = ':';
-      message[pos++] = ' ';
-   }
-#  ifdef PNG_WARNINGS_SUPPORTED
-   else
-      {
-         char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/
-
-         pos = png_safecat(message, (sizeof message), pos,
-             png_format_number(number, number+(sizeof number),
-             PNG_NUMBER_FORMAT_x, value));
-         pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/
-      }
-#  endif
-   /* The 'reason' is an arbitrary message, allow +79 maximum 195 */
-   pos = png_safecat(message, (sizeof message), pos, reason);
-   PNG_UNUSED(pos)
-
-   /* This is recoverable, but make it unconditionally an app_error on write to
-    * avoid writing invalid ICC profiles into PNG files (i.e., we handle them
-    * on read, with a warning, but on write unless the app turns off
-    * application errors the PNG won't be written.)
-    */
-   png_chunk_report(png_ptr, message,
-       (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
-
-   return 0;
-}
-#endif /* sRGB || iCCP */
-
-#ifdef PNG_sRGB_SUPPORTED
-int /* PRIVATE */
-png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    int intent)
-{
-   /* sRGB sets known gamma, end points and (from the chunk) intent. */
-   /* IMPORTANT: these are not necessarily the values found in an ICC profile
-    * because ICC profiles store values adapted to a D50 environment; it is
-    * expected that the ICC profile mediaWhitePointTag will be D50; see the
-    * checks and code elsewhere to understand this better.
-    *
-    * These XYZ values, which are accurate to 5dp, produce rgb to gray
-    * coefficients of (6968,23435,2366), which are reduced (because they add up
-    * to 32769 not 32768) to (6968,23434,2366).  These are the values that
-    * libpng has traditionally used (and are the best values given the 15bit
-    * algorithm used by the rgb to gray code.)
-    */
-   static const png_XYZ sRGB_XYZ = /* D65 XYZ (*not* the D50 adapted values!) */
-   {
-      /* color      X      Y      Z */
-      /* red   */ 41239, 21264,  1933,
-      /* green */ 35758, 71517, 11919,
-      /* blue  */ 18048,  7219, 95053
-   };
-
-   /* Do nothing if the colorspace is already invalidated. */
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   /* Check the intent, then check for existing settings.  It is valid for the
-    * PNG file to have cHRM or gAMA chunks along with sRGB, but the values must
-    * be consistent with the correct values.  If, however, this function is
-    * called below because an iCCP chunk matches sRGB then it is quite
-    * conceivable that an older app recorded incorrect gAMA and cHRM because of
-    * an incorrect calculation based on the values in the profile - this does
-    * *not* invalidate the profile (though it still produces an error, which can
-    * be ignored.)
-    */
-   if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)
-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-          (png_alloc_size_t)intent, "invalid sRGB rendering intent");
-
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&
-       colorspace->rendering_intent != intent)
-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-         (png_alloc_size_t)intent, "inconsistent rendering intents");
-
-   if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0)
-   {
-      png_benign_error(png_ptr, "duplicate sRGB information ignored");
-      return 0;
-   }
-
-   /* If the standard sRGB cHRM chunk does not match the one from the PNG file
-    * warn but overwrite the value with the correct one.
-    */
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&
-       !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
-       100))
-      png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",
-         PNG_CHUNK_ERROR);
-
-   /* This check is just done for the error reporting - the routine always
-    * returns true when the 'from' argument corresponds to sRGB (2).
-    */
-   (void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,
-       2/*from sRGB*/);
-
-   /* intent: bugs in GCC force 'int' to be used as the parameter type. */
-   colorspace->rendering_intent = (png_uint_16)intent;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_INTENT;
-
-   /* endpoints */
-   colorspace->end_points_xy = sRGB_xy;
-   colorspace->end_points_XYZ = sRGB_XYZ;
-   colorspace->flags |=
-      (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-
-   /* gamma */
-   colorspace->gamma = PNG_GAMMA_sRGB_INVERSE;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_GAMMA;
-
-   /* Finally record that we have an sRGB profile */
-   colorspace->flags |=
-      (PNG_COLORSPACE_MATCHES_sRGB|PNG_COLORSPACE_FROM_sRGB);
-
-   return 1; /* set */
-}
-#endif /* sRGB */
-
-#ifdef PNG_iCCP_SUPPORTED
-/* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value
- * is XYZ(0.9642,1.0,0.8249), which scales to:
- *
- *    (63189.8112, 65536, 54060.6464)
- */
-static const png_byte D50_nCIEXYZ[12] =
-   { 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };
-
-static int /* bool */
-icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length)
-{
-   if (profile_length < 132)
-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-          "too short");
-   return 1;
-}
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-int /* PRIVATE */
-png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length)
-{
-   if (!icc_check_length(png_ptr, colorspace, name, profile_length))
-      return 0;
-
-   /* This needs to be here because the 'normal' check is in
-    * png_decompress_chunk, yet this happens after the attempt to
-    * png_malloc_base the required data.  We only need this on read; on write
-    * the caller supplies the profile buffer so libpng doesn't allocate it.  See
-    * the call to icc_check_length below (the write case).
-    */
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-      else if (png_ptr->user_chunk_malloc_max > 0 &&
-               png_ptr->user_chunk_malloc_max < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds application limits");
-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
-      else if (PNG_USER_CHUNK_MALLOC_MAX < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds libpng limits");
-#  else /* !SET_USER_LIMITS */
-      /* This will get compiled out on all 32-bit and better systems. */
-      else if (PNG_SIZE_MAX < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds system limits");
-#  endif /* !SET_USER_LIMITS */
-
-   return 1;
-}
-#endif /* READ_iCCP */
-
-int /* PRIVATE */
-png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length,
-    png_const_bytep profile/* first 132 bytes only */, int color_type)
-{
-   png_uint_32 temp;
-
-   /* Length check; this cannot be ignored in this code because profile_length
-    * is used later to check the tag table, so even if the profile seems over
-    * long profile_length from the caller must be correct.  The caller can fix
-    * this up on read or write by just passing in the profile header length.
-    */
-   temp = png_get_uint_32(profile);
-   if (temp != profile_length)
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
-          "length does not match profile");
-
-   temp = (png_uint_32) (*(profile+8));
-   if (temp > 3 && (profile_length & 3))
-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-          "invalid length");
-
-   temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */
-   if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */
-      profile_length < 132+12*temp) /* truncated tag table */
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
-          "tag count too large");
-
-   /* The 'intent' must be valid or we can't store it, ICC limits the intent to
-    * 16 bits.
-    */
-   temp = png_get_uint_32(profile+64);
-   if (temp >= 0xffff) /* The ICC limit */
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
-          "invalid rendering intent");
-
-   /* This is just a warning because the profile may be valid in future
-    * versions.
-    */
-   if (temp >= PNG_sRGB_INTENT_LAST)
-      (void)png_icc_profile_error(png_ptr, NULL, name, temp,
-          "intent outside defined range");
-
-   /* At this point the tag table can't be checked because it hasn't necessarily
-    * been loaded; however, various header fields can be checked.  These checks
-    * are for values permitted by the PNG spec in an ICC profile; the PNG spec
-    * restricts the profiles that can be passed in an iCCP chunk (they must be
-    * appropriate to processing PNG data!)
-    */
-
-   /* Data checks (could be skipped).  These checks must be independent of the
-    * version number; however, the version number doesn't accomodate changes in
-    * the header fields (just the known tags and the interpretation of the
-    * data.)
-    */
-   temp = png_get_uint_32(profile+36); /* signature 'ascp' */
-   if (temp != 0x61637370)
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
-          "invalid signature");
-
-   /* Currently the PCS illuminant/adopted white point (the computational
-    * white point) are required to be D50,
-    * however the profile contains a record of the illuminant so perhaps ICC
-    * expects to be able to change this in the future (despite the rationale in
-    * the introduction for using a fixed PCS adopted white.)  Consequently the
-    * following is just a warning.
-    */
-   if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)
-      (void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,
-          "PCS illuminant is not D50");
-
-   /* The PNG spec requires this:
-    * "If the iCCP chunk is present, the image samples conform to the colour
-    * space represented by the embedded ICC profile as defined by the
-    * International Color Consortium [ICC]. The colour space of the ICC profile
-    * shall be an RGB colour space for colour images (PNG colour types 2, 3, and
-    * 6), or a greyscale colour space for greyscale images (PNG colour types 0
-    * and 4)."
-    *
-    * This checking code ensures the embedded profile (on either read or write)
-    * conforms to the specification requirements.  Notice that an ICC 'gray'
-    * color-space profile contains the information to transform the monochrome
-    * data to XYZ or L*a*b (according to which PCS the profile uses) and this
-    * should be used in preference to the standard libpng K channel replication
-    * into R, G and B channels.
-    *
-    * Previously it was suggested that an RGB profile on grayscale data could be
-    * handled.  However it it is clear that using an RGB profile in this context
-    * must be an error - there is no specification of what it means.  Thus it is
-    * almost certainly more correct to ignore the profile.
-    */
-   temp = png_get_uint_32(profile+16); /* data colour space field */
-   switch (temp)
-   {
-      case 0x52474220: /* 'RGB ' */
-         if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
-            return png_icc_profile_error(png_ptr, colorspace, name, temp,
-                "RGB color space not permitted on grayscale PNG");
-         break;
-
-      case 0x47524159: /* 'GRAY' */
-         if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
-            return png_icc_profile_error(png_ptr, colorspace, name, temp,
-                "Gray color space not permitted on RGB PNG");
-         break;
-
-      default:
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
-             "invalid ICC profile color space");
-   }
-
-   /* It is up to the application to check that the profile class matches the
-    * application requirements; the spec provides no guidance, but it's pretty
-    * weird if the profile is not scanner ('scnr'), monitor ('mntr'), printer
-    * ('prtr') or 'spac' (for generic color spaces).  Issue a warning in these
-    * cases.  Issue an error for device link or abstract profiles - these don't
-    * contain the records necessary to transform the color-space to anything
-    * other than the target device (and not even that for an abstract profile).
-    * Profiles of these classes may not be embedded in images.
-    */
-   temp = png_get_uint_32(profile+12); /* profile/device class */
-   switch (temp)
-   {
-      case 0x73636e72: /* 'scnr' */
-      case 0x6d6e7472: /* 'mntr' */
-      case 0x70727472: /* 'prtr' */
-      case 0x73706163: /* 'spac' */
-         /* All supported */
-         break;
-
-      case 0x61627374: /* 'abst' */
-         /* May not be embedded in an image */
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
-             "invalid embedded Abstract ICC profile");
-
-      case 0x6c696e6b: /* 'link' */
-         /* DeviceLink profiles cannot be interpreted in a non-device specific
-          * fashion, if an app uses the AToB0Tag in the profile the results are
-          * undefined unless the result is sent to the intended device,
-          * therefore a DeviceLink profile should not be found embedded in a
-          * PNG.
-          */
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
-             "unexpected DeviceLink ICC profile class");
-
-      case 0x6e6d636c: /* 'nmcl' */
-         /* A NamedColor profile is also device specific, however it doesn't
-          * contain an AToB0 tag that is open to misinterpretation.  Almost
-          * certainly it will fail the tests below.
-          */
-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
-             "unexpected NamedColor ICC profile class");
-         break;
-
-      default:
-         /* To allow for future enhancements to the profile accept unrecognized
-          * profile classes with a warning, these then hit the test below on the
-          * tag content to ensure they are backward compatible with one of the
-          * understood profiles.
-          */
-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
-             "unrecognized ICC profile class");
-         break;
-   }
-
-   /* For any profile other than a device link one the PCS must be encoded
-    * either in XYZ or Lab.
-    */
-   temp = png_get_uint_32(profile+20);
-   switch (temp)
-   {
-      case 0x58595a20: /* 'XYZ ' */
-      case 0x4c616220: /* 'Lab ' */
-         break;
-
-      default:
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
-             "unexpected ICC PCS encoding");
-   }
-
-   return 1;
-}
-
-int /* PRIVATE */
-png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length,
-    png_const_bytep profile /* header plus whole tag table */)
-{
-   png_uint_32 tag_count = png_get_uint_32(profile+128);
-   png_uint_32 itag;
-   png_const_bytep tag = profile+132; /* The first tag */
-
-   /* First scan all the tags in the table and add bits to the icc_info value
-    * (temporarily in 'tags').
-    */
-   for (itag=0; itag < tag_count; ++itag, tag += 12)
-   {
-      png_uint_32 tag_id = png_get_uint_32(tag+0);
-      png_uint_32 tag_start = png_get_uint_32(tag+4); /* must be aligned */
-      png_uint_32 tag_length = png_get_uint_32(tag+8);/* not padded */
-
-      /* The ICC specification does not exclude zero length tags, therefore the
-       * start might actually be anywhere if there is no data, but this would be
-       * a clear abuse of the intent of the standard so the start is checked for
-       * being in range.  All defined tag types have an 8 byte header - a 4 byte
-       * type signature then 0.
-       */
-
-      /* This is a hard error; potentially it can cause read outside the
-       * profile.
-       */
-      if (tag_start > profile_length || tag_length > profile_length - tag_start)
-         return png_icc_profile_error(png_ptr, colorspace, name, tag_id,
-             "ICC profile tag outside profile");
-
-      if ((tag_start & 3) != 0)
-      {
-         /* CNHP730S.icc shipped with Microsoft Windows 64 violates this; it is
-          * only a warning here because libpng does not care about the
-          * alignment.
-          */
-         (void)png_icc_profile_error(png_ptr, NULL, name, tag_id,
-             "ICC profile tag start not a multiple of 4");
-      }
-   }
-
-   return 1; /* success, maybe with warnings */
-}
-
-#ifdef PNG_sRGB_SUPPORTED
-#if PNG_sRGB_PROFILE_CHECKS >= 0
-/* Information about the known ICC sRGB profiles */
-static const struct
-{
-   png_uint_32 adler, crc, length;
-   png_uint_32 md5[4];
-   png_byte    have_md5;
-   png_byte    is_broken;
-   png_uint_16 intent;
-
-#  define PNG_MD5(a,b,c,d) { a, b, c, d }, (a!=0)||(b!=0)||(c!=0)||(d!=0)
-#  define PNG_ICC_CHECKSUM(adler, crc, md5, intent, broke, date, length, fname)\
-      { adler, crc, length, md5, broke, intent },
-
-} png_sRGB_checks[] =
-{
-   /* This data comes from contrib/tools/checksum-icc run on downloads of
-    * all four ICC sRGB profiles from www.color.org.
-    */
-   /* adler32, crc32, MD5[4], intent, date, length, file-name */
-   PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,
-       PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
-       "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
-
-   /* ICC sRGB v2 perceptual no black-compensation: */
-   PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,
-       PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
-       "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
-
-   PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,
-       PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
-       "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
-
-   /* ICC sRGB v4 perceptual */
-   PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,
-       PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
-       "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
-
-   /* The following profiles have no known MD5 checksum. If there is a match
-    * on the (empty) MD5 the other fields are used to attempt a match and
-    * a warning is produced.  The first two of these profiles have a 'cprt' tag
-    * which suggests that they were also made by Hewlett Packard.
-    */
-   PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
-       "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
-
-   /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
-    * match the D50 PCS illuminant in the header (it is in fact the D65 values,
-    * so the white point is recorded as the un-adapted value.)  The profiles
-    * below only differ in one byte - the intent - and are basically the same as
-    * the previous profile except for the mediaWhitePointTag error and a missing
-    * chromaticAdaptationTag.
-    */
-   PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
-
-   PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
-};
-
-static int
-png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
-    png_const_bytep profile, uLong adler)
-{
-   /* The quick check is to verify just the MD5 signature and trust the
-    * rest of the data.  Because the profile has already been verified for
-    * correctness this is safe.  png_colorspace_set_sRGB will check the 'intent'
-    * field too, so if the profile has been edited with an intent not defined
-    * by sRGB (but maybe defined by a later ICC specification) the read of
-    * the profile will fail at that point.
-    */
-
-   png_uint_32 length = 0;
-   png_uint_32 intent = 0x10000; /* invalid */
-#if PNG_sRGB_PROFILE_CHECKS > 1
-   uLong crc = 0; /* the value for 0 length data */
-#endif
-   unsigned int i;
-
-#ifdef PNG_SET_OPTION_SUPPORTED
-   /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */
-   if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) ==
-               PNG_OPTION_ON)
-      return 0;
-#endif
-
-   for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i)
-   {
-      if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] &&
-         png_get_uint_32(profile+88) == png_sRGB_checks[i].md5[1] &&
-         png_get_uint_32(profile+92) == png_sRGB_checks[i].md5[2] &&
-         png_get_uint_32(profile+96) == png_sRGB_checks[i].md5[3])
-      {
-         /* This may be one of the old HP profiles without an MD5, in that
-          * case we can only use the length and Adler32 (note that these
-          * are not used by default if there is an MD5!)
-          */
-#        if PNG_sRGB_PROFILE_CHECKS == 0
-            if (png_sRGB_checks[i].have_md5 != 0)
-               return 1+png_sRGB_checks[i].is_broken;
-#        endif
-
-         /* Profile is unsigned or more checks have been configured in. */
-         if (length == 0)
-         {
-            length = png_get_uint_32(profile);
-            intent = png_get_uint_32(profile+64);
-         }
-
-         /* Length *and* intent must match */
-         if (length == (png_uint_32) png_sRGB_checks[i].length &&
-            intent == (png_uint_32) png_sRGB_checks[i].intent)
-         {
-            /* Now calculate the adler32 if not done already. */
-            if (adler == 0)
-            {
-               adler = adler32(0, NULL, 0);
-               adler = adler32(adler, profile, length);
-            }
-
-            if (adler == png_sRGB_checks[i].adler)
-            {
-               /* These basic checks suggest that the data has not been
-                * modified, but if the check level is more than 1 perform
-                * our own crc32 checksum on the data.
-                */
-#              if PNG_sRGB_PROFILE_CHECKS > 1
-                  if (crc == 0)
-                  {
-                     crc = crc32(0, NULL, 0);
-                     crc = crc32(crc, profile, length);
-                  }
-
-                  /* So this check must pass for the 'return' below to happen.
-                   */
-                  if (crc == png_sRGB_checks[i].crc)
-#              endif
-               {
-                  if (png_sRGB_checks[i].is_broken != 0)
-                  {
-                     /* These profiles are known to have bad data that may cause
-                      * problems if they are used, therefore attempt to
-                      * discourage their use, skip the 'have_md5' warning below,
-                      * which is made irrelevant by this error.
-                      */
-                     png_chunk_report(png_ptr, "known incorrect sRGB profile",
-                         PNG_CHUNK_ERROR);
-                  }
-
-                  /* Warn that this being done; this isn't even an error since
-                   * the profile is perfectly valid, but it would be nice if
-                   * people used the up-to-date ones.
-                   */
-                  else if (png_sRGB_checks[i].have_md5 == 0)
-                  {
-                     png_chunk_report(png_ptr,
-                         "out-of-date sRGB profile with no signature",
-                         PNG_CHUNK_WARNING);
-                  }
-
-                  return 1+png_sRGB_checks[i].is_broken;
-               }
-            }
-
-# if PNG_sRGB_PROFILE_CHECKS > 0
-         /* The signature matched, but the profile had been changed in some
-          * way.  This probably indicates a data error or uninformed hacking.
-          * Fall through to "no match".
-          */
-         png_chunk_report(png_ptr,
-             "Not recognizing known sRGB profile that has been edited",
-             PNG_CHUNK_WARNING);
-         break;
-# endif
-         }
-      }
-   }
-
-   return 0; /* no match */
-}
-
-void /* PRIVATE */
-png_icc_set_sRGB(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
-{
-   /* Is this profile one of the known ICC sRGB profiles?  If it is, just set
-    * the sRGB information.
-    */
-   if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
-      (void)png_colorspace_set_sRGB(png_ptr, colorspace,
-         (int)/*already checked*/png_get_uint_32(profile+64));
-}
-#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */
-#endif /* sRGB */
-
-int /* PRIVATE */
-png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
-    int color_type)
-{
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   if (icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
-       png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
-           color_type) != 0 &&
-       png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
-           profile) != 0)
-   {
-#     if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
-         /* If no sRGB support, don't try storing sRGB information */
-         png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
-#     endif
-      return 1;
-   }
-
-   /* Failure case */
-   return 0;
-}
-#endif /* iCCP */
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-void /* PRIVATE */
-png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
-{
-   /* Set the rgb_to_gray coefficients from the colorspace. */
-   if (png_ptr->rgb_to_gray_coefficients_set == 0 &&
-      (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      /* png_set_background has not been called, get the coefficients from the Y
-       * values of the colorspace colorants.
-       */
-      png_fixed_point r = png_ptr->colorspace.end_points_XYZ.red_Y;
-      png_fixed_point g = png_ptr->colorspace.end_points_XYZ.green_Y;
-      png_fixed_point b = png_ptr->colorspace.end_points_XYZ.blue_Y;
-      png_fixed_point total = r+g+b;
-
-      if (total > 0 &&
-         r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
-         g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
-         b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
-         r+g+b <= 32769)
-      {
-         /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
-          * all of the coefficients were rounded up.  Handle this by
-          * reducing the *largest* coefficient by 1; this matches the
-          * approach used for the default coefficients in pngrtran.c
-          */
-         int add = 0;
-
-         if (r+g+b > 32768)
-            add = -1;
-         else if (r+g+b < 32768)
-            add = 1;
-
-         if (add != 0)
-         {
-            if (g >= r && g >= b)
-               g += add;
-            else if (r >= g && r >= b)
-               r += add;
-            else
-               b += add;
-         }
-
-         /* Check for an internal error. */
-         if (r+g+b != 32768)
-            png_error(png_ptr,
-                "internal error handling cHRM coefficients");
-
-         else
-         {
-            png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
-            png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
-         }
-      }
-
-      /* This is a png_error at present even though it could be ignored -
-       * it should never happen, but it is important that if it does, the
-       * bug is fixed.
-       */
-      else
-         png_error(png_ptr, "internal error handling cHRM->XYZ");
-   }
-}
-#endif /* READ_RGB_TO_GRAY */
-
-#endif /* COLORSPACE */
-
-#ifdef __GNUC__
-/* This exists solely to work round a warning from GNU C. */
-static int /* PRIVATE */
-png_gt(size_t a, size_t b)
-{
-   return a > b;
-}
-#else
-#   define png_gt(a,b) ((a) > (b))
-#endif
-
-void /* PRIVATE */
-png_check_IHDR(png_const_structrp png_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_type, int compression_type,
-    int filter_type)
-{
-   int error = 0;
-
-   /* Check for width and height valid values */
-   if (width == 0)
-   {
-      png_warning(png_ptr, "Image width is zero in IHDR");
-      error = 1;
-   }
-
-   if (width > PNG_UINT_31_MAX)
-   {
-      png_warning(png_ptr, "Invalid image width in IHDR");
-      error = 1;
-   }
-
-   if (png_gt(((width + 7) & (~7U)),
-       ((PNG_SIZE_MAX
-           - 48        /* big_row_buf hack */
-           - 1)        /* filter byte */
-           / 8)        /* 8-byte RGBA pixels */
-           - 1))       /* extra max_pixel_depth pad */
-   {
-      /* The size of the row must be within the limits of this architecture.
-       * Because the read code can perform arbitrary transformations the
-       * maximum size is checked here.  Because the code in png_read_start_row
-       * adds extra space "for safety's sake" in several places a conservative
-       * limit is used here.
-       *
-       * NOTE: it would be far better to check the size that is actually used,
-       * but the effect in the real world is minor and the changes are more
-       * extensive, therefore much more dangerous and much more difficult to
-       * write in a way that avoids compiler warnings.
-       */
-      png_warning(png_ptr, "Image width is too large for this architecture");
-      error = 1;
-   }
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (width > png_ptr->user_width_max)
-#else
-   if (width > PNG_USER_WIDTH_MAX)
-#endif
-   {
-      png_warning(png_ptr, "Image width exceeds user limit in IHDR");
-      error = 1;
-   }
-
-   if (height == 0)
-   {
-      png_warning(png_ptr, "Image height is zero in IHDR");
-      error = 1;
-   }
-
-   if (height > PNG_UINT_31_MAX)
-   {
-      png_warning(png_ptr, "Invalid image height in IHDR");
-      error = 1;
-   }
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (height > png_ptr->user_height_max)
-#else
-   if (height > PNG_USER_HEIGHT_MAX)
-#endif
-   {
-      png_warning(png_ptr, "Image height exceeds user limit in IHDR");
-      error = 1;
-   }
-
-   /* Check other values */
-   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
-       bit_depth != 8 && bit_depth != 16)
-   {
-      png_warning(png_ptr, "Invalid bit depth in IHDR");
-      error = 1;
-   }
-
-   if (color_type < 0 || color_type == 1 ||
-       color_type == 5 || color_type > 6)
-   {
-      png_warning(png_ptr, "Invalid color type in IHDR");
-      error = 1;
-   }
-
-   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
-       ((color_type == PNG_COLOR_TYPE_RGB ||
-         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
-         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
-   {
-      png_warning(png_ptr, "Invalid color type/bit depth combination in IHDR");
-      error = 1;
-   }
-
-   if (interlace_type >= PNG_INTERLACE_LAST)
-   {
-      png_warning(png_ptr, "Unknown interlace method in IHDR");
-      error = 1;
-   }
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Unknown compression method in IHDR");
-      error = 1;
-   }
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   /* Accept filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not read a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 &&
-       png_ptr->mng_features_permitted != 0)
-      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
-
-   if (filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
-          (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
-          ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
-          (color_type == PNG_COLOR_TYPE_RGB ||
-          color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
-      {
-         png_warning(png_ptr, "Unknown filter method in IHDR");
-         error = 1;
-      }
-
-      if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0)
-      {
-         png_warning(png_ptr, "Invalid filter method in IHDR");
-         error = 1;
-      }
-   }
-
-#else
-   if (filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Unknown filter method in IHDR");
-      error = 1;
-   }
-#endif
-
-   if (error == 1)
-      png_error(png_ptr, "Invalid IHDR data");
-}
-
-#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
-/* ASCII to fp functions */
-/* Check an ASCII formated floating point value, see the more detailed
- * comments in pngpriv.h
- */
-/* The following is used internally to preserve the sticky flags */
-#define png_fp_add(state, flags) ((state) |= (flags))
-#define png_fp_set(state, value) ((state) = (value) | ((state) & PNG_FP_STICKY))
-
-int /* PRIVATE */
-png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
-    png_size_tp whereami)
-{
-   int state = *statep;
-   png_size_t i = *whereami;
-
-   while (i < size)
-   {
-      int type;
-      /* First find the type of the next character */
-      switch (string[i])
-      {
-      case 43:  type = PNG_FP_SAW_SIGN;                   break;
-      case 45:  type = PNG_FP_SAW_SIGN + PNG_FP_NEGATIVE; break;
-      case 46:  type = PNG_FP_SAW_DOT;                    break;
-      case 48:  type = PNG_FP_SAW_DIGIT;                  break;
-      case 49: case 50: case 51: case 52:
-      case 53: case 54: case 55: case 56:
-      case 57:  type = PNG_FP_SAW_DIGIT + PNG_FP_NONZERO; break;
-      case 69:
-      case 101: type = PNG_FP_SAW_E;                      break;
-      default:  goto PNG_FP_End;
-      }
-
-      /* Now deal with this type according to the current
-       * state, the type is arranged to not overlap the
-       * bits of the PNG_FP_STATE.
-       */
-      switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY))
-      {
-      case PNG_FP_INTEGER + PNG_FP_SAW_SIGN:
-         if ((state & PNG_FP_SAW_ANY) != 0)
-            goto PNG_FP_End; /* not a part of the number */
-
-         png_fp_add(state, type);
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_SAW_DOT:
-         /* Ok as trailer, ok as lead of fraction. */
-         if ((state & PNG_FP_SAW_DOT) != 0) /* two dots */
-            goto PNG_FP_End;
-
-         else if ((state & PNG_FP_SAW_DIGIT) != 0) /* trailing dot? */
-            png_fp_add(state, type);
-
-         else
-            png_fp_set(state, PNG_FP_FRACTION | type);
-
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT:
-         if ((state & PNG_FP_SAW_DOT) != 0) /* delayed fraction */
-            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
-
-         png_fp_add(state, type | PNG_FP_WAS_VALID);
-
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_SAW_E:
-         if ((state & PNG_FP_SAW_DIGIT) == 0)
-            goto PNG_FP_End;
-
-         png_fp_set(state, PNG_FP_EXPONENT);
-
-         break;
-
-   /* case PNG_FP_FRACTION + PNG_FP_SAW_SIGN:
-         goto PNG_FP_End; ** no sign in fraction */
-
-   /* case PNG_FP_FRACTION + PNG_FP_SAW_DOT:
-         goto PNG_FP_End; ** Because SAW_DOT is always set */
-
-      case PNG_FP_FRACTION + PNG_FP_SAW_DIGIT:
-         png_fp_add(state, type | PNG_FP_WAS_VALID);
-         break;
-
-      case PNG_FP_FRACTION + PNG_FP_SAW_E:
-         /* This is correct because the trailing '.' on an
-          * integer is handled above - so we can only get here
-          * with the sequence ".E" (with no preceding digits).
-          */
-         if ((state & PNG_FP_SAW_DIGIT) == 0)
-            goto PNG_FP_End;
-
-         png_fp_set(state, PNG_FP_EXPONENT);
-
-         break;
-
-      case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN:
-         if ((state & PNG_FP_SAW_ANY) != 0)
-            goto PNG_FP_End; /* not a part of the number */
-
-         png_fp_add(state, PNG_FP_SAW_SIGN);
-
-         break;
-
-   /* case PNG_FP_EXPONENT + PNG_FP_SAW_DOT:
-         goto PNG_FP_End; */
-
-      case PNG_FP_EXPONENT + PNG_FP_SAW_DIGIT:
-         png_fp_add(state, PNG_FP_SAW_DIGIT | PNG_FP_WAS_VALID);
-
-         break;
-
-   /* case PNG_FP_EXPONEXT + PNG_FP_SAW_E:
-         goto PNG_FP_End; */
-
-      default: goto PNG_FP_End; /* I.e. break 2 */
-      }
-
-      /* The character seems ok, continue. */
-      ++i;
-   }
-
-PNG_FP_End:
-   /* Here at the end, update the state and return the correct
-    * return code.
-    */
-   *statep = state;
-   *whereami = i;
-
-   return (state & PNG_FP_SAW_DIGIT) != 0;
-}
-
-
-/* The same but for a complete string. */
-int
-png_check_fp_string(png_const_charp string, png_size_t size)
-{
-   int        state=0;
-   png_size_t char_index=0;
-
-   if (png_check_fp_number(string, size, &state, &char_index) != 0 &&
-      (char_index == size || string[char_index] == 0))
-      return state /* must be non-zero - see above */;
-
-   return 0; /* i.e. fail */
-}
-#endif /* pCAL || sCAL */
-
-#ifdef PNG_sCAL_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-/* Utility used below - a simple accurate power of ten from an integral
- * exponent.
- */
-static double
-png_pow10(int power)
-{
-   int recip = 0;
-   double d = 1;
-
-   /* Handle negative exponent with a reciprocal at the end because
-    * 10 is exact whereas .1 is inexact in base 2
-    */
-   if (power < 0)
-   {
-      if (power < DBL_MIN_10_EXP) return 0;
-      recip = 1; power = -power;
-   }
-
-   if (power > 0)
-   {
-      /* Decompose power bitwise. */
-      double mult = 10;
-      do
-      {
-         if (power & 1) d *= mult;
-         mult *= mult;
-         power >>= 1;
-      }
-      while (power > 0);
-
-      if (recip != 0) d = 1/d;
-   }
-   /* else power is 0 and d is 1 */
-
-   return d;
-}
-
-/* Function to format a floating point value in ASCII with a given
- * precision.
- */
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic push
-/* The problem arises below with exp_b10, which can never overflow because it
- * comes, originally, from frexp and is therefore limited to a range which is
- * typically +/-710 (log2(DBL_MAX)/log2(DBL_MIN)).
- */
-#pragma GCC diagnostic warning "-Wstrict-overflow=2"
-#endif /* GCC_STRICT_OVERFLOW */
-void /* PRIVATE */
-png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size,
-    double fp, unsigned int precision)
-{
-   /* We use standard functions from math.h, but not printf because
-    * that would require stdio.  The caller must supply a buffer of
-    * sufficient size or we will png_error.  The tests on size and
-    * the space in ascii[] consumed are indicated below.
-    */
-   if (precision < 1)
-      precision = DBL_DIG;
-
-   /* Enforce the limit of the implementation precision too. */
-   if (precision > DBL_DIG+1)
-      precision = DBL_DIG+1;
-
-   /* Basic sanity checks */
-   if (size >= precision+5) /* See the requirements below. */
-   {
-      if (fp < 0)
-      {
-         fp = -fp;
-         *ascii++ = 45; /* '-'  PLUS 1 TOTAL 1 */
-         --size;
-      }
-
-      if (fp >= DBL_MIN && fp <= DBL_MAX)
-      {
-         int exp_b10;   /* A base 10 exponent */
-         double base;   /* 10^exp_b10 */
-
-         /* First extract a base 10 exponent of the number,
-          * the calculation below rounds down when converting
-          * from base 2 to base 10 (multiply by log10(2) -
-          * 0.3010, but 77/256 is 0.3008, so exp_b10 needs to
-          * be increased.  Note that the arithmetic shift
-          * performs a floor() unlike C arithmetic - using a
-          * C multiply would break the following for negative
-          * exponents.
-          */
-         (void)frexp(fp, &exp_b10); /* exponent to base 2 */
-
-         exp_b10 = (exp_b10 * 77) >> 8; /* <= exponent to base 10 */
-
-         /* Avoid underflow here. */
-         base = png_pow10(exp_b10); /* May underflow */
-
-         while (base < DBL_MIN || base < fp)
-         {
-            /* And this may overflow. */
-            double test = png_pow10(exp_b10+1);
-
-            if (test <= DBL_MAX)
-            {
-               ++exp_b10; base = test;
-            }
-
-            else
-               break;
-         }
-
-         /* Normalize fp and correct exp_b10, after this fp is in the
-          * range [.1,1) and exp_b10 is both the exponent and the digit
-          * *before* which the decimal point should be inserted
-          * (starting with 0 for the first digit).  Note that this
-          * works even if 10^exp_b10 is out of range because of the
-          * test on DBL_MAX above.
-          */
-         fp /= base;
-         while (fp >= 1)
-         {
-            fp /= 10; ++exp_b10;
-         }
-
-         /* Because of the code above fp may, at this point, be
-          * less than .1, this is ok because the code below can
-          * handle the leading zeros this generates, so no attempt
-          * is made to correct that here.
-          */
-
-         {
-            unsigned int czero, clead, cdigits;
-            char exponent[10];
-
-            /* Allow up to two leading zeros - this will not lengthen
-             * the number compared to using E-n.
-             */
-            if (exp_b10 < 0 && exp_b10 > -3) /* PLUS 3 TOTAL 4 */
-            {
-               czero = 0U-exp_b10; /* PLUS 2 digits: TOTAL 3 */
-               exp_b10 = 0;      /* Dot added below before first output. */
-            }
-            else
-               czero = 0;    /* No zeros to add */
-
-            /* Generate the digit list, stripping trailing zeros and
-             * inserting a '.' before a digit if the exponent is 0.
-             */
-            clead = czero; /* Count of leading zeros */
-            cdigits = 0;   /* Count of digits in list. */
-
-            do
-            {
-               double d;
-
-               fp *= 10;
-               /* Use modf here, not floor and subtract, so that
-                * the separation is done in one step.  At the end
-                * of the loop don't break the number into parts so
-                * that the final digit is rounded.
-                */
-               if (cdigits+czero+1 < precision+clead)
-                  fp = modf(fp, &d);
-
-               else
-               {
-                  d = floor(fp + .5);
-
-                  if (d > 9)
-                  {
-                     /* Rounding up to 10, handle that here. */
-                     if (czero > 0)
-                     {
-                        --czero; d = 1;
-                        if (cdigits == 0) --clead;
-                     }
-                     else
-                     {
-                        while (cdigits > 0 && d > 9)
-                        {
-                           int ch = *--ascii;
-
-                           if (exp_b10 != (-1))
-                              ++exp_b10;
-
-                           else if (ch == 46)
-                           {
-                              ch = *--ascii; ++size;
-                              /* Advance exp_b10 to '1', so that the
-                               * decimal point happens after the
-                               * previous digit.
-                               */
-                              exp_b10 = 1;
-                           }
-
-                           --cdigits;
-                           d = ch - 47;  /* I.e. 1+(ch-48) */
-                        }
-
-                        /* Did we reach the beginning? If so adjust the
-                         * exponent but take into account the leading
-                         * decimal point.
-                         */
-                        if (d > 9)  /* cdigits == 0 */
-                        {
-                           if (exp_b10 == (-1))
-                           {
-                              /* Leading decimal point (plus zeros?), if
-                               * we lose the decimal point here it must
-                               * be reentered below.
-                               */
-                              int ch = *--ascii;
-
-                              if (ch == 46)
-                              {
-                                 ++size; exp_b10 = 1;
-                              }
-
-                              /* Else lost a leading zero, so 'exp_b10' is
-                               * still ok at (-1)
-                               */
-                           }
-                           else
-                              ++exp_b10;
-
-                           /* In all cases we output a '1' */
-                           d = 1;
-                        }
-                     }
-                  }
-                  fp = 0; /* Guarantees termination below. */
-               }
-
-               if (d == 0)
-               {
-                  ++czero;
-                  if (cdigits == 0) ++clead;
-               }
-               else
-               {
-                  /* Included embedded zeros in the digit count. */
-                  cdigits += czero - clead;
-                  clead = 0;
-
-                  while (czero > 0)
-                  {
-                     /* exp_b10 == (-1) means we just output the decimal
-                      * place - after the DP don't adjust 'exp_b10' any
-                      * more!
-                      */
-                     if (exp_b10 != (-1))
-                     {
-                        if (exp_b10 == 0)
-                        {
-                           *ascii++ = 46; --size;
-                        }
-                        /* PLUS 1: TOTAL 4 */
-                        --exp_b10;
-                     }
-                     *ascii++ = 48; --czero;
-                  }
-
-                  if (exp_b10 != (-1))
-                  {
-                     if (exp_b10 == 0)
-                     {
-                        *ascii++ = 46; --size; /* counted above */
-                     }
-
-                     --exp_b10;
-                  }
-                  *ascii++ = (char)(48 + (int)d); ++cdigits;
-               }
-            }
-            while (cdigits+czero < precision+clead && fp > DBL_MIN);
-
-            /* The total output count (max) is now 4+precision */
-
-            /* Check for an exponent, if we don't need one we are
-             * done and just need to terminate the string.  At
-             * this point exp_b10==(-1) is effectively a flag - it got
-             * to '-1' because of the decrement after outputting
-             * the decimal point above (the exponent required is
-             * *not* -1!)
-             */
-            if (exp_b10 >= (-1) && exp_b10 <= 2)
-            {
-               /* The following only happens if we didn't output the
-                * leading zeros above for negative exponent, so this
-                * doesn't add to the digit requirement.  Note that the
-                * two zeros here can only be output if the two leading
-                * zeros were *not* output, so this doesn't increase
-                * the output count.
-                */
-               while (exp_b10-- > 0) *ascii++ = 48;
-
-               *ascii = 0;
-
-               /* Total buffer requirement (including the '\0') is
-                * 5+precision - see check at the start.
-                */
-               return;
-            }
-
-            /* Here if an exponent is required, adjust size for
-             * the digits we output but did not count.  The total
-             * digit output here so far is at most 1+precision - no
-             * decimal point and no leading or trailing zeros have
-             * been output.
-             */
-            size -= cdigits;
-
-            *ascii++ = 69; --size;    /* 'E': PLUS 1 TOTAL 2+precision */
-
-            /* The following use of an unsigned temporary avoids ambiguities in
-             * the signed arithmetic on exp_b10 and permits GCC at least to do
-             * better optimization.
-             */
-            {
-               unsigned int uexp_b10;
-
-               if (exp_b10 < 0)
-               {
-                  *ascii++ = 45; --size; /* '-': PLUS 1 TOTAL 3+precision */
-                  uexp_b10 = 0U-exp_b10;
-               }
-
-               else
-                  uexp_b10 = 0U+exp_b10;
-
-               cdigits = 0;
-
-               while (uexp_b10 > 0)
-               {
-                  exponent[cdigits++] = (char)(48 + uexp_b10 % 10);
-                  uexp_b10 /= 10;
-               }
-            }
-
-            /* Need another size check here for the exponent digits, so
-             * this need not be considered above.
-             */
-            if (size > cdigits)
-            {
-               while (cdigits > 0) *ascii++ = exponent[--cdigits];
-
-               *ascii = 0;
-
-               return;
-            }
-         }
-      }
-      else if (!(fp >= DBL_MIN))
-      {
-         *ascii++ = 48; /* '0' */
-         *ascii = 0;
-         return;
-      }
-      else
-      {
-         *ascii++ = 105; /* 'i' */
-         *ascii++ = 110; /* 'n' */
-         *ascii++ = 102; /* 'f' */
-         *ascii = 0;
-         return;
-      }
-   }
-
-   /* Here on buffer too small. */
-   png_error(png_ptr, "ASCII conversion buffer too small");
-}
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic pop
-#endif /* GCC_STRICT_OVERFLOW */
-
-#  endif /* FLOATING_POINT */
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-/* Function to format a fixed point value in ASCII.
- */
-void /* PRIVATE */
-png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,
-    png_size_t size, png_fixed_point fp)
-{
-   /* Require space for 10 decimal digits, a decimal point, a minus sign and a
-    * trailing \0, 13 characters:
-    */
-   if (size > 12)
-   {
-      png_uint_32 num;
-
-      /* Avoid overflow here on the minimum integer. */
-      if (fp < 0)
-      {
-         *ascii++ = 45; num = (png_uint_32)(-fp);
-      }
-      else
-         num = (png_uint_32)fp;
-
-      if (num <= 0x80000000) /* else overflowed */
-      {
-         unsigned int ndigits = 0, first = 16 /* flag value */;
-         char digits[10];
-
-         while (num)
-         {
-            /* Split the low digit off num: */
-            unsigned int tmp = num/10;
-            num -= tmp*10;
-            digits[ndigits++] = (char)(48 + num);
-            /* Record the first non-zero digit, note that this is a number
-             * starting at 1, it's not actually the array index.
-             */
-            if (first == 16 && num > 0)
-               first = ndigits;
-            num = tmp;
-         }
-
-         if (ndigits > 0)
-         {
-            while (ndigits > 5) *ascii++ = digits[--ndigits];
-            /* The remaining digits are fractional digits, ndigits is '5' or
-             * smaller at this point.  It is certainly not zero.  Check for a
-             * non-zero fractional digit:
-             */
-            if (first <= 5)
-            {
-               unsigned int i;
-               *ascii++ = 46; /* decimal point */
-               /* ndigits may be <5 for small numbers, output leading zeros
-                * then ndigits digits to first:
-                */
-               i = 5;
-               while (ndigits < i)
-               {
-                  *ascii++ = 48; --i;
-               }
-               while (ndigits >= first) *ascii++ = digits[--ndigits];
-               /* Don't output the trailing zeros! */
-            }
-         }
-         else
-            *ascii++ = 48;
-
-         /* And null terminate the string: */
-         *ascii = 0;
-         return;
-      }
-   }
-
-   /* Here on buffer too small. */
-   png_error(png_ptr, "ASCII conversion buffer too small");
-}
-#   endif /* FIXED_POINT */
-#endif /* SCAL */
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
-   (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
-   defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
-   (defined(PNG_sCAL_SUPPORTED) && \
-   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
-png_fixed_point
-png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
-{
-   double r = floor(100000 * fp + .5);
-
-   if (r > 2147483647. || r < -2147483648.)
-      png_fixed_error(png_ptr, text);
-
-#  ifndef PNG_ERROR_TEXT_SUPPORTED
-   PNG_UNUSED(text)
-#  endif
-
-   return (png_fixed_point)r;
-}
-#endif
-
-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
-/* muldiv functions */
-/* This API takes signed arguments and rounds the result to the nearest
- * integer (or, for a fixed point number - the standard argument - to
- * the nearest .00001).  Overflow and divide by zero are signalled in
- * the result, a boolean - true on success, false on overflow.
- */
-#if GCC_STRICT_OVERFLOW /* from above */
-/* It is not obvious which comparison below gets optimized in such a way that
- * signed overflow would change the result; looking through the code does not
- * reveal any tests which have the form GCC complains about, so presumably the
- * optimizer is moving an add or subtract into the 'if' somewhere.
- */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wstrict-overflow=2"
-#endif /* GCC_STRICT_OVERFLOW */
-int
-png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   /* Return a * times / divisor, rounded. */
-   if (divisor != 0)
-   {
-      if (a == 0 || times == 0)
-      {
-         *res = 0;
-         return 1;
-      }
-      else
-      {
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = a;
-         r *= times;
-         r /= divisor;
-         r = floor(r+.5);
-
-         /* A png_fixed_point is a 32-bit integer. */
-         if (r <= 2147483647. && r >= -2147483648.)
-         {
-            *res = (png_fixed_point)r;
-            return 1;
-         }
-#else
-         int negative = 0;
-         png_uint_32 A, T, D;
-         png_uint_32 s16, s32, s00;
-
-         if (a < 0)
-            negative = 1, A = -a;
-         else
-            A = a;
-
-         if (times < 0)
-            negative = !negative, T = -times;
-         else
-            T = times;
-
-         if (divisor < 0)
-            negative = !negative, D = -divisor;
-         else
-            D = divisor;
-
-         /* Following can't overflow because the arguments only
-          * have 31 bits each, however the result may be 32 bits.
-          */
-         s16 = (A >> 16) * (T & 0xffff) +
-                           (A & 0xffff) * (T >> 16);
-         /* Can't overflow because the a*times bit is only 30
-          * bits at most.
-          */
-         s32 = (A >> 16) * (T >> 16) + (s16 >> 16);
-         s00 = (A & 0xffff) * (T & 0xffff);
-
-         s16 = (s16 & 0xffff) << 16;
-         s00 += s16;
-
-         if (s00 < s16)
-            ++s32; /* carry */
-
-         if (s32 < D) /* else overflow */
-         {
-            /* s32.s00 is now the 64-bit product, do a standard
-             * division, we know that s32 < D, so the maximum
-             * required shift is 31.
-             */
-            int bitshift = 32;
-            png_fixed_point result = 0; /* NOTE: signed */
-
-            while (--bitshift >= 0)
-            {
-               png_uint_32 d32, d00;
-
-               if (bitshift > 0)
-                  d32 = D >> (32-bitshift), d00 = D << bitshift;
-
-               else
-                  d32 = 0, d00 = D;
-
-               if (s32 > d32)
-               {
-                  if (s00 < d00) --s32; /* carry */
-                  s32 -= d32, s00 -= d00, result += 1<<bitshift;
-               }
-
-               else
-                  if (s32 == d32 && s00 >= d00)
-                     s32 = 0, s00 -= d00, result += 1<<bitshift;
-            }
-
-            /* Handle the rounding. */
-            if (s00 >= (D >> 1))
-               ++result;
-
-            if (negative != 0)
-               result = -result;
-
-            /* Check for overflow. */
-            if ((negative != 0 && result <= 0) ||
-                (negative == 0 && result >= 0))
-            {
-               *res = result;
-               return 1;
-            }
-         }
-#endif
-      }
-   }
-
-   return 0;
-}
-#if GCC_STRICT_OVERFLOW
-#pragma GCC diagnostic pop
-#endif /* GCC_STRICT_OVERFLOW */
-#endif /* READ_GAMMA || INCH_CONVERSIONS */
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* The following is for when the caller doesn't much care about the
- * result.
- */
-png_fixed_point
-png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   png_fixed_point result;
-
-   if (png_muldiv(&result, a, times, divisor) != 0)
-      return result;
-
-   png_warning(png_ptr, "fixed point overflow ignored");
-   return 0;
-}
-#endif
-
-#ifdef PNG_GAMMA_SUPPORTED /* more fixed point functions for gamma */
-/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
-png_fixed_point
-png_reciprocal(png_fixed_point a)
-{
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = floor(1E10/a+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   png_fixed_point res;
-
-   if (png_muldiv(&res, 100000, 100000, a) != 0)
-      return res;
-#endif
-
-   return 0; /* error/overflow */
-}
-
-/* This is the shared test on whether a gamma value is 'significant' - whether
- * it is worth doing gamma correction.
- */
-int /* PRIVATE */
-png_gamma_significant(png_fixed_point gamma_val)
-{
-   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
-       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
-}
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-#ifdef PNG_16BIT_SUPPORTED
-/* A local convenience routine. */
-static png_fixed_point
-png_product2(png_fixed_point a, png_fixed_point b)
-{
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = a * 1E-5;
-   r *= b;
-   r = floor(r+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   png_fixed_point res;
-
-   if (png_muldiv(&res, a, b, 100000) != 0)
-      return res;
-#endif
-
-   return 0; /* overflow */
-}
-#endif /* 16BIT */
-
-/* The inverse of the above. */
-png_fixed_point
-png_reciprocal2(png_fixed_point a, png_fixed_point b)
-{
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   if (a != 0 && b != 0)
-   {
-      double r = 1E15/a;
-      r /= b;
-      r = floor(r+.5);
-
-      if (r <= 2147483647. && r >= -2147483648.)
-         return (png_fixed_point)r;
-   }
-#else
-   /* This may overflow because the range of png_fixed_point isn't symmetric,
-    * but this API is only used for the product of file and screen gamma so it
-    * doesn't matter that the smallest number it can produce is 1/21474, not
-    * 1/100000
-    */
-   png_fixed_point res = png_product2(a, b);
-
-   if (res != 0)
-      return png_reciprocal(res);
-#endif
-
-   return 0; /* overflow */
-}
-#endif /* READ_GAMMA */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */
-#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
-/* Fixed point gamma.
- *
- * The code to calculate the tables used below can be found in the shell script
- * contrib/tools/intgamma.sh
- *
- * To calculate gamma this code implements fast log() and exp() calls using only
- * fixed point arithmetic.  This code has sufficient precision for either 8-bit
- * or 16-bit sample values.
- *
- * The tables used here were calculated using simple 'bc' programs, but C double
- * precision floating point arithmetic would work fine.
- *
- * 8-bit log table
- *   This is a table of -log(value/255)/log(2) for 'value' in the range 128 to
- *   255, so it's the base 2 logarithm of a normalized 8-bit floating point
- *   mantissa.  The numbers are 32-bit fractions.
- */
-static const png_uint_32
-png_8bit_l2[128] =
-{
-   4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,
-   3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,
-   3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,
-   3455425220U, 3413129301U, 3371120137U, 3329393864U, 3287946700U, 3246774933U,
-   3205874930U, 3165243125U, 3124876025U, 3084770202U, 3044922296U, 3005329011U,
-   2965987113U, 2926893432U, 2888044853U, 2849438323U, 2811070844U, 2772939474U,
-   2735041326U, 2697373562U, 2659933400U, 2622718104U, 2585724991U, 2548951424U,
-   2512394810U, 2476052606U, 2439922311U, 2404001468U, 2368287663U, 2332778523U,
-   2297471715U, 2262364947U, 2227455964U, 2192742551U, 2158222529U, 2123893754U,
-   2089754119U, 2055801552U, 2022034013U, 1988449497U, 1955046031U, 1921821672U,
-   1888774511U, 1855902668U, 1823204291U, 1790677560U, 1758320682U, 1726131893U,
-   1694109454U, 1662251657U, 1630556815U, 1599023271U, 1567649391U, 1536433567U,
-   1505374214U, 1474469770U, 1443718700U, 1413119487U, 1382670639U, 1352370686U,
-   1322218179U, 1292211689U, 1262349810U, 1232631153U, 1203054352U, 1173618059U,
-   1144320946U, 1115161701U, 1086139034U, 1057251672U, 1028498358U, 999877854U,
-   971388940U, 943030410U, 914801076U, 886699767U, 858725327U, 830876614U,
-   803152505U, 775551890U, 748073672U, 720716771U, 693480120U, 666362667U,
-   639363374U, 612481215U, 585715177U, 559064263U, 532527486U, 506103872U,
-   479792461U, 453592303U, 427502463U, 401522014U, 375650043U, 349885648U,
-   324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,
-   172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,
-   24347096U, 0U
-
-#if 0
-   /* The following are the values for 16-bit tables - these work fine for the
-    * 8-bit conversions but produce very slightly larger errors in the 16-bit
-    * log (about 1.2 as opposed to 0.7 absolute error in the final value).  To
-    * use these all the shifts below must be adjusted appropriately.
-    */
-   65166, 64430, 63700, 62976, 62257, 61543, 60835, 60132, 59434, 58741, 58054,
-   57371, 56693, 56020, 55352, 54689, 54030, 53375, 52726, 52080, 51439, 50803,
-   50170, 49542, 48918, 48298, 47682, 47070, 46462, 45858, 45257, 44661, 44068,
-   43479, 42894, 42312, 41733, 41159, 40587, 40020, 39455, 38894, 38336, 37782,
-   37230, 36682, 36137, 35595, 35057, 34521, 33988, 33459, 32932, 32408, 31887,
-   31369, 30854, 30341, 29832, 29325, 28820, 28319, 27820, 27324, 26830, 26339,
-   25850, 25364, 24880, 24399, 23920, 23444, 22970, 22499, 22029, 21562, 21098,
-   20636, 20175, 19718, 19262, 18808, 18357, 17908, 17461, 17016, 16573, 16132,
-   15694, 15257, 14822, 14390, 13959, 13530, 13103, 12678, 12255, 11834, 11415,
-   10997, 10582, 10168, 9756, 9346, 8937, 8531, 8126, 7723, 7321, 6921, 6523,
-   6127, 5732, 5339, 4947, 4557, 4169, 3782, 3397, 3014, 2632, 2251, 1872, 1495,
-   1119, 744, 372
-#endif
-};
-
-static png_int_32
-png_log8bit(unsigned int x)
-{
-   unsigned int lg2 = 0;
-   /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,
-    * because the log is actually negate that means adding 1.  The final
-    * returned value thus has the range 0 (for 255 input) to 7.994 (for 1
-    * input), return -1 for the overflow (log 0) case, - so the result is
-    * always at most 19 bits.
-    */
-   if ((x &= 0xff) == 0)
-      return -1;
-
-   if ((x & 0xf0) == 0)
-      lg2  = 4, x <<= 4;
-
-   if ((x & 0xc0) == 0)
-      lg2 += 2, x <<= 2;
-
-   if ((x & 0x80) == 0)
-      lg2 += 1, x <<= 1;
-
-   /* result is at most 19 bits, so this cast is safe: */
-   return (png_int_32)((lg2 << 16) + ((png_8bit_l2[x-128]+32768)>>16));
-}
-
-/* The above gives exact (to 16 binary places) log2 values for 8-bit images,
- * for 16-bit images we use the most significant 8 bits of the 16-bit value to
- * get an approximation then multiply the approximation by a correction factor
- * determined by the remaining up to 8 bits.  This requires an additional step
- * in the 16-bit case.
- *
- * We want log2(value/65535), we have log2(v'/255), where:
- *
- *    value = v' * 256 + v''
- *          = v' * f
- *
- * So f is value/v', which is equal to (256+v''/v') since v' is in the range 128
- * to 255 and v'' is in the range 0 to 255 f will be in the range 256 to less
- * than 258.  The final factor also needs to correct for the fact that our 8-bit
- * value is scaled by 255, whereas the 16-bit values must be scaled by 65535.
- *
- * This gives a final formula using a calculated value 'x' which is value/v' and
- * scaling by 65536 to match the above table:
- *
- *   log2(x/257) * 65536
- *
- * Since these numbers are so close to '1' we can use simple linear
- * interpolation between the two end values 256/257 (result -368.61) and 258/257
- * (result 367.179).  The values used below are scaled by a further 64 to give
- * 16-bit precision in the interpolation:
- *
- * Start (256): -23591
- * Zero  (257):      0
- * End   (258):  23499
- */
-#ifdef PNG_16BIT_SUPPORTED
-static png_int_32
-png_log16bit(png_uint_32 x)
-{
-   unsigned int lg2 = 0;
-
-   /* As above, but now the input has 16 bits. */
-   if ((x &= 0xffff) == 0)
-      return -1;
-
-   if ((x & 0xff00) == 0)
-      lg2  = 8, x <<= 8;
-
-   if ((x & 0xf000) == 0)
-      lg2 += 4, x <<= 4;
-
-   if ((x & 0xc000) == 0)
-      lg2 += 2, x <<= 2;
-
-   if ((x & 0x8000) == 0)
-      lg2 += 1, x <<= 1;
-
-   /* Calculate the base logarithm from the top 8 bits as a 28-bit fractional
-    * value.
-    */
-   lg2 <<= 28;
-   lg2 += (png_8bit_l2[(x>>8)-128]+8) >> 4;
-
-   /* Now we need to interpolate the factor, this requires a division by the top
-    * 8 bits.  Do this with maximum precision.
-    */
-   x = ((x << 16) + (x >> 9)) / (x >> 8);
-
-   /* Since we divided by the top 8 bits of 'x' there will be a '1' at 1<<24,
-    * the value at 1<<16 (ignoring this) will be 0 or 1; this gives us exactly
-    * 16 bits to interpolate to get the low bits of the result.  Round the
-    * answer.  Note that the end point values are scaled by 64 to retain overall
-    * precision and that 'lg2' is current scaled by an extra 12 bits, so adjust
-    * the overall scaling by 6-12.  Round at every step.
-    */
-   x -= 1U << 24;
-
-   if (x <= 65536U) /* <= '257' */
-      lg2 += ((23591U * (65536U-x)) + (1U << (16+6-12-1))) >> (16+6-12);
-
-   else
-      lg2 -= ((23499U * (x-65536U)) + (1U << (16+6-12-1))) >> (16+6-12);
-
-   /* Safe, because the result can't have more than 20 bits: */
-   return (png_int_32)((lg2 + 2048) >> 12);
-}
-#endif /* 16BIT */
-
-/* The 'exp()' case must invert the above, taking a 20-bit fixed point
- * logarithmic value and returning a 16 or 8-bit number as appropriate.  In
- * each case only the low 16 bits are relevant - the fraction - since the
- * integer bits (the top 4) simply determine a shift.
- *
- * The worst case is the 16-bit distinction between 65535 and 65534. This
- * requires perhaps spurious accuracy in the decoding of the logarithm to
- * distinguish log2(65535/65534.5) - 10^-5 or 17 bits.  There is little chance
- * of getting this accuracy in practice.
- *
- * To deal with this the following exp() function works out the exponent of the
- * fractional part of the logarithm by using an accurate 32-bit value from the
- * top four fractional bits then multiplying in the remaining bits.
- */
-static const png_uint_32
-png_32bit_exp[16] =
-{
-   /* NOTE: the first entry is deliberately set to the maximum 32-bit value. */
-   4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,
-   3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,
-   2553802834U, 2445529972U, 2341847524U, 2242560872U
-};
-
-/* Adjustment table; provided to explain the numbers in the code below. */
-#if 0
-for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}
-   11 44937.64284865548751208448
-   10 45180.98734845585101160448
-    9 45303.31936980687359311872
-    8 45364.65110595323018870784
-    7 45395.35850361789624614912
-    6 45410.72259715102037508096
-    5 45418.40724413220722311168
-    4 45422.25021786898173001728
-    3 45424.17186732298419044352
-    2 45425.13273269940811464704
-    1 45425.61317555035558641664
-    0 45425.85339951654943850496
-#endif
-
-static png_uint_32
-png_exp(png_fixed_point x)
-{
-   if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */
-   {
-      /* Obtain a 4-bit approximation */
-      png_uint_32 e = png_32bit_exp[(x >> 12) & 0x0f];
-
-      /* Incorporate the low 12 bits - these decrease the returned value by
-       * multiplying by a number less than 1 if the bit is set.  The multiplier
-       * is determined by the above table and the shift. Notice that the values
-       * converge on 45426 and this is used to allow linear interpolation of the
-       * low bits.
-       */
-      if (x & 0x800)
-         e -= (((e >> 16) * 44938U) +  16U) >> 5;
-
-      if (x & 0x400)
-         e -= (((e >> 16) * 45181U) +  32U) >> 6;
-
-      if (x & 0x200)
-         e -= (((e >> 16) * 45303U) +  64U) >> 7;
-
-      if (x & 0x100)
-         e -= (((e >> 16) * 45365U) + 128U) >> 8;
-
-      if (x & 0x080)
-         e -= (((e >> 16) * 45395U) + 256U) >> 9;
-
-      if (x & 0x040)
-         e -= (((e >> 16) * 45410U) + 512U) >> 10;
-
-      /* And handle the low 6 bits in a single block. */
-      e -= (((e >> 16) * 355U * (x & 0x3fU)) + 256U) >> 9;
-
-      /* Handle the upper bits of x. */
-      e >>= x >> 16;
-      return e;
-   }
-
-   /* Check for overflow */
-   if (x <= 0)
-      return png_32bit_exp[0];
-
-   /* Else underflow */
-   return 0;
-}
-
-static png_byte
-png_exp8bit(png_fixed_point lg2)
-{
-   /* Get a 32-bit value: */
-   png_uint_32 x = png_exp(lg2);
-
-   /* Convert the 32-bit value to 0..255 by multiplying by 256-1. Note that the
-    * second, rounding, step can't overflow because of the first, subtraction,
-    * step.
-    */
-   x -= x >> 8;
-   return (png_byte)(((x + 0x7fffffU) >> 24) & 0xff);
-}
-
-#ifdef PNG_16BIT_SUPPORTED
-static png_uint_16
-png_exp16bit(png_fixed_point lg2)
-{
-   /* Get a 32-bit value: */
-   png_uint_32 x = png_exp(lg2);
-
-   /* Convert the 32-bit value to 0..65535 by multiplying by 65536-1: */
-   x -= x >> 16;
-   return (png_uint_16)((x + 32767U) >> 16);
-}
-#endif /* 16BIT */
-#endif /* FLOATING_ARITHMETIC */
-
-png_byte
-png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
-{
-   if (value > 0 && value < 255)
-   {
-#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         /* 'value' is unsigned, ANSI-C90 requires the compiler to correctly
-          * convert this to a floating point value.  This includes values that
-          * would overflow if 'value' were to be converted to 'int'.
-          *
-          * Apparently GCC, however, does an intermediate conversion to (int)
-          * on some (ARM) but not all (x86) platforms, possibly because of
-          * hardware FP limitations.  (E.g. if the hardware conversion always
-          * assumes the integer register contains a signed value.)  This results
-          * in ANSI-C undefined behavior for large values.
-          *
-          * Other implementations on the same machine might actually be ANSI-C90
-          * conformant and therefore compile spurious extra code for the large
-          * values.
-          *
-          * We can be reasonably sure that an unsigned to float conversion
-          * won't be faster than an int to float one.  Therefore this code
-          * assumes responsibility for the undefined behavior, which it knows
-          * can't happen because of the check above.
-          *
-          * Note the argument to this routine is an (unsigned int) because, on
-          * 16-bit platforms, it is assigned a value which might be out of
-          * range for an (int); that would result in undefined behavior in the
-          * caller if the *argument* ('value') were to be declared (int).
-          */
-         double r = floor(255*pow((int)/*SAFE*/value/255.,gamma_val*.00001)+.5);
-         return (png_byte)r;
-#     else
-         png_int_32 lg2 = png_log8bit(value);
-         png_fixed_point res;
-
-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
-            return png_exp8bit(res);
-
-         /* Overflow. */
-         value = 0;
-#     endif
-   }
-
-   return (png_byte)(value & 0xff);
-}
-
-#ifdef PNG_16BIT_SUPPORTED
-png_uint_16
-png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
-{
-   if (value > 0 && value < 65535)
-   {
-# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-      /* The same (unsigned int)->(double) constraints apply here as above,
-       * however in this case the (unsigned int) to (int) conversion can
-       * overflow on an ANSI-C90 compliant system so the cast needs to ensure
-       * that this is not possible.
-       */
-      double r = floor(65535*pow((png_int_32)value/65535.,
-          gamma_val*.00001)+.5);
-      return (png_uint_16)r;
-# else
-      png_int_32 lg2 = png_log16bit(value);
-      png_fixed_point res;
-
-      if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
-         return png_exp16bit(res);
-
-      /* Overflow. */
-      value = 0;
-# endif
-   }
-
-   return (png_uint_16)value;
-}
-#endif /* 16BIT */
-
-/* This does the right thing based on the bit_depth field of the
- * png_struct, interpreting values as 8-bit or 16-bit.  While the result
- * is nominally a 16-bit value if bit depth is 8 then the result is
- * 8-bit (as are the arguments.)
- */
-png_uint_16 /* PRIVATE */
-png_gamma_correct(png_structrp png_ptr, unsigned int value,
-    png_fixed_point gamma_val)
-{
-   if (png_ptr->bit_depth == 8)
-      return png_gamma_8bit_correct(value, gamma_val);
-
-#ifdef PNG_16BIT_SUPPORTED
-   else
-      return png_gamma_16bit_correct(value, gamma_val);
-#else
-      /* should not reach this */
-      return 0;
-#endif /* 16BIT */
-}
-
-#ifdef PNG_16BIT_SUPPORTED
-/* Internal function to build a single 16-bit table - the table consists of
- * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount
- * to shift the input values right (or 16-number_of_signifiant_bits).
- *
- * The caller is responsible for ensuring that the table gets cleaned up on
- * png_error (i.e. if one of the mallocs below fails) - i.e. the *table argument
- * should be somewhere that will be cleaned.
- */
-static void
-png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
-    PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
-{
-   /* Various values derived from 'shift': */
-   PNG_CONST unsigned int num = 1U << (8U - shift);
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   /* CSE the division and work round wacky GCC warnings (see the comments
-    * in png_gamma_8bit_correct for where these come from.)
-    */
-   PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1);
-#endif
-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
-   PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);
-   unsigned int i;
-
-   png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
-
-   for (i = 0; i < num; i++)
-   {
-      png_uint_16p sub_table = table[i] =
-          (png_uint_16p)png_malloc(png_ptr, 256 * (sizeof (png_uint_16)));
-
-      /* The 'threshold' test is repeated here because it can arise for one of
-       * the 16-bit tables even if the others don't hit it.
-       */
-      if (png_gamma_significant(gamma_val) != 0)
-      {
-         /* The old code would overflow at the end and this would cause the
-          * 'pow' function to return a result >1, resulting in an
-          * arithmetic error.  This code follows the spec exactly; ig is
-          * the recovered input sample, it always has 8-16 bits.
-          *
-          * We want input * 65535/max, rounded, the arithmetic fits in 32
-          * bits (unsigned) so long as max <= 32767.
-          */
-         unsigned int j;
-         for (j = 0; j < 256; j++)
-         {
-            png_uint_32 ig = (j << (8-shift)) + i;
-#           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-               /* Inline the 'max' scaling operation: */
-               /* See png_gamma_8bit_correct for why the cast to (int) is
-                * required here.
-                */
-               double d = floor(65535.*pow(ig*fmax, gamma_val*.00001)+.5);
-               sub_table[j] = (png_uint_16)d;
-#           else
-               if (shift != 0)
-                  ig = (ig * 65535U + max_by_2)/max;
-
-               sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);
-#           endif
-         }
-      }
-      else
-      {
-         /* We must still build a table, but do it the fast way. */
-         unsigned int j;
-
-         for (j = 0; j < 256; j++)
-         {
-            png_uint_32 ig = (j << (8-shift)) + i;
-
-            if (shift != 0)
-               ig = (ig * 65535U + max_by_2)/max;
-
-            sub_table[j] = (png_uint_16)ig;
-         }
-      }
-   }
-}
-
-/* NOTE: this function expects the *inverse* of the overall gamma transformation
- * required.
- */
-static void
-png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable,
-    PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
-{
-   PNG_CONST unsigned int num = 1U << (8U - shift);
-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
-   unsigned int i;
-   png_uint_32 last;
-
-   png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
-
-   /* 'num' is the number of tables and also the number of low bits of low
-    * bits of the input 16-bit value used to select a table.  Each table is
-    * itself indexed by the high 8 bits of the value.
-    */
-   for (i = 0; i < num; i++)
-      table[i] = (png_uint_16p)png_malloc(png_ptr,
-          256 * (sizeof (png_uint_16)));
-
-   /* 'gamma_val' is set to the reciprocal of the value calculated above, so
-    * pow(out,g) is an *input* value.  'last' is the last input value set.
-    *
-    * In the loop 'i' is used to find output values.  Since the output is
-    * 8-bit there are only 256 possible values.  The tables are set up to
-    * select the closest possible output value for each input by finding
-    * the input value at the boundary between each pair of output values
-    * and filling the table up to that boundary with the lower output
-    * value.
-    *
-    * The boundary values are 0.5,1.5..253.5,254.5.  Since these are 9-bit
-    * values the code below uses a 16-bit value in i; the values start at
-    * 128.5 (for 0.5) and step by 257, for a total of 254 values (the last
-    * entries are filled with 255).  Start i at 128 and fill all 'last'
-    * table entries <= 'max'
-    */
-   last = 0;
-   for (i = 0; i < 255; ++i) /* 8-bit output value */
-   {
-      /* Find the corresponding maximum input value */
-      png_uint_16 out = (png_uint_16)(i * 257U); /* 16-bit output value */
-
-      /* Find the boundary value in 16 bits: */
-      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma_val);
-
-      /* Adjust (round) to (16-shift) bits: */
-      bound = (bound * max + 32768U)/65535U + 1U;
-
-      while (last < bound)
-      {
-         table[last & (0xffU >> shift)][last >> (8U - shift)] = out;
-         last++;
-      }
-   }
-
-   /* And fill in the final entries. */
-   while (last < (num << 8))
-   {
-      table[last & (0xff >> shift)][last >> (8U - shift)] = 65535U;
-      last++;
-   }
-}
-#endif /* 16BIT */
-
-/* Build a single 8-bit table: same as the 16-bit case but much simpler (and
- * typically much faster).  Note that libpng currently does no sBIT processing
- * (apparently contrary to the spec) so a 256-entry table is always generated.
- */
-static void
-png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,
-    PNG_CONST png_fixed_point gamma_val)
-{
-   unsigned int i;
-   png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
-
-   if (png_gamma_significant(gamma_val) != 0)
-      for (i=0; i<256; i++)
-         table[i] = png_gamma_8bit_correct(i, gamma_val);
-
-   else
-      for (i=0; i<256; ++i)
-         table[i] = (png_byte)(i & 0xff);
-}
-
-/* Used from png_read_destroy and below to release the memory used by the gamma
- * tables.
- */
-void /* PRIVATE */
-png_destroy_gamma_table(png_structrp png_ptr)
-{
-   png_free(png_ptr, png_ptr->gamma_table);
-   png_ptr->gamma_table = NULL;
-
-#ifdef PNG_16BIT_SUPPORTED
-   if (png_ptr->gamma_16_table != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_table[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_table);
-   png_ptr->gamma_16_table = NULL;
-   }
-#endif /* 16BIT */
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-   png_free(png_ptr, png_ptr->gamma_from_1);
-   png_ptr->gamma_from_1 = NULL;
-   png_free(png_ptr, png_ptr->gamma_to_1);
-   png_ptr->gamma_to_1 = NULL;
-
-#ifdef PNG_16BIT_SUPPORTED
-   if (png_ptr->gamma_16_from_1 != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_from_1);
-   png_ptr->gamma_16_from_1 = NULL;
-   }
-   if (png_ptr->gamma_16_to_1 != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_to_1);
-   png_ptr->gamma_16_to_1 = NULL;
-   }
-#endif /* 16BIT */
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-}
-
-/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
- * tables, we don't make a full table if we are reducing to 8-bit in
- * the future.  Note also how the gamma_16 tables are segmented so that
- * we don't need to allocate > 64K chunks for a full 16-bit table.
- */
-void /* PRIVATE */
-png_build_gamma_table(png_structrp png_ptr, int bit_depth)
-{
-   png_debug(1, "in png_build_gamma_table");
-
-   /* Remove any existing table; this copes with multiple calls to
-    * png_read_update_info. The warning is because building the gamma tables
-    * multiple times is a performance hit - it's harmless but the ability to
-    * call png_read_update_info() multiple times is new in 1.5.6 so it seems
-    * sensible to warn if the app introduces such a hit.
-    */
-   if (png_ptr->gamma_table != NULL || png_ptr->gamma_16_table != NULL)
-   {
-      png_warning(png_ptr, "gamma table being rebuilt");
-      png_destroy_gamma_table(png_ptr);
-   }
-
-   if (bit_depth <= 8)
-   {
-      png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
-          png_ptr->screen_gamma > 0 ?
-          png_reciprocal2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-      if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
-      {
-         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
-             png_reciprocal(png_ptr->colorspace.gamma));
-
-         png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
-             png_ptr->screen_gamma > 0 ?
-             png_reciprocal(png_ptr->screen_gamma) :
-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
-      }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-   }
-#ifdef PNG_16BIT_SUPPORTED
-   else
-   {
-      png_byte shift, sig_bit;
-
-      if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-      {
-         sig_bit = png_ptr->sig_bit.red;
-
-         if (png_ptr->sig_bit.green > sig_bit)
-            sig_bit = png_ptr->sig_bit.green;
-
-         if (png_ptr->sig_bit.blue > sig_bit)
-            sig_bit = png_ptr->sig_bit.blue;
-      }
-      else
-         sig_bit = png_ptr->sig_bit.gray;
-
-      /* 16-bit gamma code uses this equation:
-       *
-       *   ov = table[(iv & 0xff) >> gamma_shift][iv >> 8]
-       *
-       * Where 'iv' is the input color value and 'ov' is the output value -
-       * pow(iv, gamma).
-       *
-       * Thus the gamma table consists of up to 256 256-entry tables.  The table
-       * is selected by the (8-gamma_shift) most significant of the low 8 bits
-       * of the color value then indexed by the upper 8 bits:
-       *
-       *   table[low bits][high 8 bits]
-       *
-       * So the table 'n' corresponds to all those 'iv' of:
-       *
-       *   <all high 8-bit values><n << gamma_shift>..<(n+1 << gamma_shift)-1>
-       *
-       */
-      if (sig_bit > 0 && sig_bit < 16U)
-         /* shift == insignificant bits */
-         shift = (png_byte)((16U - sig_bit) & 0xff);
-
-      else
-         shift = 0; /* keep all 16 bits */
-
-      if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
-      {
-         /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
-          * the significant bits in the *input* when the output will
-          * eventually be 8 bits.  By default it is 11.
-          */
-         if (shift < (16U - PNG_MAX_GAMMA_8))
-            shift = (16U - PNG_MAX_GAMMA_8);
-      }
-
-      if (shift > 8U)
-         shift = 8U; /* Guarantees at least one table! */
-
-      png_ptr->gamma_shift = shift;
-
-      /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now
-       * PNG_COMPOSE).  This effectively smashed the background calculation for
-       * 16-bit output because the 8-bit table assumes the result will be
-       * reduced to 8 bits.
-       */
-      if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
-          png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
-          png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
-
-      else
-          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
-          png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-      if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
-      {
-         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
-             png_reciprocal(png_ptr->colorspace.gamma));
-
-         /* Notice that the '16 from 1' table should be full precision, however
-          * the lookup on this table still uses gamma_shift, so it can't be.
-          * TODO: fix this.
-          */
-         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
-             png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
-      }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-   }
-#endif /* 16BIT */
-}
-#endif /* READ_GAMMA */
-
-/* HARDWARE OR SOFTWARE OPTION SUPPORT */
-#ifdef PNG_SET_OPTION_SUPPORTED
-int PNGAPI
-png_set_option(png_structrp png_ptr, int option, int onoff)
-{
-   if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT &&
-      (option & 1) == 0)
-   {
-      png_uint_32 mask = 3U << option;
-      png_uint_32 setting = (2U + (onoff != 0)) << option;
-      png_uint_32 current = png_ptr->options;
-
-      png_ptr->options = (png_uint_32)(((current & ~mask) | setting) & 0xff);
-
-      return (int)(current & mask) >> option;
-   }
-
-   return PNG_OPTION_INVALID;
-}
-#endif
-
-/* sRGB support */
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-/* sRGB conversion tables; these are machine generated with the code in
- * contrib/tools/makesRGB.c.  The actual sRGB transfer curve defined in the
- * specification (see the article at https://en.wikipedia.org/wiki/SRGB)
- * is used, not the gamma=1/2.2 approximation use elsewhere in libpng.
- * The sRGB to linear table is exact (to the nearest 16-bit linear fraction).
- * The inverse (linear to sRGB) table has accuracies as follows:
- *
- * For all possible (255*65535+1) input values:
- *
- *    error: -0.515566 - 0.625971, 79441 (0.475369%) of readings inexact
- *
- * For the input values corresponding to the 65536 16-bit values:
- *
- *    error: -0.513727 - 0.607759, 308 (0.469978%) of readings inexact
- *
- * In all cases the inexact readings are only off by one.
- */
-
-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-/* The convert-to-sRGB table is only currently required for read. */
-const png_uint_16 png_sRGB_table[256] =
-{
-   0,20,40,60,80,99,119,139,
-   159,179,199,219,241,264,288,313,
-   340,367,396,427,458,491,526,562,
-   599,637,677,718,761,805,851,898,
-   947,997,1048,1101,1156,1212,1270,1330,
-   1391,1453,1517,1583,1651,1720,1790,1863,
-   1937,2013,2090,2170,2250,2333,2418,2504,
-   2592,2681,2773,2866,2961,3058,3157,3258,
-   3360,3464,3570,3678,3788,3900,4014,4129,
-   4247,4366,4488,4611,4736,4864,4993,5124,
-   5257,5392,5530,5669,5810,5953,6099,6246,
-   6395,6547,6700,6856,7014,7174,7335,7500,
-   7666,7834,8004,8177,8352,8528,8708,8889,
-   9072,9258,9445,9635,9828,10022,10219,10417,
-   10619,10822,11028,11235,11446,11658,11873,12090,
-   12309,12530,12754,12980,13209,13440,13673,13909,
-   14146,14387,14629,14874,15122,15371,15623,15878,
-   16135,16394,16656,16920,17187,17456,17727,18001,
-   18277,18556,18837,19121,19407,19696,19987,20281,
-   20577,20876,21177,21481,21787,22096,22407,22721,
-   23038,23357,23678,24002,24329,24658,24990,25325,
-   25662,26001,26344,26688,27036,27386,27739,28094,
-   28452,28813,29176,29542,29911,30282,30656,31033,
-   31412,31794,32179,32567,32957,33350,33745,34143,
-   34544,34948,35355,35764,36176,36591,37008,37429,
-   37852,38278,38706,39138,39572,40009,40449,40891,
-   41337,41785,42236,42690,43147,43606,44069,44534,
-   45002,45473,45947,46423,46903,47385,47871,48359,
-   48850,49344,49841,50341,50844,51349,51858,52369,
-   52884,53401,53921,54445,54971,55500,56032,56567,
-   57105,57646,58190,58737,59287,59840,60396,60955,
-   61517,62082,62650,63221,63795,64372,64952,65535
-};
-#endif /* SIMPLIFIED_READ */
-
-/* The base/delta tables are required for both read and write (but currently
- * only the simplified versions.)
- */
-const png_uint_16 png_sRGB_base[512] =
-{
-   128,1782,3383,4644,5675,6564,7357,8074,
-   8732,9346,9921,10463,10977,11466,11935,12384,
-   12816,13233,13634,14024,14402,14769,15125,15473,
-   15812,16142,16466,16781,17090,17393,17690,17981,
-   18266,18546,18822,19093,19359,19621,19879,20133,
-   20383,20630,20873,21113,21349,21583,21813,22041,
-   22265,22487,22707,22923,23138,23350,23559,23767,
-   23972,24175,24376,24575,24772,24967,25160,25352,
-   25542,25730,25916,26101,26284,26465,26645,26823,
-   27000,27176,27350,27523,27695,27865,28034,28201,
-   28368,28533,28697,28860,29021,29182,29341,29500,
-   29657,29813,29969,30123,30276,30429,30580,30730,
-   30880,31028,31176,31323,31469,31614,31758,31902,
-   32045,32186,32327,32468,32607,32746,32884,33021,
-   33158,33294,33429,33564,33697,33831,33963,34095,
-   34226,34357,34486,34616,34744,34873,35000,35127,
-   35253,35379,35504,35629,35753,35876,35999,36122,
-   36244,36365,36486,36606,36726,36845,36964,37083,
-   37201,37318,37435,37551,37668,37783,37898,38013,
-   38127,38241,38354,38467,38580,38692,38803,38915,
-   39026,39136,39246,39356,39465,39574,39682,39790,
-   39898,40005,40112,40219,40325,40431,40537,40642,
-   40747,40851,40955,41059,41163,41266,41369,41471,
-   41573,41675,41777,41878,41979,42079,42179,42279,
-   42379,42478,42577,42676,42775,42873,42971,43068,
-   43165,43262,43359,43456,43552,43648,43743,43839,
-   43934,44028,44123,44217,44311,44405,44499,44592,
-   44685,44778,44870,44962,45054,45146,45238,45329,
-   45420,45511,45601,45692,45782,45872,45961,46051,
-   46140,46229,46318,46406,46494,46583,46670,46758,
-   46846,46933,47020,47107,47193,47280,47366,47452,
-   47538,47623,47709,47794,47879,47964,48048,48133,
-   48217,48301,48385,48468,48552,48635,48718,48801,
-   48884,48966,49048,49131,49213,49294,49376,49458,
-   49539,49620,49701,49782,49862,49943,50023,50103,
-   50183,50263,50342,50422,50501,50580,50659,50738,
-   50816,50895,50973,51051,51129,51207,51285,51362,
-   51439,51517,51594,51671,51747,51824,51900,51977,
-   52053,52129,52205,52280,52356,52432,52507,52582,
-   52657,52732,52807,52881,52956,53030,53104,53178,
-   53252,53326,53400,53473,53546,53620,53693,53766,
-   53839,53911,53984,54056,54129,54201,54273,54345,
-   54417,54489,54560,54632,54703,54774,54845,54916,
-   54987,55058,55129,55199,55269,55340,55410,55480,
-   55550,55620,55689,55759,55828,55898,55967,56036,
-   56105,56174,56243,56311,56380,56448,56517,56585,
-   56653,56721,56789,56857,56924,56992,57059,57127,
-   57194,57261,57328,57395,57462,57529,57595,57662,
-   57728,57795,57861,57927,57993,58059,58125,58191,
-   58256,58322,58387,58453,58518,58583,58648,58713,
-   58778,58843,58908,58972,59037,59101,59165,59230,
-   59294,59358,59422,59486,59549,59613,59677,59740,
-   59804,59867,59930,59993,60056,60119,60182,60245,
-   60308,60370,60433,60495,60558,60620,60682,60744,
-   60806,60868,60930,60992,61054,61115,61177,61238,
-   61300,61361,61422,61483,61544,61605,61666,61727,
-   61788,61848,61909,61969,62030,62090,62150,62211,
-   62271,62331,62391,62450,62510,62570,62630,62689,
-   62749,62808,62867,62927,62986,63045,63104,63163,
-   63222,63281,63340,63398,63457,63515,63574,63632,
-   63691,63749,63807,63865,63923,63981,64039,64097,
-   64155,64212,64270,64328,64385,64443,64500,64557,
-   64614,64672,64729,64786,64843,64900,64956,65013,
-   65070,65126,65183,65239,65296,65352,65409,65465
-};
-
-const png_byte png_sRGB_delta[512] =
-{
-   207,201,158,129,113,100,90,82,77,72,68,64,61,59,56,54,
-   52,50,49,47,46,45,43,42,41,40,39,39,38,37,36,36,
-   35,34,34,33,33,32,32,31,31,30,30,30,29,29,28,28,
-   28,27,27,27,27,26,26,26,25,25,25,25,24,24,24,24,
-   23,23,23,23,23,22,22,22,22,22,22,21,21,21,21,21,
-   21,20,20,20,20,20,20,20,20,19,19,19,19,19,19,19,
-   19,18,18,18,18,18,18,18,18,18,18,17,17,17,17,17,
-   17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16,
-   16,16,16,16,15,15,15,15,15,15,15,15,15,15,15,15,
-   15,15,15,15,14,14,14,14,14,14,14,14,14,14,14,14,
-   14,14,14,14,14,14,14,13,13,13,13,13,13,13,13,13,
-   13,13,13,13,13,13,13,13,13,13,13,13,13,13,12,12,
-   12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
-   12,12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,
-   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
-   11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-   10,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,7,7,7,7,7,7,7,
-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
-};
-#endif /* SIMPLIFIED READ/WRITE sRGB support */
-
-/* SIMPLIFIED READ/WRITE SUPPORT */
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-static int
-png_image_free_function(png_voidp argument)
-{
-   png_imagep image = png_voidcast(png_imagep, argument);
-   png_controlp cp = image->opaque;
-   png_control c;
-
-   /* Double check that we have a png_ptr - it should be impossible to get here
-    * without one.
-    */
-   if (cp->png_ptr == NULL)
-      return 0;
-
-   /* First free any data held in the control structure. */
-#  ifdef PNG_STDIO_SUPPORTED
-      if (cp->owned_file != 0)
-      {
-         FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);
-         cp->owned_file = 0;
-
-         /* Ignore errors here. */
-         if (fp != NULL)
-         {
-            cp->png_ptr->io_ptr = NULL;
-            (void)fclose(fp);
-         }
-      }
-#  endif
-
-   /* Copy the control structure so that the original, allocated, version can be
-    * safely freed.  Notice that a png_error here stops the remainder of the
-    * cleanup, but this is probably fine because that would indicate bad memory
-    * problems anyway.
-    */
-   c = *cp;
-   image->opaque = &c;
-   png_free(c.png_ptr, cp);
-
-   /* Then the structures, calling the correct API. */
-   if (c.for_write != 0)
-   {
-#     ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-         png_destroy_write_struct(&c.png_ptr, &c.info_ptr);
-#     else
-         png_error(c.png_ptr, "simplified write not supported");
-#     endif
-   }
-   else
-   {
-#     ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-         png_destroy_read_struct(&c.png_ptr, &c.info_ptr, NULL);
-#     else
-         png_error(c.png_ptr, "simplified read not supported");
-#     endif
-   }
-
-   /* Success. */
-   return 1;
-}
-
-void PNGAPI
-png_image_free(png_imagep image)
-{
-   /* Safely call the real function, but only if doing so is safe at this point
-    * (if not inside an error handling context).  Otherwise assume
-    * png_safe_execute will call this API after the return.
-    */
-   if (image != NULL && image->opaque != NULL &&
-      image->opaque->error_buf == NULL)
-   {
-      /* Ignore errors here: */
-      (void)png_safe_execute(image, png_image_free_function, image);
-      image->opaque = NULL;
-   }
-}
-
-int /* PRIVATE */
-png_image_error(png_imagep image, png_const_charp error_message)
-{
-   /* Utility to log an error. */
-   png_safecat(image->message, (sizeof image->message), 0, error_message);
-   image->warning_or_error |= PNG_IMAGE_ERROR;
-   png_image_free(image);
-   return 0;
-}
-
-#endif /* SIMPLIFIED READ/WRITE */
-#endif /* READ || WRITE */
diff --git a/src/png/libpng/png.h b/src/png/libpng/png.h
deleted file mode 100644
index 4c873f5c2..000000000
--- a/src/png/libpng/png.h
+++ /dev/null
@@ -1,3278 +0,0 @@
-
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.6.34, September 29, 2017
- *
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license (See LICENSE, below)
- *
- * Authors and maintainers:
- *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.34, September 29, 2017:
- *     Glenn Randers-Pehrson.
- *   See also "Contributing Authors", below.
- */
-
-/*
- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
- *
- * If you modify libpng you may insert additional notices immediately following
- * this sentence.
- *
- * This code is released under the libpng license.
- *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are
- * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
- * derived from libpng-1.0.6, and are distributed according to the same
- * disclaimer and license as libpng-1.0.6 with the following individuals
- * added to the list of Contributing Authors:
- *
- *    Simon-Pierre Cadieux
- *    Eric S. Raymond
- *    Mans Rullgard
- *    Cosmin Truta
- *    Gilles Vollant
- *    James Yu
- *    Mandar Sahastrabuddhe
- *    Google Inc.
- *    Vadim Barkov
- *
- * and with the following additions to the disclaimer:
- *
- *    There is no warranty against interference with your enjoyment of the
- *    library or against infringement.  There is no warranty that our
- *    efforts or the library will fulfill any of your particular purposes
- *    or needs.  This library is provided with all faults, and the entire
- *    risk of satisfactory quality, performance, accuracy, and effort is with
- *    the user.
- *
- * Some files in the "contrib" directory and some configure-generated
- * files that are distributed with libpng have other copyright owners and
- * are released under other open source licenses.
- *
- * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
- * Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
- * libpng-0.96, and are distributed according to the same disclaimer and
- * license as libpng-0.96, with the following individuals added to the list
- * of Contributing Authors:
- *
- *    Tom Lane
- *    Glenn Randers-Pehrson
- *    Willem van Schaik
- *
- * libpng versions 0.89, June 1996, through 0.96, May 1997, are
- * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
- * and are distributed according to the same disclaimer and license as
- * libpng-0.88, with the following individuals added to the list of
- * Contributing Authors:
- *
- *    John Bowler
- *    Kevin Bracey
- *    Sam Bushell
- *    Magnus Holmgren
- *    Greg Roelofs
- *    Tom Tanner
- *
- * Some files in the "scripts" directory have other copyright owners
- * but are released under this license.
- *
- * libpng versions 0.5, May 1995, through 0.88, January 1996, are
- * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
- *
- * For the purposes of this copyright and license, "Contributing Authors"
- * is defined as the following set of individuals:
- *
- *    Andreas Dilger
- *    Dave Martindale
- *    Guy Eric Schalnat
- *    Paul Schmidt
- *    Tim Wegner
- *
- * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- * and Group 42, Inc. disclaim all warranties, expressed or implied,
- * including, without limitation, the warranties of merchantability and of
- * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- * assume no liability for direct, indirect, incidental, special, exemplary,
- * or consequential damages, which may result from the use of the PNG
- * Reference Library, even if advised of the possibility of such damage.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject
- * to the following restrictions:
- *
- *   1. The origin of this source code must not be misrepresented.
- *
- *   2. Altered versions must be plainly marked as such and must not
- *      be misrepresented as being the original source.
- *
- *   3. This Copyright notice may not be removed or altered from any
- *      source or altered source distribution.
- *
- * The Contributing Authors and Group 42, Inc. specifically permit, without
- * fee, and encourage the use of this source code as a component to
- * supporting the PNG file format in commercial products.  If you use this
- * source code in a product, acknowledgment is not required but would be
- * appreciated.
- *
- * END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
- *
- * TRADEMARK:
- *
- * The name "libpng" has not been registered by the Copyright owner
- * as a trademark in any jurisdiction.  However, because libpng has
- * been distributed and maintained world-wide, continually since 1995,
- * the Copyright owner claims "common-law trademark protection" in any
- * jurisdiction where common-law trademark is recognized.
- *
- * OSI CERTIFICATION:
- *
- * Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
- * a certification mark of the Open Source Initiative. OSI has not addressed
- * the additional disclaimers inserted at version 1.0.7.
- *
- * EXPORT CONTROL:
- *
- * The Copyright owner believes that the Export Control Classification
- * Number (ECCN) for libpng is EAR99, which means not subject to export
- * controls or International Traffic in Arms Regulations (ITAR) because
- * it is open source, publicly available software, that does not contain
- * any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
- * 734.7(b).
- */
-
-/*
- * A "png_get_copyright" function is available, for convenient use in "about"
- * boxes and the like:
- *
- *    printf("%s", png_get_copyright(NULL));
- *
- * Also, the PNG logo (in PNG format, of course) is supplied in the
- * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
- */
-
-/*
- * The contributing authors would like to thank all those who helped
- * with testing, bug fixes, and patience.  This wouldn't have been
- * possible without all of you.
- *
- * Thanks to Frank J. T. Wojcik for helping with the documentation.
- */
-
-/* Note about libpng version numbers:
- *
- *    Due to various miscommunications, unforeseen code incompatibilities
- *    and occasional factors outside the authors' control, version numbering
- *    on the library has not always been consistent and straightforward.
- *    The following table summarizes matters since version 0.89c, which was
- *    the first widely used release:
- *
- *    source                 png.h  png.h  shared-lib
- *    version                string   int  version
- *    -------                ------ -----  ----------
- *    0.89c "1.0 beta 3"     0.89      89  1.0.89
- *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
- *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
- *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
- *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
- *    0.97c                  0.97      97  2.0.97
- *    0.98                   0.98      98  2.0.98
- *    0.99                   0.99      98  2.0.99
- *    0.99a-m                0.99      99  2.0.99
- *    1.00                   1.00     100  2.1.0 [100 should be 10000]
- *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
- *    1.0.1       png.h string is   10001  2.1.0
- *    1.0.1a-e    identical to the  10002  from here on, the shared library
- *    1.0.2       source version)   10002  is 2.V where V is the source code
- *    1.0.2a-b                      10003  version, except as noted.
- *    1.0.3                         10003
- *    1.0.3a-d                      10004
- *    1.0.4                         10004
- *    1.0.4a-f                      10005
- *    1.0.5 (+ 2 patches)           10005
- *    1.0.5a-d                      10006
- *    1.0.5e-r                      10100 (not source compatible)
- *    1.0.5s-v                      10006 (not binary compatible)
- *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
- *    1.0.6d-f                      10007 (still binary incompatible)
- *    1.0.6g                        10007
- *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
- *    1.0.6i                        10007  10.6i
- *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
- *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
- *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
- *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
- *    1.0.7                    1    10007  (still compatible)
- *    ...
- *    1.0.19                  10    10019  10.so.0.19[.0]
- *    ...
- *    1.2.59                  13    10257  12.so.0.59[.0]
- *    ...
- *    1.5.30                  15    10527  15.so.15.30[.0]
- *    ...
- *    1.6.34                  16    10633  16.so.16.34[.0]
- *
- *    Henceforth the source version will match the shared-library major
- *    and minor numbers; the shared-library major version number will be
- *    used for changes in backward compatibility, as it is intended.  The
- *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
- *    for applications, is an unsigned integer of the form xyyzz corresponding
- *    to the source version x.y.z (leading zeros in y and z).  Beta versions
- *    were given the previous public release number plus a letter, until
- *    version 1.0.6j; from then on they were given the upcoming public
- *    release number plus "betaNN" or "rcNN".
- *
- *    Binary incompatibility exists only when applications make direct access
- *    to the info_ptr or png_ptr members through png.h, and the compiled
- *    application is loaded with a different version of the library.
- *
- *    DLLNUM will change each time there are forward or backward changes
- *    in binary compatibility (e.g., when a new feature is added).
- *
- * See libpng.txt or libpng.3 for more information.  The PNG specification
- * is available as a W3C Recommendation and as an ISO Specification,
- * <https://www.w3.org/TR/2003/REC-PNG-20031110/
- */
-
-/*
- * Y2K compliance in libpng:
- * =========================
- *
- *    September 29, 2017
- *
- *    Since the PNG Development group is an ad-hoc body, we can't make
- *    an official declaration.
- *
- *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.6.34 are Y2K compliant.  It is my belief that
- *    earlier versions were also Y2K compliant.
- *
- *    Libpng only has two year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other, which is deprecated,
- *    holds the date in text format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The string is
- *        "char time_buffer[29]" in png_struct.  This is no longer used
- *    in libpng-1.6.x and will be removed from libpng-1.7.0.
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123_buffer() in png.c
- *          (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and
- *          png_convert_to_rfc_1152() in error prior to libpng-0.98)
- *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- *        png_convert_from_time_t() in pngwrite.c
- *        png_get_tIME() in pngget.c
- *        png_handle_tIME() in pngrutil.c, called in pngread.c
- *        png_set_tIME() in pngset.c
- *        png_write_tIME() in pngwutil.c, called in pngwrite.c
- *
- *    All handle dates properly in a Y2K environment.  The
- *    png_convert_from_time_t() function calls gmtime() to convert from system
- *    clock time, which returns (year - 1900), which we properly convert to
- *    the full 4-digit year.  There is a possibility that libpng applications
- *    are not passing 4-digit years into the png_convert_to_rfc_1123_buffer()
- *    function, or that they are incorrectly passing only a 2-digit year
- *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
- *    but this is not under our control.  The libpng documentation has always
- *    stated that it works with 4-digit years, and the APIs have been
- *    documented as such.
- *
- *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
- *    integer to hold the year, and can hold years as large as 65535.
- *
- *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
- *    no date-related code.
- *
- *       Glenn Randers-Pehrson
- *       libpng maintainer
- *       PNG Development Group
- */
-
-#ifndef PNG_H
-#define PNG_H
-
-/* This is not the place to learn how to use libpng. The file libpng-manual.txt
- * describes how to use libpng, and the file example.c summarizes it
- * with some code on which to build.  This file is useful for looking
- * at the actual function definitions and structure components.  If that
- * file has been stripped from your copy of libpng, you can find it at
- * <http://www.libpng.org/pub/png/libpng-manual.txt>
- *
- * If you just need to read a PNG file and don't want to read the documentation
- * skip to the end of this file and read the section entitled 'simplified API'.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.34"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.34 - September 29, 2017\n"
-
-#define PNG_LIBPNG_VER_SONUM   16
-#define PNG_LIBPNG_VER_DLLNUM  16
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 34
-
-/* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero:
- */
-
-#define PNG_LIBPNG_VER_BUILD  0
-
-/* Release Status */
-#define PNG_LIBPNG_BUILD_ALPHA    1
-#define PNG_LIBPNG_BUILD_BETA     2
-#define PNG_LIBPNG_BUILD_RC       3
-#define PNG_LIBPNG_BUILD_STABLE   4
-#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
-
-/* Release-Specific Flags */
-#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
-                                       PNG_LIBPNG_BUILD_STABLE only */
-#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_SPECIAL */
-#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_PRIVATE */
-
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
-
-/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
- * version 1.0.0 was mis-numbered 100 instead of 10000).  From
- * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
- */
-#define PNG_LIBPNG_VER 10634 /* 1.6.34 */
-
-/* Library configuration: these options cannot be changed after
- * the library has been built.
- */
-#ifndef PNGLCONF_H
-/* If pnglibconf.h is missing, you can
- * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
- */
-#   include "pnglibconf.h"
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* Machine specific configuration. */
-#  include "pngconf.h"
-#endif
-
-/*
- * Added at libpng-1.2.8
- *
- * Ref MSDN: Private as priority over Special
- * VS_FF_PRIVATEBUILD File *was not* built using standard release
- * procedures. If this value is given, the StringFileInfo block must
- * contain a PrivateBuild string.
- *
- * VS_FF_SPECIALBUILD File *was* built by the original company using
- * standard release procedures but is a variation of the standard
- * file of the same version number. If this value is given, the
- * StringFileInfo block must contain a SpecialBuild string.
- */
-
-#ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */
-#  define PNG_LIBPNG_BUILD_TYPE \
-       (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
-#else
-#  ifdef PNG_LIBPNG_SPECIALBUILD
-#    define PNG_LIBPNG_BUILD_TYPE \
-         (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
-#  else
-#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
-#  endif
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Version information for C files, stored in png.c.  This had better match
- * the version above.
- */
-#define png_libpng_ver png_get_header_ver(NULL)
-
-/* This file is arranged in several sections:
- *
- * 1. [omitted]
- * 2. Any configuration options that can be specified by for the application
- *    code when it is built.  (Build time configuration is in pnglibconf.h)
- * 3. Type definitions (base types are defined in pngconf.h), structure
- *    definitions.
- * 4. Exported library functions.
- * 5. Simplified API.
- * 6. Implementation options.
- *
- * The library source code has additional files (principally pngpriv.h) that
- * allow configuration of the library.
- */
-
-/* Section 1: [omitted] */
-
-/* Section 2: run time configuration
- * See pnglibconf.h for build time configuration
- *
- * Run time configuration allows the application to choose between
- * implementations of certain arithmetic APIs.  The default is set
- * at build time and recorded in pnglibconf.h, but it is safe to
- * override these (and only these) settings.  Note that this won't
- * change what the library does, only application code, and the
- * settings can (and probably should) be made on a per-file basis
- * by setting the #defines before including png.h
- *
- * Use macros to read integers from PNG data or use the exported
- * functions?
- *   PNG_USE_READ_MACROS: use the macros (see below)  Note that
- *     the macros evaluate their argument multiple times.
- *   PNG_NO_USE_READ_MACROS: call the relevant library function.
- *
- * Use the alternative algorithm for compositing alpha samples that
- * does not use division?
- *   PNG_READ_COMPOSITE_NODIV_SUPPORTED: use the 'no division'
- *      algorithm.
- *   PNG_NO_READ_COMPOSITE_NODIV: use the 'division' algorithm.
- *
- * How to handle benign errors if PNG_ALLOW_BENIGN_ERRORS is
- * false?
- *   PNG_ALLOW_BENIGN_ERRORS: map calls to the benign error
- *      APIs to png_warning.
- * Otherwise the calls are mapped to png_error.
- */
-
-/* Section 3: type definitions, including structures and compile time
- * constants.
- * See pngconf.h for base types that vary by machine/system
- */
-
-/* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
-typedef char* png_libpng_version_1_6_34;
-
-/* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
- *
- * png_struct is the cache of information used while reading or writing a single
- * PNG file.  One of these is always required, although the simplified API
- * (below) hides the creation and destruction of it.
- */
-typedef struct png_struct_def png_struct;
-typedef const png_struct * png_const_structp;
-typedef png_struct * png_structp;
-typedef png_struct * * png_structpp;
-
-/* png_info contains information read from or to be written to a PNG file.  One
- * or more of these must exist while reading or creating a PNG file.  The
- * information is not used by libpng during read but is used to control what
- * gets written when a PNG file is created.  "png_get_" function calls read
- * information during read and "png_set_" functions calls write information
- * when creating a PNG.
- * been moved into a separate header file that is not accessible to
- * applications.  Read libpng-manual.txt or libpng.3 for more info.
- */
-typedef struct png_info_def png_info;
-typedef png_info * png_infop;
-typedef const png_info * png_const_infop;
-typedef png_info * * png_infopp;
-
-/* Types with names ending 'p' are pointer types.  The corresponding types with
- * names ending 'rp' are identical pointer types except that the pointer is
- * marked 'restrict', which means that it is the only pointer to the object
- * passed to the function.  Applications should not use the 'restrict' types;
- * it is always valid to pass 'p' to a pointer with a function argument of the
- * corresponding 'rp' type.  Different compilers have different rules with
- * regard to type matching in the presence of 'restrict'.  For backward
- * compatibility libpng callbacks never have 'restrict' in their parameters and,
- * consequentially, writing portable application code is extremely difficult if
- * an attempt is made to use 'restrict'.
- */
-typedef png_struct * PNG_RESTRICT png_structrp;
-typedef const png_struct * PNG_RESTRICT png_const_structrp;
-typedef png_info * PNG_RESTRICT png_inforp;
-typedef const png_info * PNG_RESTRICT png_const_inforp;
-
-/* Three color definitions.  The order of the red, green, and blue, (and the
- * exact size) is not important, although the size of the fields need to
- * be png_byte or png_uint_16 (as defined below).
- */
-typedef struct png_color_struct
-{
-   png_byte red;
-   png_byte green;
-   png_byte blue;
-} png_color;
-typedef png_color * png_colorp;
-typedef const png_color * png_const_colorp;
-typedef png_color * * png_colorpp;
-
-typedef struct png_color_16_struct
-{
-   png_byte index;    /* used for palette files */
-   png_uint_16 red;   /* for use in red green blue files */
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 gray;  /* for use in grayscale files */
-} png_color_16;
-typedef png_color_16 * png_color_16p;
-typedef const png_color_16 * png_const_color_16p;
-typedef png_color_16 * * png_color_16pp;
-
-typedef struct png_color_8_struct
-{
-   png_byte red;   /* for use in red green blue files */
-   png_byte green;
-   png_byte blue;
-   png_byte gray;  /* for use in grayscale files */
-   png_byte alpha; /* for alpha channel files */
-} png_color_8;
-typedef png_color_8 * png_color_8p;
-typedef const png_color_8 * png_const_color_8p;
-typedef png_color_8 * * png_color_8pp;
-
-/*
- * The following two structures are used for the in-core representation
- * of sPLT chunks.
- */
-typedef struct png_sPLT_entry_struct
-{
-   png_uint_16 red;
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 alpha;
-   png_uint_16 frequency;
-} png_sPLT_entry;
-typedef png_sPLT_entry * png_sPLT_entryp;
-typedef const png_sPLT_entry * png_const_sPLT_entryp;
-typedef png_sPLT_entry * * png_sPLT_entrypp;
-
-/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
- *  occupy the LSB of their respective members, and the MSB of each member
- *  is zero-filled.  The frequency member always occupies the full 16 bits.
- */
-
-typedef struct png_sPLT_struct
-{
-   png_charp name;           /* palette name */
-   png_byte depth;           /* depth of palette samples */
-   png_sPLT_entryp entries;  /* palette entries */
-   png_int_32 nentries;      /* number of palette entries */
-} png_sPLT_t;
-typedef png_sPLT_t * png_sPLT_tp;
-typedef const png_sPLT_t * png_const_sPLT_tp;
-typedef png_sPLT_t * * png_sPLT_tpp;
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
- * and whether that contents is compressed or not.  The "key" field
- * points to a regular zero-terminated C string.  The "text" fields can be a
- * regular C string, an empty string, or a NULL pointer.
- * However, the structure returned by png_get_text() will always contain
- * the "text" field as a regular zero-terminated C string (possibly
- * empty), never a NULL pointer, so it can be safely used in printf() and
- * other string-handling functions.  Note that the "itxt_length", "lang", and
- * "lang_key" members of the structure only exist when the library is built
- * with iTXt chunk support.  Prior to libpng-1.4.0 the library was built by
- * default without iTXt support. Also note that when iTXt *is* supported,
- * the "lang" and "lang_key" fields contain NULL pointers when the
- * "compression" field contains * PNG_TEXT_COMPRESSION_NONE or
- * PNG_TEXT_COMPRESSION_zTXt. Note that the "compression value" is not the
- * same as what appears in the PNG tEXt/zTXt/iTXt chunk's "compression flag"
- * which is always 0 or 1, or its "compression method" which is always 0.
- */
-typedef struct png_text_struct
-{
-   int  compression;       /* compression value:
-                             -1: tEXt, none
-                              0: zTXt, deflate
-                              1: iTXt, none
-                              2: iTXt, deflate  */
-   png_charp key;          /* keyword, 1-79 character description of "text" */
-   png_charp text;         /* comment, may be an empty string (ie "")
-                              or a NULL pointer */
-   png_size_t text_length; /* length of the text string */
-   png_size_t itxt_length; /* length of the itxt string */
-   png_charp lang;         /* language code, 0-79 characters
-                              or a NULL pointer */
-   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
-                              chars or a NULL pointer */
-} png_text;
-typedef png_text * png_textp;
-typedef const png_text * png_const_textp;
-typedef png_text * * png_textpp;
-#endif
-
-/* Supported compression types for text in PNG files (tEXt, and zTXt).
- * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
-#define PNG_TEXT_COMPRESSION_NONE_WR -3
-#define PNG_TEXT_COMPRESSION_zTXt_WR -2
-#define PNG_TEXT_COMPRESSION_NONE    -1
-#define PNG_TEXT_COMPRESSION_zTXt     0
-#define PNG_ITXT_COMPRESSION_NONE     1
-#define PNG_ITXT_COMPRESSION_zTXt     2
-#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
-
-/* png_time is a way to hold the time in an machine independent way.
- * Two conversions are provided, both from time_t and struct tm.  There
- * is no portable way to convert to either of these structures, as far
- * as I know.  If you know of a portable way, send it to me.  As a side
- * note - PNG has always been Year 2000 compliant!
- */
-typedef struct png_time_struct
-{
-   png_uint_16 year; /* full year, as in, 1995 */
-   png_byte month;   /* month of year, 1 - 12 */
-   png_byte day;     /* day of month, 1 - 31 */
-   png_byte hour;    /* hour of day, 0 - 23 */
-   png_byte minute;  /* minute of hour, 0 - 59 */
-   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
-} png_time;
-typedef png_time * png_timep;
-typedef const png_time * png_const_timep;
-typedef png_time * * png_timepp;
-
-#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\
-   defined(PNG_USER_CHUNKS_SUPPORTED)
-/* png_unknown_chunk is a structure to hold queued chunks for which there is
- * no specific support.  The idea is that we can use this to queue
- * up private chunks for output even though the library doesn't actually
- * know about their semantics.
- *
- * The data in the structure is set by libpng on read and used on write.
- */
-typedef struct png_unknown_chunk_t
-{
-   png_byte name[5]; /* Textual chunk name with '\0' terminator */
-   png_byte *data;   /* Data, should not be modified on read! */
-   png_size_t size;
-
-   /* On write 'location' must be set using the flag values listed below.
-    * Notice that on read it is set by libpng however the values stored have
-    * more bits set than are listed below.  Always treat the value as a
-    * bitmask.  On write set only one bit - setting multiple bits may cause the
-    * chunk to be written in multiple places.
-    */
-   png_byte location; /* mode of operation at read time */
-}
-png_unknown_chunk;
-
-typedef png_unknown_chunk * png_unknown_chunkp;
-typedef const png_unknown_chunk * png_const_unknown_chunkp;
-typedef png_unknown_chunk * * png_unknown_chunkpp;
-#endif
-
-/* Flag values for the unknown chunk location byte. */
-#define PNG_HAVE_IHDR  0x01
-#define PNG_HAVE_PLTE  0x02
-#define PNG_AFTER_IDAT 0x08
-
-/* Maximum positive integer used in PNG is (2^31)-1 */
-#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-#define PNG_UINT_32_MAX ((png_uint_32)(-1))
-#define PNG_SIZE_MAX ((png_size_t)(-1))
-
-/* These are constants for fixed point values encoded in the
- * PNG specification manner (x100000)
- */
-#define PNG_FP_1    100000
-#define PNG_FP_HALF  50000
-#define PNG_FP_MAX  ((png_fixed_point)0x7fffffffL)
-#define PNG_FP_MIN  (-PNG_FP_MAX)
-
-/* These describe the color_type field in png_info. */
-/* color type masks */
-#define PNG_COLOR_MASK_PALETTE    1
-#define PNG_COLOR_MASK_COLOR      2
-#define PNG_COLOR_MASK_ALPHA      4
-
-/* color types.  Note that not all combinations are legal */
-#define PNG_COLOR_TYPE_GRAY 0
-#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
-#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
-#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
-#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
-/* aliases */
-#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
-#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
-
-/* This is for compression type. PNG 1.0-1.2 only define the single type. */
-#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
-#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
-
-/* This is for filter type. PNG 1.0-1.2 only define the single type. */
-#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
-#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
-#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
-
-/* These are for the interlacing type.  These values should NOT be changed. */
-#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
-#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
-#define PNG_INTERLACE_LAST        2 /* Not a valid value */
-
-/* These are for the oFFs chunk.  These values should NOT be changed. */
-#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
-#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
-#define PNG_OFFSET_LAST           2 /* Not a valid value */
-
-/* These are for the pCAL chunk.  These values should NOT be changed. */
-#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
-#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
-#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
-#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
-#define PNG_EQUATION_LAST         4 /* Not a valid value */
-
-/* These are for the sCAL chunk.  These values should NOT be changed. */
-#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
-#define PNG_SCALE_METER           1 /* meters per pixel */
-#define PNG_SCALE_RADIAN          2 /* radians per pixel */
-#define PNG_SCALE_LAST            3 /* Not a valid value */
-
-/* These are for the pHYs chunk.  These values should NOT be changed. */
-#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
-#define PNG_RESOLUTION_METER      1 /* pixels/meter */
-#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
-
-/* These are for the sRGB chunk.  These values should NOT be changed. */
-#define PNG_sRGB_INTENT_PERCEPTUAL 0
-#define PNG_sRGB_INTENT_RELATIVE   1
-#define PNG_sRGB_INTENT_SATURATION 2
-#define PNG_sRGB_INTENT_ABSOLUTE   3
-#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
-
-/* This is for text chunks */
-#define PNG_KEYWORD_MAX_LENGTH     79
-
-/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
-#define PNG_MAX_PALETTE_LENGTH    256
-
-/* These determine if an ancillary chunk's data has been successfully read
- * from the PNG header, or if the application has filled in the corresponding
- * data in the info_struct to be written into the output file.  The values
- * of the PNG_INFO_<chunk> defines should NOT be changed.
- */
-#define PNG_INFO_gAMA 0x0001U
-#define PNG_INFO_sBIT 0x0002U
-#define PNG_INFO_cHRM 0x0004U
-#define PNG_INFO_PLTE 0x0008U
-#define PNG_INFO_tRNS 0x0010U
-#define PNG_INFO_bKGD 0x0020U
-#define PNG_INFO_hIST 0x0040U
-#define PNG_INFO_pHYs 0x0080U
-#define PNG_INFO_oFFs 0x0100U
-#define PNG_INFO_tIME 0x0200U
-#define PNG_INFO_pCAL 0x0400U
-#define PNG_INFO_sRGB 0x0800U  /* GR-P, 0.96a */
-#define PNG_INFO_iCCP 0x1000U  /* ESR, 1.0.6 */
-#define PNG_INFO_sPLT 0x2000U  /* ESR, 1.0.6 */
-#define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */
-#define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
-#define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
-
-/* This is used for the transformation routines, as some of them
- * change these values for the row.  It also should enable using
- * the routines for other purposes.
- */
-typedef struct png_row_info_struct
-{
-   png_uint_32 width;    /* width of row */
-   png_size_t rowbytes;  /* number of bytes in row */
-   png_byte color_type;  /* color type of row */
-   png_byte bit_depth;   /* bit depth of row */
-   png_byte channels;    /* number of channels (1, 2, 3, or 4) */
-   png_byte pixel_depth; /* bits per pixel (depth * channels) */
-} png_row_info;
-
-typedef png_row_info * png_row_infop;
-typedef png_row_info * * png_row_infopp;
-
-/* These are the function types for the I/O functions and for the functions
- * that allow the user to override the default I/O functions with his or her
- * own.  The png_error_ptr type should match that of user-supplied warning
- * and error functions, while the png_rw_ptr type should match that of the
- * user read/write data functions.  Note that the 'write' function must not
- * modify the buffer it is passed. The 'read' function, on the other hand, is
- * expected to return the read data in the buffer.
- */
-typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));
-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t));
-typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));
-typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,
-    int));
-typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32,
-    int));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
-typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
-
-/* The following callback receives png_uint_32 row_number, int pass for the
- * png_bytep data of the row.  When transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-typedef PNG_CALLBACK(void, *png_progressive_row_ptr, (png_structp, png_bytep,
-    png_uint_32, int));
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-typedef PNG_CALLBACK(void, *png_user_transform_ptr, (png_structp, png_row_infop,
-    png_bytep));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
-    png_unknown_chunkp));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-/* not used anywhere */
-/* typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp)); */
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This must match the function definition in <setjmp.h>, and the application
- * must include this before png.h to obtain the definition of jmp_buf.  The
- * function is required to be PNG_NORETURN, but this is not checked.  If the
- * function does return the application will crash via an abort() or similar
- * system level call.
- *
- * If you get a warning here while building the library you may need to make
- * changes to ensure that pnglibconf.h records the calling convention used by
- * your compiler.  This may be very difficult - try using a different compiler
- * to build the library!
- */
-PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
-#endif
-
-/* Transform masks for the high-level interface */
-#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
-#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
-#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
-#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
-#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
-#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
-#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
-#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
-#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
-#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
-#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
-#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only */
-/* Added to libpng-1.2.34 */
-#define PNG_TRANSFORM_STRIP_FILLER_BEFORE PNG_TRANSFORM_STRIP_FILLER
-#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* write only */
-/* Added to libpng-1.4.0 */
-#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
-/* Added to libpng-1.5.4 */
-#define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */
-#if INT_MAX >= 0x8000 /* else this might break */
-#define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */
-#endif
-
-/* Flags for MNG supported features */
-#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
-#define PNG_FLAG_MNG_FILTER_64      0x04
-#define PNG_ALL_MNG_FEATURES        0x05
-
-/* NOTE: prior to 1.5 these functions had no 'API' style declaration,
- * this allowed the zlib default functions to be used on Windows
- * platforms.  In 1.5 the zlib default malloc (which just calls malloc and
- * ignores the first argument) should be completely compatible with the
- * following.
- */
-typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp,
-    png_alloc_size_t));
-typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
-
-/* Section 4: exported functions
- * Here are the function definitions most commonly used.  This is not
- * the place to find out how to use libpng.  See libpng-manual.txt for the
- * full explanation, see example.c for the summary.  This just provides
- * a simple one line description of the use of each function.
- *
- * The PNG_EXPORT() and PNG_EXPORTA() macros used below are defined in
- * pngconf.h and in the *.dfn files in the scripts directory.
- *
- *   PNG_EXPORT(ordinal, type, name, (args));
- *
- *       ordinal:    ordinal that is used while building
- *                   *.def files. The ordinal value is only
- *                   relevant when preprocessing png.h with
- *                   the *.dfn files for building symbol table
- *                   entries, and are removed by pngconf.h.
- *       type:       return type of the function
- *       name:       function name
- *       args:       function arguments, with types
- *
- * When we wish to append attributes to a function prototype we use
- * the PNG_EXPORTA() macro instead.
- *
- *   PNG_EXPORTA(ordinal, type, name, (args), attributes);
- *
- *       ordinal, type, name, and args: same as in PNG_EXPORT().
- *       attributes: function attributes
- */
-
-/* Returns the version number of the library */
-PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));
-
-/* Tell lib we have already handled the first <num_bytes> magic bytes.
- * Handling more than 8 bytes from the beginning of the file is an error.
- */
-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
-
-/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
- * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
- * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
- */
-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start,
-    png_size_t num_to_check));
-
-/* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
- */
-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
-
-/* Allocate and initialize png_ptr struct for reading, and any other memory. */
-PNG_EXPORTA(4, png_structp, png_create_read_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-/* Allocate and initialize png_ptr struct for writing, and any other memory */
-PNG_EXPORTA(5, png_structp, png_create_write_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-    (png_const_structrp png_ptr));
-
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
-    png_size_t size));
-
-/* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
- * match up.
- */
-#ifdef PNG_SETJMP_SUPPORTED
-/* This function returns the jmp_buf built in to *png_ptr.  It must be
- * supplied with an appropriate 'longjmp' function to use on that jmp_buf
- * unless the default error function is overridden in which case NULL is
- * acceptable.  The size of the jmp_buf is checked against the actual size
- * allocated by the library - the call will return NULL on a mismatch
- * indicating an ABI mismatch.
- */
-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,
-    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
-#  define png_jmpbuf(png_ptr) \
-      (*png_set_longjmp_fn((png_ptr), longjmp, (sizeof (jmp_buf))))
-#else
-#  define png_jmpbuf(png_ptr) \
-      (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
-#endif
-/* This function should be used by libpng applications in place of
- * longjmp(png_ptr->jmpbuf, val).  If longjmp_fn() has been set, it
- * will use it; otherwise it will call PNG_ABORT().  This function was
- * added in libpng-1.5.0.
- */
-PNG_EXPORTA(9, void, png_longjmp, (png_const_structrp png_ptr, int val),
-    PNG_NORETURN);
-
-#ifdef PNG_READ_SUPPORTED
-/* Reset the compression stream */
-PNG_EXPORTA(10, int, png_reset_zstream, (png_structrp png_ptr), PNG_DEPRECATED);
-#endif
-
-/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(11, png_structp, png_create_read_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-PNG_EXPORTA(12, png_structp, png_create_write_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-#endif
-
-/* Write the PNG file signature. */
-PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
-    chunk_name, png_const_bytep data, png_size_t length));
-
-/* Write the start of a PNG chunk - length and chunk name. */
-PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
-    png_const_bytep chunk_name, png_uint_32 length));
-
-/* Write the data of a PNG chunk started with png_write_chunk_start(). */
-PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
-    png_const_bytep data, png_size_t length));
-
-/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
-
-/* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),
-    PNG_ALLOCATED);
-
-/* DEPRECATED: this function allowed init structures to be created using the
- * default allocation method (typically malloc).  Use is deprecated in 1.6.0 and
- * the API will be removed in the future.
- */
-PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size), PNG_DEPRECATED);
-
-/* Writes all the PNG information before the image. */
-PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(21, void, png_write_info,
-    (png_structrp png_ptr, png_const_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data. */
-PNG_EXPORT(22, void, png_read_info,
-    (png_structrp png_ptr, png_inforp info_ptr));
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-   /* Convert to a US string format: there is no localization support in this
-    * routine.  The original implementation used a 29 character buffer in
-    * png_struct, this will be removed in future versions.
-    */
-#if PNG_LIBPNG_VER < 10700
-/* To do: remove this from libpng17 (and from libpng17/png.c and pngstruct.h) */
-PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,
-    png_const_timep ptime),PNG_DEPRECATED);
-#endif
-PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer, (char out[29],
-    png_const_timep ptime));
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-/* Convert from a struct tm to png_time */
-PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
-    const struct tm * ttime));
-
-/* Convert from time_t to png_time.  Uses gmtime() */
-PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
-#endif /* CONVERT_tIME */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-PNG_EXPORT(26, void, png_set_expand, (png_structrp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structrp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structrp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* Expand to 16-bit channels, forces conversion of palette to RGB and expansion
- * of a tRNS chunk if present.
- */
-PNG_EXPORT(221, void, png_set_expand_16, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Use blue, green, red order for pixels. */
-PNG_EXPORT(30, void, png_set_bgr, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand the grayscale to 24-bit RGB if necessary. */
-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB to grayscale. */
-#define PNG_ERROR_ACTION_NONE  1
-#define PNG_ERROR_ACTION_WARN  2
-#define PNG_ERROR_ACTION_ERROR 3
-#define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/
-
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structrp png_ptr,
-    int error_action, double red, double green))
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structrp png_ptr,
-    int error_action, png_fixed_point red, png_fixed_point green))
-
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structrp
-    png_ptr));
-#endif
-
-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
-    png_colorp palette));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-/* How the alpha channel is interpreted - this affects how the color channels
- * of a PNG file are returned to the calling application when an alpha channel,
- * or a tRNS chunk in a palette file, is present.
- *
- * This has no effect on the way pixels are written into a PNG output
- * datastream. The color samples in a PNG datastream are never premultiplied
- * with the alpha samples.
- *
- * The default is to return data according to the PNG specification: the alpha
- * channel is a linear measure of the contribution of the pixel to the
- * corresponding composited pixel, and the color channels are unassociated
- * (not premultiplied).  The gamma encoded color channels must be scaled
- * according to the contribution and to do this it is necessary to undo
- * the encoding, scale the color values, perform the composition and reencode
- * the values.  This is the 'PNG' mode.
- *
- * The alternative is to 'associate' the alpha with the color information by
- * storing color channel values that have been scaled by the alpha.
- * image.  These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes
- * (the latter being the two common names for associated alpha color channels).
- *
- * For the 'OPTIMIZED' mode, a pixel is treated as opaque only if the alpha
- * value is equal to the maximum value.
- *
- * The final choice is to gamma encode the alpha channel as well.  This is
- * broken because, in practice, no implementation that uses this choice
- * correctly undoes the encoding before handling alpha composition.  Use this
- * choice only if other serious errors in the software or hardware you use
- * mandate it; the typical serious error is for dark halos to appear around
- * opaque areas of the composited PNG image because of arithmetic overflow.
- *
- * The API function png_set_alpha_mode specifies which of these choices to use
- * with an enumerated 'mode' value and the gamma of the required output:
- */
-#define PNG_ALPHA_PNG           0 /* according to the PNG standard */
-#define PNG_ALPHA_STANDARD      1 /* according to Porter/Duff */
-#define PNG_ALPHA_ASSOCIATED    1 /* as above; this is the normal practice */
-#define PNG_ALPHA_PREMULTIPLIED 1 /* as above */
-#define PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */
-#define PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */
-
-PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structrp png_ptr, int mode,
-    double output_gamma))
-PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
-    int mode, png_fixed_point output_gamma))
-#endif
-
-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-/* The output_gamma value is a screen gamma in libpng terminology: it expresses
- * how to decode the output values, not how they are encoded.
- */
-#define PNG_DEFAULT_sRGB -1       /* sRGB gamma and color space */
-#define PNG_GAMMA_MAC_18 -2       /* Old Mac '1.8' gamma and color space */
-#define PNG_GAMMA_sRGB   220000   /* Television standards--matches sRGB gamma */
-#define PNG_GAMMA_LINEAR PNG_FP_1 /* Linear */
-#endif
-
-/* The following are examples of calls to png_set_alpha_mode to achieve the
- * required overall gamma correction and, where necessary, alpha
- * premultiplication.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- *    This is the default libpng handling of the alpha channel - it is not
- *    pre-multiplied into the color components.  In addition the call states
- *    that the output is for a sRGB system and causes all PNG files without gAMA
- *    chunks to be assumed to be encoded using sRGB.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    In this case the output is assumed to be something like an sRGB conformant
- *    display preceeded by a power-law lookup table of power 1.45.  This is how
- *    early Mac systems behaved.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
- *    This is the classic Jim Blinn approach and will work in academic
- *    environments where everything is done by the book.  It has the shortcoming
- *    of assuming that input PNG data with no gamma information is linear - this
- *    is unlikely to be correct unless the PNG files where generated locally.
- *    Most of the time the output precision will be so low as to show
- *    significant banding in dark areas of the image.
- *
- * png_set_expand_16(pp);
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB);
- *    This is a somewhat more realistic Jim Blinn inspired approach.  PNG files
- *    are assumed to have the sRGB encoding if not marked with a gamma value and
- *    the output is always 16 bits per component.  This permits accurate scaling
- *    and processing of the data.  If you know that your input PNG files were
- *    generated locally you might need to replace PNG_DEFAULT_sRGB with the
- *    correct value for your system.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB);
- *    If you just need to composite the PNG image onto an existing background
- *    and if you control the code that does this you can use the optimization
- *    setting.  In this case you just copy completely opaque pixels to the
- *    output.  For pixels that are not completely transparent (you just skip
- *    those) you do the composition math using png_composite or png_composite_16
- *    below then encode the resultant 8-bit or 16-bit values to match the output
- *    encoding.
- *
- * Other cases
- *    If neither the PNG nor the standard linear encoding work for you because
- *    of the software or hardware you use then you have a big problem.  The PNG
- *    case will probably result in halos around the image.  The linear encoding
- *    will probably result in a washed out, too bright, image (it's actually too
- *    contrasty.)  Try the ALPHA_OPTIMIZED mode above - this will probably
- *    substantially reduce the halos.  Alternatively try:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB);
- *    This option will also reduce the halos, but there will be slight dark
- *    halos round the opaque parts of the image where the background is light.
- *    In the OPTIMIZED mode the halos will be light halos where the background
- *    is dark.  Take your pick - the halos are unavoidable unless you can get
- *    your hardware/software fixed!  (The OPTIMIZED approach is slightly
- *    faster.)
- *
- * When the default gamma of PNG files doesn't match the output gamma.
- *    If you have PNG files with no gamma information png_set_alpha_mode allows
- *    you to provide a default gamma, but it also sets the ouput gamma to the
- *    matching value.  If you know your PNG files have a gamma that doesn't
- *    match the output you can take advantage of the fact that
- *    png_set_alpha_mode always sets the output gamma but only sets the PNG
- *    default if it is not already set:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    The first call sets both the default and the output gamma values, the
- *    second call overrides the output gamma without changing the default.  This
- *    is easier than achieving the same effect with png_set_gamma.  You must use
- *    PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will
- *    fire if more than one call to png_set_alpha_mode and png_set_background is
- *    made in the same read operation, however multiple calls with PNG_ALPHA_PNG
- *    are ignored.
- */
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
-PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
-    int flags));
-/* The values of the PNG_FILLER_ defines should NOT be changed */
-#  define PNG_FILLER_BEFORE 0
-#  define PNG_FILLER_AFTER 1
-/* Add an alpha byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
-PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
-    png_uint_32 filler, int flags));
-#endif /* READ_FILLER || WRITE_FILLER */
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swap bytes in 16-bit depth files. */
-PNG_EXPORT(41, void, png_set_swap, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-PNG_EXPORT(42, void, png_set_packing, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Swap packing order of pixels in bytes. */
-PNG_EXPORT(43, void, png_set_packswap, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-/* Converts files to legal bit depths. */
-PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p
-    true_bits));
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-/* Have the code handle the interlacing.  Returns the number of passes.
- * MUST be called before png_read_update_info or png_start_read_image,
- * otherwise it will not have the desired effect.  Note that it is still
- * necessary to call png_read_row or png_read_rows png_get_image_height
- * times for each pass.
-*/
-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structrp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-/* Invert monochrome files */
-PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS by replacing with a background color.  Prior to
- * libpng-1.5.4 this API must not be called before the PNG file header has been
- * read.  Doing so will result in unexpected behavior and possible warnings or
- * errors if the PNG file contains a bKGD chunk.
- */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, double background_gamma))
-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma))
-#endif
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-#  define PNG_BACKGROUND_GAMMA_UNKNOWN 0
-#  define PNG_BACKGROUND_GAMMA_SCREEN  1
-#  define PNG_BACKGROUND_GAMMA_FILE    2
-#  define PNG_BACKGROUND_GAMMA_UNIQUE  3
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-/* Scale a 16-bit depth file down to 8-bit, accurately. */
-PNG_EXPORT(229, void, png_set_scale_16, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_16_TO_8_SUPPORTED /* Name prior to 1.5.4 */
-/* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Turn on quantizing, and reduce the palette to the number of colors
- * available.
- */
-PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,
-    png_colorp palette, int num_palette, int maximum_colors,
-    png_const_uint_16p histogram, int full_quantize));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* The threshold on gamma processing is configurable but hard-wired into the
- * library.  The following is the floating point variant.
- */
-#define PNG_GAMMA_THRESHOLD (PNG_GAMMA_THRESHOLD_FIXED*.00001)
-
-/* Handle gamma correction. Screen_gamma=(display_exponent).
- * NOTE: this API simply sets the screen and file gamma values. It will
- * therefore override the value for gamma in a PNG file if it is called after
- * the file header has been read - use with care  - call before reading the PNG
- * file for best results!
- *
- * These routines accept the same gamma values as png_set_alpha_mode (described
- * above).  The PNG_GAMMA_ defines and PNG_DEFAULT_sRGB can be passed to either
- * API (floating point or fixed.)  Notice, however, that the 'file_gamma' value
- * is the inverse of a 'screen gamma' value.
- */
-PNG_FP_EXPORT(50, void, png_set_gamma, (png_structrp png_ptr,
-    double screen_gamma, double override_file_gamma))
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structrp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point override_file_gamma))
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set how many lines between output flushes - 0 for no flushing */
-PNG_EXPORT(51, void, png_set_flush, (png_structrp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structrp png_ptr));
-#endif
-
-/* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structrp png_ptr));
-
-/* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info, (png_structrp png_ptr,
-    png_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structrp png_ptr, png_bytepp row,
-    png_bytepp display_row, png_uint_32 num_rows));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read a row of data. */
-PNG_EXPORT(56, void, png_read_row, (png_structrp png_ptr, png_bytep row,
-    png_bytep display_row));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the whole image into memory at once. */
-PNG_EXPORT(57, void, png_read_image, (png_structrp png_ptr, png_bytepp image));
-#endif
-
-/* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,
-    png_const_bytep row));
-
-/* Write a few rows of image data: (*row) is not written; however, the type
- * is declared as writeable to maintain compatibility with previous versions
- * of libpng and to allow the 'display_row' array from read_rows to be passed
- * unchanged to write_rows.
- */
-PNG_EXPORT(59, void, png_write_rows, (png_structrp png_ptr, png_bytepp row,
-    png_uint_32 num_rows));
-
-/* Write the image data */
-PNG_EXPORT(60, void, png_write_image, (png_structrp png_ptr, png_bytepp image));
-
-/* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end, (png_structrp png_ptr,
-    png_inforp info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structrp png_ptr, png_inforp info_ptr));
-#endif
-
-/* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_const_structrp png_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Set the libpng method of handling chunk CRC errors */
-PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
-    int ancil_action));
-
-/* Values for png_set_crc_action() say how to handle CRC errors in
- * ancillary and critical chunks, and whether to use the data contained
- * therein.  Note that it is impossible to "discard" data in a critical
- * chunk.  For versions prior to 0.90, the action was always error/quit,
- * whereas in version 0.90 and later, the action for CRC errors in ancillary
- * chunks is warn/discard.  These values should NOT be changed.
- *
- *      value                       action:critical     action:ancillary
- */
-#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
-#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
-#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
-#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
-#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
-#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
-
-#ifdef PNG_WRITE_SUPPORTED
-/* These functions give the user control over the scan-line filtering in
- * libpng and the compression methods used by zlib.  These functions are
- * mainly useful for testing, as the defaults should work with most users.
- * Those users who are tight on memory or want faster performance at the
- * expense of compression can modify them.  See the compression library
- * header file (zlib.h) for an explination of the compression functions.
- */
-
-/* Set the filtering method(s) used by libpng.  Currently, the only valid
- * value for "method" is 0.
- */
-PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,
-    int filters));
-#endif /* WRITE */
-
-/* Flags for png_set_filter() to say which filters to use.  The flags
- * are chosen so that they don't conflict with real filter types
- * below, in case they are supplied instead of the #defined constants.
- * These values should NOT be changed.
- */
-#define PNG_NO_FILTERS     0x00
-#define PNG_FILTER_NONE    0x08
-#define PNG_FILTER_SUB     0x10
-#define PNG_FILTER_UP      0x20
-#define PNG_FILTER_AVG     0x40
-#define PNG_FILTER_PAETH   0x80
-#define PNG_FAST_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP)
-#define PNG_ALL_FILTERS (PNG_FAST_FILTERS | PNG_FILTER_AVG | PNG_FILTER_PAETH)
-
-/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
- * These defines should NOT be changed.
- */
-#define PNG_FILTER_VALUE_NONE  0
-#define PNG_FILTER_VALUE_SUB   1
-#define PNG_FILTER_VALUE_UP    2
-#define PNG_FILTER_VALUE_AVG   3
-#define PNG_FILTER_VALUE_PAETH 4
-#define PNG_FILTER_VALUE_LAST  5
-
-#ifdef PNG_WRITE_SUPPORTED
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */
-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structrp png_ptr,
-    int heuristic_method, int num_weights, png_const_doublep filter_weights,
-    png_const_doublep filter_costs))
-PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-    (png_structrp png_ptr, int heuristic_method, int num_weights,
-    png_const_fixed_point_p filter_weights,
-    png_const_fixed_point_p filter_costs))
-#endif /* WRITE_WEIGHTED_FILTER */
-
-/* The following are no longer used and will be removed from libpng-1.7: */
-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
-
-/* Set the library compression level.  Currently, valid values range from
- * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
- * (0 - no compression, 9 - "maximal" compression).  Note that tests have
- * shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations.  In the future,
- * these values may not correspond directly to the zlib compression levels.
- */
-#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr,
-    int level));
-
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structrp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr,
-    int window_bits));
-
-PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr,
-    int method));
-#endif /* WRITE_CUSTOMIZE_COMPRESSION */
-
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-/* Also set zlib parameters for compressing non-IDAT chunks */
-PNG_EXPORT(222, void, png_set_text_compression_level, (png_structrp png_ptr,
-    int level));
-
-PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structrp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structrp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(225, void, png_set_text_compression_window_bits,
-    (png_structrp png_ptr, int window_bits));
-
-PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
-    int method));
-#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
-#endif /* WRITE */
-
-/* These next functions are called for input/output, memory, and error
- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
- * and call standard C I/O routines such as fread(), fwrite(), and
- * fprintf().  These functions can be made to use other I/O routines
- * at run time for those applications that need to handle I/O in a
- * different manner by calling png_set_???_fn().  See libpng-manual.txt for
- * more information.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-/* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
-#endif
-
-/* Replace the (error and abort), and warning functions with user
- * supplied functions.  If no messages are to be printed you must still
- * write and use replacement functions. The replacement error_fn should
- * still do a longjmp to the last setjmp location if you are using this
- * method of error handling.  If error_fn or warning_fn is NULL, the
- * default function will be used.
- */
-
-PNG_EXPORT(75, void, png_set_error_fn, (png_structrp png_ptr,
-    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
-
-/* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));
-
-/* Replace the default data output functions with a user supplied one(s).
- * If buffered output is not used, then output_flush_fn can be set to NULL.
- * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
- * output_flush_fn will be ignored (and thus can be NULL).
- * It is probably a mistake to use NULL for output_flush_fn if
- * write_data_fn is not also NULL unless you have built libpng with
- * PNG_WRITE_FLUSH_SUPPORTED undefined, because in this case libpng's
- * default flush function, which uses the standard *FILE structure, will
- * be used.
- */
-PNG_EXPORT(77, void, png_set_write_fn, (png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
-
-/* Replace the default data input function with a user supplied one. */
-PNG_EXPORT(78, void, png_set_read_fn, (png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr read_data_fn));
-
-/* Return the user pointer associated with the I/O functions */
-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_const_structrp png_ptr));
-
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structrp png_ptr,
-    png_read_status_ptr read_row_fn));
-
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structrp png_ptr,
-    png_write_status_ptr write_row_fn));
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* Replace the default memory allocation functions with user supplied one(s). */
-PNG_EXPORT(82, void, png_set_mem_fn, (png_structrp png_ptr, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-/* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr read_user_transform_fn));
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structrp png_ptr,
-    png_user_transform_ptr write_user_transform_fn));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structrp png_ptr,
-    png_voidp user_transform_ptr, int user_transform_depth,
-    int user_transform_channels));
-/* Return the user pointer associated with the user transform functions */
-PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-    (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-/* Return information about the row currently being processed.  Note that these
- * APIs do not fail but will return unexpected results if called outside a user
- * transform callback.  Also note that when transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structrp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
-#endif
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-/* This callback is called only for *unknown* chunks.  If
- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED is set then it is possible to set known
- * chunks to be treated as unknown, however in this case the callback must do
- * any processing required by the chunk (e.g. by calling the appropriate
- * png_set_ APIs.)
- *
- * There is no write support - on write, by default, all the chunks in the
- * 'unknown' list are written in the specified position.
- *
- * The integer return from the callback function is interpreted thus:
- *
- * negative: An error occurred; png_chunk_error will be called.
- *     zero: The chunk was not handled, the chunk will be saved. A critical
- *           chunk will cause an error at this point unless it is to be saved.
- * positive: The chunk was handled, libpng will ignore/discard it.
- *
- * See "INTERACTION WTIH USER CHUNK CALLBACKS" below for important notes about
- * how this behavior will change in libpng 1.7
- */
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structrp png_ptr));
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-/* Sets the function callbacks for the push reader, and a pointer to a
- * user-defined structure available to the callback functions.
- */
-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structrp png_ptr,
-    png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
-    png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
-
-/* Returns the user pointer associated with the push read functions */
-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,
-    (png_const_structrp png_ptr));
-
-/* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
-    png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size));
-
-/* A function which may be called *only* within png_process_data to stop the
- * processing of any more data.  The function returns the number of bytes
- * remaining, excluding any that libpng has cached internally.  A subsequent
- * call to png_process_data must supply these bytes again.  If the argument
- * 'save' is set to true the routine will first save all the pending data and
- * will always return 0.
- */
-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
-
-/* A function which may be called *only* outside (after) a call to
- * png_process_data.  It returns the number of bytes of data to skip in the
- * input.  Normally it will return 0, but if it returns a non-zero value the
- * application must skip than number of bytes of input data and pass the
- * following data to the next call to png_process_data.
- */
-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
-
-/* Function that combines rows.  'new_row' is a flag that should come from
- * the callback and be non-NULL if anything needs to be done; the library
- * stores its own version of the new data internally and ignores the passed
- * in value.
- */
-PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
-    png_bytep old_row, png_const_bytep new_row));
-#endif /* PROGRESSIVE_READ */
-
-PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-/* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Added at libpng version 1.2.4 */
-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
-
-/* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 free_me, int num));
-
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application; this works on the png_info structure passed
- * in, it does not change the state for other png_info structures.
- *
- * It is unlikely that this function works correctly as of 1.6.0 and using it
- * may result either in memory leaks or double free of allocated data.
- */
-PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int freer, png_uint_32 mask));
-
-/* Assignments for png_data_freer */
-#define PNG_DESTROY_WILL_FREE_DATA 1
-#define PNG_SET_WILL_FREE_DATA 1
-#define PNG_USER_WILL_FREE_DATA 2
-/* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008U
-#define PNG_FREE_ICCP 0x0010U
-#define PNG_FREE_SPLT 0x0020U
-#define PNG_FREE_ROWS 0x0040U
-#define PNG_FREE_PCAL 0x0080U
-#define PNG_FREE_SCAL 0x0100U
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#  define PNG_FREE_UNKN 0x0200U
-#endif
-/*      PNG_FREE_LIST 0x0400U   removed in 1.6.0 because it is ignored */
-#define PNG_FREE_PLTE 0x1000U
-#define PNG_FREE_TRNS 0x2000U
-#define PNG_FREE_TEXT 0x4000U
-#define PNG_FREE_EXIF 0x8000U /* Added at libpng-1.6.31 */
-#define PNG_FREE_ALL  0xffffU
-#define PNG_FREE_MUL  0x4220U /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED PNG_DEPRECATED);
-PNG_EXPORTA(101, void, png_free_default, (png_const_structrp png_ptr,
-    png_voidp ptr), PNG_DEPRECATED);
-#endif
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
-
-/* The same, but the chunk name is prepended to the error string. */
-PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
-
-#else
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN);
-#  define png_error(s1,s2) png_err(s1)
-#  define png_chunk_error(s1,s2) png_err(s1)
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-
-/* Non-fatal error in libpng, chunk name is prepended to message. */
-PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-#else
-#  define png_warning(s1,s2) ((void)(s1))
-#  define png_chunk_warning(s1,s2) ((void)(s1))
-#endif
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-/* Benign error in libpng.  Can continue, but may have a problem.
- * User can choose whether to handle as a fatal error or as a warning. */
-PNG_EXPORT(107, void, png_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-
-#ifdef PNG_READ_SUPPORTED
-/* Same, chunk name is prepended to message (only during read) */
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_const_structrp png_ptr,
-    png_const_charp warning_message));
-#endif
-
-PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structrp png_ptr, int allowed));
-#else
-#  ifdef PNG_ALLOW_BENIGN_ERRORS
-#    define png_benign_error png_warning
-#    define png_chunk_benign_error png_chunk_warning
-#  else
-#    define png_benign_error png_error
-#    define png_chunk_benign_error png_chunk_error
-#  endif
-#endif
-
-/* The png_set_<chunk> functions are for storing values in the png_info_struct.
- * Similarly, the png_get_<chunk> calls are used to read values from the
- * png_info_struct, either storing the parameters in the passed variables, or
- * setting pointers into the png_info_struct where the data is stored.  The
- * png_get_<chunk> functions return a non-zero value if the data was available
- * in info_ptr, or return zero and do not change any of the parameters if the
- * data was not available.
- *
- * These functions should be used instead of directly accessing png_info
- * to avoid problems with future changes in the size and internal layout of
- * png_info_struct.
- */
-/* Returns "flag" if chunk data is valid in info_ptr. */
-PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 flag));
-
-/* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* Returns row_pointers, which is an array of pointers to scanlines that was
- * returned from png_read_png().
- */
-PNG_EXPORT(112, png_bytepp, png_get_rows, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Set row_pointers, which is an array of pointers to scanlines for use
- * by png_write_png().
- */
-PNG_EXPORT(113, void, png_set_rows, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-
-/* Returns image resolution in pixels per meter, from pHYs chunk data. */
-PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-
-/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-#endif /* EASY_ACCESS */
-
-#ifdef PNG_READ_SUPPORTED
-/* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_16p *background));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_16p background));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *white_x, double *white_y, double *red_x,
-    double *red_y, double *green_x, double *green_y, double *blue_x,
-    double *blue_y))
-PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *red_X, double *red_Y, double *red_Z,
-    double *green_X, double *green_Y, double *green_Z, double *blue_X,
-    double *blue_Y, double *blue_Z))
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_white_x, png_fixed_point *int_white_y,
-    png_fixed_point *int_red_x, png_fixed_point *int_red_y,
-    png_fixed_point *int_green_x, png_fixed_point *int_green_y,
-    png_fixed_point *int_blue_x, png_fixed_point *int_blue_y))
-PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z))
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr,
-    double white_x, double white_y, double red_x, double red_y, double green_x,
-    double green_y, double blue_x, double blue_y))
-PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double red_X, double red_Y, double red_Z,
-    double green_X, double green_Y, double green_Z, double blue_X,
-    double blue_Y, double blue_Z))
-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_white_x,
-    png_fixed_point int_white_y, png_fixed_point int_red_x,
-    png_fixed_point int_red_y, png_fixed_point int_green_x,
-    png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y))
-PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z))
-#endif
-
-#ifdef PNG_eXIf_SUPPORTED
-PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep *exif));
-PNG_EXPORT(247, void, png_set_eXIf, (png_const_structrp png_ptr,
-    png_inforp info_ptr, const png_bytep exif));
-
-PNG_EXPORT(248, png_uint_32, png_get_eXIf_1, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *num_exif, png_bytep *exif));
-PNG_EXPORT(249, void, png_set_eXIf_1, (png_const_structrp png_ptr,
-    png_inforp info_ptr, const png_uint_32 num_exif, const png_bytep exif));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, double *file_gamma))
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_file_gamma))
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_const_structrp png_ptr,
-    png_inforp info_ptr, double file_gamma))
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_fixed_point int_file_gamma))
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_16p *hist));
-PNG_EXPORT(142, void, png_set_hIST, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_uint_16p hist));
-#endif
-
-PNG_EXPORT(143, png_uint_32, png_get_IHDR, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *width, png_uint_32 *height,
-    int *bit_depth, int *color_type, int *interlace_method,
-    int *compression_method, int *filter_method));
-
-PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_method, int compression_method,
-    int filter_method));
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
-   png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
-   int *unit_type));
-#endif
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(146, void, png_set_oFFs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_int_32 offset_x, png_int_32 offset_y,
-    int unit_type));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(147, png_uint_32, png_get_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charp *purpose, png_int_32 *X0,
-    png_int_32 *X1, int *type, int *nparams, png_charp *units,
-    png_charpp *params));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp purpose, png_int_32 X0, png_int_32 X1,
-    int type, int nparams, png_const_charp units, png_charpp params));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(149, png_uint_32, png_get_pHYs, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(150, void, png_set_pHYs, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
-#endif
-
-PNG_EXPORT(151, png_uint_32, png_get_PLTE, (png_const_structrp png_ptr,
-   png_inforp info_ptr, png_colorp *palette, int *num_palette));
-
-PNG_EXPORT(152, void, png_set_PLTE, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_colorp palette, int num_palette));
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_color_8p *sig_bit));
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_color_8p sig_bit));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *file_srgb_intent));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int srgb_intent));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_charpp name, int *compression_type,
-    png_bytepp profile, png_uint_32 *proflen));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(159, void, png_set_iCCP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_charp name, int compression_type,
-    png_const_bytep profile, png_uint_32 proflen));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(160, int, png_get_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_sPLT_tpp entries));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries));
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_get_text also returns the number of text chunks in *num_text */
-PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_textp *text_ptr, int *num_text));
-#endif
-
-/* Note while png_set_text() will accept a structure whose text,
- * language, and  translated keywords are NULL pointers, the structure
- * returned by png_get_text will always contain regular
- * zero-terminated C strings.  They might be empty strings but
- * they will never be NULL pointers.
- */
-
-#ifdef PNG_TEXT_SUPPORTED
-PNG_EXPORT(163, void, png_set_text, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_textp text_ptr, int num_text));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(164, png_uint_32, png_get_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_timep *mod_time));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_timep mod_time));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans,
-    png_color_16p *trans_color));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(167, void, png_set_tRNS, (png_structrp png_ptr,
-    png_inforp info_ptr, png_const_bytep trans_alpha, int num_trans,
-    png_const_color_16p trans_color));
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, int *unit, double *width, double *height))
-#if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
-   defined(PNG_FLOATING_POINT_SUPPORTED)
-/* NOTE: this API is currently implemented using floating point arithmetic,
- * consequently it can only be used on systems with floating point support.
- * In any case the range of values supported by png_fixed_point is small and it
- * is highly recommended that png_get_sCAL_s be used instead.
- */
-PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_fixed_point *width, png_fixed_point *height))
-#endif
-PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
-    png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit, double width, double height))
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
-   png_inforp info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height))
-PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int unit,
-    png_const_charp swidth, png_const_charp sheight));
-#endif /* sCAL */
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-/* Provide the default handling for all unknown chunks or, optionally, for
- * specific unknown chunks.
- *
- * NOTE: prior to 1.6.0 the handling specified for particular chunks on read was
- * ignored and the default was used, the per-chunk setting only had an effect on
- * write.  If you wish to have chunk-specific handling on read in code that must
- * work on earlier versions you must use a user chunk callback to specify the
- * desired handling (keep or discard.)
- *
- * The 'keep' parameter is a PNG_HANDLE_CHUNK_ value as listed below.  The
- * parameter is interpreted as follows:
- *
- * READ:
- *    PNG_HANDLE_CHUNK_AS_DEFAULT:
- *       Known chunks: do normal libpng processing, do not keep the chunk (but
- *          see the comments below about PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
- *       Unknown chunks: for a specific chunk use the global default, when used
- *          as the default discard the chunk data.
- *    PNG_HANDLE_CHUNK_NEVER:
- *       Discard the chunk data.
- *    PNG_HANDLE_CHUNK_IF_SAFE:
- *       Keep the chunk data if the chunk is not critical else raise a chunk
- *       error.
- *    PNG_HANDLE_CHUNK_ALWAYS:
- *       Keep the chunk data.
- *
- * If the chunk data is saved it can be retrieved using png_get_unknown_chunks,
- * below.  Notice that specifying "AS_DEFAULT" as a global default is equivalent
- * to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks
- * it simply resets the behavior to the libpng default.
- *
- * INTERACTION WTIH USER CHUNK CALLBACKS:
- * The per-chunk handling is always used when there is a png_user_chunk_ptr
- * callback and the callback returns 0; the chunk is then always stored *unless*
- * it is critical and the per-chunk setting is other than ALWAYS.  Notice that
- * the global default is *not* used in this case.  (In effect the per-chunk
- * value is incremented to at least IF_SAFE.)
- *
- * IMPORTANT NOTE: this behavior will change in libpng 1.7 - the global and
- * per-chunk defaults will be honored.  If you want to preserve the current
- * behavior when your callback returns 0 you must set PNG_HANDLE_CHUNK_IF_SAFE
- * as the default - if you don't do this libpng 1.6 will issue a warning.
- *
- * If you want unhandled unknown chunks to be discarded in libpng 1.6 and
- * earlier simply return '1' (handled).
- *
- * PNG_HANDLE_AS_UNKNOWN_SUPPORTED:
- *    If this is *not* set known chunks will always be handled by libpng and
- *    will never be stored in the unknown chunk list.  Known chunks listed to
- *    png_set_keep_unknown_chunks will have no effect.  If it is set then known
- *    chunks listed with a keep other than AS_DEFAULT will *never* be processed
- *    by libpng, in addition critical chunks must either be processed by the
- *    callback or saved.
- *
- *    The IHDR and IEND chunks must not be listed.  Because this turns off the
- *    default handling for chunks that would otherwise be recognized the
- *    behavior of libpng transformations may well become incorrect!
- *
- * WRITE:
- *    When writing chunks the options only apply to the chunks specified by
- *    png_set_unknown_chunks (below), libpng will *always* write known chunks
- *    required by png_set_ calls and will always write the core critical chunks
- *    (as required for PLTE).
- *
- *    Each chunk in the png_set_unknown_chunks list is looked up in the
- *    png_set_keep_unknown_chunks list to find the keep setting, this is then
- *    interpreted as follows:
- *
- *    PNG_HANDLE_CHUNK_AS_DEFAULT:
- *       Write safe-to-copy chunks and write other chunks if the global
- *       default is set to _ALWAYS, otherwise don't write this chunk.
- *    PNG_HANDLE_CHUNK_NEVER:
- *       Do not write the chunk.
- *    PNG_HANDLE_CHUNK_IF_SAFE:
- *       Write the chunk if it is safe-to-copy, otherwise do not write it.
- *    PNG_HANDLE_CHUNK_ALWAYS:
- *       Write the chunk.
- *
- * Note that the default behavior is effectively the opposite of the read case -
- * in read unknown chunks are not stored by default, in write they are written
- * by default.  Also the behavior of PNG_HANDLE_CHUNK_IF_SAFE is very different
- * - on write the safe-to-copy bit is checked, on read the critical bit is
- * checked and on read if the chunk is critical an error will be raised.
- *
- * num_chunks:
- * ===========
- *    If num_chunks is positive, then the "keep" parameter specifies the manner
- *    for handling only those chunks appearing in the chunk_list array,
- *    otherwise the chunk list array is ignored.
- *
- *    If num_chunks is 0 the "keep" parameter specifies the default behavior for
- *    unknown chunks, as described above.
- *
- *    If num_chunks is negative, then the "keep" parameter specifies the manner
- *    for handling all unknown chunks plus all chunks recognized by libpng
- *    except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to
- *    be processed by libpng.
- */
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
-    int keep, png_const_bytep chunk_list, int num_chunks));
-#endif /* HANDLE_AS_UNKNOWN */
-
-/* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;
- * the result is therefore true (non-zero) if special handling is required,
- * false for the default handling.
- */
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
-    png_const_bytep chunk_name));
-#endif /* SET_UNKNOWN_CHUNKS */
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
-   /* NOTE: prior to 1.6.0 this routine set the 'location' field of the added
-    * unknowns to the location currently stored in the png_struct.  This is
-    * invariably the wrong value on write.  To fix this call the following API
-    * for each chunk in the list with the correct location.  If you know your
-    * code won't be compiled on earlier versions you can rely on
-    * png_set_unknown_chunks(write-ptr, png_get_unknown_chunks(read-ptr)) doing
-    * the correct thing.
-    */
-
-PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_const_structrp png_ptr, png_inforp info_ptr, int chunk, int location));
-
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_unknown_chunkpp entries));
-#endif
-
-/* Png_free_data() will turn off the "valid" flag for anything it frees.
- * If you need to turn it off for a chunk that your application has freed,
- * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
- */
-PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr,
-    png_inforp info_ptr, int mask));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* The "params" pointer is currently not used and is for future expansion. */
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, png_voidp params));
-#endif
-#ifdef PNG_WRITE_SUPPORTED
-PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, png_voidp params));
-#endif
-#endif
-
-PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structrp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,
-    png_uint_32 mng_features_permitted));
-#endif
-
-/* For use in png_set_keep_unknown, added to version 1.2.6 */
-#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
-#define PNG_HANDLE_CHUNK_NEVER        1
-#define PNG_HANDLE_CHUNK_IF_SAFE      2
-#define PNG_HANDLE_CHUNK_ALWAYS       3
-#define PNG_HANDLE_CHUNK_LAST         4
-
-/* Strip the prepended error numbers ("#nnn ") from error and warning
- * messages before passing them to the error or warning handler.
- */
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-PNG_EXPORT(185, void, png_set_strip_error_numbers, (png_structrp png_ptr,
-    png_uint_32 strip_mode));
-#endif
-
-/* Added in libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-PNG_EXPORT(186, void, png_set_user_limits, (png_structrp png_ptr,
-    png_uint_32 user_width_max, png_uint_32 user_height_max));
-PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-    (png_const_structrp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structrp png_ptr));
-/* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structrp png_ptr,
-    png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structrp png_ptr));
-/* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structrp png_ptr,
-    png_alloc_size_t user_chunk_cache_max));
-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structrp png_ptr));
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr));
-
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#endif
-
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr))
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_const_structrp png_ptr, png_const_inforp info_ptr))
-#endif
-
-#  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
-    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#  endif /* pHYs */
-#endif  /* INCH_CONVERSIONS */
-
-/* Added in libpng-1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_const_structrp png_ptr));
-
-/* Removed from libpng 1.6; use png_get_io_chunk_type. */
-PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name, (png_structrp png_ptr),
-    PNG_DEPRECATED)
-
-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structrp png_ptr));
-
-/* The flags returned by png_get_io_state() are the following: */
-#  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
-#  define PNG_IO_READING     0x0001   /* currently reading */
-#  define PNG_IO_WRITING     0x0002   /* currently writing */
-#  define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */
-#  define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */
-#  define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */
-#  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */
-#  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */
-#  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */
-#endif /* IO_STATE */
-
-/* Interlace support.  The following macros are always defined so that if
- * libpng interlace handling is turned off the macros may be used to handle
- * interlaced images within the application.
- */
-#define PNG_INTERLACE_ADAM7_PASSES 7
-
-/* Two macros to return the first row and first column of the original,
- * full, image which appears in a given pass.  'pass' is in the range 0
- * to 6 and the result is in the range 0 to 7.
- */
-#define PNG_PASS_START_ROW(pass) (((1&~(pass))<<(3-((pass)>>1)))&7)
-#define PNG_PASS_START_COL(pass) (((1& (pass))<<(3-(((pass)+1)>>1)))&7)
-
-/* A macro to return the offset between pixels in the output row for a pair of
- * pixels in the input - effectively the inverse of the 'COL_SHIFT' macro that
- * follows.  Note that ROW_OFFSET is the offset from one row to the next whereas
- * COL_OFFSET is from one column to the next, within a row.
- */
-#define PNG_PASS_ROW_OFFSET(pass) ((pass)>2?(8>>(((pass)-1)>>1)):8)
-#define PNG_PASS_COL_OFFSET(pass) (1<<((7-(pass))>>1))
-
-/* Two macros to help evaluate the number of rows or columns in each
- * pass.  This is expressed as a shift - effectively log2 of the number or
- * rows or columns in each 8x8 tile of the original image.
- */
-#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3)
-#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3)
-
-/* Hence two macros to determine the number of rows or columns in a given
- * pass of an image given its height or width.  In fact these macros may
- * return non-zero even though the sub-image is empty, because the other
- * dimension may be empty for a small image.
- */
-#define PNG_PASS_ROWS(height, pass) (((height)+(((1<<PNG_PASS_ROW_SHIFT(pass))\
-   -1)-PNG_PASS_START_ROW(pass)))>>PNG_PASS_ROW_SHIFT(pass))
-#define PNG_PASS_COLS(width, pass) (((width)+(((1<<PNG_PASS_COL_SHIFT(pass))\
-   -1)-PNG_PASS_START_COL(pass)))>>PNG_PASS_COL_SHIFT(pass))
-
-/* For the reader row callbacks (both progressive and sequential) it is
- * necessary to find the row in the output image given a row in an interlaced
- * image, so two more macros:
- */
-#define PNG_ROW_FROM_PASS_ROW(y_in, pass) \
-   (((y_in)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(x_in, pass) \
-   (((x_in)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
-
-/* Two macros which return a boolean (0 or 1) saying whether the given row
- * or column is in a particular pass.  These use a common utility macro that
- * returns a mask for a given pass - the offset 'off' selects the row or
- * column version.  The mask has the appropriate bit set for each column in
- * the tile.
- */
-#define PNG_PASS_MASK(pass,off) ( \
-   ((0x110145AF>>(((7-(off))-(pass))<<2)) & 0xF) | \
-   ((0x01145AF0>>(((7-(off))-(pass))<<2)) & 0xF0))
-
-#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \
-   ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1)
-#define PNG_COL_IN_INTERLACE_PASS(x, pass) \
-   ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1)
-
-#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
-/* With these routines we avoid an integer divide, which will be slower on
- * most machines.  However, it does take more operations than the corresponding
- * divide method, so it may be slower on a few RISC systems.  There are two
- * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
- *
- * Note that the rounding factors are NOT supposed to be the same!  128 and
- * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
- * standard method.
- *
- * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
- */
-
- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
-
-#  define png_composite(composite, fg, alpha, bg)        \
-   {                                                     \
-      png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
-          * (png_uint_16)(alpha)                         \
-          + (png_uint_16)(bg)*(png_uint_16)(255          \
-          - (png_uint_16)(alpha)) + 128);                \
-      (composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); \
-   }
-
-#  define png_composite_16(composite, fg, alpha, bg)     \
-   {                                                     \
-      png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \
-          * (png_uint_32)(alpha)                         \
-          + (png_uint_32)(bg)*(65535                     \
-          - (png_uint_32)(alpha)) + 32768);              \
-      (composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); \
-   }
-
-#else  /* Standard method using integer division */
-
-#  define png_composite(composite, fg, alpha, bg)                      \
-   (composite) =                                                       \
-       (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
-       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
-       127) / 255))
-
-#  define png_composite_16(composite, fg, alpha, bg)                       \
-   (composite) =                                                           \
-       (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-       (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +     \
-       32767) / 65535))
-#endif /* READ_COMPOSITE_NODIV */
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
-PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
-PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
-#endif
-
-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_const_structrp png_ptr,
-    png_const_bytep buf));
-/* No png_get_int_16 -- may be added if there's a real need for it. */
-
-/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));
-#endif
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));
-#endif
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
-/* No png_save_int_16 -- may be added if there's a real need for it. */
-#endif
-
-#ifdef PNG_USE_READ_MACROS
-/* Inline macros to do direct reads of bytes from the input buffer.
- * The png_get_int_32() routine assumes we are using two's complement
- * format for negative values, which is almost certainly true.
- */
-#  define PNG_get_uint_32(buf) \
-   (((png_uint_32)(*(buf)) << 24) + \
-    ((png_uint_32)(*((buf) + 1)) << 16) + \
-    ((png_uint_32)(*((buf) + 2)) << 8) + \
-    ((png_uint_32)(*((buf) + 3))))
-
-   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
-    * function) incorrectly returned a value of type png_uint_32.
-    */
-#  define PNG_get_uint_16(buf) \
-   ((png_uint_16) \
-    (((unsigned int)(*(buf)) << 8) + \
-    ((unsigned int)(*((buf) + 1)))))
-
-#  define PNG_get_int_32(buf) \
-   ((png_int_32)((*(buf) & 0x80) \
-    ? -((png_int_32)(((png_get_uint_32(buf)^0xffffffffU)+1U)&0x7fffffffU)) \
-    : (png_int_32)png_get_uint_32(buf)))
-
-/* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
- * but defining a macro name prefixed with PNG_PREFIX.
- */
-#  ifndef PNG_PREFIX
-#    define png_get_uint_32(buf) PNG_get_uint_32(buf)
-#    define png_get_uint_16(buf) PNG_get_uint_16(buf)
-#    define png_get_int_32(buf)  PNG_get_int_32(buf)
-#  endif
-#else
-#  ifdef PNG_PREFIX
-   /* No macros; revert to the (redefined) function */
-#    define PNG_get_uint_32 (png_get_uint_32)
-#    define PNG_get_uint_16 (png_get_uint_16)
-#    define PNG_get_int_32  (png_get_int_32)
-#  endif
-#endif
-
-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-PNG_EXPORT(242, void, png_set_check_for_invalid_index,
-    (png_structrp png_ptr, int allowed));
-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-#  endif
-#endif /* CHECK_FOR_INVALID_INDEX */
-
-/*******************************************************************************
- * Section 5: SIMPLIFIED API
- *******************************************************************************
- *
- * Please read the documentation in libpng-manual.txt (TODO: write said
- * documentation) if you don't understand what follows.
- *
- * The simplified API hides the details of both libpng and the PNG file format
- * itself.  It allows PNG files to be read into a very limited number of
- * in-memory bitmap formats or to be written from the same formats.  If these
- * formats do not accomodate your needs then you can, and should, use the more
- * sophisticated APIs above - these support a wide variety of in-memory formats
- * and a wide variety of sophisticated transformations to those formats as well
- * as a wide variety of APIs to manipulate ancillary information.
- *
- * To read a PNG file using the simplified API:
- *
- * 1) Declare a 'png_image' structure (see below) on the stack, set the
- *    version field to PNG_IMAGE_VERSION and the 'opaque' pointer to NULL
- *    (this is REQUIRED, your program may crash if you don't do it.)
- * 2) Call the appropriate png_image_begin_read... function.
- * 3) Set the png_image 'format' member to the required sample format.
- * 4) Allocate a buffer for the image and, if required, the color-map.
- * 5) Call png_image_finish_read to read the image and, if required, the
- *    color-map into your buffers.
- *
- * There are no restrictions on the format of the PNG input itself; all valid
- * color types, bit depths, and interlace methods are acceptable, and the
- * input image is transformed as necessary to the requested in-memory format
- * during the png_image_finish_read() step.  The only caveat is that if you
- * request a color-mapped image from a PNG that is full-color or makes
- * complex use of an alpha channel the transformation is extremely lossy and the
- * result may look terrible.
- *
- * To write a PNG file using the simplified API:
- *
- * 1) Declare a 'png_image' structure on the stack and memset() it to all zero.
- * 2) Initialize the members of the structure that describe the image, setting
- *    the 'format' member to the format of the image samples.
- * 3) Call the appropriate png_image_write... function with a pointer to the
- *    image and, if necessary, the color-map to write the PNG data.
- *
- * png_image is a structure that describes the in-memory format of an image
- * when it is being read or defines the in-memory format of an image that you
- * need to write:
- */
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \
-    defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-
-#define PNG_IMAGE_VERSION 1
-
-typedef struct png_control *png_controlp;
-typedef struct
-{
-   png_controlp opaque;    /* Initialize to NULL, free with png_image_free */
-   png_uint_32  version;   /* Set to PNG_IMAGE_VERSION */
-   png_uint_32  width;     /* Image width in pixels (columns) */
-   png_uint_32  height;    /* Image height in pixels (rows) */
-   png_uint_32  format;    /* Image format as defined below */
-   png_uint_32  flags;     /* A bit mask containing informational flags */
-   png_uint_32  colormap_entries;
-                           /* Number of entries in the color-map */
-
-   /* In the event of an error or warning the following field will be set to a
-    * non-zero value and the 'message' field will contain a '\0' terminated
-    * string with the libpng error or warning message.  If both warnings and
-    * an error were encountered, only the error is recorded.  If there
-    * are multiple warnings, only the first one is recorded.
-    *
-    * The upper 30 bits of this value are reserved, the low two bits contain
-    * a value as follows:
-    */
-#  define PNG_IMAGE_WARNING 1
-#  define PNG_IMAGE_ERROR 2
-   /*
-    * The result is a two-bit code such that a value more than 1 indicates
-    * a failure in the API just called:
-    *
-    *    0 - no warning or error
-    *    1 - warning
-    *    2 - error
-    *    3 - error preceded by warning
-    */
-#  define PNG_IMAGE_FAILED(png_cntrl) ((((png_cntrl).warning_or_error)&0x03)>1)
-
-   png_uint_32  warning_or_error;
-
-   char         message[64];
-} png_image, *png_imagep;
-
-/* The samples of the image have one to four channels whose components have
- * original values in the range 0 to 1.0:
- *
- * 1: A single gray or luminance channel (G).
- * 2: A gray/luminance channel and an alpha channel (GA).
- * 3: Three red, green, blue color channels (RGB).
- * 4: Three color channels and an alpha channel (RGBA).
- *
- * The components are encoded in one of two ways:
- *
- * a) As a small integer, value 0..255, contained in a single byte.  For the
- * alpha channel the original value is simply value/255.  For the color or
- * luminance channels the value is encoded according to the sRGB specification
- * and matches the 8-bit format expected by typical display devices.
- *
- * The color/gray channels are not scaled (pre-multiplied) by the alpha
- * channel and are suitable for passing to color management software.
- *
- * b) As a value in the range 0..65535, contained in a 2-byte integer.  All
- * channels can be converted to the original value by dividing by 65535; all
- * channels are linear.  Color channels use the RGB encoding (RGB end-points) of
- * the sRGB specification.  This encoding is identified by the
- * PNG_FORMAT_FLAG_LINEAR flag below.
- *
- * When the simplified API needs to convert between sRGB and linear colorspaces,
- * the actual sRGB transfer curve defined in the sRGB specification (see the
- * article at https://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2
- * approximation used elsewhere in libpng.
- *
- * When an alpha channel is present it is expected to denote pixel coverage
- * of the color or luminance channels and is returned as an associated alpha
- * channel: the color/gray channels are scaled (pre-multiplied) by the alpha
- * value.
- *
- * The samples are either contained directly in the image data, between 1 and 8
- * bytes per pixel according to the encoding, or are held in a color-map indexed
- * by bytes in the image data.  In the case of a color-map the color-map entries
- * are individual samples, encoded as above, and the image data has one byte per
- * pixel to select the relevant sample from the color-map.
- */
-
-/* PNG_FORMAT_*
- *
- * #defines to be used in png_image::format.  Each #define identifies a
- * particular layout of sample data and, if present, alpha values.  There are
- * separate defines for each of the two component encodings.
- *
- * A format is built up using single bit flag values.  All combinations are
- * valid.  Formats can be built up from the flag values or you can use one of
- * the predefined values below.  When testing formats always use the FORMAT_FLAG
- * macros to test for individual features - future versions of the library may
- * add new flags.
- *
- * When reading or writing color-mapped images the format should be set to the
- * format of the entries in the color-map then png_image_{read,write}_colormap
- * called to read or write the color-map and set the format correctly for the
- * image data.  Do not set the PNG_FORMAT_FLAG_COLORMAP bit directly!
- *
- * NOTE: libpng can be built with particular features disabled. If you see
- * compiler errors because the definition of one of the following flags has been
- * compiled out it is because libpng does not have the required support.  It is
- * possible, however, for the libpng configuration to enable the format on just
- * read or just write; in that case you may see an error at run time.  You can
- * guard against this by checking for the definition of the appropriate
- * "_SUPPORTED" macro, one of:
- *
- *    PNG_SIMPLIFIED_{READ,WRITE}_{BGR,AFIRST}_SUPPORTED
- */
-#define PNG_FORMAT_FLAG_ALPHA    0x01U /* format with an alpha channel */
-#define PNG_FORMAT_FLAG_COLOR    0x02U /* color format: otherwise grayscale */
-#define PNG_FORMAT_FLAG_LINEAR   0x04U /* 2-byte channels else 1-byte */
-#define PNG_FORMAT_FLAG_COLORMAP 0x08U /* image data is color-mapped */
-
-#ifdef PNG_FORMAT_BGR_SUPPORTED
-#  define PNG_FORMAT_FLAG_BGR    0x10U /* BGR colors, else order is RGB */
-#endif
-
-#ifdef PNG_FORMAT_AFIRST_SUPPORTED
-#  define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */
-#endif
-
-#define PNG_FORMAT_FLAG_ASSOCIATED_ALPHA 0x40U /* alpha channel is associated */
-
-/* Commonly used formats have predefined macros.
- *
- * First the single byte (sRGB) formats:
- */
-#define PNG_FORMAT_GRAY 0
-#define PNG_FORMAT_GA   PNG_FORMAT_FLAG_ALPHA
-#define PNG_FORMAT_AG   (PNG_FORMAT_GA|PNG_FORMAT_FLAG_AFIRST)
-#define PNG_FORMAT_RGB  PNG_FORMAT_FLAG_COLOR
-#define PNG_FORMAT_BGR  (PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_BGR)
-#define PNG_FORMAT_RGBA (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_ARGB (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_AFIRST)
-#define PNG_FORMAT_BGRA (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_ABGR (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_AFIRST)
-
-/* Then the linear 2-byte formats.  When naming these "Y" is used to
- * indicate a luminance (gray) channel.
- */
-#define PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR
-#define PNG_FORMAT_LINEAR_Y_ALPHA (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_ALPHA)
-#define PNG_FORMAT_LINEAR_RGB (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR)
-#define PNG_FORMAT_LINEAR_RGB_ALPHA \
-   (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA)
-
-/* With color-mapped formats the image data is one byte for each pixel, the byte
- * is an index into the color-map which is formatted as above.  To obtain a
- * color-mapped format it is sufficient just to add the PNG_FOMAT_FLAG_COLORMAP
- * to one of the above definitions, or you can use one of the definitions below.
- */
-#define PNG_FORMAT_RGB_COLORMAP  (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_BGR_COLORMAP  (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_RGBA_COLORMAP (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_ARGB_COLORMAP (PNG_FORMAT_ARGB|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_BGRA_COLORMAP (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_COLORMAP)
-#define PNG_FORMAT_ABGR_COLORMAP (PNG_FORMAT_ABGR|PNG_FORMAT_FLAG_COLORMAP)
-
-/* PNG_IMAGE macros
- *
- * These are convenience macros to derive information from a png_image
- * structure.  The PNG_IMAGE_SAMPLE_ macros return values appropriate to the
- * actual image sample values - either the entries in the color-map or the
- * pixels in the image.  The PNG_IMAGE_PIXEL_ macros return corresponding values
- * for the pixels and will always return 1 for color-mapped formats.  The
- * remaining macros return information about the rows in the image and the
- * complete image.
- *
- * NOTE: All the macros that take a png_image::format parameter are compile time
- * constants if the format parameter is, itself, a constant.  Therefore these
- * macros can be used in array declarations and case labels where required.
- * Similarly the macros are also pre-processor constants (sizeof is not used) so
- * they can be used in #if tests.
- *
- * First the information about the samples.
- */
-#define PNG_IMAGE_SAMPLE_CHANNELS(fmt)\
-   (((fmt)&(PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA))+1)
-   /* Return the total number of channels in a given format: 1..4 */
-
-#define PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt)\
-   ((((fmt) & PNG_FORMAT_FLAG_LINEAR) >> 2)+1)
-   /* Return the size in bytes of a single component of a pixel or color-map
-    * entry (as appropriate) in the image: 1 or 2.
-    */
-
-#define PNG_IMAGE_SAMPLE_SIZE(fmt)\
-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt))
-   /* This is the size of the sample data for one sample.  If the image is
-    * color-mapped it is the size of one color-map entry (and image pixels are
-    * one byte in size), otherwise it is the size of one image pixel.
-    */
-
-#define PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(fmt)\
-   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * 256)
-   /* The maximum size of the color-map required by the format expressed in a
-    * count of components.  This can be used to compile-time allocate a
-    * color-map:
-    *
-    * png_uint_16 colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(linear_fmt)];
-    *
-    * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)];
-    *
-    * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the
-    * information from one of the png_image_begin_read_ APIs and dynamically
-    * allocate the required memory.
-    */
-
-/* Corresponding information about the pixels */
-#define PNG_IMAGE_PIXEL_(test,fmt)\
-   (((fmt)&PNG_FORMAT_FLAG_COLORMAP)?1:test(fmt))
-
-#define PNG_IMAGE_PIXEL_CHANNELS(fmt)\
-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_CHANNELS,fmt)
-   /* The number of separate channels (components) in a pixel; 1 for a
-    * color-mapped image.
-    */
-
-#define PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)\
-   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_COMPONENT_SIZE,fmt)
-   /* The size, in bytes, of each component in a pixel; 1 for a color-mapped
-    * image.
-    */
-
-#define PNG_IMAGE_PIXEL_SIZE(fmt) PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_SIZE,fmt)
-   /* The size, in bytes, of a complete pixel; 1 for a color-mapped image. */
-
-/* Information about the whole row, or whole image */
-#define PNG_IMAGE_ROW_STRIDE(image)\
-   (PNG_IMAGE_PIXEL_CHANNELS((image).format) * (image).width)
-   /* Return the total number of components in a single row of the image; this
-    * is the minimum 'row stride', the minimum count of components between each
-    * row.  For a color-mapped image this is the minimum number of bytes in a
-    * row.
-    *
-    * WARNING: this macro overflows for some images with more than one component
-    * and very large image widths.  libpng will refuse to process an image where
-    * this macro would overflow.
-    */
-
-#define PNG_IMAGE_BUFFER_SIZE(image, row_stride)\
-   (PNG_IMAGE_PIXEL_COMPONENT_SIZE((image).format)*(image).height*(row_stride))
-   /* Return the size, in bytes, of an image buffer given a png_image and a row
-    * stride - the number of components to leave space for in each row.
-    *
-    * WARNING: this macro overflows a 32-bit integer for some large PNG images,
-    * libpng will refuse to process an image where such an overflow would occur.
-    */
-
-#define PNG_IMAGE_SIZE(image)\
-   PNG_IMAGE_BUFFER_SIZE(image, PNG_IMAGE_ROW_STRIDE(image))
-   /* Return the size, in bytes, of the image in memory given just a png_image;
-    * the row stride is the minimum stride required for the image.
-    */
-
-#define PNG_IMAGE_COLORMAP_SIZE(image)\
-   (PNG_IMAGE_SAMPLE_SIZE((image).format) * (image).colormap_entries)
-   /* Return the size, in bytes, of the color-map of this image.  If the image
-    * format is not a color-map format this will return a size sufficient for
-    * 256 entries in the given format; check PNG_FORMAT_FLAG_COLORMAP if
-    * you don't want to allocate a color-map in this case.
-    */
-
-/* PNG_IMAGE_FLAG_*
- *
- * Flags containing additional information about the image are held in the
- * 'flags' field of png_image.
- */
-#define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01
-   /* This indicates the the RGB values of the in-memory bitmap do not
-    * correspond to the red, green and blue end-points defined by sRGB.
-    */
-
-#define PNG_IMAGE_FLAG_FAST 0x02
-   /* On write emphasise speed over compression; the resultant PNG file will be
-    * larger but will be produced significantly faster, particular for large
-    * images.  Do not use this option for images which will be distributed, only
-    * used it when producing intermediate files that will be read back in
-    * repeatedly.  For a typical 24-bit image the option will double the read
-    * speed at the cost of increasing the image size by 25%, however for many
-    * more compressible images the PNG file can be 10 times larger with only a
-    * slight speed gain.
-    */
-
-#define PNG_IMAGE_FLAG_16BIT_sRGB 0x04
-   /* On read if the image is a 16-bit per component image and there is no gAMA
-    * or sRGB chunk assume that the components are sRGB encoded.  Notice that
-    * images output by the simplified API always have gamma information; setting
-    * this flag only affects the interpretation of 16-bit images from an
-    * external source.  It is recommended that the application expose this flag
-    * to the user; the user can normally easily recognize the difference between
-    * linear and sRGB encoding.  This flag has no effect on write - the data
-    * passed to the write APIs must have the correct encoding (as defined
-    * above.)
-    *
-    * If the flag is not set (the default) input 16-bit per component data is
-    * assumed to be linear.
-    *
-    * NOTE: the flag can only be set after the png_image_begin_read_ call,
-    * because that call initializes the 'flags' field.
-    */
-
-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-/* READ APIs
- * ---------
- *
- * The png_image passed to the read APIs must have been initialized by setting
- * the png_controlp field 'opaque' to NULL (or, safer, memset the whole thing.)
- */
-#ifdef PNG_STDIO_SUPPORTED
-PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
-   const char *file_name));
-   /* The named file is opened for read and the image header is filled in
-    * from the PNG header in the file.
-    */
-
-PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
-   FILE* file));
-   /* The PNG header is read from the stdio FILE object. */
-#endif /* STDIO */
-
-PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
-   png_const_voidp memory, png_size_t size));
-   /* The PNG header is read from the given memory buffer. */
-
-PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
-   png_const_colorp background, void *buffer, png_int_32 row_stride,
-   void *colormap));
-   /* Finish reading the image into the supplied buffer and clean up the
-    * png_image structure.
-    *
-    * row_stride is the step, in byte or 2-byte units as appropriate,
-    * between adjacent rows.  A positive stride indicates that the top-most row
-    * is first in the buffer - the normal top-down arrangement.  A negative
-    * stride indicates that the bottom-most row is first in the buffer.
-    *
-    * background need only be supplied if an alpha channel must be removed from
-    * a png_byte format and the removal is to be done by compositing on a solid
-    * color; otherwise it may be NULL and any composition will be done directly
-    * onto the buffer.  The value is an sRGB color to use for the background,
-    * for grayscale output the green channel is used.
-    *
-    * background must be supplied when an alpha channel must be removed from a
-    * single byte color-mapped output format, in other words if:
-    *
-    * 1) The original format from png_image_begin_read_from_* had
-    *    PNG_FORMAT_FLAG_ALPHA set.
-    * 2) The format set by the application does not.
-    * 3) The format set by the application has PNG_FORMAT_FLAG_COLORMAP set and
-    *    PNG_FORMAT_FLAG_LINEAR *not* set.
-    *
-    * For linear output removing the alpha channel is always done by compositing
-    * on black and background is ignored.
-    *
-    * colormap must be supplied when PNG_FORMAT_FLAG_COLORMAP is set.  It must
-    * be at least the size (in bytes) returned by PNG_IMAGE_COLORMAP_SIZE.
-    * image->colormap_entries will be updated to the actual number of entries
-    * written to the colormap; this may be less than the original value.
-    */
-
-PNG_EXPORT(238, void, png_image_free, (png_imagep image));
-   /* Free any data allocated by libpng in image->opaque, setting the pointer to
-    * NULL.  May be called at any time after the structure is initialized.
-    */
-#endif /* SIMPLIFIED_READ */
-
-#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-/* WRITE APIS
- * ----------
- * For write you must initialize a png_image structure to describe the image to
- * be written.  To do this use memset to set the whole structure to 0 then
- * initialize fields describing your image.
- *
- * version: must be set to PNG_IMAGE_VERSION
- * opaque: must be initialized to NULL
- * width: image width in pixels
- * height: image height in rows
- * format: the format of the data (image and color-map) you wish to write
- * flags: set to 0 unless one of the defined flags applies; set
- *    PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB for color format images where the RGB
- *    values do not correspond to the colors in sRGB.
- * colormap_entries: set to the number of entries in the color-map (0 to 256)
- */
-#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
-   const char *file, int convert_to_8bit, const void *buffer,
-   png_int_32 row_stride, const void *colormap));
-   /* Write the image to the named file. */
-
-PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
-   int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
-   const void *colormap));
-   /* Write the image to the given (FILE*). */
-#endif /* SIMPLIFIED_WRITE_STDIO */
-
-/* With all write APIs if image is in one of the linear formats with 16-bit
- * data then setting convert_to_8_bit will cause the output to be an 8-bit PNG
- * gamma encoded according to the sRGB specification, otherwise a 16-bit linear
- * encoded PNG file is written.
- *
- * With color-mapped data formats the colormap parameter point to a color-map
- * with at least image->colormap_entries encoded in the specified format.  If
- * the format is linear the written PNG color-map will be converted to sRGB
- * regardless of the convert_to_8_bit flag.
- *
- * With all APIs row_stride is handled as in the read APIs - it is the spacing
- * from one row to the next in component sized units (1 or 2 bytes) and if
- * negative indicates a bottom-up row layout in the buffer.  If row_stride is
- * zero, libpng will calculate it for you from the image width and number of
- * channels.
- *
- * Note that the write API does not support interlacing, sub-8-bit pixels or
- * most ancillary chunks.  If you need to write text chunks (e.g. for copyright
- * notices) you need to use one of the other APIs.
- */
-
-PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
-   png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8_bit,
-   const void *buffer, png_int_32 row_stride, const void *colormap));
-   /* Write the image to the given memory buffer.  The function both writes the
-    * whole PNG data stream to *memory and updates *memory_bytes with the count
-    * of bytes written.
-    *
-    * 'memory' may be NULL.  In this case *memory_bytes is not read however on
-    * success the number of bytes which would have been written will still be
-    * stored in *memory_bytes.  On failure *memory_bytes will contain 0.
-    *
-    * If 'memory' is not NULL it must point to memory[*memory_bytes] of
-    * writeable memory.
-    *
-    * If the function returns success memory[*memory_bytes] (if 'memory' is not
-    * NULL) contains the written PNG data.  *memory_bytes will always be less
-    * than or equal to the original value.
-    *
-    * If the function returns false and *memory_bytes was not changed an error
-    * occured during write.  If *memory_bytes was changed, or is not 0 if
-    * 'memory' was NULL, the write would have succeeded but for the memory
-    * buffer being too small.  *memory_bytes contains the required number of
-    * bytes and will be bigger that the original value.
-    */
-
-#define png_image_write_get_memory_size(image, size, convert_to_8_bit, buffer,\
-   row_stride, colormap)\
-   png_image_write_to_memory(&(image), 0, &(size), convert_to_8_bit, buffer,\
-         row_stride, colormap)
-   /* Return the amount of memory in 'size' required to compress this image.
-    * The png_image structure 'image' must be filled in as in the above
-    * function and must not be changed before the actual write call, the buffer
-    * and all other parameters must also be identical to that in the final
-    * write call.  The 'size' variable need not be initialized.
-    *
-    * NOTE: the macro returns true/false, if false is returned 'size' will be
-    * set to zero and the write failed and probably will fail if tried again.
-    */
-
-/* You can pre-allocate the buffer by making sure it is of sufficient size
- * regardless of the amount of compression achieved.  The buffer size will
- * always be bigger than the original image and it will never be filled.  The
- * following macros are provided to assist in allocating the buffer.
- */
-#define PNG_IMAGE_DATA_SIZE(image) (PNG_IMAGE_SIZE(image)+(image).height)
-   /* The number of uncompressed bytes in the PNG byte encoding of the image;
-    * uncompressing the PNG IDAT data will give this number of bytes.
-    *
-    * NOTE: while PNG_IMAGE_SIZE cannot overflow for an image in memory this
-    * macro can because of the extra bytes used in the PNG byte encoding.  You
-    * need to avoid this macro if your image size approaches 2^30 in width or
-    * height.  The same goes for the remainder of these macros; they all produce
-    * bigger numbers than the actual in-memory image size.
-    */
-#ifndef PNG_ZLIB_MAX_SIZE
-#  define PNG_ZLIB_MAX_SIZE(b) ((b)+(((b)+7U)>>3)+(((b)+63U)>>6)+11U)
-   /* An upper bound on the number of compressed bytes given 'b' uncompressed
-    * bytes.  This is based on deflateBounds() in zlib; different
-    * implementations of zlib compression may conceivably produce more data so
-    * if your zlib implementation is not zlib itself redefine this macro
-    * appropriately.
-    */
-#endif
-
-#define PNG_IMAGE_COMPRESSED_SIZE_MAX(image)\
-   PNG_ZLIB_MAX_SIZE((png_alloc_size_t)PNG_IMAGE_DATA_SIZE(image))
-   /* An upper bound on the size of the data in the PNG IDAT chunks. */
-
-#define PNG_IMAGE_PNG_SIZE_MAX_(image, image_size)\
-   ((8U/*sig*/+25U/*IHDR*/+16U/*gAMA*/+44U/*cHRM*/+12U/*IEND*/+\
-    (((image).format&PNG_FORMAT_FLAG_COLORMAP)?/*colormap: PLTE, tRNS*/\
-    12U+3U*(image).colormap_entries/*PLTE data*/+\
-    (((image).format&PNG_FORMAT_FLAG_ALPHA)?\
-    12U/*tRNS*/+(image).colormap_entries:0U):0U)+\
-    12U)+(12U*((image_size)/PNG_ZBUF_SIZE))/*IDAT*/+(image_size))
-   /* A helper for the following macro; if your compiler cannot handle the
-    * following macro use this one with the result of
-    * PNG_IMAGE_COMPRESSED_SIZE_MAX(image) as the second argument (most
-    * compilers should handle this just fine.)
-    */
-
-#define PNG_IMAGE_PNG_SIZE_MAX(image)\
-   PNG_IMAGE_PNG_SIZE_MAX_(image, PNG_IMAGE_COMPRESSED_SIZE_MAX(image))
-   /* An upper bound on the total length of the PNG data stream for 'image'.
-    * The result is of type png_alloc_size_t, on 32-bit systems this may
-    * overflow even though PNG_IMAGE_DATA_SIZE does not overflow; the write will
-    * run out of buffer space but return a corrected size which should work.
-    */
-#endif /* SIMPLIFIED_WRITE */
-/*******************************************************************************
- *  END OF SIMPLIFIED API
- ******************************************************************************/
-#endif /* SIMPLIFIED_{READ|WRITE} */
-
-/*******************************************************************************
- * Section 6: IMPLEMENTATION OPTIONS
- *******************************************************************************
- *
- * Support for arbitrary implementation-specific optimizations.  The API allows
- * particular options to be turned on or off.  'Option' is the number of the
- * option and 'onoff' is 0 (off) or non-0 (on).  The value returned is given
- * by the PNG_OPTION_ defines below.
- *
- * HARDWARE: normally hardware capabilites, such as the Intel SSE instructions,
- *           are detected at run time, however sometimes it may be impossible
- *           to do this in user mode, in which case it is necessary to discover
- *           the capabilities in an OS specific way.  Such capabilities are
- *           listed here when libpng has support for them and must be turned
- *           ON by the application if present.
- *
- * SOFTWARE: sometimes software optimizations actually result in performance
- *           decrease on some architectures or systems, or with some sets of
- *           PNG images.  'Software' options allow such optimizations to be
- *           selected at run time.
- */
-#ifdef PNG_SET_OPTION_SUPPORTED
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-#  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
-#endif
-#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
-#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
-#ifdef PNG_MIPS_MSA_API_SUPPORTED
-#  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
-#endif
-#define PNG_IGNORE_ADLER32 8
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
-#  define PNG_POWERPC_VSX   10 /* HARDWARE: PowerPC VSX SIMD instructions supported */
-#endif
-#define PNG_OPTION_NEXT  12 /* Next option - numbers must be even */
-
-/* Return values: NOTE: there are four values and 'off' is *not* zero */
-#define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
-#define PNG_OPTION_INVALID 1 /* Option number out of range */
-#define PNG_OPTION_OFF     2
-#define PNG_OPTION_ON      3
-
-PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
-   int onoff));
-#endif /* SET_OPTION */
-
-/*******************************************************************************
- *  END OF HARDWARE AND SOFTWARE OPTIONS
- ******************************************************************************/
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
- * defs, and in scripts/symbols.def.
- */
-
-/* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)
- */
-#ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(249);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* Do not put anything past this line */
-#endif /* PNG_H */
diff --git a/src/png/libpng/pngconf.h b/src/png/libpng/pngconf.h
deleted file mode 100644
index d13b13e57..000000000
--- a/src/png/libpng/pngconf.h
+++ /dev/null
@@ -1,622 +0,0 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.6.34, September 29, 2017
- *
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * Any machine specific code is near the front of this file, so if you
- * are configuring libpng for a machine, you may want to read the section
- * starting here down to where it starts to typedef png_color, png_text,
- * and png_info.
- */
-
-#ifndef PNGCONF_H
-#define PNGCONF_H
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
-
-/* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C
- * compiler for correct compilation.  The following header files are required by
- * the standard.  If your compiler doesn't provide these header files, or they
- * do not match the standard, you will need to provide/improve them.
- */
-#include <limits.h>
-#include <stddef.h>
-
-/* Library header files.  These header files are all defined by ISOC90; libpng
- * expects conformant implementations, however, an ISOC90 conformant system need
- * not provide these header files if the functionality cannot be implemented.
- * In this case it will be necessary to disable the relevant parts of libpng in
- * the build of pnglibconf.h.
- *
- * Prior to 1.6.0 string.h was included here; the API changes in 1.6.0 to not
- * include this unnecessary header file.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-   /* Required for the definition of FILE: */
-#  include <stdio.h>
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   /* Required for the definition of jmp_buf and the declaration of longjmp: */
-#  include <setjmp.h>
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-   /* Required for struct tm: */
-#  include <time.h>
-#endif
-
-#endif /* PNG_BUILDING_SYMBOL_TABLE */
-
-/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using
- * PNG_NO_CONST; this is no longer supported except for data declarations which
- * apparently still cause problems in 2011 on some compilers.
- */
-#define PNG_CONST const /* backward compatibility only */
-
-/* This controls optimization of the reading of 16-bit and 32-bit values
- * from PNG files.  It can be set on a per-app-file basis - it
- * just changes whether a macro is used when the function is called.
- * The library builder sets the default; if read functions are not
- * built into the library the macro implementation is forced on.
- */
-#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
-#  define PNG_USE_READ_MACROS
-#endif
-#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
-#  if PNG_DEFAULT_READ_MACROS
-#    define PNG_USE_READ_MACROS
-#  endif
-#endif
-
-/* COMPILER SPECIFIC OPTIONS.
- *
- * These options are provided so that a variety of difficult compilers
- * can be used.  Some are fixed at build time (e.g. PNG_API_RULE
- * below) but still have compiler specific implementations, others
- * may be changed on a per-file basis when compiling against libpng.
- */
-
-/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
- * against legacy (pre ISOC90) compilers that did not understand function
- * prototypes.  It is not required for modern C compilers.
- */
-#ifndef PNGARG
-#  define PNGARG(arglist) arglist
-#endif
-
-/* Function calling conventions.
- * =============================
- * Normally it is not necessary to specify to the compiler how to call
- * a function - it just does it - however on x86 systems derived from
- * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems
- * and some others) there are multiple ways to call a function and the
- * default can be changed on the compiler command line.  For this reason
- * libpng specifies the calling convention of every exported function and
- * every function called via a user supplied function pointer.  This is
- * done in this file by defining the following macros:
- *
- * PNGAPI    Calling convention for exported functions.
- * PNGCBAPI  Calling convention for user provided (callback) functions.
- * PNGCAPI   Calling convention used by the ANSI-C library (required
- *           for longjmp callbacks and sometimes used internally to
- *           specify the calling convention for zlib).
- *
- * These macros should never be overridden.  If it is necessary to
- * change calling convention in a private build this can be done
- * by setting PNG_API_RULE (which defaults to 0) to one of the values
- * below to select the correct 'API' variants.
- *
- * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.
- *                This is correct in every known environment.
- * PNG_API_RULE=1 Use the operating system convention for PNGAPI and
- *                the 'C' calling convention (from PNGCAPI) for
- *                callbacks (PNGCBAPI).  This is no longer required
- *                in any known environment - if it has to be used
- *                please post an explanation of the problem to the
- *                libpng mailing list.
- *
- * These cases only differ if the operating system does not use the C
- * calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
- * Cygwin running on those systems.
- *
- * Note that the value must be defined in pnglibconf.h so that what
- * the application uses to call the library matches the conventions
- * set when building the library.
- */
-
-/* Symbol export
- * =============
- * When building a shared library it is almost always necessary to tell
- * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'
- * is used to mark the symbols.  On some systems these symbols can be
- * extracted at link time and need no special processing by the compiler,
- * on other systems the symbols are flagged by the compiler and just
- * the declaration requires a special tag applied (unfortunately) in a
- * compiler dependent way.  Some systems can do either.
- *
- * A small number of older systems also require a symbol from a DLL to
- * be flagged to the program that calls it.  This is a problem because
- * we do not know in the header file included by application code that
- * the symbol will come from a shared library, as opposed to a statically
- * linked one.  For this reason the application must tell us by setting
- * the magic flag PNG_USE_DLL to turn on the special processing before
- * it includes png.h.
- *
- * Four additional macros are used to make this happen:
- *
- * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from
- *            the build or imported if PNG_USE_DLL is set - compiler
- *            and system specific.
- *
- * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to
- *                       'type', compiler specific.
- *
- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to
- *                make a symbol exported from the DLL.  Not used in the
- *                public header files; see pngpriv.h for how it is used
- *                in the libpng build.
- *
- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come
- *                from a DLL - used to define PNG_IMPEXP when
- *                PNG_USE_DLL is set.
- */
-
-/* System specific discovery.
- * ==========================
- * This code is used at build time to find PNG_IMPEXP, the API settings
- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL
- * import processing is possible.  On Windows systems it also sets
- * compiler-specific macros to the values required to change the calling
- * conventions of the various functions.
- */
-#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-    defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-  /* Windows system (DOS doesn't support DLLs).  Includes builds under Cygwin or
-   * MinGW on any architecture currently supported by Windows.  Also includes
-   * Watcom builds but these need special treatment because they are not
-   * compatible with GCC or Visual C because of different calling conventions.
-   */
-#  if PNG_API_RULE == 2
-   /* If this line results in an error, either because __watcall is not
-    * understood or because of a redefine just below you cannot use *this*
-    * build of the library with the compiler you are using.  *This* build was
-    * build using Watcom and applications must also be built using Watcom!
-    */
-#    define PNGCAPI __watcall
-#  endif
-
-#  if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
-#    define PNGCAPI __cdecl
-#    if PNG_API_RULE == 1
-   /* If this line results in an error __stdcall is not understood and
-    * PNG_API_RULE should not have been set to '1'.
-    */
-#      define PNGAPI __stdcall
-#    endif
-#  else
-   /* An older compiler, or one not detected (erroneously) above,
-    * if necessary override on the command line to get the correct
-    * variants for the compiler.
-    */
-#    ifndef PNGCAPI
-#      define PNGCAPI _cdecl
-#    endif
-#    if PNG_API_RULE == 1 && !defined(PNGAPI)
-#      define PNGAPI _stdcall
-#    endif
-#  endif /* compiler/api */
-
-  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
-
-#  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
-#  endif
-
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-   /* older Borland and MSC
-    * compilers used '__export' and required this to be after
-    * the type.
-    */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
-
-#else /* !Windows */
-#  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#    define PNGAPI _System
-#  else /* !Windows/x86 && !OS/2 */
-   /* Use the defaults, or define PNG*API on the command line (but
-    * this will have to be done for every compile!)
-    */
-#  endif /* other system, !OS/2 */
-#endif /* !Windows/x86 */
-
-/* Now do all the defaulting . */
-#ifndef PNGCAPI
-#  define PNGCAPI
-#endif
-#ifndef PNGCBAPI
-#  define PNGCBAPI PNGCAPI
-#endif
-#ifndef PNGAPI
-#  define PNGAPI PNGCAPI
-#endif
-
-/* PNG_IMPEXP may be set on the compilation system command line or (if not set)
- * then in an internal header file when building the library, otherwise (when
- * using the library) it is set here.
- */
-#ifndef PNG_IMPEXP
-#  if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-   /* This forces use of a DLL, disallowing static linking */
-#    define PNG_IMPEXP PNG_DLL_IMPORT
-#  endif
-
-#  ifndef PNG_IMPEXP
-#    define PNG_IMPEXP
-#  endif
-#endif
-
-/* In 1.5.2 the definition of PNG_FUNCTION has been changed to always treat
- * 'attributes' as a storage class - the attributes go at the start of the
- * function definition, and attributes are always appended regardless of the
- * compiler.  This considerably simplifies these macros but may cause problems
- * if any compilers both need function attributes and fail to handle them as
- * a storage class (this is unlikely.)
- */
-#ifndef PNG_FUNCTION
-#  define PNG_FUNCTION(type, name, args, attributes) attributes type name args
-#endif
-
-#ifndef PNG_EXPORT_TYPE
-#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
-#endif
-
-   /* The ordinal value is only relevant when preprocessing png.h for symbol
-    * table entries, so we discard it here.  See the .dfn files in the
-    * scripts directory.
-    */
-
-#ifndef PNG_EXPORTA
-#  define PNG_EXPORTA(ordinal, type, name, args, attributes) \
-      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
-      PNG_LINKAGE_API attributes)
-#endif
-
-/* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
- * so make something non-empty to satisfy the requirement:
- */
-#define PNG_EMPTY /*empty list*/
-
-#define PNG_EXPORT(ordinal, type, name, args) \
-   PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)
-
-/* Use PNG_REMOVED to comment out a removed interface. */
-#ifndef PNG_REMOVED
-#  define PNG_REMOVED(ordinal, type, name, args, attributes)
-#endif
-
-#ifndef PNG_CALLBACK
-#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
-#endif
-
-/* Support for compiler specific function attributes.  These are used
- * so that where compiler support is available incorrect use of API
- * functions in png.h will generate compiler warnings.
- *
- * Added at libpng-1.2.41.
- */
-
-#ifndef PNG_NO_PEDANTIC_WARNINGS
-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
-#  endif
-#endif
-
-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
-  /* Support for compiler specific function attributes.  These are used
-   * so that where compiler support is available, incorrect use of API
-   * functions in png.h will generate compiler warnings.  Added at libpng
-   * version 1.2.41.  Disabling these removes the warnings but may also produce
-   * less efficient code.
-   */
-#  if defined(__clang__) && defined(__has_attribute)
-   /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
-#    if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    if !defined(PNG_NORETURN) && __has_attribute(__noreturn__)
-#      define PNG_NORETURN __attribute__((__noreturn__))
-#    endif
-#    if !defined(PNG_ALLOCATED) && __has_attribute(__malloc__)
-#      define PNG_ALLOCATED __attribute__((__malloc__))
-#    endif
-#    if !defined(PNG_DEPRECATED) && __has_attribute(__deprecated__)
-#      define PNG_DEPRECATED __attribute__((__deprecated__))
-#    endif
-#    if !defined(PNG_PRIVATE)
-#      ifdef __has_extension
-#        if __has_extension(attribute_unavailable_with_message)
-#          define PNG_PRIVATE __attribute__((__unavailable__(\
-             "This function is not exported by libpng.")))
-#        endif
-#      endif
-#    endif
-#    ifndef PNG_RESTRICT
-#      define PNG_RESTRICT __restrict
-#    endif
-
-#  elif defined(__GNUC__)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    if __GNUC__ >= 3
-#      ifndef PNG_ALLOCATED
-#        define PNG_ALLOCATED  __attribute__((__malloc__))
-#      endif
-#      ifndef PNG_DEPRECATED
-#        define PNG_DEPRECATED __attribute__((__deprecated__))
-#      endif
-#      ifndef PNG_PRIVATE
-#        if 0 /* Doesn't work so we use deprecated instead*/
-#          define PNG_PRIVATE \
-            __attribute__((warning("This function is not exported by libpng.")))
-#        else
-#          define PNG_PRIVATE \
-            __attribute__((__deprecated__))
-#        endif
-#      endif
-#      if ((__GNUC__ > 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))
-#        ifndef PNG_RESTRICT
-#          define PNG_RESTRICT __restrict
-#        endif
-#      endif /* __GNUC__.__GNUC_MINOR__ > 3.0 */
-#    endif /* __GNUC__ >= 3 */
-
-#  elif defined(_MSC_VER)  && (_MSC_VER >= 1300)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT /* not supported */
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __declspec(noreturn)
-#    endif
-#    ifndef PNG_ALLOCATED
-#      if (_MSC_VER >= 1400)
-#        define PNG_ALLOCATED __declspec(restrict)
-#      endif
-#    endif
-#    ifndef PNG_DEPRECATED
-#      define PNG_DEPRECATED __declspec(deprecated)
-#    endif
-#    ifndef PNG_PRIVATE
-#      define PNG_PRIVATE __declspec(deprecated)
-#    endif
-#    ifndef PNG_RESTRICT
-#      if (_MSC_VER >= 1400)
-#        define PNG_RESTRICT __restrict
-#      endif
-#    endif
-
-#  elif defined(__WATCOMC__)
-#    ifndef PNG_RESTRICT
-#      define PNG_RESTRICT __restrict
-#    endif
-#  endif
-#endif /* PNG_PEDANTIC_WARNINGS */
-
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED  /* Use of this function is deprecated */
-#endif
-#ifndef PNG_USE_RESULT
-#  define PNG_USE_RESULT  /* The result of this function must be checked */
-#endif
-#ifndef PNG_NORETURN
-#  define PNG_NORETURN    /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#endif
-#ifndef PNG_RESTRICT
-#  define PNG_RESTRICT    /* The C99 "restrict" feature */
-#endif
-
-#ifndef PNG_FP_EXPORT     /* A floating point API. */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-#     define PNG_FP_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args);
-#  else                   /* No floating point APIs */
-#     define PNG_FP_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args);
-#  else                   /* No fixed point APIs */
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE
-/* Some typedefs to get us started.  These should be safe on most of the common
- * platforms.
- *
- * png_uint_32 and png_int_32 may, currently, be larger than required to hold a
- * 32-bit value however this is not normally advisable.
- *
- * png_uint_16 and png_int_16 should always be two bytes in size - this is
- * verified at library build time.
- *
- * png_byte must always be one byte in size.
- *
- * The checks below use constants from limits.h, as defined by the ISOC90
- * standard.
- */
-#if CHAR_BIT == 8 && UCHAR_MAX == 255
-   typedef unsigned char png_byte;
-#else
-#  error "libpng requires 8-bit bytes"
-#endif
-
-#if INT_MIN == -32768 && INT_MAX == 32767
-   typedef int png_int_16;
-#elif SHRT_MIN == -32768 && SHRT_MAX == 32767
-   typedef short png_int_16;
-#else
-#  error "libpng requires a signed 16-bit type"
-#endif
-
-#if UINT_MAX == 65535
-   typedef unsigned int png_uint_16;
-#elif USHRT_MAX == 65535
-   typedef unsigned short png_uint_16;
-#else
-#  error "libpng requires an unsigned 16-bit type"
-#endif
-
-#if INT_MIN < -2147483646 && INT_MAX > 2147483646
-   typedef int png_int_32;
-#elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
-   typedef long int png_int_32;
-#else
-#  error "libpng requires a signed 32-bit (or more) type"
-#endif
-
-#if UINT_MAX > 4294967294U
-   typedef unsigned int png_uint_32;
-#elif ULONG_MAX > 4294967294U
-   typedef unsigned long int png_uint_32;
-#else
-#  error "libpng requires an unsigned 32-bit (or more) type"
-#endif
-
-/* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,
- * requires an ISOC90 compiler and relies on consistent behavior of sizeof.
- */
-typedef size_t png_size_t;
-typedef ptrdiff_t png_ptrdiff_t;
-
-/* libpng needs to know the maximum value of 'size_t' and this controls the
- * definition of png_alloc_size_t, below.  This maximum value of size_t limits
- * but does not control the maximum allocations the library makes - there is
- * direct application control of this through png_set_user_limits().
- */
-#ifndef PNG_SMALL_SIZE_T
-   /* Compiler specific tests for systems where size_t is known to be less than
-    * 32 bits (some of these systems may no longer work because of the lack of
-    * 'far' support; see above.)
-    */
-#  if (defined(__TURBOC__) && !defined(__FLAT__)) ||\
-   (defined(_MSC_VER) && defined(MAXSEG_64K))
-#     define PNG_SMALL_SIZE_T
-#  endif
-#endif
-
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no
- * smaller than png_uint_32.  Casts from png_size_t or png_uint_32 to
- * png_alloc_size_t are not necessary; in fact, it is recommended not to use
- * them at all so that the compiler can complain when something turns out to be
- * problematic.
- *
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
- * png_uint_32) should be explicitly applied; however, we do not expect to
- * encounter practical situations that require such conversions.
- *
- * PNG_SMALL_SIZE_T must be defined if the maximum value of size_t is less than
- * 4294967295 - i.e. less than the maximum value of png_uint_32.
- */
-#ifdef PNG_SMALL_SIZE_T
-   typedef png_uint_32 png_alloc_size_t;
-#else
-   typedef png_size_t png_alloc_size_t;
-#endif
-
-/* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler
- * implementations of Intel CPU specific support of user-mode segmented address
- * spaces, where 16-bit pointers address more than 65536 bytes of memory using
- * separate 'segment' registers.  The implementation requires two different
- * types of pointer (only one of which includes the segment value.)
- *
- * If required this support is available in version 1.2 of libpng and may be
- * available in versions through 1.5, although the correctness of the code has
- * not been verified recently.
- */
-
-/* Typedef for floating-point numbers that are converted to fixed-point with a
- * multiple of 100,000, e.g., gamma
- */
-typedef png_int_32 png_fixed_point;
-
-/* Add typedefs for pointers */
-typedef void                  * png_voidp;
-typedef const void            * png_const_voidp;
-typedef png_byte              * png_bytep;
-typedef const png_byte        * png_const_bytep;
-typedef png_uint_32           * png_uint_32p;
-typedef const png_uint_32     * png_const_uint_32p;
-typedef png_int_32            * png_int_32p;
-typedef const png_int_32      * png_const_int_32p;
-typedef png_uint_16           * png_uint_16p;
-typedef const png_uint_16     * png_const_uint_16p;
-typedef png_int_16            * png_int_16p;
-typedef const png_int_16      * png_const_int_16p;
-typedef char                  * png_charp;
-typedef const char            * png_const_charp;
-typedef png_fixed_point       * png_fixed_point_p;
-typedef const png_fixed_point * png_const_fixed_point_p;
-typedef png_size_t            * png_size_tp;
-typedef const png_size_t      * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double       * png_doublep;
-typedef const double * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        * * png_bytepp;
-typedef png_uint_32     * * png_uint_32pp;
-typedef png_int_32      * * png_int_32pp;
-typedef png_uint_16     * * png_uint_16pp;
-typedef png_int_16      * * png_int_16pp;
-typedef const char      * * png_const_charpp;
-typedef char            * * png_charpp;
-typedef png_fixed_point * * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          * * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            * * * png_charppp;
-
-#endif /* PNG_BUILDING_SYMBOL_TABLE */
-
-#endif /* PNGCONF_H */
diff --git a/src/png/libpng/pngdebug.h b/src/png/libpng/pngdebug.h
deleted file mode 100644
index 15a7ed0c9..000000000
--- a/src/png/libpng/pngdebug.h
+++ /dev/null
@@ -1,153 +0,0 @@
-
-/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
- *
- * Last changed in libpng 1.6.8 [December 19, 2013]
- * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* Define PNG_DEBUG at compile time for debugging information.  Higher
- * numbers for PNG_DEBUG mean more debugging information.  This has
- * only been added since version 0.95 so it is not implemented throughout
- * libpng yet, but more support will be added as needed.
- *
- * png_debug[1-2]?(level, message ,arg{0-2})
- *   Expands to a statement (either a simple expression or a compound
- *   do..while(0) statement) that outputs a message with parameter
- *   substitution if PNG_DEBUG is defined to 2 or more.  If PNG_DEBUG
- *   is undefined, 0 or 1 every png_debug expands to a simple expression
- *   (actually ((void)0)).
- *
- *   level: level of detail of message, starting at 0.  A level 'n'
- *          message is preceded by 'n' 3-space indentations (not implemented
- *          on Microsoft compilers unless PNG_DEBUG_FILE is also
- *          defined, to allow debug DLL compilation with no standard IO).
- *   message: a printf(3) style text string.  A trailing '\n' is added
- *            to the message.
- *   arg: 0 to 2 arguments for printf(3) style substitution in message.
- */
-#ifndef PNGDEBUG_H
-#define PNGDEBUG_H
-/* These settings control the formatting of messages in png.c and pngerror.c */
-/* Moved to pngdebug.h at 1.5.0 */
-#  ifndef PNG_LITERAL_SHARP
-#    define PNG_LITERAL_SHARP 0x23
-#  endif
-#  ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
-#    define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
-#  endif
-#  ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
-#    define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
-#  endif
-#  ifndef PNG_STRING_NEWLINE
-#    define PNG_STRING_NEWLINE "\n"
-#  endif
-
-#ifdef PNG_DEBUG
-#  if (PNG_DEBUG > 0)
-#    if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
-#      include <crtdbg.h>
-#      if (PNG_DEBUG > 1)
-#        ifndef _DEBUG
-#          define _DEBUG
-#        endif
-#        ifndef png_debug
-#          define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)
-#        endif
-#        ifndef png_debug1
-#          define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)
-#        endif
-#        ifndef png_debug2
-#          define png_debug2(l,m,p1,p2) \
-             _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)
-#        endif
-#      endif
-#    else /* PNG_DEBUG_FILE || !_MSC_VER */
-#      ifndef PNG_STDIO_SUPPORTED
-#        include <stdio.h> /* not included yet */
-#      endif
-#      ifndef PNG_DEBUG_FILE
-#        define PNG_DEBUG_FILE stderr
-#      endif /* PNG_DEBUG_FILE */
-
-#      if (PNG_DEBUG > 1)
-#        ifdef __STDC__
-#          ifndef png_debug
-#            define png_debug(l,m) \
-       do { \
-       int num_tabs=l; \
-       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \
-         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : "")))); \
-       } while (0)
-#          endif
-#          ifndef png_debug1
-#            define png_debug1(l,m,p1) \
-       do { \
-       int num_tabs=l; \
-       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \
-         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : ""))),p1); \
-       } while (0)
-#          endif
-#          ifndef png_debug2
-#            define png_debug2(l,m,p1,p2) \
-       do { \
-       int num_tabs=l; \
-       fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "   " : \
-         (num_tabs==2 ? "      " : (num_tabs>2 ? "         " : ""))),p1,p2);\
-       } while (0)
-#          endif
-#        else /* __STDC __ */
-#          ifndef png_debug
-#            define png_debug(l,m) \
-       do { \
-       int num_tabs=l; \
-       char format[256]; \
-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
-         m,PNG_STRING_NEWLINE); \
-       fprintf(PNG_DEBUG_FILE,format); \
-       } while (0)
-#          endif
-#          ifndef png_debug1
-#            define png_debug1(l,m,p1) \
-       do { \
-       int num_tabs=l; \
-       char format[256]; \
-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
-         m,PNG_STRING_NEWLINE); \
-       fprintf(PNG_DEBUG_FILE,format,p1); \
-       } while (0)
-#          endif
-#          ifndef png_debug2
-#            define png_debug2(l,m,p1,p2) \
-       do { \
-       int num_tabs=l; \
-       char format[256]; \
-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
-         m,PNG_STRING_NEWLINE); \
-       fprintf(PNG_DEBUG_FILE,format,p1,p2); \
-       } while (0)
-#          endif
-#        endif /* __STDC __ */
-#      endif /* (PNG_DEBUG > 1) */
-
-#    endif /* _MSC_VER */
-#  endif /* (PNG_DEBUG > 0) */
-#endif /* PNG_DEBUG */
-#ifndef png_debug
-#  define png_debug(l, m) ((void)0)
-#endif
-#ifndef png_debug1
-#  define png_debug1(l, m, p1) ((void)0)
-#endif
-#ifndef png_debug2
-#  define png_debug2(l, m, p1, p2) ((void)0)
-#endif
-#endif /* PNGDEBUG_H */
diff --git a/src/png/libpng/pngerror.c b/src/png/libpng/pngerror.c
deleted file mode 100644
index ad48bfb98..000000000
--- a/src/png/libpng/pngerror.c
+++ /dev/null
@@ -1,963 +0,0 @@
-
-/* pngerror.c - stub functions for i/o and memory allocation
- *
- * Last changed in libpng 1.6.31 [July 27, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all error handling.  Users who
- * need special error handling are expected to write replacement functions
- * and use png_set_error_fn() to use those functions.  See the instructions
- * at each function.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
-    png_const_charp error_message)),PNG_NORETURN);
-
-#ifdef PNG_WARNINGS_SUPPORTED
-static void /* PRIVATE */
-png_default_warning PNGARG((png_const_structrp png_ptr,
-    png_const_charp warning_message));
-#endif /* WARNINGS */
-
-/* This function is called whenever there is a fatal error.  This function
- * should not be changed.  If there is a need to handle errors differently,
- * you should supply a replacement error function and use png_set_error_fn()
- * to replace the error function at run-time.
- */
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-PNG_FUNCTION(void,PNGAPI
-png_error,(png_const_structrp png_ptr, png_const_charp error_message),
-    PNG_NORETURN)
-{
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   char msg[16];
-   if (png_ptr != NULL)
-   {
-      if ((png_ptr->flags &
-         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
-      {
-         if (*error_message == PNG_LITERAL_SHARP)
-         {
-            /* Strip "#nnnn " from beginning of error message. */
-            int offset;
-            for (offset = 1; offset<15; offset++)
-               if (error_message[offset] == ' ')
-                  break;
-
-            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
-            {
-               int i;
-               for (i = 0; i < offset - 1; i++)
-                  msg[i] = error_message[i + 1];
-               msg[i - 1] = '\0';
-               error_message = msg;
-            }
-
-            else
-               error_message += offset;
-         }
-
-         else
-         {
-            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
-            {
-               msg[0] = '0';
-               msg[1] = '\0';
-               error_message = msg;
-            }
-         }
-      }
-   }
-#endif
-   if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr),
-          error_message);
-
-   /* If the custom handler doesn't exist, or if it returns,
-      use the default handler, which will not return. */
-   png_default_error(png_ptr, error_message);
-}
-#else
-PNG_FUNCTION(void,PNGAPI
-png_err,(png_const_structrp png_ptr),PNG_NORETURN)
-{
-   /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed
-    * erroneously as '\0', instead of the empty string "".  This was
-    * apparently an error, introduced in libpng-1.2.20, and png_default_error
-    * will crash in this case.
-    */
-   if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr), "");
-
-   /* If the custom handler doesn't exist, or if it returns,
-      use the default handler, which will not return. */
-   png_default_error(png_ptr, "");
-}
-#endif /* ERROR_TEXT */
-
-/* Utility to safely appends strings to a buffer.  This never errors out so
- * error checking is not required in the caller.
- */
-size_t
-png_safecat(png_charp buffer, size_t bufsize, size_t pos,
-    png_const_charp string)
-{
-   if (buffer != NULL && pos < bufsize)
-   {
-      if (string != NULL)
-         while (*string != '\0' && pos < bufsize-1)
-           buffer[pos++] = *string++;
-
-      buffer[pos] = '\0';
-   }
-
-   return pos;
-}
-
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)
-/* Utility to dump an unsigned value into a buffer, given a start pointer and
- * and end pointer (which should point just *beyond* the end of the buffer!)
- * Returns the pointer to the start of the formatted string.
- */
-png_charp
-png_format_number(png_const_charp start, png_charp end, int format,
-    png_alloc_size_t number)
-{
-   int count = 0;    /* number of digits output */
-   int mincount = 1; /* minimum number required */
-   int output = 0;   /* digit output (for the fixed point format) */
-
-   *--end = '\0';
-
-   /* This is written so that the loop always runs at least once, even with
-    * number zero.
-    */
-   while (end > start && (number != 0 || count < mincount))
-   {
-
-      static const char digits[] = "0123456789ABCDEF";
-
-      switch (format)
-      {
-         case PNG_NUMBER_FORMAT_fixed:
-            /* Needs five digits (the fraction) */
-            mincount = 5;
-            if (output != 0 || number % 10 != 0)
-            {
-               *--end = digits[number % 10];
-               output = 1;
-            }
-            number /= 10;
-            break;
-
-         case PNG_NUMBER_FORMAT_02u:
-            /* Expects at least 2 digits. */
-            mincount = 2;
-            /* FALLTHROUGH */
-
-         case PNG_NUMBER_FORMAT_u:
-            *--end = digits[number % 10];
-            number /= 10;
-            break;
-
-         case PNG_NUMBER_FORMAT_02x:
-            /* This format expects at least two digits */
-            mincount = 2;
-            /* FALLTHROUGH */
-
-         case PNG_NUMBER_FORMAT_x:
-            *--end = digits[number & 0xf];
-            number >>= 4;
-            break;
-
-         default: /* an error */
-            number = 0;
-            break;
-      }
-
-      /* Keep track of the number of digits added */
-      ++count;
-
-      /* Float a fixed number here: */
-      if ((format == PNG_NUMBER_FORMAT_fixed) && (count == 5) && (end > start))
-      {
-         /* End of the fraction, but maybe nothing was output?  In that case
-          * drop the decimal point.  If the number is a true zero handle that
-          * here.
-          */
-         if (output != 0)
-            *--end = '.';
-         else if (number == 0) /* and !output */
-            *--end = '0';
-      }
-   }
-
-   return end;
-}
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* This function is called whenever there is a non-fatal error.  This function
- * should not be changed.  If there is a need to handle warnings differently,
- * you should supply a replacement warning function and use
- * png_set_error_fn() to replace the warning function at run-time.
- */
-void PNGAPI
-png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
-{
-   int offset = 0;
-   if (png_ptr != NULL)
-   {
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if ((png_ptr->flags &
-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
-#endif
-      {
-         if (*warning_message == PNG_LITERAL_SHARP)
-         {
-            for (offset = 1; offset < 15; offset++)
-               if (warning_message[offset] == ' ')
-                  break;
-         }
-      }
-   }
-   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
-      (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),
-          warning_message + offset);
-   else
-      png_default_warning(png_ptr, warning_message + offset);
-}
-
-/* These functions support 'formatted' warning messages with up to
- * PNG_WARNING_PARAMETER_COUNT parameters.  In the format string the parameter
- * is introduced by @<number>, where 'number' starts at 1.  This follows the
- * standard established by X/Open for internationalizable error messages.
- */
-void
-png_warning_parameter(png_warning_parameters p, int number,
-    png_const_charp string)
-{
-   if (number > 0 && number <= PNG_WARNING_PARAMETER_COUNT)
-      (void)png_safecat(p[number-1], (sizeof p[number-1]), 0, string);
-}
-
-void
-png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
-    png_alloc_size_t value)
-{
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
-   png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));
-}
-
-void
-png_warning_parameter_signed(png_warning_parameters p, int number, int format,
-    png_int_32 value)
-{
-   png_alloc_size_t u;
-   png_charp str;
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
-
-   /* Avoid overflow by doing the negate in a png_alloc_size_t: */
-   u = (png_alloc_size_t)value;
-   if (value < 0)
-      u = ~u + 1;
-
-   str = PNG_FORMAT_NUMBER(buffer, format, u);
-
-   if (value < 0 && str > buffer)
-      *--str = '-';
-
-   png_warning_parameter(p, number, str);
-}
-
-void
-png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
-    png_const_charp message)
-{
-   /* The internal buffer is just 192 bytes - enough for all our messages,
-    * overflow doesn't happen because this code checks!  If someone figures
-    * out how to send us a message longer than 192 bytes, all that will
-    * happen is that the message will be truncated appropriately.
-    */
-   size_t i = 0; /* Index in the msg[] buffer: */
-   char msg[192];
-
-   /* Each iteration through the following loop writes at most one character
-    * to msg[i++] then returns here to validate that there is still space for
-    * the trailing '\0'.  It may (in the case of a parameter) read more than
-    * one character from message[]; it must check for '\0' and continue to the
-    * test if it finds the end of string.
-    */
-   while (i<(sizeof msg)-1 && *message != '\0')
-   {
-      /* '@' at end of string is now just printed (previously it was skipped);
-       * it is an error in the calling code to terminate the string with @.
-       */
-      if (p != NULL && *message == '@' && message[1] != '\0')
-      {
-         int parameter_char = *++message; /* Consume the '@' */
-         static const char valid_parameters[] = "123456789";
-         int parameter = 0;
-
-         /* Search for the parameter digit, the index in the string is the
-          * parameter to use.
-          */
-         while (valid_parameters[parameter] != parameter_char &&
-            valid_parameters[parameter] != '\0')
-            ++parameter;
-
-         /* If the parameter digit is out of range it will just get printed. */
-         if (parameter < PNG_WARNING_PARAMETER_COUNT)
-         {
-            /* Append this parameter */
-            png_const_charp parm = p[parameter];
-            png_const_charp pend = p[parameter] + (sizeof p[parameter]);
-
-            /* No need to copy the trailing '\0' here, but there is no guarantee
-             * that parm[] has been initialized, so there is no guarantee of a
-             * trailing '\0':
-             */
-            while (i<(sizeof msg)-1 && *parm != '\0' && parm < pend)
-               msg[i++] = *parm++;
-
-            /* Consume the parameter digit too: */
-            ++message;
-            continue;
-         }
-
-         /* else not a parameter and there is a character after the @ sign; just
-          * copy that.  This is known not to be '\0' because of the test above.
-          */
-      }
-
-      /* At this point *message can't be '\0', even in the bad parameter case
-       * above where there is a lone '@' at the end of the message string.
-       */
-      msg[i++] = *message++;
-   }
-
-   /* i is always less than (sizeof msg), so: */
-   msg[i] = '\0';
-
-   /* And this is the formatted message. It may be larger than
-    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these
-    * are not (currently) formatted.
-    */
-   png_warning(png_ptr, msg);
-}
-#endif /* WARNINGS */
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)
-{
-   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
-   {
-#     ifdef PNG_READ_SUPPORTED
-         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-            png_ptr->chunk_name != 0)
-            png_chunk_warning(png_ptr, error_message);
-         else
-#     endif
-      png_warning(png_ptr, error_message);
-   }
-
-   else
-   {
-#     ifdef PNG_READ_SUPPORTED
-         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-            png_ptr->chunk_name != 0)
-            png_chunk_error(png_ptr, error_message);
-         else
-#     endif
-      png_error(png_ptr, error_message);
-   }
-
-#  ifndef PNG_ERROR_TEXT_SUPPORTED
-      PNG_UNUSED(error_message)
-#  endif
-}
-
-void /* PRIVATE */
-png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
-{
-   if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)
-      png_warning(png_ptr, error_message);
-   else
-      png_error(png_ptr, error_message);
-
-#  ifndef PNG_ERROR_TEXT_SUPPORTED
-      PNG_UNUSED(error_message)
-#  endif
-}
-
-void /* PRIVATE */
-png_app_error(png_const_structrp png_ptr, png_const_charp error_message)
-{
-   if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)
-      png_warning(png_ptr, error_message);
-   else
-      png_error(png_ptr, error_message);
-
-#  ifndef PNG_ERROR_TEXT_SUPPORTED
-      PNG_UNUSED(error_message)
-#  endif
-}
-#endif /* BENIGN_ERRORS */
-
-#define PNG_MAX_ERROR_TEXT 196 /* Currently limited by profile_error in png.c */
-#if defined(PNG_WARNINGS_SUPPORTED) || \
-   (defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED))
-/* These utilities are used internally to build an error message that relates
- * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
- * which is used to prefix the message.  The message is limited in length
- * to 63 bytes. The name characters are output as hex digits wrapped in []
- * if the character is invalid.
- */
-#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-static PNG_CONST char png_digit[16] = {
-   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-   'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-static void /* PRIVATE */
-png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
-    error_message)
-{
-   png_uint_32 chunk_name = png_ptr->chunk_name;
-   int iout = 0, ishift = 24;
-
-   while (ishift >= 0)
-   {
-      int c = (int)(chunk_name >> ishift) & 0xff;
-
-      ishift -= 8;
-      if (isnonalpha(c) != 0)
-      {
-         buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
-         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
-         buffer[iout++] = png_digit[c & 0x0f];
-         buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;
-      }
-
-      else
-      {
-         buffer[iout++] = (char)c;
-      }
-   }
-
-   if (error_message == NULL)
-      buffer[iout] = '\0';
-
-   else
-   {
-      int iin = 0;
-
-      buffer[iout++] = ':';
-      buffer[iout++] = ' ';
-
-      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
-         buffer[iout++] = error_message[iin++];
-
-      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
-      buffer[iout] = '\0';
-   }
-}
-#endif /* WARNINGS || ERROR_TEXT */
-
-#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
-PNG_FUNCTION(void,PNGAPI
-png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),
-    PNG_NORETURN)
-{
-   char msg[18+PNG_MAX_ERROR_TEXT];
-   if (png_ptr == NULL)
-      png_error(png_ptr, error_message);
-
-   else
-   {
-      png_format_buffer(png_ptr, msg, error_message);
-      png_error(png_ptr, msg);
-   }
-}
-#endif /* READ && ERROR_TEXT */
-
-#ifdef PNG_WARNINGS_SUPPORTED
-void PNGAPI
-png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message)
-{
-   char msg[18+PNG_MAX_ERROR_TEXT];
-   if (png_ptr == NULL)
-      png_warning(png_ptr, warning_message);
-
-   else
-   {
-      png_format_buffer(png_ptr, msg, warning_message);
-      png_warning(png_ptr, msg);
-   }
-}
-#endif /* WARNINGS */
-
-#ifdef PNG_READ_SUPPORTED
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp
-    error_message)
-{
-   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
-      png_chunk_warning(png_ptr, error_message);
-
-   else
-      png_chunk_error(png_ptr, error_message);
-
-#  ifndef PNG_ERROR_TEXT_SUPPORTED
-      PNG_UNUSED(error_message)
-#  endif
-}
-#endif
-#endif /* READ */
-
-void /* PRIVATE */
-png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
-{
-#  ifndef PNG_WARNINGS_SUPPORTED
-      PNG_UNUSED(message)
-#  endif
-
-   /* This is always supported, but for just read or just write it
-    * unconditionally does the right thing.
-    */
-#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
-      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-#  endif
-
-#  ifdef PNG_READ_SUPPORTED
-      {
-         if (error < PNG_CHUNK_ERROR)
-            png_chunk_warning(png_ptr, message);
-
-         else
-            png_chunk_benign_error(png_ptr, message);
-      }
-#  endif
-
-#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
-      else if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-#  endif
-
-#  ifdef PNG_WRITE_SUPPORTED
-      {
-         if (error < PNG_CHUNK_WRITE_ERROR)
-            png_app_warning(png_ptr, message);
-
-         else
-            png_app_error(png_ptr, message);
-      }
-#  endif
-}
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_FUNCTION(void,
-png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)
-{
-#  define fixed_message "fixed point overflow in "
-#  define fixed_message_ln ((sizeof fixed_message)-1)
-   unsigned int  iin;
-   char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
-   memcpy(msg, fixed_message, fixed_message_ln);
-   iin = 0;
-   if (name != NULL)
-      while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
-      {
-         msg[fixed_message_ln + iin] = name[iin];
-         ++iin;
-      }
-   msg[fixed_message_ln + iin] = 0;
-   png_error(png_ptr, msg);
-}
-#endif
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This API only exists if ANSI-C style error handling is used,
- * otherwise it is necessary for png_default_error to be overridden.
- */
-jmp_buf* PNGAPI
-png_set_longjmp_fn(png_structrp png_ptr, png_longjmp_ptr longjmp_fn,
-    size_t jmp_buf_size)
-{
-   /* From libpng 1.6.0 the app gets one chance to set a 'jmpbuf_size' value
-    * and it must not change after that.  Libpng doesn't care how big the
-    * buffer is, just that it doesn't change.
-    *
-    * If the buffer size is no *larger* than the size of jmp_buf when libpng is
-    * compiled a built in jmp_buf is returned; this preserves the pre-1.6.0
-    * semantics that this call will not fail.  If the size is larger, however,
-    * the buffer is allocated and this may fail, causing the function to return
-    * NULL.
-    */
-   if (png_ptr == NULL)
-      return NULL;
-
-   if (png_ptr->jmp_buf_ptr == NULL)
-   {
-      png_ptr->jmp_buf_size = 0; /* not allocated */
-
-      if (jmp_buf_size <= (sizeof png_ptr->jmp_buf_local))
-         png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local;
-
-      else
-      {
-         png_ptr->jmp_buf_ptr = png_voidcast(jmp_buf *,
-             png_malloc_warn(png_ptr, jmp_buf_size));
-
-         if (png_ptr->jmp_buf_ptr == NULL)
-            return NULL; /* new NULL return on OOM */
-
-         png_ptr->jmp_buf_size = jmp_buf_size;
-      }
-   }
-
-   else /* Already allocated: check the size */
-   {
-      size_t size = png_ptr->jmp_buf_size;
-
-      if (size == 0)
-      {
-         size = (sizeof png_ptr->jmp_buf_local);
-         if (png_ptr->jmp_buf_ptr != &png_ptr->jmp_buf_local)
-         {
-            /* This is an internal error in libpng: somehow we have been left
-             * with a stack allocated jmp_buf when the application regained
-             * control.  It's always possible to fix this up, but for the moment
-             * this is a png_error because that makes it easy to detect.
-             */
-            png_error(png_ptr, "Libpng jmp_buf still allocated");
-            /* png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local; */
-         }
-      }
-
-      if (size != jmp_buf_size)
-      {
-         png_warning(png_ptr, "Application jmp_buf size changed");
-         return NULL; /* caller will probably crash: no choice here */
-      }
-   }
-
-   /* Finally fill in the function, now we have a satisfactory buffer. It is
-    * valid to change the function on every call.
-    */
-   png_ptr->longjmp_fn = longjmp_fn;
-   return png_ptr->jmp_buf_ptr;
-}
-
-void /* PRIVATE */
-png_free_jmpbuf(png_structrp png_ptr)
-{
-   if (png_ptr != NULL)
-   {
-      jmp_buf *jb = png_ptr->jmp_buf_ptr;
-
-      /* A size of 0 is used to indicate a local, stack, allocation of the
-       * pointer; used here and in png.c
-       */
-      if (jb != NULL && png_ptr->jmp_buf_size > 0)
-      {
-
-         /* This stuff is so that a failure to free the error control structure
-          * does not leave libpng in a state with no valid error handling: the
-          * free always succeeds, if there is an error it gets ignored.
-          */
-         if (jb != &png_ptr->jmp_buf_local)
-         {
-            /* Make an internal, libpng, jmp_buf to return here */
-            jmp_buf free_jmp_buf;
-
-            if (!setjmp(free_jmp_buf))
-            {
-               png_ptr->jmp_buf_ptr = &free_jmp_buf; /* come back here */
-               png_ptr->jmp_buf_size = 0; /* stack allocation */
-               png_ptr->longjmp_fn = longjmp;
-               png_free(png_ptr, jb); /* Return to setjmp on error */
-            }
-         }
-      }
-
-      /* *Always* cancel everything out: */
-      png_ptr->jmp_buf_size = 0;
-      png_ptr->jmp_buf_ptr = NULL;
-      png_ptr->longjmp_fn = 0;
-   }
-}
-#endif
-
-/* This is the default error handling function.  Note that replacements for
- * this function MUST NOT RETURN, or the program will likely crash.  This
- * function is used by default, or if the program supplies NULL for the
- * error function pointer in png_set_error_fn().
- */
-static PNG_FUNCTION(void /* PRIVATE */,
-png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
-    PNG_NORETURN)
-{
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   /* Check on NULL only added in 1.5.4 */
-   if (error_message != NULL && *error_message == PNG_LITERAL_SHARP)
-   {
-      /* Strip "#nnnn " from beginning of error message. */
-      int offset;
-      char error_number[16];
-      for (offset = 0; offset<15; offset++)
-      {
-         error_number[offset] = error_message[offset + 1];
-         if (error_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         error_number[offset - 1] = '\0';
-         fprintf(stderr, "libpng error no. %s: %s",
-             error_number, error_message + offset + 1);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng error: %s, offset=%d",
-             error_message, offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#endif
-   {
-      fprintf(stderr, "libpng error: %s", error_message ? error_message :
-         "undefined");
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
-#else
-   PNG_UNUSED(error_message) /* Make compiler happy */
-#endif
-   png_longjmp(png_ptr, 1);
-}
-
-PNG_FUNCTION(void,PNGAPI
-png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   if (png_ptr != NULL && png_ptr->longjmp_fn != NULL &&
-       png_ptr->jmp_buf_ptr != NULL)
-      png_ptr->longjmp_fn(*png_ptr->jmp_buf_ptr, val);
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(val)
-#endif
-
-   /* If control reaches this point, png_longjmp() must not return. The only
-    * choice is to terminate the whole process (or maybe the thread); to do
-    * this the ANSI-C abort() function is used unless a different method is
-    * implemented by overriding the default configuration setting for
-    * PNG_ABORT().
-    */
-   PNG_ABORT();
-}
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* This function is called when there is a warning, but the library thinks
- * it can continue anyway.  Replacement functions don't have to do anything
- * here if you don't want them to.  In the default configuration, png_ptr is
- * not used, but it is passed in case it may be useful.
- */
-static void /* PRIVATE */
-png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)
-{
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (*warning_message == PNG_LITERAL_SHARP)
-   {
-      int offset;
-      char warning_number[16];
-      for (offset = 0; offset < 15; offset++)
-      {
-         warning_number[offset] = warning_message[offset + 1];
-         if (warning_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         warning_number[offset + 1] = '\0';
-         fprintf(stderr, "libpng warning no. %s: %s",
-             warning_number, warning_message + offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng warning: %s",
-             warning_message);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#  endif
-
-   {
-      fprintf(stderr, "libpng warning: %s", warning_message);
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
-#else
-   PNG_UNUSED(warning_message) /* Make compiler happy */
-#endif
-   PNG_UNUSED(png_ptr) /* Make compiler happy */
-}
-#endif /* WARNINGS */
-
-/* This function is called when the application wants to use another method
- * of handling errors and warnings.  Note that the error function MUST NOT
- * return to the calling routine or serious problems will occur.  The return
- * method used in the default routine calls longjmp(png_ptr->jmp_buf_ptr, 1)
- */
-void PNGAPI
-png_set_error_fn(png_structrp png_ptr, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warning_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->error_ptr = error_ptr;
-   png_ptr->error_fn = error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_ptr->warning_fn = warning_fn;
-#else
-   PNG_UNUSED(warning_fn)
-#endif
-}
-
-
-/* This function returns a pointer to the error_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy and png_read_destroy are called.
- */
-png_voidp PNGAPI
-png_get_error_ptr(png_const_structrp png_ptr)
-{
-   if (png_ptr == NULL)
-      return NULL;
-
-   return ((png_voidp)png_ptr->error_ptr);
-}
-
-
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-void PNGAPI
-png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)
-{
-   if (png_ptr != NULL)
-   {
-      png_ptr->flags &=
-         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |
-         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
-   }
-}
-#endif
-
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-   /* Currently the above both depend on SETJMP_SUPPORTED, however it would be
-    * possible to implement without setjmp support just so long as there is some
-    * way to handle the error return here:
-    */
-PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI
-png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
-    PNG_NORETURN)
-{
-   const png_const_structrp png_ptr = png_nonconst_ptr;
-   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
-
-   /* An error is always logged here, overwriting anything (typically a warning)
-    * that is already there:
-    */
-   if (image != NULL)
-   {
-      png_safecat(image->message, (sizeof image->message), 0, error_message);
-      image->warning_or_error |= PNG_IMAGE_ERROR;
-
-      /* Retrieve the jmp_buf from within the png_control, making this work for
-       * C++ compilation too is pretty tricky: C++ wants a pointer to the first
-       * element of a jmp_buf, but C doesn't tell us the type of that.
-       */
-      if (image->opaque != NULL && image->opaque->error_buf != NULL)
-         longjmp(png_control_jmp_buf(image->opaque), 1);
-
-      /* Missing longjmp buffer, the following is to help debugging: */
-      {
-         size_t pos = png_safecat(image->message, (sizeof image->message), 0,
-             "bad longjmp: ");
-         png_safecat(image->message, (sizeof image->message), pos,
-             error_message);
-      }
-   }
-
-   /* Here on an internal programming error. */
-   abort();
-}
-
-#ifdef PNG_WARNINGS_SUPPORTED
-void /* PRIVATE */ PNGCBAPI
-png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
-{
-   const png_const_structrp png_ptr = png_nonconst_ptr;
-   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
-
-   /* A warning is only logged if there is no prior warning or error. */
-   if (image->warning_or_error == 0)
-   {
-      png_safecat(image->message, (sizeof image->message), 0, warning_message);
-      image->warning_or_error |= PNG_IMAGE_WARNING;
-   }
-}
-#endif
-
-int /* PRIVATE */
-png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
-{
-   volatile png_imagep image = image_in;
-   volatile int result;
-   volatile png_voidp saved_error_buf;
-   jmp_buf safe_jmpbuf;
-
-   /* Safely execute function(arg) with png_error returning to this function. */
-   saved_error_buf = image->opaque->error_buf;
-   result = setjmp(safe_jmpbuf) == 0;
-
-   if (result != 0)
-   {
-
-      image->opaque->error_buf = safe_jmpbuf;
-      result = function(arg);
-   }
-
-   image->opaque->error_buf = saved_error_buf;
-
-   /* And do the cleanup prior to any failure return. */
-   if (result == 0)
-      png_image_free(image);
-
-   return result;
-}
-#endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
-#endif /* READ || WRITE */
diff --git a/src/png/libpng/pngget.c b/src/png/libpng/pngget.c
deleted file mode 100644
index 26e9fb1c3..000000000
--- a/src/png/libpng/pngget.c
+++ /dev/null
@@ -1,1248 +0,0 @@
-
-/* pngget.c - retrieval of values from info struct
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-png_uint_32 PNGAPI
-png_get_valid(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_uint_32 flag)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->valid & flag);
-
-   return(0);
-}
-
-png_size_t PNGAPI
-png_get_rowbytes(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->rowbytes);
-
-   return(0);
-}
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-png_bytepp PNGAPI
-png_get_rows(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->row_pointers);
-
-   return(0);
-}
-#endif
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Easy access to info, added in libpng-0.99 */
-png_uint_32 PNGAPI
-png_get_image_width(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->width;
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_image_height(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->height;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_bit_depth(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->bit_depth;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_color_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->color_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_filter_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->filter_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_interlace_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->interlace_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_compression_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->compression_type;
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
-   info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs) != 0)
-      {
-         png_debug1(1, "in %s retrieval function",
-             "png_get_x_pixels_per_meter");
-
-         if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-            return (info_ptr->x_pixels_per_unit);
-      }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
-    info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function",
-          "png_get_y_pixels_per_meter");
-
-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-         return (info_ptr->y_pixels_per_unit);
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
-
-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER &&
-          info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)
-         return (info_ptr->x_pixels_per_unit);
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return (0);
-}
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
-   info_ptr)
-{
-#ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
-
-      if (info_ptr->x_pixels_per_unit != 0)
-         return ((float)((float)info_ptr->y_pixels_per_unit
-             /(float)info_ptr->x_pixels_per_unit));
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return ((float)0.0);
-}
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-png_fixed_point PNGAPI
-png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
-    png_const_inforp info_ptr)
-{
-#ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs) != 0 &&
-       info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&
-       info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX &&
-       info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
-   {
-      png_fixed_point res;
-
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio_fixed");
-
-      /* The following casts work because a PNG 4 byte integer only has a valid
-       * range of 0..2^31-1; otherwise the cast might overflow.
-       */
-      if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,
-          (png_int_32)info_ptr->x_pixels_per_unit) != 0)
-         return res;
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return 0;
-}
-#endif
-
-png_int_32 PNGAPI
-png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_oFFs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->x_offset);
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_oFFs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->y_offset);
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_oFFs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->x_offset);
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_oFFs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->y_offset);
-   }
-#else
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(info_ptr)
-#endif
-
-   return (0);
-}
-
-#ifdef PNG_INCH_CONVERSIONS_SUPPORTED
-static png_uint_32
-ppi_from_ppm(png_uint_32 ppm)
-{
-#if 0
-   /* The conversion is *(2.54/100), in binary (32 digits):
-    * .00000110100000001001110101001001
-    */
-   png_uint_32 t1001, t1101;
-   ppm >>= 1;                  /* .1 */
-   t1001 = ppm + (ppm >> 3);   /* .1001 */
-   t1101 = t1001 + (ppm >> 1); /* .1101 */
-   ppm >>= 20;                 /* .000000000000000000001 */
-   t1101 += t1101 >> 15;       /* .1101000000000001101 */
-   t1001 >>= 11;               /* .000000000001001 */
-   t1001 += t1001 >> 12;       /* .000000000001001000000001001 */
-   ppm += t1001;               /* .000000000001001000001001001 */
-   ppm += t1101;               /* .110100000001001110101001001 */
-   return (ppm + 16) >> 5;/* .00000110100000001001110101001001 */
-#else
-   /* The argument is a PNG unsigned integer, so it is not permitted
-    * to be bigger than 2^31.
-    */
-   png_fixed_point result;
-   if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,
-       5000) != 0)
-      return (png_uint_32)result;
-
-   /* Overflow. */
-   return 0;
-#endif
-}
-
-png_uint_32 PNGAPI
-png_get_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));
-}
-
-png_uint_32 PNGAPI
-png_get_x_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));
-}
-
-png_uint_32 PNGAPI
-png_get_y_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));
-}
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-static png_fixed_point
-png_fixed_inches_from_microns(png_const_structrp png_ptr, png_int_32 microns)
-{
-   /* Convert from metres * 1,000,000 to inches * 100,000, meters to
-    * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.
-    * Notice that this can overflow - a warning is output and 0 is
-    * returned.
-    */
-   return png_muldiv_warn(png_ptr, microns, 500, 127);
-}
-
-png_fixed_point PNGAPI
-png_get_x_offset_inches_fixed(png_const_structrp png_ptr,
-    png_const_inforp info_ptr)
-{
-   return png_fixed_inches_from_microns(png_ptr,
-       png_get_x_offset_microns(png_ptr, info_ptr));
-}
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-png_fixed_point PNGAPI
-png_get_y_offset_inches_fixed(png_const_structrp png_ptr,
-    png_const_inforp info_ptr)
-{
-   return png_fixed_inches_from_microns(png_ptr,
-       png_get_y_offset_microns(png_ptr, info_ptr));
-}
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_x_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   /* To avoid the overflow do the conversion directly in floating
-    * point.
-    */
-   return (float)(png_get_x_offset_microns(png_ptr, info_ptr) * .00003937);
-}
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_y_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   /* To avoid the overflow do the conversion directly in floating
-    * point.
-    */
-   return (float)(png_get_y_offset_microns(png_ptr, info_ptr) * .00003937);
-}
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
-{
-   png_uint_32 retval = 0;
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "pHYs");
-
-      if (res_x != NULL)
-      {
-         *res_x = info_ptr->x_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (res_y != NULL)
-      {
-         *res_y = info_ptr->y_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (unit_type != NULL)
-      {
-         *unit_type = (int)info_ptr->phys_unit_type;
-         retval |= PNG_INFO_pHYs;
-
-         if (*unit_type == 1)
-         {
-            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
-            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
-         }
-      }
-   }
-
-   return (retval);
-}
-#endif /* pHYs */
-#endif /* INCH_CONVERSIONS */
-
-/* png_get_channels really belongs in here, too, but it's been around longer */
-
-#endif /* EASY_ACCESS */
-
-
-png_byte PNGAPI
-png_get_channels(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->channels);
-
-   return (0);
-}
-
-#ifdef PNG_READ_SUPPORTED
-png_const_bytep PNGAPI
-png_get_signature(png_const_structrp png_ptr, png_const_inforp info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->signature);
-
-   return (NULL);
-}
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-png_uint_32 PNGAPI
-png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_color_16p *background)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_bKGD) != 0 &&
-       background != NULL)
-   {
-      png_debug1(1, "in %s retrieval function", "bKGD");
-
-      *background = &(info_ptr->background);
-      return (PNG_INFO_bKGD);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-/* The XYZ APIs were added in 1.5.5 to take advantage of the code added at the
- * same time to correct the rgb grayscale coefficient defaults obtained from the
- * cHRM chunk in 1.5.4
- */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    double *white_x, double *white_y, double *red_x, double *red_y,
-    double *green_x, double *green_y, double *blue_x, double *blue_y)
-{
-   /* Quiet API change: this code used to only return the end points if a cHRM
-    * chunk was present, but the end points can also come from iCCP or sRGB
-    * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and
-    * the png_set_ APIs merely check that set end points are mutually
-    * consistent.
-    */
-   if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "cHRM");
-
-      if (white_x != NULL)
-         *white_x = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
-      if (white_y != NULL)
-         *white_y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");
-      if (red_x != NULL)
-         *red_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redx,
-             "cHRM red X");
-      if (red_y != NULL)
-         *red_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redy,
-             "cHRM red Y");
-      if (green_x != NULL)
-         *green_x = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");
-      if (green_y != NULL)
-         *green_y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");
-      if (blue_x != NULL)
-         *blue_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluex,
-             "cHRM blue X");
-      if (blue_y != NULL)
-         *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
-             "cHRM blue Y");
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    double *red_X, double *red_Y, double *red_Z, double *green_X,
-    double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
-    double *blue_Z)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
-
-      if (red_X != NULL)
-         *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
-             "cHRM red X");
-      if (red_Y != NULL)
-         *red_Y = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Y,
-             "cHRM red Y");
-      if (red_Z != NULL)
-         *red_Z = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Z,
-             "cHRM red Z");
-      if (green_X != NULL)
-         *green_X = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");
-      if (green_Y != NULL)
-         *green_Y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");
-      if (green_Z != NULL)
-         *green_Z = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");
-      if (blue_X != NULL)
-         *blue_X = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");
-      if (blue_Y != NULL)
-         *blue_Y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");
-      if (blue_Z != NULL)
-         *blue_Z = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-#  endif
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
-
-      if (int_red_X != NULL)
-         *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;
-      if (int_red_Y != NULL)
-         *int_red_Y = info_ptr->colorspace.end_points_XYZ.red_Y;
-      if (int_red_Z != NULL)
-         *int_red_Z = info_ptr->colorspace.end_points_XYZ.red_Z;
-      if (int_green_X != NULL)
-         *int_green_X = info_ptr->colorspace.end_points_XYZ.green_X;
-      if (int_green_Y != NULL)
-         *int_green_Y = info_ptr->colorspace.end_points_XYZ.green_Y;
-      if (int_green_Z != NULL)
-         *int_green_Z = info_ptr->colorspace.end_points_XYZ.green_Z;
-      if (int_blue_X != NULL)
-         *int_blue_X = info_ptr->colorspace.end_points_XYZ.blue_X;
-      if (int_blue_Y != NULL)
-         *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;
-      if (int_blue_Z != NULL)
-         *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
-    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
-    png_fixed_point *blue_x, png_fixed_point *blue_y)
-{
-   png_debug1(1, "in %s retrieval function", "cHRM");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      if (white_x != NULL)
-         *white_x = info_ptr->colorspace.end_points_xy.whitex;
-      if (white_y != NULL)
-         *white_y = info_ptr->colorspace.end_points_xy.whitey;
-      if (red_x != NULL)
-         *red_x = info_ptr->colorspace.end_points_xy.redx;
-      if (red_y != NULL)
-         *red_y = info_ptr->colorspace.end_points_xy.redy;
-      if (green_x != NULL)
-         *green_x = info_ptr->colorspace.end_points_xy.greenx;
-      if (green_y != NULL)
-         *green_y = info_ptr->colorspace.end_points_xy.greeny;
-      if (blue_x != NULL)
-         *blue_x = info_ptr->colorspace.end_points_xy.bluex;
-      if (blue_y != NULL)
-         *blue_y = info_ptr->colorspace.end_points_xy.bluey;
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-#  endif
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *file_gamma)
-{
-   png_debug1(1, "in %s retrieval function", "gAMA");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-       file_gamma != NULL)
-   {
-      *file_gamma = info_ptr->colorspace.gamma;
-      return (PNG_INFO_gAMA);
-   }
-
-   return (0);
-}
-#  endif
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    double *file_gamma)
-{
-   png_debug1(1, "in %s retrieval function", "gAMA(float)");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-      file_gamma != NULL)
-   {
-      *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
-          "png_get_gAMA");
-      return (PNG_INFO_gAMA);
-   }
-
-   return (0);
-}
-#  endif
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    int *file_srgb_intent)
-{
-   png_debug1(1, "in %s retrieval function", "sRGB");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
-   {
-      *file_srgb_intent = info_ptr->colorspace.rendering_intent;
-      return (PNG_INFO_sRGB);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-png_uint_32 PNGAPI
-png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_charpp name, int *compression_type,
-    png_bytepp profile, png_uint_32 *proflen)
-{
-   png_debug1(1, "in %s retrieval function", "iCCP");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_iCCP) != 0 &&
-       name != NULL && compression_type != NULL && profile != NULL &&
-           proflen != NULL)
-   {
-      *name = info_ptr->iccp_name;
-      *profile = info_ptr->iccp_profile;
-      *proflen = png_get_uint_32(info_ptr->iccp_profile);
-      /* This is somewhat irrelevant since the profile data returned has
-       * actually been uncompressed.
-       */
-      *compression_type = PNG_COMPRESSION_TYPE_BASE;
-      return (PNG_INFO_iCCP);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-int PNGAPI
-png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_sPLT_tpp spalettes)
-{
-   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
-   {
-      *spalettes = info_ptr->splt_palettes;
-      return info_ptr->splt_palettes_num;
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_eXIf_SUPPORTED
-png_uint_32 PNGAPI
-png_get_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_bytep *exif)
-{
-  png_warning(png_ptr, "png_get_eXIf does not work; use png_get_eXIf_1");
-  PNG_UNUSED(info_ptr)
-  PNG_UNUSED(exif)
-  return 0;
-}
-
-png_uint_32 PNGAPI
-png_get_eXIf_1(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_uint_32 *num_exif, png_bytep *exif)
-{
-   png_debug1(1, "in %s retrieval function", "eXIf");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_eXIf) != 0 && exif != NULL)
-   {
-      *num_exif = info_ptr->num_exif;
-      *exif = info_ptr->exif;
-      return (PNG_INFO_eXIf);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-png_uint_32 PNGAPI
-png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_uint_16p *hist)
-{
-   png_debug1(1, "in %s retrieval function", "hIST");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)
-   {
-      *hist = info_ptr->hist;
-      return (PNG_INFO_hIST);
-   }
-
-   return (0);
-}
-#endif
-
-png_uint_32 PNGAPI
-png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_uint_32 *width, png_uint_32 *height, int *bit_depth,
-    int *color_type, int *interlace_type, int *compression_type,
-    int *filter_type)
-{
-   png_debug1(1, "in %s retrieval function", "IHDR");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return (0);
-
-   if (width != NULL)
-       *width = info_ptr->width;
-
-   if (height != NULL)
-       *height = info_ptr->height;
-
-   if (bit_depth != NULL)
-       *bit_depth = info_ptr->bit_depth;
-
-   if (color_type != NULL)
-       *color_type = info_ptr->color_type;
-
-   if (compression_type != NULL)
-      *compression_type = info_ptr->compression_type;
-
-   if (filter_type != NULL)
-      *filter_type = info_ptr->filter_type;
-
-   if (interlace_type != NULL)
-      *interlace_type = info_ptr->interlace_type;
-
-   /* This is redundant if we can be sure that the info_ptr values were all
-    * assigned in png_set_IHDR().  We do the check anyhow in case an
-    * application has ignored our advice not to mess with the members
-    * of info_ptr directly.
-    */
-   png_check_IHDR(png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
-       info_ptr->compression_type, info_ptr->filter_type);
-
-   return (1);
-}
-
-#ifdef PNG_oFFs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
-{
-   png_debug1(1, "in %s retrieval function", "oFFs");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_oFFs) != 0 &&
-       offset_x != NULL && offset_y != NULL && unit_type != NULL)
-   {
-      *offset_x = info_ptr->x_offset;
-      *offset_y = info_ptr->y_offset;
-      *unit_type = (int)info_ptr->offset_unit_type;
-      return (PNG_INFO_oFFs);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
-    png_charp *units, png_charpp *params)
-{
-   png_debug1(1, "in %s retrieval function", "pCAL");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pCAL) != 0 &&
-       purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
-       nparams != NULL && units != NULL && params != NULL)
-   {
-      *purpose = info_ptr->pcal_purpose;
-      *X0 = info_ptr->pcal_X0;
-      *X1 = info_ptr->pcal_X1;
-      *type = (int)info_ptr->pcal_type;
-      *nparams = (int)info_ptr->pcal_nparams;
-      *units = info_ptr->pcal_units;
-      *params = info_ptr->pcal_params;
-      return (PNG_INFO_pCAL);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#    if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
-         defined(PNG_FLOATING_POINT_SUPPORTED)
-png_uint_32 PNGAPI
-png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    int *unit, png_fixed_point *width, png_fixed_point *height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL) != 0)
-   {
-      *unit = info_ptr->scal_unit;
-      /*TODO: make this work without FP support; the API is currently eliminated
-       * if neither floating point APIs nor internal floating point arithmetic
-       * are enabled.
-       */
-      *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
-      *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
-          "sCAL height");
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#    endif /* FLOATING_ARITHMETIC */
-#  endif /* FIXED_POINT */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    int *unit, double *width, double *height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL) != 0)
-   {
-      *unit = info_ptr->scal_unit;
-      *width = atof(info_ptr->scal_s_width);
-      *height = atof(info_ptr->scal_s_height);
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#  endif /* FLOATING POINT */
-png_uint_32 PNGAPI
-png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    int *unit, png_charpp width, png_charpp height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL) != 0)
-   {
-      *unit = info_ptr->scal_unit;
-      *width = info_ptr->scal_s_width;
-      *height = info_ptr->scal_s_height;
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#endif /* sCAL */
-
-#ifdef PNG_pHYs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
-{
-   png_uint_32 retval = 0;
-
-   png_debug1(1, "in %s retrieval function", "pHYs");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      if (res_x != NULL)
-      {
-         *res_x = info_ptr->x_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (res_y != NULL)
-      {
-         *res_y = info_ptr->y_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (unit_type != NULL)
-      {
-         *unit_type = (int)info_ptr->phys_unit_type;
-         retval |= PNG_INFO_pHYs;
-      }
-   }
-
-   return (retval);
-}
-#endif /* pHYs */
-
-png_uint_32 PNGAPI
-png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_colorp *palette, int *num_palette)
-{
-   png_debug1(1, "in %s retrieval function", "PLTE");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_PLTE) != 0 && palette != NULL)
-   {
-      *palette = info_ptr->palette;
-      *num_palette = info_ptr->num_palette;
-      png_debug1(3, "num_palette = %d", *num_palette);
-      return (PNG_INFO_PLTE);
-   }
-
-   return (0);
-}
-
-#ifdef PNG_sBIT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_color_8p *sig_bit)
-{
-   png_debug1(1, "in %s retrieval function", "sBIT");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)
-   {
-      *sig_bit = &(info_ptr->sig_bit);
-      return (PNG_INFO_sBIT);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-int PNGAPI
-png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_textp *text_ptr, int *num_text)
-{
-   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
-   {
-      png_debug1(1, "in 0x%lx retrieval function",
-         (unsigned long)png_ptr->chunk_name);
-
-      if (text_ptr != NULL)
-         *text_ptr = info_ptr->text;
-
-      if (num_text != NULL)
-         *num_text = info_ptr->num_text;
-
-      return info_ptr->num_text;
-   }
-
-   if (num_text != NULL)
-      *num_text = 0;
-
-   return(0);
-}
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-png_uint_32 PNGAPI
-png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_timep *mod_time)
-{
-   png_debug1(1, "in %s retrieval function", "tIME");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)
-   {
-      *mod_time = &(info_ptr->mod_time);
-      return (PNG_INFO_tIME);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-png_uint_32 PNGAPI
-png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
-{
-   png_uint_32 retval = 0;
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_tRNS) != 0)
-   {
-      png_debug1(1, "in %s retrieval function", "tRNS");
-
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (trans_alpha != NULL)
-         {
-            *trans_alpha = info_ptr->trans_alpha;
-            retval |= PNG_INFO_tRNS;
-         }
-
-         if (trans_color != NULL)
-            *trans_color = &(info_ptr->trans_color);
-      }
-
-      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
-      {
-         if (trans_color != NULL)
-         {
-            *trans_color = &(info_ptr->trans_color);
-            retval |= PNG_INFO_tRNS;
-         }
-
-         if (trans_alpha != NULL)
-            *trans_alpha = NULL;
-      }
-
-      if (num_trans != NULL)
-      {
-         *num_trans = info_ptr->num_trans;
-         retval |= PNG_INFO_tRNS;
-      }
-   }
-
-   return (retval);
-}
-#endif
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-int PNGAPI
-png_get_unknown_chunks(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_unknown_chunkpp unknowns)
-{
-   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
-   {
-      *unknowns = info_ptr->unknown_chunks;
-      return info_ptr->unknown_chunks_num;
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-png_byte PNGAPI
-png_get_rgb_to_gray_status (png_const_structrp png_ptr)
-{
-   return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
-}
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-png_voidp PNGAPI
-png_get_user_chunk_ptr(png_const_structrp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_ptr : NULL);
-}
-#endif
-
-png_size_t PNGAPI
-png_get_compression_buffer_size(png_const_structrp png_ptr)
-{
-   if (png_ptr == NULL)
-      return 0;
-
-#ifdef PNG_WRITE_SUPPORTED
-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-#endif
-   {
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-      return png_ptr->IDAT_read_size;
-#else
-      return PNG_IDAT_READ_SIZE;
-#endif
-   }
-
-#ifdef PNG_WRITE_SUPPORTED
-   else
-      return png_ptr->zbuffer_size;
-#endif
-}
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-/* These functions were added to libpng 1.2.6 and were enabled
- * by default in libpng-1.4.0 */
-png_uint_32 PNGAPI
-png_get_user_width_max (png_const_structrp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_width_max : 0);
-}
-
-png_uint_32 PNGAPI
-png_get_user_height_max (png_const_structrp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_height_max : 0);
-}
-
-/* This function was added to libpng 1.4.0 */
-png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_const_structrp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
-}
-
-/* This function was added to libpng 1.4.1 */
-png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_const_structrp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
-}
-#endif /* SET_USER_LIMITS */
-
-/* These functions were added to libpng 1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-png_uint_32 PNGAPI
-png_get_io_state (png_const_structrp png_ptr)
-{
-   return png_ptr->io_state;
-}
-
-png_uint_32 PNGAPI
-png_get_io_chunk_type (png_const_structrp png_ptr)
-{
-   return png_ptr->chunk_name;
-}
-#endif /* IO_STATE */
-
-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-int PNGAPI
-png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return png_ptr->num_palette_max;
-
-   return (-1);
-}
-#  endif
-#endif
-
-#endif /* READ || WRITE */
diff --git a/src/png/libpng/pnginfo.h b/src/png/libpng/pnginfo.h
deleted file mode 100644
index d5f6149db..000000000
--- a/src/png/libpng/pnginfo.h
+++ /dev/null
@@ -1,267 +0,0 @@
-
-/* pnginfo.h - header file for PNG reference library
- *
- * Last changed in libpng 1.6.1 [March 28, 2013]
- * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
- /* png_info is a structure that holds the information in a PNG file so
- * that the application can find out the characteristics of the image.
- * If you are reading the file, this structure will tell you what is
- * in the PNG file.  If you are writing the file, fill in the information
- * you want to put into the PNG file, using png_set_*() functions, then
- * call png_write_info().
- *
- * The names chosen should be very close to the PNG specification, so
- * consult that document for information about the meaning of each field.
- *
- * With libpng < 0.95, it was only possible to directly set and read the
- * the values in the png_info_struct, which meant that the contents and
- * order of the values had to remain fixed.  With libpng 0.95 and later,
- * however, there are now functions that abstract the contents of
- * png_info_struct from the application, so this makes it easier to use
- * libpng with dynamic libraries, and even makes it possible to use
- * libraries that don't have all of the libpng ancillary chunk-handing
- * functionality.  In libpng-1.5.0 this was moved into a separate private
- * file that is not visible to applications.
- *
- * The following members may have allocated storage attached that should be
- * cleaned up before the structure is discarded: palette, trans, text,
- * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
- * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
- * are automatically freed when the info structure is deallocated, if they were
- * allocated internally by libpng.  This behavior can be changed by means
- * of the png_data_freer() function.
- *
- * More allocation details: all the chunk-reading functions that
- * change these members go through the corresponding png_set_*
- * functions.  A function to clear these members is available: see
- * png_free_data().  The png_set_* functions do not depend on being
- * able to point info structure members to any of the storage they are
- * passed (they make their own copies), EXCEPT that the png_set_text
- * functions use the same storage passed to them in the text_ptr or
- * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
- * functions do not make their own copies.
- */
-#ifndef PNGINFO_H
-#define PNGINFO_H
-
-struct png_info_def
-{
-   /* The following are necessary for every PNG file */
-   png_uint_32 width;  /* width of image in pixels (from IHDR) */
-   png_uint_32 height; /* height of image in pixels (from IHDR) */
-   png_uint_32 valid;  /* valid chunk data (see PNG_INFO_ below) */
-   png_size_t rowbytes; /* bytes needed to hold an untransformed row */
-   png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
-   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
-   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
-   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
-   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
-   /* The following three should have been named *_method not *_type */
-   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
-   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
-   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-
-   /* The following are set by png_set_IHDR, called from the application on
-    * write, but the are never actually used by the write code.
-    */
-   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */
-   png_byte pixel_depth;    /* number of bits per pixel */
-   png_byte spare_byte;     /* to align the data, and for future use */
-
-#ifdef PNG_READ_SUPPORTED
-   /* This is never set during write */
-   png_byte signature[8];   /* magic bytes read by libpng from start of file */
-#endif
-
-   /* The rest of the data is optional.  If you are reading, check the
-    * valid field to see if the information in these are valid.  If you
-    * are writing, set the valid field to those chunks you want written,
-    * and initialize the appropriate fields below.
-    */
-
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-   /* png_colorspace only contains 'flags' if neither GAMMA or COLORSPACE are
-    * defined.  When COLORSPACE is switched on all the colorspace-defining
-    * chunks should be enabled, when GAMMA is switched on all the gamma-defining
-    * chunks should be enabled.  If this is not done it becomes possible to read
-    * inconsistent PNG files and assign a probably incorrect interpretation to
-    * the information.  (In other words, by carefully choosing which chunks to
-    * recognize the system configuration can select an interpretation for PNG
-    * files containing ambiguous data and this will result in inconsistent
-    * behavior between different libpng builds!)
-    */
-   png_colorspace colorspace;
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-   /* iCCP chunk data. */
-   png_charp iccp_name;     /* profile name */
-   png_bytep iccp_profile;  /* International Color Consortium profile data */
-   png_uint_32 iccp_proflen;  /* ICC profile data length */
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-   /* The tEXt, and zTXt chunks contain human-readable textual data in
-    * uncompressed, compressed, and optionally compressed forms, respectively.
-    * The data in "text" is an array of pointers to uncompressed,
-    * null-terminated C strings. Each chunk has a keyword that describes the
-    * textual data contained in that chunk.  Keywords are not required to be
-    * unique, and the text string may be empty.  Any number of text chunks may
-    * be in an image.
-    */
-   int num_text; /* number of comments read or comments to write */
-   int max_text; /* current size of text array */
-   png_textp text; /* array of comments read or comments to write */
-#endif /* TEXT */
-
-#ifdef PNG_tIME_SUPPORTED
-   /* The tIME chunk holds the last time the displayed image data was
-    * modified.  See the png_time struct for the contents of this struct.
-    */
-   png_time mod_time;
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-   /* The sBIT chunk specifies the number of significant high-order bits
-    * in the pixel data.  Values are in the range [1, bit_depth], and are
-    * only specified for the channels in the pixel data.  The contents of
-    * the low-order bits is not specified.  Data is valid if
-    * (valid & PNG_INFO_sBIT) is non-zero.
-    */
-   png_color_8 sig_bit; /* significant bits in color channels */
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \
-defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* The tRNS chunk supplies transparency data for paletted images and
-    * other image types that don't need a full alpha channel.  There are
-    * "num_trans" transparency values for a paletted image, stored in the
-    * same order as the palette colors, starting from index 0.  Values
-    * for the data are in the range [0, 255], ranging from fully transparent
-    * to fully opaque, respectively.  For non-paletted images, there is a
-    * single color specified that should be treated as fully transparent.
-    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
-    */
-   png_bytep trans_alpha;    /* alpha values for paletted image */
-   png_color_16 trans_color; /* transparent color for non-palette image */
-#endif
-
-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* The bKGD chunk gives the suggested image background color if the
-    * display program does not have its own background color and the image
-    * is needs to composited onto a background before display.  The colors
-    * in "background" are normally in the same color space/depth as the
-    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
-    */
-   png_color_16 background;
-#endif
-
-#ifdef PNG_oFFs_SUPPORTED
-   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
-    * and downwards from the top-left corner of the display, page, or other
-    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines
-    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.
-    */
-   png_int_32 x_offset; /* x offset on page */
-   png_int_32 y_offset; /* y offset on page */
-   png_byte offset_unit_type; /* offset units type */
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-   /* The pHYs chunk gives the physical pixel density of the image for
-    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
-    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
-    */
-   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */
-   png_uint_32 y_pixels_per_unit; /* vertical pixel density */
-   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */
-#endif
-
-#ifdef PNG_eXIf_SUPPORTED
-   int num_exif;  /* Added at libpng-1.6.31 */
-   png_bytep exif;
-# ifdef PNG_READ_eXIf_SUPPORTED
-   png_bytep eXIf_buf;  /* Added at libpng-1.6.32 */
-# endif
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-   /* The hIST chunk contains the relative frequency or importance of the
-    * various palette entries, so that a viewer can intelligently select a
-    * reduced-color palette, if required.  Data is an array of "num_palette"
-    * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)
-    * is non-zero.
-    */
-   png_uint_16p hist;
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-   /* The pCAL chunk describes a transformation between the stored pixel
-    * values and original physical data values used to create the image.
-    * The integer range [0, 2^bit_depth - 1] maps to the floating-point
-    * range given by [pcal_X0, pcal_X1], and are further transformed by a
-    * (possibly non-linear) transformation function given by "pcal_type"
-    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
-    * defines below, and the PNG-Group's PNG extensions document for a
-    * complete description of the transformations and how they should be
-    * implemented, and for a description of the ASCII parameter strings.
-    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
-    */
-   png_charp pcal_purpose;  /* pCAL chunk description string */
-   png_int_32 pcal_X0;      /* minimum value */
-   png_int_32 pcal_X1;      /* maximum value */
-   png_charp pcal_units;    /* Latin-1 string giving physical units */
-   png_charpp pcal_params;  /* ASCII strings containing parameter values */
-   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */
-   png_byte pcal_nparams;   /* number of parameters given in pcal_params */
-#endif
-
-/* New members added in libpng-1.0.6 */
-   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-   /* Storage for unknown chunks that the library doesn't recognize. */
-   png_unknown_chunkp unknown_chunks;
-
-   /* The type of this field is limited by the type of
-    * png_struct::user_chunk_cache_max, else overflow can occur.
-    */
-   int                unknown_chunks_num;
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-   /* Data on sPLT chunks (there may be more than one). */
-   png_sPLT_tp splt_palettes;
-   int         splt_palettes_num; /* Match type returned by png_get API */
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-   /* The sCAL chunk describes the actual physical dimensions of the
-    * subject matter of the graphic.  The chunk contains a unit specification
-    * a byte value, and two ASCII strings representing floating-point
-    * values.  The values are width and height corresponsing to one pixel
-    * in the image.  Data values are valid if (valid & PNG_INFO_sCAL) is
-    * non-zero.
-    */
-   png_byte scal_unit;         /* unit of physical scale */
-   png_charp scal_s_width;     /* string containing height */
-   png_charp scal_s_height;    /* string containing width */
-#endif
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS)
-      non-zero */
-   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */
-   png_bytepp row_pointers;        /* the image bits */
-#endif
-
-};
-#endif /* PNGINFO_H */
diff --git a/src/png/libpng/pngmem.c b/src/png/libpng/pngmem.c
deleted file mode 100644
index ff3ef7e88..000000000
--- a/src/png/libpng/pngmem.c
+++ /dev/null
@@ -1,284 +0,0 @@
-
-/* pngmem.c - stub functions for memory allocation
- *
- * Last changed in libpng 1.6.26 [October 20, 2016]
- * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all memory allocation.  Users who
- * need special memory handling are expected to supply replacement
- * functions for png_malloc() and png_free(), and to use
- * png_create_read_struct_2() and png_create_write_struct_2() to
- * identify the replacement functions.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-/* Free a png_struct */
-void /* PRIVATE */
-png_destroy_png_struct(png_structrp png_ptr)
-{
-   if (png_ptr != NULL)
-   {
-      /* png_free might call png_error and may certainly call
-       * png_get_mem_ptr, so fake a temporary png_struct to support this.
-       */
-      png_struct dummy_struct = *png_ptr;
-      memset(png_ptr, 0, (sizeof *png_ptr));
-      png_free(&dummy_struct, png_ptr);
-
-#     ifdef PNG_SETJMP_SUPPORTED
-         /* We may have a jmp_buf left to deallocate. */
-         png_free_jmpbuf(&dummy_struct);
-#     endif
-   }
-}
-
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more than 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information.  zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   ret = png_malloc(png_ptr, size);
-
-   if (ret != NULL)
-      memset(ret, 0, size);
-
-   return ret;
-}
-
-/* png_malloc_base, an internal function added at libpng 1.6.0, does the work of
- * allocating memory, taking into account limits and PNG_USER_MEM_SUPPORTED.
- * Checking and error handling must happen outside this routine; it returns NULL
- * if the allocation cannot be done (for any reason.)
- */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED)
-{
-   /* Moved to png_malloc_base from png_malloc_default in 1.6.0; the DOS
-    * allocators have also been removed in 1.6.0, so any 16-bit system now has
-    * to implement a user memory handler.  This checks to be sure it isn't
-    * called with big numbers.
-    */
-#ifndef PNG_USER_MEM_SUPPORTED
-   PNG_UNUSED(png_ptr)
-#endif
-
-   /* Some compilers complain that this is always true.  However, it
-    * can be false when integer overflow happens.
-    */
-   if (size > 0 && size <= PNG_SIZE_MAX
-#     ifdef PNG_MAX_MALLOC_64K
-         && size <= 65536U
-#     endif
-      )
-   {
-#ifdef PNG_USER_MEM_SUPPORTED
-      if (png_ptr != NULL && png_ptr->malloc_fn != NULL)
-         return png_ptr->malloc_fn(png_constcast(png_structrp,png_ptr), size);
-
-      else
-#endif
-         return malloc((size_t)size); /* checked for truncation above */
-   }
-
-   else
-      return NULL;
-}
-
-#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
-   defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)
-/* This is really here only to work round a spurious warning in GCC 4.6 and 4.7
- * that arises because of the checks in png_realloc_array that are repeated in
- * png_malloc_array.
- */
-static png_voidp
-png_malloc_array_checked(png_const_structrp png_ptr, int nelements,
-    size_t element_size)
-{
-   png_alloc_size_t req = (png_alloc_size_t)nelements; /* known to be > 0 */
-
-   if (req <= PNG_SIZE_MAX/element_size)
-      return png_malloc_base(png_ptr, req * element_size);
-
-   /* The failure case when the request is too large */
-   return NULL;
-}
-
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_malloc_array,(png_const_structrp png_ptr, int nelements,
-    size_t element_size),PNG_ALLOCATED)
-{
-   if (nelements <= 0 || element_size == 0)
-      png_error(png_ptr, "internal error: array alloc");
-
-   return png_malloc_array_checked(png_ptr, nelements, element_size);
-}
-
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array,
-    int old_elements, int add_elements, size_t element_size),PNG_ALLOCATED)
-{
-   /* These are internal errors: */
-   if (add_elements <= 0 || element_size == 0 || old_elements < 0 ||
-      (old_array == NULL && old_elements > 0))
-      png_error(png_ptr, "internal error: array realloc");
-
-   /* Check for overflow on the elements count (so the caller does not have to
-    * check.)
-    */
-   if (add_elements <= INT_MAX - old_elements)
-   {
-      png_voidp new_array = png_malloc_array_checked(png_ptr,
-          old_elements+add_elements, element_size);
-
-      if (new_array != NULL)
-      {
-         /* Because png_malloc_array worked the size calculations below cannot
-          * overflow.
-          */
-         if (old_elements > 0)
-            memcpy(new_array, old_array, element_size*(unsigned)old_elements);
-
-         memset((char*)new_array + element_size*(unsigned)old_elements, 0,
-             element_size*(unsigned)add_elements);
-
-         return new_array;
-      }
-   }
-
-   return NULL; /* error */
-}
-#endif /* TEXT || sPLT || STORE_UNKNOWN_CHUNKS */
-
-/* Various functions that have different error handling are derived from this.
- * png_malloc always exists, but if PNG_USER_MEM_SUPPORTED is defined a separate
- * function png_malloc_default is also provided.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   if (png_ptr == NULL)
-      return NULL;
-
-   ret = png_malloc_base(png_ptr, size);
-
-   if (ret == NULL)
-       png_error(png_ptr, "Out of memory"); /* 'm' means png_malloc */
-
-   return ret;
-}
-
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED PNG_DEPRECATED)
-{
-   png_voidp ret;
-
-   if (png_ptr == NULL)
-      return NULL;
-
-   /* Passing 'NULL' here bypasses the application provided memory handler. */
-   ret = png_malloc_base(NULL/*use malloc*/, size);
-
-   if (ret == NULL)
-      png_error(png_ptr, "Out of Memory"); /* 'M' means png_malloc_default */
-
-   return ret;
-}
-#endif /* USER_MEM */
-
-/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
- * function will issue a png_warning and return NULL instead of issuing a
- * png_error, if it fails to allocate the requested memory.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_warn,(png_const_structrp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED)
-{
-   if (png_ptr != NULL)
-   {
-      png_voidp ret = png_malloc_base(png_ptr, size);
-
-      if (ret != NULL)
-         return ret;
-
-      png_warning(png_ptr, "Out of memory");
-   }
-
-   return NULL;
-}
-
-/* Free a pointer allocated by png_malloc().  If ptr is NULL, return
- * without taking any action.
- */
-void PNGAPI
-png_free(png_const_structrp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->free_fn != NULL)
-      png_ptr->free_fn(png_constcast(png_structrp,png_ptr), ptr);
-
-   else
-      png_free_default(png_ptr, ptr);
-}
-
-PNG_FUNCTION(void,PNGAPI
-png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-#endif /* USER_MEM */
-
-   free(ptr);
-}
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* This function is called when the application wants to use another method
- * of allocating and freeing memory.
- */
-void PNGAPI
-png_set_mem_fn(png_structrp png_ptr, png_voidp mem_ptr, png_malloc_ptr
-  malloc_fn, png_free_ptr free_fn)
-{
-   if (png_ptr != NULL)
-   {
-      png_ptr->mem_ptr = mem_ptr;
-      png_ptr->malloc_fn = malloc_fn;
-      png_ptr->free_fn = free_fn;
-   }
-}
-
-/* This function returns a pointer to the mem_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy and png_read_destroy are called.
- */
-png_voidp PNGAPI
-png_get_mem_ptr(png_const_structrp png_ptr)
-{
-   if (png_ptr == NULL)
-      return NULL;
-
-   return png_ptr->mem_ptr;
-}
-#endif /* USER_MEM */
-#endif /* READ || WRITE */
diff --git a/src/png/libpng/pngpread.c b/src/png/libpng/pngpread.c
deleted file mode 100644
index fbe361dc3..000000000
--- a/src/png/libpng/pngpread.c
+++ /dev/null
@@ -1,1096 +0,0 @@
-
-/* pngpread.c - read a png file in push mode
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-
-/* Push model modes */
-#define PNG_READ_SIG_MODE   0
-#define PNG_READ_CHUNK_MODE 1
-#define PNG_READ_IDAT_MODE  2
-#define PNG_READ_tEXt_MODE  4
-#define PNG_READ_zTXt_MODE  5
-#define PNG_READ_DONE_MODE  6
-#define PNG_READ_iTXt_MODE  7
-#define PNG_ERROR_MODE      8
-
-#define PNG_PUSH_SAVE_BUFFER_IF_FULL \
-if (png_ptr->push_length + 4 > png_ptr->buffer_size) \
-   { png_push_save_buffer(png_ptr); return; }
-#define PNG_PUSH_SAVE_BUFFER_IF_LT(N) \
-if (png_ptr->buffer_size < N) \
-   { png_push_save_buffer(png_ptr); return; }
-
-void PNGAPI
-png_process_data(png_structrp png_ptr, png_inforp info_ptr,
-    png_bytep buffer, png_size_t buffer_size)
-{
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_push_restore_buffer(png_ptr, buffer, buffer_size);
-
-   while (png_ptr->buffer_size)
-   {
-      png_process_some_data(png_ptr, info_ptr);
-   }
-}
-
-png_size_t PNGAPI
-png_process_data_pause(png_structrp png_ptr, int save)
-{
-   if (png_ptr != NULL)
-   {
-      /* It's easiest for the caller if we do the save; then the caller doesn't
-       * have to supply the same data again:
-       */
-      if (save != 0)
-         png_push_save_buffer(png_ptr);
-      else
-      {
-         /* This includes any pending saved bytes: */
-         png_size_t remaining = png_ptr->buffer_size;
-         png_ptr->buffer_size = 0;
-
-         /* So subtract the saved buffer size, unless all the data
-          * is actually 'saved', in which case we just return 0
-          */
-         if (png_ptr->save_buffer_size < remaining)
-            return remaining - png_ptr->save_buffer_size;
-      }
-   }
-
-   return 0;
-}
-
-png_uint_32 PNGAPI
-png_process_data_skip(png_structrp png_ptr)
-{
-/* TODO: Deprecate and remove this API.
- * Somewhere the implementation of this seems to have been lost,
- * or abandoned.  It was only to support some internal back-door access
- * to png_struct) in libpng-1.4.x.
- */
-   png_app_warning(png_ptr,
-"png_process_data_skip is not implemented in any current version of libpng");
-   return 0;
-}
-
-/* What we do with the incoming data depends on what we were previously
- * doing before we ran out of data...
- */
-void /* PRIVATE */
-png_process_some_data(png_structrp png_ptr, png_inforp info_ptr)
-{
-   if (png_ptr == NULL)
-      return;
-
-   switch (png_ptr->process_mode)
-   {
-      case PNG_READ_SIG_MODE:
-      {
-         png_push_read_sig(png_ptr, info_ptr);
-         break;
-      }
-
-      case PNG_READ_CHUNK_MODE:
-      {
-         png_push_read_chunk(png_ptr, info_ptr);
-         break;
-      }
-
-      case PNG_READ_IDAT_MODE:
-      {
-         png_push_read_IDAT(png_ptr);
-         break;
-      }
-
-      default:
-      {
-         png_ptr->buffer_size = 0;
-         break;
-      }
-   }
-}
-
-/* Read any remaining signature bytes from the stream and compare them with
- * the correct PNG signature.  It is possible that this routine is called
- * with bytes already read from the signature, either because they have been
- * checked by the calling application, or because of multiple calls to this
- * routine.
- */
-void /* PRIVATE */
-png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
-{
-   png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */
-       num_to_check = 8 - num_checked;
-
-   if (png_ptr->buffer_size < num_to_check)
-   {
-      num_to_check = png_ptr->buffer_size;
-   }
-
-   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
-       num_to_check);
-   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
-
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
-   {
-      if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-         png_error(png_ptr, "Not a PNG file");
-
-      else
-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
-   }
-   else
-   {
-      if (png_ptr->sig_bytes >= 8)
-      {
-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-      }
-   }
-}
-
-void /* PRIVATE */
-png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
-{
-   png_uint_32 chunk_name;
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   int keep; /* unknown handling method */
-#endif
-
-   /* First we make sure we have enough data for the 4-byte chunk name
-    * and the 4-byte chunk length before proceeding with decoding the
-    * chunk data.  To fully decode each of these chunks, we also make
-    * sure we have enough data in the buffer for the 4-byte CRC at the
-    * end of every chunk (except IDAT, which is handled separately).
-    */
-   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
-   {
-      png_byte chunk_length[4];
-      png_byte chunk_tag[4];
-
-      PNG_PUSH_SAVE_BUFFER_IF_LT(8)
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, chunk_tag, 4);
-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
-      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-      png_check_chunk_length(png_ptr, png_ptr->push_length);
-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-   }
-
-   chunk_name = png_ptr->chunk_name;
-
-   if (chunk_name == png_IDAT)
-   {
-      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-
-      /* If we reach an IDAT chunk, this means we have read all of the
-       * header chunks, and we can start reading the image (or if this
-       * is called after the image has been read - we have an error).
-       */
-      if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-         png_error(png_ptr, "Missing IHDR before IDAT");
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-          (png_ptr->mode & PNG_HAVE_PLTE) == 0)
-         png_error(png_ptr, "Missing PLTE before IDAT");
-
-      png_ptr->process_mode = PNG_READ_IDAT_MODE;
-
-      if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-         if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
-            if (png_ptr->push_length == 0)
-               return;
-
-      png_ptr->mode |= PNG_HAVE_IDAT;
-
-      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
-         png_benign_error(png_ptr, "Too many IDATs found");
-   }
-
-   if (chunk_name == png_IHDR)
-   {
-      if (png_ptr->push_length != 13)
-         png_error(png_ptr, "Invalid IHDR length");
-
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   else if (chunk_name == png_IEND)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
-
-      png_ptr->process_mode = PNG_READ_DONE_MODE;
-      png_push_have_end(png_ptr, info_ptr);
-   }
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length, keep);
-
-      if (chunk_name == png_PLTE)
-         png_ptr->mode |= PNG_HAVE_PLTE;
-   }
-#endif
-
-   else if (chunk_name == png_PLTE)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   else if (chunk_name == png_IDAT)
-   {
-      png_ptr->idat_size = png_ptr->push_length;
-      png_ptr->process_mode = PNG_READ_IDAT_MODE;
-      png_push_have_info(png_ptr, info_ptr);
-      png_ptr->zstream.avail_out =
-          (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
-          png_ptr->iwidth) + 1;
-      png_ptr->zstream.next_out = png_ptr->row_buf;
-      return;
-   }
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-   else if (png_ptr->chunk_name == png_gAMA)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-   else if (png_ptr->chunk_name == png_sBIT)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-   else if (png_ptr->chunk_name == png_cHRM)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-   else if (chunk_name == png_sRGB)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-   else if (png_ptr->chunk_name == png_iCCP)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-   else if (chunk_name == png_sPLT)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-   else if (chunk_name == png_tRNS)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_bKGD_SUPPORTED
-   else if (chunk_name == png_bKGD)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-   else if (chunk_name == png_hIST)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-   else if (chunk_name == png_pHYs)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-   else if (chunk_name == png_oFFs)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-   else if (chunk_name == png_pCAL)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-   else if (chunk_name == png_sCAL)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-   else if (chunk_name == png_tIME)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-   else if (chunk_name == png_tEXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-   else if (chunk_name == png_zTXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-   else if (chunk_name == png_iTXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
-   else
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
-          PNG_HANDLE_CHUNK_AS_DEFAULT);
-   }
-
-   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-}
-
-void PNGCBAPI
-png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
-{
-   png_bytep ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   ptr = buffer;
-   if (png_ptr->save_buffer_size != 0)
-   {
-      png_size_t save_size;
-
-      if (length < png_ptr->save_buffer_size)
-         save_size = length;
-
-      else
-         save_size = png_ptr->save_buffer_size;
-
-      memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
-      length -= save_size;
-      ptr += save_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-   if (length != 0 && png_ptr->current_buffer_size != 0)
-   {
-      png_size_t save_size;
-
-      if (length < png_ptr->current_buffer_size)
-         save_size = length;
-
-      else
-         save_size = png_ptr->current_buffer_size;
-
-      memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-}
-
-void /* PRIVATE */
-png_push_save_buffer(png_structrp png_ptr)
-{
-   if (png_ptr->save_buffer_size != 0)
-   {
-      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
-      {
-         png_size_t i, istop;
-         png_bytep sp;
-         png_bytep dp;
-
-         istop = png_ptr->save_buffer_size;
-         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
-             i < istop; i++, sp++, dp++)
-         {
-            *dp = *sp;
-         }
-      }
-   }
-   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
-       png_ptr->save_buffer_max)
-   {
-      png_size_t new_max;
-      png_bytep old_buffer;
-
-      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
-          (png_ptr->current_buffer_size + 256))
-      {
-         png_error(png_ptr, "Potential overflow of save_buffer");
-      }
-
-      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
-      old_buffer = png_ptr->save_buffer;
-      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
-          (png_size_t)new_max);
-
-      if (png_ptr->save_buffer == NULL)
-      {
-         png_free(png_ptr, old_buffer);
-         png_error(png_ptr, "Insufficient memory for save_buffer");
-      }
-
-      if (old_buffer)
-         memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
-      else if (png_ptr->save_buffer_size)
-         png_error(png_ptr, "save_buffer error");
-      png_free(png_ptr, old_buffer);
-      png_ptr->save_buffer_max = new_max;
-   }
-   if (png_ptr->current_buffer_size)
-   {
-      memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
-         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
-      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
-      png_ptr->current_buffer_size = 0;
-   }
-   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
-   png_ptr->buffer_size = 0;
-}
-
-void /* PRIVATE */
-png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
-    png_size_t buffer_length)
-{
-   png_ptr->current_buffer = buffer;
-   png_ptr->current_buffer_size = buffer_length;
-   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
-   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
-}
-
-void /* PRIVATE */
-png_push_read_IDAT(png_structrp png_ptr)
-{
-   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
-   {
-      png_byte chunk_length[4];
-      png_byte chunk_tag[4];
-
-      /* TODO: this code can be commoned up with the same code in push_read */
-      PNG_PUSH_SAVE_BUFFER_IF_LT(8)
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, chunk_tag, 4);
-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-
-      if (png_ptr->chunk_name != png_IDAT)
-      {
-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-
-         if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
-            png_error(png_ptr, "Not enough compressed data");
-
-         return;
-      }
-
-      png_ptr->idat_size = png_ptr->push_length;
-   }
-
-   if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
-   {
-      png_size_t save_size = png_ptr->save_buffer_size;
-      png_uint_32 idat_size = png_ptr->idat_size;
-
-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
-       * are of different types and we don't know which variable has the fewest
-       * bits.  Carefully select the smaller and cast it to the type of the
-       * larger - this cannot overflow.  Do not cast in the following test - it
-       * will break on either 16-bit or 64-bit platforms.
-       */
-      if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
-
-      else
-         idat_size = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_ptr->idat_size -= idat_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-
-   if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0)
-   {
-      png_size_t save_size = png_ptr->current_buffer_size;
-      png_uint_32 idat_size = png_ptr->idat_size;
-
-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
-       * are of different types and we don't know which variable has the fewest
-       * bits.  Carefully select the smaller and cast it to the type of the
-       * larger - this cannot overflow.
-       */
-      if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
-
-      else
-         idat_size = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_ptr->idat_size -= idat_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-
-   if (png_ptr->idat_size == 0)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_LT(4)
-      png_crc_finish(png_ptr, 0);
-      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-      png_ptr->mode |= PNG_AFTER_IDAT;
-      png_ptr->zowner = 0;
-   }
-}
-
-void /* PRIVATE */
-png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,
-    png_size_t buffer_length)
-{
-   /* The caller checks for a non-zero buffer length. */
-   if (!(buffer_length > 0) || buffer == NULL)
-      png_error(png_ptr, "No IDAT data (internal error)");
-
-   /* This routine must process all the data it has been given
-    * before returning, calling the row callback as required to
-    * handle the uncompressed results.
-    */
-   png_ptr->zstream.next_in = buffer;
-   /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
-   png_ptr->zstream.avail_in = (uInt)buffer_length;
-
-   /* Keep going until the decompressed data is all processed
-    * or the stream marked as finished.
-    */
-   while (png_ptr->zstream.avail_in > 0 &&
-      (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
-   {
-      int ret;
-
-      /* We have data for zlib, but we must check that zlib
-       * has someplace to put the results.  It doesn't matter
-       * if we don't expect any results -- it may be the input
-       * data is just the LZ end code.
-       */
-      if (!(png_ptr->zstream.avail_out > 0))
-      {
-         /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
-         png_ptr->zstream.avail_out = (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
-             png_ptr->iwidth) + 1);
-
-         png_ptr->zstream.next_out = png_ptr->row_buf;
-      }
-
-      /* Using Z_SYNC_FLUSH here means that an unterminated
-       * LZ stream (a stream with a missing end code) can still
-       * be handled, otherwise (Z_NO_FLUSH) a future zlib
-       * implementation might defer output and therefore
-       * change the current behavior (see comments in inflate.c
-       * for why this doesn't happen at present with zlib 1.2.5).
-       */
-      ret = PNG_INFLATE(png_ptr, Z_SYNC_FLUSH);
-
-      /* Check for any failure before proceeding. */
-      if (ret != Z_OK && ret != Z_STREAM_END)
-      {
-         /* Terminate the decompression. */
-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-         png_ptr->zowner = 0;
-
-         /* This may be a truncated stream (missing or
-          * damaged end code).  Treat that as a warning.
-          */
-         if (png_ptr->row_number >= png_ptr->num_rows ||
-             png_ptr->pass > 6)
-            png_warning(png_ptr, "Truncated compressed data in IDAT");
-
-         else
-         {
-            if (ret == Z_DATA_ERROR)
-               png_benign_error(png_ptr, "IDAT: ADLER32 checksum mismatch");
-            else
-               png_error(png_ptr, "Decompression error in IDAT");
-         }
-
-         /* Skip the check on unprocessed input */
-         return;
-      }
-
-      /* Did inflate output any data? */
-      if (png_ptr->zstream.next_out != png_ptr->row_buf)
-      {
-         /* Is this unexpected data after the last row?
-          * If it is, artificially terminate the LZ output
-          * here.
-          */
-         if (png_ptr->row_number >= png_ptr->num_rows ||
-             png_ptr->pass > 6)
-         {
-            /* Extra data. */
-            png_warning(png_ptr, "Extra compressed data in IDAT");
-            png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-            png_ptr->zowner = 0;
-
-            /* Do no more processing; skip the unprocessed
-             * input check below.
-             */
-            return;
-         }
-
-         /* Do we have a complete row? */
-         if (png_ptr->zstream.avail_out == 0)
-            png_push_process_row(png_ptr);
-      }
-
-      /* And check for the end of the stream. */
-      if (ret == Z_STREAM_END)
-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-   }
-
-   /* All the data should have been processed, if anything
-    * is left at this point we have bytes of IDAT data
-    * after the zlib end code.
-    */
-   if (png_ptr->zstream.avail_in > 0)
-      png_warning(png_ptr, "Extra compression data in IDAT");
-}
-
-void /* PRIVATE */
-png_push_process_row(png_structrp png_ptr)
-{
-   /* 1.5.6: row_info moved out of png_struct to a local here. */
-   png_row_info row_info;
-
-   row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
-   row_info.color_type = png_ptr->color_type;
-   row_info.bit_depth = png_ptr->bit_depth;
-   row_info.channels = png_ptr->channels;
-   row_info.pixel_depth = png_ptr->pixel_depth;
-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-   if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
-   {
-      if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
-         png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
-            png_ptr->prev_row + 1, png_ptr->row_buf[0]);
-      else
-         png_error(png_ptr, "bad adaptive filter value");
-   }
-
-   /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
-    * 1.5.6, while the buffer really is this big in current versions of libpng
-    * it may not be in the future, so this was changed just to copy the
-    * interlaced row count:
-    */
-   memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   if (png_ptr->transformations != 0)
-      png_do_read_transformations(png_ptr, &row_info);
-#endif
-
-   /* The transformed pixel depth should match the depth now in row_info. */
-   if (png_ptr->transformed_pixel_depth == 0)
-   {
-      png_ptr->transformed_pixel_depth = row_info.pixel_depth;
-      if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
-         png_error(png_ptr, "progressive row overflow");
-   }
-
-   else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
-      png_error(png_ptr, "internal progressive row size calculation error");
-
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Expand interlaced rows to full size */
-   if (png_ptr->interlaced != 0 &&
-       (png_ptr->transformations & PNG_INTERLACE) != 0)
-   {
-      if (png_ptr->pass < 6)
-         png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
-             png_ptr->transformations);
-
-      switch (png_ptr->pass)
-      {
-         case 0:
-         {
-            int i;
-            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */
-            }
-
-            if (png_ptr->pass == 2) /* Pass 1 might be empty */
-            {
-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            if (png_ptr->pass == 4 && png_ptr->height <= 4)
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            if (png_ptr->pass == 6 && png_ptr->height <= 4)
-            {
-                png_push_have_row(png_ptr, NULL);
-                png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         case 1:
-         {
-            int i;
-            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 2) /* Skip top 4 generated rows */
-            {
-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 2:
-         {
-            int i;
-
-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 4) /* Pass 3 might be empty */
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 3:
-         {
-            int i;
-
-            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 4) /* Skip top two generated rows */
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 4:
-         {
-            int i;
-
-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 6) /* Pass 5 might be empty */
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         case 5:
-         {
-            int i;
-
-            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 6) /* Skip top generated row */
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         default:
-         case 6:
-         {
-            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-            png_read_push_finish_row(png_ptr);
-
-            if (png_ptr->pass != 6)
-               break;
-
-            png_push_have_row(png_ptr, NULL);
-            png_read_push_finish_row(png_ptr);
-         }
-      }
-   }
-   else
-#endif
-   {
-      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-      png_read_push_finish_row(png_ptr);
-   }
-}
-
-void /* PRIVATE */
-png_read_push_finish_row(png_structrp png_ptr)
-{
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-
-   /* Height of interlace block.  This is not currently used - if you need
-    * it, uncomment it here and in png.h
-   static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
-   */
-#endif
-
-   png_ptr->row_number++;
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced != 0)
-   {
-      png_ptr->row_number = 0;
-      memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-      do
-      {
-         png_ptr->pass++;
-         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
-             (png_ptr->pass == 3 && png_ptr->width < 3) ||
-             (png_ptr->pass == 5 && png_ptr->width < 2))
-            png_ptr->pass++;
-
-         if (png_ptr->pass > 7)
-            png_ptr->pass--;
-
-         if (png_ptr->pass >= 7)
-            break;
-
-         png_ptr->iwidth = (png_ptr->width +
-             png_pass_inc[png_ptr->pass] - 1 -
-             png_pass_start[png_ptr->pass]) /
-             png_pass_inc[png_ptr->pass];
-
-         if ((png_ptr->transformations & PNG_INTERLACE) != 0)
-            break;
-
-         png_ptr->num_rows = (png_ptr->height +
-             png_pass_yinc[png_ptr->pass] - 1 -
-             png_pass_ystart[png_ptr->pass]) /
-             png_pass_yinc[png_ptr->pass];
-
-      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
-   }
-#endif /* READ_INTERLACING */
-}
-
-void /* PRIVATE */
-png_push_have_info(png_structrp png_ptr, png_inforp info_ptr)
-{
-   if (png_ptr->info_fn != NULL)
-      (*(png_ptr->info_fn))(png_ptr, info_ptr);
-}
-
-void /* PRIVATE */
-png_push_have_end(png_structrp png_ptr, png_inforp info_ptr)
-{
-   if (png_ptr->end_fn != NULL)
-      (*(png_ptr->end_fn))(png_ptr, info_ptr);
-}
-
-void /* PRIVATE */
-png_push_have_row(png_structrp png_ptr, png_bytep row)
-{
-   if (png_ptr->row_fn != NULL)
-      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
-          (int)png_ptr->pass);
-}
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-void PNGAPI
-png_progressive_combine_row(png_const_structrp png_ptr, png_bytep old_row,
-    png_const_bytep new_row)
-{
-   if (png_ptr == NULL)
-      return;
-
-   /* new_row is a flag here - if it is NULL then the app callback was called
-    * from an empty row (see the calls to png_struct::row_fn below), otherwise
-    * it must be png_ptr->row_buf+1
-    */
-   if (new_row != NULL)
-      png_combine_row(png_ptr, old_row, 1/*blocky display*/);
-}
-#endif /* READ_INTERLACING */
-
-void PNGAPI
-png_set_progressive_read_fn(png_structrp png_ptr, png_voidp progressive_ptr,
-    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
-    png_progressive_end_ptr end_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->info_fn = info_fn;
-   png_ptr->row_fn = row_fn;
-   png_ptr->end_fn = end_fn;
-
-   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
-}
-
-png_voidp PNGAPI
-png_get_progressive_ptr(png_const_structrp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return png_ptr->io_ptr;
-}
-#endif /* PROGRESSIVE_READ */
diff --git a/src/png/libpng/pngpriv.h b/src/png/libpng/pngpriv.h
deleted file mode 100644
index 1f2e90f2b..000000000
--- a/src/png/libpng/pngpriv.h
+++ /dev/null
@@ -1,2120 +0,0 @@
-
-/* pngpriv.h - private declarations for use inside libpng
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* The symbols declared in this file (including the functions declared
- * as extern) are PRIVATE.  They are not part of the libpng public
- * interface, and are not recommended for use by regular applications.
- * Some of them may become public in the future; others may stay private,
- * change in an incompatible way, or even disappear.
- * Although the libpng users are not forbidden to include this header,
- * they should be well aware of the issues that may arise from doing so.
- */
-
-#ifndef PNGPRIV_H
-#define PNGPRIV_H
-
-/* Feature Test Macros.  The following are defined here to ensure that correctly
- * implemented libraries reveal the APIs libpng needs to build and hide those
- * that are not needed and potentially damaging to the compilation.
- *
- * Feature Test Macros must be defined before any system header is included (see
- * POSIX 1003.1 2.8.2 "POSIX Symbols."
- *
- * These macros only have an effect if the operating system supports either
- * POSIX 1003.1 or C99, or both.  On other operating systems (particularly
- * Windows/Visual Studio) there is no effect; the OS specific tests below are
- * still required (as of 2011-05-02.)
- */
-#ifndef _POSIX_SOURCE
-# define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* Standard library headers not required by png.h: */
-#  include <stdlib.h>
-#  include <string.h>
-#endif
-
-#define PNGLIB_BUILD /*libpng is being built, not used*/
-
-/* If HAVE_CONFIG_H is defined during the build then the build system must
- * provide an appropriate "config.h" file on the include path.  The header file
- * must provide definitions as required below (search for "HAVE_CONFIG_H");
- * see configure.ac for more details of the requirements.  The macro
- * "PNG_NO_CONFIG_H" is provided for maintainers to test for dependencies on
- * 'configure'; define this macro to prevent the configure build including the
- * configure generated config.h.  Libpng is expected to compile without *any*
- * special build system support on a reasonably ANSI-C compliant system.
- */
-#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
-#  include <config.h>
-
-   /* Pick up the definition of 'restrict' from config.h if it was read: */
-#  define PNG_RESTRICT restrict
-#endif
-
-/* To support symbol prefixing it is necessary to know *before* including png.h
- * whether the fixed point (and maybe other) APIs are exported, because if they
- * are not internal definitions may be required.  This is handled below just
- * before png.h is included, but load the configuration now if it is available.
- */
-#ifndef PNGLCONF_H
-#  include "pnglibconf.h"
-#endif
-
-/* Local renames may change non-exported API functions from png.h */
-#if defined(PNG_PREFIX) && !defined(PNGPREFIX_H)
-#  include "pngprefix.h"
-#endif
-
-#ifdef PNG_USER_CONFIG
-#  include "pngusr.h"
-   /* These should have been defined in pngusr.h */
-#  ifndef PNG_USER_PRIVATEBUILD
-#    define PNG_USER_PRIVATEBUILD "Custom libpng build"
-#  endif
-#  ifndef PNG_USER_DLLFNAME_POSTFIX
-#    define PNG_USER_DLLFNAME_POSTFIX "Cb"
-#  endif
-#endif
-
-/* Compile time options.
- * =====================
- * In a multi-arch build the compiler may compile the code several times for the
- * same object module, producing different binaries for different architectures.
- * When this happens configure-time setting of the target host options cannot be
- * done and this interferes with the handling of the ARM NEON optimizations, and
- * possibly other similar optimizations.  Put additional tests here; in general
- * this is needed when the same option can be changed at both compile time and
- * run time depending on the target OS (i.e. iOS vs Android.)
- *
- * NOTE: symbol prefixing does not pass $(CFLAGS) to the preprocessor, because
- * this is not possible with certain compilers (Oracle SUN OS CC), as a result
- * it is necessary to ensure that all extern functions that *might* be used
- * regardless of $(CFLAGS) get declared in this file.  The test on __ARM_NEON__
- * below is one example of this behavior because it is controlled by the
- * presence or not of -mfpu=neon on the GCC command line, it is possible to do
- * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely
- * do this.
- */
-#ifndef PNG_ARM_NEON_OPT
-   /* ARM NEON optimizations are being controlled by the compiler settings,
-    * typically the target FPU.  If the FPU has been set to NEON (-mfpu=neon
-    * with GCC) then the compiler will define __ARM_NEON__ and we can rely
-    * unconditionally on NEON instructions not crashing, otherwise we must
-    * disable use of NEON instructions.
-    *
-    * NOTE: at present these optimizations depend on 'ALIGNED_MEMORY', so they
-    * can only be turned on automatically if that is supported too.  If
-    * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail
-    * to compile with an appropriate #error if ALIGNED_MEMORY has been turned
-    * off.
-    *
-    * Note that gcc-4.9 defines __ARM_NEON instead of the deprecated
-    * __ARM_NEON__, so we check both variants.
-    *
-    * To disable ARM_NEON optimizations entirely, and skip compiling the
-    * associated assembler code, pass --enable-arm-neon=no to configure
-    * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.
-    */
-#  if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
-   defined(PNG_ALIGNED_MEMORY_SUPPORTED)
-#     define PNG_ARM_NEON_OPT 2
-#  else
-#     define PNG_ARM_NEON_OPT 0
-#  endif
-#endif
-
-#if PNG_ARM_NEON_OPT > 0
-   /* NEON optimizations are to be at least considered by libpng, so enable the
-    * callbacks to do this.
-    */
-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
-
-   /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used
-    * if possible - if __ARM_NEON__ is set and the compiler version is not known
-    * to be broken.  This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can
-    * be:
-    *
-    *    1  The intrinsics code (the default with __ARM_NEON__)
-    *    2  The hand coded assembler (the default without __ARM_NEON__)
-    *
-    * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however
-    * this is *NOT* supported and may cease to work even after a minor revision
-    * to libpng.  It *is* valid to do this for testing purposes, e.g. speed
-    * testing or a new compiler, but the results should be communicated to the
-    * libpng implementation list for incorporation in the next minor release.
-    */
-#  ifndef PNG_ARM_NEON_IMPLEMENTATION
-#     if defined(__ARM_NEON__) || defined(__ARM_NEON)
-#        if defined(__clang__)
-            /* At present it is unknown by the libpng developers which versions
-             * of clang support the intrinsics, however some or perhaps all
-             * versions do not work with the assembler so this may be
-             * irrelevant, so just use the default (do nothing here.)
-             */
-#        elif defined(__GNUC__)
-            /* GCC 4.5.4 NEON support is known to be broken.  4.6.3 is known to
-             * work, so if this *is* GCC, or G++, look for a version >4.5
-             */
-#           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
-#              define PNG_ARM_NEON_IMPLEMENTATION 2
-#           endif /* no GNUC support */
-#        endif /* __GNUC__ */
-#     else /* !defined __ARM_NEON__ */
-         /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
-          */
-#        define PNG_ARM_NEON_IMPLEMENTATION 2
-#     endif /* __ARM_NEON__ */
-#  endif /* !PNG_ARM_NEON_IMPLEMENTATION */
-
-#  ifndef PNG_ARM_NEON_IMPLEMENTATION
-      /* Use the intrinsics code by default. */
-#     define PNG_ARM_NEON_IMPLEMENTATION 1
-#  endif
-#endif /* PNG_ARM_NEON_OPT > 0 */
-
-#ifndef PNG_MIPS_MSA_OPT
-#  if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
-#     define PNG_MIPS_MSA_OPT 2
-#  else
-#     define PNG_MIPS_MSA_OPT 0
-#  endif
-#endif
-
-#ifndef PNG_POWERPC_VSX_OPT
-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
-#     define PNG_POWERPC_VSX_OPT 2
-#  else
-#     define PNG_POWERPC_VSX_OPT 0
-#  endif
-#endif
-
-#ifndef PNG_INTEL_SSE_OPT
-#   ifdef PNG_INTEL_SSE
-      /* Only check for SSE if the build configuration has been modified to
-       * enable SSE optimizations.  This means that these optimizations will
-       * be off by default.  See contrib/intel for more details.
-       */
-#     if defined(__SSE4_1__) || defined(__AVX__) || defined(__SSSE3__) || \
-       defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
-       (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
-#         define PNG_INTEL_SSE_OPT 1
-#      endif
-#   endif
-#endif
-
-#if PNG_INTEL_SSE_OPT > 0
-#   ifndef PNG_INTEL_SSE_IMPLEMENTATION
-#      if defined(__SSE4_1__) || defined(__AVX__)
-          /* We are not actually using AVX, but checking for AVX is the best
-             way we can detect SSE4.1 and SSSE3 on MSVC.
-          */
-#         define PNG_INTEL_SSE_IMPLEMENTATION 3
-#      elif defined(__SSSE3__)
-#         define PNG_INTEL_SSE_IMPLEMENTATION 2
-#      elif defined(__SSE2__) || defined(_M_X64) || defined(_M_AMD64) || \
-       (defined(_M_IX86_FP) && _M_IX86_FP >= 2)
-#         define PNG_INTEL_SSE_IMPLEMENTATION 1
-#      else
-#         define PNG_INTEL_SSE_IMPLEMENTATION 0
-#      endif
-#   endif
-
-#   if PNG_INTEL_SSE_IMPLEMENTATION > 0
-#      define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_sse2
-#   endif
-#endif
-
-#if PNG_MIPS_MSA_OPT > 0
-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa
-#  ifndef PNG_MIPS_MSA_IMPLEMENTATION
-#     if defined(__mips_msa)
-#        if defined(__clang__)
-#        elif defined(__GNUC__)
-#           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
-#              define PNG_MIPS_MSA_IMPLEMENTATION 2
-#           endif /* no GNUC support */
-#        endif /* __GNUC__ */
-#     else /* !defined __mips_msa */
-#        define PNG_MIPS_MSA_IMPLEMENTATION 2
-#     endif /* __mips_msa */
-#  endif /* !PNG_MIPS_MSA_IMPLEMENTATION */
-
-#  ifndef PNG_MIPS_MSA_IMPLEMENTATION
-#     define PNG_MIPS_MSA_IMPLEMENTATION 1
-#  endif
-#endif /* PNG_MIPS_MSA_OPT > 0 */
-
-#if PNG_POWERPC_VSX_OPT > 0
-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
-#  define PNG_POWERPC_VSX_IMPLEMENTATION 1
-#endif
-
-
-/* Is this a build of a DLL where compilation of the object modules requires
- * different preprocessor settings to those required for a simple library?  If
- * so PNG_BUILD_DLL must be set.
- *
- * If libpng is used inside a DLL but that DLL does not export the libpng APIs
- * PNG_BUILD_DLL must not be set.  To avoid the code below kicking in build a
- * static library of libpng then link the DLL against that.
- */
-#ifndef PNG_BUILD_DLL
-#  ifdef DLL_EXPORT
-      /* This is set by libtool when files are compiled for a DLL; libtool
-       * always compiles twice, even on systems where it isn't necessary.  Set
-       * PNG_BUILD_DLL in case it is necessary:
-       */
-#     define PNG_BUILD_DLL
-#  else
-#     ifdef _WINDLL
-         /* This is set by the Microsoft Visual Studio IDE in projects that
-          * build a DLL.  It can't easily be removed from those projects (it
-          * isn't visible in the Visual Studio UI) so it is a fairly reliable
-          * indication that PNG_IMPEXP needs to be set to the DLL export
-          * attributes.
-          */
-#        define PNG_BUILD_DLL
-#     else
-#        ifdef __DLL__
-            /* This is set by the Borland C system when compiling for a DLL
-             * (as above.)
-             */
-#           define PNG_BUILD_DLL
-#        else
-            /* Add additional compiler cases here. */
-#        endif
-#     endif
-#  endif
-#endif /* Setting PNG_BUILD_DLL if required */
-
-/* See pngconf.h for more details: the builder of the library may set this on
- * the command line to the right thing for the specific compilation system or it
- * may be automagically set above (at present we know of no system where it does
- * need to be set on the command line.)
- *
- * PNG_IMPEXP must be set here when building the library to prevent pngconf.h
- * setting it to the "import" setting for a DLL build.
- */
-#ifndef PNG_IMPEXP
-#  ifdef PNG_BUILD_DLL
-#     define PNG_IMPEXP PNG_DLL_EXPORT
-#  else
-      /* Not building a DLL, or the DLL doesn't require specific export
-       * definitions.
-       */
-#     define PNG_IMPEXP
-#  endif
-#endif
-
-/* No warnings for private or deprecated functions in the build: */
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE
-#endif
-
-/* Symbol preprocessing support.
- *
- * To enable listing global, but internal, symbols the following macros should
- * always be used to declare an extern data or function object in this file.
- */
-#ifndef PNG_INTERNAL_DATA
-#  define PNG_INTERNAL_DATA(type, name, array) PNG_LINKAGE_DATA type name array
-#endif
-
-#ifndef PNG_INTERNAL_FUNCTION
-#  define PNG_INTERNAL_FUNCTION(type, name, args, attributes)\
-      PNG_LINKAGE_FUNCTION PNG_FUNCTION(type, name, args, PNG_EMPTY attributes)
-#endif
-
-#ifndef PNG_INTERNAL_CALLBACK
-#  define PNG_INTERNAL_CALLBACK(type, name, args, attributes)\
-      PNG_LINKAGE_CALLBACK PNG_FUNCTION(type, (PNGCBAPI name), args,\
-         PNG_EMPTY attributes)
-#endif
-
-/* If floating or fixed point APIs are disabled they may still be compiled
- * internally.  To handle this make sure they are declared as the appropriate
- * internal extern function (otherwise the symbol prefixing stuff won't work and
- * the functions will be used without definitions.)
- *
- * NOTE: although all the API functions are declared here they are not all
- * actually built!  Because the declarations are still made it is necessary to
- * fake out types that they depend on.
- */
-#ifndef PNG_FP_EXPORT
-#  ifndef PNG_FLOATING_POINT_SUPPORTED
-#     define PNG_FP_EXPORT(ordinal, type, name, args)\
-         PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);
-#     ifndef PNG_VERSION_INFO_ONLY
-         typedef struct png_incomplete png_double;
-         typedef png_double*           png_doublep;
-         typedef const png_double*     png_const_doublep;
-         typedef png_double**          png_doublepp;
-#     endif
-#  endif
-#endif
-#ifndef PNG_FIXED_EXPORT
-#  ifndef PNG_FIXED_POINT_SUPPORTED
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-         PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);
-#  endif
-#endif
-
-#include "png.h"
-
-/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
-#ifndef PNG_DLL_EXPORT
-#  define PNG_DLL_EXPORT
-#endif
-
-/* This is a global switch to set the compilation for an installed system
- * (a release build).  It can be set for testing debug builds to ensure that
- * they will compile when the build type is switched to RC or STABLE, the
- * default is just to use PNG_LIBPNG_BUILD_BASE_TYPE.  Set this in CPPFLAGS
- * with either:
- *
- *   -DPNG_RELEASE_BUILD Turns on the release compile path
- *   -DPNG_RELEASE_BUILD=0 Turns it off
- * or in your pngusr.h with
- *   #define PNG_RELEASE_BUILD=1 Turns on the release compile path
- *   #define PNG_RELEASE_BUILD=0 Turns it off
- */
-#ifndef PNG_RELEASE_BUILD
-#  define PNG_RELEASE_BUILD (PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC)
-#endif
-
-/* SECURITY and SAFETY:
- *
- * libpng is built with support for internal limits on image dimensions and
- * memory usage.  These are documented in scripts/pnglibconf.dfa of the
- * source and recorded in the machine generated header file pnglibconf.h.
- */
-
-/* If you are running on a machine where you cannot allocate more
- * than 64K of memory at once, uncomment this.  While libpng will not
- * normally need that much memory in a chunk (unless you load up a very
- * large file), zlib needs to know how big of a chunk it can use, and
- * libpng thus makes sure to check any memory allocation to verify it
- * will fit into memory.
- *
- * zlib provides 'MAXSEG_64K' which, if defined, indicates the
- * same limit and pngconf.h (already included) sets the limit
- * if certain operating systems are detected.
- */
-#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
-#  define PNG_MAX_MALLOC_64K
-#endif
-
-#ifndef PNG_UNUSED
-/* Unused formal parameter warnings are silenced using the following macro
- * which is expected to have no bad effects on performance (optimizing
- * compilers will probably remove it entirely).  Note that if you replace
- * it with something other than whitespace, you must include the terminating
- * semicolon.
- */
-#  define PNG_UNUSED(param) (void)param;
-#endif
-
-/* Just a little check that someone hasn't tried to define something
- * contradictory.
- */
-#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
-#  undef PNG_ZBUF_SIZE
-#  define PNG_ZBUF_SIZE 65536L
-#endif
-
-/* If warnings or errors are turned off the code is disabled or redirected here.
- * From 1.5.4 functions have been added to allow very limited formatting of
- * error and warning messages - this code will also be disabled here.
- */
-#ifdef PNG_WARNINGS_SUPPORTED
-#  define PNG_WARNING_PARAMETERS(p) png_warning_parameters p;
-#else
-#  define png_warning_parameter(p,number,string) ((void)0)
-#  define png_warning_parameter_unsigned(p,number,format,value) ((void)0)
-#  define png_warning_parameter_signed(p,number,format,value) ((void)0)
-#  define png_formatted_warning(pp,p,message) ((void)(pp))
-#  define PNG_WARNING_PARAMETERS(p)
-#endif
-#ifndef PNG_ERROR_TEXT_SUPPORTED
-#  define png_fixed_error(s1,s2) png_err(s1)
-#endif
-
-/* Some fixed point APIs are still required even if not exported because
- * they get used by the corresponding floating point APIs.  This magic
- * deals with this:
- */
-#ifdef PNG_FIXED_POINT_SUPPORTED
-#  define PNGFAPI PNGAPI
-#else
-#  define PNGFAPI /* PRIVATE */
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-/* Other defines specific to compilers can go here.  Try to keep
- * them inside an appropriate ifdef/endif pair for portability.
- */
-
-/* C allows up-casts from (void*) to any pointer and (const void*) to any
- * pointer to a const object.  C++ regards this as a type error and requires an
- * explicit, static, cast and provides the static_cast<> rune to ensure that
- * const is not cast away.
- */
-#ifdef __cplusplus
-#  define png_voidcast(type, value) static_cast<type>(value)
-#  define png_constcast(type, value) const_cast<type>(value)
-#  define png_aligncast(type, value) \
-   static_cast<type>(static_cast<void*>(value))
-#  define png_aligncastconst(type, value) \
-   static_cast<type>(static_cast<const void*>(value))
-#else
-#  define png_voidcast(type, value) (value)
-#  ifdef _WIN64
-#     ifdef __GNUC__
-         typedef unsigned long long png_ptruint;
-#     else
-         typedef unsigned __int64 png_ptruint;
-#     endif
-#  else
-      typedef unsigned long png_ptruint;
-#  endif
-#  define png_constcast(type, value) ((type)(png_ptruint)(const void*)(value))
-#  define png_aligncast(type, value) ((void*)(value))
-#  define png_aligncastconst(type, value) ((const void*)(value))
-#endif /* __cplusplus */
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED) ||\
-    defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
-   /* png.c requires the following ANSI-C constants if the conversion of
-    * floating point to ASCII is implemented therein:
-    *
-    *  DBL_DIG  Maximum number of decimal digits (can be set to any constant)
-    *  DBL_MIN  Smallest normalized fp number (can be set to an arbitrary value)
-    *  DBL_MAX  Maximum floating point number (can be set to an arbitrary value)
-    */
-#  include <float.h>
-
-#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
-    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
-   /* We need to check that <math.h> hasn't already been included earlier
-    * as it seems it doesn't agree with <fp.h>, yet we should really use
-    * <fp.h> if possible.
-    */
-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
-#      include <fp.h>
-#    endif
-#  else
-#    include <math.h>
-#  endif
-#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
-   /* Amiga SAS/C: We must include builtin FPU functions when compiling using
-    * MATH=68881
-    */
-#    include <m68881.h>
-#  endif
-#endif
-
-/* This provides the non-ANSI (far) memory allocation routines. */
-#if defined(__TURBOC__) && defined(__MSDOS__)
-#  include <mem.h>
-#  include <alloc.h>
-#endif
-
-#if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \
-    defined(_WIN32) || defined(__WIN32__)
-#  include <windows.h>  /* defines _WINDOWS_ macro */
-#endif
-#endif /* PNG_VERSION_INFO_ONLY */
-
-/* Moved here around 1.5.0beta36 from pngconf.h */
-/* Users may want to use these so they are not private.  Any library
- * functions that are passed far data must be model-independent.
- */
-
-/* Memory model/platform independent fns */
-#ifndef PNG_ABORT
-#  ifdef _WINDOWS_
-#    define PNG_ABORT() ExitProcess(0)
-#  else
-#    define PNG_ABORT() abort()
-#  endif
-#endif
-
-/* These macros may need to be architecture dependent. */
-#define PNG_ALIGN_NONE   0 /* do not use data alignment */
-#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */
-#ifdef offsetof
-#  define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */
-#else
-#  define PNG_ALIGN_OFFSET -1 /* prevent the use of this */
-#endif
-#define PNG_ALIGN_SIZE   3 /* use sizeof to determine alignment */
-
-#ifndef PNG_ALIGN_TYPE
-   /* Default to using aligned access optimizations and requiring alignment to a
-    * multiple of the data type size.  Override in a compiler specific fashion
-    * if necessary by inserting tests here:
-    */
-#  define PNG_ALIGN_TYPE PNG_ALIGN_SIZE
-#endif
-
-#if PNG_ALIGN_TYPE == PNG_ALIGN_SIZE
-   /* This is used because in some compiler implementations non-aligned
-    * structure members are supported, so the offsetof approach below fails.
-    * Set PNG_ALIGN_SIZE=0 for compiler combinations where unaligned access
-    * is good for performance.  Do not do this unless you have tested the result
-    * and understand it.
-    */
-#  define png_alignof(type) (sizeof (type))
-#else
-#  if PNG_ALIGN_TYPE == PNG_ALIGN_OFFSET
-#     define png_alignof(type) offsetof(struct{char c; type t;}, t)
-#  else
-#     if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS
-#        define png_alignof(type) (1)
-#     endif
-      /* Else leave png_alignof undefined to prevent use thereof */
-#  endif
-#endif
-
-/* This implicitly assumes alignment is always to a power of 2. */
-#ifdef png_alignof
-#  define png_isaligned(ptr, type)\
-   (((type)((const char*)ptr-(const char*)0) & \
-   (type)(png_alignof(type)-1)) == 0)
-#else
-#  define png_isaligned(ptr, type) 0
-#endif
-
-/* End of memory model/platform independent support */
-/* End of 1.5.0beta36 move from pngconf.h */
-
-/* CONSTANTS and UTILITY MACROS
- * These are used internally by libpng and not exposed in the API
- */
-
-/* Various modes of operation.  Note that after an init, mode is set to
- * zero automatically when the structure is created.  Three of these
- * are defined in png.h because they need to be visible to applications
- * that call png_set_unknown_chunk().
- */
-/* #define PNG_HAVE_IHDR            0x01U (defined in png.h) */
-/* #define PNG_HAVE_PLTE            0x02U (defined in png.h) */
-#define PNG_HAVE_IDAT               0x04U
-/* #define PNG_AFTER_IDAT           0x08U (defined in png.h) */
-#define PNG_HAVE_IEND               0x10U
-                   /*               0x20U (unused) */
-                   /*               0x40U (unused) */
-                   /*               0x80U (unused) */
-#define PNG_HAVE_CHUNK_HEADER      0x100U
-#define PNG_WROTE_tIME             0x200U
-#define PNG_WROTE_INFO_BEFORE_PLTE 0x400U
-#define PNG_BACKGROUND_IS_GRAY     0x800U
-#define PNG_HAVE_PNG_SIGNATURE    0x1000U
-#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
-                   /*             0x4000U (unused) */
-#define PNG_IS_READ_STRUCT        0x8000U /* Else is a write struct */
-
-/* Flags for the transformations the PNG library does on the image data */
-#define PNG_BGR                 0x0001U
-#define PNG_INTERLACE           0x0002U
-#define PNG_PACK                0x0004U
-#define PNG_SHIFT               0x0008U
-#define PNG_SWAP_BYTES          0x0010U
-#define PNG_INVERT_MONO         0x0020U
-#define PNG_QUANTIZE            0x0040U
-#define PNG_COMPOSE             0x0080U    /* Was PNG_BACKGROUND */
-#define PNG_BACKGROUND_EXPAND   0x0100U
-#define PNG_EXPAND_16           0x0200U    /* Added to libpng 1.5.2 */
-#define PNG_16_TO_8             0x0400U    /* Becomes 'chop' in 1.5.4 */
-#define PNG_RGBA                0x0800U
-#define PNG_EXPAND              0x1000U
-#define PNG_GAMMA               0x2000U
-#define PNG_GRAY_TO_RGB         0x4000U
-#define PNG_FILLER              0x8000U
-#define PNG_PACKSWAP           0x10000U
-#define PNG_SWAP_ALPHA         0x20000U
-#define PNG_STRIP_ALPHA        0x40000U
-#define PNG_INVERT_ALPHA       0x80000U
-#define PNG_USER_TRANSFORM    0x100000U
-#define PNG_RGB_TO_GRAY_ERR   0x200000U
-#define PNG_RGB_TO_GRAY_WARN  0x400000U
-#define PNG_RGB_TO_GRAY       0x600000U /* two bits, RGB_TO_GRAY_ERR|WARN */
-#define PNG_ENCODE_ALPHA      0x800000U /* Added to libpng-1.5.4 */
-#define PNG_ADD_ALPHA        0x1000000U /* Added to libpng-1.2.7 */
-#define PNG_EXPAND_tRNS      0x2000000U /* Added to libpng-1.2.9 */
-#define PNG_SCALE_16_TO_8    0x4000000U /* Added to libpng-1.5.4 */
-                       /*    0x8000000U unused */
-                       /*   0x10000000U unused */
-                       /*   0x20000000U unused */
-                       /*   0x40000000U unused */
-/* Flags for png_create_struct */
-#define PNG_STRUCT_PNG   0x0001U
-#define PNG_STRUCT_INFO  0x0002U
-
-/* Flags for the png_ptr->flags rather than declaring a byte for each one */
-#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001U
-#define PNG_FLAG_ZSTREAM_INITIALIZED      0x0002U /* Added to libpng-1.6.0 */
-                                  /*      0x0004U    unused */
-#define PNG_FLAG_ZSTREAM_ENDED            0x0008U /* Added to libpng-1.6.0 */
-                                  /*      0x0010U    unused */
-                                  /*      0x0020U    unused */
-#define PNG_FLAG_ROW_INIT                 0x0040U
-#define PNG_FLAG_FILLER_AFTER             0x0080U
-#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100U
-#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200U
-#define PNG_FLAG_CRC_CRITICAL_USE         0x0400U
-#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800U
-#define PNG_FLAG_ASSUME_sRGB              0x1000U /* Added to libpng-1.5.4 */
-#define PNG_FLAG_OPTIMIZE_ALPHA           0x2000U /* Added to libpng-1.5.4 */
-#define PNG_FLAG_DETECT_UNINITIALIZED     0x4000U /* Added to libpng-1.5.4 */
-/* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000U */
-/* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS      0x10000U */
-#define PNG_FLAG_LIBRARY_MISMATCH        0x20000U
-#define PNG_FLAG_STRIP_ERROR_NUMBERS     0x40000U
-#define PNG_FLAG_STRIP_ERROR_TEXT        0x80000U
-#define PNG_FLAG_BENIGN_ERRORS_WARN     0x100000U /* Added to libpng-1.4.0 */
-#define PNG_FLAG_APP_WARNINGS_WARN      0x200000U /* Added to libpng-1.6.0 */
-#define PNG_FLAG_APP_ERRORS_WARN        0x400000U /* Added to libpng-1.6.0 */
-                                  /*    0x800000U    unused */
-                                  /*   0x1000000U    unused */
-                                  /*   0x2000000U    unused */
-                                  /*   0x4000000U    unused */
-                                  /*   0x8000000U    unused */
-                                  /*  0x10000000U    unused */
-                                  /*  0x20000000U    unused */
-                                  /*  0x40000000U    unused */
-
-#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
-                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)
-
-#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \
-                                     PNG_FLAG_CRC_CRITICAL_IGNORE)
-
-#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
-                                     PNG_FLAG_CRC_CRITICAL_MASK)
-
-/* Save typing and make code easier to understand */
-
-#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
-   abs((int)((c1).green) - (int)((c2).green)) + \
-   abs((int)((c1).blue) - (int)((c2).blue)))
-
-/* Added to libpng-1.6.0: scale a 16-bit value in the range 0..65535 to 0..255
- * by dividing by 257 *with rounding*.  This macro is exact for the given range.
- * See the discourse in pngrtran.c png_do_scale_16_to_8.  The values in the
- * macro were established by experiment (modifying the added value).  The macro
- * has a second variant that takes a value already scaled by 255 and divides by
- * 65535 - this has a maximum error of .502.  Over the range 0..65535*65535 it
- * only gives off-by-one errors and only for 0.5% (1 in 200) of the values.
- */
-#define PNG_DIV65535(v24) (((v24) + 32895) >> 16)
-#define PNG_DIV257(v16) PNG_DIV65535((png_uint_32)(v16) * 255)
-
-/* Added to libpng-1.2.6 JB */
-#define PNG_ROWBYTES(pixel_bits, width) \
-    ((pixel_bits) >= 8 ? \
-    ((png_size_t)(width) * (((png_size_t)(pixel_bits)) >> 3)) : \
-    (( ((png_size_t)(width) * ((png_size_t)(pixel_bits))) + 7) >> 3) )
-
-/* This returns the number of trailing bits in the last byte of a row, 0 if the
- * last byte is completely full of pixels.  It is, in principle, (pixel_bits x
- * width) % 8, but that would overflow for large 'width'.  The second macro is
- * the same except that it returns the number of unused bits in the last byte;
- * (8-TRAILBITS), but 0 when TRAILBITS is 0.
- *
- * NOTE: these macros are intended to be self-evidently correct and never
- * overflow on the assumption that pixel_bits is in the range 0..255.  The
- * arguments are evaluated only once and they can be signed (e.g. as a result of
- * the integral promotions).  The result of the expression always has type
- * (png_uint_32), however the compiler always knows it is in the range 0..7.
- */
-#define PNG_TRAILBITS(pixel_bits, width) \
-    (((pixel_bits) * ((width) % (png_uint_32)8)) % 8)
-
-#define PNG_PADBITS(pixel_bits, width) \
-    ((8 - PNG_TRAILBITS(pixel_bits, width)) % 8)
-
-/* PNG_OUT_OF_RANGE returns true if value is outside the range
- * ideal-delta..ideal+delta.  Each argument is evaluated twice.
- * "ideal" and "delta" should be constants, normally simple
- * integers, "value" a variable. Added to libpng-1.2.6 JB
- */
-#define PNG_OUT_OF_RANGE(value, ideal, delta) \
-   ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )
-
-/* Conversions between fixed and floating point, only defined if
- * required (to make sure the code doesn't accidentally use float
- * when it is supposedly disabled.)
- */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-/* The floating point conversion can't overflow, though it can and
- * does lose accuracy relative to the original fixed point value.
- * In practice this doesn't matter because png_fixed_point only
- * stores numbers with very low precision.  The png_ptr and s
- * arguments are unused by default but are there in case error
- * checking becomes a requirement.
- */
-#define png_float(png_ptr, fixed, s) (.00001 * (fixed))
-
-/* The fixed point conversion performs range checking and evaluates
- * its argument multiple times, so must be used with care.  The
- * range checking uses the PNG specification values for a signed
- * 32-bit fixed point value except that the values are deliberately
- * rounded-to-zero to an integral value - 21474 (21474.83 is roughly
- * (2^31-1) * 100000). 's' is a string that describes the value being
- * converted.
- *
- * NOTE: this macro will raise a png_error if the range check fails,
- * therefore it is normally only appropriate to use this on values
- * that come from API calls or other sources where an out of range
- * error indicates a programming error, not a data error!
- *
- * NOTE: by default this is off - the macro is not used - because the
- * function call saves a lot of code.
- */
-#ifdef PNG_FIXED_POINT_MACRO_SUPPORTED
-#define png_fixed(png_ptr, fp, s) ((fp) <= 21474 && (fp) >= -21474 ?\
-    ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))
-#endif
-/* else the corresponding function is defined below, inside the scope of the
- * cplusplus test.
- */
-#endif
-
-/* Constants for known chunk types.  If you need to add a chunk, define the name
- * here.  For historical reasons these constants have the form png_<name>; i.e.
- * the prefix is lower case.  Please use decimal values as the parameters to
- * match the ISO PNG specification and to avoid relying on the C locale
- * interpretation of character values.
- *
- * Prior to 1.5.6 these constants were strings, as of 1.5.6 png_uint_32 values
- * are computed and a new macro (PNG_STRING_FROM_CHUNK) added to allow a string
- * to be generated if required.
- *
- * PNG_32b correctly produces a value shifted by up to 24 bits, even on
- * architectures where (int) is only 16 bits.
- */
-#define PNG_32b(b,s) ((png_uint_32)(b) << (s))
-#define PNG_U32(b1,b2,b3,b4) \
-   (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0))
-
-/* Constants for known chunk types.
- *
- * MAINTAINERS: If you need to add a chunk, define the name here.
- * For historical reasons these constants have the form png_<name>; i.e.
- * the prefix is lower case.  Please use decimal values as the parameters to
- * match the ISO PNG specification and to avoid relying on the C locale
- * interpretation of character values.  Please keep the list sorted.
- *
- * Notice that PNG_U32 is used to define a 32-bit value for the 4 byte chunk
- * type.  In fact the specification does not express chunk types this way,
- * however using a 32-bit value means that the chunk type can be read from the
- * stream using exactly the same code as used for a 32-bit unsigned value and
- * can be examined far more efficiently (using one arithmetic compare).
- *
- * Prior to 1.5.6 the chunk type constants were expressed as C strings.  The
- * libpng API still uses strings for 'unknown' chunks and a macro,
- * PNG_STRING_FROM_CHUNK, allows a string to be generated if required.  Notice
- * that for portable code numeric values must still be used; the string "IHDR"
- * is not portable and neither is PNG_U32('I', 'H', 'D', 'R').
- *
- * In 1.7.0 the definitions will be made public in png.h to avoid having to
- * duplicate the same definitions in application code.
- */
-#define png_IDAT PNG_U32( 73,  68,  65,  84)
-#define png_IEND PNG_U32( 73,  69,  78,  68)
-#define png_IHDR PNG_U32( 73,  72,  68,  82)
-#define png_PLTE PNG_U32( 80,  76,  84,  69)
-#define png_bKGD PNG_U32( 98,  75,  71,  68)
-#define png_cHRM PNG_U32( 99,  72,  82,  77)
-#define png_eXIf PNG_U32(101,  88,  73, 102) /* registered July 2017 */
-#define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */
-#define png_gAMA PNG_U32(103,  65,  77,  65)
-#define png_gIFg PNG_U32(103,  73,  70, 103)
-#define png_gIFt PNG_U32(103,  73,  70, 116) /* deprecated */
-#define png_gIFx PNG_U32(103,  73,  70, 120)
-#define png_hIST PNG_U32(104,  73,  83,  84)
-#define png_iCCP PNG_U32(105,  67,  67,  80)
-#define png_iTXt PNG_U32(105,  84,  88, 116)
-#define png_oFFs PNG_U32(111,  70,  70, 115)
-#define png_pCAL PNG_U32(112,  67,  65,  76)
-#define png_pHYs PNG_U32(112,  72,  89, 115)
-#define png_sBIT PNG_U32(115,  66,  73,  84)
-#define png_sCAL PNG_U32(115,  67,  65,  76)
-#define png_sPLT PNG_U32(115,  80,  76,  84)
-#define png_sRGB PNG_U32(115,  82,  71,  66)
-#define png_sTER PNG_U32(115,  84,  69,  82)
-#define png_tEXt PNG_U32(116,  69,  88, 116)
-#define png_tIME PNG_U32(116,  73,  77,  69)
-#define png_tRNS PNG_U32(116,  82,  78,  83)
-#define png_zTXt PNG_U32(122,  84,  88, 116)
-
-/* The following will work on (signed char*) strings, whereas the get_uint_32
- * macro will fail on top-bit-set values because of the sign extension.
- */
-#define PNG_CHUNK_FROM_STRING(s)\
-   PNG_U32(0xff & (s)[0], 0xff & (s)[1], 0xff & (s)[2], 0xff & (s)[3])
-
-/* This uses (char), not (png_byte) to avoid warnings on systems where (char) is
- * signed and the argument is a (char[])  This macro will fail miserably on
- * systems where (char) is more than 8 bits.
- */
-#define PNG_STRING_FROM_CHUNK(s,c)\
-   (void)(((char*)(s))[0]=(char)(((c)>>24) & 0xff), \
-   ((char*)(s))[1]=(char)(((c)>>16) & 0xff),\
-   ((char*)(s))[2]=(char)(((c)>>8) & 0xff), \
-   ((char*)(s))[3]=(char)((c & 0xff)))
-
-/* Do the same but terminate with a null character. */
-#define PNG_CSTRING_FROM_CHUNK(s,c)\
-   (void)(PNG_STRING_FROM_CHUNK(s,c), ((char*)(s))[4] = 0)
-
-/* Test on flag values as defined in the spec (section 5.4): */
-#define PNG_CHUNK_ANCILLARY(c)   (1 & ((c) >> 29))
-#define PNG_CHUNK_CRITICAL(c)     (!PNG_CHUNK_ANCILLARY(c))
-#define PNG_CHUNK_PRIVATE(c)      (1 & ((c) >> 21))
-#define PNG_CHUNK_RESERVED(c)     (1 & ((c) >> 13))
-#define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >>  5))
-
-/* Gamma values (new at libpng-1.5.4): */
-#define PNG_GAMMA_MAC_OLD 151724  /* Assume '1.8' is really 2.2/1.45! */
-#define PNG_GAMMA_MAC_INVERSE 65909
-#define PNG_GAMMA_sRGB_INVERSE 45455
-
-/* Almost everything below is C specific; the #defines above can be used in
- * non-C code (so long as it is C-preprocessed) the rest of this stuff cannot.
- */
-#ifndef PNG_VERSION_INFO_ONLY
-
-#include "pngstruct.h"
-#include "pnginfo.h"
-
-/* Validate the include paths - the include path used to generate pnglibconf.h
- * must match that used in the build, or we must be using pnglibconf.h.prebuilt:
- */
-#if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM
-#  error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
-      "-I (include path) error: see the notes in pngpriv.h"
-   /* This means that when pnglibconf.h was built the copy of zlib.h that it
-    * used is not the same as the one being used here.  Because the build of
-    * libpng makes decisions to use inflateInit2 and inflateReset2 based on the
-    * zlib version number and because this affects handling of certain broken
-    * PNG files the -I directives must match.
-    *
-    * The most likely explanation is that you passed a -I in CFLAGS. This will
-    * not work; all the preprocessor directories and in particular all the -I
-    * directives must be in CPPFLAGS.
-    */
-#endif
-
-/* This is used for 16-bit gamma tables -- only the top level pointers are
- * const; this could be changed:
- */
-typedef const png_uint_16p * png_const_uint_16pp;
-
-/* Added to libpng-1.5.7: sRGB conversion tables */
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]);
-   /* Convert from an sRGB encoded value 0..255 to a 16-bit linear value,
-    * 0..65535.  This table gives the closest 16-bit answers (no errors).
-    */
-#endif
-
-PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_base, [512]);
-PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);
-
-#define PNG_sRGB_FROM_LINEAR(linear) \
-  ((png_byte)(0xff & ((png_sRGB_base[(linear)>>15] \
-   + ((((linear) & 0x7fff)*png_sRGB_delta[(linear)>>15])>>12)) >> 8)))
-   /* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB
-    * encoded value with maximum error 0.646365.  Note that the input is not a
-    * 16-bit value; it has been multiplied by 255! */
-#endif /* SIMPLIFIED_READ/WRITE */
-
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Internal functions; these are not exported from a DLL however because they
- * are used within several of the C source files they have to be C extern.
- *
- * All of these functions must be declared with PNG_INTERNAL_FUNCTION.
- */
-
-/* Zlib support */
-#define PNG_UNEXPECTED_ZLIB_RETURN (-7)
-PNG_INTERNAL_FUNCTION(void, png_zstream_error,(png_structrp png_ptr, int ret),
-   PNG_EMPTY);
-   /* Used by the zlib handling functions to ensure that z_stream::msg is always
-    * set before they return.
-    */
-
-#ifdef PNG_WRITE_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,
-   png_compression_bufferp *list),PNG_EMPTY);
-   /* Free the buffer list used by the compressed write code. */
-#endif
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
-   (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
-   defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
-   (defined(PNG_sCAL_SUPPORTED) && \
-   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_fixed,(png_const_structrp png_ptr,
-   double fp, png_const_charp text),PNG_EMPTY);
-#endif
-
-/* Check the user version string for compatibility, returns false if the version
- * numbers aren't compatible.
- */
-PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,
-   png_const_charp user_png_ver),PNG_EMPTY);
-
-/* Internal base allocator - no messages, NULL on failure to allocate.  This
- * does, however, call the application provided allocator and that could call
- * png_error (although that would be a bug in the application implementation.)
- */
-PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_base,(png_const_structrp png_ptr,
-   png_alloc_size_t size),PNG_ALLOCATED);
-
-#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
-   defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)
-/* Internal array allocator, outputs no error or warning messages on failure,
- * just returns NULL.
- */
-PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_array,(png_const_structrp png_ptr,
-   int nelements, size_t element_size),PNG_ALLOCATED);
-
-/* The same but an existing array is extended by add_elements.  This function
- * also memsets the new elements to 0 and copies the old elements.  The old
- * array is not freed or altered.
- */
-PNG_INTERNAL_FUNCTION(png_voidp,png_realloc_array,(png_const_structrp png_ptr,
-   png_const_voidp array, int old_elements, int add_elements,
-   size_t element_size),PNG_ALLOCATED);
-#endif /* text, sPLT or unknown chunks */
-
-/* Magic to create a struct when there is no struct to call the user supplied
- * memory allocators.  Because error handling has not been set up the memory
- * handlers can't safely call png_error, but this is an obscure and undocumented
- * restriction so libpng has to assume that the 'free' handler, at least, might
- * call png_error.
- */
-PNG_INTERNAL_FUNCTION(png_structp,png_create_png_struct,
-   (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn,
-    png_free_ptr free_fn),PNG_ALLOCATED);
-
-/* Free memory from internal libpng struct */
-PNG_INTERNAL_FUNCTION(void,png_destroy_png_struct,(png_structrp png_ptr),
-   PNG_EMPTY);
-
-/* Free an allocated jmp_buf (always succeeds) */
-PNG_INTERNAL_FUNCTION(void,png_free_jmpbuf,(png_structrp png_ptr),PNG_EMPTY);
-
-/* Function to allocate memory for zlib.  PNGAPI is disallowed. */
-PNG_INTERNAL_FUNCTION(voidpf,png_zalloc,(voidpf png_ptr, uInt items, uInt size),
-   PNG_ALLOCATED);
-
-/* Function to free memory for zlib.  PNGAPI is disallowed. */
-PNG_INTERNAL_FUNCTION(void,png_zfree,(voidpf png_ptr, voidpf ptr),PNG_EMPTY);
-
-/* Next four functions are used internally as callbacks.  PNGCBAPI is required
- * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3, changed to
- * PNGCBAPI at 1.5.0
- */
-
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_read_data,(png_structp png_ptr,
-    png_bytep data, png_size_t length),PNG_EMPTY);
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_push_fill_buffer,(png_structp png_ptr,
-    png_bytep buffer, png_size_t length),PNG_EMPTY);
-#endif
-
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_write_data,(png_structp png_ptr,
-    png_bytep data, png_size_t length),PNG_EMPTY);
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_STDIO_SUPPORTED
-PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_flush,(png_structp png_ptr),
-   PNG_EMPTY);
-#  endif
-#endif
-
-/* Reset the CRC variable */
-PNG_INTERNAL_FUNCTION(void,png_reset_crc,(png_structrp png_ptr),PNG_EMPTY);
-
-/* Write the "data" buffer to whatever output you are using */
-PNG_INTERNAL_FUNCTION(void,png_write_data,(png_structrp png_ptr,
-    png_const_bytep data, png_size_t length),PNG_EMPTY);
-
-/* Read and check the PNG file signature */
-PNG_INTERNAL_FUNCTION(void,png_read_sig,(png_structrp png_ptr,
-   png_inforp info_ptr),PNG_EMPTY);
-
-/* Read the chunk header (length + type name) */
-PNG_INTERNAL_FUNCTION(png_uint_32,png_read_chunk_header,(png_structrp png_ptr),
-   PNG_EMPTY);
-
-/* Read data from whatever input you are using into the "data" buffer */
-PNG_INTERNAL_FUNCTION(void,png_read_data,(png_structrp png_ptr, png_bytep data,
-    png_size_t length),PNG_EMPTY);
-
-/* Read bytes into buf, and update png_ptr->crc */
-PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,
-    png_uint_32 length),PNG_EMPTY);
-
-/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
-PNG_INTERNAL_FUNCTION(int,png_crc_finish,(png_structrp png_ptr,
-   png_uint_32 skip),PNG_EMPTY);
-
-/* Read the CRC from the file and compare it to the libpng calculated CRC */
-PNG_INTERNAL_FUNCTION(int,png_crc_error,(png_structrp png_ptr),PNG_EMPTY);
-
-/* Calculate the CRC over a section of data.  Note that we are only
- * passing a maximum of 64K on systems that have this as a memory limit,
- * since this is the maximum buffer size we can specify.
- */
-PNG_INTERNAL_FUNCTION(void,png_calculate_crc,(png_structrp png_ptr,
-   png_const_bytep ptr, png_size_t length),PNG_EMPTY);
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_flush,(png_structrp png_ptr),PNG_EMPTY);
-#endif
-
-/* Write various chunks */
-
-/* Write the IHDR chunk, and update the png_struct with the necessary
- * information.
- */
-PNG_INTERNAL_FUNCTION(void,png_write_IHDR,(png_structrp png_ptr,
-   png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
-   int compression_method, int filter_method, int interlace_method),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_write_PLTE,(png_structrp png_ptr,
-   png_const_colorp palette, png_uint_32 num_pal),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_compress_IDAT,(png_structrp png_ptr,
-   png_const_bytep row_data, png_alloc_size_t row_data_length, int flush),
-   PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_write_IEND,(png_structrp png_ptr),PNG_EMPTY);
-
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_gAMA_fixed,(png_structrp png_ptr,
-    png_fixed_point file_gamma),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sBIT,(png_structrp png_ptr,
-    png_const_color_8p sbit, int color_type),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_cHRM_fixed,(png_structrp png_ptr,
-    const png_xy *xy), PNG_EMPTY);
-   /* The xy value must have been previously validated */
-#endif
-
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,
-    int intent),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_eXIf_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_eXIf,(png_structrp png_ptr,
-    png_bytep exif, int num_exif),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,
-   png_const_charp name, png_const_bytep profile), PNG_EMPTY);
-   /* The profile must have been previously validated for correctness, the
-    * length comes from the first four bytes.  Only the base, deflate,
-    * compression is supported.
-    */
-#endif
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sPLT,(png_structrp png_ptr,
-    png_const_sPLT_tp palette),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_tRNS,(png_structrp png_ptr,
-    png_const_bytep trans, png_const_color_16p values, int number,
-    int color_type),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_bKGD,(png_structrp png_ptr,
-    png_const_color_16p values, int color_type),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_hIST,(png_structrp png_ptr,
-    png_const_uint_16p hist, int num_hist),PNG_EMPTY);
-#endif
-
-/* Chunks that have keywords */
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_tEXt,(png_structrp png_ptr,
-   png_const_charp key, png_const_charp text, png_size_t text_len),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_zTXt,(png_structrp png_ptr, png_const_charp
-    key, png_const_charp text, int compression),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_iTXt,(png_structrp png_ptr,
-    int compression, png_const_charp key, png_const_charp lang,
-    png_const_charp lang_key, png_const_charp text),PNG_EMPTY);
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED  /* Added at version 1.0.14 and 1.2.4 */
-PNG_INTERNAL_FUNCTION(int,png_set_text_2,(png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_textp text_ptr, int num_text),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_oFFs,(png_structrp png_ptr,
-    png_int_32 x_offset, png_int_32 y_offset, int unit_type),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_pCAL,(png_structrp png_ptr,
-    png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
-    png_const_charp units, png_charpp params),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_pHYs,(png_structrp png_ptr,
-    png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
-    int unit_type),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_tIME,(png_structrp png_ptr,
-    png_const_timep mod_time),PNG_EMPTY);
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_write_sCAL_s,(png_structrp png_ptr,
-    int unit, png_const_charp width, png_const_charp height),PNG_EMPTY);
-#endif
-
-/* Called when finished processing a row of data */
-PNG_INTERNAL_FUNCTION(void,png_write_finish_row,(png_structrp png_ptr),
-    PNG_EMPTY);
-
-/* Internal use only.   Called before first row of data */
-PNG_INTERNAL_FUNCTION(void,png_write_start_row,(png_structrp png_ptr),
-    PNG_EMPTY);
-
-/* Combine a row of data, dealing with alpha, etc. if requested.  'row' is an
- * array of png_ptr->width pixels.  If the image is not interlaced or this
- * is the final pass this just does a memcpy, otherwise the "display" flag
- * is used to determine whether to copy pixels that are not in the current pass.
- *
- * Because 'png_do_read_interlace' (below) replicates pixels this allows this
- * function to achieve the documented 'blocky' appearance during interlaced read
- * if display is 1 and the 'sparkle' appearance, where existing pixels in 'row'
- * are not changed if they are not in the current pass, when display is 0.
- *
- * 'display' must be 0 or 1, otherwise the memcpy will be done regardless.
- *
- * The API always reads from the png_struct row buffer and always assumes that
- * it is full width (png_do_read_interlace has already been called.)
- *
- * This function is only ever used to write to row buffers provided by the
- * caller of the relevant libpng API and the row must have already been
- * transformed by the read transformations.
- *
- * The PNG_USE_COMPILE_TIME_MASKS option causes generation of pre-computed
- * bitmasks for use within the code, otherwise runtime generated masks are used.
- * The default is compile time masks.
- */
-#ifndef PNG_USE_COMPILE_TIME_MASKS
-#  define PNG_USE_COMPILE_TIME_MASKS 1
-#endif
-PNG_INTERNAL_FUNCTION(void,png_combine_row,(png_const_structrp png_ptr,
-    png_bytep row, int display),PNG_EMPTY);
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-/* Expand an interlaced row: the 'row_info' describes the pass data that has
- * been read in and must correspond to the pixels in 'row', the pixels are
- * expanded (moved apart) in 'row' to match the final layout, when doing this
- * the pixels are *replicated* to the intervening space.  This is essential for
- * the correct operation of png_combine_row, above.
- */
-PNG_INTERNAL_FUNCTION(void,png_do_read_interlace,(png_row_infop row_info,
-    png_bytep row, int pass, png_uint_32 transformations),PNG_EMPTY);
-#endif
-
-/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-/* Grab pixels out of a row for an interlaced pass */
-PNG_INTERNAL_FUNCTION(void,png_do_write_interlace,(png_row_infop row_info,
-    png_bytep row, int pass),PNG_EMPTY);
-#endif
-
-/* Unfilter a row: check the filter value before calling this, there is no point
- * calling it for PNG_FILTER_VALUE_NONE.
- */
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row,(png_structrp pp, png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row, int filter),PNG_EMPTY);
-
-#if PNG_ARM_NEON_OPT > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_neon,(png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-#endif
-
-#if PNG_MIPS_MSA_OPT > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-#endif
-
-#if PNG_POWERPC_VSX_OPT > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_vsx,(png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_vsx,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-#endif
-
-#if PNG_INTEL_SSE_IMPLEMENTATION > 0
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-#endif
-
-/* Choose the best filter to use and filter the row data */
-PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
-    png_row_infop row_info),PNG_EMPTY);
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr,
-   png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY);
-   /* Read 'avail_out' bytes of data from the IDAT stream.  If the output buffer
-    * is NULL the function checks, instead, for the end of the stream.  In this
-    * case a benign error will be issued if the stream end is not found or if
-    * extra data has to be consumed.
-    */
-PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr),
-   PNG_EMPTY);
-   /* This cleans up when the IDAT LZ stream does not end when the last image
-    * byte is read; there is still some pending input.
-    */
-
-PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr),
-   PNG_EMPTY);
-   /* Finish a row while reading, dealing with interlacing passes, etc. */
-#endif /* SEQUENTIAL_READ */
-
-/* Initialize the row buffers, etc. */
-PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);
-
-#if ZLIB_VERNUM >= 0x1240
-PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush),
-      PNG_EMPTY);
-#  define PNG_INFLATE(pp, flush) png_zlib_inflate(pp, flush)
-#else /* Zlib < 1.2.4 */
-#  define PNG_INFLATE(pp, flush) inflate(&(pp)->zstream, flush)
-#endif /* Zlib < 1.2.4 */
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-/* Optional call to update the users info structure */
-PNG_INTERNAL_FUNCTION(void,png_read_transform_info,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#endif
-
-/* Shared transform functions, defined in pngtran.c */
-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_strip_channel,(png_row_infop row_info,
-    png_bytep row, int at_start),PNG_EMPTY);
-#endif
-
-#ifdef PNG_16BIT_SUPPORTED
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_swap,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
-#endif
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_packswap,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_invert,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info,
-    png_bytep row),PNG_EMPTY);
-#endif
-
-/* The following decodes the appropriate chunks, and does error correction,
- * then calls the appropriate callback for the chunk if it is valid.
- */
-
-/* Decode the IHDR chunk */
-PNG_INTERNAL_FUNCTION(void,png_handle_IHDR,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_handle_PLTE,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_handle_IEND,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_bKGD,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_cHRM,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_eXIf,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_gAMA,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* READ_iCCP */
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_oFFs,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_pCAL,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_pHYs,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sBIT,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* READ_sPLT */
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tIME,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tRNS,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr,
-    const png_uint_32 chunk_name),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,
-    const png_uint_32 chunk_length),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
-   /* This is the function that gets called for unknown chunks.  The 'keep'
-    * argument is either non-zero for a known chunk that has been set to be
-    * handled as unknown or zero for an unknown chunk.  By default the function
-    * just skips the chunk or errors out if it is critical.
-    */
-
-#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
-    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,
-    (png_const_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY);
-   /* Exactly as the API png_handle_as_unknown() except that the argument is a
-    * 32-bit chunk name, not a string.
-    */
-#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */
-
-/* Handle the transformations for reading and writing */
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_do_read_transformations,(png_structrp png_ptr,
-   png_row_infop row_info),PNG_EMPTY);
-#endif
-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_do_write_transformations,(png_structrp png_ptr,
-   png_row_infop row_info),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_init_read_transformations,(png_structrp png_ptr),
-    PNG_EMPTY);
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_read_chunk,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_sig,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_check_crc,(png_structrp png_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_save_buffer,(png_structrp png_ptr),
-    PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_restore_buffer,(png_structrp png_ptr,
-    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_IDAT,(png_structrp png_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,
-    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),
-    PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_handle_unknown,(png_structrp png_ptr,
-   png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_have_info,(png_structrp png_ptr,
-   png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,
-   png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_have_row,(png_structrp png_ptr,
-    png_bytep row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_end,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_push_finish_row,(png_structrp png_ptr),
-    PNG_EMPTY);
-#  ifdef PNG_READ_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-#  ifdef PNG_READ_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-#  ifdef PNG_READ_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-
-#endif /* PROGRESSIVE_READ */
-
-/* Added at libpng version 1.6.0 */
-#ifdef PNG_GAMMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA), PNG_EMPTY);
-   /* Set the colorspace gamma with a value provided by the application or by
-    * the gAMA chunk on read.  The value will override anything set by an ICC
-    * profile.
-    */
-
-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync_info,(png_const_structrp png_ptr,
-    png_inforp info_ptr), PNG_EMPTY);
-   /* Synchronize the info 'valid' flags with the colorspace */
-
-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync,(png_const_structrp png_ptr,
-    png_inforp info_ptr), PNG_EMPTY);
-   /* Copy the png_struct colorspace to the info_struct and call the above to
-    * synchronize the flags.  Checks for NULL info_ptr and does nothing.
-    */
-#endif
-
-/* Added at libpng version 1.4.0 */
-#ifdef PNG_COLORSPACE_SUPPORTED
-/* These internal functions are for maintaining the colorspace structure within
- * a png_info or png_struct (or, indeed, both).
- */
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_chromaticities,
-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_xy *xy,
-    int preferred), PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_endpoints,
-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_XYZ *XYZ,
-    int preferred), PNG_EMPTY);
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_sRGB,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, int intent), PNG_EMPTY);
-   /* This does set the colorspace gAMA and cHRM values too, but doesn't set the
-    * flags to write them, if it returns false there was a problem and an error
-    * message has already been output (but the colorspace may still need to be
-    * synced to record the invalid flag).
-    */
-#endif /* sRGB */
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length, png_const_bytep profile, int color_type),
-   PNG_EMPTY);
-   /* The 'name' is used for information only */
-
-/* Routines for checking parts of an ICC profile. */
-#ifdef PNG_READ_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length), PNG_EMPTY);
-#endif /* READ_iCCP */
-PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length,
-   png_const_bytep profile /* first 132 bytes only */, int color_type),
-   PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length,
-   png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);
-#ifdef PNG_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_icc_set_sRGB,(
-   png_const_structrp png_ptr, png_colorspacerp colorspace,
-   png_const_bytep profile, uLong adler), PNG_EMPTY);
-   /* 'adler' is the Adler32 checksum of the uncompressed profile data. It may
-    * be zero to indicate that it is not available.  It is used, if provided,
-    * as a fast check on the profile when checking to see if it is sRGB.
-    */
-#endif
-#endif /* iCCP */
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_rgb_coefficients,
-   (png_structrp png_ptr), PNG_EMPTY);
-   /* Set the rgb_to_gray coefficients from the colorspace Y values */
-#endif /* READ_RGB_TO_GRAY */
-#endif /* COLORSPACE */
-
-/* Added at libpng version 1.4.0 */
-PNG_INTERNAL_FUNCTION(void,png_check_IHDR,(png_const_structrp png_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_type, int compression_type,
-    int filter_type),PNG_EMPTY);
-
-/* Added at libpng version 1.5.10 */
-#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
-    defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_do_check_palette_indexes,
-   (png_structrp png_ptr, png_row_infop row_info),PNG_EMPTY);
-#endif
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
-PNG_INTERNAL_FUNCTION(void,png_fixed_error,(png_const_structrp png_ptr,
-   png_const_charp name),PNG_NORETURN);
-#endif
-
-/* Puts 'string' into 'buffer' at buffer[pos], taking care never to overwrite
- * the end.  Always leaves the buffer nul terminated.  Never errors out (and
- * there is no error code.)
- */
-PNG_INTERNAL_FUNCTION(size_t,png_safecat,(png_charp buffer, size_t bufsize,
-   size_t pos, png_const_charp string),PNG_EMPTY);
-
-/* Various internal functions to handle formatted warning messages, currently
- * only implemented for warnings.
- */
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)
-/* Utility to dump an unsigned value into a buffer, given a start pointer and
- * and end pointer (which should point just *beyond* the end of the buffer!)
- * Returns the pointer to the start of the formatted string.  This utility only
- * does unsigned values.
- */
-PNG_INTERNAL_FUNCTION(png_charp,png_format_number,(png_const_charp start,
-   png_charp end, int format, png_alloc_size_t number),PNG_EMPTY);
-
-/* Convenience macro that takes an array: */
-#define PNG_FORMAT_NUMBER(buffer,format,number) \
-   png_format_number(buffer, buffer + (sizeof buffer), format, number)
-
-/* Suggested size for a number buffer (enough for 64 bits and a sign!) */
-#define PNG_NUMBER_BUFFER_SIZE 24
-
-/* These are the integer formats currently supported, the name is formed from
- * the standard printf(3) format string.
- */
-#define PNG_NUMBER_FORMAT_u     1 /* chose unsigned API! */
-#define PNG_NUMBER_FORMAT_02u   2
-#define PNG_NUMBER_FORMAT_d     1 /* chose signed API! */
-#define PNG_NUMBER_FORMAT_02d   2
-#define PNG_NUMBER_FORMAT_x     3
-#define PNG_NUMBER_FORMAT_02x   4
-#define PNG_NUMBER_FORMAT_fixed 5 /* choose the signed API */
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* New defines and members adding in libpng-1.5.4 */
-#  define PNG_WARNING_PARAMETER_SIZE 32
-#  define PNG_WARNING_PARAMETER_COUNT 8 /* Maximum 9; see pngerror.c */
-
-/* An l-value of this type has to be passed to the APIs below to cache the
- * values of the parameters to a formatted warning message.
- */
-typedef char png_warning_parameters[PNG_WARNING_PARAMETER_COUNT][
-   PNG_WARNING_PARAMETER_SIZE];
-
-PNG_INTERNAL_FUNCTION(void,png_warning_parameter,(png_warning_parameters p,
-   int number, png_const_charp string),PNG_EMPTY);
-   /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,
-    * including the trailing '\0'.
-    */
-PNG_INTERNAL_FUNCTION(void,png_warning_parameter_unsigned,
-   (png_warning_parameters p, int number, int format, png_alloc_size_t value),
-   PNG_EMPTY);
-   /* Use png_alloc_size_t because it is an unsigned type as big as any we
-    * need to output.  Use the following for a signed value.
-    */
-PNG_INTERNAL_FUNCTION(void,png_warning_parameter_signed,
-   (png_warning_parameters p, int number, int format, png_int_32 value),
-   PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_formatted_warning,(png_const_structrp png_ptr,
-   png_warning_parameters p, png_const_charp message),PNG_EMPTY);
-   /* 'message' follows the X/Open approach of using @1, @2 to insert
-    * parameters previously supplied using the above functions.  Errors in
-    * specifying the parameters will simply result in garbage substitutions.
-    */
-#endif
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-/* Application errors (new in 1.6); use these functions (declared below) for
- * errors in the parameters or order of API function calls on read.  The
- * 'warning' should be used for an error that can be handled completely; the
- * 'error' for one which can be handled safely but which may lose application
- * information or settings.
- *
- * By default these both result in a png_error call prior to release, while in a
- * released version the 'warning' is just a warning.  However if the application
- * explicitly disables benign errors (explicitly permitting the code to lose
- * information) they both turn into warnings.
- *
- * If benign errors aren't supported they end up as the corresponding base call
- * (png_warning or png_error.)
- */
-PNG_INTERNAL_FUNCTION(void,png_app_warning,(png_const_structrp png_ptr,
-   png_const_charp message),PNG_EMPTY);
-   /* The application provided invalid parameters to an API function or called
-    * an API function at the wrong time, libpng can completely recover.
-    */
-
-PNG_INTERNAL_FUNCTION(void,png_app_error,(png_const_structrp png_ptr,
-   png_const_charp message),PNG_EMPTY);
-   /* As above but libpng will ignore the call, or attempt some other partial
-    * recovery from the error.
-    */
-#else
-#  define png_app_warning(pp,s) png_warning(pp,s)
-#  define png_app_error(pp,s) png_error(pp,s)
-#endif
-
-PNG_INTERNAL_FUNCTION(void,png_chunk_report,(png_const_structrp png_ptr,
-   png_const_charp message, int error),PNG_EMPTY);
-   /* Report a recoverable issue in chunk data.  On read this is used to report
-    * a problem found while reading a particular chunk and the
-    * png_chunk_benign_error or png_chunk_warning function is used as
-    * appropriate.  On write this is used to report an error that comes from
-    * data set via an application call to a png_set_ API and png_app_error or
-    * png_app_warning is used as appropriate.
-    *
-    * The 'error' parameter must have one of the following values:
-    */
-#define PNG_CHUNK_WARNING     0 /* never an error */
-#define PNG_CHUNK_WRITE_ERROR 1 /* an error only on write */
-#define PNG_CHUNK_ERROR       2 /* always an error */
-
-/* ASCII to FP interfaces, currently only implemented if sCAL
- * support is required.
- */
-#if defined(PNG_sCAL_SUPPORTED)
-/* MAX_DIGITS is actually the maximum number of characters in an sCAL
- * width or height, derived from the precision (number of significant
- * digits - a build time settable option) and assumptions about the
- * maximum ridiculous exponent.
- */
-#define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_ascii_from_fp,(png_const_structrp png_ptr,
-   png_charp ascii, png_size_t size, double fp, unsigned int precision),
-   PNG_EMPTY);
-#endif /* FLOATING_POINT */
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
-   png_charp ascii, png_size_t size, png_fixed_point fp),PNG_EMPTY);
-#endif /* FIXED_POINT */
-#endif /* sCAL */
-
-#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
-/* An internal API to validate the format of a floating point number.
- * The result is the index of the next character.  If the number is
- * not valid it will be the index of a character in the supposed number.
- *
- * The format of a number is defined in the PNG extensions specification
- * and this API is strictly conformant to that spec, not anyone elses!
- *
- * The format as a regular expression is:
- *
- * [+-]?[0-9]+.?([Ee][+-]?[0-9]+)?
- *
- * or:
- *
- * [+-]?.[0-9]+(.[0-9]+)?([Ee][+-]?[0-9]+)?
- *
- * The complexity is that either integer or fraction must be present and the
- * fraction is permitted to have no digits only if the integer is present.
- *
- * NOTE: The dangling E problem.
- *   There is a PNG valid floating point number in the following:
- *
- *       PNG floating point numbers are not greedy.
- *
- *   Working this out requires *TWO* character lookahead (because of the
- *   sign), the parser does not do this - it will fail at the 'r' - this
- *   doesn't matter for PNG sCAL chunk values, but it requires more care
- *   if the value were ever to be embedded in something more complex.  Use
- *   ANSI-C strtod if you need the lookahead.
- */
-/* State table for the parser. */
-#define PNG_FP_INTEGER    0  /* before or in integer */
-#define PNG_FP_FRACTION   1  /* before or in fraction */
-#define PNG_FP_EXPONENT   2  /* before or in exponent */
-#define PNG_FP_STATE      3  /* mask for the above */
-#define PNG_FP_SAW_SIGN   4  /* Saw +/- in current state */
-#define PNG_FP_SAW_DIGIT  8  /* Saw a digit in current state */
-#define PNG_FP_SAW_DOT   16  /* Saw a dot in current state */
-#define PNG_FP_SAW_E     32  /* Saw an E (or e) in current state */
-#define PNG_FP_SAW_ANY   60  /* Saw any of the above 4 */
-
-/* These three values don't affect the parser.  They are set but not used.
- */
-#define PNG_FP_WAS_VALID 64  /* Preceding substring is a valid fp number */
-#define PNG_FP_NEGATIVE 128  /* A negative number, including "-0" */
-#define PNG_FP_NONZERO  256  /* A non-zero value */
-#define PNG_FP_STICKY   448  /* The above three flags */
-
-/* This is available for the caller to store in 'state' if required.  Do not
- * call the parser after setting it (the parser sometimes clears it.)
- */
-#define PNG_FP_INVALID  512  /* Available for callers as a distinct value */
-
-/* Result codes for the parser (boolean - true meants ok, false means
- * not ok yet.)
- */
-#define PNG_FP_MAYBE      0  /* The number may be valid in the future */
-#define PNG_FP_OK         1  /* The number is valid */
-
-/* Tests on the sticky non-zero and negative flags.  To pass these checks
- * the state must also indicate that the whole number is valid - this is
- * achieved by testing PNG_FP_SAW_DIGIT (see the implementation for why this
- * is equivalent to PNG_FP_OK above.)
- */
-#define PNG_FP_NZ_MASK (PNG_FP_SAW_DIGIT | PNG_FP_NEGATIVE | PNG_FP_NONZERO)
-   /* NZ_MASK: the string is valid and a non-zero negative value */
-#define PNG_FP_Z_MASK (PNG_FP_SAW_DIGIT | PNG_FP_NONZERO)
-   /* Z MASK: the string is valid and a non-zero value. */
-   /* PNG_FP_SAW_DIGIT: the string is valid. */
-#define PNG_FP_IS_ZERO(state) (((state) & PNG_FP_Z_MASK) == PNG_FP_SAW_DIGIT)
-#define PNG_FP_IS_POSITIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_Z_MASK)
-#define PNG_FP_IS_NEGATIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_NZ_MASK)
-
-/* The actual parser.  This can be called repeatedly. It updates
- * the index into the string and the state variable (which must
- * be initialized to 0).  It returns a result code, as above.  There
- * is no point calling the parser any more if it fails to advance to
- * the end of the string - it is stuck on an invalid character (or
- * terminated by '\0').
- *
- * Note that the pointer will consume an E or even an E+ and then leave
- * a 'maybe' state even though a preceding integer.fraction is valid.
- * The PNG_FP_WAS_VALID flag indicates that a preceding substring was
- * a valid number.  It's possible to recover from this by calling
- * the parser again (from the start, with state 0) but with a string
- * that omits the last character (i.e. set the size to the index of
- * the problem character.)  This has not been tested within libpng.
- */
-PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
-   png_size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);
-
-/* This is the same but it checks a complete string and returns true
- * only if it just contains a floating point number.  As of 1.5.4 this
- * function also returns the state at the end of parsing the number if
- * it was valid (otherwise it returns 0.)  This can be used for testing
- * for negative or zero values using the sticky flag.
- */
-PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
-   png_size_t size),PNG_EMPTY);
-#endif /* pCAL || sCAL */
-
-#if defined(PNG_GAMMA_SUPPORTED) ||\
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
-/* Added at libpng version 1.5.0 */
-/* This is a utility to provide a*times/div (rounded) and indicate
- * if there is an overflow.  The result is a boolean - false (0)
- * for overflow, true (1) if no overflow, in which case *res
- * holds the result.
- */
-PNG_INTERNAL_FUNCTION(int,png_muldiv,(png_fixed_point_p res, png_fixed_point a,
-   png_int_32 multiplied_by, png_int_32 divided_by),PNG_EMPTY);
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* Same deal, but issue a warning on overflow and return 0. */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_muldiv_warn,
-   (png_const_structrp png_ptr, png_fixed_point a, png_int_32 multiplied_by,
-   png_int_32 divided_by),PNG_EMPTY);
-#endif
-
-#ifdef PNG_GAMMA_SUPPORTED
-/* Calculate a reciprocal - used for gamma values.  This returns
- * 0 if the argument is 0 in order to maintain an undefined value;
- * there are no warnings.
- */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
-   PNG_EMPTY);
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* The same but gives a reciprocal of the product of two fixed point
- * values.  Accuracy is suitable for gamma calculations but this is
- * not exact - use png_muldiv for that.  Only required at present on read.
- */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal2,(png_fixed_point a,
-   png_fixed_point b),PNG_EMPTY);
-#endif
-
-/* Return true if the gamma value is significantly different from 1.0 */
-PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),
-   PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* Internal fixed point gamma correction.  These APIs are called as
- * required to convert single values - they don't need to be fast,
- * they are not used when processing image pixel values.
- *
- * While the input is an 'unsigned' value it must actually be the
- * correct bit value - 0..255 or 0..65535 as required.
- */
-PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_correct,(png_structrp png_ptr,
-   unsigned int value, png_fixed_point gamma_value),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_16bit_correct,(unsigned int value,
-   png_fixed_point gamma_value),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(png_byte,png_gamma_8bit_correct,(unsigned int value,
-   png_fixed_point gamma_value),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_destroy_gamma_table,(png_structrp png_ptr),
-   PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_build_gamma_table,(png_structrp png_ptr,
-   int bit_depth),PNG_EMPTY);
-#endif
-
-/* SIMPLIFIED READ/WRITE SUPPORT */
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
-   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
-/* The internal structure that png_image::opaque points to. */
-typedef struct png_control
-{
-   png_structp png_ptr;
-   png_infop   info_ptr;
-   png_voidp   error_buf;           /* Always a jmp_buf at present. */
-
-   png_const_bytep memory;          /* Memory buffer. */
-   png_size_t      size;            /* Size of the memory buffer. */
-
-   unsigned int for_write       :1; /* Otherwise it is a read structure */
-   unsigned int owned_file      :1; /* We own the file in io_ptr */
-} png_control;
-
-/* Return the pointer to the jmp_buf from a png_control: necessary because C
- * does not reveal the type of the elements of jmp_buf.
- */
-#ifdef __cplusplus
-#  define png_control_jmp_buf(pc) (((jmp_buf*)((pc)->error_buf))[0])
-#else
-#  define png_control_jmp_buf(pc) ((pc)->error_buf)
-#endif
-
-/* Utility to safely execute a piece of libpng code catching and logging any
- * errors that might occur.  Returns true on success, false on failure (either
- * of the function or as a result of a png_error.)
- */
-PNG_INTERNAL_CALLBACK(void,png_safe_error,(png_structp png_ptr,
-   png_const_charp error_message),PNG_NORETURN);
-
-#ifdef PNG_WARNINGS_SUPPORTED
-PNG_INTERNAL_CALLBACK(void,png_safe_warning,(png_structp png_ptr,
-   png_const_charp warning_message),PNG_EMPTY);
-#else
-#  define png_safe_warning 0/*dummy argument*/
-#endif
-
-PNG_INTERNAL_FUNCTION(int,png_safe_execute,(png_imagep image,
-   int (*function)(png_voidp), png_voidp arg),PNG_EMPTY);
-
-/* Utility to log an error; this also cleans up the png_image; the function
- * always returns 0 (false).
- */
-PNG_INTERNAL_FUNCTION(int,png_image_error,(png_imagep image,
-   png_const_charp error_message),PNG_EMPTY);
-
-#ifndef PNG_SIMPLIFIED_READ_SUPPORTED
-/* png_image_free is used by the write code but not exported */
-PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY);
-#endif /* !SIMPLIFIED_READ */
-
-#endif /* SIMPLIFIED READ/WRITE */
-
-/* These are initialization functions for hardware specific PNG filter
- * optimizations; list these here then select the appropriate one at compile
- * time using the macro PNG_FILTER_OPTIMIZATIONS.  If the macro is not defined
- * the generic code is used.
- */
-#ifdef PNG_FILTER_OPTIMIZATIONS
-PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,
-   unsigned int bpp), PNG_EMPTY);
-   /* Just declare the optimization that will be used */
-#else
-   /* List *all* the possible optimizations here - this branch is required if
-    * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in
-    * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing.
-    */
-#  if PNG_ARM_NEON_OPT > 0
-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
-#endif
-
-#if PNG_MIPS_MSA_OPT > 0
-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
-#endif
-
-#  if PNG_INTEL_SSE_IMPLEMENTATION > 0
-PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,
-   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
-#  endif
-#endif
-
-PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
-   png_const_charp key, png_bytep new_key), PNG_EMPTY);
-
-/* Maintainer: Put new private prototypes here ^ */
-
-#include "pngdebug.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-#endif /* PNGPRIV_H */
diff --git a/src/png/libpng/pngread.c b/src/png/libpng/pngread.c
deleted file mode 100644
index da32e9ad9..000000000
--- a/src/png/libpng/pngread.c
+++ /dev/null
@@ -1,4219 +0,0 @@
-
-/* pngread.c - read a PNG file
- *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains routines that an application calls directly to
- * read a PNG file or stream.
- */
-
-#include "pngpriv.h"
-#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)
-#  include <errno.h>
-#endif
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Create a PNG structure for reading, and allocate any memory needed. */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
-{
-#ifndef PNG_USER_MEM_SUPPORTED
-   png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-        error_fn, warn_fn, NULL, NULL, NULL);
-#else
-   return png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
-        warn_fn, NULL, NULL, NULL);
-}
-
-/* Alternate create PNG structure for reading, and allocate any memory
- * needed.
- */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-{
-   png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-       error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
-#endif /* USER_MEM */
-
-   if (png_ptr != NULL)
-   {
-      png_ptr->mode = PNG_IS_READ_STRUCT;
-
-      /* Added in libpng-1.6.0; this can be used to detect a read structure if
-       * required (it will be zero in a write structure.)
-       */
-#     ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-         png_ptr->IDAT_read_size = PNG_IDAT_READ_SIZE;
-#     endif
-
-#     ifdef PNG_BENIGN_READ_ERRORS_SUPPORTED
-         png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
-
-         /* In stable builds only warn if an application error can be completely
-          * handled.
-          */
-#        if PNG_RELEASE_BUILD
-            png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;
-#        endif
-#     endif
-
-      /* TODO: delay this, it can be done in png_init_io (if the app doesn't
-       * do it itself) avoiding setting the default function if it is not
-       * required.
-       */
-      png_set_read_fn(png_ptr, NULL, NULL);
-   }
-
-   return png_ptr;
-}
-
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data.  This has been
- * changed in v0.90 to allow reading a file that already has the magic
- * bytes read from the stream.  You can tell libpng how many bytes have
- * been read from the beginning of the stream (up to the maximum of 8)
- * via png_set_sig_bytes(), and we will only check the remaining bytes
- * here.  The application can then have access to the signature bytes we
- * read if it is determined that this isn't a valid PNG file.
- */
-void PNGAPI
-png_read_info(png_structrp png_ptr, png_inforp info_ptr)
-{
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   int keep;
-#endif
-
-   png_debug(1, "in png_read_info");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Read and check the PNG file signature. */
-   png_read_sig(png_ptr, info_ptr);
-
-   for (;;)
-   {
-      png_uint_32 length = png_read_chunk_header(png_ptr);
-      png_uint_32 chunk_name = png_ptr->chunk_name;
-
-      /* IDAT logic needs to happen here to simplify getting the two flags
-       * right.
-       */
-      if (chunk_name == png_IDAT)
-      {
-         if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-            png_chunk_error(png_ptr, "Missing IHDR before IDAT");
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-             (png_ptr->mode & PNG_HAVE_PLTE) == 0)
-            png_chunk_error(png_ptr, "Missing PLTE before IDAT");
-
-         else if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
-            png_chunk_benign_error(png_ptr, "Too many IDATs found");
-
-         png_ptr->mode |= PNG_HAVE_IDAT;
-      }
-
-      else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      {
-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-         png_ptr->mode |= PNG_AFTER_IDAT;
-      }
-
-      /* This should be a binary subdivision search or a hash for
-       * matching the chunk name rather than a linear search.
-       */
-      if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
-
-      else if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
-      {
-         png_handle_unknown(png_ptr, info_ptr, length, keep);
-
-         if (chunk_name == png_PLTE)
-            png_ptr->mode |= PNG_HAVE_PLTE;
-
-         else if (chunk_name == png_IDAT)
-         {
-            png_ptr->idat_size = 0; /* It has been consumed */
-            break;
-         }
-      }
-#endif
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-      else if (chunk_name == png_IDAT)
-      {
-         png_ptr->idat_size = length;
-         break;
-      }
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-      else if (chunk_name == png_eXIf)
-         png_handle_eXIf(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
-      else
-         png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
-   }
-}
-#endif /* SEQUENTIAL_READ */
-
-/* Optional call to update the users info_ptr structure */
-void PNGAPI
-png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
-{
-   png_debug(1, "in png_read_update_info");
-
-   if (png_ptr != NULL)
-   {
-      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-      {
-         png_read_start_row(png_ptr);
-
-#        ifdef PNG_READ_TRANSFORMS_SUPPORTED
-            png_read_transform_info(png_ptr, info_ptr);
-#        else
-            PNG_UNUSED(info_ptr)
-#        endif
-      }
-
-      /* New in 1.6.0 this avoids the bug of doing the initializations twice */
-      else
-         png_app_error(png_ptr,
-             "png_read_update_info/png_start_read_image: duplicate call");
-   }
-}
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Initialize palette, background, etc, after transformations
- * are set, but before any reading takes place.  This allows
- * the user to obtain a gamma-corrected palette, for example.
- * If the user doesn't call this, we will do it ourselves.
- */
-void PNGAPI
-png_start_read_image(png_structrp png_ptr)
-{
-   png_debug(1, "in png_start_read_image");
-
-   if (png_ptr != NULL)
-   {
-      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-         png_read_start_row(png_ptr);
-
-      /* New in 1.6.0 this avoids the bug of doing the initializations twice */
-      else
-         png_app_error(png_ptr,
-             "png_start_read_image/png_read_update_info: duplicate call");
-   }
-}
-#endif /* SEQUENTIAL_READ */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Undoes intrapixel differencing,
- * NOTE: this is apparently only supported in the 'sequential' reader.
- */
-static void
-png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_read_intrapixel");
-
-   if (
-       (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
-   {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
-
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);
-            *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);
-         }
-      }
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (png_uint_32)(*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (png_uint_32)(*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (png_uint_32)(*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (s0 + s1 + 65536) & 0xffff;
-            png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;
-            *(rp    ) = (png_byte)((red >> 8) & 0xff);
-            *(rp + 1) = (png_byte)(red & 0xff);
-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-            *(rp + 5) = (png_byte)(blue & 0xff);
-         }
-      }
-   }
-}
-#endif /* MNG_FEATURES */
-
-void PNGAPI
-png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
-{
-   png_row_info row_info;
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug2(1, "in png_read_row (row %lu, pass %d)",
-       (unsigned long)png_ptr->row_number, png_ptr->pass);
-
-   /* png_read_start_row sets the information (in particular iwidth) for this
-    * interlace pass.
-    */
-   if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-      png_read_start_row(png_ptr);
-
-   /* 1.5.6: row_info moved out of png_struct to a local here. */
-   row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
-   row_info.color_type = png_ptr->color_type;
-   row_info.bit_depth = png_ptr->bit_depth;
-   row_info.channels = png_ptr->channels;
-   row_info.pixel_depth = png_ptr->pixel_depth;
-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-#ifdef PNG_WARNINGS_SUPPORTED
-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
-   {
-   /* Check for transforms that have been set but were defined out */
-#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
-   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
-      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
-   if ((png_ptr->transformations & PNG_FILLER) != 0)
-      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
-    !defined(PNG_READ_PACKSWAP_SUPPORTED)
-   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
-   if ((png_ptr->transformations & PNG_PACK) != 0)
-      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
-   if ((png_ptr->transformations & PNG_SHIFT) != 0)
-      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
-   if ((png_ptr->transformations & PNG_BGR) != 0)
-      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
-   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
-      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");
-#endif
-   }
-#endif /* WARNINGS */
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* If interlaced and we do not need a new row, combine row and return.
-    * Notice that the pixels we have from previous rows have been transformed
-    * already; we can only combine like with like (transformed or
-    * untransformed) and, because of the libpng API for interlaced images, this
-    * means we must transform before de-interlacing.
-    */
-   if (png_ptr->interlaced != 0 &&
-       (png_ptr->transformations & PNG_INTERLACE) != 0)
-   {
-      switch (png_ptr->pass)
-      {
-         case 0:
-            if (png_ptr->row_number & 0x07)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 1:
-            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 2:
-            if ((png_ptr->row_number & 0x07) != 4)
-            {
-               if (dsp_row != NULL && (png_ptr->row_number & 4))
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 3:
-            if ((png_ptr->row_number & 3) || png_ptr->width < 3)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 4:
-            if ((png_ptr->row_number & 3) != 2)
-            {
-               if (dsp_row != NULL && (png_ptr->row_number & 2))
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 5:
-            if ((png_ptr->row_number & 1) || png_ptr->width < 2)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         default:
-         case 6:
-            if ((png_ptr->row_number & 1) == 0)
-            {
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-      }
-   }
-#endif
-
-   if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
-      png_error(png_ptr, "Invalid attempt to read row data");
-
-   /* Fill the row with IDAT data: */
-   png_ptr->row_buf[0]=255; /* to force error if no data was found */
-   png_read_IDAT_data(png_ptr, png_ptr->row_buf, row_info.rowbytes + 1);
-
-   if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
-   {
-      if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
-         png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
-             png_ptr->prev_row + 1, png_ptr->row_buf[0]);
-      else
-         png_error(png_ptr, "bad adaptive filter value");
-   }
-
-   /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
-    * 1.5.6, while the buffer really is this big in current versions of libpng
-    * it may not be in the future, so this was changed just to copy the
-    * interlaced count:
-    */
-   memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
-   {
-      /* Intrapixel differencing */
-      png_do_read_intrapixel(&row_info, png_ptr->row_buf + 1);
-   }
-#endif
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   if (png_ptr->transformations)
-      png_do_read_transformations(png_ptr, &row_info);
-#endif
-
-   /* The transformed pixel depth should match the depth now in row_info. */
-   if (png_ptr->transformed_pixel_depth == 0)
-   {
-      png_ptr->transformed_pixel_depth = row_info.pixel_depth;
-      if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
-         png_error(png_ptr, "sequential row overflow");
-   }
-
-   else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
-      png_error(png_ptr, "internal sequential row size calculation error");
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Expand interlaced rows to full size */
-   if (png_ptr->interlaced != 0 &&
-      (png_ptr->transformations & PNG_INTERLACE) != 0)
-   {
-      if (png_ptr->pass < 6)
-         png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
-             png_ptr->transformations);
-
-      if (dsp_row != NULL)
-         png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-      if (row != NULL)
-         png_combine_row(png_ptr, row, 0/*row*/);
-   }
-
-   else
-#endif
-   {
-      if (row != NULL)
-         png_combine_row(png_ptr, row, -1/*ignored*/);
-
-      if (dsp_row != NULL)
-         png_combine_row(png_ptr, dsp_row, -1/*ignored*/);
-   }
-   png_read_finish_row(png_ptr);
-
-   if (png_ptr->read_row_fn != NULL)
-      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-
-}
-#endif /* SEQUENTIAL_READ */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data.  If the image is interlaced,
- * and png_set_interlace_handling() has been called, the rows need to
- * contain the contents of the rows from the previous pass.  If the
- * image has alpha or transparency, and png_handle_alpha()[*] has been
- * called, the rows contents must be initialized to the contents of the
- * screen.
- *
- * "row" holds the actual image, and pixels are placed in it
- * as they arrive.  If the image is displayed after each pass, it will
- * appear to "sparkle" in.  "display_row" can be used to display a
- * "chunky" progressive image, with finer detail added as it becomes
- * available.  If you do not want this "chunky" display, you may pass
- * NULL for display_row.  If you do not want the sparkle display, and
- * you have not called png_handle_alpha(), you may pass NULL for rows.
- * If you have called png_handle_alpha(), and the image has either an
- * alpha channel or a transparency chunk, you must provide a buffer for
- * rows.  In this case, you do not have to provide a display_row buffer
- * also, but you may.  If the image is not interlaced, or if you have
- * not called png_set_interlace_handling(), the display_row buffer will
- * be ignored, so pass NULL to it.
- *
- * [*] png_handle_alpha() does not exist yet, as of this version of libpng
- */
-
-void PNGAPI
-png_read_rows(png_structrp png_ptr, png_bytepp row,
-    png_bytepp display_row, png_uint_32 num_rows)
-{
-   png_uint_32 i;
-   png_bytepp rp;
-   png_bytepp dp;
-
-   png_debug(1, "in png_read_rows");
-
-   if (png_ptr == NULL)
-      return;
-
-   rp = row;
-   dp = display_row;
-   if (rp != NULL && dp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep rptr = *rp++;
-         png_bytep dptr = *dp++;
-
-         png_read_row(png_ptr, rptr, dptr);
-      }
-
-   else if (rp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep rptr = *rp;
-         png_read_row(png_ptr, rptr, NULL);
-         rp++;
-      }
-
-   else if (dp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep dptr = *dp;
-         png_read_row(png_ptr, NULL, dptr);
-         dp++;
-      }
-}
-#endif /* SEQUENTIAL_READ */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the entire image.  If the image has an alpha channel or a tRNS
- * chunk, and you have called png_handle_alpha()[*], you will need to
- * initialize the image to the current image that PNG will be overlaying.
- * We set the num_rows again here, in case it was incorrectly set in
- * png_read_start_row() by a call to png_read_update_info() or
- * png_start_read_image() if png_set_interlace_handling() wasn't called
- * prior to either of these functions like it should have been.  You can
- * only call this function once.  If you desire to have an image for
- * each pass of a interlaced image, use png_read_rows() instead.
- *
- * [*] png_handle_alpha() does not exist yet, as of this version of libpng
- */
-void PNGAPI
-png_read_image(png_structrp png_ptr, png_bytepp image)
-{
-   png_uint_32 i, image_height;
-   int pass, j;
-   png_bytepp rp;
-
-   png_debug(1, "in png_read_image");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-   {
-      pass = png_set_interlace_handling(png_ptr);
-      /* And make sure transforms are initialized. */
-      png_start_read_image(png_ptr);
-   }
-   else
-   {
-      if (png_ptr->interlaced != 0 &&
-          (png_ptr->transformations & PNG_INTERLACE) == 0)
-      {
-         /* Caller called png_start_read_image or png_read_update_info without
-          * first turning on the PNG_INTERLACE transform.  We can fix this here,
-          * but the caller should do it!
-          */
-         png_warning(png_ptr, "Interlace handling should be turned on when "
-             "using png_read_image");
-         /* Make sure this is set correctly */
-         png_ptr->num_rows = png_ptr->height;
-      }
-
-      /* Obtain the pass number, which also turns on the PNG_INTERLACE flag in
-       * the above error case.
-       */
-      pass = png_set_interlace_handling(png_ptr);
-   }
-#else
-   if (png_ptr->interlaced)
-      png_error(png_ptr,
-          "Cannot read interlaced image -- interlace handler disabled");
-
-   pass = 1;
-#endif
-
-   image_height=png_ptr->height;
-
-   for (j = 0; j < pass; j++)
-   {
-      rp = image;
-      for (i = 0; i < image_height; i++)
-      {
-         png_read_row(png_ptr, *rp, NULL);
-         rp++;
-      }
-   }
-}
-#endif /* SEQUENTIAL_READ */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file.  Will not read past the end of the
- * file, will verify the end is accurate, and will read any comments
- * or time information at the end of the file, if info is not NULL.
- */
-void PNGAPI
-png_read_end(png_structrp png_ptr, png_inforp info_ptr)
-{
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   int keep;
-#endif
-
-   png_debug(1, "in png_read_end");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* If png_read_end is called in the middle of reading the rows there may
-    * still be pending IDAT data and an owned zstream.  Deal with this here.
-    */
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   if (png_chunk_unknown_handling(png_ptr, png_IDAT) == 0)
-#endif
-      png_read_finish_IDAT(png_ptr);
-
-#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   /* Report invalid palette index; added at libng-1.5.10 */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       png_ptr->num_palette_max > png_ptr->num_palette)
-      png_benign_error(png_ptr, "Read palette index exceeding num_palette");
-#endif
-
-   do
-   {
-      png_uint_32 length = png_read_chunk_header(png_ptr);
-      png_uint_32 chunk_name = png_ptr->chunk_name;
-
-      if (chunk_name != png_IDAT)
-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-
-      if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
-
-      else if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
-
-      else if (info_ptr == NULL)
-         png_crc_finish(png_ptr, length);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
-      {
-         if (chunk_name == png_IDAT)
-         {
-            if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
-                || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
-               png_benign_error(png_ptr, ".Too many IDATs found");
-         }
-         png_handle_unknown(png_ptr, info_ptr, length, keep);
-         if (chunk_name == png_PLTE)
-            png_ptr->mode |= PNG_HAVE_PLTE;
-      }
-#endif
-
-      else if (chunk_name == png_IDAT)
-      {
-         /* Zero length IDATs are legal after the last IDAT has been
-          * read, but not after other chunks have been read.  1.6 does not
-          * always read all the deflate data; specifically it cannot be relied
-          * upon to read the Adler32 at the end.  If it doesn't ignore IDAT
-          * chunks which are longer than zero as well:
-          */
-         if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
-             || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
-            png_benign_error(png_ptr, "..Too many IDATs found");
-
-         png_crc_finish(png_ptr, length);
-      }
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-      else if (chunk_name == png_eXIf)
-         png_handle_eXIf(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
-      else
-         png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
-   } while ((png_ptr->mode & PNG_HAVE_IEND) == 0);
-}
-#endif /* SEQUENTIAL_READ */
-
-/* Free all memory used in the read struct */
-static void
-png_read_destroy(png_structrp png_ptr)
-{
-   png_debug(1, "in png_read_destroy");
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   png_destroy_gamma_table(png_ptr);
-#endif
-
-   png_free(png_ptr, png_ptr->big_row_buf);
-   png_ptr->big_row_buf = NULL;
-   png_free(png_ptr, png_ptr->big_prev_row);
-   png_ptr->big_prev_row = NULL;
-   png_free(png_ptr, png_ptr->read_buffer);
-   png_ptr->read_buffer = NULL;
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   png_free(png_ptr, png_ptr->palette_lookup);
-   png_ptr->palette_lookup = NULL;
-   png_free(png_ptr, png_ptr->quantize_index);
-   png_ptr->quantize_index = NULL;
-#endif
-
-   if ((png_ptr->free_me & PNG_FREE_PLTE) != 0)
-   {
-      png_zfree(png_ptr, png_ptr->palette);
-      png_ptr->palette = NULL;
-   }
-   png_ptr->free_me &= ~PNG_FREE_PLTE;
-
-#if defined(PNG_tRNS_SUPPORTED) || \
-    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   if ((png_ptr->free_me & PNG_FREE_TRNS) != 0)
-   {
-      png_free(png_ptr, png_ptr->trans_alpha);
-      png_ptr->trans_alpha = NULL;
-   }
-   png_ptr->free_me &= ~PNG_FREE_TRNS;
-#endif
-
-   inflateEnd(&png_ptr->zstream);
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-   png_free(png_ptr, png_ptr->save_buffer);
-   png_ptr->save_buffer = NULL;
-#endif
-
-#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \
-   defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
-   png_free(png_ptr, png_ptr->unknown_chunk.data);
-   png_ptr->unknown_chunk.data = NULL;
-#endif
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-   png_free(png_ptr, png_ptr->chunk_list);
-   png_ptr->chunk_list = NULL;
-#endif
-
-   /* NOTE: the 'setjmp' buffer may still be allocated and the memory and error
-    * callbacks are still set at this point.  They are required to complete the
-    * destruction of the png_struct itself.
-    */
-}
-
-/* Free all memory used by the read */
-void PNGAPI
-png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
-    png_infopp end_info_ptr_ptr)
-{
-   png_structrp png_ptr = NULL;
-
-   png_debug(1, "in png_destroy_read_struct");
-
-   if (png_ptr_ptr != NULL)
-      png_ptr = *png_ptr_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* libpng 1.6.0: use the API to destroy info structs to ensure consistent
-    * behavior.  Prior to 1.6.0 libpng did extra 'info' destruction in this API.
-    * The extra was, apparently, unnecessary yet this hides memory leak bugs.
-    */
-   png_destroy_info_struct(png_ptr, end_info_ptr_ptr);
-   png_destroy_info_struct(png_ptr, info_ptr_ptr);
-
-   *png_ptr_ptr = NULL;
-   png_read_destroy(png_ptr);
-   png_destroy_png_struct(png_ptr);
-}
-
-void PNGAPI
-png_set_read_status_fn(png_structrp png_ptr, png_read_status_ptr read_row_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->read_row_fn = read_row_fn;
-}
-
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_read_png(png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, voidp params)
-{
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* png_read_info() gives us all of the information from the
-    * PNG file before the first IDAT (image data chunk).
-    */
-   png_read_info(png_ptr, info_ptr);
-   if (info_ptr->height > PNG_UINT_32_MAX/(sizeof (png_bytep)))
-      png_error(png_ptr, "Image is too high to process with png_read_png()");
-
-   /* -------------- image transformations start here ------------------- */
-   /* libpng 1.6.10: add code to cause a png_app_error if a selected TRANSFORM
-    * is not implemented.  This will only happen in de-configured (non-default)
-    * libpng builds.  The results can be unexpected - png_read_png may return
-    * short or mal-formed rows because the transform is skipped.
-    */
-
-   /* Tell libpng to strip 16-bit/color files down to 8 bits per color.
-    */
-   if ((transforms & PNG_TRANSFORM_SCALE_16) != 0)
-      /* Added at libpng-1.5.4. "strip_16" produces the same result that it
-       * did in earlier versions, while "scale_16" is now more accurate.
-       */
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-      png_set_scale_16(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_SCALE_16 not supported");
-#endif
-
-   /* If both SCALE and STRIP are required pngrtran will effectively cancel the
-    * latter by doing SCALE first.  This is ok and allows apps not to check for
-    * which is supported to get the right answer.
-    */
-   if ((transforms & PNG_TRANSFORM_STRIP_16) != 0)
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-      png_set_strip_16(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_16 not supported");
-#endif
-
-   /* Strip alpha bytes from the input data without combining with
-    * the background (not recommended).
-    */
-   if ((transforms & PNG_TRANSFORM_STRIP_ALPHA) != 0)
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-      png_set_strip_alpha(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_ALPHA not supported");
-#endif
-
-   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
-    * byte into separate bytes (useful for paletted and grayscale images).
-    */
-   if ((transforms & PNG_TRANSFORM_PACKING) != 0)
-#ifdef PNG_READ_PACK_SUPPORTED
-      png_set_packing(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");
-#endif
-
-   /* Change the order of packed pixels to least significant bit first
-    * (not useful if you are using png_set_packing).
-    */
-   if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-      png_set_packswap(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");
-#endif
-
-   /* Expand paletted colors into true RGB triplets
-    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
-    * Expand paletted or RGB images with transparency to full alpha
-    * channels so the data will be available as RGBA quartets.
-    */
-   if ((transforms & PNG_TRANSFORM_EXPAND) != 0)
-#ifdef PNG_READ_EXPAND_SUPPORTED
-      png_set_expand(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND not supported");
-#endif
-
-   /* We don't handle background color or gamma transformation or quantizing.
-    */
-
-   /* Invert monochrome files to have 0 as white and 1 as black
-    */
-   if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
-#ifdef PNG_READ_INVERT_SUPPORTED
-      png_set_invert_mono(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");
-#endif
-
-   /* If you want to shift the pixel values from the range [0,255] or
-    * [0,65535] to the original [0,7] or [0,31], or whatever range the
-    * colors were originally in:
-    */
-   if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
-#ifdef PNG_READ_SHIFT_SUPPORTED
-      if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
-         png_set_shift(png_ptr, &info_ptr->sig_bit);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
-#endif
-
-   /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
-   if ((transforms & PNG_TRANSFORM_BGR) != 0)
-#ifdef PNG_READ_BGR_SUPPORTED
-      png_set_bgr(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");
-#endif
-
-   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
-   if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-      png_set_swap_alpha(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");
-#endif
-
-   /* Swap bytes of 16-bit files to least significant byte first */
-   if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
-#ifdef PNG_READ_SWAP_SUPPORTED
-      png_set_swap(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");
-#endif
-
-/* Added at libpng-1.2.41 */
-   /* Invert the alpha channel from opacity to transparency */
-   if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-      png_set_invert_alpha(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");
-#endif
-
-/* Added at libpng-1.2.41 */
-   /* Expand grayscale image to RGB */
-   if ((transforms & PNG_TRANSFORM_GRAY_TO_RGB) != 0)
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-      png_set_gray_to_rgb(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_GRAY_TO_RGB not supported");
-#endif
-
-/* Added at libpng-1.5.4 */
-   if ((transforms & PNG_TRANSFORM_EXPAND_16) != 0)
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-      png_set_expand_16(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND_16 not supported");
-#endif
-
-   /* We don't handle adding filler bytes */
-
-   /* We use png_read_image and rely on that for interlace handling, but we also
-    * call png_read_update_info therefore must turn on interlace handling now:
-    */
-   (void)png_set_interlace_handling(png_ptr);
-
-   /* Optional call to gamma correct and add the background to the palette
-    * and update info structure.  REQUIRED if you are expecting libpng to
-    * update the palette for you (i.e., you selected such a transform above).
-    */
-   png_read_update_info(png_ptr, info_ptr);
-
-   /* -------------- image transformations end here ------------------- */
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-   if (info_ptr->row_pointers == NULL)
-   {
-      png_uint_32 iptr;
-
-      info_ptr->row_pointers = png_voidcast(png_bytepp, png_malloc(png_ptr,
-          info_ptr->height * (sizeof (png_bytep))));
-
-      for (iptr=0; iptr<info_ptr->height; iptr++)
-         info_ptr->row_pointers[iptr] = NULL;
-
-      info_ptr->free_me |= PNG_FREE_ROWS;
-
-      for (iptr = 0; iptr < info_ptr->height; iptr++)
-         info_ptr->row_pointers[iptr] = png_voidcast(png_bytep,
-             png_malloc(png_ptr, info_ptr->rowbytes));
-   }
-
-   png_read_image(png_ptr, info_ptr->row_pointers);
-   info_ptr->valid |= PNG_INFO_IDAT;
-
-   /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
-   png_read_end(png_ptr, info_ptr);
-
-   PNG_UNUSED(params)
-}
-#endif /* INFO_IMAGE */
-#endif /* SEQUENTIAL_READ */
-
-#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
-/* SIMPLIFIED READ
- *
- * This code currently relies on the sequential reader, though it could easily
- * be made to work with the progressive one.
- */
-/* Arguments to png_image_finish_read: */
-
-/* Encoding of PNG data (used by the color-map code) */
-#  define P_NOTSET  0 /* File encoding not yet known */
-#  define P_sRGB    1 /* 8-bit encoded to sRGB gamma */
-#  define P_LINEAR  2 /* 16-bit linear: not encoded, NOT pre-multiplied! */
-#  define P_FILE    3 /* 8-bit encoded to file gamma, not sRGB or linear */
-#  define P_LINEAR8 4 /* 8-bit linear: only from a file value */
-
-/* Color-map processing: after libpng has run on the PNG image further
- * processing may be needed to convert the data to color-map indices.
- */
-#define PNG_CMAP_NONE      0
-#define PNG_CMAP_GA        1 /* Process GA data to a color-map with alpha */
-#define PNG_CMAP_TRANS     2 /* Process GA data to a background index */
-#define PNG_CMAP_RGB       3 /* Process RGB data */
-#define PNG_CMAP_RGB_ALPHA 4 /* Process RGBA data */
-
-/* The following document where the background is for each processing case. */
-#define PNG_CMAP_NONE_BACKGROUND      256
-#define PNG_CMAP_GA_BACKGROUND        231
-#define PNG_CMAP_TRANS_BACKGROUND     254
-#define PNG_CMAP_RGB_BACKGROUND       256
-#define PNG_CMAP_RGB_ALPHA_BACKGROUND 216
-
-typedef struct
-{
-   /* Arguments: */
-   png_imagep image;
-   png_voidp  buffer;
-   png_int_32 row_stride;
-   png_voidp  colormap;
-   png_const_colorp background;
-   /* Local variables: */
-   png_voidp       local_row;
-   png_voidp       first_row;
-   ptrdiff_t       row_bytes;           /* step between rows */
-   int             file_encoding;       /* E_ values above */
-   png_fixed_point gamma_to_linear;     /* For P_FILE, reciprocal of gamma */
-   int             colormap_processing; /* PNG_CMAP_ values above */
-} png_image_read_control;
-
-/* Do all the *safe* initialization - 'safe' means that png_error won't be
- * called, so setting up the jmp_buf is not required.  This means that anything
- * called from here must *not* call png_malloc - it has to call png_malloc_warn
- * instead so that control is returned safely back to this routine.
- */
-static int
-png_image_read_init(png_imagep image)
-{
-   if (image->opaque == NULL)
-   {
-      png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, image,
-          png_safe_error, png_safe_warning);
-
-      /* And set the rest of the structure to NULL to ensure that the various
-       * fields are consistent.
-       */
-      memset(image, 0, (sizeof *image));
-      image->version = PNG_IMAGE_VERSION;
-
-      if (png_ptr != NULL)
-      {
-         png_infop info_ptr = png_create_info_struct(png_ptr);
-
-         if (info_ptr != NULL)
-         {
-            png_controlp control = png_voidcast(png_controlp,
-                png_malloc_warn(png_ptr, (sizeof *control)));
-
-            if (control != NULL)
-            {
-               memset(control, 0, (sizeof *control));
-
-               control->png_ptr = png_ptr;
-               control->info_ptr = info_ptr;
-               control->for_write = 0;
-
-               image->opaque = control;
-               return 1;
-            }
-
-            /* Error clean up */
-            png_destroy_info_struct(png_ptr, &info_ptr);
-         }
-
-         png_destroy_read_struct(&png_ptr, NULL, NULL);
-      }
-
-      return png_image_error(image, "png_image_read: out of memory");
-   }
-
-   return png_image_error(image, "png_image_read: opaque pointer not NULL");
-}
-
-/* Utility to find the base format of a PNG file from a png_struct. */
-static png_uint_32
-png_image_format(png_structrp png_ptr)
-{
-   png_uint_32 format = 0;
-
-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-      format |= PNG_FORMAT_FLAG_COLOR;
-
-   if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-      format |= PNG_FORMAT_FLAG_ALPHA;
-
-   /* Use png_ptr here, not info_ptr, because by examination png_handle_tRNS
-    * sets the png_struct fields; that's all we are interested in here.  The
-    * precise interaction with an app call to png_set_tRNS and PNG file reading
-    * is unclear.
-    */
-   else if (png_ptr->num_trans > 0)
-      format |= PNG_FORMAT_FLAG_ALPHA;
-
-   if (png_ptr->bit_depth == 16)
-      format |= PNG_FORMAT_FLAG_LINEAR;
-
-   if ((png_ptr->color_type & PNG_COLOR_MASK_PALETTE) != 0)
-      format |= PNG_FORMAT_FLAG_COLORMAP;
-
-   return format;
-}
-
-/* Is the given gamma significantly different from sRGB?  The test is the same
- * one used in pngrtran.c when deciding whether to do gamma correction.  The
- * arithmetic optimizes the division by using the fact that the inverse of the
- * file sRGB gamma is 2.2
- */
-static int
-png_gamma_not_sRGB(png_fixed_point g)
-{
-   if (g < PNG_FP_1)
-   {
-      /* An uninitialized gamma is assumed to be sRGB for the simplified API. */
-      if (g == 0)
-         return 0;
-
-      return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);
-   }
-
-   return 1;
-}
-
-/* Do the main body of a 'png_image_begin_read' function; read the PNG file
- * header and fill in all the information.  This is executed in a safe context,
- * unlike the init routine above.
- */
-static int
-png_image_read_header(png_voidp argument)
-{
-   png_imagep image = png_voidcast(png_imagep, argument);
-   png_structrp png_ptr = image->opaque->png_ptr;
-   png_inforp info_ptr = image->opaque->info_ptr;
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-   png_set_benign_errors(png_ptr, 1/*warn*/);
-#endif
-   png_read_info(png_ptr, info_ptr);
-
-   /* Do this the fast way; just read directly out of png_struct. */
-   image->width = png_ptr->width;
-   image->height = png_ptr->height;
-
-   {
-      png_uint_32 format = png_image_format(png_ptr);
-
-      image->format = format;
-
-#ifdef PNG_COLORSPACE_SUPPORTED
-      /* Does the colorspace match sRGB?  If there is no color endpoint
-       * (colorant) information assume yes, otherwise require the
-       * 'ENDPOINTS_MATCHP_sRGB' colorspace flag to have been set.  If the
-       * colorspace has been determined to be invalid ignore it.
-       */
-      if ((format & PNG_FORMAT_FLAG_COLOR) != 0 && ((png_ptr->colorspace.flags
-         & (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB|
-            PNG_COLORSPACE_INVALID)) == PNG_COLORSPACE_HAVE_ENDPOINTS))
-         image->flags |= PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB;
-#endif
-   }
-
-   /* We need the maximum number of entries regardless of the format the
-    * application sets here.
-    */
-   {
-      png_uint_32 cmap_entries;
-
-      switch (png_ptr->color_type)
-      {
-         case PNG_COLOR_TYPE_GRAY:
-            cmap_entries = 1U << png_ptr->bit_depth;
-            break;
-
-         case PNG_COLOR_TYPE_PALETTE:
-            cmap_entries = (png_uint_32)png_ptr->num_palette;
-            break;
-
-         default:
-            cmap_entries = 256;
-            break;
-      }
-
-      if (cmap_entries > 256)
-         cmap_entries = 256;
-
-      image->colormap_entries = cmap_entries;
-   }
-
-   return 1;
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-int PNGAPI
-png_image_begin_read_from_stdio(png_imagep image, FILE* file)
-{
-   if (image != NULL && image->version == PNG_IMAGE_VERSION)
-   {
-      if (file != NULL)
-      {
-         if (png_image_read_init(image) != 0)
-         {
-            /* This is slightly evil, but png_init_io doesn't do anything other
-             * than this and we haven't changed the standard IO functions so
-             * this saves a 'safe' function.
-             */
-            image->opaque->png_ptr->io_ptr = file;
-            return png_safe_execute(image, png_image_read_header, image);
-         }
-      }
-
-      else
-         return png_image_error(image,
-             "png_image_begin_read_from_stdio: invalid argument");
-   }
-
-   else if (image != NULL)
-      return png_image_error(image,
-          "png_image_begin_read_from_stdio: incorrect PNG_IMAGE_VERSION");
-
-   return 0;
-}
-
-int PNGAPI
-png_image_begin_read_from_file(png_imagep image, const char *file_name)
-{
-   if (image != NULL && image->version == PNG_IMAGE_VERSION)
-   {
-      if (file_name != NULL)
-      {
-         FILE *fp = fopen(file_name, "rb");
-
-         if (fp != NULL)
-         {
-            if (png_image_read_init(image) != 0)
-            {
-               image->opaque->png_ptr->io_ptr = fp;
-               image->opaque->owned_file = 1;
-               return png_safe_execute(image, png_image_read_header, image);
-            }
-
-            /* Clean up: just the opened file. */
-            (void)fclose(fp);
-         }
-
-         else
-            return png_image_error(image, strerror(errno));
-      }
-
-      else
-         return png_image_error(image,
-             "png_image_begin_read_from_file: invalid argument");
-   }
-
-   else if (image != NULL)
-      return png_image_error(image,
-          "png_image_begin_read_from_file: incorrect PNG_IMAGE_VERSION");
-
-   return 0;
-}
-#endif /* STDIO */
-
-static void PNGCBAPI
-png_image_memory_read(png_structp png_ptr, png_bytep out, png_size_t need)
-{
-   if (png_ptr != NULL)
-   {
-      png_imagep image = png_voidcast(png_imagep, png_ptr->io_ptr);
-      if (image != NULL)
-      {
-         png_controlp cp = image->opaque;
-         if (cp != NULL)
-         {
-            png_const_bytep memory = cp->memory;
-            png_size_t size = cp->size;
-
-            if (memory != NULL && size >= need)
-            {
-               memcpy(out, memory, need);
-               cp->memory = memory + need;
-               cp->size = size - need;
-               return;
-            }
-
-            png_error(png_ptr, "read beyond end of data");
-         }
-      }
-
-      png_error(png_ptr, "invalid memory read");
-   }
-}
-
-int PNGAPI png_image_begin_read_from_memory(png_imagep image,
-    png_const_voidp memory, png_size_t size)
-{
-   if (image != NULL && image->version == PNG_IMAGE_VERSION)
-   {
-      if (memory != NULL && size > 0)
-      {
-         if (png_image_read_init(image) != 0)
-         {
-            /* Now set the IO functions to read from the memory buffer and
-             * store it into io_ptr.  Again do this in-place to avoid calling a
-             * libpng function that requires error handling.
-             */
-            image->opaque->memory = png_voidcast(png_const_bytep, memory);
-            image->opaque->size = size;
-            image->opaque->png_ptr->io_ptr = image;
-            image->opaque->png_ptr->read_data_fn = png_image_memory_read;
-
-            return png_safe_execute(image, png_image_read_header, image);
-         }
-      }
-
-      else
-         return png_image_error(image,
-             "png_image_begin_read_from_memory: invalid argument");
-   }
-
-   else if (image != NULL)
-      return png_image_error(image,
-          "png_image_begin_read_from_memory: incorrect PNG_IMAGE_VERSION");
-
-   return 0;
-}
-
-/* Utility function to skip chunks that are not used by the simplified image
- * read functions and an appropriate macro to call it.
- */
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-static void
-png_image_skip_unused_chunks(png_structrp png_ptr)
-{
-   /* Prepare the reader to ignore all recognized chunks whose data will not
-    * be used, i.e., all chunks recognized by libpng except for those
-    * involved in basic image reading:
-    *
-    *    IHDR, PLTE, IDAT, IEND
-    *
-    * Or image data handling:
-    *
-    *    tRNS, bKGD, gAMA, cHRM, sRGB, [iCCP] and sBIT.
-    *
-    * This provides a small performance improvement and eliminates any
-    * potential vulnerability to security problems in the unused chunks.
-    *
-    * At present the iCCP chunk data isn't used, so iCCP chunk can be ignored
-    * too.  This allows the simplified API to be compiled without iCCP support,
-    * however if the support is there the chunk is still checked to detect
-    * errors (which are unfortunately quite common.)
-    */
-   {
-         static PNG_CONST png_byte chunks_to_process[] = {
-            98,  75,  71,  68, '\0',  /* bKGD */
-            99,  72,  82,  77, '\0',  /* cHRM */
-           103,  65,  77,  65, '\0',  /* gAMA */
-#        ifdef PNG_READ_iCCP_SUPPORTED
-           105,  67,  67,  80, '\0',  /* iCCP */
-#        endif
-           115,  66,  73,  84, '\0',  /* sBIT */
-           115,  82,  71,  66, '\0',  /* sRGB */
-           };
-
-       /* Ignore unknown chunks and all other chunks except for the
-        * IHDR, PLTE, tRNS, IDAT, and IEND chunks.
-        */
-       png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_NEVER,
-           NULL, -1);
-
-       /* But do not ignore image data handling chunks */
-       png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_AS_DEFAULT,
-           chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5);
-   }
-}
-
-#  define PNG_SKIP_CHUNKS(p) png_image_skip_unused_chunks(p)
-#else
-#  define PNG_SKIP_CHUNKS(p) ((void)0)
-#endif /* HANDLE_AS_UNKNOWN */
-
-/* The following macro gives the exact rounded answer for all values in the
- * range 0..255 (it actually divides by 51.2, but the rounding still generates
- * the correct numbers 0..5
- */
-#define PNG_DIV51(v8) (((v8) * 5 + 130) >> 8)
-
-/* Utility functions to make particular color-maps */
-static void
-set_file_encoding(png_image_read_control *display)
-{
-   png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma;
-   if (png_gamma_significant(g) != 0)
-   {
-      if (png_gamma_not_sRGB(g) != 0)
-      {
-         display->file_encoding = P_FILE;
-         display->gamma_to_linear = png_reciprocal(g);
-      }
-
-      else
-         display->file_encoding = P_sRGB;
-   }
-
-   else
-      display->file_encoding = P_LINEAR8;
-}
-
-static unsigned int
-decode_gamma(png_image_read_control *display, png_uint_32 value, int encoding)
-{
-   if (encoding == P_FILE) /* double check */
-      encoding = display->file_encoding;
-
-   if (encoding == P_NOTSET) /* must be the file encoding */
-   {
-      set_file_encoding(display);
-      encoding = display->file_encoding;
-   }
-
-   switch (encoding)
-   {
-      case P_FILE:
-         value = png_gamma_16bit_correct(value*257, display->gamma_to_linear);
-         break;
-
-      case P_sRGB:
-         value = png_sRGB_table[value];
-         break;
-
-      case P_LINEAR:
-         break;
-
-      case P_LINEAR8:
-         value *= 257;
-         break;
-
-#ifdef __GNUC__
-      default:
-         png_error(display->image->opaque->png_ptr,
-             "unexpected encoding (internal error)");
-#endif
-   }
-
-   return value;
-}
-
-static png_uint_32
-png_colormap_compose(png_image_read_control *display,
-    png_uint_32 foreground, int foreground_encoding, png_uint_32 alpha,
-    png_uint_32 background, int encoding)
-{
-   /* The file value is composed on the background, the background has the given
-    * encoding and so does the result, the file is encoded with P_FILE and the
-    * file and alpha are 8-bit values.  The (output) encoding will always be
-    * P_LINEAR or P_sRGB.
-    */
-   png_uint_32 f = decode_gamma(display, foreground, foreground_encoding);
-   png_uint_32 b = decode_gamma(display, background, encoding);
-
-   /* The alpha is always an 8-bit value (it comes from the palette), the value
-    * scaled by 255 is what PNG_sRGB_FROM_LINEAR requires.
-    */
-   f = f * alpha + b * (255-alpha);
-
-   if (encoding == P_LINEAR)
-   {
-      /* Scale to 65535; divide by 255, approximately (in fact this is extremely
-       * accurate, it divides by 255.00000005937181414556, with no overflow.)
-       */
-      f *= 257; /* Now scaled by 65535 */
-      f += f >> 16;
-      f = (f+32768) >> 16;
-   }
-
-   else /* P_sRGB */
-      f = PNG_sRGB_FROM_LINEAR(f);
-
-   return f;
-}
-
-/* NOTE: P_LINEAR values to this routine must be 16-bit, but P_FILE values must
- * be 8-bit.
- */
-static void
-png_create_colormap_entry(png_image_read_control *display,
-    png_uint_32 ip, png_uint_32 red, png_uint_32 green, png_uint_32 blue,
-    png_uint_32 alpha, int encoding)
-{
-   png_imagep image = display->image;
-   const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
-       P_LINEAR : P_sRGB;
-   const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&
-       (red != green || green != blue);
-
-   if (ip > 255)
-      png_error(image->opaque->png_ptr, "color-map index out of range");
-
-   /* Update the cache with whether the file gamma is significantly different
-    * from sRGB.
-    */
-   if (encoding == P_FILE)
-   {
-      if (display->file_encoding == P_NOTSET)
-         set_file_encoding(display);
-
-      /* Note that the cached value may be P_FILE too, but if it is then the
-       * gamma_to_linear member has been set.
-       */
-      encoding = display->file_encoding;
-   }
-
-   if (encoding == P_FILE)
-   {
-      png_fixed_point g = display->gamma_to_linear;
-
-      red = png_gamma_16bit_correct(red*257, g);
-      green = png_gamma_16bit_correct(green*257, g);
-      blue = png_gamma_16bit_correct(blue*257, g);
-
-      if (convert_to_Y != 0 || output_encoding == P_LINEAR)
-      {
-         alpha *= 257;
-         encoding = P_LINEAR;
-      }
-
-      else
-      {
-         red = PNG_sRGB_FROM_LINEAR(red * 255);
-         green = PNG_sRGB_FROM_LINEAR(green * 255);
-         blue = PNG_sRGB_FROM_LINEAR(blue * 255);
-         encoding = P_sRGB;
-      }
-   }
-
-   else if (encoding == P_LINEAR8)
-   {
-      /* This encoding occurs quite frequently in test cases because PngSuite
-       * includes a gAMA 1.0 chunk with most images.
-       */
-      red *= 257;
-      green *= 257;
-      blue *= 257;
-      alpha *= 257;
-      encoding = P_LINEAR;
-   }
-
-   else if (encoding == P_sRGB &&
-       (convert_to_Y  != 0 || output_encoding == P_LINEAR))
-   {
-      /* The values are 8-bit sRGB values, but must be converted to 16-bit
-       * linear.
-       */
-      red = png_sRGB_table[red];
-      green = png_sRGB_table[green];
-      blue = png_sRGB_table[blue];
-      alpha *= 257;
-      encoding = P_LINEAR;
-   }
-
-   /* This is set if the color isn't gray but the output is. */
-   if (encoding == P_LINEAR)
-   {
-      if (convert_to_Y != 0)
-      {
-         /* NOTE: these values are copied from png_do_rgb_to_gray */
-         png_uint_32 y = (png_uint_32)6968 * red  + (png_uint_32)23434 * green +
-            (png_uint_32)2366 * blue;
-
-         if (output_encoding == P_LINEAR)
-            y = (y + 16384) >> 15;
-
-         else
-         {
-            /* y is scaled by 32768, we need it scaled by 255: */
-            y = (y + 128) >> 8;
-            y *= 255;
-            y = PNG_sRGB_FROM_LINEAR((y + 64) >> 7);
-            alpha = PNG_DIV257(alpha);
-            encoding = P_sRGB;
-         }
-
-         blue = red = green = y;
-      }
-
-      else if (output_encoding == P_sRGB)
-      {
-         red = PNG_sRGB_FROM_LINEAR(red * 255);
-         green = PNG_sRGB_FROM_LINEAR(green * 255);
-         blue = PNG_sRGB_FROM_LINEAR(blue * 255);
-         alpha = PNG_DIV257(alpha);
-         encoding = P_sRGB;
-      }
-   }
-
-   if (encoding != output_encoding)
-      png_error(image->opaque->png_ptr, "bad encoding (internal error)");
-
-   /* Store the value. */
-   {
-#     ifdef PNG_FORMAT_AFIRST_SUPPORTED
-         const int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
-            (image->format & PNG_FORMAT_FLAG_ALPHA) != 0;
-#     else
-#        define afirst 0
-#     endif
-#     ifdef PNG_FORMAT_BGR_SUPPORTED
-         const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
-#     else
-#        define bgr 0
-#     endif
-
-      if (output_encoding == P_LINEAR)
-      {
-         png_uint_16p entry = png_voidcast(png_uint_16p, display->colormap);
-
-         entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);
-
-         /* The linear 16-bit values must be pre-multiplied by the alpha channel
-          * value, if less than 65535 (this is, effectively, composite on black
-          * if the alpha channel is removed.)
-          */
-         switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))
-         {
-            case 4:
-               entry[afirst ? 0 : 3] = (png_uint_16)alpha;
-               /* FALLTHROUGH */
-
-            case 3:
-               if (alpha < 65535)
-               {
-                  if (alpha > 0)
-                  {
-                     blue = (blue * alpha + 32767U)/65535U;
-                     green = (green * alpha + 32767U)/65535U;
-                     red = (red * alpha + 32767U)/65535U;
-                  }
-
-                  else
-                     red = green = blue = 0;
-               }
-               entry[afirst + (2 ^ bgr)] = (png_uint_16)blue;
-               entry[afirst + 1] = (png_uint_16)green;
-               entry[afirst + bgr] = (png_uint_16)red;
-               break;
-
-            case 2:
-               entry[1 ^ afirst] = (png_uint_16)alpha;
-               /* FALLTHROUGH */
-
-            case 1:
-               if (alpha < 65535)
-               {
-                  if (alpha > 0)
-                     green = (green * alpha + 32767U)/65535U;
-
-                  else
-                     green = 0;
-               }
-               entry[afirst] = (png_uint_16)green;
-               break;
-
-            default:
-               break;
-         }
-      }
-
-      else /* output encoding is P_sRGB */
-      {
-         png_bytep entry = png_voidcast(png_bytep, display->colormap);
-
-         entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);
-
-         switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))
-         {
-            case 4:
-               entry[afirst ? 0 : 3] = (png_byte)alpha;
-               /* FALLTHROUGH */
-            case 3:
-               entry[afirst + (2 ^ bgr)] = (png_byte)blue;
-               entry[afirst + 1] = (png_byte)green;
-               entry[afirst + bgr] = (png_byte)red;
-               break;
-
-            case 2:
-               entry[1 ^ afirst] = (png_byte)alpha;
-               /* FALLTHROUGH */
-            case 1:
-               entry[afirst] = (png_byte)green;
-               break;
-
-            default:
-               break;
-         }
-      }
-
-#     ifdef afirst
-#        undef afirst
-#     endif
-#     ifdef bgr
-#        undef bgr
-#     endif
-   }
-}
-
-static int
-make_gray_file_colormap(png_image_read_control *display)
-{
-   unsigned int i;
-
-   for (i=0; i<256; ++i)
-      png_create_colormap_entry(display, i, i, i, i, 255, P_FILE);
-
-   return (int)i;
-}
-
-static int
-make_gray_colormap(png_image_read_control *display)
-{
-   unsigned int i;
-
-   for (i=0; i<256; ++i)
-      png_create_colormap_entry(display, i, i, i, i, 255, P_sRGB);
-
-   return (int)i;
-}
-#define PNG_GRAY_COLORMAP_ENTRIES 256
-
-static int
-make_ga_colormap(png_image_read_control *display)
-{
-   unsigned int i, a;
-
-   /* Alpha is retained, the output will be a color-map with entries
-    * selected by six levels of alpha.  One transparent entry, 6 gray
-    * levels for all the intermediate alpha values, leaving 230 entries
-    * for the opaque grays.  The color-map entries are the six values
-    * [0..5]*51, the GA processing uses PNG_DIV51(value) to find the
-    * relevant entry.
-    *
-    * if (alpha > 229) // opaque
-    * {
-    *    // The 231 entries are selected to make the math below work:
-    *    base = 0;
-    *    entry = (231 * gray + 128) >> 8;
-    * }
-    * else if (alpha < 26) // transparent
-    * {
-    *    base = 231;
-    *    entry = 0;
-    * }
-    * else // partially opaque
-    * {
-    *    base = 226 + 6 * PNG_DIV51(alpha);
-    *    entry = PNG_DIV51(gray);
-    * }
-    */
-   i = 0;
-   while (i < 231)
-   {
-      unsigned int gray = (i * 256 + 115) / 231;
-      png_create_colormap_entry(display, i++, gray, gray, gray, 255, P_sRGB);
-   }
-
-   /* 255 is used here for the component values for consistency with the code
-    * that undoes premultiplication in pngwrite.c.
-    */
-   png_create_colormap_entry(display, i++, 255, 255, 255, 0, P_sRGB);
-
-   for (a=1; a<5; ++a)
-   {
-      unsigned int g;
-
-      for (g=0; g<6; ++g)
-         png_create_colormap_entry(display, i++, g*51, g*51, g*51, a*51,
-             P_sRGB);
-   }
-
-   return (int)i;
-}
-
-#define PNG_GA_COLORMAP_ENTRIES 256
-
-static int
-make_rgb_colormap(png_image_read_control *display)
-{
-   unsigned int i, r;
-
-   /* Build a 6x6x6 opaque RGB cube */
-   for (i=r=0; r<6; ++r)
-   {
-      unsigned int g;
-
-      for (g=0; g<6; ++g)
-      {
-         unsigned int b;
-
-         for (b=0; b<6; ++b)
-            png_create_colormap_entry(display, i++, r*51, g*51, b*51, 255,
-                P_sRGB);
-      }
-   }
-
-   return (int)i;
-}
-
-#define PNG_RGB_COLORMAP_ENTRIES 216
-
-/* Return a palette index to the above palette given three 8-bit sRGB values. */
-#define PNG_RGB_INDEX(r,g,b) \
-   ((png_byte)(6 * (6 * PNG_DIV51(r) + PNG_DIV51(g)) + PNG_DIV51(b)))
-
-static int
-png_image_read_colormap(png_voidp argument)
-{
-   png_image_read_control *display =
-      png_voidcast(png_image_read_control*, argument);
-   const png_imagep image = display->image;
-
-   const png_structrp png_ptr = image->opaque->png_ptr;
-   const png_uint_32 output_format = image->format;
-   const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
-      P_LINEAR : P_sRGB;
-
-   unsigned int cmap_entries;
-   unsigned int output_processing;        /* Output processing option */
-   unsigned int data_encoding = P_NOTSET; /* Encoding libpng must produce */
-
-   /* Background information; the background color and the index of this color
-    * in the color-map if it exists (else 256).
-    */
-   unsigned int background_index = 256;
-   png_uint_32 back_r, back_g, back_b;
-
-   /* Flags to accumulate things that need to be done to the input. */
-   int expand_tRNS = 0;
-
-   /* Exclude the NYI feature of compositing onto a color-mapped buffer; it is
-    * very difficult to do, the results look awful, and it is difficult to see
-    * what possible use it is because the application can't control the
-    * color-map.
-    */
-   if (((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0 ||
-         png_ptr->num_trans > 0) /* alpha in input */ &&
-      ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0) /* no alpha in output */)
-   {
-      if (output_encoding == P_LINEAR) /* compose on black */
-         back_b = back_g = back_r = 0;
-
-      else if (display->background == NULL /* no way to remove it */)
-         png_error(png_ptr,
-             "background color must be supplied to remove alpha/transparency");
-
-      /* Get a copy of the background color (this avoids repeating the checks
-       * below.)  The encoding is 8-bit sRGB or 16-bit linear, depending on the
-       * output format.
-       */
-      else
-      {
-         back_g = display->background->green;
-         if ((output_format & PNG_FORMAT_FLAG_COLOR) != 0)
-         {
-            back_r = display->background->red;
-            back_b = display->background->blue;
-         }
-         else
-            back_b = back_r = back_g;
-      }
-   }
-
-   else if (output_encoding == P_LINEAR)
-      back_b = back_r = back_g = 65535;
-
-   else
-      back_b = back_r = back_g = 255;
-
-   /* Default the input file gamma if required - this is necessary because
-    * libpng assumes that if no gamma information is present the data is in the
-    * output format, but the simplified API deduces the gamma from the input
-    * format.
-    */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) == 0)
-   {
-      /* Do this directly, not using the png_colorspace functions, to ensure
-       * that it happens even if the colorspace is invalid (though probably if
-       * it is the setting will be ignored)  Note that the same thing can be
-       * achieved at the application interface with png_set_gAMA.
-       */
-      if (png_ptr->bit_depth == 16 &&
-         (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
-         png_ptr->colorspace.gamma = PNG_GAMMA_LINEAR;
-
-      else
-         png_ptr->colorspace.gamma = PNG_GAMMA_sRGB_INVERSE;
-
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-   }
-
-   /* Decide what to do based on the PNG color type of the input data.  The
-    * utility function png_create_colormap_entry deals with most aspects of the
-    * output transformations; this code works out how to produce bytes of
-    * color-map entries from the original format.
-    */
-   switch (png_ptr->color_type)
-   {
-      case PNG_COLOR_TYPE_GRAY:
-         if (png_ptr->bit_depth <= 8)
-         {
-            /* There at most 256 colors in the output, regardless of
-             * transparency.
-             */
-            unsigned int step, i, val, trans = 256/*ignore*/, back_alpha = 0;
-
-            cmap_entries = 1U << png_ptr->bit_depth;
-            if (cmap_entries > image->colormap_entries)
-               png_error(png_ptr, "gray[8] color-map: too few entries");
-
-            step = 255 / (cmap_entries - 1);
-            output_processing = PNG_CMAP_NONE;
-
-            /* If there is a tRNS chunk then this either selects a transparent
-             * value or, if the output has no alpha, the background color.
-             */
-            if (png_ptr->num_trans > 0)
-            {
-               trans = png_ptr->trans_color.gray;
-
-               if ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0)
-                  back_alpha = output_encoding == P_LINEAR ? 65535 : 255;
-            }
-
-            /* png_create_colormap_entry just takes an RGBA and writes the
-             * corresponding color-map entry using the format from 'image',
-             * including the required conversion to sRGB or linear as
-             * appropriate.  The input values are always either sRGB (if the
-             * gamma correction flag is 0) or 0..255 scaled file encoded values
-             * (if the function must gamma correct them).
-             */
-            for (i=val=0; i<cmap_entries; ++i, val += step)
-            {
-               /* 'i' is a file value.  While this will result in duplicated
-                * entries for 8-bit non-sRGB encoded files it is necessary to
-                * have non-gamma corrected values to do tRNS handling.
-                */
-               if (i != trans)
-                  png_create_colormap_entry(display, i, val, val, val, 255,
-                      P_FILE/*8-bit with file gamma*/);
-
-               /* Else this entry is transparent.  The colors don't matter if
-                * there is an alpha channel (back_alpha == 0), but it does no
-                * harm to pass them in; the values are not set above so this
-                * passes in white.
-                *
-                * NOTE: this preserves the full precision of the application
-                * supplied background color when it is used.
-                */
-               else
-                  png_create_colormap_entry(display, i, back_r, back_g, back_b,
-                      back_alpha, output_encoding);
-            }
-
-            /* We need libpng to preserve the original encoding. */
-            data_encoding = P_FILE;
-
-            /* The rows from libpng, while technically gray values, are now also
-             * color-map indices; however, they may need to be expanded to 1
-             * byte per pixel.  This is what png_set_packing does (i.e., it
-             * unpacks the bit values into bytes.)
-             */
-            if (png_ptr->bit_depth < 8)
-               png_set_packing(png_ptr);
-         }
-
-         else /* bit depth is 16 */
-         {
-            /* The 16-bit input values can be converted directly to 8-bit gamma
-             * encoded values; however, if a tRNS chunk is present 257 color-map
-             * entries are required.  This means that the extra entry requires
-             * special processing; add an alpha channel, sacrifice gray level
-             * 254 and convert transparent (alpha==0) entries to that.
-             *
-             * Use libpng to chop the data to 8 bits.  Convert it to sRGB at the
-             * same time to minimize quality loss.  If a tRNS chunk is present
-             * this means libpng must handle it too; otherwise it is impossible
-             * to do the exact match on the 16-bit value.
-             *
-             * If the output has no alpha channel *and* the background color is
-             * gray then it is possible to let libpng handle the substitution by
-             * ensuring that the corresponding gray level matches the background
-             * color exactly.
-             */
-            data_encoding = P_sRGB;
-
-            if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
-               png_error(png_ptr, "gray[16] color-map: too few entries");
-
-            cmap_entries = (unsigned int)make_gray_colormap(display);
-
-            if (png_ptr->num_trans > 0)
-            {
-               unsigned int back_alpha;
-
-               if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-                  back_alpha = 0;
-
-               else
-               {
-                  if (back_r == back_g && back_g == back_b)
-                  {
-                     /* Background is gray; no special processing will be
-                      * required.
-                      */
-                     png_color_16 c;
-                     png_uint_32 gray = back_g;
-
-                     if (output_encoding == P_LINEAR)
-                     {
-                        gray = PNG_sRGB_FROM_LINEAR(gray * 255);
-
-                        /* And make sure the corresponding palette entry
-                         * matches.
-                         */
-                        png_create_colormap_entry(display, gray, back_g, back_g,
-                            back_g, 65535, P_LINEAR);
-                     }
-
-                     /* The background passed to libpng, however, must be the
-                      * sRGB value.
-                      */
-                     c.index = 0; /*unused*/
-                     c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
-
-                     /* NOTE: does this work without expanding tRNS to alpha?
-                      * It should be the color->gray case below apparently
-                      * doesn't.
-                      */
-                     png_set_background_fixed(png_ptr, &c,
-                         PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-                         0/*gamma: not used*/);
-
-                     output_processing = PNG_CMAP_NONE;
-                     break;
-                  }
-#ifdef __COVERITY__
-                 /* Coverity claims that output_encoding cannot be 2 (P_LINEAR)
-                  * here.
-                  */
-                  back_alpha = 255;
-#else
-                  back_alpha = output_encoding == P_LINEAR ? 65535 : 255;
-#endif
-               }
-
-               /* output_processing means that the libpng-processed row will be
-                * 8-bit GA and it has to be processing to single byte color-map
-                * values.  Entry 254 is replaced by either a completely
-                * transparent entry or by the background color at full
-                * precision (and the background color is not a simple gray
-                * level in this case.)
-                */
-               expand_tRNS = 1;
-               output_processing = PNG_CMAP_TRANS;
-               background_index = 254;
-
-               /* And set (overwrite) color-map entry 254 to the actual
-                * background color at full precision.
-                */
-               png_create_colormap_entry(display, 254, back_r, back_g, back_b,
-                   back_alpha, output_encoding);
-            }
-
-            else
-               output_processing = PNG_CMAP_NONE;
-         }
-         break;
-
-      case PNG_COLOR_TYPE_GRAY_ALPHA:
-         /* 8-bit or 16-bit PNG with two channels - gray and alpha.  A minimum
-          * of 65536 combinations.  If, however, the alpha channel is to be
-          * removed there are only 256 possibilities if the background is gray.
-          * (Otherwise there is a subset of the 65536 possibilities defined by
-          * the triangle between black, white and the background color.)
-          *
-          * Reduce 16-bit files to 8-bit and sRGB encode the result.  No need to
-          * worry about tRNS matching - tRNS is ignored if there is an alpha
-          * channel.
-          */
-         data_encoding = P_sRGB;
-
-         if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-         {
-            if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
-               png_error(png_ptr, "gray+alpha color-map: too few entries");
-
-            cmap_entries = (unsigned int)make_ga_colormap(display);
-
-            background_index = PNG_CMAP_GA_BACKGROUND;
-            output_processing = PNG_CMAP_GA;
-         }
-
-         else /* alpha is removed */
-         {
-            /* Alpha must be removed as the PNG data is processed when the
-             * background is a color because the G and A channels are
-             * independent and the vector addition (non-parallel vectors) is a
-             * 2-D problem.
-             *
-             * This can be reduced to the same algorithm as above by making a
-             * colormap containing gray levels (for the opaque grays), a
-             * background entry (for a transparent pixel) and a set of four six
-             * level color values, one set for each intermediate alpha value.
-             * See the comments in make_ga_colormap for how this works in the
-             * per-pixel processing.
-             *
-             * If the background is gray, however, we only need a 256 entry gray
-             * level color map.  It is sufficient to make the entry generated
-             * for the background color be exactly the color specified.
-             */
-            if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0 ||
-               (back_r == back_g && back_g == back_b))
-            {
-               /* Background is gray; no special processing will be required. */
-               png_color_16 c;
-               png_uint_32 gray = back_g;
-
-               if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
-                  png_error(png_ptr, "gray-alpha color-map: too few entries");
-
-               cmap_entries = (unsigned int)make_gray_colormap(display);
-
-               if (output_encoding == P_LINEAR)
-               {
-                  gray = PNG_sRGB_FROM_LINEAR(gray * 255);
-
-                  /* And make sure the corresponding palette entry matches. */
-                  png_create_colormap_entry(display, gray, back_g, back_g,
-                      back_g, 65535, P_LINEAR);
-               }
-
-               /* The background passed to libpng, however, must be the sRGB
-                * value.
-                */
-               c.index = 0; /*unused*/
-               c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
-
-               png_set_background_fixed(png_ptr, &c,
-                   PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-                   0/*gamma: not used*/);
-
-               output_processing = PNG_CMAP_NONE;
-            }
-
-            else
-            {
-               png_uint_32 i, a;
-
-               /* This is the same as png_make_ga_colormap, above, except that
-                * the entries are all opaque.
-                */
-               if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
-                  png_error(png_ptr, "ga-alpha color-map: too few entries");
-
-               i = 0;
-               while (i < 231)
-               {
-                  png_uint_32 gray = (i * 256 + 115) / 231;
-                  png_create_colormap_entry(display, i++, gray, gray, gray,
-                      255, P_sRGB);
-               }
-
-               /* NOTE: this preserves the full precision of the application
-                * background color.
-                */
-               background_index = i;
-               png_create_colormap_entry(display, i++, back_r, back_g, back_b,
-#ifdef __COVERITY__
-                   /* Coverity claims that output_encoding
-                    * cannot be 2 (P_LINEAR) here.
-                    */ 255U,
-#else
-                    output_encoding == P_LINEAR ? 65535U : 255U,
-#endif
-                    output_encoding);
-
-               /* For non-opaque input composite on the sRGB background - this
-                * requires inverting the encoding for each component.  The input
-                * is still converted to the sRGB encoding because this is a
-                * reasonable approximate to the logarithmic curve of human
-                * visual sensitivity, at least over the narrow range which PNG
-                * represents.  Consequently 'G' is always sRGB encoded, while
-                * 'A' is linear.  We need the linear background colors.
-                */
-               if (output_encoding == P_sRGB) /* else already linear */
-               {
-                  /* This may produce a value not exactly matching the
-                   * background, but that's ok because these numbers are only
-                   * used when alpha != 0
-                   */
-                  back_r = png_sRGB_table[back_r];
-                  back_g = png_sRGB_table[back_g];
-                  back_b = png_sRGB_table[back_b];
-               }
-
-               for (a=1; a<5; ++a)
-               {
-                  unsigned int g;
-
-                  /* PNG_sRGB_FROM_LINEAR expects a 16-bit linear value scaled
-                   * by an 8-bit alpha value (0..255).
-                   */
-                  png_uint_32 alpha = 51 * a;
-                  png_uint_32 back_rx = (255-alpha) * back_r;
-                  png_uint_32 back_gx = (255-alpha) * back_g;
-                  png_uint_32 back_bx = (255-alpha) * back_b;
-
-                  for (g=0; g<6; ++g)
-                  {
-                     png_uint_32 gray = png_sRGB_table[g*51] * alpha;
-
-                     png_create_colormap_entry(display, i++,
-                         PNG_sRGB_FROM_LINEAR(gray + back_rx),
-                         PNG_sRGB_FROM_LINEAR(gray + back_gx),
-                         PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, P_sRGB);
-                  }
-               }
-
-               cmap_entries = i;
-               output_processing = PNG_CMAP_GA;
-            }
-         }
-         break;
-
-      case PNG_COLOR_TYPE_RGB:
-      case PNG_COLOR_TYPE_RGB_ALPHA:
-         /* Exclude the case where the output is gray; we can always handle this
-          * with the cases above.
-          */
-         if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0)
-         {
-            /* The color-map will be grayscale, so we may as well convert the
-             * input RGB values to a simple grayscale and use the grayscale
-             * code above.
-             *
-             * NOTE: calling this apparently damages the recognition of the
-             * transparent color in background color handling; call
-             * png_set_tRNS_to_alpha before png_set_background_fixed.
-             */
-            png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE, -1,
-                -1);
-            data_encoding = P_sRGB;
-
-            /* The output will now be one or two 8-bit gray or gray+alpha
-             * channels.  The more complex case arises when the input has alpha.
-             */
-            if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-               png_ptr->num_trans > 0) &&
-               (output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-            {
-               /* Both input and output have an alpha channel, so no background
-                * processing is required; just map the GA bytes to the right
-                * color-map entry.
-                */
-               expand_tRNS = 1;
-
-               if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
-                  png_error(png_ptr, "rgb[ga] color-map: too few entries");
-
-               cmap_entries = (unsigned int)make_ga_colormap(display);
-               background_index = PNG_CMAP_GA_BACKGROUND;
-               output_processing = PNG_CMAP_GA;
-            }
-
-            else
-            {
-               /* Either the input or the output has no alpha channel, so there
-                * will be no non-opaque pixels in the color-map; it will just be
-                * grayscale.
-                */
-               if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
-                  png_error(png_ptr, "rgb[gray] color-map: too few entries");
-
-               /* Ideally this code would use libpng to do the gamma correction,
-                * but if an input alpha channel is to be removed we will hit the
-                * libpng bug in gamma+compose+rgb-to-gray (the double gamma
-                * correction bug).  Fix this by dropping the gamma correction in
-                * this case and doing it in the palette; this will result in
-                * duplicate palette entries, but that's better than the
-                * alternative of double gamma correction.
-                */
-               if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-                  png_ptr->num_trans > 0) &&
-                  png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)
-               {
-                  cmap_entries = (unsigned int)make_gray_file_colormap(display);
-                  data_encoding = P_FILE;
-               }
-
-               else
-                  cmap_entries = (unsigned int)make_gray_colormap(display);
-
-               /* But if the input has alpha or transparency it must be removed
-                */
-               if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-                  png_ptr->num_trans > 0)
-               {
-                  png_color_16 c;
-                  png_uint_32 gray = back_g;
-
-                  /* We need to ensure that the application background exists in
-                   * the colormap and that completely transparent pixels map to
-                   * it.  Achieve this simply by ensuring that the entry
-                   * selected for the background really is the background color.
-                   */
-                  if (data_encoding == P_FILE) /* from the fixup above */
-                  {
-                     /* The app supplied a gray which is in output_encoding, we
-                      * need to convert it to a value of the input (P_FILE)
-                      * encoding then set this palette entry to the required
-                      * output encoding.
-                      */
-                     if (output_encoding == P_sRGB)
-                        gray = png_sRGB_table[gray]; /* now P_LINEAR */
-
-                     gray = PNG_DIV257(png_gamma_16bit_correct(gray,
-                         png_ptr->colorspace.gamma)); /* now P_FILE */
-
-                     /* And make sure the corresponding palette entry contains
-                      * exactly the required sRGB value.
-                      */
-                     png_create_colormap_entry(display, gray, back_g, back_g,
-                         back_g, 0/*unused*/, output_encoding);
-                  }
-
-                  else if (output_encoding == P_LINEAR)
-                  {
-                     gray = PNG_sRGB_FROM_LINEAR(gray * 255);
-
-                     /* And make sure the corresponding palette entry matches.
-                      */
-                     png_create_colormap_entry(display, gray, back_g, back_g,
-                        back_g, 0/*unused*/, P_LINEAR);
-                  }
-
-                  /* The background passed to libpng, however, must be the
-                   * output (normally sRGB) value.
-                   */
-                  c.index = 0; /*unused*/
-                  c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
-
-                  /* NOTE: the following is apparently a bug in libpng. Without
-                   * it the transparent color recognition in
-                   * png_set_background_fixed seems to go wrong.
-                   */
-                  expand_tRNS = 1;
-                  png_set_background_fixed(png_ptr, &c,
-                      PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-                      0/*gamma: not used*/);
-               }
-
-               output_processing = PNG_CMAP_NONE;
-            }
-         }
-
-         else /* output is color */
-         {
-            /* We could use png_quantize here so long as there is no transparent
-             * color or alpha; png_quantize ignores alpha.  Easier overall just
-             * to do it once and using PNG_DIV51 on the 6x6x6 reduced RGB cube.
-             * Consequently we always want libpng to produce sRGB data.
-             */
-            data_encoding = P_sRGB;
-
-            /* Is there any transparency or alpha? */
-            if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-               png_ptr->num_trans > 0)
-            {
-               /* Is there alpha in the output too?  If so all four channels are
-                * processed into a special RGB cube with alpha support.
-                */
-               if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-               {
-                  png_uint_32 r;
-
-                  if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
-                     png_error(png_ptr, "rgb+alpha color-map: too few entries");
-
-                  cmap_entries = (unsigned int)make_rgb_colormap(display);
-
-                  /* Add a transparent entry. */
-                  png_create_colormap_entry(display, cmap_entries, 255, 255,
-                      255, 0, P_sRGB);
-
-                  /* This is stored as the background index for the processing
-                   * algorithm.
-                   */
-                  background_index = cmap_entries++;
-
-                  /* Add 27 r,g,b entries each with alpha 0.5. */
-                  for (r=0; r<256; r = (r << 1) | 0x7f)
-                  {
-                     png_uint_32 g;
-
-                     for (g=0; g<256; g = (g << 1) | 0x7f)
-                     {
-                        png_uint_32 b;
-
-                        /* This generates components with the values 0, 127 and
-                         * 255
-                         */
-                        for (b=0; b<256; b = (b << 1) | 0x7f)
-                           png_create_colormap_entry(display, cmap_entries++,
-                               r, g, b, 128, P_sRGB);
-                     }
-                  }
-
-                  expand_tRNS = 1;
-                  output_processing = PNG_CMAP_RGB_ALPHA;
-               }
-
-               else
-               {
-                  /* Alpha/transparency must be removed.  The background must
-                   * exist in the color map (achieved by setting adding it after
-                   * the 666 color-map).  If the standard processing code will
-                   * pick up this entry automatically that's all that is
-                   * required; libpng can be called to do the background
-                   * processing.
-                   */
-                  unsigned int sample_size =
-                     PNG_IMAGE_SAMPLE_SIZE(output_format);
-                  png_uint_32 r, g, b; /* sRGB background */
-
-                  if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
-                     png_error(png_ptr, "rgb-alpha color-map: too few entries");
-
-                  cmap_entries = (unsigned int)make_rgb_colormap(display);
-
-                  png_create_colormap_entry(display, cmap_entries, back_r,
-                      back_g, back_b, 0/*unused*/, output_encoding);
-
-                  if (output_encoding == P_LINEAR)
-                  {
-                     r = PNG_sRGB_FROM_LINEAR(back_r * 255);
-                     g = PNG_sRGB_FROM_LINEAR(back_g * 255);
-                     b = PNG_sRGB_FROM_LINEAR(back_b * 255);
-                  }
-
-                  else
-                  {
-                     r = back_r;
-                     g = back_g;
-                     b = back_g;
-                  }
-
-                  /* Compare the newly-created color-map entry with the one the
-                   * PNG_CMAP_RGB algorithm will use.  If the two entries don't
-                   * match, add the new one and set this as the background
-                   * index.
-                   */
-                  if (memcmp((png_const_bytep)display->colormap +
-                      sample_size * cmap_entries,
-                      (png_const_bytep)display->colormap +
-                          sample_size * PNG_RGB_INDEX(r,g,b),
-                     sample_size) != 0)
-                  {
-                     /* The background color must be added. */
-                     background_index = cmap_entries++;
-
-                     /* Add 27 r,g,b entries each with created by composing with
-                      * the background at alpha 0.5.
-                      */
-                     for (r=0; r<256; r = (r << 1) | 0x7f)
-                     {
-                        for (g=0; g<256; g = (g << 1) | 0x7f)
-                        {
-                           /* This generates components with the values 0, 127
-                            * and 255
-                            */
-                           for (b=0; b<256; b = (b << 1) | 0x7f)
-                              png_create_colormap_entry(display, cmap_entries++,
-                                  png_colormap_compose(display, r, P_sRGB, 128,
-                                      back_r, output_encoding),
-                                  png_colormap_compose(display, g, P_sRGB, 128,
-                                      back_g, output_encoding),
-                                  png_colormap_compose(display, b, P_sRGB, 128,
-                                      back_b, output_encoding),
-                                  0/*unused*/, output_encoding);
-                        }
-                     }
-
-                     expand_tRNS = 1;
-                     output_processing = PNG_CMAP_RGB_ALPHA;
-                  }
-
-                  else /* background color is in the standard color-map */
-                  {
-                     png_color_16 c;
-
-                     c.index = 0; /*unused*/
-                     c.red = (png_uint_16)back_r;
-                     c.gray = c.green = (png_uint_16)back_g;
-                     c.blue = (png_uint_16)back_b;
-
-                     png_set_background_fixed(png_ptr, &c,
-                         PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-                         0/*gamma: not used*/);
-
-                     output_processing = PNG_CMAP_RGB;
-                  }
-               }
-            }
-
-            else /* no alpha or transparency in the input */
-            {
-               /* Alpha in the output is irrelevant, simply map the opaque input
-                * pixels to the 6x6x6 color-map.
-                */
-               if (PNG_RGB_COLORMAP_ENTRIES > image->colormap_entries)
-                  png_error(png_ptr, "rgb color-map: too few entries");
-
-               cmap_entries = (unsigned int)make_rgb_colormap(display);
-               output_processing = PNG_CMAP_RGB;
-            }
-         }
-         break;
-
-      case PNG_COLOR_TYPE_PALETTE:
-         /* It's already got a color-map.  It may be necessary to eliminate the
-          * tRNS entries though.
-          */
-         {
-            unsigned int num_trans = png_ptr->num_trans;
-            png_const_bytep trans = num_trans > 0 ? png_ptr->trans_alpha : NULL;
-            png_const_colorp colormap = png_ptr->palette;
-            const int do_background = trans != NULL &&
-               (output_format & PNG_FORMAT_FLAG_ALPHA) == 0;
-            unsigned int i;
-
-            /* Just in case: */
-            if (trans == NULL)
-               num_trans = 0;
-
-            output_processing = PNG_CMAP_NONE;
-            data_encoding = P_FILE; /* Don't change from color-map indices */
-            cmap_entries = (unsigned int)png_ptr->num_palette;
-            if (cmap_entries > 256)
-               cmap_entries = 256;
-
-            if (cmap_entries > (unsigned int)image->colormap_entries)
-               png_error(png_ptr, "palette color-map: too few entries");
-
-            for (i=0; i < cmap_entries; ++i)
-            {
-               if (do_background != 0 && i < num_trans && trans[i] < 255)
-               {
-                  if (trans[i] == 0)
-                     png_create_colormap_entry(display, i, back_r, back_g,
-                         back_b, 0, output_encoding);
-
-                  else
-                  {
-                     /* Must compose the PNG file color in the color-map entry
-                      * on the sRGB color in 'back'.
-                      */
-                     png_create_colormap_entry(display, i,
-                         png_colormap_compose(display, colormap[i].red,
-                             P_FILE, trans[i], back_r, output_encoding),
-                         png_colormap_compose(display, colormap[i].green,
-                             P_FILE, trans[i], back_g, output_encoding),
-                         png_colormap_compose(display, colormap[i].blue,
-                             P_FILE, trans[i], back_b, output_encoding),
-                         output_encoding == P_LINEAR ? trans[i] * 257U :
-                             trans[i],
-                         output_encoding);
-                  }
-               }
-
-               else
-                  png_create_colormap_entry(display, i, colormap[i].red,
-                      colormap[i].green, colormap[i].blue,
-                      i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/);
-            }
-
-            /* The PNG data may have indices packed in fewer than 8 bits, it
-             * must be expanded if so.
-             */
-            if (png_ptr->bit_depth < 8)
-               png_set_packing(png_ptr);
-         }
-         break;
-
-      default:
-         png_error(png_ptr, "invalid PNG color type");
-         /*NOT REACHED*/
-   }
-
-   /* Now deal with the output processing */
-   if (expand_tRNS != 0 && png_ptr->num_trans > 0 &&
-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0)
-      png_set_tRNS_to_alpha(png_ptr);
-
-   switch (data_encoding)
-   {
-      case P_sRGB:
-         /* Change to 8-bit sRGB */
-         png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, PNG_GAMMA_sRGB);
-         /* FALLTHROUGH */
-
-      case P_FILE:
-         if (png_ptr->bit_depth > 8)
-            png_set_scale_16(png_ptr);
-         break;
-
-#ifdef __GNUC__
-      default:
-         png_error(png_ptr, "bad data option (internal error)");
-#endif
-   }
-
-   if (cmap_entries > 256 || cmap_entries > image->colormap_entries)
-      png_error(png_ptr, "color map overflow (BAD internal error)");
-
-   image->colormap_entries = cmap_entries;
-
-   /* Double check using the recorded background index */
-   switch (output_processing)
-   {
-      case PNG_CMAP_NONE:
-         if (background_index != PNG_CMAP_NONE_BACKGROUND)
-            goto bad_background;
-         break;
-
-      case PNG_CMAP_GA:
-         if (background_index != PNG_CMAP_GA_BACKGROUND)
-            goto bad_background;
-         break;
-
-      case PNG_CMAP_TRANS:
-         if (background_index >= cmap_entries ||
-            background_index != PNG_CMAP_TRANS_BACKGROUND)
-            goto bad_background;
-         break;
-
-      case PNG_CMAP_RGB:
-         if (background_index != PNG_CMAP_RGB_BACKGROUND)
-            goto bad_background;
-         break;
-
-      case PNG_CMAP_RGB_ALPHA:
-         if (background_index != PNG_CMAP_RGB_ALPHA_BACKGROUND)
-            goto bad_background;
-         break;
-
-      default:
-         png_error(png_ptr, "bad processing option (internal error)");
-
-      bad_background:
-         png_error(png_ptr, "bad background index (internal error)");
-   }
-
-   display->colormap_processing = (int)output_processing;
-
-   return 1/*ok*/;
-}
-
-/* The final part of the color-map read called from png_image_finish_read. */
-static int
-png_image_read_and_map(png_voidp argument)
-{
-   png_image_read_control *display = png_voidcast(png_image_read_control*,
-       argument);
-   png_imagep image = display->image;
-   png_structrp png_ptr = image->opaque->png_ptr;
-   int passes;
-
-   /* Called when the libpng data must be transformed into the color-mapped
-    * form.  There is a local row buffer in display->local and this routine must
-    * do the interlace handling.
-    */
-   switch (png_ptr->interlaced)
-   {
-      case PNG_INTERLACE_NONE:
-         passes = 1;
-         break;
-
-      case PNG_INTERLACE_ADAM7:
-         passes = PNG_INTERLACE_ADAM7_PASSES;
-         break;
-
-      default:
-         png_error(png_ptr, "unknown interlace type");
-   }
-
-   {
-      png_uint_32  height = image->height;
-      png_uint_32  width = image->width;
-      int          proc = display->colormap_processing;
-      png_bytep    first_row = png_voidcast(png_bytep, display->first_row);
-      ptrdiff_t    step_row = display->row_bytes;
-      int pass;
-
-      for (pass = 0; pass < passes; ++pass)
-      {
-         unsigned int     startx, stepx, stepy;
-         png_uint_32      y;
-
-         if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-         {
-            /* The row may be empty for a short image: */
-            if (PNG_PASS_COLS(width, pass) == 0)
-               continue;
-
-            startx = PNG_PASS_START_COL(pass);
-            stepx = PNG_PASS_COL_OFFSET(pass);
-            y = PNG_PASS_START_ROW(pass);
-            stepy = PNG_PASS_ROW_OFFSET(pass);
-         }
-
-         else
-         {
-            y = 0;
-            startx = 0;
-            stepx = stepy = 1;
-         }
-
-         for (; y<height; y += stepy)
-         {
-            png_bytep inrow = png_voidcast(png_bytep, display->local_row);
-            png_bytep outrow = first_row + y * step_row;
-            png_const_bytep end_row = outrow + width;
-
-            /* Read read the libpng data into the temporary buffer. */
-            png_read_row(png_ptr, inrow, NULL);
-
-            /* Now process the row according to the processing option, note
-             * that the caller verifies that the format of the libpng output
-             * data is as required.
-             */
-            outrow += startx;
-            switch (proc)
-            {
-               case PNG_CMAP_GA:
-                  for (; outrow < end_row; outrow += stepx)
-                  {
-                     /* The data is always in the PNG order */
-                     unsigned int gray = *inrow++;
-                     unsigned int alpha = *inrow++;
-                     unsigned int entry;
-
-                     /* NOTE: this code is copied as a comment in
-                      * make_ga_colormap above.  Please update the
-                      * comment if you change this code!
-                      */
-                     if (alpha > 229) /* opaque */
-                     {
-                        entry = (231 * gray + 128) >> 8;
-                     }
-                     else if (alpha < 26) /* transparent */
-                     {
-                        entry = 231;
-                     }
-                     else /* partially opaque */
-                     {
-                        entry = 226 + 6 * PNG_DIV51(alpha) + PNG_DIV51(gray);
-                     }
-
-                     *outrow = (png_byte)entry;
-                  }
-                  break;
-
-               case PNG_CMAP_TRANS:
-                  for (; outrow < end_row; outrow += stepx)
-                  {
-                     png_byte gray = *inrow++;
-                     png_byte alpha = *inrow++;
-
-                     if (alpha == 0)
-                        *outrow = PNG_CMAP_TRANS_BACKGROUND;
-
-                     else if (gray != PNG_CMAP_TRANS_BACKGROUND)
-                        *outrow = gray;
-
-                     else
-                        *outrow = (png_byte)(PNG_CMAP_TRANS_BACKGROUND+1);
-                  }
-                  break;
-
-               case PNG_CMAP_RGB:
-                  for (; outrow < end_row; outrow += stepx)
-                  {
-                     *outrow = PNG_RGB_INDEX(inrow[0], inrow[1], inrow[2]);
-                     inrow += 3;
-                  }
-                  break;
-
-               case PNG_CMAP_RGB_ALPHA:
-                  for (; outrow < end_row; outrow += stepx)
-                  {
-                     unsigned int alpha = inrow[3];
-
-                     /* Because the alpha entries only hold alpha==0.5 values
-                      * split the processing at alpha==0.25 (64) and 0.75
-                      * (196).
-                      */
-
-                     if (alpha >= 196)
-                        *outrow = PNG_RGB_INDEX(inrow[0], inrow[1],
-                            inrow[2]);
-
-                     else if (alpha < 64)
-                        *outrow = PNG_CMAP_RGB_ALPHA_BACKGROUND;
-
-                     else
-                     {
-                        /* Likewise there are three entries for each of r, g
-                         * and b.  We could select the entry by popcount on
-                         * the top two bits on those architectures that
-                         * support it, this is what the code below does,
-                         * crudely.
-                         */
-                        unsigned int back_i = PNG_CMAP_RGB_ALPHA_BACKGROUND+1;
-
-                        /* Here are how the values map:
-                         *
-                         * 0x00 .. 0x3f -> 0
-                         * 0x40 .. 0xbf -> 1
-                         * 0xc0 .. 0xff -> 2
-                         *
-                         * So, as above with the explicit alpha checks, the
-                         * breakpoints are at 64 and 196.
-                         */
-                        if (inrow[0] & 0x80) back_i += 9; /* red */
-                        if (inrow[0] & 0x40) back_i += 9;
-                        if (inrow[0] & 0x80) back_i += 3; /* green */
-                        if (inrow[0] & 0x40) back_i += 3;
-                        if (inrow[0] & 0x80) back_i += 1; /* blue */
-                        if (inrow[0] & 0x40) back_i += 1;
-
-                        *outrow = (png_byte)back_i;
-                     }
-
-                     inrow += 4;
-                  }
-                  break;
-
-               default:
-                  break;
-            }
-         }
-      }
-   }
-
-   return 1;
-}
-
-static int
-png_image_read_colormapped(png_voidp argument)
-{
-   png_image_read_control *display = png_voidcast(png_image_read_control*,
-       argument);
-   png_imagep image = display->image;
-   png_controlp control = image->opaque;
-   png_structrp png_ptr = control->png_ptr;
-   png_inforp info_ptr = control->info_ptr;
-
-   int passes = 0; /* As a flag */
-
-   PNG_SKIP_CHUNKS(png_ptr);
-
-   /* Update the 'info' structure and make sure the result is as required; first
-    * make sure to turn on the interlace handling if it will be required
-    * (because it can't be turned on *after* the call to png_read_update_info!)
-    */
-   if (display->colormap_processing == PNG_CMAP_NONE)
-      passes = png_set_interlace_handling(png_ptr);
-
-   png_read_update_info(png_ptr, info_ptr);
-
-   /* The expected output can be deduced from the colormap_processing option. */
-   switch (display->colormap_processing)
-   {
-      case PNG_CMAP_NONE:
-         /* Output must be one channel and one byte per pixel, the output
-          * encoding can be anything.
-          */
-         if ((info_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
-            info_ptr->color_type == PNG_COLOR_TYPE_GRAY) &&
-            info_ptr->bit_depth == 8)
-            break;
-
-         goto bad_output;
-
-      case PNG_CMAP_TRANS:
-      case PNG_CMAP_GA:
-         /* Output must be two channels and the 'G' one must be sRGB, the latter
-          * can be checked with an exact number because it should have been set
-          * to this number above!
-          */
-         if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-            info_ptr->bit_depth == 8 &&
-            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
-            image->colormap_entries == 256)
-            break;
-
-         goto bad_output;
-
-      case PNG_CMAP_RGB:
-         /* Output must be 8-bit sRGB encoded RGB */
-         if (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-            info_ptr->bit_depth == 8 &&
-            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
-            image->colormap_entries == 216)
-            break;
-
-         goto bad_output;
-
-      case PNG_CMAP_RGB_ALPHA:
-         /* Output must be 8-bit sRGB encoded RGBA */
-         if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-            info_ptr->bit_depth == 8 &&
-            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
-            image->colormap_entries == 244 /* 216 + 1 + 27 */)
-            break;
-
-         goto bad_output;
-
-      default:
-      bad_output:
-         png_error(png_ptr, "bad color-map processing (internal error)");
-   }
-
-   /* Now read the rows.  Do this here if it is possible to read directly into
-    * the output buffer, otherwise allocate a local row buffer of the maximum
-    * size libpng requires and call the relevant processing routine safely.
-    */
-   {
-      png_voidp first_row = display->buffer;
-      ptrdiff_t row_bytes = display->row_stride;
-
-      /* The following expression is designed to work correctly whether it gives
-       * a signed or an unsigned result.
-       */
-      if (row_bytes < 0)
-      {
-         char *ptr = png_voidcast(char*, first_row);
-         ptr += (image->height-1) * (-row_bytes);
-         first_row = png_voidcast(png_voidp, ptr);
-      }
-
-      display->first_row = first_row;
-      display->row_bytes = row_bytes;
-   }
-
-   if (passes == 0)
-   {
-      int result;
-      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
-
-      display->local_row = row;
-      result = png_safe_execute(image, png_image_read_and_map, display);
-      display->local_row = NULL;
-      png_free(png_ptr, row);
-
-      return result;
-   }
-
-   else
-   {
-      png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
-
-      while (--passes >= 0)
-      {
-         png_uint_32      y = image->height;
-         png_bytep        row = png_voidcast(png_bytep, display->first_row);
-
-         for (; y > 0; --y)
-         {
-            png_read_row(png_ptr, row, NULL);
-            row += row_bytes;
-         }
-      }
-
-      return 1;
-   }
-}
-
-/* Just the row reading part of png_image_read. */
-static int
-png_image_read_composite(png_voidp argument)
-{
-   png_image_read_control *display = png_voidcast(png_image_read_control*,
-       argument);
-   png_imagep image = display->image;
-   png_structrp png_ptr = image->opaque->png_ptr;
-   int passes;
-
-   switch (png_ptr->interlaced)
-   {
-      case PNG_INTERLACE_NONE:
-         passes = 1;
-         break;
-
-      case PNG_INTERLACE_ADAM7:
-         passes = PNG_INTERLACE_ADAM7_PASSES;
-         break;
-
-      default:
-         png_error(png_ptr, "unknown interlace type");
-   }
-
-   {
-      png_uint_32  height = image->height;
-      png_uint_32  width = image->width;
-      ptrdiff_t    step_row = display->row_bytes;
-      unsigned int channels =
-          (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
-      int pass;
-
-      for (pass = 0; pass < passes; ++pass)
-      {
-         unsigned int     startx, stepx, stepy;
-         png_uint_32      y;
-
-         if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-         {
-            /* The row may be empty for a short image: */
-            if (PNG_PASS_COLS(width, pass) == 0)
-               continue;
-
-            startx = PNG_PASS_START_COL(pass) * channels;
-            stepx = PNG_PASS_COL_OFFSET(pass) * channels;
-            y = PNG_PASS_START_ROW(pass);
-            stepy = PNG_PASS_ROW_OFFSET(pass);
-         }
-
-         else
-         {
-            y = 0;
-            startx = 0;
-            stepx = channels;
-            stepy = 1;
-         }
-
-         for (; y<height; y += stepy)
-         {
-            png_bytep inrow = png_voidcast(png_bytep, display->local_row);
-            png_bytep outrow;
-            png_const_bytep end_row;
-
-            /* Read the row, which is packed: */
-            png_read_row(png_ptr, inrow, NULL);
-
-            outrow = png_voidcast(png_bytep, display->first_row);
-            outrow += y * step_row;
-            end_row = outrow + width * channels;
-
-            /* Now do the composition on each pixel in this row. */
-            outrow += startx;
-            for (; outrow < end_row; outrow += stepx)
-            {
-               png_byte alpha = inrow[channels];
-
-               if (alpha > 0) /* else no change to the output */
-               {
-                  unsigned int c;
-
-                  for (c=0; c<channels; ++c)
-                  {
-                     png_uint_32 component = inrow[c];
-
-                     if (alpha < 255) /* else just use component */
-                     {
-                        /* This is PNG_OPTIMIZED_ALPHA, the component value
-                         * is a linear 8-bit value.  Combine this with the
-                         * current outrow[c] value which is sRGB encoded.
-                         * Arithmetic here is 16-bits to preserve the output
-                         * values correctly.
-                         */
-                        component *= 257*255; /* =65535 */
-                        component += (255-alpha)*png_sRGB_table[outrow[c]];
-
-                        /* So 'component' is scaled by 255*65535 and is
-                         * therefore appropriate for the sRGB to linear
-                         * conversion table.
-                         */
-                        component = PNG_sRGB_FROM_LINEAR(component);
-                     }
-
-                     outrow[c] = (png_byte)component;
-                  }
-               }
-
-               inrow += channels+1; /* components and alpha channel */
-            }
-         }
-      }
-   }
-
-   return 1;
-}
-
-/* The do_local_background case; called when all the following transforms are to
- * be done:
- *
- * PNG_RGB_TO_GRAY
- * PNG_COMPOSITE
- * PNG_GAMMA
- *
- * This is a work-around for the fact that both the PNG_RGB_TO_GRAY and
- * PNG_COMPOSITE code performs gamma correction, so we get double gamma
- * correction.  The fix-up is to prevent the PNG_COMPOSITE operation from
- * happening inside libpng, so this routine sees an 8 or 16-bit gray+alpha
- * row and handles the removal or pre-multiplication of the alpha channel.
- */
-static int
-png_image_read_background(png_voidp argument)
-{
-   png_image_read_control *display = png_voidcast(png_image_read_control*,
-       argument);
-   png_imagep image = display->image;
-   png_structrp png_ptr = image->opaque->png_ptr;
-   png_inforp info_ptr = image->opaque->info_ptr;
-   png_uint_32 height = image->height;
-   png_uint_32 width = image->width;
-   int pass, passes;
-
-   /* Double check the convoluted logic below.  We expect to get here with
-    * libpng doing rgb to gray and gamma correction but background processing
-    * left to the png_image_read_background function.  The rows libpng produce
-    * might be 8 or 16-bit but should always have two channels; gray plus alpha.
-    */
-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)
-      png_error(png_ptr, "lost rgb to gray");
-
-   if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-      png_error(png_ptr, "unexpected compose");
-
-   if (png_get_channels(png_ptr, info_ptr) != 2)
-      png_error(png_ptr, "lost/gained channels");
-
-   /* Expect the 8-bit case to always remove the alpha channel */
-   if ((image->format & PNG_FORMAT_FLAG_LINEAR) == 0 &&
-      (image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
-      png_error(png_ptr, "unexpected 8-bit transformation");
-
-   switch (png_ptr->interlaced)
-   {
-      case PNG_INTERLACE_NONE:
-         passes = 1;
-         break;
-
-      case PNG_INTERLACE_ADAM7:
-         passes = PNG_INTERLACE_ADAM7_PASSES;
-         break;
-
-      default:
-         png_error(png_ptr, "unknown interlace type");
-   }
-
-   /* Use direct access to info_ptr here because otherwise the simplified API
-    * would require PNG_EASY_ACCESS_SUPPORTED (just for this.)  Note this is
-    * checking the value after libpng expansions, not the original value in the
-    * PNG.
-    */
-   switch (info_ptr->bit_depth)
-   {
-      case 8:
-         /* 8-bit sRGB gray values with an alpha channel; the alpha channel is
-          * to be removed by composing on a background: either the row if
-          * display->background is NULL or display->background->green if not.
-          * Unlike the code above ALPHA_OPTIMIZED has *not* been done.
-          */
-         {
-            png_bytep first_row = png_voidcast(png_bytep, display->first_row);
-            ptrdiff_t step_row = display->row_bytes;
-
-            for (pass = 0; pass < passes; ++pass)
-            {
-               png_bytep row = png_voidcast(png_bytep, display->first_row);
-               unsigned int     startx, stepx, stepy;
-               png_uint_32      y;
-
-               if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-               {
-                  /* The row may be empty for a short image: */
-                  if (PNG_PASS_COLS(width, pass) == 0)
-                     continue;
-
-                  startx = PNG_PASS_START_COL(pass);
-                  stepx = PNG_PASS_COL_OFFSET(pass);
-                  y = PNG_PASS_START_ROW(pass);
-                  stepy = PNG_PASS_ROW_OFFSET(pass);
-               }
-
-               else
-               {
-                  y = 0;
-                  startx = 0;
-                  stepx = stepy = 1;
-               }
-
-               if (display->background == NULL)
-               {
-                  for (; y<height; y += stepy)
-                  {
-                     png_bytep inrow = png_voidcast(png_bytep,
-                         display->local_row);
-                     png_bytep outrow = first_row + y * step_row;
-                     png_const_bytep end_row = outrow + width;
-
-                     /* Read the row, which is packed: */
-                     png_read_row(png_ptr, inrow, NULL);
-
-                     /* Now do the composition on each pixel in this row. */
-                     outrow += startx;
-                     for (; outrow < end_row; outrow += stepx)
-                     {
-                        png_byte alpha = inrow[1];
-
-                        if (alpha > 0) /* else no change to the output */
-                        {
-                           png_uint_32 component = inrow[0];
-
-                           if (alpha < 255) /* else just use component */
-                           {
-                              /* Since PNG_OPTIMIZED_ALPHA was not set it is
-                               * necessary to invert the sRGB transfer
-                               * function and multiply the alpha out.
-                               */
-                              component = png_sRGB_table[component] * alpha;
-                              component += png_sRGB_table[outrow[0]] *
-                                 (255-alpha);
-                              component = PNG_sRGB_FROM_LINEAR(component);
-                           }
-
-                           outrow[0] = (png_byte)component;
-                        }
-
-                        inrow += 2; /* gray and alpha channel */
-                     }
-                  }
-               }
-
-               else /* constant background value */
-               {
-                  png_byte background8 = display->background->green;
-                  png_uint_16 background = png_sRGB_table[background8];
-
-                  for (; y<height; y += stepy)
-                  {
-                     png_bytep inrow = png_voidcast(png_bytep,
-                         display->local_row);
-                     png_bytep outrow = first_row + y * step_row;
-                     png_const_bytep end_row = outrow + width;
-
-                     /* Read the row, which is packed: */
-                     png_read_row(png_ptr, inrow, NULL);
-
-                     /* Now do the composition on each pixel in this row. */
-                     outrow += startx;
-                     for (; outrow < end_row; outrow += stepx)
-                     {
-                        png_byte alpha = inrow[1];
-
-                        if (alpha > 0) /* else use background */
-                        {
-                           png_uint_32 component = inrow[0];
-
-                           if (alpha < 255) /* else just use component */
-                           {
-                              component = png_sRGB_table[component] * alpha;
-                              component += background * (255-alpha);
-                              component = PNG_sRGB_FROM_LINEAR(component);
-                           }
-
-                           outrow[0] = (png_byte)component;
-                        }
-
-                        else
-                           outrow[0] = background8;
-
-                        inrow += 2; /* gray and alpha channel */
-                     }
-
-                     row += display->row_bytes;
-                  }
-               }
-            }
-         }
-         break;
-
-      case 16:
-         /* 16-bit linear with pre-multiplied alpha; the pre-multiplication must
-          * still be done and, maybe, the alpha channel removed.  This code also
-          * handles the alpha-first option.
-          */
-         {
-            png_uint_16p first_row = png_voidcast(png_uint_16p,
-                display->first_row);
-            /* The division by two is safe because the caller passed in a
-             * stride which was multiplied by 2 (below) to get row_bytes.
-             */
-            ptrdiff_t    step_row = display->row_bytes / 2;
-            unsigned int preserve_alpha = (image->format &
-                PNG_FORMAT_FLAG_ALPHA) != 0;
-            unsigned int outchannels = 1U+preserve_alpha;
-            int swap_alpha = 0;
-
-#           ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-               if (preserve_alpha != 0 &&
-                   (image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
-                  swap_alpha = 1;
-#           endif
-
-            for (pass = 0; pass < passes; ++pass)
-            {
-               unsigned int     startx, stepx, stepy;
-               png_uint_32      y;
-
-               /* The 'x' start and step are adjusted to output components here.
-                */
-               if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
-               {
-                  /* The row may be empty for a short image: */
-                  if (PNG_PASS_COLS(width, pass) == 0)
-                     continue;
-
-                  startx = PNG_PASS_START_COL(pass) * outchannels;
-                  stepx = PNG_PASS_COL_OFFSET(pass) * outchannels;
-                  y = PNG_PASS_START_ROW(pass);
-                  stepy = PNG_PASS_ROW_OFFSET(pass);
-               }
-
-               else
-               {
-                  y = 0;
-                  startx = 0;
-                  stepx = outchannels;
-                  stepy = 1;
-               }
-
-               for (; y<height; y += stepy)
-               {
-                  png_const_uint_16p inrow;
-                  png_uint_16p outrow = first_row + y*step_row;
-                  png_uint_16p end_row = outrow + width * outchannels;
-
-                  /* Read the row, which is packed: */
-                  png_read_row(png_ptr, png_voidcast(png_bytep,
-                      display->local_row), NULL);
-                  inrow = png_voidcast(png_const_uint_16p, display->local_row);
-
-                  /* Now do the pre-multiplication on each pixel in this row.
-                   */
-                  outrow += startx;
-                  for (; outrow < end_row; outrow += stepx)
-                  {
-                     png_uint_32 component = inrow[0];
-                     png_uint_16 alpha = inrow[1];
-
-                     if (alpha > 0) /* else 0 */
-                     {
-                        if (alpha < 65535) /* else just use component */
-                        {
-                           component *= alpha;
-                           component += 32767;
-                           component /= 65535;
-                        }
-                     }
-
-                     else
-                        component = 0;
-
-                     outrow[swap_alpha] = (png_uint_16)component;
-                     if (preserve_alpha != 0)
-                        outrow[1 ^ swap_alpha] = alpha;
-
-                     inrow += 2; /* components and alpha channel */
-                  }
-               }
-            }
-         }
-         break;
-
-#ifdef __GNUC__
-      default:
-         png_error(png_ptr, "unexpected bit depth");
-#endif
-   }
-
-   return 1;
-}
-
-/* The guts of png_image_finish_read as a png_safe_execute callback. */
-static int
-png_image_read_direct(png_voidp argument)
-{
-   png_image_read_control *display = png_voidcast(png_image_read_control*,
-       argument);
-   png_imagep image = display->image;
-   png_structrp png_ptr = image->opaque->png_ptr;
-   png_inforp info_ptr = image->opaque->info_ptr;
-
-   png_uint_32 format = image->format;
-   int linear = (format & PNG_FORMAT_FLAG_LINEAR) != 0;
-   int do_local_compose = 0;
-   int do_local_background = 0; /* to avoid double gamma correction bug */
-   int passes = 0;
-
-   /* Add transforms to ensure the correct output format is produced then check
-    * that the required implementation support is there.  Always expand; always
-    * need 8 bits minimum, no palette and expanded tRNS.
-    */
-   png_set_expand(png_ptr);
-
-   /* Now check the format to see if it was modified. */
-   {
-      png_uint_32 base_format = png_image_format(png_ptr) &
-         ~PNG_FORMAT_FLAG_COLORMAP /* removed by png_set_expand */;
-      png_uint_32 change = format ^ base_format;
-      png_fixed_point output_gamma;
-      int mode; /* alpha mode */
-
-      /* Do this first so that we have a record if rgb to gray is happening. */
-      if ((change & PNG_FORMAT_FLAG_COLOR) != 0)
-      {
-         /* gray<->color transformation required. */
-         if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
-            png_set_gray_to_rgb(png_ptr);
-
-         else
-         {
-            /* libpng can't do both rgb to gray and
-             * background/pre-multiplication if there is also significant gamma
-             * correction, because both operations require linear colors and
-             * the code only supports one transform doing the gamma correction.
-             * Handle this by doing the pre-multiplication or background
-             * operation in this code, if necessary.
-             *
-             * TODO: fix this by rewriting pngrtran.c (!)
-             *
-             * For the moment (given that fixing this in pngrtran.c is an
-             * enormous change) 'do_local_background' is used to indicate that
-             * the problem exists.
-             */
-            if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-               do_local_background = 1/*maybe*/;
-
-            png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE,
-                PNG_RGB_TO_GRAY_DEFAULT, PNG_RGB_TO_GRAY_DEFAULT);
-         }
-
-         change &= ~PNG_FORMAT_FLAG_COLOR;
-      }
-
-      /* Set the gamma appropriately, linear for 16-bit input, sRGB otherwise.
-       */
-      {
-         png_fixed_point input_gamma_default;
-
-         if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 &&
-             (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
-            input_gamma_default = PNG_GAMMA_LINEAR;
-         else
-            input_gamma_default = PNG_DEFAULT_sRGB;
-
-         /* Call png_set_alpha_mode to set the default for the input gamma; the
-          * output gamma is set by a second call below.
-          */
-         png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, input_gamma_default);
-      }
-
-      if (linear != 0)
-      {
-         /* If there *is* an alpha channel in the input it must be multiplied
-          * out; use PNG_ALPHA_STANDARD, otherwise just use PNG_ALPHA_PNG.
-          */
-         if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-            mode = PNG_ALPHA_STANDARD; /* associated alpha */
-
-         else
-            mode = PNG_ALPHA_PNG;
-
-         output_gamma = PNG_GAMMA_LINEAR;
-      }
-
-      else
-      {
-         mode = PNG_ALPHA_PNG;
-         output_gamma = PNG_DEFAULT_sRGB;
-      }
-      
-      if ((change & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0)
-      {
-         mode = PNG_ALPHA_OPTIMIZED;
-         change &= ~PNG_FORMAT_FLAG_ASSOCIATED_ALPHA;
-      }
-      
-      /* If 'do_local_background' is set check for the presence of gamma
-       * correction; this is part of the work-round for the libpng bug
-       * described above.
-       *
-       * TODO: fix libpng and remove this.
-       */
-      if (do_local_background != 0)
-      {
-         png_fixed_point gtest;
-
-         /* This is 'png_gamma_threshold' from pngrtran.c; the test used for
-          * gamma correction, the screen gamma hasn't been set on png_struct
-          * yet; it's set below.  png_struct::gamma, however, is set to the
-          * final value.
-          */
-         if (png_muldiv(&gtest, output_gamma, png_ptr->colorspace.gamma,
-             PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
-            do_local_background = 0;
-
-         else if (mode == PNG_ALPHA_STANDARD)
-         {
-            do_local_background = 2/*required*/;
-            mode = PNG_ALPHA_PNG; /* prevent libpng doing it */
-         }
-
-         /* else leave as 1 for the checks below */
-      }
-
-      /* If the bit-depth changes then handle that here. */
-      if ((change & PNG_FORMAT_FLAG_LINEAR) != 0)
-      {
-         if (linear != 0 /*16-bit output*/)
-            png_set_expand_16(png_ptr);
-
-         else /* 8-bit output */
-            png_set_scale_16(png_ptr);
-
-         change &= ~PNG_FORMAT_FLAG_LINEAR;
-      }
-
-      /* Now the background/alpha channel changes. */
-      if ((change & PNG_FORMAT_FLAG_ALPHA) != 0)
-      {
-         /* Removing an alpha channel requires composition for the 8-bit
-          * formats; for the 16-bit it is already done, above, by the
-          * pre-multiplication and the channel just needs to be stripped.
-          */
-         if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
-         {
-            /* If RGB->gray is happening the alpha channel must be left and the
-             * operation completed locally.
-             *
-             * TODO: fix libpng and remove this.
-             */
-            if (do_local_background != 0)
-               do_local_background = 2/*required*/;
-
-            /* 16-bit output: just remove the channel */
-            else if (linear != 0) /* compose on black (well, pre-multiply) */
-               png_set_strip_alpha(png_ptr);
-
-            /* 8-bit output: do an appropriate compose */
-            else if (display->background != NULL)
-            {
-               png_color_16 c;
-
-               c.index = 0; /*unused*/
-               c.red = display->background->red;
-               c.green = display->background->green;
-               c.blue = display->background->blue;
-               c.gray = display->background->green;
-
-               /* This is always an 8-bit sRGB value, using the 'green' channel
-                * for gray is much better than calculating the luminance here;
-                * we can get off-by-one errors in that calculation relative to
-                * the app expectations and that will show up in transparent
-                * pixels.
-                */
-               png_set_background_fixed(png_ptr, &c,
-                   PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
-                   0/*gamma: not used*/);
-            }
-
-            else /* compose on row: implemented below. */
-            {
-               do_local_compose = 1;
-               /* This leaves the alpha channel in the output, so it has to be
-                * removed by the code below.  Set the encoding to the 'OPTIMIZE'
-                * one so the code only has to hack on the pixels that require
-                * composition.
-                */
-               mode = PNG_ALPHA_OPTIMIZED;
-            }
-         }
-
-         else /* output needs an alpha channel */
-         {
-            /* This is tricky because it happens before the swap operation has
-             * been accomplished; however, the swap does *not* swap the added
-             * alpha channel (weird API), so it must be added in the correct
-             * place.
-             */
-            png_uint_32 filler; /* opaque filler */
-            int where;
-
-            if (linear != 0)
-               filler = 65535;
-
-            else
-               filler = 255;
-
-#ifdef PNG_FORMAT_AFIRST_SUPPORTED
-            if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
-            {
-               where = PNG_FILLER_BEFORE;
-               change &= ~PNG_FORMAT_FLAG_AFIRST;
-            }
-
-            else
-#endif
-            where = PNG_FILLER_AFTER;
-
-            png_set_add_alpha(png_ptr, filler, where);
-         }
-
-         /* This stops the (irrelevant) call to swap_alpha below. */
-         change &= ~PNG_FORMAT_FLAG_ALPHA;
-      }
-
-      /* Now set the alpha mode correctly; this is always done, even if there is
-       * no alpha channel in either the input or the output because it correctly
-       * sets the output gamma.
-       */
-      png_set_alpha_mode_fixed(png_ptr, mode, output_gamma);
-
-#     ifdef PNG_FORMAT_BGR_SUPPORTED
-         if ((change & PNG_FORMAT_FLAG_BGR) != 0)
-         {
-            /* Check only the output format; PNG is never BGR; don't do this if
-             * the output is gray, but fix up the 'format' value in that case.
-             */
-            if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
-               png_set_bgr(png_ptr);
-
-            else
-               format &= ~PNG_FORMAT_FLAG_BGR;
-
-            change &= ~PNG_FORMAT_FLAG_BGR;
-         }
-#     endif
-
-#     ifdef PNG_FORMAT_AFIRST_SUPPORTED
-         if ((change & PNG_FORMAT_FLAG_AFIRST) != 0)
-         {
-            /* Only relevant if there is an alpha channel - it's particularly
-             * important to handle this correctly because do_local_compose may
-             * be set above and then libpng will keep the alpha channel for this
-             * code to remove.
-             */
-            if ((format & PNG_FORMAT_FLAG_ALPHA) != 0)
-            {
-               /* Disable this if doing a local background,
-                * TODO: remove this when local background is no longer required.
-                */
-               if (do_local_background != 2)
-                  png_set_swap_alpha(png_ptr);
-            }
-
-            else
-               format &= ~PNG_FORMAT_FLAG_AFIRST;
-
-            change &= ~PNG_FORMAT_FLAG_AFIRST;
-         }
-#     endif
-
-      /* If the *output* is 16-bit then we need to check for a byte-swap on this
-       * architecture.
-       */
-      if (linear != 0)
-      {
-         PNG_CONST png_uint_16 le = 0x0001;
-
-         if ((*(png_const_bytep) & le) != 0)
-            png_set_swap(png_ptr);
-      }
-
-      /* If change is not now 0 some transformation is missing - error out. */
-      if (change != 0)
-         png_error(png_ptr, "png_read_image: unsupported transformation");
-   }
-
-   PNG_SKIP_CHUNKS(png_ptr);
-
-   /* Update the 'info' structure and make sure the result is as required; first
-    * make sure to turn on the interlace handling if it will be required
-    * (because it can't be turned on *after* the call to png_read_update_info!)
-    *
-    * TODO: remove the do_local_background fixup below.
-    */
-   if (do_local_compose == 0 && do_local_background != 2)
-      passes = png_set_interlace_handling(png_ptr);
-
-   png_read_update_info(png_ptr, info_ptr);
-
-   {
-      png_uint_32 info_format = 0;
-
-      if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-         info_format |= PNG_FORMAT_FLAG_COLOR;
-
-      if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-      {
-         /* do_local_compose removes this channel below. */
-         if (do_local_compose == 0)
-         {
-            /* do_local_background does the same if required. */
-            if (do_local_background != 2 ||
-               (format & PNG_FORMAT_FLAG_ALPHA) != 0)
-               info_format |= PNG_FORMAT_FLAG_ALPHA;
-         }
-      }
-
-      else if (do_local_compose != 0) /* internal error */
-         png_error(png_ptr, "png_image_read: alpha channel lost");
-
-      if ((format & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0) {
-         info_format |= PNG_FORMAT_FLAG_ASSOCIATED_ALPHA;
-      }
-
-      if (info_ptr->bit_depth == 16)
-         info_format |= PNG_FORMAT_FLAG_LINEAR;
-
-#ifdef PNG_FORMAT_BGR_SUPPORTED
-      if ((png_ptr->transformations & PNG_BGR) != 0)
-         info_format |= PNG_FORMAT_FLAG_BGR;
-#endif
-
-#ifdef PNG_FORMAT_AFIRST_SUPPORTED
-         if (do_local_background == 2)
-         {
-            if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
-               info_format |= PNG_FORMAT_FLAG_AFIRST;
-         }
-
-         if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0 ||
-            ((png_ptr->transformations & PNG_ADD_ALPHA) != 0 &&
-            (png_ptr->flags & PNG_FLAG_FILLER_AFTER) == 0))
-         {
-            if (do_local_background == 2)
-               png_error(png_ptr, "unexpected alpha swap transformation");
-
-            info_format |= PNG_FORMAT_FLAG_AFIRST;
-         }
-#     endif
-
-      /* This is actually an internal error. */
-      if (info_format != format)
-         png_error(png_ptr, "png_read_image: invalid transformations");
-   }
-
-   /* Now read the rows.  If do_local_compose is set then it is necessary to use
-    * a local row buffer.  The output will be GA, RGBA or BGRA and must be
-    * converted to G, RGB or BGR as appropriate.  The 'local_row' member of the
-    * display acts as a flag.
-    */
-   {
-      png_voidp first_row = display->buffer;
-      ptrdiff_t row_bytes = display->row_stride;
-
-      if (linear != 0)
-         row_bytes *= 2;
-
-      /* The following expression is designed to work correctly whether it gives
-       * a signed or an unsigned result.
-       */
-      if (row_bytes < 0)
-      {
-         char *ptr = png_voidcast(char*, first_row);
-         ptr += (image->height-1) * (-row_bytes);
-         first_row = png_voidcast(png_voidp, ptr);
-      }
-
-      display->first_row = first_row;
-      display->row_bytes = row_bytes;
-   }
-
-   if (do_local_compose != 0)
-   {
-      int result;
-      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
-
-      display->local_row = row;
-      result = png_safe_execute(image, png_image_read_composite, display);
-      display->local_row = NULL;
-      png_free(png_ptr, row);
-
-      return result;
-   }
-
-   else if (do_local_background == 2)
-   {
-      int result;
-      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
-
-      display->local_row = row;
-      result = png_safe_execute(image, png_image_read_background, display);
-      display->local_row = NULL;
-      png_free(png_ptr, row);
-
-      return result;
-   }
-
-   else
-   {
-      png_alloc_size_t row_bytes = (png_alloc_size_t)display->row_bytes;
-
-      while (--passes >= 0)
-      {
-         png_uint_32      y = image->height;
-         png_bytep        row = png_voidcast(png_bytep, display->first_row);
-
-         for (; y > 0; --y)
-         {
-            png_read_row(png_ptr, row, NULL);
-            row += row_bytes;
-         }
-      }
-
-      return 1;
-   }
-}
-
-int PNGAPI
-png_image_finish_read(png_imagep image, png_const_colorp background,
-    void *buffer, png_int_32 row_stride, void *colormap)
-{
-   if (image != NULL && image->version == PNG_IMAGE_VERSION)
-   {
-      /* Check for row_stride overflow.  This check is not performed on the
-       * original PNG format because it may not occur in the output PNG format
-       * and libpng deals with the issues of reading the original.
-       */
-      const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
-
-      /* The following checks just the 'row_stride' calculation to ensure it
-       * fits in a signed 32-bit value.  Because channels/components can be
-       * either 1 or 2 bytes in size the length of a row can still overflow 32
-       * bits; this is just to verify that the 'row_stride' argument can be
-       * represented.
-       */
-      if (image->width <= 0x7fffffffU/channels) /* no overflow */
-      {
-         png_uint_32 check;
-         const png_uint_32 png_row_stride = image->width * channels;
-
-         if (row_stride == 0)
-            row_stride = (png_int_32)/*SAFE*/png_row_stride;
-
-         if (row_stride < 0)
-            check = (png_uint_32)(-row_stride);
-
-         else
-            check = (png_uint_32)row_stride;
-
-         /* This verifies 'check', the absolute value of the actual stride
-          * passed in and detects overflow in the application calculation (i.e.
-          * if the app did actually pass in a non-zero 'row_stride'.
-          */
-         if (image->opaque != NULL && buffer != NULL && check >= png_row_stride)
-         {
-            /* Now check for overflow of the image buffer calculation; this
-             * limits the whole image size to 32 bits for API compatibility with
-             * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.
-             *
-             * The PNG_IMAGE_BUFFER_SIZE macro is:
-             *
-             *    (PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)*height*(row_stride))
-             *
-             * And the component size is always 1 or 2, so make sure that the
-             * number of *bytes* that the application is saying are available
-             * does actually fit into a 32-bit number.
-             *
-             * NOTE: this will be changed in 1.7 because PNG_IMAGE_BUFFER_SIZE
-             * will be changed to use png_alloc_size_t; bigger images can be
-             * accomodated on 64-bit systems.
-             */
-            if (image->height <=
-                0xffffffffU/PNG_IMAGE_PIXEL_COMPONENT_SIZE(image->format)/check)
-            {
-               if ((image->format & PNG_FORMAT_FLAG_COLORMAP) == 0 ||
-                  (image->colormap_entries > 0 && colormap != NULL))
-               {
-                  int result;
-                  png_image_read_control display;
-
-                  memset(&display, 0, (sizeof display));
-                  display.image = image;
-                  display.buffer = buffer;
-                  display.row_stride = row_stride;
-                  display.colormap = colormap;
-                  display.background = background;
-                  display.local_row = NULL;
-
-                  /* Choose the correct 'end' routine; for the color-map case
-                   * all the setup has already been done.
-                   */
-                  if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0)
-                     result =
-                         png_safe_execute(image,
-                             png_image_read_colormap, &display) &&
-                             png_safe_execute(image,
-                             png_image_read_colormapped, &display);
-
-                  else
-                     result =
-                        png_safe_execute(image,
-                            png_image_read_direct, &display);
-
-                  png_image_free(image);
-                  return result;
-               }
-
-               else
-                  return png_image_error(image,
-                      "png_image_finish_read[color-map]: no color-map");
-            }
-
-            else
-               return png_image_error(image,
-                   "png_image_finish_read: image too large");
-         }
-
-         else
-            return png_image_error(image,
-                "png_image_finish_read: invalid argument");
-      }
-
-      else
-         return png_image_error(image,
-             "png_image_finish_read: row_stride too large");
-   }
-
-   else if (image != NULL)
-      return png_image_error(image,
-          "png_image_finish_read: damaged PNG_IMAGE_VERSION");
-
-   return 0;
-}
-
-#endif /* SIMPLIFIED_READ */
-#endif /* READ */
diff --git a/src/png/libpng/pngrio.c b/src/png/libpng/pngrio.c
deleted file mode 100644
index 7e26e855c..000000000
--- a/src/png/libpng/pngrio.c
+++ /dev/null
@@ -1,120 +0,0 @@
-
-/* pngrio.c - functions for data input
- *
- * Last changed in libpng 1.6.24 [August 4, 2016]
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all input.  Users who need
- * special handling are expected to write a function that has the same
- * arguments as this and performs a similar function, but that possibly
- * has a different input method.  Note that you shouldn't change this
- * function, but rather write a replacement function and then make
- * libpng use it at run time with png_set_read_fn(...).
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Read the data from whatever input you are using.  The default routine
- * reads from a file pointer.  Note that this routine sometimes gets called
- * with very small lengths, so you should implement some kind of simple
- * buffering if you are using unbuffered reads.  This should never be asked
- * to read more than 64K on a 16-bit machine.
- */
-void /* PRIVATE */
-png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length)
-{
-   png_debug1(4, "reading %d bytes", (int)length);
-
-   if (png_ptr->read_data_fn != NULL)
-      (*(png_ptr->read_data_fn))(png_ptr, data, length);
-
-   else
-      png_error(png_ptr, "Call to NULL read function");
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-/* This is the function that does the actual reading of data.  If you are
- * not reading from a standard C stream, you should create a replacement
- * read_data function and use it at run time with png_set_read_fn(), rather
- * than changing the library.
- */
-void PNGCBAPI
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
-    * instead of an int, which is what fread() actually returns.
-    */
-   check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));
-
-   if (check != length)
-      png_error(png_ptr, "Read Error");
-}
-#endif
-
-/* This function allows the application to supply a new input function
- * for libpng if standard C streams aren't being used.
- *
- * This function takes as its arguments:
- *
- * png_ptr      - pointer to a png input data structure
- *
- * io_ptr       - pointer to user supplied structure containing info about
- *                the input functions.  May be NULL.
- *
- * read_data_fn - pointer to a new input function that takes as its
- *                arguments a pointer to a png_struct, a pointer to
- *                a location where input data can be stored, and a 32-bit
- *                unsigned int that is the number of bytes to be read.
- *                To exit and output any fatal error messages the new write
- *                function should call png_error(png_ptr, "Error msg").
- *                May be NULL, in which case libpng's default function will
- *                be used.
- */
-void PNGAPI
-png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr read_data_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = io_ptr;
-
-#ifdef PNG_STDIO_SUPPORTED
-   if (read_data_fn != NULL)
-      png_ptr->read_data_fn = read_data_fn;
-
-   else
-      png_ptr->read_data_fn = png_default_read_data;
-#else
-   png_ptr->read_data_fn = read_data_fn;
-#endif
-
-#ifdef PNG_WRITE_SUPPORTED
-   /* It is an error to write to a read device */
-   if (png_ptr->write_data_fn != NULL)
-   {
-      png_ptr->write_data_fn = NULL;
-      png_warning(png_ptr,
-          "Can't set both read_data_fn and write_data_fn in the"
-          " same structure");
-   }
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_ptr->output_flush_fn = NULL;
-#endif
-}
-#endif /* READ */
diff --git a/src/png/libpng/pngrtran.c b/src/png/libpng/pngrtran.c
deleted file mode 100644
index c18965031..000000000
--- a/src/png/libpng/pngrtran.c
+++ /dev/null
@@ -1,5010 +0,0 @@
-
-/* pngrtran.c - transforms the data in a row for PNG readers
- *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains functions optionally called by an application
- * in order to tell libpng how to handle data when reading a PNG.
- * Transformations that are used in both reading and writing are
- * in pngtrans.c.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Set the action on getting a CRC error for an ancillary or critical chunk. */
-void PNGAPI
-png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action)
-{
-   png_debug(1, "in png_set_crc_action");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Tell libpng how we react to CRC errors in critical chunks */
-   switch (crit_action)
-   {
-      case PNG_CRC_NO_CHANGE:                        /* Leave setting as is */
-         break;
-
-      case PNG_CRC_WARN_USE:                               /* Warn/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
-         break;
-
-      case PNG_CRC_QUIET_USE:                             /* Quiet/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
-                           PNG_FLAG_CRC_CRITICAL_IGNORE;
-         break;
-
-      case PNG_CRC_WARN_DISCARD:    /* Not a valid action for critical data */
-         png_warning(png_ptr,
-             "Can't discard critical data on CRC error");
-         /* FALLTHROUGH */
-      case PNG_CRC_ERROR_QUIT:                                /* Error/quit */
-
-      case PNG_CRC_DEFAULT:
-      default:
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         break;
-   }
-
-   /* Tell libpng how we react to CRC errors in ancillary chunks */
-   switch (ancil_action)
-   {
-      case PNG_CRC_NO_CHANGE:                       /* Leave setting as is */
-         break;
-
-      case PNG_CRC_WARN_USE:                              /* Warn/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
-         break;
-
-      case PNG_CRC_QUIET_USE:                            /* Quiet/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
-                           PNG_FLAG_CRC_ANCILLARY_NOWARN;
-         break;
-
-      case PNG_CRC_ERROR_QUIT:                               /* Error/quit */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
-         break;
-
-      case PNG_CRC_WARN_DISCARD:                      /* Warn/discard data */
-
-      case PNG_CRC_DEFAULT:
-      default:
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         break;
-   }
-}
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-/* Is it OK to set a transformation now?  Only if png_start_read_image or
- * png_read_update_info have not been called.  It is not necessary for the IHDR
- * to have been read in all cases; the need_IHDR parameter allows for this
- * check too.
- */
-static int
-png_rtran_ok(png_structrp png_ptr, int need_IHDR)
-{
-   if (png_ptr != NULL)
-   {
-      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
-         png_app_error(png_ptr,
-             "invalid after png_start_read_image or png_read_update_info");
-
-      else if (need_IHDR && (png_ptr->mode & PNG_HAVE_IHDR) == 0)
-         png_app_error(png_ptr, "invalid before the PNG header has been read");
-
-      else
-      {
-         /* Turn on failure to initialize correctly for all transforms. */
-         png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
-
-         return 1; /* Ok */
-      }
-   }
-
-   return 0; /* no png_error possible! */
-}
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS via a background color */
-void PNGFAPI
-png_set_background_fixed(png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma)
-{
-   png_debug(1, "in png_set_background_fixed");
-
-   if (png_rtran_ok(png_ptr, 0) == 0 || background_color == NULL)
-      return;
-
-   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
-   {
-      png_warning(png_ptr, "Application must supply a known background gamma");
-      return;
-   }
-
-   png_ptr->transformations |= PNG_COMPOSE | PNG_STRIP_ALPHA;
-   png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-   png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-   png_ptr->background = *background_color;
-   png_ptr->background_gamma = background_gamma;
-   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
-   if (need_expand != 0)
-      png_ptr->transformations |= PNG_BACKGROUND_EXPAND;
-   else
-      png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_background(png_structrp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, double background_gamma)
-{
-   png_set_background_fixed(png_ptr, background_color, background_gamma_code,
-      need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));
-}
-#  endif /* FLOATING_POINT */
-#endif /* READ_BACKGROUND */
-
-/* Scale 16-bit depth files to 8-bit depth.  If both of these are set then the
- * one that pngrtran does first (scale) happens.  This is necessary to allow the
- * TRANSFORM and API behavior to be somewhat consistent, and it's simpler.
- */
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-void PNGAPI
-png_set_scale_16(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_scale_16");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= PNG_SCALE_16_TO_8;
-}
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-/* Chop 16-bit depth files to 8-bit depth */
-void PNGAPI
-png_set_strip_16(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_strip_16");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= PNG_16_TO_8;
-}
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-void PNGAPI
-png_set_strip_alpha(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_strip_alpha");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= PNG_STRIP_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)
-static png_fixed_point
-translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
-    int is_screen)
-{
-   /* Check for flag values.  The main reason for having the old Mac value as a
-    * flag is that it is pretty near impossible to work out what the correct
-    * value is from Apple documentation - a working Mac system is needed to
-    * discover the value!
-    */
-   if (output_gamma == PNG_DEFAULT_sRGB ||
-      output_gamma == PNG_FP_1 / PNG_DEFAULT_sRGB)
-   {
-      /* If there is no sRGB support this just sets the gamma to the standard
-       * sRGB value.  (This is a side effect of using this function!)
-       */
-#     ifdef PNG_READ_sRGB_SUPPORTED
-         png_ptr->flags |= PNG_FLAG_ASSUME_sRGB;
-#     else
-         PNG_UNUSED(png_ptr)
-#     endif
-      if (is_screen != 0)
-         output_gamma = PNG_GAMMA_sRGB;
-      else
-         output_gamma = PNG_GAMMA_sRGB_INVERSE;
-   }
-
-   else if (output_gamma == PNG_GAMMA_MAC_18 ||
-      output_gamma == PNG_FP_1 / PNG_GAMMA_MAC_18)
-   {
-      if (is_screen != 0)
-         output_gamma = PNG_GAMMA_MAC_OLD;
-      else
-         output_gamma = PNG_GAMMA_MAC_INVERSE;
-   }
-
-   return output_gamma;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-static png_fixed_point
-convert_gamma_value(png_structrp png_ptr, double output_gamma)
-{
-   /* The following silently ignores cases where fixed point (times 100,000)
-    * gamma values are passed to the floating point API.  This is safe and it
-    * means the fixed point constants work just fine with the floating point
-    * API.  The alternative would just lead to undetected errors and spurious
-    * bug reports.  Negative values fail inside the _fixed API unless they
-    * correspond to the flag values.
-    */
-   if (output_gamma > 0 && output_gamma < 128)
-      output_gamma *= PNG_FP_1;
-
-   /* This preserves -1 and -2 exactly: */
-   output_gamma = floor(output_gamma + .5);
-
-   if (output_gamma > PNG_FP_MAX || output_gamma < PNG_FP_MIN)
-      png_fixed_error(png_ptr, "gamma value");
-
-   return (png_fixed_point)output_gamma;
-}
-#  endif
-#endif /* READ_ALPHA_MODE || READ_GAMMA */
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-void PNGFAPI
-png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
-    png_fixed_point output_gamma)
-{
-   int compose = 0;
-   png_fixed_point file_gamma;
-
-   png_debug(1, "in png_set_alpha_mode");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
-
-   /* Validate the value to ensure it is in a reasonable range. The value
-    * is expected to be 1 or greater, but this range test allows for some
-    * viewing correction values.  The intent is to weed out users of this API
-    * who use the inverse of the gamma value accidentally!  Since some of these
-    * values are reasonable this may have to be changed:
-    *
-    * 1.6.x: changed from 0.07..3 to 0.01..100 (to accomodate the optimal 16-bit
-    * gamma of 36, and its reciprocal.)
-    */
-   if (output_gamma < 1000 || output_gamma > 10000000)
-      png_error(png_ptr, "output gamma out of expected range");
-
-   /* The default file gamma is the inverse of the output gamma; the output
-    * gamma may be changed below so get the file value first:
-    */
-   file_gamma = png_reciprocal(output_gamma);
-
-   /* There are really 8 possibilities here, composed of any combination
-    * of:
-    *
-    *    premultiply the color channels
-    *    do not encode non-opaque pixels
-    *    encode the alpha as well as the color channels
-    *
-    * The differences disappear if the input/output ('screen') gamma is 1.0,
-    * because then the encoding is a no-op and there is only the choice of
-    * premultiplying the color channels or not.
-    *
-    * png_set_alpha_mode and png_set_background interact because both use
-    * png_compose to do the work.  Calling both is only useful when
-    * png_set_alpha_mode is used to set the default mode - PNG_ALPHA_PNG - along
-    * with a default gamma value.  Otherwise PNG_COMPOSE must not be set.
-    */
-   switch (mode)
-   {
-      case PNG_ALPHA_PNG:        /* default: png standard */
-         /* No compose, but it may be set by png_set_background! */
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-         break;
-
-      case PNG_ALPHA_ASSOCIATED: /* color channels premultiplied */
-         compose = 1;
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-         /* The output is linear: */
-         output_gamma = PNG_FP_1;
-         break;
-
-      case PNG_ALPHA_OPTIMIZED:  /* associated, non-opaque pixels linear */
-         compose = 1;
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags |= PNG_FLAG_OPTIMIZE_ALPHA;
-         /* output_gamma records the encoding of opaque pixels! */
-         break;
-
-      case PNG_ALPHA_BROKEN:     /* associated, non-linear, alpha encoded */
-         compose = 1;
-         png_ptr->transformations |= PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-         break;
-
-      default:
-         png_error(png_ptr, "invalid alpha mode");
-   }
-
-   /* Only set the default gamma if the file gamma has not been set (this has
-    * the side effect that the gamma in a second call to png_set_alpha_mode will
-    * be ignored.)
-    */
-   if (png_ptr->colorspace.gamma == 0)
-   {
-      png_ptr->colorspace.gamma = file_gamma;
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-   }
-
-   /* But always set the output gamma: */
-   png_ptr->screen_gamma = output_gamma;
-
-   /* Finally, if pre-multiplying, set the background fields to achieve the
-    * desired result.
-    */
-   if (compose != 0)
-   {
-      /* And obtain alpha pre-multiplication by composing on black: */
-      memset(&png_ptr->background, 0, (sizeof png_ptr->background));
-      png_ptr->background_gamma = png_ptr->colorspace.gamma; /* just in case */
-      png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;
-      png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
-
-      if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-         png_error(png_ptr,
-             "conflicting calls to set alpha mode and background");
-
-      png_ptr->transformations |= PNG_COMPOSE;
-   }
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_alpha_mode(png_structrp png_ptr, int mode, double output_gamma)
-{
-   png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr,
-       output_gamma));
-}
-#  endif
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Dither file to 8-bit.  Supply a palette, the current number
- * of elements in the palette, the maximum number of elements
- * allowed, and a histogram if possible.  If the current number
- * of colors is greater than the maximum number, the palette will be
- * modified to fit in the maximum number.  "full_quantize" indicates
- * whether we need a quantizing cube set up for RGB images, or if we
- * simply are reducing the number of colors in a paletted image.
- */
-
-typedef struct png_dsort_struct
-{
-   struct png_dsort_struct * next;
-   png_byte left;
-   png_byte right;
-} png_dsort;
-typedef png_dsort *   png_dsortp;
-typedef png_dsort * * png_dsortpp;
-
-void PNGAPI
-png_set_quantize(png_structrp png_ptr, png_colorp palette,
-    int num_palette, int maximum_colors, png_const_uint_16p histogram,
-    int full_quantize)
-{
-   png_debug(1, "in png_set_quantize");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= PNG_QUANTIZE;
-
-   if (full_quantize == 0)
-   {
-      int i;
-
-      png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-          (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
-      for (i = 0; i < num_palette; i++)
-         png_ptr->quantize_index[i] = (png_byte)i;
-   }
-
-   if (num_palette > maximum_colors)
-   {
-      if (histogram != NULL)
-      {
-         /* This is easy enough, just throw out the least used colors.
-          * Perhaps not the best solution, but good enough.
-          */
-
-         int i;
-
-         /* Initialize an array to sort colors */
-         png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette * (sizeof (png_byte))));
-
-         /* Initialize the quantize_sort array */
-         for (i = 0; i < num_palette; i++)
-            png_ptr->quantize_sort[i] = (png_byte)i;
-
-         /* Find the least used palette entries by starting a
-          * bubble sort, and running it until we have sorted
-          * out enough colors.  Note that we don't care about
-          * sorting all the colors, just finding which are
-          * least used.
-          */
-
-         for (i = num_palette - 1; i >= maximum_colors; i--)
-         {
-            int done; /* To stop early if the list is pre-sorted */
-            int j;
-
-            done = 1;
-            for (j = 0; j < i; j++)
-            {
-               if (histogram[png_ptr->quantize_sort[j]]
-                   < histogram[png_ptr->quantize_sort[j + 1]])
-               {
-                  png_byte t;
-
-                  t = png_ptr->quantize_sort[j];
-                  png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1];
-                  png_ptr->quantize_sort[j + 1] = t;
-                  done = 0;
-               }
-            }
-
-            if (done != 0)
-               break;
-         }
-
-         /* Swap the palette around, and set up a table, if necessary */
-         if (full_quantize != 0)
-         {
-            int j = num_palette;
-
-            /* Put all the useful colors within the max, but don't
-             * move the others.
-             */
-            for (i = 0; i < maximum_colors; i++)
-            {
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-               {
-                  do
-                     j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-
-                  palette[i] = palette[j];
-               }
-            }
-         }
-         else
-         {
-            int j = num_palette;
-
-            /* Move all the used colors inside the max limit, and
-             * develop a translation table.
-             */
-            for (i = 0; i < maximum_colors; i++)
-            {
-               /* Only move the colors we need to */
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-               {
-                  png_color tmp_color;
-
-                  do
-                     j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-
-                  tmp_color = palette[j];
-                  palette[j] = palette[i];
-                  palette[i] = tmp_color;
-                  /* Indicate where the color went */
-                  png_ptr->quantize_index[j] = (png_byte)i;
-                  png_ptr->quantize_index[i] = (png_byte)j;
-               }
-            }
-
-            /* Find closest color for those colors we are not using */
-            for (i = 0; i < num_palette; i++)
-            {
-               if ((int)png_ptr->quantize_index[i] >= maximum_colors)
-               {
-                  int min_d, k, min_k, d_index;
-
-                  /* Find the closest color to one we threw out */
-                  d_index = png_ptr->quantize_index[i];
-                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
-                  for (k = 1, min_k = 0; k < maximum_colors; k++)
-                  {
-                     int d;
-
-                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);
-
-                     if (d < min_d)
-                     {
-                        min_d = d;
-                        min_k = k;
-                     }
-                  }
-                  /* Point to closest color */
-                  png_ptr->quantize_index[i] = (png_byte)min_k;
-               }
-            }
-         }
-         png_free(png_ptr, png_ptr->quantize_sort);
-         png_ptr->quantize_sort = NULL;
-      }
-      else
-      {
-         /* This is much harder to do simply (and quickly).  Perhaps
-          * we need to go through a median cut routine, but those
-          * don't always behave themselves with only a few colors
-          * as input.  So we will just find the closest two colors,
-          * and throw out one of them (chosen somewhat randomly).
-          * [We don't understand this at all, so if someone wants to
-          *  work on improving it, be our guest - AED, GRP]
-          */
-         int i;
-         int max_d;
-         int num_new_palette;
-         png_dsortp t;
-         png_dsortpp hash;
-
-         t = NULL;
-
-         /* Initialize palette index arrays */
-         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette *
-             (sizeof (png_byte))));
-         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)((png_uint_32)num_palette *
-             (sizeof (png_byte))));
-
-         /* Initialize the sort array */
-         for (i = 0; i < num_palette; i++)
-         {
-            png_ptr->index_to_palette[i] = (png_byte)i;
-            png_ptr->palette_to_index[i] = (png_byte)i;
-         }
-
-         hash = (png_dsortpp)png_calloc(png_ptr, (png_alloc_size_t)(769 *
-             (sizeof (png_dsortp))));
-
-         num_new_palette = num_palette;
-
-         /* Initial wild guess at how far apart the farthest pixel
-          * pair we will be eliminating will be.  Larger
-          * numbers mean more areas will be allocated, Smaller
-          * numbers run the risk of not saving enough data, and
-          * having to do this all over again.
-          *
-          * I have not done extensive checking on this number.
-          */
-         max_d = 96;
-
-         while (num_new_palette > maximum_colors)
-         {
-            for (i = 0; i < num_new_palette - 1; i++)
-            {
-               int j;
-
-               for (j = i + 1; j < num_new_palette; j++)
-               {
-                  int d;
-
-                  d = PNG_COLOR_DIST(palette[i], palette[j]);
-
-                  if (d <= max_d)
-                  {
-
-                     t = (png_dsortp)png_malloc_warn(png_ptr,
-                         (png_alloc_size_t)(sizeof (png_dsort)));
-
-                     if (t == NULL)
-                         break;
-
-                     t->next = hash[d];
-                     t->left = (png_byte)i;
-                     t->right = (png_byte)j;
-                     hash[d] = t;
-                  }
-               }
-               if (t == NULL)
-                  break;
-            }
-
-            if (t != NULL)
-            for (i = 0; i <= max_d; i++)
-            {
-               if (hash[i] != NULL)
-               {
-                  png_dsortp p;
-
-                  for (p = hash[i]; p; p = p->next)
-                  {
-                     if ((int)png_ptr->index_to_palette[p->left]
-                         < num_new_palette &&
-                         (int)png_ptr->index_to_palette[p->right]
-                         < num_new_palette)
-                     {
-                        int j, next_j;
-
-                        if (num_new_palette & 0x01)
-                        {
-                           j = p->left;
-                           next_j = p->right;
-                        }
-                        else
-                        {
-                           j = p->right;
-                           next_j = p->left;
-                        }
-
-                        num_new_palette--;
-                        palette[png_ptr->index_to_palette[j]]
-                            = palette[num_new_palette];
-                        if (full_quantize == 0)
-                        {
-                           int k;
-
-                           for (k = 0; k < num_palette; k++)
-                           {
-                              if (png_ptr->quantize_index[k] ==
-                                  png_ptr->index_to_palette[j])
-                                 png_ptr->quantize_index[k] =
-                                     png_ptr->index_to_palette[next_j];
-
-                              if ((int)png_ptr->quantize_index[k] ==
-                                  num_new_palette)
-                                 png_ptr->quantize_index[k] =
-                                     png_ptr->index_to_palette[j];
-                           }
-                        }
-
-                        png_ptr->index_to_palette[png_ptr->palette_to_index
-                            [num_new_palette]] = png_ptr->index_to_palette[j];
-
-                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]
-                            = png_ptr->palette_to_index[num_new_palette];
-
-                        png_ptr->index_to_palette[j] =
-                            (png_byte)num_new_palette;
-
-                        png_ptr->palette_to_index[num_new_palette] =
-                            (png_byte)j;
-                     }
-                     if (num_new_palette <= maximum_colors)
-                        break;
-                  }
-                  if (num_new_palette <= maximum_colors)
-                     break;
-               }
-            }
-
-            for (i = 0; i < 769; i++)
-            {
-               if (hash[i] != NULL)
-               {
-                  png_dsortp p = hash[i];
-                  while (p)
-                  {
-                     t = p->next;
-                     png_free(png_ptr, p);
-                     p = t;
-                  }
-               }
-               hash[i] = 0;
-            }
-            max_d += 96;
-         }
-         png_free(png_ptr, hash);
-         png_free(png_ptr, png_ptr->palette_to_index);
-         png_free(png_ptr, png_ptr->index_to_palette);
-         png_ptr->palette_to_index = NULL;
-         png_ptr->index_to_palette = NULL;
-      }
-      num_palette = maximum_colors;
-   }
-   if (png_ptr->palette == NULL)
-   {
-      png_ptr->palette = palette;
-   }
-   png_ptr->num_palette = (png_uint_16)num_palette;
-
-   if (full_quantize != 0)
-   {
-      int i;
-      png_bytep distance;
-      int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS +
-          PNG_QUANTIZE_BLUE_BITS;
-      int num_red = (1 << PNG_QUANTIZE_RED_BITS);
-      int num_green = (1 << PNG_QUANTIZE_GREEN_BITS);
-      int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS);
-      png_size_t num_entries = ((png_size_t)1 << total_bits);
-
-      png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
-          (png_alloc_size_t)(num_entries * (sizeof (png_byte))));
-
-      distance = (png_bytep)png_malloc(png_ptr, (png_alloc_size_t)(num_entries *
-          (sizeof (png_byte))));
-
-      memset(distance, 0xff, num_entries * (sizeof (png_byte)));
-
-      for (i = 0; i < num_palette; i++)
-      {
-         int ir, ig, ib;
-         int r = (palette[i].red >> (8 - PNG_QUANTIZE_RED_BITS));
-         int g = (palette[i].green >> (8 - PNG_QUANTIZE_GREEN_BITS));
-         int b = (palette[i].blue >> (8 - PNG_QUANTIZE_BLUE_BITS));
-
-         for (ir = 0; ir < num_red; ir++)
-         {
-            /* int dr = abs(ir - r); */
-            int dr = ((ir > r) ? ir - r : r - ir);
-            int index_r = (ir << (PNG_QUANTIZE_BLUE_BITS +
-                PNG_QUANTIZE_GREEN_BITS));
-
-            for (ig = 0; ig < num_green; ig++)
-            {
-               /* int dg = abs(ig - g); */
-               int dg = ((ig > g) ? ig - g : g - ig);
-               int dt = dr + dg;
-               int dm = ((dr > dg) ? dr : dg);
-               int index_g = index_r | (ig << PNG_QUANTIZE_BLUE_BITS);
-
-               for (ib = 0; ib < num_blue; ib++)
-               {
-                  int d_index = index_g | ib;
-                  /* int db = abs(ib - b); */
-                  int db = ((ib > b) ? ib - b : b - ib);
-                  int dmax = ((dm > db) ? dm : db);
-                  int d = dmax + dt + db;
-
-                  if (d < (int)distance[d_index])
-                  {
-                     distance[d_index] = (png_byte)d;
-                     png_ptr->palette_lookup[d_index] = (png_byte)i;
-                  }
-               }
-            }
-         }
-      }
-
-      png_free(png_ptr, distance);
-   }
-}
-#endif /* READ_QUANTIZE */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-void PNGFAPI
-png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
-    png_fixed_point file_gamma)
-{
-   png_debug(1, "in png_set_gamma_fixed");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   /* New in libpng-1.5.4 - reserve particular negative values as flags. */
-   scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/);
-   file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/);
-
-   /* Checking the gamma values for being >0 was added in 1.5.4 along with the
-    * premultiplied alpha support; this actually hides an undocumented feature
-    * of the previous implementation which allowed gamma processing to be
-    * disabled in background handling.  There is no evidence (so far) that this
-    * was being used; however, png_set_background itself accepted and must still
-    * accept '0' for the gamma value it takes, because it isn't always used.
-    *
-    * Since this is an API change (albeit a very minor one that removes an
-    * undocumented API feature) the following checks were only enabled in
-    * libpng-1.6.0.
-    */
-   if (file_gamma <= 0)
-      png_error(png_ptr, "invalid file gamma in png_set_gamma");
-
-   if (scrn_gamma <= 0)
-      png_error(png_ptr, "invalid screen gamma in png_set_gamma");
-
-   /* Set the gamma values unconditionally - this overrides the value in the PNG
-    * file if a gAMA chunk was present.  png_set_alpha_mode provides a
-    * different, easier, way to default the file gamma.
-    */
-   png_ptr->colorspace.gamma = file_gamma;
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-   png_ptr->screen_gamma = scrn_gamma;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma)
-{
-   png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma),
-       convert_gamma_value(png_ptr, file_gamma));
-}
-#  endif /* FLOATING_POINT */
-#endif /* READ_GAMMA */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand paletted images to RGB, expand grayscale images of
- * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
- * to alpha channels.
- */
-void PNGAPI
-png_set_expand(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_expand");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-}
-
-/* GRR 19990627:  the following three functions currently are identical
- *  to png_set_expand().  However, it is entirely reasonable that someone
- *  might wish to expand an indexed image to RGB but *not* expand a single,
- *  fully transparent palette entry to a full alpha channel--perhaps instead
- *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace
- *  the transparent color with a particular RGB value, or drop tRNS entirely.
- *  IOW, a future version of the library may make the transformations flag
- *  a bit more fine-grained, with separate bits for each of these three
- *  functions.
- *
- *  More to the point, these functions make it obvious what libpng will be
- *  doing, whereas "expand" can (and does) mean any number of things.
- *
- *  GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified
- *  to expand only the sample depth but not to expand the tRNS to alpha
- *  and its name was changed to png_set_expand_gray_1_2_4_to_8().
- */
-
-/* Expand paletted images to RGB. */
-void PNGAPI
-png_set_palette_to_rgb(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_palette_to_rgb");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-}
-
-/* Expand grayscale images of less than 8-bit depth to 8 bits. */
-void PNGAPI
-png_set_expand_gray_1_2_4_to_8(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= PNG_EXPAND;
-}
-
-/* Expand tRNS chunks to alpha channels. */
-void PNGAPI
-png_set_tRNS_to_alpha(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_tRNS_to_alpha");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-}
-#endif /* READ_EXPAND */
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise
- * it may not work correctly.)
- */
-void PNGAPI
-png_set_expand_16(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_expand_16");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS);
-}
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-void PNGAPI
-png_set_gray_to_rgb(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_gray_to_rgb");
-
-   if (png_rtran_ok(png_ptr, 0) == 0)
-      return;
-
-   /* Because rgb must be 8 bits or more: */
-   png_set_expand_gray_1_2_4_to_8(png_ptr);
-   png_ptr->transformations |= PNG_GRAY_TO_RGB;
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-void PNGFAPI
-png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
-    png_fixed_point red, png_fixed_point green)
-{
-   png_debug(1, "in png_set_rgb_to_gray");
-
-   /* Need the IHDR here because of the check on color_type below. */
-   /* TODO: fix this */
-   if (png_rtran_ok(png_ptr, 1) == 0)
-      return;
-
-   switch (error_action)
-   {
-      case PNG_ERROR_ACTION_NONE:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY;
-         break;
-
-      case PNG_ERROR_ACTION_WARN:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
-         break;
-
-      case PNG_ERROR_ACTION_ERROR:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
-         break;
-
-      default:
-         png_error(png_ptr, "invalid error action to rgb_to_gray");
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#ifdef PNG_READ_EXPAND_SUPPORTED
-      png_ptr->transformations |= PNG_EXPAND;
-#else
-   {
-      /* Make this an error in 1.6 because otherwise the application may assume
-       * that it just worked and get a memory overwrite.
-       */
-      png_error(png_ptr,
-          "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");
-
-      /* png_ptr->transformations &= ~PNG_RGB_TO_GRAY; */
-   }
-#endif
-   {
-      if (red >= 0 && green >= 0 && red + green <= PNG_FP_1)
-      {
-         png_uint_16 red_int, green_int;
-
-         /* NOTE: this calculation does not round, but this behavior is retained
-          * for consistency; the inaccuracy is very small.  The code here always
-          * overwrites the coefficients, regardless of whether they have been
-          * defaulted or set already.
-          */
-         red_int = (png_uint_16)(((png_uint_32)red*32768)/100000);
-         green_int = (png_uint_16)(((png_uint_32)green*32768)/100000);
-
-         png_ptr->rgb_to_gray_red_coeff   = red_int;
-         png_ptr->rgb_to_gray_green_coeff = green_int;
-         png_ptr->rgb_to_gray_coefficients_set = 1;
-      }
-
-      else
-      {
-         if (red >= 0 && green >= 0)
-            png_app_warning(png_ptr,
-                "ignoring out of range rgb_to_gray coefficients");
-
-         /* Use the defaults, from the cHRM chunk if set, else the historical
-          * values which are close to the sRGB/HDTV/ITU-Rec 709 values.  See
-          * png_do_rgb_to_gray for more discussion of the values.  In this case
-          * the coefficients are not marked as 'set' and are not overwritten if
-          * something has already provided a default.
-          */
-         if (png_ptr->rgb_to_gray_red_coeff == 0 &&
-             png_ptr->rgb_to_gray_green_coeff == 0)
-         {
-            png_ptr->rgb_to_gray_red_coeff   = 6968;
-            png_ptr->rgb_to_gray_green_coeff = 23434;
-            /* png_ptr->rgb_to_gray_blue_coeff  = 2366; */
-         }
-      }
-   }
-}
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-/* Convert a RGB image to a grayscale of the same width.  This allows us,
- * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
- */
-
-void PNGAPI
-png_set_rgb_to_gray(png_structrp png_ptr, int error_action, double red,
-    double green)
-{
-   png_set_rgb_to_gray_fixed(png_ptr, error_action,
-       png_fixed(png_ptr, red, "rgb to gray red coefficient"),
-      png_fixed(png_ptr, green, "rgb to gray green coefficient"));
-}
-#endif /* FLOATING POINT */
-
-#endif /* RGB_TO_GRAY */
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-void PNGAPI
-png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
-    read_user_transform_fn)
-{
-   png_debug(1, "in png_set_read_user_transform_fn");
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   png_ptr->transformations |= PNG_USER_TRANSFORM;
-   png_ptr->read_user_transform_fn = read_user_transform_fn;
-#endif
-}
-#endif
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* In the case of gamma transformations only do transformations on images where
- * the [file] gamma and screen_gamma are not close reciprocals, otherwise it
- * slows things down slightly, and also needlessly introduces small errors.
- */
-static int /* PRIVATE */
-png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma)
-{
-   /* PNG_GAMMA_THRESHOLD is the threshold for performing gamma
-    * correction as a difference of the overall transform from 1.0
-    *
-    * We want to compare the threshold with s*f - 1, if we get
-    * overflow here it is because of wacky gamma values so we
-    * turn on processing anyway.
-    */
-   png_fixed_point gtest;
-   return !png_muldiv(&gtest, screen_gamma, file_gamma, PNG_FP_1) ||
-       png_gamma_significant(gtest);
-}
-#endif
-
-/* Initialize everything needed for the read.  This includes modifying
- * the palette.
- */
-
-/* For the moment 'png_init_palette_transformations' and
- * 'png_init_rgb_transformations' only do some flag canceling optimizations.
- * The intent is that these two routines should have palette or rgb operations
- * extracted from 'png_init_read_transformations'.
- */
-static void /* PRIVATE */
-png_init_palette_transformations(png_structrp png_ptr)
-{
-   /* Called to handle the (input) palette case.  In png_do_read_transformations
-    * the first step is to expand the palette if requested, so this code must
-    * take care to only make changes that are invariant with respect to the
-    * palette expansion, or only do them if there is no expansion.
-    *
-    * STRIP_ALPHA has already been handled in the caller (by setting num_trans
-    * to 0.)
-    */
-   int input_has_alpha = 0;
-   int input_has_transparency = 0;
-
-   if (png_ptr->num_trans > 0)
-   {
-      int i;
-
-      /* Ignore if all the entries are opaque (unlikely!) */
-      for (i=0; i<png_ptr->num_trans; ++i)
-      {
-         if (png_ptr->trans_alpha[i] == 255)
-            continue;
-         else if (png_ptr->trans_alpha[i] == 0)
-            input_has_transparency = 1;
-         else
-         {
-            input_has_transparency = 1;
-            input_has_alpha = 1;
-            break;
-         }
-      }
-   }
-
-   /* If no alpha we can optimize. */
-   if (input_has_alpha == 0)
-   {
-      /* Any alpha means background and associative alpha processing is
-       * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA
-       * and ENCODE_ALPHA are irrelevant.
-       */
-      png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-      if (input_has_transparency == 0)
-         png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);
-   }
-
-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* png_set_background handling - deals with the complexity of whether the
-    * background color is in the file format or the screen format in the case
-    * where an 'expand' will happen.
-    */
-
-   /* The following code cannot be entered in the alpha pre-multiplication case
-    * because PNG_BACKGROUND_EXPAND is cancelled below.
-    */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
-       (png_ptr->transformations & PNG_EXPAND) != 0)
-   {
-      {
-         png_ptr->background.red   =
-             png_ptr->palette[png_ptr->background.index].red;
-         png_ptr->background.green =
-             png_ptr->palette[png_ptr->background.index].green;
-         png_ptr->background.blue  =
-             png_ptr->palette[png_ptr->background.index].blue;
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-        if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
-        {
-           if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
-           {
-              /* Invert the alpha channel (in tRNS) unless the pixels are
-               * going to be expanded, in which case leave it for later
-               */
-              int i, istop = png_ptr->num_trans;
-
-              for (i=0; i<istop; i++)
-                 png_ptr->trans_alpha[i] = (png_byte)(255 -
-                    png_ptr->trans_alpha[i]);
-           }
-        }
-#endif /* READ_INVERT_ALPHA */
-      }
-   } /* background expand and (therefore) no alpha association. */
-#endif /* READ_EXPAND && READ_BACKGROUND */
-}
-
-static void /* PRIVATE */
-png_init_rgb_transformations(png_structrp png_ptr)
-{
-   /* Added to libpng-1.5.4: check the color type to determine whether there
-    * is any alpha or transparency in the image and simply cancel the
-    * background and alpha mode stuff if there isn't.
-    */
-   int input_has_alpha = (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0;
-   int input_has_transparency = png_ptr->num_trans > 0;
-
-   /* If no alpha we can optimize. */
-   if (input_has_alpha == 0)
-   {
-      /* Any alpha means background and associative alpha processing is
-       * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA
-       * and ENCODE_ALPHA are irrelevant.
-       */
-#     ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-#     endif
-
-      if (input_has_transparency == 0)
-         png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);
-   }
-
-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* png_set_background handling - deals with the complexity of whether the
-    * background color is in the file format or the screen format in the case
-    * where an 'expand' will happen.
-    */
-
-   /* The following code cannot be entered in the alpha pre-multiplication case
-    * because PNG_BACKGROUND_EXPAND is cancelled below.
-    */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
-       (png_ptr->transformations & PNG_EXPAND) != 0 &&
-       (png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
-       /* i.e., GRAY or GRAY_ALPHA */
-   {
-      {
-         /* Expand background and tRNS chunks */
-         int gray = png_ptr->background.gray;
-         int trans_gray = png_ptr->trans_color.gray;
-
-         switch (png_ptr->bit_depth)
-         {
-            case 1:
-               gray *= 0xff;
-               trans_gray *= 0xff;
-               break;
-
-            case 2:
-               gray *= 0x55;
-               trans_gray *= 0x55;
-               break;
-
-            case 4:
-               gray *= 0x11;
-               trans_gray *= 0x11;
-               break;
-
-            default:
-
-            case 8:
-               /* FALLTHROUGH */ /*  (Already 8 bits) */
-
-            case 16:
-               /* Already a full 16 bits */
-               break;
-         }
-
-         png_ptr->background.red = png_ptr->background.green =
-            png_ptr->background.blue = (png_uint_16)gray;
-
-         if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
-         {
-            png_ptr->trans_color.red = png_ptr->trans_color.green =
-               png_ptr->trans_color.blue = (png_uint_16)trans_gray;
-         }
-      }
-   } /* background expand and (therefore) no alpha association. */
-#endif /* READ_EXPAND && READ_BACKGROUND */
-}
-
-void /* PRIVATE */
-png_init_read_transformations(png_structrp png_ptr)
-{
-   png_debug(1, "in png_init_read_transformations");
-
-   /* This internal function is called from png_read_start_row in pngrutil.c
-    * and it is called before the 'rowbytes' calculation is done, so the code
-    * in here can change or update the transformations flags.
-    *
-    * First do updates that do not depend on the details of the PNG image data
-    * being processed.
-    */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   /* Prior to 1.5.4 these tests were performed from png_set_gamma, 1.5.4 adds
-    * png_set_alpha_mode and this is another source for a default file gamma so
-    * the test needs to be performed later - here.  In addition prior to 1.5.4
-    * the tests were repeated for the PALETTE color type here - this is no
-    * longer necessary (and doesn't seem to have been necessary before.)
-    */
-   {
-      /* The following temporary indicates if overall gamma correction is
-       * required.
-       */
-      int gamma_correction = 0;
-
-      if (png_ptr->colorspace.gamma != 0) /* has been set */
-      {
-         if (png_ptr->screen_gamma != 0) /* screen set too */
-            gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma,
-                png_ptr->screen_gamma);
-
-         else
-            /* Assume the output matches the input; a long time default behavior
-             * of libpng, although the standard has nothing to say about this.
-             */
-            png_ptr->screen_gamma = png_reciprocal(png_ptr->colorspace.gamma);
-      }
-
-      else if (png_ptr->screen_gamma != 0)
-         /* The converse - assume the file matches the screen, note that this
-          * perhaps undesireable default can (from 1.5.4) be changed by calling
-          * png_set_alpha_mode (even if the alpha handling mode isn't required
-          * or isn't changed from the default.)
-          */
-         png_ptr->colorspace.gamma = png_reciprocal(png_ptr->screen_gamma);
-
-      else /* neither are set */
-         /* Just in case the following prevents any processing - file and screen
-          * are both assumed to be linear and there is no way to introduce a
-          * third gamma value other than png_set_background with 'UNIQUE', and,
-          * prior to 1.5.4
-          */
-         png_ptr->screen_gamma = png_ptr->colorspace.gamma = PNG_FP_1;
-
-      /* We have a gamma value now. */
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-
-      /* Now turn the gamma transformation on or off as appropriate.  Notice
-       * that PNG_GAMMA just refers to the file->screen correction.  Alpha
-       * composition may independently cause gamma correction because it needs
-       * linear data (e.g. if the file has a gAMA chunk but the screen gamma
-       * hasn't been specified.)  In any case this flag may get turned off in
-       * the code immediately below if the transform can be handled outside the
-       * row loop.
-       */
-      if (gamma_correction != 0)
-         png_ptr->transformations |= PNG_GAMMA;
-
-      else
-         png_ptr->transformations &= ~PNG_GAMMA;
-   }
-#endif
-
-   /* Certain transformations have the effect of preventing other
-    * transformations that happen afterward in png_do_read_transformations;
-    * resolve the interdependencies here.  From the code of
-    * png_do_read_transformations the order is:
-    *
-    *  1) PNG_EXPAND (including PNG_EXPAND_tRNS)
-    *  2) PNG_STRIP_ALPHA (if no compose)
-    *  3) PNG_RGB_TO_GRAY
-    *  4) PNG_GRAY_TO_RGB iff !PNG_BACKGROUND_IS_GRAY
-    *  5) PNG_COMPOSE
-    *  6) PNG_GAMMA
-    *  7) PNG_STRIP_ALPHA (if compose)
-    *  8) PNG_ENCODE_ALPHA
-    *  9) PNG_SCALE_16_TO_8
-    * 10) PNG_16_TO_8
-    * 11) PNG_QUANTIZE (converts to palette)
-    * 12) PNG_EXPAND_16
-    * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY
-    * 14) PNG_INVERT_MONO
-    * 15) PNG_INVERT_ALPHA
-    * 16) PNG_SHIFT
-    * 17) PNG_PACK
-    * 18) PNG_BGR
-    * 19) PNG_PACKSWAP
-    * 20) PNG_FILLER (includes PNG_ADD_ALPHA)
-    * 21) PNG_SWAP_ALPHA
-    * 22) PNG_SWAP_BYTES
-    * 23) PNG_USER_TRANSFORM [must be last]
-    */
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
-       (png_ptr->transformations & PNG_COMPOSE) == 0)
-   {
-      /* Stripping the alpha channel happens immediately after the 'expand'
-       * transformations, before all other transformation, so it cancels out
-       * the alpha handling.  It has the side effect negating the effect of
-       * PNG_EXPAND_tRNS too:
-       */
-      png_ptr->transformations &= ~(PNG_BACKGROUND_EXPAND | PNG_ENCODE_ALPHA |
-         PNG_EXPAND_tRNS);
-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-      /* Kill the tRNS chunk itself too.  Prior to 1.5.4 this did not happen
-       * so transparency information would remain just so long as it wasn't
-       * expanded.  This produces unexpected API changes if the set of things
-       * that do PNG_EXPAND_tRNS changes (perfectly possible given the
-       * documentation - which says ask for what you want, accept what you
-       * get.)  This makes the behavior consistent from 1.5.4:
-       */
-      png_ptr->num_trans = 0;
-   }
-#endif /* STRIP_ALPHA supported, no COMPOSE */
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-   /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA
-    * settings will have no effect.
-    */
-   if (png_gamma_significant(png_ptr->screen_gamma) == 0)
-   {
-      png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-   }
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   /* Make sure the coefficients for the rgb to gray conversion are set
-    * appropriately.
-    */
-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-      png_colorspace_set_rgb_coefficients(png_ptr);
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* Detect gray background and attempt to enable optimization for
-    * gray --> RGB case.
-    *
-    * Note:  if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or
-    * RGB_ALPHA (in which case need_expand is superfluous anyway), the
-    * background color might actually be gray yet not be flagged as such.
-    * This is not a problem for the current code, which uses
-    * PNG_BACKGROUND_IS_GRAY only to decide when to do the
-    * png_do_gray_to_rgb() transformation.
-    *
-    * TODO: this code needs to be revised to avoid the complexity and
-    * interdependencies.  The color type of the background should be recorded in
-    * png_set_background, along with the bit depth, then the code has a record
-    * of exactly what color space the background is currently in.
-    */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0)
-   {
-      /* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if
-       * the file was grayscale the background value is gray.
-       */
-      if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
-         png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
-   }
-
-   else if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-   {
-      /* PNG_COMPOSE: png_set_background was called with need_expand false,
-       * so the color is in the color space of the output or png_set_alpha_mode
-       * was called and the color is black.  Ignore RGB_TO_GRAY because that
-       * happens before GRAY_TO_RGB.
-       */
-      if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
-      {
-         if (png_ptr->background.red == png_ptr->background.green &&
-             png_ptr->background.red == png_ptr->background.blue)
-         {
-            png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
-            png_ptr->background.gray = png_ptr->background.red;
-         }
-      }
-   }
-#endif /* READ_EXPAND && READ_BACKGROUND */
-#endif /* READ_GRAY_TO_RGB */
-
-   /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations
-    * can be performed directly on the palette, and some (such as rgb to gray)
-    * can be optimized inside the palette.  This is particularly true of the
-    * composite (background and alpha) stuff, which can be pretty much all done
-    * in the palette even if the result is expanded to RGB or gray afterward.
-    *
-    * NOTE: this is Not Yet Implemented, the code behaves as in 1.5.1 and
-    * earlier and the palette stuff is actually handled on the first row.  This
-    * leads to the reported bug that the palette returned by png_get_PLTE is not
-    * updated.
-    */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      png_init_palette_transformations(png_ptr);
-
-   else
-      png_init_rgb_transformations(png_ptr);
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-   defined(PNG_READ_EXPAND_16_SUPPORTED)
-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
-       (png_ptr->transformations & PNG_COMPOSE) != 0 &&
-       (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
-       png_ptr->bit_depth != 16)
-   {
-      /* TODO: fix this.  Because the expand_16 operation is after the compose
-       * handling the background color must be 8, not 16, bits deep, but the
-       * application will supply a 16-bit value so reduce it here.
-       *
-       * The PNG_BACKGROUND_EXPAND code above does not expand to 16 bits at
-       * present, so that case is ok (until do_expand_16 is moved.)
-       *
-       * NOTE: this discards the low 16 bits of the user supplied background
-       * color, but until expand_16 works properly there is no choice!
-       */
-#     define CHOP(x) (x)=((png_uint_16)PNG_DIV257(x))
-      CHOP(png_ptr->background.red);
-      CHOP(png_ptr->background.green);
-      CHOP(png_ptr->background.blue);
-      CHOP(png_ptr->background.gray);
-#     undef CHOP
-   }
-#endif /* READ_BACKGROUND && READ_EXPAND_16 */
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-   (defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \
-   defined(PNG_READ_STRIP_16_TO_8_SUPPORTED))
-   if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) != 0 &&
-       (png_ptr->transformations & PNG_COMPOSE) != 0 &&
-       (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
-       png_ptr->bit_depth == 16)
-   {
-      /* On the other hand, if a 16-bit file is to be reduced to 8-bits per
-       * component this will also happen after PNG_COMPOSE and so the background
-       * color must be pre-expanded here.
-       *
-       * TODO: fix this too.
-       */
-      png_ptr->background.red = (png_uint_16)(png_ptr->background.red * 257);
-      png_ptr->background.green =
-         (png_uint_16)(png_ptr->background.green * 257);
-      png_ptr->background.blue = (png_uint_16)(png_ptr->background.blue * 257);
-      png_ptr->background.gray = (png_uint_16)(png_ptr->background.gray * 257);
-   }
-#endif
-
-   /* NOTE: below 'PNG_READ_ALPHA_MODE_SUPPORTED' is presumed to also enable the
-    * background support (see the comments in scripts/pnglibconf.dfa), this
-    * allows pre-multiplication of the alpha channel to be implemented as
-    * compositing on black.  This is probably sub-optimal and has been done in
-    * 1.5.4 betas simply to enable external critique and testing (i.e. to
-    * implement the new API quickly, without lots of internal changes.)
-    */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-#  ifdef PNG_READ_BACKGROUND_SUPPORTED
-      /* Includes ALPHA_MODE */
-      png_ptr->background_1 = png_ptr->background;
-#  endif
-
-   /* This needs to change - in the palette image case a whole set of tables are
-    * built when it would be quicker to just calculate the correct value for
-    * each palette entry directly.  Also, the test is too tricky - why check
-    * PNG_RGB_TO_GRAY if PNG_GAMMA is not set?  The answer seems to be that
-    * PNG_GAMMA is cancelled even if the gamma is known?  The test excludes the
-    * PNG_COMPOSE case, so apparently if there is no *overall* gamma correction
-    * the gamma tables will not be built even if composition is required on a
-    * gamma encoded value.
-    *
-    * In 1.5.4 this is addressed below by an additional check on the individual
-    * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the
-    * tables.
-    */
-   if ((png_ptr->transformations & PNG_GAMMA) != 0 ||
-       ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 &&
-        (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
-         png_gamma_significant(png_ptr->screen_gamma) != 0)) ||
-        ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
-         (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
-          png_gamma_significant(png_ptr->screen_gamma) != 0
-#  ifdef PNG_READ_BACKGROUND_SUPPORTED
-         || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE &&
-           png_gamma_significant(png_ptr->background_gamma) != 0)
-#  endif
-        )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
-       png_gamma_significant(png_ptr->screen_gamma) != 0))
-   {
-      png_build_gamma_table(png_ptr, png_ptr->bit_depth);
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-      if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-      {
-         /* Issue a warning about this combination: because RGB_TO_GRAY is
-          * optimized to do the gamma transform if present yet do_background has
-          * to do the same thing if both options are set a
-          * double-gamma-correction happens.  This is true in all versions of
-          * libpng to date.
-          */
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-            png_warning(png_ptr,
-                "libpng does not support gamma+background+rgb_to_gray");
-
-         if ((png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) != 0)
-         {
-            /* We don't get to here unless there is a tRNS chunk with non-opaque
-             * entries - see the checking code at the start of this function.
-             */
-            png_color back, back_1;
-            png_colorp palette = png_ptr->palette;
-            int num_palette = png_ptr->num_palette;
-            int i;
-            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
-            {
-
-               back.red = png_ptr->gamma_table[png_ptr->background.red];
-               back.green = png_ptr->gamma_table[png_ptr->background.green];
-               back.blue = png_ptr->gamma_table[png_ptr->background.blue];
-
-               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
-               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
-               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
-            }
-            else
-            {
-               png_fixed_point g, gs;
-
-               switch (png_ptr->background_gamma_type)
-               {
-                  case PNG_BACKGROUND_GAMMA_SCREEN:
-                     g = (png_ptr->screen_gamma);
-                     gs = PNG_FP_1;
-                     break;
-
-                  case PNG_BACKGROUND_GAMMA_FILE:
-                     g = png_reciprocal(png_ptr->colorspace.gamma);
-                     gs = png_reciprocal2(png_ptr->colorspace.gamma,
-                         png_ptr->screen_gamma);
-                     break;
-
-                  case PNG_BACKGROUND_GAMMA_UNIQUE:
-                     g = png_reciprocal(png_ptr->background_gamma);
-                     gs = png_reciprocal2(png_ptr->background_gamma,
-                         png_ptr->screen_gamma);
-                     break;
-                  default:
-                     g = PNG_FP_1;    /* back_1 */
-                     gs = PNG_FP_1;   /* back */
-                     break;
-               }
-
-               if (png_gamma_significant(gs) != 0)
-               {
-                  back.red = png_gamma_8bit_correct(png_ptr->background.red,
-                      gs);
-                  back.green = png_gamma_8bit_correct(png_ptr->background.green,
-                      gs);
-                  back.blue = png_gamma_8bit_correct(png_ptr->background.blue,
-                      gs);
-               }
-
-               else
-               {
-                  back.red   = (png_byte)png_ptr->background.red;
-                  back.green = (png_byte)png_ptr->background.green;
-                  back.blue  = (png_byte)png_ptr->background.blue;
-               }
-
-               if (png_gamma_significant(g) != 0)
-               {
-                  back_1.red = png_gamma_8bit_correct(png_ptr->background.red,
-                      g);
-                  back_1.green = png_gamma_8bit_correct(
-                      png_ptr->background.green, g);
-                  back_1.blue = png_gamma_8bit_correct(png_ptr->background.blue,
-                      g);
-               }
-
-               else
-               {
-                  back_1.red   = (png_byte)png_ptr->background.red;
-                  back_1.green = (png_byte)png_ptr->background.green;
-                  back_1.blue  = (png_byte)png_ptr->background.blue;
-               }
-            }
-
-            for (i = 0; i < num_palette; i++)
-            {
-               if (i < (int)png_ptr->num_trans &&
-                   png_ptr->trans_alpha[i] != 0xff)
-               {
-                  if (png_ptr->trans_alpha[i] == 0)
-                  {
-                     palette[i] = back;
-                  }
-                  else /* if (png_ptr->trans_alpha[i] != 0xff) */
-                  {
-                     png_byte v, w;
-
-                     v = png_ptr->gamma_to_1[palette[i].red];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.red);
-                     palette[i].red = png_ptr->gamma_from_1[w];
-
-                     v = png_ptr->gamma_to_1[palette[i].green];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.green);
-                     palette[i].green = png_ptr->gamma_from_1[w];
-
-                     v = png_ptr->gamma_to_1[palette[i].blue];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue);
-                     palette[i].blue = png_ptr->gamma_from_1[w];
-                  }
-               }
-               else
-               {
-                  palette[i].red = png_ptr->gamma_table[palette[i].red];
-                  palette[i].green = png_ptr->gamma_table[palette[i].green];
-                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];
-               }
-            }
-
-            /* Prevent the transformations being done again.
-             *
-             * NOTE: this is highly dubious; it removes the transformations in
-             * place.  This seems inconsistent with the general treatment of the
-             * transformations elsewhere.
-             */
-            png_ptr->transformations &= ~(PNG_COMPOSE | PNG_GAMMA);
-         } /* color_type == PNG_COLOR_TYPE_PALETTE */
-
-         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
-         else /* color_type != PNG_COLOR_TYPE_PALETTE */
-         {
-            int gs_sig, g_sig;
-            png_fixed_point g = PNG_FP_1;  /* Correction to linear */
-            png_fixed_point gs = PNG_FP_1; /* Correction to screen */
-
-            switch (png_ptr->background_gamma_type)
-            {
-               case PNG_BACKGROUND_GAMMA_SCREEN:
-                  g = png_ptr->screen_gamma;
-                  /* gs = PNG_FP_1; */
-                  break;
-
-               case PNG_BACKGROUND_GAMMA_FILE:
-                  g = png_reciprocal(png_ptr->colorspace.gamma);
-                  gs = png_reciprocal2(png_ptr->colorspace.gamma,
-                      png_ptr->screen_gamma);
-                  break;
-
-               case PNG_BACKGROUND_GAMMA_UNIQUE:
-                  g = png_reciprocal(png_ptr->background_gamma);
-                  gs = png_reciprocal2(png_ptr->background_gamma,
-                      png_ptr->screen_gamma);
-                  break;
-
-               default:
-                  png_error(png_ptr, "invalid background gamma type");
-            }
-
-            g_sig = png_gamma_significant(g);
-            gs_sig = png_gamma_significant(gs);
-
-            if (g_sig != 0)
-               png_ptr->background_1.gray = png_gamma_correct(png_ptr,
-                   png_ptr->background.gray, g);
-
-            if (gs_sig != 0)
-               png_ptr->background.gray = png_gamma_correct(png_ptr,
-                   png_ptr->background.gray, gs);
-
-            if ((png_ptr->background.red != png_ptr->background.green) ||
-                (png_ptr->background.red != png_ptr->background.blue) ||
-                (png_ptr->background.red != png_ptr->background.gray))
-            {
-               /* RGB or RGBA with color background */
-               if (g_sig != 0)
-               {
-                  png_ptr->background_1.red = png_gamma_correct(png_ptr,
-                      png_ptr->background.red, g);
-
-                  png_ptr->background_1.green = png_gamma_correct(png_ptr,
-                      png_ptr->background.green, g);
-
-                  png_ptr->background_1.blue = png_gamma_correct(png_ptr,
-                      png_ptr->background.blue, g);
-               }
-
-               if (gs_sig != 0)
-               {
-                  png_ptr->background.red = png_gamma_correct(png_ptr,
-                      png_ptr->background.red, gs);
-
-                  png_ptr->background.green = png_gamma_correct(png_ptr,
-                      png_ptr->background.green, gs);
-
-                  png_ptr->background.blue = png_gamma_correct(png_ptr,
-                      png_ptr->background.blue, gs);
-               }
-            }
-
-            else
-            {
-               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */
-               png_ptr->background_1.red = png_ptr->background_1.green
-                   = png_ptr->background_1.blue = png_ptr->background_1.gray;
-
-               png_ptr->background.red = png_ptr->background.green
-                   = png_ptr->background.blue = png_ptr->background.gray;
-            }
-
-            /* The background is now in screen gamma: */
-            png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_SCREEN;
-         } /* color_type != PNG_COLOR_TYPE_PALETTE */
-      }/* png_ptr->transformations & PNG_BACKGROUND */
-
-      else
-      /* Transformation does not include PNG_BACKGROUND */
-#endif /* READ_BACKGROUND */
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-         /* RGB_TO_GRAY needs to have non-gamma-corrected values! */
-         && ((png_ptr->transformations & PNG_EXPAND) == 0 ||
-         (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)
-#endif
-         )
-      {
-         png_colorp palette = png_ptr->palette;
-         int num_palette = png_ptr->num_palette;
-         int i;
-
-         /* NOTE: there are other transformations that should probably be in
-          * here too.
-          */
-         for (i = 0; i < num_palette; i++)
-         {
-            palette[i].red = png_ptr->gamma_table[palette[i].red];
-            palette[i].green = png_ptr->gamma_table[palette[i].green];
-            palette[i].blue = png_ptr->gamma_table[palette[i].blue];
-         }
-
-         /* Done the gamma correction. */
-         png_ptr->transformations &= ~PNG_GAMMA;
-      } /* color_type == PALETTE && !PNG_BACKGROUND transformation */
-   }
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   else
-#endif
-#endif /* READ_GAMMA */
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   /* No GAMMA transformation (see the hanging else 4 lines above) */
-   if ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
-   {
-      int i;
-      int istop = (int)png_ptr->num_trans;
-      png_color back;
-      png_colorp palette = png_ptr->palette;
-
-      back.red   = (png_byte)png_ptr->background.red;
-      back.green = (png_byte)png_ptr->background.green;
-      back.blue  = (png_byte)png_ptr->background.blue;
-
-      for (i = 0; i < istop; i++)
-      {
-         if (png_ptr->trans_alpha[i] == 0)
-         {
-            palette[i] = back;
-         }
-
-         else if (png_ptr->trans_alpha[i] != 0xff)
-         {
-            /* The png_composite() macro is defined in png.h */
-            png_composite(palette[i].red, palette[i].red,
-                png_ptr->trans_alpha[i], back.red);
-
-            png_composite(palette[i].green, palette[i].green,
-                png_ptr->trans_alpha[i], back.green);
-
-            png_composite(palette[i].blue, palette[i].blue,
-                png_ptr->trans_alpha[i], back.blue);
-         }
-      }
-
-      png_ptr->transformations &= ~PNG_COMPOSE;
-   }
-#endif /* READ_BACKGROUND */
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   if ((png_ptr->transformations & PNG_SHIFT) != 0 &&
-       (png_ptr->transformations & PNG_EXPAND) == 0 &&
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
-   {
-      int i;
-      int istop = png_ptr->num_palette;
-      int shift = 8 - png_ptr->sig_bit.red;
-
-      png_ptr->transformations &= ~PNG_SHIFT;
-
-      /* significant bits can be in the range 1 to 7 for a meaninful result, if
-       * the number of significant bits is 0 then no shift is done (this is an
-       * error condition which is silently ignored.)
-       */
-      if (shift > 0 && shift < 8)
-         for (i=0; i<istop; ++i)
-         {
-            int component = png_ptr->palette[i].red;
-
-            component >>= shift;
-            png_ptr->palette[i].red = (png_byte)component;
-         }
-
-      shift = 8 - png_ptr->sig_bit.green;
-      if (shift > 0 && shift < 8)
-         for (i=0; i<istop; ++i)
-         {
-            int component = png_ptr->palette[i].green;
-
-            component >>= shift;
-            png_ptr->palette[i].green = (png_byte)component;
-         }
-
-      shift = 8 - png_ptr->sig_bit.blue;
-      if (shift > 0 && shift < 8)
-         for (i=0; i<istop; ++i)
-         {
-            int component = png_ptr->palette[i].blue;
-
-            component >>= shift;
-            png_ptr->palette[i].blue = (png_byte)component;
-         }
-   }
-#endif /* READ_SHIFT */
-}
-
-/* Modify the info structure to reflect the transformations.  The
- * info should be updated so a PNG file could be written with it,
- * assuming the transformations result in valid PNG data.
- */
-void /* PRIVATE */
-png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
-{
-   png_debug(1, "in png_read_transform_info");
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if ((png_ptr->transformations & PNG_EXPAND) != 0)
-   {
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         /* This check must match what actually happens in
-          * png_do_expand_palette; if it ever checks the tRNS chunk to see if
-          * it is all opaque we must do the same (at present it does not.)
-          */
-         if (png_ptr->num_trans > 0)
-            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-
-         else
-            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-
-         info_ptr->bit_depth = 8;
-         info_ptr->num_trans = 0;
-
-         if (png_ptr->palette == NULL)
-            png_error (png_ptr, "Palette is NULL in indexed image");
-      }
-      else
-      {
-         if (png_ptr->num_trans != 0)
-         {
-            if ((png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
-               info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
-         }
-         if (info_ptr->bit_depth < 8)
-            info_ptr->bit_depth = 8;
-
-         info_ptr->num_trans = 0;
-      }
-   }
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-   /* The following is almost certainly wrong unless the background value is in
-    * the screen space!
-    */
-   if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-      info_ptr->background = png_ptr->background;
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   /* The following used to be conditional on PNG_GAMMA (prior to 1.5.4),
-    * however it seems that the code in png_init_read_transformations, which has
-    * been called before this from png_read_update_info->png_read_start_row
-    * sometimes does the gamma transform and cancels the flag.
-    *
-    * TODO: this looks wrong; the info_ptr should end up with a gamma equal to
-    * the screen_gamma value.  The following probably results in weirdness if
-    * the info_ptr is used by the app after the rows have been read.
-    */
-   info_ptr->colorspace.gamma = png_ptr->colorspace.gamma;
-#endif
-
-   if (info_ptr->bit_depth == 16)
-   {
-#  ifdef PNG_READ_16BIT_SUPPORTED
-#     ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-         if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
-            info_ptr->bit_depth = 8;
-#     endif
-
-#     ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-         if ((png_ptr->transformations & PNG_16_TO_8) != 0)
-            info_ptr->bit_depth = 8;
-#     endif
-
-#  else
-      /* No 16-bit support: force chopping 16-bit input down to 8, in this case
-       * the app program can chose if both APIs are available by setting the
-       * correct scaling to use.
-       */
-#     ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-         /* For compatibility with previous versions use the strip method by
-          * default.  This code works because if PNG_SCALE_16_TO_8 is already
-          * set the code below will do that in preference to the chop.
-          */
-         png_ptr->transformations |= PNG_16_TO_8;
-         info_ptr->bit_depth = 8;
-#     else
-
-#        ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-            png_ptr->transformations |= PNG_SCALE_16_TO_8;
-            info_ptr->bit_depth = 8;
-#        else
-
-            CONFIGURATION ERROR: you must enable at least one 16 to 8 method
-#        endif
-#    endif
-#endif /* !READ_16BIT */
-   }
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
-      info_ptr->color_type = (png_byte)(info_ptr->color_type |
-         PNG_COLOR_MASK_COLOR);
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-      info_ptr->color_type = (png_byte)(info_ptr->color_type &
-         ~PNG_COLOR_MASK_COLOR);
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
-   {
-      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
-          (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
-          png_ptr->palette_lookup != 0 && info_ptr->bit_depth == 8)
-      {
-         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-      }
-   }
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
-       info_ptr->bit_depth == 8 &&
-       info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      info_ptr->bit_depth = 16;
-   }
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) != 0 &&
-       (info_ptr->bit_depth < 8))
-      info_ptr->bit_depth = 8;
-#endif
-
-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      info_ptr->channels = 1;
-
-   else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-      info_ptr->channels = 3;
-
-   else
-      info_ptr->channels = 1;
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0)
-   {
-      info_ptr->color_type = (png_byte)(info_ptr->color_type &
-         ~PNG_COLOR_MASK_ALPHA);
-      info_ptr->num_trans = 0;
-   }
-#endif
-
-   if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-      info_ptr->channels++;
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
-   if ((png_ptr->transformations & PNG_FILLER) != 0 &&
-       (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
-       info_ptr->color_type == PNG_COLOR_TYPE_GRAY))
-   {
-      info_ptr->channels++;
-      /* If adding a true alpha channel not just filler */
-      if ((png_ptr->transformations & PNG_ADD_ALPHA) != 0)
-         info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
-   }
-#endif
-
-#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
-defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
-   {
-      if (png_ptr->user_transform_depth != 0)
-         info_ptr->bit_depth = png_ptr->user_transform_depth;
-
-      if (png_ptr->user_transform_channels != 0)
-         info_ptr->channels = png_ptr->user_transform_channels;
-   }
-#endif
-
-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
-       info_ptr->bit_depth);
-
-   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width);
-
-   /* Adding in 1.5.4: cache the above value in png_struct so that we can later
-    * check in png_rowbytes that the user buffer won't get overwritten.  Note
-    * that the field is not always set - if png_read_update_info isn't called
-    * the application has to either not do any transforms or get the calculation
-    * right itself.
-    */
-   png_ptr->info_rowbytes = info_ptr->rowbytes;
-
-#ifndef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr != NULL)
-      return;
-#endif
-}
-
-#ifdef PNG_READ_PACK_SUPPORTED
-/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
- * without changing the actual values.  Thus, if you had a row with
- * a bit depth of 1, you would end up with bytes that only contained
- * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
- * png_do_shift() after this.
- */
-static void
-png_do_unpack(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_unpack");
-
-   if (row_info->bit_depth < 8)
-   {
-      png_uint_32 i;
-      png_uint_32 row_width=row_info->width;
-
-      switch (row_info->bit_depth)
-      {
-         case 1:
-         {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = 7U - ((row_width + 7U) & 0x07);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x01);
-
-               if (shift == 7)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift++;
-
-               dp--;
-            }
-            break;
-         }
-
-         case 2:
-         {
-
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = ((3U - ((row_width + 3U) & 0x03)) << 1);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x03);
-
-               if (shift == 6)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift += 2;
-
-               dp--;
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = ((1U - ((row_width + 1U) & 0x01)) << 2);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x0f);
-
-               if (shift == 4)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift = 4;
-
-               dp--;
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-/* Reverse the effects of png_do_shift.  This routine merely shifts the
- * pixels back to their significant bits values.  Thus, if you have
- * a row of bit depth 8, but only 5 are significant, this will shift
- * the values back to 0 through 31.
- */
-static void
-png_do_unshift(png_row_infop row_info, png_bytep row,
-    png_const_color_8p sig_bits)
-{
-   int color_type;
-
-   png_debug(1, "in png_do_unshift");
-
-   /* The palette case has already been handled in the _init routine. */
-   color_type = row_info->color_type;
-
-   if (color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      int shift[4];
-      int channels = 0;
-      int bit_depth = row_info->bit_depth;
-
-      if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
-      {
-         shift[channels++] = bit_depth - sig_bits->red;
-         shift[channels++] = bit_depth - sig_bits->green;
-         shift[channels++] = bit_depth - sig_bits->blue;
-      }
-
-      else
-      {
-         shift[channels++] = bit_depth - sig_bits->gray;
-      }
-
-      if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
-      {
-         shift[channels++] = bit_depth - sig_bits->alpha;
-      }
-
-      {
-         int c, have_shift;
-
-         for (c = have_shift = 0; c < channels; ++c)
-         {
-            /* A shift of more than the bit depth is an error condition but it
-             * gets ignored here.
-             */
-            if (shift[c] <= 0 || shift[c] >= bit_depth)
-               shift[c] = 0;
-
-            else
-               have_shift = 1;
-         }
-
-         if (have_shift == 0)
-            return;
-      }
-
-      switch (bit_depth)
-      {
-         default:
-         /* Must be 1bpp gray: should not be here! */
-            /* NOTREACHED */
-            break;
-
-         case 2:
-         /* Must be 2bpp gray */
-         /* assert(channels == 1 && shift[0] == 1) */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-
-            while (bp < bp_end)
-            {
-               int b = (*bp >> 1) & 0x55;
-               *bp++ = (png_byte)b;
-            }
-            break;
-         }
-
-         case 4:
-         /* Must be 4bpp gray */
-         /* assert(channels == 1) */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-            int gray_shift = shift[0];
-            int mask =  0xf >> gray_shift;
-
-            mask |= mask << 4;
-
-            while (bp < bp_end)
-            {
-               int b = (*bp >> gray_shift) & mask;
-               *bp++ = (png_byte)b;
-            }
-            break;
-         }
-
-         case 8:
-         /* Single byte components, G, GA, RGB, RGBA */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-            int channel = 0;
-
-            while (bp < bp_end)
-            {
-               int b = *bp >> shift[channel];
-               if (++channel >= channels)
-                  channel = 0;
-               *bp++ = (png_byte)b;
-            }
-            break;
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         case 16:
-         /* Double byte components, G, GA, RGB, RGBA */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-            int channel = 0;
-
-            while (bp < bp_end)
-            {
-               int value = (bp[0] << 8) + bp[1];
-
-               value >>= shift[channel];
-               if (++channel >= channels)
-                  channel = 0;
-               *bp++ = (png_byte)(value >> 8);
-               *bp++ = (png_byte)value;
-            }
-            break;
-         }
-#endif
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-/* Scale rows of bit depth 16 down to 8 accurately */
-static void
-png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_scale_16_to_8");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep sp = row; /* source */
-      png_bytep dp = row; /* destination */
-      png_bytep ep = sp + row_info->rowbytes; /* end+1 */
-
-      while (sp < ep)
-      {
-         /* The input is an array of 16-bit components, these must be scaled to
-          * 8 bits each.  For a 16-bit value V the required value (from the PNG
-          * specification) is:
-          *
-          *    (V * 255) / 65535
-          *
-          * This reduces to round(V / 257), or floor((V + 128.5)/257)
-          *
-          * Represent V as the two byte value vhi.vlo.  Make a guess that the
-          * result is the top byte of V, vhi, then the correction to this value
-          * is:
-          *
-          *    error = floor(((V-vhi.vhi) + 128.5) / 257)
-          *          = floor(((vlo-vhi) + 128.5) / 257)
-          *
-          * This can be approximated using integer arithmetic (and a signed
-          * shift):
-          *
-          *    error = (vlo-vhi+128) >> 8;
-          *
-          * The approximate differs from the exact answer only when (vlo-vhi) is
-          * 128; it then gives a correction of +1 when the exact correction is
-          * 0.  This gives 128 errors.  The exact answer (correct for all 16-bit
-          * input values) is:
-          *
-          *    error = (vlo-vhi+128)*65535 >> 24;
-          *
-          * An alternative arithmetic calculation which also gives no errors is:
-          *
-          *    (V * 255 + 32895) >> 16
-          */
-
-         png_int_32 tmp = *sp++; /* must be signed! */
-         tmp += (((int)*sp++ - tmp + 128) * 65535) >> 24;
-         *dp++ = (png_byte)tmp;
-      }
-
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_info->width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-static void
-/* Simply discard the low byte.  This was the default behavior prior
- * to libpng-1.5.4.
- */
-png_do_chop(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_chop");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep sp = row; /* source */
-      png_bytep dp = row; /* destination */
-      png_bytep ep = sp + row_info->rowbytes; /* end+1 */
-
-      while (sp < ep)
-      {
-         *dp++ = *sp;
-         sp += 2; /* skip low byte */
-      }
-
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_info->width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-static void
-png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_read_swap_alpha");
-
-   {
-      png_uint_32 row_width = row_info->width;
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         /* This converts from RGBA to ARGB */
-         if (row_info->bit_depth == 8)
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from RRGGBBAA to AARRGGBB */
-         else
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
-         }
-#endif
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         /* This converts from GA to AG */
-         if (row_info->bit_depth == 8)
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from GGAA to AAGG */
-         else
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
-         }
-#endif
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-static void
-png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_uint_32 row_width;
-   png_debug(1, "in png_do_read_invert_alpha");
-
-   row_width = row_info->width;
-   if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         /* This inverts the alpha channel in RGBA */
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-
-/*          This does nothing:
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            We can replace it with:
-*/
-            sp-=3;
-            dp=sp;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      /* This inverts the alpha channel in RRGGBBAA */
-      else
-      {
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = (png_byte)(255 - *(--sp));
-
-/*          This does nothing:
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            We can replace it with:
-*/
-            sp-=6;
-            dp=sp;
-         }
-      }
-#endif
-   }
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         /* This inverts the alpha channel in GA */
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = *(--sp);
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else
-      {
-         /* This inverts the alpha channel in GGAA */
-         png_bytep sp  = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = (png_byte)(255 - *(--sp));
-/*
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-*/
-            sp-=2;
-            dp=sp;
-         }
-      }
-#endif
-   }
-}
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-/* Add filler channel if we have RGB color */
-static void
-png_do_read_filler(png_row_infop row_info, png_bytep row,
-    png_uint_32 filler, png_uint_32 flags)
-{
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-   png_byte hi_filler = (png_byte)(filler>>8);
-#endif
-   png_byte lo_filler = (png_byte)filler;
-
-   png_debug(1, "in png_do_read_filler");
-
-   if (
-       row_info->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
-         {
-            /* This changes the data from G to GX */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp =  sp + (png_size_t)row_width;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            row_info->channels = 2;
-            row_info->pixel_depth = 16;
-            row_info->rowbytes = row_width * 2;
-         }
-
-         else
-         {
-            /* This changes the data from G to XG */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp = sp  + (png_size_t)row_width;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 2;
-            row_info->pixel_depth = 16;
-            row_info->rowbytes = row_width * 2;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
-         {
-            /* This changes the data from GG to GGXX */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = hi_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            *(--dp) = hi_filler;
-            row_info->channels = 2;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-
-         else
-         {
-            /* This changes the data from GG to XXGG */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-               *(--dp) = hi_filler;
-            }
-            row_info->channels = 2;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-      }
-#endif
-   } /* COLOR_TYPE == GRAY */
-   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
-         {
-            /* This changes the data from RGB to RGBX */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp  + (png_size_t)row_width;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            row_info->channels = 4;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-
-         else
-         {
-            /* This changes the data from RGB to XRGB */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp + (png_size_t)row_width;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 4;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
-         {
-            /* This changes the data from RRGGBB to RRGGBBXX */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = hi_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            *(--dp) = hi_filler;
-            row_info->channels = 4;
-            row_info->pixel_depth = 64;
-            row_info->rowbytes = row_width * 8;
-         }
-
-         else
-         {
-            /* This changes the data from RRGGBB to XXRRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-               *(--dp) = hi_filler;
-            }
-
-            row_info->channels = 4;
-            row_info->pixel_depth = 64;
-            row_info->rowbytes = row_width * 8;
-         }
-      }
-#endif
-   } /* COLOR_TYPE == RGB */
-}
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand grayscale files to RGB, with or without alpha */
-static void
-png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
-{
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-
-   png_debug(1, "in png_do_gray_to_rgb");
-
-   if (row_info->bit_depth >= 8 &&
-       (row_info->color_type & PNG_COLOR_MASK_COLOR) == 0)
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This changes G to RGB */
-            png_bytep sp = row + (png_size_t)row_width - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *sp;
-               *(dp--) = *sp;
-               *(dp--) = *(sp--);
-            }
-         }
-
-         else
-         {
-            /* This changes GG to RRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-            }
-         }
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This changes GA to RGBA */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *(sp--);
-               *(dp--) = *sp;
-               *(dp--) = *sp;
-               *(dp--) = *(sp--);
-            }
-         }
-
-         else
-         {
-            /* This changes GGAA to RRGGBBAA */
-            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-            }
-         }
-      }
-      row_info->channels = (png_byte)(row_info->channels + 2);
-      row_info->color_type |= PNG_COLOR_MASK_COLOR;
-      row_info->pixel_depth = (png_byte)(row_info->channels *
-          row_info->bit_depth);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-   }
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB files to grayscale, with or without alpha
- * using the equation given in Poynton's ColorFAQ of 1998-01-04 at
- * <http://www.inforamp.net/~poynton/>  (THIS LINK IS DEAD June 2008 but
- * versions dated 1998 through November 2002 have been archived at
- * https://web.archive.org/web/20000816232553/www.inforamp.net/
- * ~poynton/notes/colour_and_gamma/ColorFAQ.txt )
- * Charles Poynton poynton at poynton.com
- *
- *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
- *
- *  which can be expressed with integers as
- *
- *     Y = (6969 * R + 23434 * G + 2365 * B)/32768
- *
- * Poynton's current link (as of January 2003 through July 2011):
- * <http://www.poynton.com/notes/colour_and_gamma/>
- * has changed the numbers slightly:
- *
- *     Y = 0.2126*R + 0.7152*G + 0.0722*B
- *
- *  which can be expressed with integers as
- *
- *     Y = (6966 * R + 23436 * G + 2366 * B)/32768
- *
- *  Historically, however, libpng uses numbers derived from the ITU-R Rec 709
- *  end point chromaticities and the D65 white point.  Depending on the
- *  precision used for the D65 white point this produces a variety of different
- *  numbers, however if the four decimal place value used in ITU-R Rec 709 is
- *  used (0.3127,0.3290) the Y calculation would be:
- *
- *     Y = (6968 * R + 23435 * G + 2366 * B)/32768
- *
- *  While this is correct the rounding results in an overflow for white, because
- *  the sum of the rounded coefficients is 32769, not 32768.  Consequently
- *  libpng uses, instead, the closest non-overflowing approximation:
- *
- *     Y = (6968 * R + 23434 * G + 2366 * B)/32768
- *
- *  Starting with libpng-1.5.5, if the image being converted has a cHRM chunk
- *  (including an sRGB chunk) then the chromaticities are used to calculate the
- *  coefficients.  See the chunk handling in pngrutil.c for more information.
- *
- *  In all cases the calculation is to be done in a linear colorspace.  If no
- *  gamma information is available to correct the encoding of the original RGB
- *  values this results in an implicit assumption that the original PNG RGB
- *  values were linear.
- *
- *  Other integer coefficents can be used via png_set_rgb_to_gray().  Because
- *  the API takes just red and green coefficients the blue coefficient is
- *  calculated to make the sum 32768.  This will result in different rounding
- *  to that used above.
- */
-static int
-png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
-
-{
-   int rgb_error = 0;
-
-   png_debug(1, "in png_do_rgb_to_gray");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 &&
-       (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
-   {
-      PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
-      PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
-      PNG_CONST png_uint_32 bc = 32768 - rc - gc;
-      PNG_CONST png_uint_32 row_width = row_info->width;
-      PNG_CONST int have_alpha =
-         (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0;
-
-      if (row_info->bit_depth == 8)
-      {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-         /* Notice that gamma to/from 1 are not necessarily inverses (if
-          * there is an overall gamma correction).  Prior to 1.5.5 this code
-          * checked the linearized values for equality; this doesn't match
-          * the documentation, the original values must be checked.
-          */
-         if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte red   = *(sp++);
-               png_byte green = *(sp++);
-               png_byte blue  = *(sp++);
-
-               if (red != green || red != blue)
-               {
-                  red = png_ptr->gamma_to_1[red];
-                  green = png_ptr->gamma_to_1[green];
-                  blue = png_ptr->gamma_to_1[blue];
-
-                  rgb_error |= 1;
-                  *(dp++) = png_ptr->gamma_from_1[
-                      (rc*red + gc*green + bc*blue + 16384)>>15];
-               }
-
-               else
-               {
-                  /* If there is no overall correction the table will not be
-                   * set.
-                   */
-                  if (png_ptr->gamma_table != NULL)
-                     red = png_ptr->gamma_table[red];
-
-                  *(dp++) = red;
-               }
-
-               if (have_alpha != 0)
-                  *(dp++) = *(sp++);
-            }
-         }
-         else
-#endif
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte red   = *(sp++);
-               png_byte green = *(sp++);
-               png_byte blue  = *(sp++);
-
-               if (red != green || red != blue)
-               {
-                  rgb_error |= 1;
-                  /* NOTE: this is the historical approach which simply
-                   * truncates the results.
-                   */
-                  *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
-               }
-
-               else
-                  *(dp++) = red;
-
-               if (have_alpha != 0)
-                  *(dp++) = *(sp++);
-            }
-         }
-      }
-
-      else /* RGB bit_depth == 16 */
-      {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-         if (png_ptr->gamma_16_to_1 != NULL && png_ptr->gamma_16_from_1 != NULL)
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_uint_16 red, green, blue, w;
-               png_byte hi,lo;
-
-               hi=*(sp)++; lo=*(sp)++; red   = (png_uint_16)((hi << 8) | (lo));
-               hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo));
-               hi=*(sp)++; lo=*(sp)++; blue  = (png_uint_16)((hi << 8) | (lo));
-
-               if (red == green && red == blue)
-               {
-                  if (png_ptr->gamma_16_table != NULL)
-                     w = png_ptr->gamma_16_table[(red & 0xff)
-                         >> png_ptr->gamma_shift][red >> 8];
-
-                  else
-                     w = red;
-               }
-
-               else
-               {
-                  png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red & 0xff)
-                      >> png_ptr->gamma_shift][red>>8];
-                  png_uint_16 green_1 =
-                      png_ptr->gamma_16_to_1[(green & 0xff) >>
-                      png_ptr->gamma_shift][green>>8];
-                  png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue & 0xff)
-                      >> png_ptr->gamma_shift][blue>>8];
-                  png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
-                      + bc*blue_1 + 16384)>>15);
-                  w = png_ptr->gamma_16_from_1[(gray16 & 0xff) >>
-                      png_ptr->gamma_shift][gray16 >> 8];
-                  rgb_error |= 1;
-               }
-
-               *(dp++) = (png_byte)((w>>8) & 0xff);
-               *(dp++) = (png_byte)(w & 0xff);
-
-               if (have_alpha != 0)
-               {
-                  *(dp++) = *(sp++);
-                  *(dp++) = *(sp++);
-               }
-            }
-         }
-         else
-#endif
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_uint_16 red, green, blue, gray16;
-               png_byte hi,lo;
-
-               hi=*(sp)++; lo=*(sp)++; red   = (png_uint_16)((hi << 8) | (lo));
-               hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo));
-               hi=*(sp)++; lo=*(sp)++; blue  = (png_uint_16)((hi << 8) | (lo));
-
-               if (red != green || red != blue)
-                  rgb_error |= 1;
-
-               /* From 1.5.5 in the 16-bit case do the accurate conversion even
-                * in the 'fast' case - this is because this is where the code
-                * ends up when handling linear 16-bit data.
-                */
-               gray16  = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >>
-                  15);
-               *(dp++) = (png_byte)((gray16 >> 8) & 0xff);
-               *(dp++) = (png_byte)(gray16 & 0xff);
-
-               if (have_alpha != 0)
-               {
-                  *(dp++) = *(sp++);
-                  *(dp++) = *(sp++);
-               }
-            }
-         }
-      }
-
-      row_info->channels = (png_byte)(row_info->channels - 2);
-      row_info->color_type = (png_byte)(row_info->color_type &
-          ~PNG_COLOR_MASK_COLOR);
-      row_info->pixel_depth = (png_byte)(row_info->channels *
-          row_info->bit_depth);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-   }
-   return rgb_error;
-}
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-/* Replace any alpha or transparency with the supplied background color.
- * "background" is already in the screen gamma, while "background_1" is
- * at a gamma of 1.0.  Paletted files have already been taken care of.
- */
-static void
-png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
-{
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   png_const_bytep gamma_table = png_ptr->gamma_table;
-   png_const_bytep gamma_from_1 = png_ptr->gamma_from_1;
-   png_const_bytep gamma_to_1 = png_ptr->gamma_to_1;
-   png_const_uint_16pp gamma_16 = png_ptr->gamma_16_table;
-   png_const_uint_16pp gamma_16_from_1 = png_ptr->gamma_16_from_1;
-   png_const_uint_16pp gamma_16_to_1 = png_ptr->gamma_16_to_1;
-   int gamma_shift = png_ptr->gamma_shift;
-   int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
-#endif
-
-   png_bytep sp;
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-   int shift;
-
-   png_debug(1, "in png_do_compose");
-
-   {
-      switch (row_info->color_type)
-      {
-         case PNG_COLOR_TYPE_GRAY:
-         {
-            switch (row_info->bit_depth)
-            {
-               case 1:
-               {
-                  sp = row;
-                  shift = 7;
-                  for (i = 0; i < row_width; i++)
-                  {
-                     if ((png_uint_16)((*sp >> shift) & 0x01)
-                        == png_ptr->trans_color.gray)
-                     {
-                        unsigned int tmp = *sp & (0x7f7f >> (7 - shift));
-                        tmp |=
-                            (unsigned int)(png_ptr->background.gray << shift);
-                        *sp = (png_byte)(tmp & 0xff);
-                     }
-
-                     if (shift == 0)
-                     {
-                        shift = 7;
-                        sp++;
-                     }
-
-                     else
-                        shift--;
-                  }
-                  break;
-               }
-
-               case 2:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-                           tmp |=
-                              (unsigned int)png_ptr->background.gray << shift;
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        else
-                        {
-                           unsigned int p = (*sp >> shift) & 0x03;
-                           unsigned int g = (gamma_table [p | (p << 2) |
-                               (p << 4) | (p << 6)] >> 6) & 0x03;
-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-                           tmp |= (unsigned int)(g << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        if (shift == 0)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
-                     }
-                  }
-
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
-                           tmp |=
-                               (unsigned int)png_ptr->background.gray << shift;
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        if (shift == 0)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
-                     }
-                  }
-                  break;
-               }
-
-               case 4:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
-                           tmp |=
-                              (unsigned int)(png_ptr->background.gray << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        else
-                        {
-                           unsigned int p = (*sp >> shift) & 0x0f;
-                           unsigned int g = (gamma_table[p | (p << 4)] >> 4) &
-                              0x0f;
-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
-                           tmp |= (unsigned int)(g << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        if (shift == 0)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
-                     }
-                  }
-
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == png_ptr->trans_color.gray)
-                        {
-                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
-                           tmp |=
-                              (unsigned int)(png_ptr->background.gray << shift);
-                           *sp = (png_byte)(tmp & 0xff);
-                        }
-
-                        if (shift == 0)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
-                     }
-                  }
-                  break;
-               }
-
-               case 8:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
-                     {
-                        if (*sp == png_ptr->trans_color.gray)
-                           *sp = (png_byte)png_ptr->background.gray;
-
-                        else
-                           *sp = gamma_table[*sp];
-                     }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
-                     {
-                        if (*sp == png_ptr->trans_color.gray)
-                           *sp = (png_byte)png_ptr->background.gray;
-                     }
-                  }
-                  break;
-               }
-
-               case 16:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_16 != NULL)
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
-                     {
-                        png_uint_16 v;
-
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == png_ptr->trans_color.gray)
-                        {
-                           /* Background is already in screen gamma */
-                           *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                           *(sp + 1) = (png_byte)(png_ptr->background.gray
-                                & 0xff);
-                        }
-
-                        else
-                        {
-                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                           *sp = (png_byte)((v >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(v & 0xff);
-                        }
-                     }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
-                     {
-                        png_uint_16 v;
-
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == png_ptr->trans_color.gray)
-                        {
-                           *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                           *(sp + 1) = (png_byte)(png_ptr->background.gray
-                                & 0xff);
-                        }
-                     }
-                  }
-                  break;
-               }
-
-               default:
-                  break;
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_table != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
-                  {
-                     if (*sp == png_ptr->trans_color.red &&
-                         *(sp + 1) == png_ptr->trans_color.green &&
-                         *(sp + 2) == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-
-                     else
-                     {
-                        *sp = gamma_table[*sp];
-                        *(sp + 1) = gamma_table[*(sp + 1)];
-                        *(sp + 2) = gamma_table[*(sp + 2)];
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
-                  {
-                     if (*sp == png_ptr->trans_color.red &&
-                         *(sp + 1) == png_ptr->trans_color.green &&
-                         *(sp + 2) == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-                  }
-               }
-            }
-            else /* if (row_info->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
-                  {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == png_ptr->trans_color.red &&
-                         g == png_ptr->trans_color.green &&
-                         b == png_ptr->trans_color.blue)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
-                  {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == png_ptr->trans_color.red &&
-                         g == png_ptr->trans_color.green &&
-                         b == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 2)
-                  {
-                     png_uint_16 a = *(sp + 1);
-
-                     if (a == 0xff)
-                        *sp = gamma_table[*sp];
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)png_ptr->background.gray;
-                     }
-
-                     else
-                     {
-                        png_byte v, w;
-
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, png_ptr->background_1.gray);
-                        if (optimize == 0)
-                           w = gamma_from_1[w];
-                        *sp = w;
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 2)
-                  {
-                     png_byte a = *(sp + 1);
-
-                     if (a == 0)
-                        *sp = (png_byte)png_ptr->background.gray;
-
-                     else if (a < 0xff)
-                        png_composite(*sp, *sp, a, png_ptr->background.gray);
-                  }
-               }
-            }
-            else /* if (png_ptr->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
-
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 g, v, w;
-
-                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(v, g, a, png_ptr->background_1.gray);
-                        if (optimize != 0)
-                           w = v;
-                        else
-                           w = gamma_16_from_1[(v & 0xff) >>
-                               gamma_shift][v >> 8];
-                        *sp = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(w & 0xff);
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)((png_ptr->background.gray >> 8)
-                                & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                     }
-
-                     else if (a < 0xffff)
-                     {
-                        png_uint_16 g, v;
-
-                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_composite_16(v, g, a, png_ptr->background.gray);
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_byte a = *(sp + 3);
-
-                     if (a == 0xff)
-                     {
-                        *sp = gamma_table[*sp];
-                        *(sp + 1) = gamma_table[*(sp + 1)];
-                        *(sp + 2) = gamma_table[*(sp + 2)];
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-
-                     else
-                     {
-                        png_byte v, w;
-
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, png_ptr->background_1.red);
-                        if (optimize == 0) w = gamma_from_1[w];
-                        *sp = w;
-
-                        v = gamma_to_1[*(sp + 1)];
-                        png_composite(w, v, a, png_ptr->background_1.green);
-                        if (optimize == 0) w = gamma_from_1[w];
-                        *(sp + 1) = w;
-
-                        v = gamma_to_1[*(sp + 2)];
-                        png_composite(w, v, a, png_ptr->background_1.blue);
-                        if (optimize == 0) w = gamma_from_1[w];
-                        *(sp + 2) = w;
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_byte a = *(sp + 3);
-
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-
-                     else if (a < 0xff)
-                     {
-                        png_composite(*sp, *sp, a, png_ptr->background.red);
-
-                        png_composite(*(sp + 1), *(sp + 1), a,
-                            png_ptr->background.green);
-
-                        png_composite(*(sp + 2), *(sp + 2), a,
-                            png_ptr->background.blue);
-                     }
-                  }
-               }
-            }
-            else /* if (row_info->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 8)
-                  {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
-
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
-
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 v, w;
-
-                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(w, v, a, png_ptr->background_1.red);
-                        if (optimize == 0)
-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
-                                8];
-                        *sp = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(w & 0xff);
-
-                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        png_composite_16(w, v, a, png_ptr->background_1.green);
-                        if (optimize == 0)
-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
-                                8];
-
-                        *(sp + 2) = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(w & 0xff);
-
-                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        png_composite_16(w, v, a, png_ptr->background_1.blue);
-                        if (optimize == 0)
-                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
-                                8];
-
-                        *(sp + 4) = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(w & 0xff);
-                     }
-                  }
-               }
-
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 8)
-                  {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
-
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8)
-                                & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green
-                                & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8)
-                                & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-
-                     else if (a < 0xffff)
-                     {
-                        png_uint_16 v;
-
-                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                            + *(sp + 3));
-                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                            + *(sp + 5));
-
-                        png_composite_16(v, r, a, png_ptr->background.red);
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-
-                        png_composite_16(v, g, a, png_ptr->background.green);
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        png_composite_16(v, b, a, png_ptr->background.blue);
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-   }
-}
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* Gamma correct the image, avoiding the alpha channel.  Make sure
- * you do this after you deal with the transparency issue on grayscale
- * or RGB images. If your bit depth is 8, use gamma_table, if it
- * is 16, use gamma_16_table and gamma_shift.  Build these with
- * build_gamma_table().
- */
-static void
-png_do_gamma(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
-{
-   png_const_bytep gamma_table = png_ptr->gamma_table;
-   png_const_uint_16pp gamma_16_table = png_ptr->gamma_16_table;
-   int gamma_shift = png_ptr->gamma_shift;
-
-   png_bytep sp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_gamma");
-
-   if (((row_info->bit_depth <= 8 && gamma_table != NULL) ||
-       (row_info->bit_depth == 16 && gamma_16_table != NULL)))
-   {
-      switch (row_info->color_type)
-      {
-         case PNG_COLOR_TYPE_RGB:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-                  *sp = gamma_table[*sp];
-                  sp++;
-                  *sp = gamma_table[*sp];
-                  sp++;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  sp++;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 4;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp += 2;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 4;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY:
-         {
-            if (row_info->bit_depth == 2)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i += 4)
-               {
-                  int a = *sp & 0xc0;
-                  int b = *sp & 0x30;
-                  int c = *sp & 0x0c;
-                  int d = *sp & 0x03;
-
-                  *sp = (png_byte)(
-                      ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|
-                      ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
-                      ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
-                      ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));
-                  sp++;
-               }
-            }
-
-            if (row_info->bit_depth == 4)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i += 2)
-               {
-                  int msb = *sp & 0xf0;
-                  int lsb = *sp & 0x0f;
-
-                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)
-                      | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));
-                  sp++;
-               }
-            }
-
-            else if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-               }
-            }
-
-            else if (row_info->bit_depth == 16)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-               }
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-/* Encode the alpha channel to the output gamma (the input channel is always
- * linear.)  Called only with color types that have an alpha channel.  Needs the
- * from_1 tables.
- */
-static void
-png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
-{
-   png_uint_32 row_width = row_info->width;
-
-   png_debug(1, "in png_do_encode_alpha");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         PNG_CONST png_bytep table = png_ptr->gamma_from_1;
-
-         if (table != NULL)
-         {
-            PNG_CONST int step =
-               (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2;
-
-            /* The alpha channel is the last component: */
-            row += step - 1;
-
-            for (; row_width > 0; --row_width, row += step)
-               *row = table[*row];
-
-            return;
-         }
-      }
-
-      else if (row_info->bit_depth == 16)
-      {
-         PNG_CONST png_uint_16pp table = png_ptr->gamma_16_from_1;
-         PNG_CONST int gamma_shift = png_ptr->gamma_shift;
-
-         if (table != NULL)
-         {
-            PNG_CONST int step =
-               (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4;
-
-            /* The alpha channel is the last component: */
-            row += step - 2;
-
-            for (; row_width > 0; --row_width, row += step)
-            {
-               png_uint_16 v;
-
-               v = table[*(row + 1) >> gamma_shift][*row];
-               *row = (png_byte)((v >> 8) & 0xff);
-               *(row + 1) = (png_byte)(v & 0xff);
-            }
-
-            return;
-         }
-      }
-   }
-
-   /* Only get to here if called with a weird row_info; no harm has been done,
-    * so just issue a warning.
-    */
-   png_warning(png_ptr, "png_do_encode_alpha: unexpected call");
-}
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expands a palette row to an RGB or RGBA row depending
- * upon whether you supply trans and num_trans.
- */
-static void
-png_do_expand_palette(png_row_infop row_info, png_bytep row,
-    png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
-{
-   int shift, value;
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_expand_palette");
-
-   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (row_info->bit_depth < 8)
-      {
-         switch (row_info->bit_depth)
-         {
-            case 1:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 3);
-               dp = row + (png_size_t)row_width - 1;
-               shift = 7 - (int)((row_width + 7) & 0x07);
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((*sp >> shift) & 0x01)
-                     *dp = 1;
-
-                  else
-                     *dp = 0;
-
-                  if (shift == 7)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift++;
-
-                  dp--;
-               }
-               break;
-            }
-
-            case 2:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 2);
-               dp = row + (png_size_t)row_width - 1;
-               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-               for (i = 0; i < row_width; i++)
-               {
-                  value = (*sp >> shift) & 0x03;
-                  *dp = (png_byte)value;
-                  if (shift == 6)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift += 2;
-
-                  dp--;
-               }
-               break;
-            }
-
-            case 4:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 1);
-               dp = row + (png_size_t)row_width - 1;
-               shift = (int)((row_width & 0x01) << 2);
-               for (i = 0; i < row_width; i++)
-               {
-                  value = (*sp >> shift) & 0x0f;
-                  *dp = (png_byte)value;
-                  if (shift == 4)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift += 4;
-
-                  dp--;
-               }
-               break;
-            }
-
-            default:
-               break;
-         }
-         row_info->bit_depth = 8;
-         row_info->pixel_depth = 8;
-         row_info->rowbytes = row_width;
-      }
-
-      if (row_info->bit_depth == 8)
-      {
-         {
-            if (num_trans > 0)
-            {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + ((png_size_t)row_width << 2) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((int)(*sp) >= num_trans)
-                     *dp-- = 0xff;
-
-                  else
-                     *dp-- = trans_alpha[*sp];
-
-                  *dp-- = palette[*sp].blue;
-                  *dp-- = palette[*sp].green;
-                  *dp-- = palette[*sp].red;
-                  sp--;
-               }
-               row_info->bit_depth = 8;
-               row_info->pixel_depth = 32;
-               row_info->rowbytes = row_width * 4;
-               row_info->color_type = 6;
-               row_info->channels = 4;
-            }
-
-            else
-            {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width * 3) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  *dp-- = palette[*sp].blue;
-                  *dp-- = palette[*sp].green;
-                  *dp-- = palette[*sp].red;
-                  sp--;
-               }
-
-               row_info->bit_depth = 8;
-               row_info->pixel_depth = 24;
-               row_info->rowbytes = row_width * 3;
-               row_info->color_type = 2;
-               row_info->channels = 3;
-            }
-         }
-      }
-   }
-}
-
-/* If the bit depth < 8, it is expanded to 8.  Also, if the already
- * expanded transparency value is supplied, an alpha channel is built.
- */
-static void
-png_do_expand(png_row_infop row_info, png_bytep row,
-    png_const_color_16p trans_color)
-{
-   int shift, value;
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_expand");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         unsigned int gray = trans_color != NULL ? trans_color->gray : 0;
-
-         if (row_info->bit_depth < 8)
-         {
-            switch (row_info->bit_depth)
-            {
-               case 1:
-               {
-                  gray = (gray & 0x01) * 0xff;
-                  sp = row + (png_size_t)((row_width - 1) >> 3);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = 7 - (int)((row_width + 7) & 0x07);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     if ((*sp >> shift) & 0x01)
-                        *dp = 0xff;
-
-                     else
-                        *dp = 0;
-
-                     if (shift == 7)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift++;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               case 2:
-               {
-                  gray = (gray & 0x03) * 0x55;
-                  sp = row + (png_size_t)((row_width - 1) >> 2);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     value = (*sp >> shift) & 0x03;
-                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
-                        (value << 6));
-                     if (shift == 6)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift += 2;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               case 4:
-               {
-                  gray = (gray & 0x0f) * 0x11;
-                  sp = row + (png_size_t)((row_width - 1) >> 1);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     value = (*sp >> shift) & 0x0f;
-                     *dp = (png_byte)(value | (value << 4));
-                     if (shift == 4)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift = 4;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               default:
-                  break;
-            }
-
-            row_info->bit_depth = 8;
-            row_info->pixel_depth = 8;
-            row_info->rowbytes = row_width;
-         }
-
-         if (trans_color != NULL)
-         {
-            if (row_info->bit_depth == 8)
-            {
-               gray = gray & 0xff;
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + ((png_size_t)row_width << 1) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((*sp & 0xffU) == gray)
-                     *dp-- = 0;
-
-                  else
-                     *dp-- = 0xff;
-
-                  *dp-- = *sp--;
-               }
-            }
-
-            else if (row_info->bit_depth == 16)
-            {
-               unsigned int gray_high = (gray >> 8) & 0xff;
-               unsigned int gray_low = gray & 0xff;
-               sp = row + row_info->rowbytes - 1;
-               dp = row + (row_info->rowbytes << 1) - 1;
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((*(sp - 1) & 0xffU) == gray_high &&
-                      (*(sp) & 0xffU) == gray_low)
-                  {
-                     *dp-- = 0;
-                     *dp-- = 0;
-                  }
-
-                  else
-                  {
-                     *dp-- = 0xff;
-                     *dp-- = 0xff;
-                  }
-
-                  *dp-- = *sp--;
-                  *dp-- = *sp--;
-               }
-            }
-
-            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-            row_info->channels = 2;
-            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
-            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-                row_width);
-         }
-      }
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
-          trans_color != NULL)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            png_byte red = (png_byte)(trans_color->red & 0xff);
-            png_byte green = (png_byte)(trans_color->green & 0xff);
-            png_byte blue = (png_byte)(trans_color->blue & 0xff);
-            sp = row + (png_size_t)row_info->rowbytes - 1;
-            dp = row + ((png_size_t)row_width << 2) - 1;
-            for (i = 0; i < row_width; i++)
-            {
-               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
-                  *dp-- = 0;
-
-               else
-                  *dp-- = 0xff;
-
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-            }
-         }
-         else if (row_info->bit_depth == 16)
-         {
-            png_byte red_high = (png_byte)((trans_color->red >> 8) & 0xff);
-            png_byte green_high = (png_byte)((trans_color->green >> 8) & 0xff);
-            png_byte blue_high = (png_byte)((trans_color->blue >> 8) & 0xff);
-            png_byte red_low = (png_byte)(trans_color->red & 0xff);
-            png_byte green_low = (png_byte)(trans_color->green & 0xff);
-            png_byte blue_low = (png_byte)(trans_color->blue & 0xff);
-            sp = row + row_info->rowbytes - 1;
-            dp = row + ((png_size_t)row_width << 3) - 1;
-            for (i = 0; i < row_width; i++)
-            {
-               if (*(sp - 5) == red_high &&
-                   *(sp - 4) == red_low &&
-                   *(sp - 3) == green_high &&
-                   *(sp - 2) == green_low &&
-                   *(sp - 1) == blue_high &&
-                   *(sp    ) == blue_low)
-               {
-                  *dp-- = 0;
-                  *dp-- = 0;
-               }
-
-               else
-               {
-                  *dp-- = 0xff;
-                  *dp-- = 0xff;
-               }
-
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-            }
-         }
-         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-         row_info->channels = 4;
-         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* If the bit depth is 8 and the color type is not a palette type expand the
- * whole row to 16 bits.  Has no effect otherwise.
- */
-static void
-png_do_expand_16(png_row_infop row_info, png_bytep row)
-{
-   if (row_info->bit_depth == 8 &&
-      row_info->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      /* The row have a sequence of bytes containing [0..255] and we need
-       * to turn it into another row containing [0..65535], to do this we
-       * calculate:
-       *
-       *  (input / 255) * 65535
-       *
-       *  Which happens to be exactly input * 257 and this can be achieved
-       *  simply by byte replication in place (copying backwards).
-       */
-      png_byte *sp = row + row_info->rowbytes; /* source, last byte + 1 */
-      png_byte *dp = sp + row_info->rowbytes;  /* destination, end + 1 */
-      while (dp > sp)
-      {
-         dp[-2] = dp[-1] = *--sp; dp -= 2;
-      }
-
-      row_info->rowbytes *= 2;
-      row_info->bit_depth = 16;
-      row_info->pixel_depth = (png_byte)(row_info->channels * 16);
-   }
-}
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-static void
-png_do_quantize(png_row_infop row_info, png_bytep row,
-    png_const_bytep palette_lookup, png_const_bytep quantize_lookup)
-{
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_quantize");
-
-   if (row_info->bit_depth == 8)
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB && palette_lookup)
-      {
-         int r, g, b, p;
-         sp = row;
-         dp = row;
-         for (i = 0; i < row_width; i++)
-         {
-            r = *sp++;
-            g = *sp++;
-            b = *sp++;
-
-            /* This looks real messy, but the compiler will reduce
-             * it down to a reasonable formula.  For example, with
-             * 5 bits per color, we get:
-             * p = (((r >> 3) & 0x1f) << 10) |
-             *    (((g >> 3) & 0x1f) << 5) |
-             *    ((b >> 3) & 0x1f);
-             */
-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &
-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<
-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |
-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &
-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<
-                (PNG_QUANTIZE_BLUE_BITS)) |
-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &
-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));
-
-            *dp++ = palette_lookup[p];
-         }
-
-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
-         row_info->channels = 1;
-         row_info->pixel_depth = row_info->bit_depth;
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-         palette_lookup != NULL)
-      {
-         int r, g, b, p;
-         sp = row;
-         dp = row;
-         for (i = 0; i < row_width; i++)
-         {
-            r = *sp++;
-            g = *sp++;
-            b = *sp++;
-            sp++;
-
-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &
-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<
-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |
-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &
-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<
-                (PNG_QUANTIZE_BLUE_BITS)) |
-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &
-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));
-
-            *dp++ = palette_lookup[p];
-         }
-
-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
-         row_info->channels = 1;
-         row_info->pixel_depth = row_info->bit_depth;
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
-         quantize_lookup)
-      {
-         sp = row;
-
-         for (i = 0; i < row_width; i++, sp++)
-         {
-            *sp = quantize_lookup[*sp];
-         }
-      }
-   }
-}
-#endif /* READ_QUANTIZE */
-
-/* Transform the row.  The order of transformations is significant,
- * and is very touchy.  If you add a transformation, take care to
- * decide how it fits in with the other transformations here.
- */
-void /* PRIVATE */
-png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
-{
-   png_debug(1, "in png_do_read_transformations");
-
-   if (png_ptr->row_buf == NULL)
-   {
-      /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this
-       * error is incredibly rare and incredibly easy to debug without this
-       * information.
-       */
-      png_error(png_ptr, "NULL row buffer");
-   }
-
-   /* The following is debugging; prior to 1.5.4 the code was never compiled in;
-    * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro
-    * PNG_WARN_UNINITIALIZED_ROW removed.  In 1.6 the new flag is set only for
-    * all transformations, however in practice the ROW_INIT always gets done on
-    * demand, if necessary.
-    */
-   if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&
-       (png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
-   {
-      /* Application has failed to call either png_read_start_image() or
-       * png_read_update_info() after setting transforms that expand pixels.
-       * This check added to libpng-1.2.19 (but not enabled until 1.5.4).
-       */
-      png_error(png_ptr, "Uninitialized row");
-   }
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if ((png_ptr->transformations & PNG_EXPAND) != 0)
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_do_expand_palette(row_info, png_ptr->row_buf + 1,
-             png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
-      }
-
-      else
-      {
-         if (png_ptr->num_trans != 0 &&
-             (png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
-            png_do_expand(row_info, png_ptr->row_buf + 1,
-                &(png_ptr->trans_color));
-
-         else
-            png_do_expand(row_info, png_ptr->row_buf + 1,
-                NULL);
-      }
-   }
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
-       (png_ptr->transformations & PNG_COMPOSE) == 0 &&
-       (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-       row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-          0 /* at_start == false, because SWAP_ALPHA happens later */);
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-   {
-      int rgb_error =
-          png_do_rgb_to_gray(png_ptr, row_info,
-              png_ptr->row_buf + 1);
-
-      if (rgb_error != 0)
-      {
-         png_ptr->rgb_to_gray_status=1;
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_WARN)
-            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_ERR)
-            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-      }
-   }
-#endif
-
-/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
- *
- *   In most cases, the "simple transparency" should be done prior to doing
- *   gray-to-RGB, or you will have to test 3x as many bytes to check if a
- *   pixel is transparent.  You would also need to make sure that the
- *   transparency information is upgraded to RGB.
- *
- *   To summarize, the current flow is:
- *   - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
- *                                   with background "in place" if transparent,
- *                                   convert to RGB if necessary
- *   - Gray + alpha -> composite with gray background and remove alpha bytes,
- *                                   convert to RGB if necessary
- *
- *   To support RGB backgrounds for gray images we need:
- *   - Gray + simple transparency -> convert to RGB + simple transparency,
- *                                   compare 3 or 6 bytes and composite with
- *                                   background "in place" if transparent
- *                                   (3x compare/pixel compared to doing
- *                                   composite with gray bkgrnd)
- *   - Gray + alpha -> convert to RGB + alpha, composite with background and
- *                                   remove alpha bytes (3x float
- *                                   operations/pixel compared with composite
- *                                   on gray background)
- *
- *  Greg's change will do this.  The reason it wasn't done before is for
- *  performance, as this increases the per-pixel operations.  If we would check
- *  in advance if the background was gray or RGB, and position the gray-to-RGB
- *  transform appropriately, then it would save a lot of work/time.
- */
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* If gray -> RGB, do so now only if background is non-gray; else do later
-    * for performance reasons
-    */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
-       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) == 0)
-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-   if ((png_ptr->transformations & PNG_COMPOSE) != 0)
-      png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   if ((png_ptr->transformations & PNG_GAMMA) != 0 &&
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-      /* Because RGB_TO_GRAY does the gamma transform. */
-      (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0 &&
-#endif
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-      /* Because PNG_COMPOSE does the gamma transform if there is something to
-       * do (if there is an alpha channel or transparency.)
-       */
-       !((png_ptr->transformations & PNG_COMPOSE) != 0 &&
-       ((png_ptr->num_trans != 0) ||
-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)) &&
-#endif
-      /* Because png_init_read_transformations transforms the palette, unless
-       * RGB_TO_GRAY will do the transform.
-       */
-       (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
-      png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
-       (png_ptr->transformations & PNG_COMPOSE) != 0 &&
-       (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-       row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-          0 /* at_start == false, because SWAP_ALPHA happens later */);
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-   if ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
-       (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-      png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-   if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
-      png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-   /* There is no harm in doing both of these because only one has any effect,
-    * by putting the 'scale' option first if the app asks for scale (either by
-    * calling the API or in a TRANSFORM flag) this is what happens.
-    */
-   if ((png_ptr->transformations & PNG_16_TO_8) != 0)
-      png_do_chop(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
-   {
-      png_do_quantize(row_info, png_ptr->row_buf + 1,
-          png_ptr->palette_lookup, png_ptr->quantize_index);
-
-      if (row_info->rowbytes == 0)
-         png_error(png_ptr, "png_do_quantize returned rowbytes=0");
-   }
-#endif /* READ_QUANTIZE */
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   /* Do the expansion now, after all the arithmetic has been done.  Notice
-    * that previous transformations can handle the PNG_EXPAND_16 flag if this
-    * is efficient (particularly true in the case of gamma correction, where
-    * better accuracy results faster!)
-    */
-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
-      png_do_expand_16(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* NOTE: moved here in 1.5.4 (from much later in this list.) */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
-       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) != 0)
-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_INVERT_SUPPORTED
-   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
-      png_do_invert(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
-      png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   if ((png_ptr->transformations & PNG_SHIFT) != 0)
-      png_do_unshift(row_info, png_ptr->row_buf + 1,
-          &(png_ptr->shift));
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) != 0)
-      png_do_unpack(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   /* Added at libpng-1.5.10 */
-   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
-       png_ptr->num_palette_max >= 0)
-      png_do_check_palette_indexes(png_ptr, row_info);
-#endif
-
-#ifdef PNG_READ_BGR_SUPPORTED
-   if ((png_ptr->transformations & PNG_BGR) != 0)
-      png_do_bgr(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-      png_do_packswap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   if ((png_ptr->transformations & PNG_FILLER) != 0)
-      png_do_read_filler(row_info, png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->filler, png_ptr->flags);
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
-      png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-#ifdef PNG_READ_SWAP_SUPPORTED
-   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
-      png_do_swap(row_info, png_ptr->row_buf + 1);
-#endif
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
-   {
-      if (png_ptr->read_user_transform_fn != NULL)
-         (*(png_ptr->read_user_transform_fn)) /* User read transform function */
-             (png_ptr,     /* png_ptr */
-             row_info,     /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);    /* start of pixel data for row */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-      if (png_ptr->user_transform_depth != 0)
-         row_info->bit_depth = png_ptr->user_transform_depth;
-
-      if (png_ptr->user_transform_channels != 0)
-         row_info->channels = png_ptr->user_transform_channels;
-#endif
-      row_info->pixel_depth = (png_byte)(row_info->bit_depth *
-          row_info->channels);
-
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width);
-   }
-#endif
-}
-
-#endif /* READ_TRANSFORMS */
-#endif /* READ */
diff --git a/src/png/libpng/pngrutil.c b/src/png/libpng/pngrutil.c
deleted file mode 100644
index 8692933bd..000000000
--- a/src/png/libpng/pngrutil.c
+++ /dev/null
@@ -1,4661 +0,0 @@
-
-/* pngrutil.c - utilities to read a PNG file
- *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains routines that are only called from within
- * libpng itself during the course of reading an image.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-png_uint_32 PNGAPI
-png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval > PNG_UINT_31_MAX)
-      png_error(png_ptr, "PNG unsigned integer out of range");
-
-   return (uval);
-}
-
-#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
-/* The following is a variation on the above for use with the fixed
- * point values used for gAMA and cHRM.  Instead of png_error it
- * issues a warning and returns (-1) - an invalid value because both
- * gAMA and cHRM use *unsigned* integers for fixed point values.
- */
-#define PNG_FIXED_ERROR (-1)
-
-static png_fixed_point /* PRIVATE */
-png_get_fixed_point(png_structrp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval <= PNG_UINT_31_MAX)
-      return (png_fixed_point)uval; /* known to be in range */
-
-   /* The caller can turn off the warning by passing NULL. */
-   if (png_ptr != NULL)
-      png_warning(png_ptr, "PNG fixed point integer out of range");
-
-   return PNG_FIXED_ERROR;
-}
-#endif
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-/* NOTE: the read macros will obscure these definitions, so that if
- * PNG_USE_READ_MACROS is set the library will not use them internally,
- * but the APIs will still be available externally.
- *
- * The parentheses around "PNGAPI function_name" in the following three
- * functions are necessary because they allow the macros to co-exist with
- * these (unused but exported) functions.
- */
-
-/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
-png_uint_32 (PNGAPI
-png_get_uint_32)(png_const_bytep buf)
-{
-   png_uint_32 uval =
-       ((png_uint_32)(*(buf    )) << 24) +
-       ((png_uint_32)(*(buf + 1)) << 16) +
-       ((png_uint_32)(*(buf + 2)) <<  8) +
-       ((png_uint_32)(*(buf + 3))      ) ;
-
-   return uval;
-}
-
-/* Grab a signed 32-bit integer from a buffer in big-endian format.  The
- * data is stored in the PNG file in two's complement format and there
- * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore
- * the following code does a two's complement to native conversion.
- */
-png_int_32 (PNGAPI
-png_get_int_32)(png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-   if ((uval & 0x80000000) == 0) /* non-negative */
-      return (png_int_32)uval;
-
-   uval = (uval ^ 0xffffffff) + 1;  /* 2's complement: -x = ~x+1 */
-   if ((uval & 0x80000000) == 0) /* no overflow */
-      return -(png_int_32)uval;
-   /* The following has to be safe; this function only gets called on PNG data
-    * and if we get here that data is invalid.  0 is the most safe value and
-    * if not then an attacker would surely just generate a PNG with 0 instead.
-    */
-   return 0;
-}
-
-/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
-png_uint_16 (PNGAPI
-png_get_uint_16)(png_const_bytep buf)
-{
-   /* ANSI-C requires an int value to accomodate at least 16 bits so this
-    * works and allows the compiler not to worry about possible narrowing
-    * on 32-bit systems.  (Pre-ANSI systems did not make integers smaller
-    * than 16 bits either.)
-    */
-   unsigned int val =
-       ((unsigned int)(*buf) << 8) +
-       ((unsigned int)(*(buf + 1)));
-
-   return (png_uint_16)val;
-}
-
-#endif /* READ_INT_FUNCTIONS */
-
-/* Read and check the PNG file signature */
-void /* PRIVATE */
-png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
-{
-   png_size_t num_checked, num_to_check;
-
-   /* Exit if the user application does not expect a signature. */
-   if (png_ptr->sig_bytes >= 8)
-      return;
-
-   num_checked = png_ptr->sig_bytes;
-   num_to_check = 8 - num_checked;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;
-#endif
-
-   /* The signature must be serialized in a single I/O call. */
-   png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
-   png_ptr->sig_bytes = 8;
-
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
-   {
-      if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-         png_error(png_ptr, "Not a PNG file");
-      else
-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
-   }
-   if (num_checked < 3)
-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-}
-
-/* Read the chunk header (length + type name).
- * Put the type name into png_ptr->chunk_name, and return the length.
- */
-png_uint_32 /* PRIVATE */
-png_read_chunk_header(png_structrp png_ptr)
-{
-   png_byte buf[8];
-   png_uint_32 length;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;
-#endif
-
-   /* Read the length and the chunk name.
-    * This must be performed in a single I/O call.
-    */
-   png_read_data(png_ptr, buf, 8);
-   length = png_get_uint_31(png_ptr, buf);
-
-   /* Put the chunk name into png_ptr->chunk_name. */
-   png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
-
-   png_debug2(0, "Reading %lx chunk, length = %lu",
-       (unsigned long)png_ptr->chunk_name, (unsigned long)length);
-
-   /* Reset the crc and run it over the chunk name. */
-   png_reset_crc(png_ptr);
-   png_calculate_crc(png_ptr, buf + 4, 4);
-
-   /* Check to see if chunk name is valid. */
-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-
-   /* Check for too-large chunk length */
-   png_check_chunk_length(png_ptr, length);
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
-#endif
-
-   return length;
-}
-
-/* Read data, and (optionally) run it through the CRC. */
-void /* PRIVATE */
-png_crc_read(png_structrp png_ptr, png_bytep buf, png_uint_32 length)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_read_data(png_ptr, buf, length);
-   png_calculate_crc(png_ptr, buf, length);
-}
-
-/* Optionally skip data and then check the CRC.  Depending on whether we
- * are reading an ancillary or critical chunk, and how the program has set
- * things up, we may calculate the CRC on the data and print a message.
- * Returns '1' if there was a CRC error, '0' otherwise.
- */
-int /* PRIVATE */
-png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
-{
-   /* The size of the local buffer for inflate is a good guess as to a
-    * reasonable size to use for buffering reads from the application.
-    */
-   while (skip > 0)
-   {
-      png_uint_32 len;
-      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
-
-      len = (sizeof tmpbuf);
-      if (len > skip)
-         len = skip;
-      skip -= len;
-
-      png_crc_read(png_ptr, tmpbuf, len);
-   }
-
-   if (png_crc_error(png_ptr) != 0)
-   {
-      if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
-          (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
-          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
-      {
-         png_chunk_warning(png_ptr, "CRC error");
-      }
-
-      else
-         png_chunk_error(png_ptr, "CRC error");
-
-      return (1);
-   }
-
-   return (0);
-}
-
-/* Compare the CRC stored in the PNG file with that calculated by libpng from
- * the data it has read thus far.
- */
-int /* PRIVATE */
-png_crc_error(png_structrp png_ptr)
-{
-   png_byte crc_bytes[4];
-   png_uint_32 crc;
-   int need_crc = 1;
-
-   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
-         need_crc = 0;
-   }
-
-   else /* critical */
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
-         need_crc = 0;
-   }
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_CRC;
-#endif
-
-   /* The chunk CRC must be serialized in a single I/O call. */
-   png_read_data(png_ptr, crc_bytes, 4);
-
-   if (need_crc != 0)
-   {
-      crc = png_get_uint_32(crc_bytes);
-      return ((int)(crc != png_ptr->crc));
-   }
-
-   else
-      return (0);
-}
-
-#if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
-    defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\
-    defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\
-    defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED)
-/* Manage the read buffer; this simply reallocates the buffer if it is not small
- * enough (or if it is not allocated).  The routine returns a pointer to the
- * buffer; if an error occurs and 'warn' is set the routine returns NULL, else
- * it will call png_error (via png_malloc) on failure.  (warn == 2 means
- * 'silent').
- */
-static png_bytep
-png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
-{
-   png_bytep buffer = png_ptr->read_buffer;
-
-   if (buffer != NULL && new_size > png_ptr->read_buffer_size)
-   {
-      png_ptr->read_buffer = NULL;
-      png_ptr->read_buffer = NULL;
-      png_ptr->read_buffer_size = 0;
-      png_free(png_ptr, buffer);
-      buffer = NULL;
-   }
-
-   if (buffer == NULL)
-   {
-      buffer = png_voidcast(png_bytep, png_malloc_base(png_ptr, new_size));
-
-      if (buffer != NULL)
-      {
-         memset(buffer, 0, new_size); /* just in case */
-         png_ptr->read_buffer = buffer;
-         png_ptr->read_buffer_size = new_size;
-      }
-
-      else if (warn < 2) /* else silent */
-      {
-         if (warn != 0)
-             png_chunk_warning(png_ptr, "insufficient memory to read chunk");
-
-         else
-             png_chunk_error(png_ptr, "insufficient memory to read chunk");
-      }
-   }
-
-   return buffer;
-}
-#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
-
-/* png_inflate_claim: claim the zstream for some nefarious purpose that involves
- * decompression.  Returns Z_OK on success, else a zlib error code.  It checks
- * the owner but, in final release builds, just issues a warning if some other
- * chunk apparently owns the stream.  Prior to release it does a png_error.
- */
-static int
-png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
-{
-   if (png_ptr->zowner != 0)
-   {
-      char msg[64];
-
-      PNG_STRING_FROM_CHUNK(msg, png_ptr->zowner);
-      /* So the message that results is "<chunk> using zstream"; this is an
-       * internal error, but is very useful for debugging.  i18n requirements
-       * are minimal.
-       */
-      (void)png_safecat(msg, (sizeof msg), 4, " using zstream");
-#if PNG_RELEASE_BUILD
-      png_chunk_warning(png_ptr, msg);
-      png_ptr->zowner = 0;
-#else
-      png_chunk_error(png_ptr, msg);
-#endif
-   }
-
-   /* Implementation note: unlike 'png_deflate_claim' this internal function
-    * does not take the size of the data as an argument.  Some efficiency could
-    * be gained by using this when it is known *if* the zlib stream itself does
-    * not record the number; however, this is an illusion: the original writer
-    * of the PNG may have selected a lower window size, and we really must
-    * follow that because, for systems with with limited capabilities, we
-    * would otherwise reject the application's attempts to use a smaller window
-    * size (zlib doesn't have an interface to say "this or lower"!).
-    *
-    * inflateReset2 was added to zlib 1.2.4; before this the window could not be
-    * reset, therefore it is necessary to always allocate the maximum window
-    * size with earlier zlibs just in case later compressed chunks need it.
-    */
-   {
-      int ret; /* zlib return code */
-#if ZLIB_VERNUM >= 0x1240
-      int window_bits = 0;
-
-# if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW)
-      if (((png_ptr->options >> PNG_MAXIMUM_INFLATE_WINDOW) & 3) ==
-          PNG_OPTION_ON)
-      {
-         window_bits = 15;
-         png_ptr->zstream_start = 0; /* fixed window size */
-      }
-
-      else
-      {
-         png_ptr->zstream_start = 1;
-      }
-# endif
-
-#endif /* ZLIB_VERNUM >= 0x1240 */
-
-      /* Set this for safety, just in case the previous owner left pointers to
-       * memory allocations.
-       */
-      png_ptr->zstream.next_in = NULL;
-      png_ptr->zstream.avail_in = 0;
-      png_ptr->zstream.next_out = NULL;
-      png_ptr->zstream.avail_out = 0;
-
-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
-      {
-#if ZLIB_VERNUM >= 0x1240
-         ret = inflateReset2(&png_ptr->zstream, window_bits);
-#else
-         ret = inflateReset(&png_ptr->zstream);
-#endif
-      }
-
-      else
-      {
-#if ZLIB_VERNUM >= 0x1240
-         ret = inflateInit2(&png_ptr->zstream, window_bits);
-#else
-         ret = inflateInit(&png_ptr->zstream);
-#endif
-
-         if (ret == Z_OK)
-            png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
-      }
-
-#if ZLIB_VERNUM >= 0x1290 && \
-   defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32)
-      if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON)
-         /* Turn off validation of the ADLER32 checksum in IDAT chunks */
-         ret = inflateValidate(&png_ptr->zstream, 0);
-#endif
-
-      if (ret == Z_OK)
-         png_ptr->zowner = owner;
-
-      else
-         png_zstream_error(png_ptr, ret);
-
-      return ret;
-   }
-
-#ifdef window_bits
-# undef window_bits
-#endif
-}
-
-#if ZLIB_VERNUM >= 0x1240
-/* Handle the start of the inflate stream if we called inflateInit2(strm,0);
- * in this case some zlib versions skip validation of the CINFO field and, in
- * certain circumstances, libpng may end up displaying an invalid image, in
- * contrast to implementations that call zlib in the normal way (e.g. libpng
- * 1.5).
- */
-int /* PRIVATE */
-png_zlib_inflate(png_structrp png_ptr, int flush)
-{
-   if (png_ptr->zstream_start && png_ptr->zstream.avail_in > 0)
-   {
-      if ((*png_ptr->zstream.next_in >> 4) > 7)
-      {
-         png_ptr->zstream.msg = "invalid window size (libpng)";
-         return Z_DATA_ERROR;
-      }
-
-      png_ptr->zstream_start = 0;
-   }
-
-   return inflate(&png_ptr->zstream, flush);
-}
-#endif /* Zlib >= 1.2.4 */
-
-#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#if defined(PNG_READ_zTXt_SUPPORTED) || defined (PNG_READ_iTXt_SUPPORTED)
-/* png_inflate now returns zlib error codes including Z_OK and Z_STREAM_END to
- * allow the caller to do multiple calls if required.  If the 'finish' flag is
- * set Z_FINISH will be passed to the final inflate() call and Z_STREAM_END must
- * be returned or there has been a problem, otherwise Z_SYNC_FLUSH is used and
- * Z_OK or Z_STREAM_END will be returned on success.
- *
- * The input and output sizes are updated to the actual amounts of data consumed
- * or written, not the amount available (as in a z_stream).  The data pointers
- * are not changed, so the next input is (data+input_size) and the next
- * available output is (output+output_size).
- */
-static int
-png_inflate(png_structrp png_ptr, png_uint_32 owner, int finish,
-    /* INPUT: */ png_const_bytep input, png_uint_32p input_size_ptr,
-    /* OUTPUT: */ png_bytep output, png_alloc_size_t *output_size_ptr)
-{
-   if (png_ptr->zowner == owner) /* Else not claimed */
-   {
-      int ret;
-      png_alloc_size_t avail_out = *output_size_ptr;
-      png_uint_32 avail_in = *input_size_ptr;
-
-      /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it
-       * can't even necessarily handle 65536 bytes) because the type uInt is
-       * "16 bits or more".  Consequently it is necessary to chunk the input to
-       * zlib.  This code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the
-       * maximum value that can be stored in a uInt.)  It is possible to set
-       * ZLIB_IO_MAX to a lower value in pngpriv.h and this may sometimes have
-       * a performance advantage, because it reduces the amount of data accessed
-       * at each step and that may give the OS more time to page it in.
-       */
-      png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);
-      /* avail_in and avail_out are set below from 'size' */
-      png_ptr->zstream.avail_in = 0;
-      png_ptr->zstream.avail_out = 0;
-
-      /* Read directly into the output if it is available (this is set to
-       * a local buffer below if output is NULL).
-       */
-      if (output != NULL)
-         png_ptr->zstream.next_out = output;
-
-      do
-      {
-         uInt avail;
-         Byte local_buffer[PNG_INFLATE_BUF_SIZE];
-
-         /* zlib INPUT BUFFER */
-         /* The setting of 'avail_in' used to be outside the loop; by setting it
-          * inside it is possible to chunk the input to zlib and simply rely on
-          * zlib to advance the 'next_in' pointer.  This allows arbitrary
-          * amounts of data to be passed through zlib at the unavoidable cost of
-          * requiring a window save (memcpy of up to 32768 output bytes)
-          * every ZLIB_IO_MAX input bytes.
-          */
-         avail_in += png_ptr->zstream.avail_in; /* not consumed last time */
-
-         avail = ZLIB_IO_MAX;
-
-         if (avail_in < avail)
-            avail = (uInt)avail_in; /* safe: < than ZLIB_IO_MAX */
-
-         avail_in -= avail;
-         png_ptr->zstream.avail_in = avail;
-
-         /* zlib OUTPUT BUFFER */
-         avail_out += png_ptr->zstream.avail_out; /* not written last time */
-
-         avail = ZLIB_IO_MAX; /* maximum zlib can process */
-
-         if (output == NULL)
-         {
-            /* Reset the output buffer each time round if output is NULL and
-             * make available the full buffer, up to 'remaining_space'
-             */
-            png_ptr->zstream.next_out = local_buffer;
-            if ((sizeof local_buffer) < avail)
-               avail = (sizeof local_buffer);
-         }
-
-         if (avail_out < avail)
-            avail = (uInt)avail_out; /* safe: < ZLIB_IO_MAX */
-
-         png_ptr->zstream.avail_out = avail;
-         avail_out -= avail;
-
-         /* zlib inflate call */
-         /* In fact 'avail_out' may be 0 at this point, that happens at the end
-          * of the read when the final LZ end code was not passed at the end of
-          * the previous chunk of input data.  Tell zlib if we have reached the
-          * end of the output buffer.
-          */
-         ret = PNG_INFLATE(png_ptr, avail_out > 0 ? Z_NO_FLUSH :
-             (finish ? Z_FINISH : Z_SYNC_FLUSH));
-      } while (ret == Z_OK);
-
-      /* For safety kill the local buffer pointer now */
-      if (output == NULL)
-         png_ptr->zstream.next_out = NULL;
-
-      /* Claw back the 'size' and 'remaining_space' byte counts. */
-      avail_in += png_ptr->zstream.avail_in;
-      avail_out += png_ptr->zstream.avail_out;
-
-      /* Update the input and output sizes; the updated values are the amount
-       * consumed or written, effectively the inverse of what zlib uses.
-       */
-      if (avail_out > 0)
-         *output_size_ptr -= avail_out;
-
-      if (avail_in > 0)
-         *input_size_ptr -= avail_in;
-
-      /* Ensure png_ptr->zstream.msg is set (even in the success case!) */
-      png_zstream_error(png_ptr, ret);
-      return ret;
-   }
-
-   else
-   {
-      /* This is a bad internal error.  The recovery assigns to the zstream msg
-       * pointer, which is not owned by the caller, but this is safe; it's only
-       * used on errors!
-       */
-      png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");
-      return Z_STREAM_ERROR;
-   }
-}
-
-/*
- * Decompress trailing data in a chunk.  The assumption is that read_buffer
- * points at an allocated area holding the contents of a chunk with a
- * trailing compressed part.  What we get back is an allocated area
- * holding the original prefix part and an uncompressed version of the
- * trailing part (the malloc area passed in is freed).
- */
-static int
-png_decompress_chunk(png_structrp png_ptr,
-    png_uint_32 chunklength, png_uint_32 prefix_size,
-    png_alloc_size_t *newlength /* must be initialized to the maximum! */,
-    int terminate /*add a '\0' to the end of the uncompressed data*/)
-{
-   /* TODO: implement different limits for different types of chunk.
-    *
-    * The caller supplies *newlength set to the maximum length of the
-    * uncompressed data, but this routine allocates space for the prefix and
-    * maybe a '\0' terminator too.  We have to assume that 'prefix_size' is
-    * limited only by the maximum chunk size.
-    */
-   png_alloc_size_t limit = PNG_SIZE_MAX;
-
-# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-# endif
-
-   if (limit >= prefix_size + (terminate != 0))
-   {
-      int ret;
-
-      limit -= prefix_size + (terminate != 0);
-
-      if (limit < *newlength)
-         *newlength = limit;
-
-      /* Now try to claim the stream. */
-      ret = png_inflate_claim(png_ptr, png_ptr->chunk_name);
-
-      if (ret == Z_OK)
-      {
-         png_uint_32 lzsize = chunklength - prefix_size;
-
-         ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
-             /* input: */ png_ptr->read_buffer + prefix_size, &lzsize,
-             /* output: */ NULL, newlength);
-
-         if (ret == Z_STREAM_END)
-         {
-            /* Use 'inflateReset' here, not 'inflateReset2' because this
-             * preserves the previously decided window size (otherwise it would
-             * be necessary to store the previous window size.)  In practice
-             * this doesn't matter anyway, because png_inflate will call inflate
-             * with Z_FINISH in almost all cases, so the window will not be
-             * maintained.
-             */
-            if (inflateReset(&png_ptr->zstream) == Z_OK)
-            {
-               /* Because of the limit checks above we know that the new,
-                * expanded, size will fit in a size_t (let alone an
-                * png_alloc_size_t).  Use png_malloc_base here to avoid an
-                * extra OOM message.
-                */
-               png_alloc_size_t new_size = *newlength;
-               png_alloc_size_t buffer_size = prefix_size + new_size +
-                   (terminate != 0);
-               png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr,
-                   buffer_size));
-
-               if (text != NULL)
-               {
-                  memset(text, 0, buffer_size);
-
-                  ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
-                      png_ptr->read_buffer + prefix_size, &lzsize,
-                      text + prefix_size, newlength);
-
-                  if (ret == Z_STREAM_END)
-                  {
-                     if (new_size == *newlength)
-                     {
-                        if (terminate != 0)
-                           text[prefix_size + *newlength] = 0;
-
-                        if (prefix_size > 0)
-                           memcpy(text, png_ptr->read_buffer, prefix_size);
-
-                        {
-                           png_bytep old_ptr = png_ptr->read_buffer;
-
-                           png_ptr->read_buffer = text;
-                           png_ptr->read_buffer_size = buffer_size;
-                           text = old_ptr; /* freed below */
-                        }
-                     }
-
-                     else
-                     {
-                        /* The size changed on the second read, there can be no
-                         * guarantee that anything is correct at this point.
-                         * The 'msg' pointer has been set to "unexpected end of
-                         * LZ stream", which is fine, but return an error code
-                         * that the caller won't accept.
-                         */
-                        ret = PNG_UNEXPECTED_ZLIB_RETURN;
-                     }
-                  }
-
-                  else if (ret == Z_OK)
-                     ret = PNG_UNEXPECTED_ZLIB_RETURN; /* for safety */
-
-                  /* Free the text pointer (this is the old read_buffer on
-                   * success)
-                   */
-                  png_free(png_ptr, text);
-
-                  /* This really is very benign, but it's still an error because
-                   * the extra space may otherwise be used as a Trojan Horse.
-                   */
-                  if (ret == Z_STREAM_END &&
-                      chunklength - prefix_size != lzsize)
-                     png_chunk_benign_error(png_ptr, "extra compressed data");
-               }
-
-               else
-               {
-                  /* Out of memory allocating the buffer */
-                  ret = Z_MEM_ERROR;
-                  png_zstream_error(png_ptr, Z_MEM_ERROR);
-               }
-            }
-
-            else
-            {
-               /* inflateReset failed, store the error message */
-               png_zstream_error(png_ptr, ret);
-               ret = PNG_UNEXPECTED_ZLIB_RETURN;
-            }
-         }
-
-         else if (ret == Z_OK)
-            ret = PNG_UNEXPECTED_ZLIB_RETURN;
-
-         /* Release the claimed stream */
-         png_ptr->zowner = 0;
-      }
-
-      else /* the claim failed */ if (ret == Z_STREAM_END) /* impossible! */
-         ret = PNG_UNEXPECTED_ZLIB_RETURN;
-
-      return ret;
-   }
-
-   else
-   {
-      /* Application/configuration limits exceeded */
-      png_zstream_error(png_ptr, Z_MEM_ERROR);
-      return Z_MEM_ERROR;
-   }
-}
-#endif /* READ_zTXt || READ_iTXt */
-#endif /* READ_COMPRESSED_TEXT */
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-/* Perform a partial read and decompress, producing 'avail_out' bytes and
- * reading from the current chunk as required.
- */
-static int
-png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,
-    png_uint_32p chunk_bytes, png_bytep next_out, png_alloc_size_t *out_size,
-    int finish)
-{
-   if (png_ptr->zowner == png_ptr->chunk_name)
-   {
-      int ret;
-
-      /* next_in and avail_in must have been initialized by the caller. */
-      png_ptr->zstream.next_out = next_out;
-      png_ptr->zstream.avail_out = 0; /* set in the loop */
-
-      do
-      {
-         if (png_ptr->zstream.avail_in == 0)
-         {
-            if (read_size > *chunk_bytes)
-               read_size = (uInt)*chunk_bytes;
-            *chunk_bytes -= read_size;
-
-            if (read_size > 0)
-               png_crc_read(png_ptr, read_buffer, read_size);
-
-            png_ptr->zstream.next_in = read_buffer;
-            png_ptr->zstream.avail_in = read_size;
-         }
-
-         if (png_ptr->zstream.avail_out == 0)
-         {
-            uInt avail = ZLIB_IO_MAX;
-            if (avail > *out_size)
-               avail = (uInt)*out_size;
-            *out_size -= avail;
-
-            png_ptr->zstream.avail_out = avail;
-         }
-
-         /* Use Z_SYNC_FLUSH when there is no more chunk data to ensure that all
-          * the available output is produced; this allows reading of truncated
-          * streams.
-          */
-         ret = PNG_INFLATE(png_ptr, *chunk_bytes > 0 ?
-             Z_NO_FLUSH : (finish ? Z_FINISH : Z_SYNC_FLUSH));
-      }
-      while (ret == Z_OK && (*out_size > 0 || png_ptr->zstream.avail_out > 0));
-
-      *out_size += png_ptr->zstream.avail_out;
-      png_ptr->zstream.avail_out = 0; /* Should not be required, but is safe */
-
-      /* Ensure the error message pointer is always set: */
-      png_zstream_error(png_ptr, ret);
-      return ret;
-   }
-
-   else
-   {
-      png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");
-      return Z_STREAM_ERROR;
-   }
-}
-#endif /* READ_iCCP */
-
-/* Read and check the IDHR chunk */
-
-void /* PRIVATE */
-png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_byte buf[13];
-   png_uint_32 width, height;
-   int bit_depth, color_type, compression_type, filter_type;
-   int interlace_type;
-
-   png_debug(1, "in png_handle_IHDR");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) != 0)
-      png_chunk_error(png_ptr, "out of place");
-
-   /* Check the length */
-   if (length != 13)
-      png_chunk_error(png_ptr, "invalid");
-
-   png_ptr->mode |= PNG_HAVE_IHDR;
-
-   png_crc_read(png_ptr, buf, 13);
-   png_crc_finish(png_ptr, 0);
-
-   width = png_get_uint_31(png_ptr, buf);
-   height = png_get_uint_31(png_ptr, buf + 4);
-   bit_depth = buf[8];
-   color_type = buf[9];
-   compression_type = buf[10];
-   filter_type = buf[11];
-   interlace_type = buf[12];
-
-   /* Set internal variables */
-   png_ptr->width = width;
-   png_ptr->height = height;
-   png_ptr->bit_depth = (png_byte)bit_depth;
-   png_ptr->interlaced = (png_byte)interlace_type;
-   png_ptr->color_type = (png_byte)color_type;
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_ptr->filter_type = (png_byte)filter_type;
-#endif
-   png_ptr->compression_type = (png_byte)compression_type;
-
-   /* Find number of channels */
-   switch (png_ptr->color_type)
-   {
-      default: /* invalid, png_set_IHDR calls png_error */
-      case PNG_COLOR_TYPE_GRAY:
-      case PNG_COLOR_TYPE_PALETTE:
-         png_ptr->channels = 1;
-         break;
-
-      case PNG_COLOR_TYPE_RGB:
-         png_ptr->channels = 3;
-         break;
-
-      case PNG_COLOR_TYPE_GRAY_ALPHA:
-         png_ptr->channels = 2;
-         break;
-
-      case PNG_COLOR_TYPE_RGB_ALPHA:
-         png_ptr->channels = 4;
-         break;
-   }
-
-   /* Set up other useful info */
-   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * png_ptr->channels);
-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
-   png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
-   png_debug1(3, "channels = %d", png_ptr->channels);
-   png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);
-   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
-       color_type, interlace_type, compression_type, filter_type);
-}
-
-/* Read and check the palette */
-void /* PRIVATE */
-png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_color palette[PNG_MAX_PALETTE_LENGTH];
-   int max_palette_length, num, i;
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   png_colorp pal_ptr;
-#endif
-
-   png_debug(1, "in png_handle_PLTE");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   /* Moved to before the 'after IDAT' check below because otherwise duplicate
-    * PLTE chunks are potentially ignored (the spec says there shall not be more
-    * than one PLTE, the error is not treated as benign, so this check trumps
-    * the requirement that PLTE appears before IDAT.)
-    */
-   else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
-      png_chunk_error(png_ptr, "duplicate");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      /* This is benign because the non-benign error happened before, when an
-       * IDAT was encountered in a color-mapped image with no PLTE.
-       */
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   png_ptr->mode |= PNG_HAVE_PLTE;
-
-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "ignored in grayscale PNG");
-      return;
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
-   {
-      png_crc_finish(png_ptr, length);
-
-      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-         png_chunk_benign_error(png_ptr, "invalid");
-
-      else
-         png_chunk_error(png_ptr, "invalid");
-
-      return;
-   }
-
-   /* The cast is safe because 'length' is less than 3*PNG_MAX_PALETTE_LENGTH */
-   num = (int)length / 3;
-
-   /* If the palette has 256 or fewer entries but is too large for the bit
-    * depth, we don't issue an error, to preserve the behavior of previous
-    * libpng versions. We silently truncate the unused extra palette entries
-    * here.
-    */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      max_palette_length = (1 << png_ptr->bit_depth);
-   else
-      max_palette_length = PNG_MAX_PALETTE_LENGTH;
-
-   if (num > max_palette_length)
-      num = max_palette_length;
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      pal_ptr->red = buf[0];
-      pal_ptr->green = buf[1];
-      pal_ptr->blue = buf[2];
-   }
-#else
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      /* Don't depend upon png_color being any order */
-      palette[i].red = buf[0];
-      palette[i].green = buf[1];
-      palette[i].blue = buf[2];
-   }
-#endif
-
-   /* If we actually need the PLTE chunk (ie for a paletted image), we do
-    * whatever the normal CRC configuration tells us.  However, if we
-    * have an RGB image, the PLTE can be considered ancillary, so
-    * we will act as though it is.
-    */
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#endif
-   {
-      png_crc_finish(png_ptr, (png_uint_32) (length - (unsigned int)num * 3));
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   else if (png_crc_error(png_ptr) != 0)  /* Only if we have a CRC error */
-   {
-      /* If we don't want to use the data from an ancillary chunk,
-       * we have two options: an error abort, or a warning and we
-       * ignore the data in this chunk (which should be OK, since
-       * it's considered ancillary for a RGB or RGBA image).
-       *
-       * IMPLEMENTATION NOTE: this is only here because png_crc_finish uses the
-       * chunk type to determine whether to check the ancillary or the critical
-       * flags.
-       */
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0)
-      {
-         if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0)
-            return;
-
-         else
-            png_chunk_error(png_ptr, "CRC error");
-      }
-
-      /* Otherwise, we (optionally) emit a warning and use the chunk. */
-      else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0)
-         png_chunk_warning(png_ptr, "CRC error");
-   }
-#endif
-
-   /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to its
-    * own copy of the palette.  This has the side effect that when png_start_row
-    * is called (this happens after any call to png_read_update_info) the
-    * info_ptr palette gets changed.  This is extremely unexpected and
-    * confusing.
-    *
-    * Fix this by not sharing the palette in this way.
-    */
-   png_set_PLTE(png_ptr, info_ptr, palette, num);
-
-   /* The three chunks, bKGD, hIST and tRNS *must* appear after PLTE and before
-    * IDAT.  Prior to 1.6.0 this was not checked; instead the code merely
-    * checked the apparent validity of a tRNS chunk inserted before PLTE on a
-    * palette PNG.  1.6.0 attempts to rigorously follow the standard and
-    * therefore does a benign error if the erroneous condition is detected *and*
-    * cancels the tRNS if the benign error returns.  The alternative is to
-    * amend the standard since it would be rather hypocritical of the standards
-    * maintainers to ignore it.
-    */
-#ifdef PNG_READ_tRNS_SUPPORTED
-   if (png_ptr->num_trans > 0 ||
-       (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0))
-   {
-      /* Cancel this because otherwise it would be used if the transforms
-       * require it.  Don't cancel the 'valid' flag because this would prevent
-       * detection of duplicate chunks.
-       */
-      png_ptr->num_trans = 0;
-
-      if (info_ptr != NULL)
-         info_ptr->num_trans = 0;
-
-      png_chunk_benign_error(png_ptr, "tRNS must be after");
-   }
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
-      png_chunk_benign_error(png_ptr, "hIST must be after");
-#endif
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
-      png_chunk_benign_error(png_ptr, "bKGD must be after");
-#endif
-}
-
-void /* PRIVATE */
-png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_debug(1, "in png_handle_IEND");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 ||
-       (png_ptr->mode & PNG_HAVE_IDAT) == 0)
-      png_chunk_error(png_ptr, "out of place");
-
-   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
-
-   png_crc_finish(png_ptr, length);
-
-   if (length != 0)
-      png_chunk_benign_error(png_ptr, "invalid");
-
-   PNG_UNUSED(info_ptr)
-}
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-void /* PRIVATE */
-png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_fixed_point igamma;
-   png_byte buf[4];
-
-   png_debug(1, "in png_handle_gAMA");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 4)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 4);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   igamma = png_get_fixed_point(NULL, buf);
-
-   png_colorspace_set_gamma(png_ptr, &png_ptr->colorspace, igamma);
-   png_colorspace_sync(png_ptr, info_ptr);
-}
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-void /* PRIVATE */
-png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   unsigned int truelen, i;
-   png_byte sample_depth;
-   png_byte buf[4];
-
-   png_debug(1, "in png_handle_sBIT");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      truelen = 3;
-      sample_depth = 8;
-   }
-
-   else
-   {
-      truelen = png_ptr->channels;
-      sample_depth = png_ptr->bit_depth;
-   }
-
-   if (length != truelen || length > 4)
-   {
-      png_chunk_benign_error(png_ptr, "invalid");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   buf[0] = buf[1] = buf[2] = buf[3] = sample_depth;
-   png_crc_read(png_ptr, buf, truelen);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   for (i=0; i<truelen; ++i)
-   {
-      if (buf[i] == 0 || buf[i] > sample_depth)
-      {
-         png_chunk_benign_error(png_ptr, "invalid");
-         return;
-      }
-   }
-
-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-   {
-      png_ptr->sig_bit.red = buf[0];
-      png_ptr->sig_bit.green = buf[1];
-      png_ptr->sig_bit.blue = buf[2];
-      png_ptr->sig_bit.alpha = buf[3];
-   }
-
-   else
-   {
-      png_ptr->sig_bit.gray = buf[0];
-      png_ptr->sig_bit.red = buf[0];
-      png_ptr->sig_bit.green = buf[0];
-      png_ptr->sig_bit.blue = buf[0];
-      png_ptr->sig_bit.alpha = buf[1];
-   }
-
-   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
-}
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-void /* PRIVATE */
-png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_byte buf[32];
-   png_xy xy;
-
-   png_debug(1, "in png_handle_cHRM");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 32)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 32);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   xy.whitex = png_get_fixed_point(NULL, buf);
-   xy.whitey = png_get_fixed_point(NULL, buf + 4);
-   xy.redx   = png_get_fixed_point(NULL, buf + 8);
-   xy.redy   = png_get_fixed_point(NULL, buf + 12);
-   xy.greenx = png_get_fixed_point(NULL, buf + 16);
-   xy.greeny = png_get_fixed_point(NULL, buf + 20);
-   xy.bluex  = png_get_fixed_point(NULL, buf + 24);
-   xy.bluey  = png_get_fixed_point(NULL, buf + 28);
-
-   if (xy.whitex == PNG_FIXED_ERROR ||
-       xy.whitey == PNG_FIXED_ERROR ||
-       xy.redx   == PNG_FIXED_ERROR ||
-       xy.redy   == PNG_FIXED_ERROR ||
-       xy.greenx == PNG_FIXED_ERROR ||
-       xy.greeny == PNG_FIXED_ERROR ||
-       xy.bluex  == PNG_FIXED_ERROR ||
-       xy.bluey  == PNG_FIXED_ERROR)
-   {
-      png_chunk_benign_error(png_ptr, "invalid values");
-      return;
-   }
-
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
-
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0)
-   {
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-      png_colorspace_sync(png_ptr, info_ptr);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-   (void)png_colorspace_set_chromaticities(png_ptr, &png_ptr->colorspace, &xy,
-       1/*prefer cHRM values*/);
-   png_colorspace_sync(png_ptr, info_ptr);
-}
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-void /* PRIVATE */
-png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_byte intent;
-
-   png_debug(1, "in png_handle_sRGB");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 1)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_crc_read(png_ptr, &intent, 1);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
-
-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-    * this.
-    */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0)
-   {
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-      png_colorspace_sync(png_ptr, info_ptr);
-      png_chunk_benign_error(png_ptr, "too many profiles");
-      return;
-   }
-
-   (void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent);
-   png_colorspace_sync(png_ptr, info_ptr);
-}
-#endif /* READ_sRGB */
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-void /* PRIVATE */
-png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-/* Note: this does not properly handle profiles that are > 64K under DOS */
-{
-   png_const_charp errmsg = NULL; /* error message output, or no error */
-   int finished = 0; /* crc checked */
-
-   png_debug(1, "in png_handle_iCCP");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   /* Consistent with all the above colorspace handling an obviously *invalid*
-    * chunk is just ignored, so does not invalidate the color space.  An
-    * alternative is to set the 'invalid' flags at the start of this routine
-    * and only clear them in they were not set before and all the tests pass.
-    */
-
-   /* The keyword must be at least one character and there is a
-    * terminator (0) byte and the compression method byte, and the
-    * 'zlib' datastream is at least 11 bytes.
-    */
-   if (length < 14)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too short");
-      return;
-   }
-
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-    * this.
-    */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) == 0)
-   {
-      uInt read_length, keyword_length;
-      char keyword[81];
-
-      /* Find the keyword; the keyword plus separator and compression method
-       * bytes can be at most 81 characters long.
-       */
-      read_length = 81; /* maximum */
-      if (read_length > length)
-         read_length = (uInt)length;
-
-      png_crc_read(png_ptr, (png_bytep)keyword, read_length);
-      length -= read_length;
-
-      /* The minimum 'zlib' stream is assumed to be just the 2 byte header,
-       * 5 bytes minimum 'deflate' stream, and the 4 byte checksum.
-       */
-      if (length < 11)
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "too short");
-         return;
-      }
-
-      keyword_length = 0;
-      while (keyword_length < 80 && keyword_length < read_length &&
-         keyword[keyword_length] != 0)
-         ++keyword_length;
-
-      /* TODO: make the keyword checking common */
-      if (keyword_length >= 1 && keyword_length <= 79)
-      {
-         /* We only understand '0' compression - deflate - so if we get a
-          * different value we can't safely decode the chunk.
-          */
-         if (keyword_length+1 < read_length &&
-            keyword[keyword_length+1] == PNG_COMPRESSION_TYPE_BASE)
-         {
-            read_length -= keyword_length+2;
-
-            if (png_inflate_claim(png_ptr, png_iCCP) == Z_OK)
-            {
-               Byte profile_header[132]={0};
-               Byte local_buffer[PNG_INFLATE_BUF_SIZE];
-               png_alloc_size_t size = (sizeof profile_header);
-
-               png_ptr->zstream.next_in = (Bytef*)keyword + (keyword_length+2);
-               png_ptr->zstream.avail_in = read_length;
-               (void)png_inflate_read(png_ptr, local_buffer,
-                   (sizeof local_buffer), &length, profile_header, &size,
-                   0/*finish: don't, because the output is too small*/);
-
-               if (size == 0)
-               {
-                  /* We have the ICC profile header; do the basic header checks.
-                   */
-                  const png_uint_32 profile_length =
-                     png_get_uint_32(profile_header);
-
-                  if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
-                      keyword, profile_length) != 0)
-                  {
-                     /* The length is apparently ok, so we can check the 132
-                      * byte header.
-                      */
-                     if (png_icc_check_header(png_ptr, &png_ptr->colorspace,
-                         keyword, profile_length, profile_header,
-                         png_ptr->color_type) != 0)
-                     {
-                        /* Now read the tag table; a variable size buffer is
-                         * needed at this point, allocate one for the whole
-                         * profile.  The header check has already validated
-                         * that none of this stuff will overflow.
-                         */
-                        const png_uint_32 tag_count = png_get_uint_32(
-                            profile_header+128);
-                        png_bytep profile = png_read_buffer(png_ptr,
-                            profile_length, 2/*silent*/);
-
-                        if (profile != NULL)
-                        {
-                           memcpy(profile, profile_header,
-                               (sizeof profile_header));
-
-                           size = 12 * tag_count;
-
-                           (void)png_inflate_read(png_ptr, local_buffer,
-                               (sizeof local_buffer), &length,
-                               profile + (sizeof profile_header), &size, 0);
-
-                           /* Still expect a buffer error because we expect
-                            * there to be some tag data!
-                            */
-                           if (size == 0)
-                           {
-                              if (png_icc_check_tag_table(png_ptr,
-                                  &png_ptr->colorspace, keyword, profile_length,
-                                  profile) != 0)
-                              {
-                                 /* The profile has been validated for basic
-                                  * security issues, so read the whole thing in.
-                                  */
-                                 size = profile_length - (sizeof profile_header)
-                                     - 12 * tag_count;
-
-                                 (void)png_inflate_read(png_ptr, local_buffer,
-                                     (sizeof local_buffer), &length,
-                                     profile + (sizeof profile_header) +
-                                     12 * tag_count, &size, 1/*finish*/);
-
-                                 if (length > 0 && !(png_ptr->flags &
-                                     PNG_FLAG_BENIGN_ERRORS_WARN))
-                                    errmsg = "extra compressed data";
-
-                                 /* But otherwise allow extra data: */
-                                 else if (size == 0)
-                                 {
-                                    if (length > 0)
-                                    {
-                                       /* This can be handled completely, so
-                                        * keep going.
-                                        */
-                                       png_chunk_warning(png_ptr,
-                                           "extra compressed data");
-                                    }
-
-                                    png_crc_finish(png_ptr, length);
-                                    finished = 1;
-
-# if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
-                                    /* Check for a match against sRGB */
-                                    png_icc_set_sRGB(png_ptr,
-                                        &png_ptr->colorspace, profile,
-                                        png_ptr->zstream.adler);
-# endif
-
-                                    /* Steal the profile for info_ptr. */
-                                    if (info_ptr != NULL)
-                                    {
-                                       png_free_data(png_ptr, info_ptr,
-                                           PNG_FREE_ICCP, 0);
-
-                                       info_ptr->iccp_name = png_voidcast(char*,
-                                           png_malloc_base(png_ptr,
-                                           keyword_length+1));
-                                       if (info_ptr->iccp_name != NULL)
-                                       {
-                                          memcpy(info_ptr->iccp_name, keyword,
-                                              keyword_length+1);
-                                          info_ptr->iccp_proflen =
-                                              profile_length;
-                                          info_ptr->iccp_profile = profile;
-                                          png_ptr->read_buffer = NULL; /*steal*/
-                                          info_ptr->free_me |= PNG_FREE_ICCP;
-                                          info_ptr->valid |= PNG_INFO_iCCP;
-                                       }
-
-                                       else
-                                       {
-                                          png_ptr->colorspace.flags |=
-                                             PNG_COLORSPACE_INVALID;
-                                          errmsg = "out of memory";
-                                       }
-                                    }
-
-                                    /* else the profile remains in the read
-                                     * buffer which gets reused for subsequent
-                                     * chunks.
-                                     */
-
-                                    if (info_ptr != NULL)
-                                       png_colorspace_sync(png_ptr, info_ptr);
-
-                                    if (errmsg == NULL)
-                                    {
-                                       png_ptr->zowner = 0;
-                                       return;
-                                    }
-                                 }
-                                 if (errmsg == NULL)
-                                    errmsg = png_ptr->zstream.msg;
-                              }
-                              /* else png_icc_check_tag_table output an error */
-                           }
-                           else /* profile truncated */
-                              errmsg = png_ptr->zstream.msg;
-                        }
-
-                        else
-                           errmsg = "out of memory";
-                     }
-
-                     /* else png_icc_check_header output an error */
-                  }
-
-                  /* else png_icc_check_length output an error */
-               }
-
-               else /* profile truncated */
-                  errmsg = png_ptr->zstream.msg;
-
-               /* Release the stream */
-               png_ptr->zowner = 0;
-            }
-
-            else /* png_inflate_claim failed */
-               errmsg = png_ptr->zstream.msg;
-         }
-
-         else
-            errmsg = "bad compression method"; /* or missing */
-      }
-
-      else
-         errmsg = "bad keyword";
-   }
-
-   else
-      errmsg = "too many profiles";
-
-   /* Failure: the reason is in 'errmsg' */
-   if (finished == 0)
-      png_crc_finish(png_ptr, length);
-
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-   png_colorspace_sync(png_ptr, info_ptr);
-   if (errmsg != NULL) /* else already output */
-      png_chunk_benign_error(png_ptr, errmsg);
-}
-#endif /* READ_iCCP */
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-void /* PRIVATE */
-png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-{
-   png_bytep entry_start, buffer;
-   png_sPLT_t new_palette;
-   png_sPLT_entryp pp;
-   png_uint_32 data_length;
-   int entry_size, i;
-   png_uint_32 skip = 0;
-   png_uint_32 dl;
-   png_size_t max_dl;
-
-   png_debug(1, "in png_handle_sPLT");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for sPLT");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > 65535U)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too large to fit in memory");
-      return;
-   }
-#endif
-
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
-   if (buffer == NULL)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of memory");
-      return;
-   }
-
-
-   /* WARNING: this may break if size_t is less than 32 bits; it is assumed
-    * that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a
-    * potential breakage point if the types in pngconf.h aren't exactly right.
-    */
-   png_crc_read(png_ptr, buffer, length);
-
-   if (png_crc_finish(png_ptr, skip) != 0)
-      return;
-
-   buffer[length] = 0;
-
-   for (entry_start = buffer; *entry_start; entry_start++)
-      /* Empty loop to find end of name */ ;
-
-   ++entry_start;
-
-   /* A sample depth should follow the separator, and we should be on it  */
-   if (length < 2U || entry_start > buffer + (length - 2U))
-   {
-      png_warning(png_ptr, "malformed sPLT chunk");
-      return;
-   }
-
-   new_palette.depth = *entry_start++;
-   entry_size = (new_palette.depth == 8 ? 6 : 10);
-   /* This must fit in a png_uint_32 because it is derived from the original
-    * chunk data length.
-    */
-   data_length = length - (png_uint_32)(entry_start - buffer);
-
-   /* Integrity-check the data length */
-   if ((data_length % (unsigned int)entry_size) != 0)
-   {
-      png_warning(png_ptr, "sPLT chunk has bad length");
-      return;
-   }
-
-   dl = (png_uint_32)(data_length / (unsigned int)entry_size);
-   max_dl = PNG_SIZE_MAX / (sizeof (png_sPLT_entry));
-
-   if (dl > max_dl)
-   {
-      png_warning(png_ptr, "sPLT chunk too long");
-      return;
-   }
-
-   new_palette.nentries = (png_int_32)(data_length / (unsigned int)entry_size);
-
-   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
-       (png_alloc_size_t) new_palette.nentries * (sizeof (png_sPLT_entry)));
-
-   if (new_palette.entries == NULL)
-   {
-      png_warning(png_ptr, "sPLT chunk requires too much memory");
-      return;
-   }
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-      pp = new_palette.entries + i;
-
-      if (new_palette.depth == 8)
-      {
-         pp->red = *entry_start++;
-         pp->green = *entry_start++;
-         pp->blue = *entry_start++;
-         pp->alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp->red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp->green = png_get_uint_16(entry_start); entry_start += 2;
-         pp->blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#else
-   pp = new_palette.entries;
-
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-
-      if (new_palette.depth == 8)
-      {
-         pp[i].red   = *entry_start++;
-         pp[i].green = *entry_start++;
-         pp[i].blue  = *entry_start++;
-         pp[i].alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp[i].frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#endif
-
-   /* Discard all chunk data except the name and stash that */
-   new_palette.name = (png_charp)buffer;
-
-   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
-
-   png_free(png_ptr, new_palette.entries);
-}
-#endif /* READ_sPLT */
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-void /* PRIVATE */
-png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
-
-   png_debug(1, "in png_handle_tRNS");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      png_byte buf[2];
-
-      if (length != 2)
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "invalid");
-         return;
-      }
-
-      png_crc_read(png_ptr, buf, 2);
-      png_ptr->num_trans = 1;
-      png_ptr->trans_color.gray = png_get_uint_16(buf);
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      png_byte buf[6];
-
-      if (length != 6)
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "invalid");
-         return;
-      }
-
-      png_crc_read(png_ptr, buf, length);
-      png_ptr->num_trans = 1;
-      png_ptr->trans_color.red = png_get_uint_16(buf);
-      png_ptr->trans_color.green = png_get_uint_16(buf + 2);
-      png_ptr->trans_color.blue = png_get_uint_16(buf + 4);
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
-      {
-         /* TODO: is this actually an error in the ISO spec? */
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "out of place");
-         return;
-      }
-
-      if (length > (unsigned int) png_ptr->num_palette ||
-         length > (unsigned int) PNG_MAX_PALETTE_LENGTH ||
-         length == 0)
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "invalid");
-         return;
-      }
-
-      png_crc_read(png_ptr, readbuf, length);
-      png_ptr->num_trans = (png_uint_16)length;
-   }
-
-   else
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid with alpha channel");
-      return;
-   }
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-   {
-      png_ptr->num_trans = 0;
-      return;
-   }
-
-   /* TODO: this is a horrible side effect in the palette case because the
-    * png_struct ends up with a pointer to the tRNS buffer owned by the
-    * png_info.  Fix this.
-    */
-   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
-       &(png_ptr->trans_color));
-}
-#endif
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-void /* PRIVATE */
-png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   unsigned int truelen;
-   png_byte buf[6];
-   png_color_16 background;
-
-   png_debug(1, "in png_handle_bKGD");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       (png_ptr->mode & PNG_HAVE_PLTE) == 0))
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      truelen = 1;
-
-   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-      truelen = 6;
-
-   else
-      truelen = 2;
-
-   if (length != truelen)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, truelen);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   /* We convert the index value into RGB components so that we can allow
-    * arbitrary RGB values for background when we have transparency, and
-    * so it is easy to determine the RGB values of the background color
-    * from the info_ptr struct.
-    */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      background.index = buf[0];
-
-      if (info_ptr != NULL && info_ptr->num_palette != 0)
-      {
-         if (buf[0] >= info_ptr->num_palette)
-         {
-            png_chunk_benign_error(png_ptr, "invalid index");
-            return;
-         }
-
-         background.red = (png_uint_16)png_ptr->palette[buf[0]].red;
-         background.green = (png_uint_16)png_ptr->palette[buf[0]].green;
-         background.blue = (png_uint_16)png_ptr->palette[buf[0]].blue;
-      }
-
-      else
-         background.red = background.green = background.blue = 0;
-
-      background.gray = 0;
-   }
-
-   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* GRAY */
-   {
-      background.index = 0;
-      background.red =
-      background.green =
-      background.blue =
-      background.gray = png_get_uint_16(buf);
-   }
-
-   else
-   {
-      background.index = 0;
-      background.red = png_get_uint_16(buf);
-      background.green = png_get_uint_16(buf + 2);
-      background.blue = png_get_uint_16(buf + 4);
-      background.gray = 0;
-   }
-
-   png_set_bKGD(png_ptr, info_ptr, &background);
-}
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-void /* PRIVATE */
-png_handle_eXIf(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   unsigned int i;
-
-   png_debug(1, "in png_handle_eXIf");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   if (length < 2)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too short");
-      return;
-   }
-
-   else if (info_ptr == NULL || (info_ptr->valid & PNG_INFO_eXIf) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   info_ptr->free_me |= PNG_FREE_EXIF;
-
-   info_ptr->eXIf_buf = png_voidcast(png_bytep,
-             png_malloc_warn(png_ptr, length));
-
-   if (info_ptr->eXIf_buf == NULL)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of memory");
-      return;
-   }
-
-   for (i = 0; i < length; i++)
-   {
-      png_byte buf[1];
-      png_crc_read(png_ptr, buf, 1);
-      info_ptr->eXIf_buf[i] = buf[0];
-      if (i == 1 && buf[0] != 'M' && buf[0] != 'I'
-                 && info_ptr->eXIf_buf[0] != buf[0])
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");
-         png_free(png_ptr, info_ptr->eXIf_buf);
-         info_ptr->eXIf_buf = NULL;
-         return;
-      }
-   }
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf);
-
-   png_free(png_ptr, info_ptr->eXIf_buf);
-   info_ptr->eXIf_buf = NULL;
-}
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-void /* PRIVATE */
-png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   unsigned int num, i;
-   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
-
-   png_debug(1, "in png_handle_hIST");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-       (png_ptr->mode & PNG_HAVE_PLTE) == 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   num = length / 2 ;
-
-   if (num != (unsigned int) png_ptr->num_palette ||
-       num > (unsigned int) PNG_MAX_PALETTE_LENGTH)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[2];
-
-      png_crc_read(png_ptr, buf, 2);
-      readbuf[i] = png_get_uint_16(buf);
-   }
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   png_set_hIST(png_ptr, info_ptr, readbuf);
-}
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-void /* PRIVATE */
-png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_byte buf[9];
-   png_uint_32 res_x, res_y;
-   int unit_type;
-
-   png_debug(1, "in png_handle_pHYs");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 9);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   res_x = png_get_uint_32(buf);
-   res_y = png_get_uint_32(buf + 4);
-   unit_type = buf[8];
-   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
-}
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-void /* PRIVATE */
-png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_byte buf[9];
-   png_int_32 offset_x, offset_y;
-   int unit_type;
-
-   png_debug(1, "in png_handle_oFFs");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 9);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   offset_x = png_get_int_32(buf);
-   offset_y = png_get_int_32(buf + 4);
-   unit_type = buf[8];
-   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
-}
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-/* Read the pCAL chunk (described in the PNG Extensions document) */
-void /* PRIVATE */
-png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_int_32 X0, X1;
-   png_byte type, nparams;
-   png_bytep buffer, buf, units, endptr;
-   png_charpp params;
-   int i;
-
-   png_debug(1, "in png_handle_pCAL");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
-       length + 1);
-
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
-
-   if (buffer == NULL)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of memory");
-      return;
-   }
-
-   png_crc_read(png_ptr, buffer, length);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   buffer[length] = 0; /* Null terminate the last string */
-
-   png_debug(3, "Finding end of pCAL purpose string");
-   for (buf = buffer; *buf; buf++)
-      /* Empty loop */ ;
-
-   endptr = buffer + length;
-
-   /* We need to have at least 12 bytes after the purpose string
-    * in order to get the parameter information.
-    */
-   if (endptr - buf <= 12)
-   {
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
-   X0 = png_get_int_32((png_bytep)buf+1);
-   X1 = png_get_int_32((png_bytep)buf+5);
-   type = buf[9];
-   nparams = buf[10];
-   units = buf + 11;
-
-   png_debug(3, "Checking pCAL equation type and number of parameters");
-   /* Check that we have the right number of parameters for known
-    * equation types.
-    */
-   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
-       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
-       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
-       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
-   {
-      png_chunk_benign_error(png_ptr, "invalid parameter count");
-      return;
-   }
-
-   else if (type >= PNG_EQUATION_LAST)
-   {
-      png_chunk_benign_error(png_ptr, "unrecognized equation type");
-   }
-
-   for (buf = units; *buf; buf++)
-      /* Empty loop to move past the units string. */ ;
-
-   png_debug(3, "Allocating pCAL parameters array");
-
-   params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
-       nparams * (sizeof (png_charp))));
-
-   if (params == NULL)
-   {
-      png_chunk_benign_error(png_ptr, "out of memory");
-      return;
-   }
-
-   /* Get pointers to the start of each parameter string. */
-   for (i = 0; i < nparams; i++)
-   {
-      buf++; /* Skip the null string terminator from previous parameter. */
-
-      png_debug1(3, "Reading pCAL parameter %d", i);
-
-      for (params[i] = (png_charp)buf; buf <= endptr && *buf != 0; buf++)
-         /* Empty loop to move past each parameter string */ ;
-
-      /* Make sure we haven't run out of data yet */
-      if (buf > endptr)
-      {
-         png_free(png_ptr, params);
-         png_chunk_benign_error(png_ptr, "invalid data");
-         return;
-      }
-   }
-
-   png_set_pCAL(png_ptr, info_ptr, (png_charp)buffer, X0, X1, type, nparams,
-       (png_charp)units, params);
-
-   png_free(png_ptr, params);
-}
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-/* Read the sCAL chunk */
-void /* PRIVATE */
-png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_bytep buffer;
-   png_size_t i;
-   int state;
-
-   png_debug(1, "in png_handle_sCAL");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   /* Need unit type, width, \0, height: minimum 4 bytes */
-   else if (length < 4)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
-       length + 1);
-
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
-
-   if (buffer == NULL)
-   {
-      png_chunk_benign_error(png_ptr, "out of memory");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buffer, length);
-   buffer[length] = 0; /* Null terminate the last string */
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   /* Validate the unit. */
-   if (buffer[0] != 1 && buffer[0] != 2)
-   {
-      png_chunk_benign_error(png_ptr, "invalid unit");
-      return;
-   }
-
-   /* Validate the ASCII numbers, need two ASCII numbers separated by
-    * a '\0' and they need to fit exactly in the chunk data.
-    */
-   i = 1;
-   state = 0;
-
-   if (png_check_fp_number((png_const_charp)buffer, length, &state, &i) == 0 ||
-       i >= length || buffer[i++] != 0)
-      png_chunk_benign_error(png_ptr, "bad width format");
-
-   else if (PNG_FP_IS_POSITIVE(state) == 0)
-      png_chunk_benign_error(png_ptr, "non-positive width");
-
-   else
-   {
-      png_size_t heighti = i;
-
-      state = 0;
-      if (png_check_fp_number((png_const_charp)buffer, length,
-          &state, &i) == 0 || i != length)
-         png_chunk_benign_error(png_ptr, "bad height format");
-
-      else if (PNG_FP_IS_POSITIVE(state) == 0)
-         png_chunk_benign_error(png_ptr, "non-positive height");
-
-      else
-         /* This is the (only) success case. */
-         png_set_sCAL_s(png_ptr, info_ptr, buffer[0],
-             (png_charp)buffer+1, (png_charp)buffer+heighti);
-   }
-}
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-void /* PRIVATE */
-png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_byte buf[7];
-   png_time mod_time;
-
-   png_debug(1, "in png_handle_tIME");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-   if (length != 7)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 7);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   mod_time.second = buf[6];
-   mod_time.minute = buf[5];
-   mod_time.hour = buf[4];
-   mod_time.day = buf[3];
-   mod_time.month = buf[2];
-   mod_time.year = png_get_uint_16(buf);
-
-   png_set_tIME(png_ptr, info_ptr, &mod_time);
-}
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_text  text_info;
-   png_bytep buffer;
-   png_charp key;
-   png_charp text;
-   png_uint_32 skip = 0;
-
-   png_debug(1, "in png_handle_tEXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
-      }
-   }
-#endif
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > 65535U)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too large to fit in memory");
-      return;
-   }
-#endif
-
-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
-
-   if (buffer == NULL)
-   {
-      png_chunk_benign_error(png_ptr, "out of memory");
-      return;
-   }
-
-   png_crc_read(png_ptr, buffer, length);
-
-   if (png_crc_finish(png_ptr, skip) != 0)
-      return;
-
-   key = (png_charp)buffer;
-   key[length] = 0;
-
-   for (text = key; *text; text++)
-      /* Empty loop to find end of key */ ;
-
-   if (text != key + length)
-      text++;
-
-   text_info.compression = PNG_TEXT_COMPRESSION_NONE;
-   text_info.key = key;
-   text_info.lang = NULL;
-   text_info.lang_key = NULL;
-   text_info.itxt_length = 0;
-   text_info.text = text;
-   text_info.text_length = strlen(text);
-
-   if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0)
-      png_warning(png_ptr, "Insufficient memory to process text chunk");
-}
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-/* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_const_charp errmsg = NULL;
-   png_bytep       buffer;
-   png_uint_32     keyword_length;
-
-   png_debug(1, "in png_handle_zTXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
-      }
-   }
-#endif
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-   /* Note, "length" is sufficient here; we won't be adding
-    * a null terminator later.
-    */
-   buffer = png_read_buffer(png_ptr, length, 2/*silent*/);
-
-   if (buffer == NULL)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of memory");
-      return;
-   }
-
-   png_crc_read(png_ptr, buffer, length);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   /* TODO: also check that the keyword contents match the spec! */
-   for (keyword_length = 0;
-      keyword_length < length && buffer[keyword_length] != 0;
-      ++keyword_length)
-      /* Empty loop to find end of name */ ;
-
-   if (keyword_length > 79 || keyword_length < 1)
-      errmsg = "bad keyword";
-
-   /* zTXt must have some LZ data after the keyword, although it may expand to
-    * zero bytes; we need a '\0' at the end of the keyword, the compression type
-    * then the LZ data:
-    */
-   else if (keyword_length + 3 > length)
-      errmsg = "truncated";
-
-   else if (buffer[keyword_length+1] != PNG_COMPRESSION_TYPE_BASE)
-      errmsg = "unknown compression type";
-
-   else
-   {
-      png_alloc_size_t uncompressed_length = PNG_SIZE_MAX;
-
-      /* TODO: at present png_decompress_chunk imposes a single application
-       * level memory limit, this should be split to different values for iCCP
-       * and text chunks.
-       */
-      if (png_decompress_chunk(png_ptr, length, keyword_length+2,
-          &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
-      {
-         png_text text;
-
-         if (png_ptr->read_buffer == NULL)
-           errmsg="Read failure in png_handle_zTXt";
-         else
-         {
-            /* It worked; png_ptr->read_buffer now looks like a tEXt chunk
-             * except for the extra compression type byte and the fact that
-             * it isn't necessarily '\0' terminated.
-             */
-            buffer = png_ptr->read_buffer;
-            buffer[uncompressed_length+(keyword_length+2)] = 0;
-
-            text.compression = PNG_TEXT_COMPRESSION_zTXt;
-            text.key = (png_charp)buffer;
-            text.text = (png_charp)(buffer + keyword_length+2);
-            text.text_length = uncompressed_length;
-            text.itxt_length = 0;
-            text.lang = NULL;
-            text.lang_key = NULL;
-
-            if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-               errmsg = "insufficient memory";
-         }
-      }
-
-      else
-         errmsg = png_ptr->zstream.msg;
-   }
-
-   if (errmsg != NULL)
-      png_chunk_benign_error(png_ptr, errmsg);
-}
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-/* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
-{
-   png_const_charp errmsg = NULL;
-   png_bytep buffer;
-   png_uint_32 prefix_length;
-
-   png_debug(1, "in png_handle_iTXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
-      }
-   }
-#endif
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
-
-   if (buffer == NULL)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of memory");
-      return;
-   }
-
-   png_crc_read(png_ptr, buffer, length);
-
-   if (png_crc_finish(png_ptr, 0) != 0)
-      return;
-
-   /* First the keyword. */
-   for (prefix_length=0;
-      prefix_length < length && buffer[prefix_length] != 0;
-      ++prefix_length)
-      /* Empty loop */ ;
-
-   /* Perform a basic check on the keyword length here. */
-   if (prefix_length > 79 || prefix_length < 1)
-      errmsg = "bad keyword";
-
-   /* Expect keyword, compression flag, compression type, language, translated
-    * keyword (both may be empty but are 0 terminated) then the text, which may
-    * be empty.
-    */
-   else if (prefix_length + 5 > length)
-      errmsg = "truncated";
-
-   else if (buffer[prefix_length+1] == 0 ||
-      (buffer[prefix_length+1] == 1 &&
-      buffer[prefix_length+2] == PNG_COMPRESSION_TYPE_BASE))
-   {
-      int compressed = buffer[prefix_length+1] != 0;
-      png_uint_32 language_offset, translated_keyword_offset;
-      png_alloc_size_t uncompressed_length = 0;
-
-      /* Now the language tag */
-      prefix_length += 3;
-      language_offset = prefix_length;
-
-      for (; prefix_length < length && buffer[prefix_length] != 0;
-         ++prefix_length)
-         /* Empty loop */ ;
-
-      /* WARNING: the length may be invalid here, this is checked below. */
-      translated_keyword_offset = ++prefix_length;
-
-      for (; prefix_length < length && buffer[prefix_length] != 0;
-         ++prefix_length)
-         /* Empty loop */ ;
-
-      /* prefix_length should now be at the trailing '\0' of the translated
-       * keyword, but it may already be over the end.  None of this arithmetic
-       * can overflow because chunks are at most 2^31 bytes long, but on 16-bit
-       * systems the available allocation may overflow.
-       */
-      ++prefix_length;
-
-      if (compressed == 0 && prefix_length <= length)
-         uncompressed_length = length - prefix_length;
-
-      else if (compressed != 0 && prefix_length < length)
-      {
-         uncompressed_length = PNG_SIZE_MAX;
-
-         /* TODO: at present png_decompress_chunk imposes a single application
-          * level memory limit, this should be split to different values for
-          * iCCP and text chunks.
-          */
-         if (png_decompress_chunk(png_ptr, length, prefix_length,
-             &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
-            buffer = png_ptr->read_buffer;
-
-         else
-            errmsg = png_ptr->zstream.msg;
-      }
-
-      else
-         errmsg = "truncated";
-
-      if (errmsg == NULL)
-      {
-         png_text text;
-
-         buffer[uncompressed_length+prefix_length] = 0;
-
-         if (compressed == 0)
-            text.compression = PNG_ITXT_COMPRESSION_NONE;
-
-         else
-            text.compression = PNG_ITXT_COMPRESSION_zTXt;
-
-         text.key = (png_charp)buffer;
-         text.lang = (png_charp)buffer + language_offset;
-         text.lang_key = (png_charp)buffer + translated_keyword_offset;
-         text.text = (png_charp)buffer + prefix_length;
-         text.text_length = 0;
-         text.itxt_length = uncompressed_length;
-
-         if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-            errmsg = "insufficient memory";
-      }
-   }
-
-   else
-      errmsg = "bad compression info";
-
-   if (errmsg != NULL)
-      png_chunk_benign_error(png_ptr, errmsg);
-}
-#endif
-
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
-static int
-png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
-{
-   png_alloc_size_t limit = PNG_SIZE_MAX;
-
-   if (png_ptr->unknown_chunk.data != NULL)
-   {
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
-   }
-
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-
-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-#  endif
-
-   if (length <= limit)
-   {
-      PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
-      /* The following is safe because of the PNG_SIZE_MAX init above */
-      png_ptr->unknown_chunk.size = (png_size_t)length/*SAFE*/;
-      /* 'mode' is a flag array, only the bottom four bits matter here */
-      png_ptr->unknown_chunk.location = (png_byte)png_ptr->mode/*SAFE*/;
-
-      if (length == 0)
-         png_ptr->unknown_chunk.data = NULL;
-
-      else
-      {
-         /* Do a 'warn' here - it is handled below. */
-         png_ptr->unknown_chunk.data = png_voidcast(png_bytep,
-             png_malloc_warn(png_ptr, length));
-      }
-   }
-
-   if (png_ptr->unknown_chunk.data == NULL && length > 0)
-   {
-      /* This is benign because we clean up correctly */
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "unknown chunk exceeds memory limits");
-      return 0;
-   }
-
-   else
-   {
-      if (length > 0)
-         png_crc_read(png_ptr, png_ptr->unknown_chunk.data, length);
-      png_crc_finish(png_ptr, 0);
-      return 1;
-   }
-}
-#endif /* READ_UNKNOWN_CHUNKS */
-
-/* Handle an unknown, or known but disabled, chunk */
-void /* PRIVATE */
-png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
-    png_uint_32 length, int keep)
-{
-   int handled = 0; /* the chunk was handled */
-
-   png_debug(1, "in png_handle_unknown");
-
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-   /* NOTE: this code is based on the code in libpng-1.4.12 except for fixing
-    * the bug which meant that setting a non-default behavior for a specific
-    * chunk would be ignored (the default was always used unless a user
-    * callback was installed).
-    *
-    * 'keep' is the value from the png_chunk_unknown_handling, the setting for
-    * this specific chunk_name, if PNG_HANDLE_AS_UNKNOWN_SUPPORTED, if not it
-    * will always be PNG_HANDLE_CHUNK_AS_DEFAULT and it needs to be set here.
-    * This is just an optimization to avoid multiple calls to the lookup
-    * function.
-    */
-#  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#     ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-   keep = png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name);
-#     endif
-#  endif
-
-   /* One of the following methods will read the chunk or skip it (at least one
-    * of these is always defined because this is the only way to switch on
-    * PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
-    */
-#  ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-   /* The user callback takes precedence over the chunk keep value, but the
-    * keep value is still required to validate a save of a critical chunk.
-    */
-   if (png_ptr->read_user_chunk_fn != NULL)
-   {
-      if (png_cache_unknown_chunk(png_ptr, length) != 0)
-      {
-         /* Callback to user unknown chunk handler */
-         int ret = (*(png_ptr->read_user_chunk_fn))(png_ptr,
-             &png_ptr->unknown_chunk);
-
-         /* ret is:
-          * negative: An error occurred; png_chunk_error will be called.
-          *     zero: The chunk was not handled, the chunk will be discarded
-          *           unless png_set_keep_unknown_chunks has been used to set
-          *           a 'keep' behavior for this particular chunk, in which
-          *           case that will be used.  A critical chunk will cause an
-          *           error at this point unless it is to be saved.
-          * positive: The chunk was handled, libpng will ignore/discard it.
-          */
-         if (ret < 0)
-            png_chunk_error(png_ptr, "error in user chunk");
-
-         else if (ret == 0)
-         {
-            /* If the keep value is 'default' or 'never' override it, but
-             * still error out on critical chunks unless the keep value is
-             * 'always'  While this is weird it is the behavior in 1.4.12.
-             * A possible improvement would be to obey the value set for the
-             * chunk, but this would be an API change that would probably
-             * damage some applications.
-             *
-             * The png_app_warning below catches the case that matters, where
-             * the application has not set specific save or ignore for this
-             * chunk or global save or ignore.
-             */
-            if (keep < PNG_HANDLE_CHUNK_IF_SAFE)
-            {
-#              ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-               if (png_ptr->unknown_default < PNG_HANDLE_CHUNK_IF_SAFE)
-               {
-                  png_chunk_warning(png_ptr, "Saving unknown chunk:");
-                  png_app_warning(png_ptr,
-                      "forcing save of an unhandled chunk;"
-                      " please call png_set_keep_unknown_chunks");
-                      /* with keep = PNG_HANDLE_CHUNK_IF_SAFE */
-               }
-#              endif
-               keep = PNG_HANDLE_CHUNK_IF_SAFE;
-            }
-         }
-
-         else /* chunk was handled */
-         {
-            handled = 1;
-            /* Critical chunks can be safely discarded at this point. */
-            keep = PNG_HANDLE_CHUNK_NEVER;
-         }
-      }
-
-      else
-         keep = PNG_HANDLE_CHUNK_NEVER; /* insufficient memory */
-   }
-
-   else
-   /* Use the SAVE_UNKNOWN_CHUNKS code or skip the chunk */
-#  endif /* READ_USER_CHUNKS */
-
-#  ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-   {
-      /* keep is currently just the per-chunk setting, if there was no
-       * setting change it to the global default now (not that this may
-       * still be AS_DEFAULT) then obtain the cache of the chunk if required,
-       * if not simply skip the chunk.
-       */
-      if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT)
-         keep = png_ptr->unknown_default;
-
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS ||
-         (keep == PNG_HANDLE_CHUNK_IF_SAFE &&
-          PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))
-      {
-         if (png_cache_unknown_chunk(png_ptr, length) == 0)
-            keep = PNG_HANDLE_CHUNK_NEVER;
-      }
-
-      else
-         png_crc_finish(png_ptr, length);
-   }
-#  else
-#     ifndef PNG_READ_USER_CHUNKS_SUPPORTED
-#        error no method to support READ_UNKNOWN_CHUNKS
-#     endif
-
-   {
-      /* If here there is no read callback pointer set and no support is
-       * compiled in to just save the unknown chunks, so simply skip this
-       * chunk.  If 'keep' is something other than AS_DEFAULT or NEVER then
-       * the app has erroneously asked for unknown chunk saving when there
-       * is no support.
-       */
-      if (keep > PNG_HANDLE_CHUNK_NEVER)
-         png_app_error(png_ptr, "no unknown chunk support available");
-
-      png_crc_finish(png_ptr, length);
-   }
-#  endif
-
-#  ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-   /* Now store the chunk in the chunk list if appropriate, and if the limits
-    * permit it.
-    */
-   if (keep == PNG_HANDLE_CHUNK_ALWAYS ||
-      (keep == PNG_HANDLE_CHUNK_IF_SAFE &&
-       PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))
-   {
-#     ifdef PNG_USER_LIMITS_SUPPORTED
-      switch (png_ptr->user_chunk_cache_max)
-      {
-         case 2:
-            png_ptr->user_chunk_cache_max = 1;
-            png_chunk_benign_error(png_ptr, "no space in chunk cache");
-            /* FALLTHROUGH */
-         case 1:
-            /* NOTE: prior to 1.6.0 this case resulted in an unknown critical
-             * chunk being skipped, now there will be a hard error below.
-             */
-            break;
-
-         default: /* not at limit */
-            --(png_ptr->user_chunk_cache_max);
-            /* FALLTHROUGH */
-         case 0: /* no limit */
-#  endif /* USER_LIMITS */
-            /* Here when the limit isn't reached or when limits are compiled
-             * out; store the chunk.
-             */
-            png_set_unknown_chunks(png_ptr, info_ptr,
-                &png_ptr->unknown_chunk, 1);
-            handled = 1;
-#  ifdef PNG_USER_LIMITS_SUPPORTED
-            break;
-      }
-#  endif
-   }
-#  else /* no store support: the chunk must be handled by the user callback */
-   PNG_UNUSED(info_ptr)
-#  endif
-
-   /* Regardless of the error handling below the cached data (if any) can be
-    * freed now.  Notice that the data is not freed if there is a png_error, but
-    * it will be freed by destroy_read_struct.
-    */
-   if (png_ptr->unknown_chunk.data != NULL)
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-   png_ptr->unknown_chunk.data = NULL;
-
-#else /* !PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */
-   /* There is no support to read an unknown chunk, so just skip it. */
-   png_crc_finish(png_ptr, length);
-   PNG_UNUSED(info_ptr)
-   PNG_UNUSED(keep)
-#endif /* !READ_UNKNOWN_CHUNKS */
-
-   /* Check for unhandled critical chunks */
-   if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
-      png_chunk_error(png_ptr, "unhandled critical chunk");
-}
-
-/* This function is called to verify that a chunk name is valid.
- * This function can't have the "critical chunk check" incorporated
- * into it, since in the future we will need to be able to call user
- * functions to handle unknown critical chunks after we check that
- * the chunk name itself is valid.
- */
-
-/* Bit hacking: the test for an invalid byte in the 4 byte chunk name is:
- *
- * ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
- */
-
-void /* PRIVATE */
-png_check_chunk_name(png_const_structrp png_ptr, const png_uint_32 chunk_name)
-{
-   int i;
-   png_uint_32 cn=chunk_name;
-
-   png_debug(1, "in png_check_chunk_name");
-
-   for (i=1; i<=4; ++i)
-   {
-      int c = cn & 0xff;
-
-      if (c < 65 || c > 122 || (c > 90 && c < 97))
-         png_chunk_error(png_ptr, "invalid chunk type");
-
-      cn >>= 8;
-   }
-}
-
-void /* PRIVATE */
-png_check_chunk_length(png_const_structrp png_ptr, const png_uint_32 length)
-{
-   png_alloc_size_t limit = PNG_UINT_31_MAX;
-
-# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-# endif
-   if (png_ptr->chunk_name == png_IDAT)
-   {
-      png_alloc_size_t idat_limit = PNG_UINT_31_MAX;
-      size_t row_factor =
-         (png_ptr->width * png_ptr->channels * (png_ptr->bit_depth > 8? 2: 1)
-          + 1 + (png_ptr->interlaced? 6: 0));
-      if (png_ptr->height > PNG_UINT_32_MAX/row_factor)
-         idat_limit=PNG_UINT_31_MAX;
-      else
-         idat_limit = png_ptr->height * row_factor;
-      row_factor = row_factor > 32566? 32566 : row_factor;
-      idat_limit += 6 + 5*(idat_limit/row_factor+1); /* zlib+deflate overhead */
-      idat_limit=idat_limit < PNG_UINT_31_MAX? idat_limit : PNG_UINT_31_MAX;
-      limit = limit < idat_limit? idat_limit : limit;
-   }
-
-   if (length > limit)
-   {
-      png_debug2(0," length = %lu, limit = %lu",
-         (unsigned long)length,(unsigned long)limit);
-      png_chunk_error(png_ptr, "chunk data is too large");
-   }
-}
-
-/* Combines the row recently read in with the existing pixels in the row.  This
- * routine takes care of alpha and transparency if requested.  This routine also
- * handles the two methods of progressive display of interlaced images,
- * depending on the 'display' value; if 'display' is true then the whole row
- * (dp) is filled from the start by replicating the available pixels.  If
- * 'display' is false only those pixels present in the pass are filled in.
- */
-void /* PRIVATE */
-png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
-{
-   unsigned int pixel_depth = png_ptr->transformed_pixel_depth;
-   png_const_bytep sp = png_ptr->row_buf + 1;
-   png_alloc_size_t row_width = png_ptr->width;
-   unsigned int pass = png_ptr->pass;
-   png_bytep end_ptr = 0;
-   png_byte end_byte = 0;
-   unsigned int end_mask;
-
-   png_debug(1, "in png_combine_row");
-
-   /* Added in 1.5.6: it should not be possible to enter this routine until at
-    * least one row has been read from the PNG data and transformed.
-    */
-   if (pixel_depth == 0)
-      png_error(png_ptr, "internal row logic error");
-
-   /* Added in 1.5.4: the pixel depth should match the information returned by
-    * any call to png_read_update_info at this point.  Do not continue if we got
-    * this wrong.
-    */
-   if (png_ptr->info_rowbytes != 0 && png_ptr->info_rowbytes !=
-          PNG_ROWBYTES(pixel_depth, row_width))
-      png_error(png_ptr, "internal row size calculation error");
-
-   /* Don't expect this to ever happen: */
-   if (row_width == 0)
-      png_error(png_ptr, "internal row width error");
-
-   /* Preserve the last byte in cases where only part of it will be overwritten,
-    * the multiply below may overflow, we don't care because ANSI-C guarantees
-    * we get the low bits.
-    */
-   end_mask = (pixel_depth * row_width) & 7;
-   if (end_mask != 0)
-   {
-      /* end_ptr == NULL is a flag to say do nothing */
-      end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1;
-      end_byte = *end_ptr;
-#     ifdef PNG_READ_PACKSWAP_SUPPORTED
-      if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-         /* little-endian byte */
-         end_mask = (unsigned int)(0xff << end_mask);
-
-      else /* big-endian byte */
-#     endif
-      end_mask = 0xff >> end_mask;
-      /* end_mask is now the bits to *keep* from the destination row */
-   }
-
-   /* For non-interlaced images this reduces to a memcpy(). A memcpy()
-    * will also happen if interlacing isn't supported or if the application
-    * does not call png_set_interlace_handling().  In the latter cases the
-    * caller just gets a sequence of the unexpanded rows from each interlace
-    * pass.
-    */
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced != 0 &&
-       (png_ptr->transformations & PNG_INTERLACE) != 0 &&
-       pass < 6 && (display == 0 ||
-       /* The following copies everything for 'display' on passes 0, 2 and 4. */
-       (display == 1 && (pass & 1) != 0)))
-   {
-      /* Narrow images may have no bits in a pass; the caller should handle
-       * this, but this test is cheap:
-       */
-      if (row_width <= PNG_PASS_START_COL(pass))
-         return;
-
-      if (pixel_depth < 8)
-      {
-         /* For pixel depths up to 4 bpp the 8-pixel mask can be expanded to fit
-          * into 32 bits, then a single loop over the bytes using the four byte
-          * values in the 32-bit mask can be used.  For the 'display' option the
-          * expanded mask may also not require any masking within a byte.  To
-          * make this work the PACKSWAP option must be taken into account - it
-          * simply requires the pixels to be reversed in each byte.
-          *
-          * The 'regular' case requires a mask for each of the first 6 passes,
-          * the 'display' case does a copy for the even passes in the range
-          * 0..6.  This has already been handled in the test above.
-          *
-          * The masks are arranged as four bytes with the first byte to use in
-          * the lowest bits (little-endian) regardless of the order (PACKSWAP or
-          * not) of the pixels in each byte.
-          *
-          * NOTE: the whole of this logic depends on the caller of this function
-          * only calling it on rows appropriate to the pass.  This function only
-          * understands the 'x' logic; the 'y' logic is handled by the caller.
-          *
-          * The following defines allow generation of compile time constant bit
-          * masks for each pixel depth and each possibility of swapped or not
-          * swapped bytes.  Pass 'p' is in the range 0..6; 'x', a pixel index,
-          * is in the range 0..7; and the result is 1 if the pixel is to be
-          * copied in the pass, 0 if not.  'S' is for the sparkle method, 'B'
-          * for the block method.
-          *
-          * With some compilers a compile time expression of the general form:
-          *
-          *    (shift >= 32) ? (a >> (shift-32)) : (b >> shift)
-          *
-          * Produces warnings with values of 'shift' in the range 33 to 63
-          * because the right hand side of the ?: expression is evaluated by
-          * the compiler even though it isn't used.  Microsoft Visual C (various
-          * versions) and the Intel C compiler are known to do this.  To avoid
-          * this the following macros are used in 1.5.6.  This is a temporary
-          * solution to avoid destabilizing the code during the release process.
-          */
-#        if PNG_USE_COMPILE_TIME_MASKS
-#           define PNG_LSR(x,s) ((x)>>((s) & 0x1f))
-#           define PNG_LSL(x,s) ((x)<<((s) & 0x1f))
-#        else
-#           define PNG_LSR(x,s) ((x)>>(s))
-#           define PNG_LSL(x,s) ((x)<<(s))
-#        endif
-#        define S_COPY(p,x) (((p)<4 ? PNG_LSR(0x80088822,(3-(p))*8+(7-(x))) :\
-           PNG_LSR(0xaa55ff00,(7-(p))*8+(7-(x)))) & 1)
-#        define B_COPY(p,x) (((p)<4 ? PNG_LSR(0xff0fff33,(3-(p))*8+(7-(x))) :\
-           PNG_LSR(0xff55ff00,(7-(p))*8+(7-(x)))) & 1)
-
-         /* Return a mask for pass 'p' pixel 'x' at depth 'd'.  The mask is
-          * little endian - the first pixel is at bit 0 - however the extra
-          * parameter 's' can be set to cause the mask position to be swapped
-          * within each byte, to match the PNG format.  This is done by XOR of
-          * the shift with 7, 6 or 4 for bit depths 1, 2 and 4.
-          */
-#        define PIXEL_MASK(p,x,d,s) \
-            (PNG_LSL(((PNG_LSL(1U,(d)))-1),(((x)*(d))^((s)?8-(d):0))))
-
-         /* Hence generate the appropriate 'block' or 'sparkle' pixel copy mask.
-          */
-#        define S_MASKx(p,x,d,s) (S_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
-#        define B_MASKx(p,x,d,s) (B_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
-
-         /* Combine 8 of these to get the full mask.  For the 1-bpp and 2-bpp
-          * cases the result needs replicating, for the 4-bpp case the above
-          * generates a full 32 bits.
-          */
-#        define MASK_EXPAND(m,d) ((m)*((d)==1?0x01010101:((d)==2?0x00010001:1)))
-
-#        define S_MASK(p,d,s) MASK_EXPAND(S_MASKx(p,0,d,s) + S_MASKx(p,1,d,s) +\
-            S_MASKx(p,2,d,s) + S_MASKx(p,3,d,s) + S_MASKx(p,4,d,s) +\
-            S_MASKx(p,5,d,s) + S_MASKx(p,6,d,s) + S_MASKx(p,7,d,s), d)
-
-#        define B_MASK(p,d,s) MASK_EXPAND(B_MASKx(p,0,d,s) + B_MASKx(p,1,d,s) +\
-            B_MASKx(p,2,d,s) + B_MASKx(p,3,d,s) + B_MASKx(p,4,d,s) +\
-            B_MASKx(p,5,d,s) + B_MASKx(p,6,d,s) + B_MASKx(p,7,d,s), d)
-
-#if PNG_USE_COMPILE_TIME_MASKS
-         /* Utility macros to construct all the masks for a depth/swap
-          * combination.  The 's' parameter says whether the format is PNG
-          * (big endian bytes) or not.  Only the three odd-numbered passes are
-          * required for the display/block algorithm.
-          */
-#        define S_MASKS(d,s) { S_MASK(0,d,s), S_MASK(1,d,s), S_MASK(2,d,s),\
-            S_MASK(3,d,s), S_MASK(4,d,s), S_MASK(5,d,s) }
-
-#        define B_MASKS(d,s) { B_MASK(1,d,s), B_MASK(3,d,s), B_MASK(5,d,s) }
-
-#        define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))
-
-         /* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and
-          * then pass:
-          */
-         static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
-         {
-            /* Little-endian byte masks for PACKSWAP */
-            { S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) },
-            /* Normal (big-endian byte) masks - PNG format */
-            { S_MASKS(1,1), S_MASKS(2,1), S_MASKS(4,1) }
-         };
-
-         /* display_mask has only three entries for the odd passes, so index by
-          * pass>>1.
-          */
-         static PNG_CONST png_uint_32 display_mask[2][3][3] =
-         {
-            /* Little-endian byte masks for PACKSWAP */
-            { B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) },
-            /* Normal (big-endian byte) masks - PNG format */
-            { B_MASKS(1,1), B_MASKS(2,1), B_MASKS(4,1) }
-         };
-
-#        define MASK(pass,depth,display,png)\
-            ((display)?display_mask[png][DEPTH_INDEX(depth)][pass>>1]:\
-               row_mask[png][DEPTH_INDEX(depth)][pass])
-
-#else /* !PNG_USE_COMPILE_TIME_MASKS */
-         /* This is the runtime alternative: it seems unlikely that this will
-          * ever be either smaller or faster than the compile time approach.
-          */
-#        define MASK(pass,depth,display,png)\
-            ((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png))
-#endif /* !USE_COMPILE_TIME_MASKS */
-
-         /* Use the appropriate mask to copy the required bits.  In some cases
-          * the byte mask will be 0 or 0xff; optimize these cases.  row_width is
-          * the number of pixels, but the code copies bytes, so it is necessary
-          * to special case the end.
-          */
-         png_uint_32 pixels_per_byte = 8 / pixel_depth;
-         png_uint_32 mask;
-
-#        ifdef PNG_READ_PACKSWAP_SUPPORTED
-         if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-            mask = MASK(pass, pixel_depth, display, 0);
-
-         else
-#        endif
-         mask = MASK(pass, pixel_depth, display, 1);
-
-         for (;;)
-         {
-            png_uint_32 m;
-
-            /* It doesn't matter in the following if png_uint_32 has more than
-             * 32 bits because the high bits always match those in m<<24; it is,
-             * however, essential to use OR here, not +, because of this.
-             */
-            m = mask;
-            mask = (m >> 8) | (m << 24); /* rotate right to good compilers */
-            m &= 0xff;
-
-            if (m != 0) /* something to copy */
-            {
-               if (m != 0xff)
-                  *dp = (png_byte)((*dp & ~m) | (*sp & m));
-               else
-                  *dp = *sp;
-            }
-
-            /* NOTE: this may overwrite the last byte with garbage if the image
-             * is not an exact number of bytes wide; libpng has always done
-             * this.
-             */
-            if (row_width <= pixels_per_byte)
-               break; /* May need to restore part of the last byte */
-
-            row_width -= pixels_per_byte;
-            ++dp;
-            ++sp;
-         }
-      }
-
-      else /* pixel_depth >= 8 */
-      {
-         unsigned int bytes_to_copy, bytes_to_jump;
-
-         /* Validate the depth - it must be a multiple of 8 */
-         if (pixel_depth & 7)
-            png_error(png_ptr, "invalid user transform pixel depth");
-
-         pixel_depth >>= 3; /* now in bytes */
-         row_width *= pixel_depth;
-
-         /* Regardless of pass number the Adam 7 interlace always results in a
-          * fixed number of pixels to copy then to skip.  There may be a
-          * different number of pixels to skip at the start though.
-          */
-         {
-            unsigned int offset = PNG_PASS_START_COL(pass) * pixel_depth;
-
-            row_width -= offset;
-            dp += offset;
-            sp += offset;
-         }
-
-         /* Work out the bytes to copy. */
-         if (display != 0)
-         {
-            /* When doing the 'block' algorithm the pixel in the pass gets
-             * replicated to adjacent pixels.  This is why the even (0,2,4,6)
-             * passes are skipped above - the entire expanded row is copied.
-             */
-            bytes_to_copy = (1<<((6-pass)>>1)) * pixel_depth;
-
-            /* But don't allow this number to exceed the actual row width. */
-            if (bytes_to_copy > row_width)
-               bytes_to_copy = (unsigned int)/*SAFE*/row_width;
-         }
-
-         else /* normal row; Adam7 only ever gives us one pixel to copy. */
-            bytes_to_copy = pixel_depth;
-
-         /* In Adam7 there is a constant offset between where the pixels go. */
-         bytes_to_jump = PNG_PASS_COL_OFFSET(pass) * pixel_depth;
-
-         /* And simply copy these bytes.  Some optimization is possible here,
-          * depending on the value of 'bytes_to_copy'.  Special case the low
-          * byte counts, which we know to be frequent.
-          *
-          * Notice that these cases all 'return' rather than 'break' - this
-          * avoids an unnecessary test on whether to restore the last byte
-          * below.
-          */
-         switch (bytes_to_copy)
-         {
-            case 1:
-               for (;;)
-               {
-                  *dp = *sp;
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  dp += bytes_to_jump;
-                  sp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-               }
-
-            case 2:
-               /* There is a possibility of a partial copy at the end here; this
-                * slows the code down somewhat.
-                */
-               do
-               {
-                  dp[0] = sp[0]; dp[1] = sp[1];
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  sp += bytes_to_jump;
-                  dp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-               }
-               while (row_width > 1);
-
-               /* And there can only be one byte left at this point: */
-               *dp = *sp;
-               return;
-
-            case 3:
-               /* This can only be the RGB case, so each copy is exactly one
-                * pixel and it is not necessary to check for a partial copy.
-                */
-               for (;;)
-               {
-                  dp[0] = sp[0]; dp[1] = sp[1]; dp[2] = sp[2];
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  sp += bytes_to_jump;
-                  dp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-               }
-
-            default:
-#if PNG_ALIGN_TYPE != PNG_ALIGN_NONE
-               /* Check for double byte alignment and, if possible, use a
-                * 16-bit copy.  Don't attempt this for narrow images - ones that
-                * are less than an interlace panel wide.  Don't attempt it for
-                * wide bytes_to_copy either - use the memcpy there.
-                */
-               if (bytes_to_copy < 16 /*else use memcpy*/ &&
-                   png_isaligned(dp, png_uint_16) &&
-                   png_isaligned(sp, png_uint_16) &&
-                   bytes_to_copy % (sizeof (png_uint_16)) == 0 &&
-                   bytes_to_jump % (sizeof (png_uint_16)) == 0)
-               {
-                  /* Everything is aligned for png_uint_16 copies, but try for
-                   * png_uint_32 first.
-                   */
-                  if (png_isaligned(dp, png_uint_32) &&
-                      png_isaligned(sp, png_uint_32) &&
-                      bytes_to_copy % (sizeof (png_uint_32)) == 0 &&
-                      bytes_to_jump % (sizeof (png_uint_32)) == 0)
-                  {
-                     png_uint_32p dp32 = png_aligncast(png_uint_32p,dp);
-                     png_const_uint_32p sp32 = png_aligncastconst(
-                         png_const_uint_32p, sp);
-                     size_t skip = (bytes_to_jump-bytes_to_copy) /
-                         (sizeof (png_uint_32));
-
-                     do
-                     {
-                        size_t c = bytes_to_copy;
-                        do
-                        {
-                           *dp32++ = *sp32++;
-                           c -= (sizeof (png_uint_32));
-                        }
-                        while (c > 0);
-
-                        if (row_width <= bytes_to_jump)
-                           return;
-
-                        dp32 += skip;
-                        sp32 += skip;
-                        row_width -= bytes_to_jump;
-                     }
-                     while (bytes_to_copy <= row_width);
-
-                     /* Get to here when the row_width truncates the final copy.
-                      * There will be 1-3 bytes left to copy, so don't try the
-                      * 16-bit loop below.
-                      */
-                     dp = (png_bytep)dp32;
-                     sp = (png_const_bytep)sp32;
-                     do
-                        *dp++ = *sp++;
-                     while (--row_width > 0);
-                     return;
-                  }
-
-                  /* Else do it in 16-bit quantities, but only if the size is
-                   * not too large.
-                   */
-                  else
-                  {
-                     png_uint_16p dp16 = png_aligncast(png_uint_16p, dp);
-                     png_const_uint_16p sp16 = png_aligncastconst(
-                        png_const_uint_16p, sp);
-                     size_t skip = (bytes_to_jump-bytes_to_copy) /
-                        (sizeof (png_uint_16));
-
-                     do
-                     {
-                        size_t c = bytes_to_copy;
-                        do
-                        {
-                           *dp16++ = *sp16++;
-                           c -= (sizeof (png_uint_16));
-                        }
-                        while (c > 0);
-
-                        if (row_width <= bytes_to_jump)
-                           return;
-
-                        dp16 += skip;
-                        sp16 += skip;
-                        row_width -= bytes_to_jump;
-                     }
-                     while (bytes_to_copy <= row_width);
-
-                     /* End of row - 1 byte left, bytes_to_copy > row_width: */
-                     dp = (png_bytep)dp16;
-                     sp = (png_const_bytep)sp16;
-                     do
-                        *dp++ = *sp++;
-                     while (--row_width > 0);
-                     return;
-                  }
-               }
-#endif /* ALIGN_TYPE code */
-
-               /* The true default - use a memcpy: */
-               for (;;)
-               {
-                  memcpy(dp, sp, bytes_to_copy);
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  sp += bytes_to_jump;
-                  dp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-                  if (bytes_to_copy > row_width)
-                     bytes_to_copy = (unsigned int)/*SAFE*/row_width;
-               }
-         }
-
-         /* NOT REACHED*/
-      } /* pixel_depth >= 8 */
-
-      /* Here if pixel_depth < 8 to check 'end_ptr' below. */
-   }
-   else
-#endif /* READ_INTERLACING */
-
-   /* If here then the switch above wasn't used so just memcpy the whole row
-    * from the temporary row buffer (notice that this overwrites the end of the
-    * destination row if it is a partial byte.)
-    */
-   memcpy(dp, sp, PNG_ROWBYTES(pixel_depth, row_width));
-
-   /* Restore the overwritten bits from the last byte if necessary. */
-   if (end_ptr != NULL)
-      *end_ptr = (png_byte)((end_byte & end_mask) | (*end_ptr & ~end_mask));
-}
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-void /* PRIVATE */
-png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
-    png_uint_32 transformations /* Because these may affect the byte layout */)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-   /* Offset to next interlace block */
-   static PNG_CONST unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   png_debug(1, "in png_do_read_interlace");
-   if (row != NULL && row_info != NULL)
-   {
-      png_uint_32 final_width;
-
-      final_width = row_info->width * png_pass_inc[pass];
-
-      switch (row_info->pixel_depth)
-      {
-         case 1:
-         {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
-            unsigned int sshift, dshift;
-            unsigned int s_start, s_end;
-            int s_inc;
-            int jstop = (int)png_pass_inc[pass];
-            png_byte v;
-            png_uint_32 i;
-            int j;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if ((transformations & PNG_PACKSWAP) != 0)
-            {
-                sshift = ((row_info->width + 7) & 0x07);
-                dshift = ((final_width + 7) & 0x07);
-                s_start = 7;
-                s_end = 0;
-                s_inc = -1;
-            }
-
-            else
-#endif
-            {
-                sshift = 7 - ((row_info->width + 7) & 0x07);
-                dshift = 7 - ((final_width + 7) & 0x07);
-                s_start = 0;
-                s_end = 7;
-                s_inc = 1;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               v = (png_byte)((*sp >> sshift) & 0x01);
-               for (j = 0; j < jstop; j++)
-               {
-                  unsigned int tmp = *dp & (0x7f7f >> (7 - dshift));
-                  tmp |= (unsigned int)(v << dshift);
-                  *dp = (png_byte)(tmp & 0xff);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift = (unsigned int)((int)dshift + s_inc);
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift = (unsigned int)((int)sshift + s_inc);
-            }
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
-            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
-            unsigned int sshift, dshift;
-            unsigned int s_start, s_end;
-            int s_inc;
-            int jstop = (int)png_pass_inc[pass];
-            png_uint_32 i;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if ((transformations & PNG_PACKSWAP) != 0)
-            {
-               sshift = (((row_info->width + 3) & 0x03) << 1);
-               dshift = (((final_width + 3) & 0x03) << 1);
-               s_start = 6;
-               s_end = 0;
-               s_inc = -2;
-            }
-
-            else
-#endif
-            {
-               sshift = ((3 - ((row_info->width + 3) & 0x03)) << 1);
-               dshift = ((3 - ((final_width + 3) & 0x03)) << 1);
-               s_start = 0;
-               s_end = 6;
-               s_inc = 2;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v;
-               int j;
-
-               v = (png_byte)((*sp >> sshift) & 0x03);
-               for (j = 0; j < jstop; j++)
-               {
-                  unsigned int tmp = *dp & (0x3f3f >> (6 - dshift));
-                  tmp |= (unsigned int)(v << dshift);
-                  *dp = (png_byte)(tmp & 0xff);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift = (unsigned int)((int)dshift + s_inc);
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift = (unsigned int)((int)sshift + s_inc);
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
-            unsigned int sshift, dshift;
-            unsigned int s_start, s_end;
-            int s_inc;
-            png_uint_32 i;
-            int jstop = (int)png_pass_inc[pass];
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if ((transformations & PNG_PACKSWAP) != 0)
-            {
-               sshift = (((row_info->width + 1) & 0x01) << 2);
-               dshift = (((final_width + 1) & 0x01) << 2);
-               s_start = 4;
-               s_end = 0;
-               s_inc = -4;
-            }
-
-            else
-#endif
-            {
-               sshift = ((1 - ((row_info->width + 1) & 0x01)) << 2);
-               dshift = ((1 - ((final_width + 1) & 0x01)) << 2);
-               s_start = 0;
-               s_end = 4;
-               s_inc = 4;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v = (png_byte)((*sp >> sshift) & 0x0f);
-               int j;
-
-               for (j = 0; j < jstop; j++)
-               {
-                  unsigned int tmp = *dp & (0xf0f >> (4 - dshift));
-                  tmp |= (unsigned int)(v << dshift);
-                  *dp = (png_byte)(tmp & 0xff);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift = (unsigned int)((int)dshift + s_inc);
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift = (unsigned int)((int)sshift + s_inc);
-            }
-            break;
-         }
-
-         default:
-         {
-            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
-
-            png_bytep sp = row + (png_size_t)(row_info->width - 1)
-                * pixel_bytes;
-
-            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
-
-            int jstop = (int)png_pass_inc[pass];
-            png_uint_32 i;
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v[8]; /* SAFE; pixel_depth does not exceed 64 */
-               int j;
-
-               memcpy(v, sp, pixel_bytes);
-
-               for (j = 0; j < jstop; j++)
-               {
-                  memcpy(dp, v, pixel_bytes);
-                  dp -= pixel_bytes;
-               }
-
-               sp -= pixel_bytes;
-            }
-            break;
-         }
-      }
-
-      row_info->width = final_width;
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
-   }
-#ifndef PNG_READ_PACKSWAP_SUPPORTED
-   PNG_UNUSED(transformations)  /* Silence compiler warning */
-#endif
-}
-#endif /* READ_INTERLACING */
-
-static void
-png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
-    png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_size_t istop = row_info->rowbytes;
-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-   png_bytep rp = row + bpp;
-
-   PNG_UNUSED(prev_row)
-
-   for (i = bpp; i < istop; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-      rp++;
-   }
-}
-
-static void
-png_read_filter_row_up(png_row_infop row_info, png_bytep row,
-    png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_size_t istop = row_info->rowbytes;
-   png_bytep rp = row;
-   png_const_bytep pp = prev_row;
-
-   for (i = 0; i < istop; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-      rp++;
-   }
-}
-
-static void
-png_read_filter_row_avg(png_row_infop row_info, png_bytep row,
-    png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_bytep rp = row;
-   png_const_bytep pp = prev_row;
-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-   png_size_t istop = row_info->rowbytes - bpp;
-
-   for (i = 0; i < bpp; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) +
-         ((int)(*pp++) / 2 )) & 0xff);
-
-      rp++;
-   }
-
-   for (i = 0; i < istop; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) +
-         (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-      rp++;
-   }
-}
-
-static void
-png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,
-    png_const_bytep prev_row)
-{
-   png_bytep rp_end = row + row_info->rowbytes;
-   int a, c;
-
-   /* First pixel/byte */
-   c = *prev_row++;
-   a = *row + c;
-   *row++ = (png_byte)a;
-
-   /* Remainder */
-   while (row < rp_end)
-   {
-      int b, pa, pb, pc, p;
-
-      a &= 0xff; /* From previous iteration or start */
-      b = *prev_row++;
-
-      p = b - c;
-      pc = a - c;
-
-#ifdef PNG_USE_ABS
-      pa = abs(p);
-      pb = abs(pc);
-      pc = abs(p + pc);
-#else
-      pa = p < 0 ? -p : p;
-      pb = pc < 0 ? -pc : pc;
-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-      /* Find the best predictor, the least of pa, pb, pc favoring the earlier
-       * ones in the case of a tie.
-       */
-      if (pb < pa)
-      {
-         pa = pb; a = b;
-      }
-      if (pc < pa) a = c;
-
-      /* Calculate the current pixel in a, and move the previous row pixel to c
-       * for the next time round the loop
-       */
-      c = b;
-      a += *row;
-      *row++ = (png_byte)a;
-   }
-}
-
-static void
-png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,
-    png_const_bytep prev_row)
-{
-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-   png_bytep rp_end = row + bpp;
-
-   /* Process the first pixel in the row completely (this is the same as 'up'
-    * because there is only one candidate predictor for the first row).
-    */
-   while (row < rp_end)
-   {
-      int a = *row + *prev_row++;
-      *row++ = (png_byte)a;
-   }
-
-   /* Remainder */
-   rp_end = rp_end + (row_info->rowbytes - bpp);
-
-   while (row < rp_end)
-   {
-      int a, b, c, pa, pb, pc, p;
-
-      c = *(prev_row - bpp);
-      a = *(row - bpp);
-      b = *prev_row++;
-
-      p = b - c;
-      pc = a - c;
-
-#ifdef PNG_USE_ABS
-      pa = abs(p);
-      pb = abs(pc);
-      pc = abs(p + pc);
-#else
-      pa = p < 0 ? -p : p;
-      pb = pc < 0 ? -pc : pc;
-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-      if (pb < pa)
-      {
-         pa = pb; a = b;
-      }
-      if (pc < pa) a = c;
-
-      a += *row;
-      *row++ = (png_byte)a;
-   }
-}
-
-static void
-png_init_filter_functions(png_structrp pp)
-   /* This function is called once for every PNG image (except for PNG images
-    * that only use PNG_FILTER_VALUE_NONE for all rows) to set the
-    * implementations required to reverse the filtering of PNG rows.  Reversing
-    * the filter is the first transformation performed on the row data.  It is
-    * performed in place, therefore an implementation can be selected based on
-    * the image pixel format.  If the implementation depends on image width then
-    * take care to ensure that it works correctly if the image is interlaced -
-    * interlacing causes the actual row width to vary.
-    */
-{
-   unsigned int bpp = (pp->pixel_depth + 7) >> 3;
-
-   pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub;
-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up;
-   pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg;
-   if (bpp == 1)
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-         png_read_filter_row_paeth_1byte_pixel;
-   else
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-         png_read_filter_row_paeth_multibyte_pixel;
-
-#ifdef PNG_FILTER_OPTIMIZATIONS
-   /* To use this define PNG_FILTER_OPTIMIZATIONS as the name of a function to
-    * call to install hardware optimizations for the above functions; simply
-    * replace whatever elements of the pp->read_filter[] array with a hardware
-    * specific (or, for that matter, generic) optimization.
-    *
-    * To see an example of this examine what configure.ac does when
-    * --enable-arm-neon is specified on the command line.
-    */
-   PNG_FILTER_OPTIMIZATIONS(pp, bpp);
-#endif
-}
-
-void /* PRIVATE */
-png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row,
-    png_const_bytep prev_row, int filter)
-{
-   /* OPTIMIZATION: DO NOT MODIFY THIS FUNCTION, instead #define
-    * PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic
-    * implementations.  See png_init_filter_functions above.
-    */
-   if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST)
-   {
-      if (pp->read_filter[0] == NULL)
-         png_init_filter_functions(pp);
-
-      pp->read_filter[filter-1](row_info, row, prev_row);
-   }
-}
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-void /* PRIVATE */
-png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
-    png_alloc_size_t avail_out)
-{
-   /* Loop reading IDATs and decompressing the result into output[avail_out] */
-   png_ptr->zstream.next_out = output;
-   png_ptr->zstream.avail_out = 0; /* safety: set below */
-
-   if (output == NULL)
-      avail_out = 0;
-
-   do
-   {
-      int ret;
-      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
-
-      if (png_ptr->zstream.avail_in == 0)
-      {
-         uInt avail_in;
-         png_bytep buffer;
-
-         while (png_ptr->idat_size == 0)
-         {
-            png_crc_finish(png_ptr, 0);
-
-            png_ptr->idat_size = png_read_chunk_header(png_ptr);
-            /* This is an error even in the 'check' case because the code just
-             * consumed a non-IDAT header.
-             */
-            if (png_ptr->chunk_name != png_IDAT)
-               png_error(png_ptr, "Not enough image data");
-         }
-
-         avail_in = png_ptr->IDAT_read_size;
-
-         if (avail_in > png_ptr->idat_size)
-            avail_in = (uInt)png_ptr->idat_size;
-
-         /* A PNG with a gradually increasing IDAT size will defeat this attempt
-          * to minimize memory usage by causing lots of re-allocs, but
-          * realistically doing IDAT_read_size re-allocs is not likely to be a
-          * big problem.
-          */
-         buffer = png_read_buffer(png_ptr, avail_in, 0/*error*/);
-
-         png_crc_read(png_ptr, buffer, avail_in);
-         png_ptr->idat_size -= avail_in;
-
-         png_ptr->zstream.next_in = buffer;
-         png_ptr->zstream.avail_in = avail_in;
-      }
-
-      /* And set up the output side. */
-      if (output != NULL) /* standard read */
-      {
-         uInt out = ZLIB_IO_MAX;
-
-         if (out > avail_out)
-            out = (uInt)avail_out;
-
-         avail_out -= out;
-         png_ptr->zstream.avail_out = out;
-      }
-
-      else /* after last row, checking for end */
-      {
-         png_ptr->zstream.next_out = tmpbuf;
-         png_ptr->zstream.avail_out = (sizeof tmpbuf);
-      }
-
-      /* Use NO_FLUSH; this gives zlib the maximum opportunity to optimize the
-       * process.  If the LZ stream is truncated the sequential reader will
-       * terminally damage the stream, above, by reading the chunk header of the
-       * following chunk (it then exits with png_error).
-       *
-       * TODO: deal more elegantly with truncated IDAT lists.
-       */
-      ret = PNG_INFLATE(png_ptr, Z_NO_FLUSH);
-
-      /* Take the unconsumed output back. */
-      if (output != NULL)
-         avail_out += png_ptr->zstream.avail_out;
-
-      else /* avail_out counts the extra bytes */
-         avail_out += (sizeof tmpbuf) - png_ptr->zstream.avail_out;
-
-      png_ptr->zstream.avail_out = 0;
-
-      if (ret == Z_STREAM_END)
-      {
-         /* Do this for safety; we won't read any more into this row. */
-         png_ptr->zstream.next_out = NULL;
-
-         png_ptr->mode |= PNG_AFTER_IDAT;
-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-
-         if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
-            png_chunk_benign_error(png_ptr, "Extra compressed data");
-         break;
-      }
-
-      if (ret != Z_OK)
-      {
-         png_zstream_error(png_ptr, ret);
-
-         if (output != NULL)
-            png_chunk_error(png_ptr, png_ptr->zstream.msg);
-
-         else /* checking */
-         {
-            png_chunk_benign_error(png_ptr, png_ptr->zstream.msg);
-            return;
-         }
-      }
-   } while (avail_out > 0);
-
-   if (avail_out > 0)
-   {
-      /* The stream ended before the image; this is the same as too few IDATs so
-       * should be handled the same way.
-       */
-      if (output != NULL)
-         png_error(png_ptr, "Not enough image data");
-
-      else /* the deflate stream contained extra data */
-         png_chunk_benign_error(png_ptr, "Too much image data");
-   }
-}
-
-void /* PRIVATE */
-png_read_finish_IDAT(png_structrp png_ptr)
-{
-   /* We don't need any more data and the stream should have ended, however the
-    * LZ end code may actually not have been processed.  In this case we must
-    * read it otherwise stray unread IDAT data or, more likely, an IDAT chunk
-    * may still remain to be consumed.
-    */
-   if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
-   {
-      /* The NULL causes png_read_IDAT_data to swallow any remaining bytes in
-       * the compressed stream, but the stream may be damaged too, so even after
-       * this call we may need to terminate the zstream ownership.
-       */
-      png_read_IDAT_data(png_ptr, NULL, 0);
-      png_ptr->zstream.next_out = NULL; /* safety */
-
-      /* Now clear everything out for safety; the following may not have been
-       * done.
-       */
-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
-      {
-         png_ptr->mode |= PNG_AFTER_IDAT;
-         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-      }
-   }
-
-   /* If the zstream has not been released do it now *and* terminate the reading
-    * of the final IDAT chunk.
-    */
-   if (png_ptr->zowner == png_IDAT)
-   {
-      /* Always do this; the pointers otherwise point into the read buffer. */
-      png_ptr->zstream.next_in = NULL;
-      png_ptr->zstream.avail_in = 0;
-
-      /* Now we no longer own the zstream. */
-      png_ptr->zowner = 0;
-
-      /* The slightly weird semantics of the sequential IDAT reading is that we
-       * are always in or at the end of an IDAT chunk, so we always need to do a
-       * crc_finish here.  If idat_size is non-zero we also need to read the
-       * spurious bytes at the end of the chunk now.
-       */
-      (void)png_crc_finish(png_ptr, png_ptr->idat_size);
-   }
-}
-
-void /* PRIVATE */
-png_read_finish_row(png_structrp png_ptr)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-
-   png_debug(1, "in png_read_finish_row");
-   png_ptr->row_number++;
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-   if (png_ptr->interlaced != 0)
-   {
-      png_ptr->row_number = 0;
-
-      /* TO DO: don't do this if prev_row isn't needed (requires
-       * read-ahead of the next row's filter byte.
-       */
-      memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-      do
-      {
-         png_ptr->pass++;
-
-         if (png_ptr->pass >= 7)
-            break;
-
-         png_ptr->iwidth = (png_ptr->width +
-            png_pass_inc[png_ptr->pass] - 1 -
-            png_pass_start[png_ptr->pass]) /
-            png_pass_inc[png_ptr->pass];
-
-         if ((png_ptr->transformations & PNG_INTERLACE) == 0)
-         {
-            png_ptr->num_rows = (png_ptr->height +
-                png_pass_yinc[png_ptr->pass] - 1 -
-                png_pass_ystart[png_ptr->pass]) /
-                png_pass_yinc[png_ptr->pass];
-         }
-
-         else  /* if (png_ptr->transformations & PNG_INTERLACE) */
-            break; /* libpng deinterlacing sees every row */
-
-      } while (png_ptr->num_rows == 0 || png_ptr->iwidth == 0);
-
-      if (png_ptr->pass < 7)
-         return;
-   }
-
-   /* Here after at the end of the last row of the last pass. */
-   png_read_finish_IDAT(png_ptr);
-}
-#endif /* SEQUENTIAL_READ */
-
-void /* PRIVATE */
-png_read_start_row(png_structrp png_ptr)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-
-   unsigned int max_pixel_depth;
-   png_size_t row_bytes;
-
-   png_debug(1, "in png_read_start_row");
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   png_init_read_transformations(png_ptr);
-#endif
-   if (png_ptr->interlaced != 0)
-   {
-      if ((png_ptr->transformations & PNG_INTERLACE) == 0)
-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
-             png_pass_ystart[0]) / png_pass_yinc[0];
-
-      else
-         png_ptr->num_rows = png_ptr->height;
-
-      png_ptr->iwidth = (png_ptr->width +
-          png_pass_inc[png_ptr->pass] - 1 -
-          png_pass_start[png_ptr->pass]) /
-          png_pass_inc[png_ptr->pass];
-   }
-
-   else
-   {
-      png_ptr->num_rows = png_ptr->height;
-      png_ptr->iwidth = png_ptr->width;
-   }
-
-   max_pixel_depth = (unsigned int)png_ptr->pixel_depth;
-
-   /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpler set of
-    * calculations to calculate the final pixel depth, then
-    * png_do_read_transforms actually does the transforms.  This means that the
-    * code which effectively calculates this value is actually repeated in three
-    * separate places.  They must all match.  Innocent changes to the order of
-    * transformations can and will break libpng in a way that causes memory
-    * overwrites.
-    *
-    * TODO: fix this.
-    */
-#ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) != 0 && png_ptr->bit_depth < 8)
-      max_pixel_depth = 8;
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if ((png_ptr->transformations & PNG_EXPAND) != 0)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (png_ptr->num_trans != 0)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 24;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (max_pixel_depth < 8)
-            max_pixel_depth = 8;
-
-         if (png_ptr->num_trans != 0)
-            max_pixel_depth *= 2;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-      {
-         if (png_ptr->num_trans != 0)
-         {
-            max_pixel_depth *= 4;
-            max_pixel_depth /= 3;
-         }
-      }
-   }
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
-   {
-#  ifdef PNG_READ_EXPAND_SUPPORTED
-      /* In fact it is an error if it isn't supported, but checking is
-       * the safe way.
-       */
-      if ((png_ptr->transformations & PNG_EXPAND) != 0)
-      {
-         if (png_ptr->bit_depth < 16)
-            max_pixel_depth *= 2;
-      }
-      else
-#  endif
-      png_ptr->transformations &= ~PNG_EXPAND_16;
-   }
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   if ((png_ptr->transformations & (PNG_FILLER)) != 0)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (max_pixel_depth <= 8)
-            max_pixel_depth = 16;
-
-         else
-            max_pixel_depth = 32;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB ||
-         png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (max_pixel_depth <= 32)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 64;
-      }
-   }
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
-   {
-      if (
-#ifdef PNG_READ_EXPAND_SUPPORTED
-          (png_ptr->num_trans != 0 &&
-          (png_ptr->transformations & PNG_EXPAND) != 0) ||
-#endif
-#ifdef PNG_READ_FILLER_SUPPORTED
-          (png_ptr->transformations & (PNG_FILLER)) != 0 ||
-#endif
-          png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (max_pixel_depth <= 16)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 64;
-      }
-
-      else
-      {
-         if (max_pixel_depth <= 8)
-         {
-            if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-               max_pixel_depth = 32;
-
-            else
-               max_pixel_depth = 24;
-         }
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            max_pixel_depth = 64;
-
-         else
-            max_pixel_depth = 48;
-      }
-   }
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
-defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
-   {
-      unsigned int user_pixel_depth = png_ptr->user_transform_depth *
-         png_ptr->user_transform_channels;
-
-      if (user_pixel_depth > max_pixel_depth)
-         max_pixel_depth = user_pixel_depth;
-   }
-#endif
-
-   /* This value is stored in png_struct and double checked in the row read
-    * code.
-    */
-   png_ptr->maximum_pixel_depth = (png_byte)max_pixel_depth;
-   png_ptr->transformed_pixel_depth = 0; /* calculated on demand */
-
-   /* Align the width on the next larger 8 pixels.  Mainly used
-    * for interlacing
-    */
-   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
-   /* Calculate the maximum bytes needed, adding a byte and a pixel
-    * for safety's sake
-    */
-   row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +
-       1 + ((max_pixel_depth + 7) >> 3U);
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (row_bytes > (png_uint_32)65536L)
-      png_error(png_ptr, "This image requires a row greater than 64KB");
-#endif
-
-   if (row_bytes + 48 > png_ptr->old_big_row_buf_size)
-   {
-      png_free(png_ptr, png_ptr->big_row_buf);
-      png_free(png_ptr, png_ptr->big_prev_row);
-
-      if (png_ptr->interlaced != 0)
-         png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
-             row_bytes + 48);
-
-      else
-         png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
-
-      png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
-
-#ifdef PNG_ALIGNED_MEMORY_SUPPORTED
-      /* Use 16-byte aligned memory for row_buf with at least 16 bytes
-       * of padding before and after row_buf; treat prev_row similarly.
-       * NOTE: the alignment is to the start of the pixels, one beyond the start
-       * of the buffer, because of the filter byte.  Prior to libpng 1.5.6 this
-       * was incorrect; the filter byte was aligned, which had the exact
-       * opposite effect of that intended.
-       */
-      {
-         png_bytep temp = png_ptr->big_row_buf + 32;
-         int extra = (int)((temp - (png_bytep)0) & 0x0f);
-         png_ptr->row_buf = temp - extra - 1/*filter byte*/;
-
-         temp = png_ptr->big_prev_row + 32;
-         extra = (int)((temp - (png_bytep)0) & 0x0f);
-         png_ptr->prev_row = temp - extra - 1/*filter byte*/;
-      }
-
-#else
-      /* Use 31 bytes of padding before and 17 bytes after row_buf. */
-      png_ptr->row_buf = png_ptr->big_row_buf + 31;
-      png_ptr->prev_row = png_ptr->big_prev_row + 31;
-#endif
-      png_ptr->old_big_row_buf_size = row_bytes + 48;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (png_ptr->rowbytes > 65535)
-      png_error(png_ptr, "This image requires a row greater than 64KB");
-
-#endif
-   if (png_ptr->rowbytes > (PNG_SIZE_MAX - 1))
-      png_error(png_ptr, "Row has too many bytes to allocate in memory");
-
-   memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-   png_debug1(3, "width = %u,", png_ptr->width);
-   png_debug1(3, "height = %u,", png_ptr->height);
-   png_debug1(3, "iwidth = %u,", png_ptr->iwidth);
-   png_debug1(3, "num_rows = %u,", png_ptr->num_rows);
-   png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);
-   png_debug1(3, "irowbytes = %lu",
-       (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
-
-   /* The sequential reader needs a buffer for IDAT, but the progressive reader
-    * does not, so free the read buffer now regardless; the sequential reader
-    * reallocates it on demand.
-    */
-   if (png_ptr->read_buffer != NULL)
-   {
-      png_bytep buffer = png_ptr->read_buffer;
-
-      png_ptr->read_buffer_size = 0;
-      png_ptr->read_buffer = NULL;
-      png_free(png_ptr, buffer);
-   }
-
-   /* Finally claim the zstream for the inflate of the IDAT data, use the bits
-    * value from the stream (note that this will result in a fatal error if the
-    * IDAT stream has a bogus deflate header window_bits value, but this should
-    * not be happening any longer!)
-    */
-   if (png_inflate_claim(png_ptr, png_IDAT) != Z_OK)
-      png_error(png_ptr, png_ptr->zstream.msg);
-
-   png_ptr->flags |= PNG_FLAG_ROW_INIT;
-}
-#endif /* READ */
diff --git a/src/png/libpng/pngset.c b/src/png/libpng/pngset.c
deleted file mode 100644
index 6f3a1ee11..000000000
--- a/src/png/libpng/pngset.c
+++ /dev/null
@@ -1,1802 +0,0 @@
-
-/* pngset.c - storage of image information into info struct
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * The functions here are used during reads to store data from the file
- * into the info struct, and during writes to store application data
- * into the info struct for writing into the file.  This abstracts the
- * info struct and allows us to change the structure in the future.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-#ifdef PNG_bKGD_SUPPORTED
-void PNGAPI
-png_set_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_color_16p background)
-{
-   png_debug1(1, "in %s storage function", "bKGD");
-
-   if (png_ptr == NULL || info_ptr == NULL || background == NULL)
-      return;
-
-   info_ptr->background = *background;
-   info_ptr->valid |= PNG_INFO_bKGD;
-}
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-void PNGFAPI
-png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
-    png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
-    png_fixed_point blue_x, png_fixed_point blue_y)
-{
-   png_xy xy;
-
-   png_debug1(1, "in %s storage function", "cHRM fixed");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   xy.redx = red_x;
-   xy.redy = red_y;
-   xy.greenx = green_x;
-   xy.greeny = green_y;
-   xy.bluex = blue_x;
-   xy.bluey = blue_y;
-   xy.whitex = white_x;
-   xy.whitey = white_y;
-
-   if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,
-       2/* override with app values*/) != 0)
-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-
-void PNGFAPI
-png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z)
-{
-   png_XYZ XYZ;
-
-   png_debug1(1, "in %s storage function", "cHRM XYZ fixed");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   XYZ.red_X = int_red_X;
-   XYZ.red_Y = int_red_Y;
-   XYZ.red_Z = int_red_Z;
-   XYZ.green_X = int_green_X;
-   XYZ.green_Y = int_green_Y;
-   XYZ.green_Z = int_green_Z;
-   XYZ.blue_X = int_blue_X;
-   XYZ.blue_Y = int_blue_Y;
-   XYZ.blue_Z = int_blue_Z;
-
-   if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,
-       &XYZ, 2) != 0)
-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
-    double white_x, double white_y, double red_x, double red_y,
-    double green_x, double green_y, double blue_x, double blue_y)
-{
-   png_set_cHRM_fixed(png_ptr, info_ptr,
-       png_fixed(png_ptr, white_x, "cHRM White X"),
-       png_fixed(png_ptr, white_y, "cHRM White Y"),
-       png_fixed(png_ptr, red_x, "cHRM Red X"),
-       png_fixed(png_ptr, red_y, "cHRM Red Y"),
-       png_fixed(png_ptr, green_x, "cHRM Green X"),
-       png_fixed(png_ptr, green_y, "cHRM Green Y"),
-       png_fixed(png_ptr, blue_x, "cHRM Blue X"),
-       png_fixed(png_ptr, blue_y, "cHRM Blue Y"));
-}
-
-void PNGAPI
-png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,
-    double red_Y, double red_Z, double green_X, double green_Y, double green_Z,
-    double blue_X, double blue_Y, double blue_Z)
-{
-   png_set_cHRM_XYZ_fixed(png_ptr, info_ptr,
-       png_fixed(png_ptr, red_X, "cHRM Red X"),
-       png_fixed(png_ptr, red_Y, "cHRM Red Y"),
-       png_fixed(png_ptr, red_Z, "cHRM Red Z"),
-       png_fixed(png_ptr, green_X, "cHRM Green X"),
-       png_fixed(png_ptr, green_Y, "cHRM Green Y"),
-       png_fixed(png_ptr, green_Z, "cHRM Green Z"),
-       png_fixed(png_ptr, blue_X, "cHRM Blue X"),
-       png_fixed(png_ptr, blue_Y, "cHRM Blue Y"),
-       png_fixed(png_ptr, blue_Z, "cHRM Blue Z"));
-}
-#  endif /* FLOATING_POINT */
-
-#endif /* cHRM */
-
-#ifdef PNG_eXIf_SUPPORTED
-void PNGAPI
-png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
-    const png_bytep eXIf_buf)
-{
-  png_warning(png_ptr, "png_set_eXIf does not work; use png_set_eXIf_1");
-  PNG_UNUSED(info_ptr)
-  PNG_UNUSED(eXIf_buf)
-}
-
-void PNGAPI
-png_set_eXIf_1(png_const_structrp png_ptr, png_inforp info_ptr,
-    const png_uint_32 num_exif, const png_bytep eXIf_buf)
-{
-   int i;
-
-   png_debug1(1, "in %s storage function", "eXIf");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (info_ptr->exif)
-   {
-      png_free(png_ptr, info_ptr->exif);
-      info_ptr->exif = NULL;
-   }
-
-   info_ptr->num_exif = num_exif;
-
-   info_ptr->exif = png_voidcast(png_bytep, png_malloc_warn(png_ptr,
-       info_ptr->num_exif));
-
-   if (info_ptr->exif == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for eXIf chunk data");
-      return;
-   }
-
-   info_ptr->free_me |= PNG_FREE_EXIF;
-
-   for (i = 0; i < (int) info_ptr->num_exif; i++)
-      info_ptr->exif[i] = eXIf_buf[i];
-
-   info_ptr->valid |= PNG_INFO_eXIf;
-}
-#endif /* eXIf */
-
-#ifdef PNG_gAMA_SUPPORTED
-void PNGFAPI
-png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_fixed_point file_gamma)
-{
-   png_debug1(1, "in %s storage function", "gAMA");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_gAMA(png_const_structrp png_ptr, png_inforp info_ptr, double file_gamma)
-{
-   png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,
-       "png_set_gAMA"));
-}
-#  endif
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-void PNGAPI
-png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_uint_16p hist)
-{
-   int i;
-
-   png_debug1(1, "in %s storage function", "hIST");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (info_ptr->num_palette == 0 || info_ptr->num_palette
-       > PNG_MAX_PALETTE_LENGTH)
-   {
-      png_warning(png_ptr,
-          "Invalid palette size, hIST allocation skipped");
-
-      return;
-   }
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
-
-   /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
-    * version 1.2.1
-    */
-   info_ptr->hist = png_voidcast(png_uint_16p, png_malloc_warn(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * (sizeof (png_uint_16))));
-
-   if (info_ptr->hist == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for hIST chunk data");
-
-      return;
-   }
-
-   info_ptr->free_me |= PNG_FREE_HIST;
-
-   for (i = 0; i < info_ptr->num_palette; i++)
-      info_ptr->hist[i] = hist[i];
-
-   info_ptr->valid |= PNG_INFO_hIST;
-}
-#endif
-
-void PNGAPI
-png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_type, int compression_type,
-    int filter_type)
-{
-   png_debug1(1, "in %s storage function", "IHDR");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->width = width;
-   info_ptr->height = height;
-   info_ptr->bit_depth = (png_byte)bit_depth;
-   info_ptr->color_type = (png_byte)color_type;
-   info_ptr->compression_type = (png_byte)compression_type;
-   info_ptr->filter_type = (png_byte)filter_type;
-   info_ptr->interlace_type = (png_byte)interlace_type;
-
-   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
-       info_ptr->compression_type, info_ptr->filter_type);
-
-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      info_ptr->channels = 1;
-
-   else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
-      info_ptr->channels = 3;
-
-   else
-      info_ptr->channels = 1;
-
-   if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-      info_ptr->channels++;
-
-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
-
-   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
-}
-
-#ifdef PNG_oFFs_SUPPORTED
-void PNGAPI
-png_set_oFFs(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_int_32 offset_x, png_int_32 offset_y, int unit_type)
-{
-   png_debug1(1, "in %s storage function", "oFFs");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->x_offset = offset_x;
-   info_ptr->y_offset = offset_y;
-   info_ptr->offset_unit_type = (png_byte)unit_type;
-   info_ptr->valid |= PNG_INFO_oFFs;
-}
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-void PNGAPI
-png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
-    int nparams, png_const_charp units, png_charpp params)
-{
-   png_size_t length;
-   int i;
-
-   png_debug1(1, "in %s storage function", "pCAL");
-
-   if (png_ptr == NULL || info_ptr == NULL || purpose == NULL || units == NULL
-       || (nparams > 0 && params == NULL))
-      return;
-
-   length = strlen(purpose) + 1;
-   png_debug1(3, "allocating purpose for info (%lu bytes)",
-       (unsigned long)length);
-
-   /* TODO: validate format of calibration name and unit name */
-
-   /* Check that the type matches the specification. */
-   if (type < 0 || type > 3)
-   {
-      png_chunk_report(png_ptr, "Invalid pCAL equation type",
-            PNG_CHUNK_WRITE_ERROR);
-      return;
-   }
-
-   if (nparams < 0 || nparams > 255)
-   {
-      png_chunk_report(png_ptr, "Invalid pCAL parameter count",
-            PNG_CHUNK_WRITE_ERROR);
-      return;
-   }
-
-   /* Validate params[nparams] */
-   for (i=0; i<nparams; ++i)
-   {
-      if (params[i] == NULL ||
-          !png_check_fp_string(params[i], strlen(params[i])))
-      {
-         png_chunk_report(png_ptr, "Invalid format for pCAL parameter",
-               PNG_CHUNK_WRITE_ERROR);
-         return;
-      }
-   }
-
-   info_ptr->pcal_purpose = png_voidcast(png_charp,
-       png_malloc_warn(png_ptr, length));
-
-   if (info_ptr->pcal_purpose == NULL)
-   {
-      png_chunk_report(png_ptr, "Insufficient memory for pCAL purpose",
-            PNG_CHUNK_WRITE_ERROR);
-      return;
-   }
-
-   memcpy(info_ptr->pcal_purpose, purpose, length);
-
-   png_debug(3, "storing X0, X1, type, and nparams in info");
-   info_ptr->pcal_X0 = X0;
-   info_ptr->pcal_X1 = X1;
-   info_ptr->pcal_type = (png_byte)type;
-   info_ptr->pcal_nparams = (png_byte)nparams;
-
-   length = strlen(units) + 1;
-   png_debug1(3, "allocating units for info (%lu bytes)",
-       (unsigned long)length);
-
-   info_ptr->pcal_units = png_voidcast(png_charp,
-       png_malloc_warn(png_ptr, length));
-
-   if (info_ptr->pcal_units == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL units");
-
-      return;
-   }
-
-   memcpy(info_ptr->pcal_units, units, length);
-
-   info_ptr->pcal_params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
-       (png_size_t)(((unsigned int)nparams + 1) * (sizeof (png_charp)))));
-
-   if (info_ptr->pcal_params == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL params");
-
-      return;
-   }
-
-   memset(info_ptr->pcal_params, 0, ((unsigned int)nparams + 1) *
-       (sizeof (png_charp)));
-
-   for (i = 0; i < nparams; i++)
-   {
-      length = strlen(params[i]) + 1;
-      png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
-          (unsigned long)length);
-
-      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
-
-      if (info_ptr->pcal_params[i] == NULL)
-      {
-         png_warning(png_ptr, "Insufficient memory for pCAL parameter");
-
-         return;
-      }
-
-      memcpy(info_ptr->pcal_params[i], params[i], length);
-   }
-
-   info_ptr->valid |= PNG_INFO_pCAL;
-   info_ptr->free_me |= PNG_FREE_PCAL;
-}
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-void PNGAPI
-png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,
-    int unit, png_const_charp swidth, png_const_charp sheight)
-{
-   png_size_t lengthw = 0, lengthh = 0;
-
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Double check the unit (should never get here with an invalid
-    * unit unless this is an API call.)
-    */
-   if (unit != 1 && unit != 2)
-      png_error(png_ptr, "Invalid sCAL unit");
-
-   if (swidth == NULL || (lengthw = strlen(swidth)) == 0 ||
-       swidth[0] == 45 /* '-' */ || !png_check_fp_string(swidth, lengthw))
-      png_error(png_ptr, "Invalid sCAL width");
-
-   if (sheight == NULL || (lengthh = strlen(sheight)) == 0 ||
-       sheight[0] == 45 /* '-' */ || !png_check_fp_string(sheight, lengthh))
-      png_error(png_ptr, "Invalid sCAL height");
-
-   info_ptr->scal_unit = (png_byte)unit;
-
-   ++lengthw;
-
-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
-
-   info_ptr->scal_s_width = png_voidcast(png_charp,
-       png_malloc_warn(png_ptr, lengthw));
-
-   if (info_ptr->scal_s_width == NULL)
-   {
-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");
-
-      return;
-   }
-
-   memcpy(info_ptr->scal_s_width, swidth, lengthw);
-
-   ++lengthh;
-
-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
-
-   info_ptr->scal_s_height = png_voidcast(png_charp,
-       png_malloc_warn(png_ptr, lengthh));
-
-   if (info_ptr->scal_s_height == NULL)
-   {
-      png_free (png_ptr, info_ptr->scal_s_width);
-      info_ptr->scal_s_width = NULL;
-
-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");
-
-      return;
-   }
-
-   memcpy(info_ptr->scal_s_height, sheight, lengthh);
-
-   info_ptr->valid |= PNG_INFO_sCAL;
-   info_ptr->free_me |= PNG_FREE_SCAL;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_sCAL(png_const_structrp png_ptr, png_inforp info_ptr, int unit,
-    double width, double height)
-{
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   /* Check the arguments. */
-   if (width <= 0)
-      png_warning(png_ptr, "Invalid sCAL width ignored");
-
-   else if (height <= 0)
-      png_warning(png_ptr, "Invalid sCAL height ignored");
-
-   else
-   {
-      /* Convert 'width' and 'height' to ASCII. */
-      char swidth[PNG_sCAL_MAX_DIGITS+1];
-      char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-      png_ascii_from_fp(png_ptr, swidth, (sizeof swidth), width,
-          PNG_sCAL_PRECISION);
-      png_ascii_from_fp(png_ptr, sheight, (sizeof sheight), height,
-          PNG_sCAL_PRECISION);
-
-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
-   }
-}
-#  endif
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-void PNGAPI
-png_set_sCAL_fixed(png_const_structrp png_ptr, png_inforp info_ptr, int unit,
-    png_fixed_point width, png_fixed_point height)
-{
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   /* Check the arguments. */
-   if (width <= 0)
-      png_warning(png_ptr, "Invalid sCAL width ignored");
-
-   else if (height <= 0)
-      png_warning(png_ptr, "Invalid sCAL height ignored");
-
-   else
-   {
-      /* Convert 'width' and 'height' to ASCII. */
-      char swidth[PNG_sCAL_MAX_DIGITS+1];
-      char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-      png_ascii_from_fixed(png_ptr, swidth, (sizeof swidth), width);
-      png_ascii_from_fixed(png_ptr, sheight, (sizeof sheight), height);
-
-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
-   }
-}
-#  endif
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-void PNGAPI
-png_set_pHYs(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_uint_32 res_x, png_uint_32 res_y, int unit_type)
-{
-   png_debug1(1, "in %s storage function", "pHYs");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->x_pixels_per_unit = res_x;
-   info_ptr->y_pixels_per_unit = res_y;
-   info_ptr->phys_unit_type = (png_byte)unit_type;
-   info_ptr->valid |= PNG_INFO_pHYs;
-}
-#endif
-
-void PNGAPI
-png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
-    png_const_colorp palette, int num_palette)
-{
-
-   png_uint_32 max_palette_length;
-
-   png_debug1(1, "in %s storage function", "PLTE");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   max_palette_length = (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
-      (1 << info_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;
-
-   if (num_palette < 0 || num_palette > (int) max_palette_length)
-   {
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-         png_error(png_ptr, "Invalid palette length");
-
-      else
-      {
-         png_warning(png_ptr, "Invalid palette length");
-
-         return;
-      }
-   }
-
-   if ((num_palette > 0 && palette == NULL) ||
-      (num_palette == 0
-#        ifdef PNG_MNG_FEATURES_SUPPORTED
-            && (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0
-#        endif
-      ))
-   {
-      png_error(png_ptr, "Invalid palette");
-   }
-
-   /* It may not actually be necessary to set png_ptr->palette here;
-    * we do it for backward compatibility with the way the png_handle_tRNS
-    * function used to do the allocation.
-    *
-    * 1.6.0: the above statement appears to be incorrect; something has to set
-    * the palette inside png_struct on read.
-    */
-   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
-
-   /* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead
-    * of num_palette entries, in case of an invalid PNG file or incorrect
-    * call to png_set_PLTE() with too-large sample values.
-    */
-   png_ptr->palette = png_voidcast(png_colorp, png_calloc(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));
-
-   if (num_palette > 0)
-      memcpy(png_ptr->palette, palette, (unsigned int)num_palette *
-          (sizeof (png_color)));
-   info_ptr->palette = png_ptr->palette;
-   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
-
-   info_ptr->free_me |= PNG_FREE_PLTE;
-
-   info_ptr->valid |= PNG_INFO_PLTE;
-}
-
-#ifdef PNG_sBIT_SUPPORTED
-void PNGAPI
-png_set_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_color_8p sig_bit)
-{
-   png_debug1(1, "in %s storage function", "sBIT");
-
-   if (png_ptr == NULL || info_ptr == NULL || sig_bit == NULL)
-      return;
-
-   info_ptr->sig_bit = *sig_bit;
-   info_ptr->valid |= PNG_INFO_sBIT;
-}
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-void PNGAPI
-png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)
-{
-   png_debug1(1, "in %s storage function", "sRGB");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-
-void PNGAPI
-png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
-    int srgb_intent)
-{
-   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace,
-       srgb_intent) != 0)
-   {
-      /* This causes the gAMA and cHRM to be written too */
-      info_ptr->colorspace.flags |=
-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-   }
-
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-#endif /* sRGB */
-
-
-#ifdef PNG_iCCP_SUPPORTED
-void PNGAPI
-png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_charp name, int compression_type,
-    png_const_bytep profile, png_uint_32 proflen)
-{
-   png_charp new_iccp_name;
-   png_bytep new_iccp_profile;
-   png_size_t length;
-
-   png_debug1(1, "in %s storage function", "iCCP");
-
-   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
-      return;
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-      png_app_error(png_ptr, "Invalid iCCP compression method");
-
-   /* Set the colorspace first because this validates the profile; do not
-    * override previously set app cHRM or gAMA here (because likely as not the
-    * application knows better than libpng what the correct values are.)  Pass
-    * the info_ptr color_type field to png_colorspace_set_ICC because in the
-    * write case it has not yet been stored in png_ptr.
-    */
-   {
-      int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,
-          proflen, profile, info_ptr->color_type);
-
-      png_colorspace_sync_info(png_ptr, info_ptr);
-
-      /* Don't do any of the copying if the profile was bad, or inconsistent. */
-      if (result == 0)
-         return;
-
-      /* But do write the gAMA and cHRM chunks from the profile. */
-      info_ptr->colorspace.flags |=
-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-   }
-
-   length = strlen(name)+1;
-   new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));
-
-   if (new_iccp_name == NULL)
-   {
-      png_benign_error(png_ptr, "Insufficient memory to process iCCP chunk");
-
-      return;
-   }
-
-   memcpy(new_iccp_name, name, length);
-   new_iccp_profile = png_voidcast(png_bytep,
-       png_malloc_warn(png_ptr, proflen));
-
-   if (new_iccp_profile == NULL)
-   {
-      png_free(png_ptr, new_iccp_name);
-      png_benign_error(png_ptr,
-          "Insufficient memory to process iCCP profile");
-
-      return;
-   }
-
-   memcpy(new_iccp_profile, profile, proflen);
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
-
-   info_ptr->iccp_proflen = proflen;
-   info_ptr->iccp_name = new_iccp_name;
-   info_ptr->iccp_profile = new_iccp_profile;
-   info_ptr->free_me |= PNG_FREE_ICCP;
-   info_ptr->valid |= PNG_INFO_iCCP;
-}
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-void PNGAPI
-png_set_text(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_textp text_ptr, int num_text)
-{
-   int ret;
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
-
-   if (ret != 0)
-      png_error(png_ptr, "Insufficient memory to store text");
-}
-
-int /* PRIVATE */
-png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_textp text_ptr, int num_text)
-{
-   int i;
-
-   png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11U :
-      (unsigned long)png_ptr->chunk_name);
-
-   if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)
-      return(0);
-
-   /* Make sure we have enough space in the "text" array in info_struct
-    * to hold all of the incoming text_ptr objects.  This compare can't overflow
-    * because max_text >= num_text (anyway, subtract of two positive integers
-    * can't overflow in any case.)
-    */
-   if (num_text > info_ptr->max_text - info_ptr->num_text)
-   {
-      int old_num_text = info_ptr->num_text;
-      int max_text;
-      png_textp new_text = NULL;
-
-      /* Calculate an appropriate max_text, checking for overflow. */
-      max_text = old_num_text;
-      if (num_text <= INT_MAX - max_text)
-      {
-         max_text += num_text;
-
-         /* Round up to a multiple of 8 */
-         if (max_text < INT_MAX-8)
-            max_text = (max_text + 8) & ~0x7;
-
-         else
-            max_text = INT_MAX;
-
-         /* Now allocate a new array and copy the old members in; this does all
-          * the overflow checks.
-          */
-         new_text = png_voidcast(png_textp,png_realloc_array(png_ptr,
-             info_ptr->text, old_num_text, max_text-old_num_text,
-             sizeof *new_text));
-      }
-
-      if (new_text == NULL)
-      {
-         png_chunk_report(png_ptr, "too many text chunks",
-             PNG_CHUNK_WRITE_ERROR);
-
-         return 1;
-      }
-
-      png_free(png_ptr, info_ptr->text);
-
-      info_ptr->text = new_text;
-      info_ptr->free_me |= PNG_FREE_TEXT;
-      info_ptr->max_text = max_text;
-      /* num_text is adjusted below as the entries are copied in */
-
-      png_debug1(3, "allocated %d entries for info_ptr->text", max_text);
-   }
-
-   for (i = 0; i < num_text; i++)
-   {
-      size_t text_length, key_len;
-      size_t lang_len, lang_key_len;
-      png_textp textp = &(info_ptr->text[info_ptr->num_text]);
-
-      if (text_ptr[i].key == NULL)
-          continue;
-
-      if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||
-          text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)
-      {
-         png_chunk_report(png_ptr, "text compression mode is out of range",
-             PNG_CHUNK_WRITE_ERROR);
-         continue;
-      }
-
-      key_len = strlen(text_ptr[i].key);
-
-      if (text_ptr[i].compression <= 0)
-      {
-         lang_len = 0;
-         lang_key_len = 0;
-      }
-
-      else
-#  ifdef PNG_iTXt_SUPPORTED
-      {
-         /* Set iTXt data */
-
-         if (text_ptr[i].lang != NULL)
-            lang_len = strlen(text_ptr[i].lang);
-
-         else
-            lang_len = 0;
-
-         if (text_ptr[i].lang_key != NULL)
-            lang_key_len = strlen(text_ptr[i].lang_key);
-
-         else
-            lang_key_len = 0;
-      }
-#  else /* iTXt */
-      {
-         png_chunk_report(png_ptr, "iTXt chunk not supported",
-             PNG_CHUNK_WRITE_ERROR);
-         continue;
-      }
-#  endif
-
-      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
-      {
-         text_length = 0;
-#  ifdef PNG_iTXt_SUPPORTED
-         if (text_ptr[i].compression > 0)
-            textp->compression = PNG_ITXT_COMPRESSION_NONE;
-
-         else
-#  endif
-            textp->compression = PNG_TEXT_COMPRESSION_NONE;
-      }
-
-      else
-      {
-         text_length = strlen(text_ptr[i].text);
-         textp->compression = text_ptr[i].compression;
-      }
-
-      textp->key = png_voidcast(png_charp,png_malloc_base(png_ptr,
-          key_len + text_length + lang_len + lang_key_len + 4));
-
-      if (textp->key == NULL)
-      {
-         png_chunk_report(png_ptr, "text chunk: out of memory",
-             PNG_CHUNK_WRITE_ERROR);
-
-         return 1;
-      }
-
-      png_debug2(2, "Allocated %lu bytes at %p in png_set_text",
-          (unsigned long)(png_uint_32)
-          (key_len + lang_len + lang_key_len + text_length + 4),
-          textp->key);
-
-      memcpy(textp->key, text_ptr[i].key, key_len);
-      *(textp->key + key_len) = '\0';
-
-      if (text_ptr[i].compression > 0)
-      {
-         textp->lang = textp->key + key_len + 1;
-         memcpy(textp->lang, text_ptr[i].lang, lang_len);
-         *(textp->lang + lang_len) = '\0';
-         textp->lang_key = textp->lang + lang_len + 1;
-         memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
-         *(textp->lang_key + lang_key_len) = '\0';
-         textp->text = textp->lang_key + lang_key_len + 1;
-      }
-
-      else
-      {
-         textp->lang=NULL;
-         textp->lang_key=NULL;
-         textp->text = textp->key + key_len + 1;
-      }
-
-      if (text_length != 0)
-         memcpy(textp->text, text_ptr[i].text, text_length);
-
-      *(textp->text + text_length) = '\0';
-
-#  ifdef PNG_iTXt_SUPPORTED
-      if (textp->compression > 0)
-      {
-         textp->text_length = 0;
-         textp->itxt_length = text_length;
-      }
-
-      else
-#  endif
-      {
-         textp->text_length = text_length;
-         textp->itxt_length = 0;
-      }
-
-      info_ptr->num_text++;
-      png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
-   }
-
-   return(0);
-}
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-void PNGAPI
-png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_const_timep mod_time)
-{
-   png_debug1(1, "in %s storage function", "tIME");
-
-   if (png_ptr == NULL || info_ptr == NULL || mod_time == NULL ||
-       (png_ptr->mode & PNG_WROTE_tIME) != 0)
-      return;
-
-   if (mod_time->month == 0   || mod_time->month > 12  ||
-       mod_time->day   == 0   || mod_time->day   > 31  ||
-       mod_time->hour  > 23   || mod_time->minute > 59 ||
-       mod_time->second > 60)
-   {
-      png_warning(png_ptr, "Ignoring invalid time value");
-
-      return;
-   }
-
-   info_ptr->mod_time = *mod_time;
-   info_ptr->valid |= PNG_INFO_tIME;
-}
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-void PNGAPI
-png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
-    png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)
-{
-   png_debug1(1, "in %s storage function", "tRNS");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-
-      return;
-
-   if (trans_alpha != NULL)
-   {
-       /* It may not actually be necessary to set png_ptr->trans_alpha here;
-        * we do it for backward compatibility with the way the png_handle_tRNS
-        * function used to do the allocation.
-        *
-        * 1.6.0: The above statement is incorrect; png_handle_tRNS effectively
-        * relies on png_set_tRNS storing the information in png_struct
-        * (otherwise it won't be there for the code in pngrtran.c).
-        */
-
-       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
-
-       if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
-       {
-         /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
-          info_ptr->trans_alpha = png_voidcast(png_bytep,
-              png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
-          memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
-       }
-       png_ptr->trans_alpha = info_ptr->trans_alpha;
-   }
-
-   if (trans_color != NULL)
-   {
-#ifdef PNG_WARNINGS_SUPPORTED
-      if (info_ptr->bit_depth < 16)
-      {
-         int sample_max = (1 << info_ptr->bit_depth) - 1;
-
-         if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
-             trans_color->gray > sample_max) ||
-             (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-             (trans_color->red > sample_max ||
-             trans_color->green > sample_max ||
-             trans_color->blue > sample_max)))
-            png_warning(png_ptr,
-                "tRNS chunk has out-of-range samples for bit_depth");
-      }
-#endif
-
-      info_ptr->trans_color = *trans_color;
-
-      if (num_trans == 0)
-         num_trans = 1;
-   }
-
-   info_ptr->num_trans = (png_uint_16)num_trans;
-
-   if (num_trans != 0)
-   {
-      info_ptr->valid |= PNG_INFO_tRNS;
-      info_ptr->free_me |= PNG_FREE_TRNS;
-   }
-}
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-void PNGAPI
-png_set_sPLT(png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries)
-/*
- *  entries        - array of png_sPLT_t structures
- *                   to be added to the list of palettes
- *                   in the info structure.
- *
- *  nentries       - number of palette structures to be
- *                   added.
- */
-{
-   png_sPLT_tp np;
-
-   if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)
-      return;
-
-   /* Use the internal realloc function, which checks for all the possible
-    * overflows.  Notice that the parameters are (int) and (size_t)
-    */
-   np = png_voidcast(png_sPLT_tp,png_realloc_array(png_ptr,
-       info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,
-       sizeof *np));
-
-   if (np == NULL)
-   {
-      /* Out of memory or too many chunks */
-      png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR);
-
-      return;
-   }
-
-   png_free(png_ptr, info_ptr->splt_palettes);
-   info_ptr->splt_palettes = np;
-   info_ptr->free_me |= PNG_FREE_SPLT;
-
-   np += info_ptr->splt_palettes_num;
-
-   do
-   {
-      png_size_t length;
-
-      /* Skip invalid input entries */
-      if (entries->name == NULL || entries->entries == NULL)
-      {
-         /* png_handle_sPLT doesn't do this, so this is an app error */
-         png_app_error(png_ptr, "png_set_sPLT: invalid sPLT");
-         /* Just skip the invalid entry */
-         continue;
-      }
-
-      np->depth = entries->depth;
-
-      /* In the event of out-of-memory just return - there's no point keeping
-       * on trying to add sPLT chunks.
-       */
-      length = strlen(entries->name) + 1;
-      np->name = png_voidcast(png_charp, png_malloc_base(png_ptr, length));
-
-      if (np->name == NULL)
-         break;
-
-      memcpy(np->name, entries->name, length);
-
-      /* IMPORTANT: we have memory now that won't get freed if something else
-       * goes wrong; this code must free it.  png_malloc_array produces no
-       * warnings; use a png_chunk_report (below) if there is an error.
-       */
-      np->entries = png_voidcast(png_sPLT_entryp, png_malloc_array(png_ptr,
-          entries->nentries, sizeof (png_sPLT_entry)));
-
-      if (np->entries == NULL)
-      {
-         png_free(png_ptr, np->name);
-         np->name = NULL;
-         break;
-      }
-
-      np->nentries = entries->nentries;
-      /* This multiply can't overflow because png_malloc_array has already
-       * checked it when doing the allocation.
-       */
-      memcpy(np->entries, entries->entries,
-          (unsigned int)entries->nentries * sizeof (png_sPLT_entry));
-
-      /* Note that 'continue' skips the advance of the out pointer and out
-       * count, so an invalid entry is not added.
-       */
-      info_ptr->valid |= PNG_INFO_sPLT;
-      ++(info_ptr->splt_palettes_num);
-      ++np;
-      ++entries;
-   }
-   while (--nentries);
-
-   if (nentries > 0)
-      png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);
-}
-#endif /* sPLT */
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-static png_byte
-check_location(png_const_structrp png_ptr, int location)
-{
-   location &= (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT);
-
-   /* New in 1.6.0; copy the location and check it.  This is an API
-    * change; previously the app had to use the
-    * png_set_unknown_chunk_location API below for each chunk.
-    */
-   if (location == 0 && (png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-   {
-      /* Write struct, so unknown chunks come from the app */
-      png_app_warning(png_ptr,
-          "png_set_unknown_chunks now expects a valid location");
-      /* Use the old behavior */
-      location = (png_byte)(png_ptr->mode &
-          (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));
-   }
-
-   /* This need not be an internal error - if the app calls
-    * png_set_unknown_chunks on a read pointer it must get the location right.
-    */
-   if (location == 0)
-      png_error(png_ptr, "invalid location in png_set_unknown_chunks");
-
-   /* Now reduce the location to the top-most set bit by removing each least
-    * significant bit in turn.
-    */
-   while (location != (location & -location))
-      location &= ~(location & -location);
-
-   /* The cast is safe because 'location' is a bit mask and only the low four
-    * bits are significant.
-    */
-   return (png_byte)location;
-}
-
-void PNGAPI
-png_set_unknown_chunks(png_const_structrp png_ptr,
-    png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
-{
-   png_unknown_chunkp np;
-
-   if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 ||
-       unknowns == NULL)
-      return;
-
-   /* Check for the failure cases where support has been disabled at compile
-    * time.  This code is hardly ever compiled - it's here because
-    * STORE_UNKNOWN_CHUNKS is set by both read and write code (compiling in this
-    * code) but may be meaningless if the read or write handling of unknown
-    * chunks is not compiled in.
-    */
-#  if !defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) && \
-      defined(PNG_READ_SUPPORTED)
-      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-      {
-         png_app_error(png_ptr, "no unknown chunk support on read");
-
-         return;
-      }
-#  endif
-#  if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \
-      defined(PNG_WRITE_SUPPORTED)
-      if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-      {
-         png_app_error(png_ptr, "no unknown chunk support on write");
-
-         return;
-      }
-#  endif
-
-   /* Prior to 1.6.0 this code used png_malloc_warn; however, this meant that
-    * unknown critical chunks could be lost with just a warning resulting in
-    * undefined behavior.  Now png_chunk_report is used to provide behavior
-    * appropriate to read or write.
-    */
-   np = png_voidcast(png_unknown_chunkp, png_realloc_array(png_ptr,
-       info_ptr->unknown_chunks, info_ptr->unknown_chunks_num, num_unknowns,
-       sizeof *np));
-
-   if (np == NULL)
-   {
-      png_chunk_report(png_ptr, "too many unknown chunks",
-          PNG_CHUNK_WRITE_ERROR);
-
-      return;
-   }
-
-   png_free(png_ptr, info_ptr->unknown_chunks);
-   info_ptr->unknown_chunks = np; /* safe because it is initialized */
-   info_ptr->free_me |= PNG_FREE_UNKN;
-
-   np += info_ptr->unknown_chunks_num;
-
-   /* Increment unknown_chunks_num each time round the loop to protect the
-    * just-allocated chunk data.
-    */
-   for (; num_unknowns > 0; --num_unknowns, ++unknowns)
-   {
-      memcpy(np->name, unknowns->name, (sizeof np->name));
-      np->name[(sizeof np->name)-1] = '\0';
-      np->location = check_location(png_ptr, unknowns->location);
-
-      if (unknowns->size == 0)
-      {
-         np->data = NULL;
-         np->size = 0;
-      }
-
-      else
-      {
-         np->data = png_voidcast(png_bytep,
-             png_malloc_base(png_ptr, unknowns->size));
-
-         if (np->data == NULL)
-         {
-            png_chunk_report(png_ptr, "unknown chunk: out of memory",
-                PNG_CHUNK_WRITE_ERROR);
-            /* But just skip storing the unknown chunk */
-            continue;
-         }
-
-         memcpy(np->data, unknowns->data, unknowns->size);
-         np->size = unknowns->size;
-      }
-
-      /* These increments are skipped on out-of-memory for the data - the
-       * unknown chunk entry gets overwritten if the png_chunk_report returns.
-       * This is correct in the read case (the chunk is just dropped.)
-       */
-      ++np;
-      ++(info_ptr->unknown_chunks_num);
-   }
-}
-
-void PNGAPI
-png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
-    int chunk, int location)
-{
-   /* This API is pretty pointless in 1.6.0 because the location can be set
-    * before the call to png_set_unknown_chunks.
-    *
-    * TODO: add a png_app_warning in 1.7
-    */
-   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 &&
-      chunk < info_ptr->unknown_chunks_num)
-   {
-      if ((location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)
-      {
-         png_app_error(png_ptr, "invalid unknown chunk location");
-         /* Fake out the pre 1.6.0 behavior: */
-         if (((unsigned int)location & PNG_HAVE_IDAT) != 0) /* undocumented! */
-            location = PNG_AFTER_IDAT;
-
-         else
-            location = PNG_HAVE_IHDR; /* also undocumented */
-      }
-
-      info_ptr->unknown_chunks[chunk].location =
-         check_location(png_ptr, location);
-   }
-}
-#endif /* STORE_UNKNOWN_CHUNKS */
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-png_uint_32 PNGAPI
-png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
-{
-   png_debug(1, "in png_permit_mng_features");
-
-   if (png_ptr == NULL)
-      return 0;
-
-   png_ptr->mng_features_permitted = mng_features & PNG_ALL_MNG_FEATURES;
-
-   return png_ptr->mng_features_permitted;
-}
-#endif
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-static unsigned int
-add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep)
-{
-   unsigned int i;
-
-   /* Utility function: update the 'keep' state of a chunk if it is already in
-    * the list, otherwise add it to the list.
-    */
-   for (i=0; i<count; ++i, list += 5)
-   {
-      if (memcmp(list, add, 4) == 0)
-      {
-         list[4] = (png_byte)keep;
-
-         return count;
-      }
-   }
-
-   if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT)
-   {
-      ++count;
-      memcpy(list, add, 4);
-      list[4] = (png_byte)keep;
-   }
-
-   return count;
-}
-
-void PNGAPI
-png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
-    png_const_bytep chunk_list, int num_chunks_in)
-{
-   png_bytep new_list;
-   unsigned int num_chunks, old_num_chunks;
-
-   if (png_ptr == NULL)
-      return;
-
-   if (keep < 0 || keep >= PNG_HANDLE_CHUNK_LAST)
-   {
-      png_app_error(png_ptr, "png_set_keep_unknown_chunks: invalid keep");
-
-      return;
-   }
-
-   if (num_chunks_in <= 0)
-   {
-      png_ptr->unknown_default = keep;
-
-      /* '0' means just set the flags, so stop here */
-      if (num_chunks_in == 0)
-        return;
-   }
-
-   if (num_chunks_in < 0)
-   {
-      /* Ignore all unknown chunks and all chunks recognized by
-       * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND
-       */
-      static PNG_CONST png_byte chunks_to_ignore[] = {
-         98,  75,  71,  68, '\0',  /* bKGD */
-         99,  72,  82,  77, '\0',  /* cHRM */
-        101,  88,  73, 102, '\0',  /* eXIf */
-        103,  65,  77,  65, '\0',  /* gAMA */
-        104,  73,  83,  84, '\0',  /* hIST */
-        105,  67,  67,  80, '\0',  /* iCCP */
-        105,  84,  88, 116, '\0',  /* iTXt */
-        111,  70,  70, 115, '\0',  /* oFFs */
-        112,  67,  65,  76, '\0',  /* pCAL */
-        112,  72,  89, 115, '\0',  /* pHYs */
-        115,  66,  73,  84, '\0',  /* sBIT */
-        115,  67,  65,  76, '\0',  /* sCAL */
-        115,  80,  76,  84, '\0',  /* sPLT */
-        115,  84,  69,  82, '\0',  /* sTER */
-        115,  82,  71,  66, '\0',  /* sRGB */
-        116,  69,  88, 116, '\0',  /* tEXt */
-        116,  73,  77,  69, '\0',  /* tIME */
-        122,  84,  88, 116, '\0'   /* zTXt */
-      };
-
-      chunk_list = chunks_to_ignore;
-      num_chunks = (unsigned int)/*SAFE*/(sizeof chunks_to_ignore)/5U;
-   }
-
-   else /* num_chunks_in > 0 */
-   {
-      if (chunk_list == NULL)
-      {
-         /* Prior to 1.6.0 this was silently ignored, now it is an app_error
-          * which can be switched off.
-          */
-         png_app_error(png_ptr, "png_set_keep_unknown_chunks: no chunk list");
-
-         return;
-      }
-
-      num_chunks = (unsigned int)num_chunks_in;
-   }
-
-   old_num_chunks = png_ptr->num_chunk_list;
-   if (png_ptr->chunk_list == NULL)
-      old_num_chunks = 0;
-
-   /* Since num_chunks is always restricted to UINT_MAX/5 this can't overflow.
-    */
-   if (num_chunks + old_num_chunks > UINT_MAX/5)
-   {
-      png_app_error(png_ptr, "png_set_keep_unknown_chunks: too many chunks");
-
-      return;
-   }
-
-   /* If these chunks are being reset to the default then no more memory is
-    * required because add_one_chunk above doesn't extend the list if the 'keep'
-    * parameter is the default.
-    */
-   if (keep != 0)
-   {
-      new_list = png_voidcast(png_bytep, png_malloc(png_ptr,
-          5 * (num_chunks + old_num_chunks)));
-
-      if (old_num_chunks > 0)
-         memcpy(new_list, png_ptr->chunk_list, 5*old_num_chunks);
-   }
-
-   else if (old_num_chunks > 0)
-      new_list = png_ptr->chunk_list;
-
-   else
-      new_list = NULL;
-
-   /* Add the new chunks together with each one's handling code.  If the chunk
-    * already exists the code is updated, otherwise the chunk is added to the
-    * end.  (In libpng 1.6.0 order no longer matters because this code enforces
-    * the earlier convention that the last setting is the one that is used.)
-    */
-   if (new_list != NULL)
-   {
-      png_const_bytep inlist;
-      png_bytep outlist;
-      unsigned int i;
-
-      for (i=0; i<num_chunks; ++i)
-      {
-         old_num_chunks = add_one_chunk(new_list, old_num_chunks,
-             chunk_list+5*i, keep);
-      }
-
-      /* Now remove any spurious 'default' entries. */
-      num_chunks = 0;
-      for (i=0, inlist=outlist=new_list; i<old_num_chunks; ++i, inlist += 5)
-      {
-         if (inlist[4])
-         {
-            if (outlist != inlist)
-               memcpy(outlist, inlist, 5);
-            outlist += 5;
-            ++num_chunks;
-         }
-      }
-
-      /* This means the application has removed all the specialized handling. */
-      if (num_chunks == 0)
-      {
-         if (png_ptr->chunk_list != new_list)
-            png_free(png_ptr, new_list);
-
-         new_list = NULL;
-      }
-   }
-
-   else
-      num_chunks = 0;
-
-   png_ptr->num_chunk_list = num_chunks;
-
-   if (png_ptr->chunk_list != new_list)
-   {
-      if (png_ptr->chunk_list != NULL)
-         png_free(png_ptr, png_ptr->chunk_list);
-
-      png_ptr->chunk_list = new_list;
-   }
-}
-#endif
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-void PNGAPI
-png_set_read_user_chunk_fn(png_structrp png_ptr, png_voidp user_chunk_ptr,
-    png_user_chunk_ptr read_user_chunk_fn)
-{
-   png_debug(1, "in png_set_read_user_chunk_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
-   png_ptr->user_chunk_ptr = user_chunk_ptr;
-}
-#endif
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
-    png_bytepp row_pointers)
-{
-   png_debug1(1, "in %s storage function", "rows");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (info_ptr->row_pointers != NULL &&
-       (info_ptr->row_pointers != row_pointers))
-      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-
-   info_ptr->row_pointers = row_pointers;
-
-   if (row_pointers != NULL)
-      info_ptr->valid |= PNG_INFO_IDAT;
-}
-#endif
-
-void PNGAPI
-png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
-{
-   if (png_ptr == NULL)
-      return;
-
-   if (size == 0 || size > PNG_UINT_31_MAX)
-      png_error(png_ptr, "invalid compression buffer size");
-
-#  ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-   {
-      png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */
-      return;
-   }
-#  endif
-
-#  ifdef PNG_WRITE_SUPPORTED
-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
-   {
-      if (png_ptr->zowner != 0)
-      {
-         png_warning(png_ptr,
-             "Compression buffer size cannot be changed because it is in use");
-
-         return;
-      }
-
-#ifndef __COVERITY__
-      /* Some compilers complain that this is always false.  However, it
-       * can be true when integer overflow happens.
-       */
-      if (size > ZLIB_IO_MAX)
-      {
-         png_warning(png_ptr,
-             "Compression buffer size limited to system maximum");
-         size = ZLIB_IO_MAX; /* must fit */
-      }
-#endif
-
-      if (size < 6)
-      {
-         /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH
-          * if this is permitted.
-          */
-         png_warning(png_ptr,
-             "Compression buffer size cannot be reduced below 6");
-
-         return;
-      }
-
-      if (png_ptr->zbuffer_size != size)
-      {
-         png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
-         png_ptr->zbuffer_size = (uInt)size;
-      }
-   }
-#  endif
-}
-
-void PNGAPI
-png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      info_ptr->valid &= (unsigned int)(~mask);
-}
-
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-/* This function was added to libpng 1.2.6 */
-void PNGAPI
-png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,
-    png_uint_32 user_height_max)
-{
-   /* Images with dimensions larger than these limits will be
-    * rejected by png_set_IHDR().  To accept any PNG datastream
-    * regardless of dimensions, set both limits to 0x7fffffff.
-    */
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->user_width_max = user_width_max;
-   png_ptr->user_height_max = user_height_max;
-}
-
-/* This function was added to libpng 1.4.0 */
-void PNGAPI
-png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
-{
-   if (png_ptr != NULL)
-      png_ptr->user_chunk_cache_max = user_chunk_cache_max;
-}
-
-/* This function was added to libpng 1.4.1 */
-void PNGAPI
-png_set_chunk_malloc_max (png_structrp png_ptr,
-    png_alloc_size_t user_chunk_malloc_max)
-{
-   if (png_ptr != NULL)
-      png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
-}
-#endif /* ?SET_USER_LIMITS */
-
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_set_benign_errors(png_structrp png_ptr, int allowed)
-{
-   png_debug(1, "in png_set_benign_errors");
-
-   /* If allowed is 1, png_benign_error() is treated as a warning.
-    *
-    * If allowed is 0, png_benign_error() is treated as an error (which
-    * is the default behavior if png_set_benign_errors() is not called).
-    */
-
-   if (allowed != 0)
-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN |
-         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN;
-
-   else
-      png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN |
-         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN);
-}
-#endif /* BENIGN_ERRORS */
-
-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   /* Whether to report invalid palette index; added at libng-1.5.10.
-    * It is possible for an indexed (color-type==3) PNG file to contain
-    * pixels with invalid (out-of-range) indexes if the PLTE chunk has
-    * fewer entries than the image's bit-depth would allow. We recover
-    * from this gracefully by filling any incomplete palette with zeros
-    * (opaque black).  By default, when this occurs libpng will issue
-    * a benign error.  This API can be used to override that behavior.
-    */
-void PNGAPI
-png_set_check_for_invalid_index(png_structrp png_ptr, int allowed)
-{
-   png_debug(1, "in png_set_check_for_invalid_index");
-
-   if (allowed > 0)
-      png_ptr->num_palette_max = 0;
-
-   else
-      png_ptr->num_palette_max = -1;
-}
-#endif
-
-#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_pCAL_SUPPORTED) || \
-    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
-/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
- * and if invalid, correct the keyword rather than discarding the entire
- * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
- * length, forbids leading or trailing whitespace, multiple internal spaces,
- * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
- *
- * The 'new_key' buffer must be 80 characters in size (for the keyword plus a
- * trailing '\0').  If this routine returns 0 then there was no keyword, or a
- * valid one could not be generated, and the caller must png_error.
- */
-png_uint_32 /* PRIVATE */
-png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
-{
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_const_charp orig_key = key;
-#endif
-   png_uint_32 key_len = 0;
-   int bad_character = 0;
-   int space = 1;
-
-   png_debug(1, "in png_check_keyword");
-
-   if (key == NULL)
-   {
-      *new_key = 0;
-      return 0;
-   }
-
-   while (*key && key_len < 79)
-   {
-      png_byte ch = (png_byte)*key++;
-
-      if ((ch > 32 && ch <= 126) || (ch >= 161 /*&& ch <= 255*/))
-      {
-         *new_key++ = ch; ++key_len; space = 0;
-      }
-
-      else if (space == 0)
-      {
-         /* A space or an invalid character when one wasn't seen immediately
-          * before; output just a space.
-          */
-         *new_key++ = 32; ++key_len; space = 1;
-
-         /* If the character was not a space then it is invalid. */
-         if (ch != 32)
-            bad_character = ch;
-      }
-
-      else if (bad_character == 0)
-         bad_character = ch; /* just skip it, record the first error */
-   }
-
-   if (key_len > 0 && space != 0) /* trailing space */
-   {
-      --key_len; --new_key;
-      if (bad_character == 0)
-         bad_character = 32;
-   }
-
-   /* Terminate the keyword */
-   *new_key = 0;
-
-   if (key_len == 0)
-      return 0;
-
-#ifdef PNG_WARNINGS_SUPPORTED
-   /* Try to only output one warning per keyword: */
-   if (*key != 0) /* keyword too long */
-      png_warning(png_ptr, "keyword truncated");
-
-   else if (bad_character != 0)
-   {
-      PNG_WARNING_PARAMETERS(p)
-
-      png_warning_parameter(p, 1, orig_key);
-      png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_02x, bad_character);
-
-      png_formatted_warning(png_ptr, p, "keyword \"@1\": bad character '0x@2'");
-   }
-#else /* !WARNINGS */
-   PNG_UNUSED(png_ptr)
-#endif /* !WARNINGS */
-
-   return key_len;
-}
-#endif /* TEXT || pCAL || iCCP || sPLT */
-#endif /* READ || WRITE */
diff --git a/src/png/libpng/pngstruct.h b/src/png/libpng/pngstruct.h
deleted file mode 100644
index d83f97125..000000000
--- a/src/png/libpng/pngstruct.h
+++ /dev/null
@@ -1,483 +0,0 @@
-
-/* pngstruct.h - header file for PNG reference library
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* The structure that holds the information to read and write PNG files.
- * The only people who need to care about what is inside of this are the
- * people who will be modifying the library for their own special needs.
- * It should NOT be accessed directly by an application.
- */
-
-#ifndef PNGSTRUCT_H
-#define PNGSTRUCT_H
-/* zlib.h defines the structure z_stream, an instance of which is included
- * in this structure and is required for decompressing the LZ compressed
- * data in PNG files.
- */
-#ifndef ZLIB_CONST
-   /* We must ensure that zlib uses 'const' in declarations. */
-#  define ZLIB_CONST
-#endif
-#include "zlib.h"
-#ifdef const
-   /* zlib.h sometimes #defines const to nothing, undo this. */
-#  undef const
-#endif
-
-/* zlib.h has mediocre z_const use before 1.2.6, this stuff is for compatibility
- * with older builds.
- */
-#if ZLIB_VERNUM < 0x1260
-#  define PNGZ_MSG_CAST(s) png_constcast(char*,s)
-#  define PNGZ_INPUT_CAST(b) png_constcast(png_bytep,b)
-#else
-#  define PNGZ_MSG_CAST(s) (s)
-#  define PNGZ_INPUT_CAST(b) (b)
-#endif
-
-/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
- * can handle at once.  This type need be no larger than 16 bits (so maximum of
- * 65535), this define allows us to discover how big it is, but limited by the
- * maximuum for png_size_t.  The value can be overriden in a library build
- * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
- * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)
- * and may even improve performance on some systems (and degrade it on others.)
- */
-#ifndef ZLIB_IO_MAX
-#  define ZLIB_IO_MAX ((uInt)-1)
-#endif
-
-#ifdef PNG_WRITE_SUPPORTED
-/* The type of a compression buffer list used by the write code. */
-typedef struct png_compression_buffer
-{
-   struct png_compression_buffer *next;
-   png_byte                       output[1]; /* actually zbuf_size */
-} png_compression_buffer, *png_compression_bufferp;
-
-#define PNG_COMPRESSION_BUFFER_SIZE(pp)\
-   (offsetof(png_compression_buffer, output) + (pp)->zbuffer_size)
-#endif
-
-/* Colorspace support; structures used in png_struct, png_info and in internal
- * functions to hold and communicate information about the color space.
- *
- * PNG_COLORSPACE_SUPPORTED is only required if the application will perform
- * colorspace corrections, otherwise all the colorspace information can be
- * skipped and the size of libpng can be reduced (significantly) by compiling
- * out the colorspace support.
- */
-#ifdef PNG_COLORSPACE_SUPPORTED
-/* The chromaticities of the red, green and blue colorants and the chromaticity
- * of the corresponding white point (i.e. of rgb(1.0,1.0,1.0)).
- */
-typedef struct png_xy
-{
-   png_fixed_point redx, redy;
-   png_fixed_point greenx, greeny;
-   png_fixed_point bluex, bluey;
-   png_fixed_point whitex, whitey;
-} png_xy;
-
-/* The same data as above but encoded as CIE XYZ values.  When this data comes
- * from chromaticities the sum of the Y values is assumed to be 1.0
- */
-typedef struct png_XYZ
-{
-   png_fixed_point red_X, red_Y, red_Z;
-   png_fixed_point green_X, green_Y, green_Z;
-   png_fixed_point blue_X, blue_Y, blue_Z;
-} png_XYZ;
-#endif /* COLORSPACE */
-
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-/* A colorspace is all the above plus, potentially, profile information;
- * however at present libpng does not use the profile internally so it is only
- * stored in the png_info struct (if iCCP is supported.)  The rendering intent
- * is retained here and is checked.
- *
- * The file gamma encoding information is also stored here and gamma correction
- * is done by libpng, whereas color correction must currently be done by the
- * application.
- */
-typedef struct png_colorspace
-{
-#ifdef PNG_GAMMA_SUPPORTED
-   png_fixed_point gamma;        /* File gamma */
-#endif
-
-#ifdef PNG_COLORSPACE_SUPPORTED
-   png_xy      end_points_xy;    /* End points as chromaticities */
-   png_XYZ     end_points_XYZ;   /* End points as CIE XYZ colorant values */
-   png_uint_16 rendering_intent; /* Rendering intent of a profile */
-#endif
-
-   /* Flags are always defined to simplify the code. */
-   png_uint_16 flags;            /* As defined below */
-} png_colorspace, * PNG_RESTRICT png_colorspacerp;
-
-typedef const png_colorspace * PNG_RESTRICT png_const_colorspacerp;
-
-/* General flags for the 'flags' field */
-#define PNG_COLORSPACE_HAVE_GAMMA           0x0001
-#define PNG_COLORSPACE_HAVE_ENDPOINTS       0x0002
-#define PNG_COLORSPACE_HAVE_INTENT          0x0004
-#define PNG_COLORSPACE_FROM_gAMA            0x0008
-#define PNG_COLORSPACE_FROM_cHRM            0x0010
-#define PNG_COLORSPACE_FROM_sRGB            0x0020
-#define PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB 0x0040
-#define PNG_COLORSPACE_MATCHES_sRGB         0x0080 /* exact match on profile */
-#define PNG_COLORSPACE_INVALID              0x8000
-#define PNG_COLORSPACE_CANCEL(flags)        (0xffff ^ (flags))
-#endif /* COLORSPACE || GAMMA */
-
-struct png_struct_def
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf jmp_buf_local;     /* New name in 1.6.0 for jmp_buf in png_struct */
-   png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */
-   jmp_buf *jmp_buf_ptr;      /* passed to longjmp_fn */
-   size_t jmp_buf_size;       /* size of the above, if allocated */
-#endif
-   png_error_ptr error_fn;    /* function for printing errors and aborting */
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_error_ptr warning_fn;  /* function for printing warnings */
-#endif
-   png_voidp error_ptr;       /* user supplied struct for error functions */
-   png_rw_ptr write_data_fn;  /* function for writing output data */
-   png_rw_ptr read_data_fn;   /* function for reading input data */
-   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   png_user_transform_ptr read_user_transform_fn; /* user read transform */
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-   png_user_transform_ptr write_user_transform_fn; /* user write transform */
-#endif
-
-/* These were added in libpng-1.0.2 */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-   png_voidp user_transform_ptr; /* user supplied struct for user transform */
-   png_byte user_transform_depth;    /* bit depth of user transformed pixels */
-   png_byte user_transform_channels; /* channels in user transformed pixels */
-#endif
-#endif
-
-   png_uint_32 mode;          /* tells us where we are in the PNG file */
-   png_uint_32 flags;         /* flags indicating various things to libpng */
-   png_uint_32 transformations; /* which transformations to perform */
-
-   png_uint_32 zowner;        /* ID (chunk type) of zstream owner, 0 if none */
-   z_stream    zstream;       /* decompression structure */
-
-#ifdef PNG_WRITE_SUPPORTED
-   png_compression_bufferp zbuffer_list; /* Created on demand during write */
-   uInt                    zbuffer_size; /* size of the actual buffer */
-
-   int zlib_level;            /* holds zlib compression level */
-   int zlib_method;           /* holds zlib compression method */
-   int zlib_window_bits;      /* holds zlib compression window bits */
-   int zlib_mem_level;        /* holds zlib compression memory level */
-   int zlib_strategy;         /* holds zlib compression strategy */
-#endif
-/* Added at libpng 1.5.4 */
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-   int zlib_text_level;            /* holds zlib compression level */
-   int zlib_text_method;           /* holds zlib compression method */
-   int zlib_text_window_bits;      /* holds zlib compression window bits */
-   int zlib_text_mem_level;        /* holds zlib compression memory level */
-   int zlib_text_strategy;         /* holds zlib compression strategy */
-#endif
-/* End of material added at libpng 1.5.4 */
-/* Added at libpng 1.6.0 */
-#ifdef PNG_WRITE_SUPPORTED
-   int zlib_set_level;        /* Actual values set into the zstream on write */
-   int zlib_set_method;
-   int zlib_set_window_bits;
-   int zlib_set_mem_level;
-   int zlib_set_strategy;
-#endif
-
-   png_uint_32 width;         /* width of image in pixels */
-   png_uint_32 height;        /* height of image in pixels */
-   png_uint_32 num_rows;      /* number of rows in current pass */
-   png_uint_32 usr_width;     /* width of row at start of write */
-   png_size_t rowbytes;       /* size of row in bytes */
-   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
-   png_uint_32 row_number;    /* current row in interlace pass */
-   png_uint_32 chunk_name;    /* PNG_CHUNK() id of current chunk */
-   png_bytep prev_row;        /* buffer to save previous (unfiltered) row.
-                               * While reading this is a pointer into
-                               * big_prev_row; while writing it is separately
-                               * allocated if needed.
-                               */
-   png_bytep row_buf;         /* buffer to save current (unfiltered) row.
-                               * While reading, this is a pointer into
-                               * big_row_buf; while writing it is separately
-                               * allocated.
-                               */
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_bytep try_row;    /* buffer to save trial row when filtering */
-   png_bytep tst_row;    /* buffer to save best trial row when filtering */
-#endif
-   png_size_t info_rowbytes;  /* Added in 1.5.4: cache of updated row bytes */
-
-   png_uint_32 idat_size;     /* current IDAT size for read */
-   png_uint_32 crc;           /* current chunk CRC value */
-   png_colorp palette;        /* palette from the input file */
-   png_uint_16 num_palette;   /* number of color entries in palette */
-
-/* Added at libpng-1.5.10 */
-#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   int num_palette_max;       /* maximum palette index found in IDAT */
-#endif
-
-   png_uint_16 num_trans;     /* number of transparency values */
-   png_byte compression;      /* file compression type (always 0) */
-   png_byte filter;           /* file filter type (always 0) */
-   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-   png_byte pass;             /* current interlace pass (0 - 6) */
-   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ in png.h ) */
-   png_byte color_type;       /* color type of file */
-   png_byte bit_depth;        /* bit depth of file */
-   png_byte usr_bit_depth;    /* bit depth of users row: write only */
-   png_byte pixel_depth;      /* number of bits per pixel */
-   png_byte channels;         /* number of channels in file */
-#ifdef PNG_WRITE_SUPPORTED
-   png_byte usr_channels;     /* channels at start of write: write only */
-#endif
-   png_byte sig_bytes;        /* magic bytes read/written from start of file */
-   png_byte maximum_pixel_depth;
-                              /* pixel depth used for the row buffers */
-   png_byte transformed_pixel_depth;
-                              /* pixel depth after read/write transforms */
-#if ZLIB_VERNUM >= 0x1240
-   png_byte zstream_start;    /* at start of an input zlib stream */
-#endif /* Zlib >= 1.2.4 */
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-   png_uint_16 filler;           /* filler bytes for pixel expansion */
-#endif
-
-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-   png_byte background_gamma_type;
-   png_fixed_point background_gamma;
-   png_color_16 background;   /* background color in screen gamma space */
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   png_color_16 background_1; /* background normalized to gamma 1.0 */
-#endif
-#endif /* bKGD */
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_flush_ptr output_flush_fn; /* Function for flushing output */
-   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
-   png_uint_32 flush_rows;    /* number of rows written since last flush */
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */
-   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
-
-   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
-   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
-   png_bytep gamma_to_1;      /* converts from file to 1.0 */
-   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
-   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
-   png_color_8 sig_bit;       /* significant bits in each available channel */
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-   png_color_8 shift;         /* shift for significant bit tranformation */
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
- || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   png_bytep trans_alpha;           /* alpha values for paletted files */
-   png_color_16 trans_color;  /* transparent color for non-paletted files */
-#endif
-
-   png_read_status_ptr read_row_fn;   /* called after each row is decoded */
-   png_write_status_ptr write_row_fn; /* called after each row is encoded */
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-   png_progressive_info_ptr info_fn; /* called after header data fully read */
-   png_progressive_row_ptr row_fn;   /* called after a prog. row is decoded */
-   png_progressive_end_ptr end_fn;   /* called after image is complete */
-   png_bytep save_buffer_ptr;        /* current location in save_buffer */
-   png_bytep save_buffer;            /* buffer for previously read data */
-   png_bytep current_buffer_ptr;     /* current location in current_buffer */
-   png_bytep current_buffer;         /* buffer for recently used data */
-   png_uint_32 push_length;          /* size of current input chunk */
-   png_uint_32 skip_length;          /* bytes to skip in input data */
-   png_size_t save_buffer_size;      /* amount of data now in save_buffer */
-   png_size_t save_buffer_max;       /* total size of save_buffer */
-   png_size_t buffer_size;           /* total amount of available input data */
-   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
-   int process_mode;                 /* what push library is currently doing */
-   int cur_palette;                  /* current push library palette index */
-
-#endif /* PROGRESSIVE_READ */
-
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* For the Borland special 64K segment handler */
-   png_bytepp offset_table_ptr;
-   png_bytep offset_table;
-   png_uint_16 offset_table_number;
-   png_uint_16 offset_table_count;
-   png_uint_16 offset_table_count_free;
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   png_bytep palette_lookup; /* lookup table for quantizing */
-   png_bytep quantize_index; /* index translation for palette files */
-#endif
-
-/* Options */
-#ifdef PNG_SET_OPTION_SUPPORTED
-   png_uint_32 options;           /* On/off state (up to 16 options) */
-#endif
-
-#if PNG_LIBPNG_VER < 10700
-/* To do: remove this from libpng-1.7 */
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-   char time_buffer[29]; /* String to hold RFC 1123 time text */
-#endif
-#endif
-
-/* New members added in libpng-1.0.6 */
-
-   png_uint_32 free_me;    /* flags items libpng is responsible for freeing */
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-   png_voidp user_chunk_ptr;
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
-#endif
-#endif
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-   int          unknown_default; /* As PNG_HANDLE_* */
-   unsigned int num_chunk_list;  /* Number of entries in the list */
-   png_bytep    chunk_list;      /* List of png_byte[5]; the textual chunk name
-                                  * followed by a PNG_HANDLE_* byte */
-#endif
-
-/* New members added in libpng-1.0.3 */
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   png_byte rgb_to_gray_status;
-   /* Added in libpng 1.5.5 to record setting of coefficients: */
-   png_byte rgb_to_gray_coefficients_set;
-   /* These were changed from png_byte in libpng-1.0.6 */
-   png_uint_16 rgb_to_gray_red_coeff;
-   png_uint_16 rgb_to_gray_green_coeff;
-   /* deleted in 1.5.5: rgb_to_gray_blue_coeff; */
-#endif
-
-/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
-#if defined(PNG_MNG_FEATURES_SUPPORTED)
-/* Changed from png_byte to png_uint_32 at version 1.2.0 */
-   png_uint_32 mng_features_permitted;
-#endif
-
-/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_byte filter_type;
-#endif
-
-/* New members added in libpng-1.2.0 */
-
-/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_voidp mem_ptr;             /* user supplied struct for mem functions */
-   png_malloc_ptr malloc_fn;      /* function for allocating memory */
-   png_free_ptr free_fn;          /* function for freeing memory */
-#endif
-
-/* New member added in libpng-1.0.13 and 1.2.0 */
-   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* The following three members were added at version 1.0.14 and 1.2.4 */
-   png_bytep quantize_sort;          /* working sort array */
-   png_bytep index_to_palette;       /* where the original index currently is
-                                        in the palette */
-   png_bytep palette_to_index;       /* which original index points to this
-                                         palette color */
-#endif
-
-/* New members added in libpng-1.0.16 and 1.2.6 */
-   png_byte compression_type;
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   png_uint_32 user_width_max;
-   png_uint_32 user_height_max;
-
-   /* Added in libpng-1.4.0: Total number of sPLT, text, and unknown
-    * chunks that can be stored (0 means unlimited).
-    */
-   png_uint_32 user_chunk_cache_max;
-
-   /* Total memory that a zTXt, sPLT, iTXt, iCCP, or unknown chunk
-    * can occupy when decompressed.  0 means unlimited.
-    */
-   png_alloc_size_t user_chunk_malloc_max;
-#endif
-
-/* New member added in libpng-1.0.25 and 1.2.17 */
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-   /* Temporary storage for unknown chunk that the library doesn't recognize,
-    * used while reading the chunk.
-    */
-   png_unknown_chunk unknown_chunk;
-#endif
-
-/* New member added in libpng-1.2.26 */
-  png_size_t old_big_row_buf_size;
-
-#ifdef PNG_READ_SUPPORTED
-/* New member added in libpng-1.2.30 */
-  png_bytep        read_buffer;      /* buffer for reading chunk data */
-  png_alloc_size_t read_buffer_size; /* current size of the buffer */
-#endif
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-  uInt             IDAT_read_size;   /* limit on read buffer size for IDAT */
-#endif
-
-#ifdef PNG_IO_STATE_SUPPORTED
-/* New member added in libpng-1.4.0 */
-   png_uint_32 io_state;
-#endif
-
-/* New member added in libpng-1.5.6 */
-   png_bytep big_prev_row;
-
-/* New member added in libpng-1.5.7 */
-   void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
-      png_bytep row, png_const_bytep prev_row);
-
-#ifdef PNG_READ_SUPPORTED
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-   png_colorspace   colorspace;
-#endif
-#endif
-};
-#endif /* PNGSTRUCT_H */
diff --git a/src/png/libpng/pngtest.c b/src/png/libpng/pngtest.c
deleted file mode 100644
index 9d5075791..000000000
--- a/src/png/libpng/pngtest.c
+++ /dev/null
@@ -1,2156 +0,0 @@
-
-/* pngtest.c - a simple test program to test libpng
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This program reads in a PNG image, writes it out again, and then
- * compares the two files.  If the files are identical, this shows that
- * the basic chunk handling, filtering, and (de)compression code is working
- * properly.  It does not currently test all of the transforms, although
- * it probably should.
- *
- * The program will report "FAIL" in certain legitimate cases:
- * 1) when the compression level or filter selection method is changed.
- * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.
- * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks
- *    exist in the input file.
- * 4) others not listed here...
- * In these cases, it is best to check with another tool such as "pngcheck"
- * to see what the differences between the two files are.
- *
- * If a filename is given on the command-line, then this file is used
- * for the input, rather than the default "pngtest.png".  This allows
- * testing a wide variety of files easily.  You can also test a number
- * of files at once by typing "pngtest -m file1.png file2.png ..."
- */
-
-#define _POSIX_SOURCE 1
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Defined so I can write to a file on gui/windowing platforms */
-/*  #define STDERR stderr  */
-#define STDERR stdout   /* For DOS */
-
-#include "png.h"
-
-/* Known chunks that exist in pngtest.png must be supported or pngtest will fail
- * simply as a result of re-ordering them.  This may be fixed in 1.7
- *
- * pngtest allocates a single row buffer for each row and overwrites it,
- * therefore if the write side doesn't support the writing of interlaced images
- * nothing can be done for an interlaced image (and the code below will fail
- * horribly trying to write extra data after writing garbage).
- */
-#if defined PNG_READ_SUPPORTED && /* else nothing can be done */\
-   defined PNG_READ_bKGD_SUPPORTED &&\
-   defined PNG_READ_cHRM_SUPPORTED &&\
-   defined PNG_READ_gAMA_SUPPORTED &&\
-   defined PNG_READ_oFFs_SUPPORTED &&\
-   defined PNG_READ_pCAL_SUPPORTED &&\
-   defined PNG_READ_pHYs_SUPPORTED &&\
-   defined PNG_READ_sBIT_SUPPORTED &&\
-   defined PNG_READ_sCAL_SUPPORTED &&\
-   defined PNG_READ_sRGB_SUPPORTED &&\
-   defined PNG_READ_sPLT_SUPPORTED &&\
-   defined PNG_READ_tEXt_SUPPORTED &&\
-   defined PNG_READ_tIME_SUPPORTED &&\
-   defined PNG_READ_zTXt_SUPPORTED &&\
-   (defined PNG_WRITE_INTERLACING_SUPPORTED || PNG_LIBPNG_VER >= 10700)
-
-#ifdef PNG_ZLIB_HEADER
-#  include PNG_ZLIB_HEADER /* defined by pnglibconf.h from 1.7 */
-#else
-#  include "zlib.h"
-#endif
-
-/* Copied from pngpriv.h but only used in error messages below. */
-#ifndef PNG_ZBUF_SIZE
-#  define PNG_ZBUF_SIZE 8192
-#endif
-#define FCLOSE(file) fclose(file)
-
-#ifndef PNG_STDIO_SUPPORTED
-typedef FILE                * png_FILE_p;
-#endif
-
-/* Makes pngtest verbose so we can find problems. */
-#ifndef PNG_DEBUG
-#  define PNG_DEBUG 0
-#endif
-
-#if PNG_DEBUG > 1
-#  define pngtest_debug(m)        ((void)fprintf(stderr, m "\n"))
-#  define pngtest_debug1(m,p1)    ((void)fprintf(stderr, m "\n", p1))
-#  define pngtest_debug2(m,p1,p2) ((void)fprintf(stderr, m "\n", p1, p2))
-#else
-#  define pngtest_debug(m)        ((void)0)
-#  define pngtest_debug1(m,p1)    ((void)0)
-#  define pngtest_debug2(m,p1,p2) ((void)0)
-#endif
-
-#if !PNG_DEBUG
-#  define SINGLE_ROWBUF_ALLOC  /* Makes buffer overruns easier to nail */
-#endif
-
-#ifndef PNG_UNUSED
-#  define PNG_UNUSED(param) (void)param;
-#endif
-
-/* Turn on CPU timing
-#define PNGTEST_TIMING
-*/
-
-#ifndef PNG_FLOATING_POINT_SUPPORTED
-#undef PNGTEST_TIMING
-#endif
-
-#ifdef PNGTEST_TIMING
-static float t_start, t_stop, t_decode, t_encode, t_misc;
-#include <time.h>
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-#define PNG_tIME_STRING_LENGTH 29
-static int tIME_chunk_present = 0;
-static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";
-
-#if PNG_LIBPNG_VER < 10619
-#define png_convert_to_rfc1123_buffer(ts, t) tIME_to_str(read_ptr, ts, t)
-
-static int
-tIME_to_str(png_structp png_ptr, png_charp ts, png_const_timep t)
-{
-   png_const_charp str = png_convert_to_rfc1123(png_ptr, t);
-
-   if (str == NULL)
-       return 0;
-
-   strcpy(ts, str);
-   return 1;
-}
-#endif /* older libpng */
-#endif
-
-static int verbose = 0;
-static int strict = 0;
-static int relaxed = 0;
-static int xfail = 0;
-static int unsupported_chunks = 0; /* chunk unsupported by libpng in input */
-static int error_count = 0; /* count calls to png_error */
-static int warning_count = 0; /* count calls to png_warning */
-
-/* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
-#ifndef png_jmpbuf
-#  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
-#endif
-
-/* Defines for unknown chunk handling if required. */
-#ifndef PNG_HANDLE_CHUNK_ALWAYS
-#  define PNG_HANDLE_CHUNK_ALWAYS       3
-#endif
-#ifndef PNG_HANDLE_CHUNK_IF_SAFE
-#  define PNG_HANDLE_CHUNK_IF_SAFE      2
-#endif
-
-/* Utility to save typing/errors, the argument must be a name */
-#define MEMZERO(var) ((void)memset(&var, 0, sizeof var))
-
-/* Example of using row callbacks to make a simple progress meter */
-static int status_pass = 1;
-static int status_dots_requested = 0;
-static int status_dots = 1;
-
-static void PNGCBAPI
-read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
-{
-   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX)
-      return;
-
-   if (status_pass != pass)
-   {
-      fprintf(stdout, "\n Pass %d: ", pass);
-      status_pass = pass;
-      status_dots = 31;
-   }
-
-   status_dots--;
-
-   if (status_dots == 0)
-   {
-      fprintf(stdout, "\n         ");
-      status_dots=30;
-   }
-
-   fprintf(stdout, "r");
-}
-
-#ifdef PNG_WRITE_SUPPORTED
-static void PNGCBAPI
-write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
-{
-   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7)
-      return;
-
-   fprintf(stdout, "w");
-}
-#endif
-
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-/* Example of using a user transform callback (doesn't do anything at present).
- */
-static void PNGCBAPI
-read_user_callback(png_structp png_ptr, png_row_infop row_info, png_bytep data)
-{
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(row_info)
-   PNG_UNUSED(data)
-}
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-/* Example of using user transform callback (we don't transform anything,
- * but merely count the zero samples)
- */
-
-static png_uint_32 zero_samples;
-
-static void PNGCBAPI
-count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
-{
-   png_bytep dp = data;
-   if (png_ptr == NULL)
-      return;
-
-   /* Contents of row_info:
-    *  png_uint_32 width      width of row
-    *  png_uint_32 rowbytes   number of bytes in row
-    *  png_byte color_type    color type of pixels
-    *  png_byte bit_depth     bit depth of samples
-    *  png_byte channels      number of channels (1-4)
-    *  png_byte pixel_depth   bits per pixel (depth*channels)
-    */
-
-   /* Counts the number of zero samples (or zero pixels if color_type is 3 */
-
-   if (row_info->color_type == 0 || row_info->color_type == 3)
-   {
-      int pos = 0;
-      png_uint_32 n, nstop;
-
-      for (n = 0, nstop=row_info->width; n<nstop; n++)
-      {
-         if (row_info->bit_depth == 1)
-         {
-            if (((*dp << pos++ ) & 0x80) == 0)
-               zero_samples++;
-
-            if (pos == 8)
-            {
-               pos = 0;
-               dp++;
-            }
-         }
-
-         if (row_info->bit_depth == 2)
-         {
-            if (((*dp << (pos+=2)) & 0xc0) == 0)
-               zero_samples++;
-
-            if (pos == 8)
-            {
-               pos = 0;
-               dp++;
-            }
-         }
-
-         if (row_info->bit_depth == 4)
-         {
-            if (((*dp << (pos+=4)) & 0xf0) == 0)
-               zero_samples++;
-
-            if (pos == 8)
-            {
-               pos = 0;
-               dp++;
-            }
-         }
-
-         if (row_info->bit_depth == 8)
-            if (*dp++ == 0)
-               zero_samples++;
-
-         if (row_info->bit_depth == 16)
-         {
-            if ((*dp | *(dp+1)) == 0)
-               zero_samples++;
-            dp+=2;
-         }
-      }
-   }
-   else /* Other color types */
-   {
-      png_uint_32 n, nstop;
-      int channel;
-      int color_channels = row_info->channels;
-      if (row_info->color_type > 3)
-         color_channels--;
-
-      for (n = 0, nstop=row_info->width; n<nstop; n++)
-      {
-         for (channel = 0; channel < color_channels; channel++)
-         {
-            if (row_info->bit_depth == 8)
-               if (*dp++ == 0)
-                  zero_samples++;
-
-            if (row_info->bit_depth == 16)
-            {
-               if ((*dp | *(dp+1)) == 0)
-                  zero_samples++;
-
-               dp+=2;
-            }
-         }
-         if (row_info->color_type > 3)
-         {
-            dp++;
-            if (row_info->bit_depth == 16)
-               dp++;
-         }
-      }
-   }
-}
-#endif /* WRITE_USER_TRANSFORM */
-
-#ifndef PNG_STDIO_SUPPORTED
-/* START of code to validate stdio-free compilation */
-/* These copies of the default read/write functions come from pngrio.c and
- * pngwio.c.  They allow "don't include stdio" testing of the library.
- * This is the function that does the actual reading of data.  If you are
- * not reading from a standard C stream, you should create a replacement
- * read_data function and use it at run time with png_set_read_fn(), rather
- * than changing the library.
- */
-
-#ifdef PNG_IO_STATE_SUPPORTED
-void
-pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
-    png_uint_32 io_op);
-void
-pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
-    png_uint_32 io_op)
-{
-   png_uint_32 io_state = png_get_io_state(png_ptr);
-   int err = 0;
-
-   /* Check if the current operation (reading / writing) is as expected. */
-   if ((io_state & PNG_IO_MASK_OP) != io_op)
-      png_error(png_ptr, "Incorrect operation in I/O state");
-
-   /* Check if the buffer size specific to the current location
-    * (file signature / header / data / crc) is as expected.
-    */
-   switch (io_state & PNG_IO_MASK_LOC)
-   {
-   case PNG_IO_SIGNATURE:
-      if (data_length > 8)
-         err = 1;
-      break;
-   case PNG_IO_CHUNK_HDR:
-      if (data_length != 8)
-         err = 1;
-      break;
-   case PNG_IO_CHUNK_DATA:
-      break;  /* no restrictions here */
-   case PNG_IO_CHUNK_CRC:
-      if (data_length != 4)
-         err = 1;
-      break;
-   default:
-      err = 1;  /* uninitialized */
-   }
-   if (err != 0)
-      png_error(png_ptr, "Bad I/O state or buffer size");
-}
-#endif
-
-static void PNGCBAPI
-pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check = 0;
-   png_voidp io_ptr;
-
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
-    * instead of an int, which is what fread() actually returns.
-    */
-   io_ptr = png_get_io_ptr(png_ptr);
-   if (io_ptr != NULL)
-   {
-      check = fread(data, 1, length, (png_FILE_p)io_ptr);
-   }
-
-   if (check != length)
-   {
-      png_error(png_ptr, "Read Error");
-   }
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   pngtest_check_io_state(png_ptr, length, PNG_IO_READING);
-#endif
-}
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-static void PNGCBAPI
-pngtest_flush(png_structp png_ptr)
-{
-   /* Do nothing; fflush() is said to be just a waste of energy. */
-   PNG_UNUSED(png_ptr)   /* Stifle compiler warning */
-}
-#endif
-
-/* This is the function that does the actual writing of data.  If you are
- * not writing to a standard C stream, you should create a replacement
- * write_data function and use it at run time with png_set_write_fn(), rather
- * than changing the library.
- */
-static void PNGCBAPI
-pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-
-   check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
-
-   if (check != length)
-   {
-      png_error(png_ptr, "Write Error");
-   }
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);
-#endif
-}
-#endif /* !STDIO */
-
-/* This function is called when there is a warning, but the library thinks
- * it can continue anyway.  Replacement functions don't have to do anything
- * here if you don't want to.  In the default configuration, png_ptr is
- * not used, but it is passed in case it may be useful.
- */
-typedef struct
-{
-   PNG_CONST char *file_name;
-}  pngtest_error_parameters;
-
-static void PNGCBAPI
-pngtest_warning(png_structp png_ptr, png_const_charp message)
-{
-   PNG_CONST char *name = "UNKNOWN (ERROR!)";
-   pngtest_error_parameters *test =
-      (pngtest_error_parameters*)png_get_error_ptr(png_ptr);
-
-   ++warning_count;
-
-   if (test != NULL && test->file_name != NULL)
-      name = test->file_name;
-
-   fprintf(STDERR, "\n%s: libpng warning: %s\n", name, message);
-}
-
-/* This is the default error handling function.  Note that replacements for
- * this function MUST NOT RETURN, or the program will likely crash.  This
- * function is used by default, or if the program supplies NULL for the
- * error function pointer in png_set_error_fn().
- */
-static void PNGCBAPI
-pngtest_error(png_structp png_ptr, png_const_charp message)
-{
-   ++error_count;
-
-   pngtest_warning(png_ptr, message);
-   /* We can return because png_error calls the default handler, which is
-    * actually OK in this case.
-    */
-}
-
-/* END of code to validate stdio-free compilation */
-
-/* START of code to validate memory allocation and deallocation */
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more than 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information.  zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- *
- * This piece of code can be compiled to validate max 64K allocations
- * by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K.
- */
-typedef struct memory_information
-{
-   png_alloc_size_t          size;
-   png_voidp                 pointer;
-   struct memory_information *next;
-} memory_information;
-typedef memory_information *memory_infop;
-
-static memory_infop pinformation = NULL;
-static int current_allocation = 0;
-static int maximum_allocation = 0;
-static int total_allocation = 0;
-static int num_allocations = 0;
-
-png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,
-    png_alloc_size_t size));
-void PNGCBAPI png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
-
-png_voidp
-PNGCBAPI png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)
-{
-
-   /* png_malloc has already tested for NULL; png_create_struct calls
-    * png_debug_malloc directly, with png_ptr == NULL which is OK
-    */
-
-   if (size == 0)
-      return (NULL);
-
-   /* This calls the library allocator twice, once to get the requested
-      buffer and once to get a new free list entry. */
-   {
-      /* Disable malloc_fn and free_fn */
-      memory_infop pinfo;
-      png_set_mem_fn(png_ptr, NULL, NULL, NULL);
-      pinfo = (memory_infop)png_malloc(png_ptr,
-          (sizeof *pinfo));
-      pinfo->size = size;
-      current_allocation += size;
-      total_allocation += size;
-      num_allocations ++;
-
-      if (current_allocation > maximum_allocation)
-         maximum_allocation = current_allocation;
-
-      pinfo->pointer = png_malloc(png_ptr, size);
-      /* Restore malloc_fn and free_fn */
-
-      png_set_mem_fn(png_ptr,
-          NULL, png_debug_malloc, png_debug_free);
-
-      if (size != 0 && pinfo->pointer == NULL)
-      {
-         current_allocation -= size;
-         total_allocation -= size;
-         png_error(png_ptr,
-           "out of memory in pngtest->png_debug_malloc");
-      }
-
-      pinfo->next = pinformation;
-      pinformation = pinfo;
-      /* Make sure the caller isn't assuming zeroed memory. */
-      memset(pinfo->pointer, 0xdd, pinfo->size);
-
-      if (verbose != 0)
-         printf("png_malloc %lu bytes at %p\n", (unsigned long)size,
-             pinfo->pointer);
-
-      return (png_voidp)(pinfo->pointer);
-   }
-}
-
-/* Free a pointer.  It is removed from the list at the same time. */
-void PNGCBAPI
-png_debug_free(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL)
-      fprintf(STDERR, "NULL pointer to png_debug_free.\n");
-
-   if (ptr == 0)
-   {
-#if 0 /* This happens all the time. */
-      fprintf(STDERR, "WARNING: freeing NULL pointer\n");
-#endif
-      return;
-   }
-
-   /* Unlink the element from the list. */
-   if (pinformation != NULL)
-   {
-      memory_infop *ppinfo = &pinformation;
-
-      for (;;)
-      {
-         memory_infop pinfo = *ppinfo;
-
-         if (pinfo->pointer == ptr)
-         {
-            *ppinfo = pinfo->next;
-            current_allocation -= pinfo->size;
-            if (current_allocation < 0)
-               fprintf(STDERR, "Duplicate free of memory\n");
-            /* We must free the list element too, but first kill
-               the memory that is to be freed. */
-            memset(ptr, 0x55, pinfo->size);
-            free(pinfo);
-            pinfo = NULL;
-            break;
-         }
-
-         if (pinfo->next == NULL)
-         {
-            fprintf(STDERR, "Pointer %p not found\n", ptr);
-            break;
-         }
-
-         ppinfo = &pinfo->next;
-      }
-   }
-
-   /* Finally free the data. */
-   if (verbose != 0)
-      printf("Freeing %p\n", ptr);
-
-   if (ptr != NULL)
-      free(ptr);
-   ptr = NULL;
-}
-#endif /* USER_MEM && DEBUG */
-/* END of code to test memory allocation/deallocation */
-
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-/* Demonstration of user chunk support of the sTER and vpAg chunks */
-
-/* (sTER is a public chunk not yet known by libpng.  vpAg is a private
-chunk used in ImageMagick to store "virtual page" size).  */
-
-static struct user_chunk_data
-{
-   png_const_infop info_ptr;
-   png_uint_32     vpAg_width, vpAg_height;
-   png_byte        vpAg_units;
-   png_byte        sTER_mode;
-   int             location[2];
-}
-user_chunk_data;
-
-/* Used for location and order; zero means nothing. */
-#define have_sTER   0x01
-#define have_vpAg   0x02
-#define before_PLTE 0x10
-#define before_IDAT 0x20
-#define after_IDAT  0x40
-
-static void
-init_callback_info(png_const_infop info_ptr)
-{
-   MEMZERO(user_chunk_data);
-   user_chunk_data.info_ptr = info_ptr;
-}
-
-static int
-set_location(png_structp png_ptr, struct user_chunk_data *data, int what)
-{
-   int location;
-
-   if ((data->location[0] & what) != 0 || (data->location[1] & what) != 0)
-      return 0; /* already have one of these */
-
-   /* Find where we are (the code below zeroes info_ptr to indicate that the
-    * chunks before the first IDAT have been read.)
-    */
-   if (data->info_ptr == NULL) /* after IDAT */
-      location = what | after_IDAT;
-
-   else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE) != 0)
-      location = what | before_IDAT;
-
-   else
-      location = what | before_PLTE;
-
-   if (data->location[0] == 0)
-      data->location[0] = location;
-
-   else
-      data->location[1] = location;
-
-   return 1; /* handled */
-}
-
-static int PNGCBAPI
-read_user_chunk_callback(png_struct *png_ptr, png_unknown_chunkp chunk)
-{
-   struct user_chunk_data *my_user_chunk_data =
-      (struct user_chunk_data*)png_get_user_chunk_ptr(png_ptr);
-
-   if (my_user_chunk_data == NULL)
-      png_error(png_ptr, "lost user chunk pointer");
-
-   /* Return one of the following:
-    *    return (-n);  chunk had an error
-    *    return (0);  did not recognize
-    *    return (n);  success
-    *
-    * The unknown chunk structure contains the chunk data:
-    * png_byte name[5];
-    * png_byte *data;
-    * png_size_t size;
-    *
-    * Note that libpng has already taken care of the CRC handling.
-    */
-
-   if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */
-       chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */
-      {
-         /* Found sTER chunk */
-         if (chunk->size != 1)
-            return (-1); /* Error return */
-
-         if (chunk->data[0] != 0 && chunk->data[0] != 1)
-            return (-1);  /* Invalid mode */
-
-         if (set_location(png_ptr, my_user_chunk_data, have_sTER) != 0)
-         {
-            my_user_chunk_data->sTER_mode=chunk->data[0];
-            return (1);
-         }
-
-         else
-            return (0); /* duplicate sTER - give it to libpng */
-      }
-
-   if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */
-       chunk->name[2] !=  65 || chunk->name[3] != 103)      /* A  g */
-      return (0); /* Did not recognize */
-
-   /* Found ImageMagick vpAg chunk */
-
-   if (chunk->size != 9)
-      return (-1); /* Error return */
-
-   if (set_location(png_ptr, my_user_chunk_data, have_vpAg) == 0)
-      return (0);  /* duplicate vpAg */
-
-   my_user_chunk_data->vpAg_width = png_get_uint_31(png_ptr, chunk->data);
-   my_user_chunk_data->vpAg_height = png_get_uint_31(png_ptr, chunk->data + 4);
-   my_user_chunk_data->vpAg_units = chunk->data[8];
-
-   return (1);
-}
-
-#ifdef PNG_WRITE_SUPPORTED
-static void
-write_sTER_chunk(png_structp write_ptr)
-{
-   png_byte sTER[5] = {115,  84,  69,  82, '\0'};
-
-   if (verbose != 0)
-      fprintf(STDERR, "\n stereo mode = %d\n", user_chunk_data.sTER_mode);
-
-   png_write_chunk(write_ptr, sTER, &user_chunk_data.sTER_mode, 1);
-}
-
-static void
-write_vpAg_chunk(png_structp write_ptr)
-{
-   png_byte vpAg[5] = {118, 112,  65, 103, '\0'};
-
-   png_byte vpag_chunk_data[9];
-
-   if (verbose != 0)
-      fprintf(STDERR, " vpAg = %lu x %lu, units = %d\n",
-          (unsigned long)user_chunk_data.vpAg_width,
-          (unsigned long)user_chunk_data.vpAg_height,
-          user_chunk_data.vpAg_units);
-
-   png_save_uint_32(vpag_chunk_data, user_chunk_data.vpAg_width);
-   png_save_uint_32(vpag_chunk_data + 4, user_chunk_data.vpAg_height);
-   vpag_chunk_data[8] = user_chunk_data.vpAg_units;
-   png_write_chunk(write_ptr, vpAg, vpag_chunk_data, 9);
-}
-
-static void
-write_chunks(png_structp write_ptr, int location)
-{
-   int i;
-
-   /* Notice that this preserves the original chunk order, however chunks
-    * intercepted by the callback will be written *after* chunks passed to
-    * libpng.  This will actually reverse a pair of sTER chunks or a pair of
-    * vpAg chunks, resulting in an error later.  This is not worth worrying
-    * about - the chunks should not be duplicated!
-    */
-   for (i=0; i<2; ++i)
-   {
-      if (user_chunk_data.location[i] == (location | have_sTER))
-         write_sTER_chunk(write_ptr);
-
-      else if (user_chunk_data.location[i] == (location | have_vpAg))
-         write_vpAg_chunk(write_ptr);
-   }
-}
-#endif /* WRITE */
-#else /* !READ_USER_CHUNKS */
-#  define write_chunks(pp,loc) ((void)0)
-#endif
-/* END of code to demonstrate user chunk support */
-
-/* START of code to check that libpng has the required text support; this only
- * checks for the write support because if read support is missing the chunk
- * will simply not be reported back to pngtest.
- */
-#ifdef PNG_TEXT_SUPPORTED
-static void
-pngtest_check_text_support(png_structp png_ptr, png_textp text_ptr,
-    int num_text)
-{
-   while (num_text > 0)
-   {
-      switch (text_ptr[--num_text].compression)
-      {
-         case PNG_TEXT_COMPRESSION_NONE:
-            break;
-
-         case PNG_TEXT_COMPRESSION_zTXt:
-#           ifndef PNG_WRITE_zTXt_SUPPORTED
-               ++unsupported_chunks;
-               /* In libpng 1.7 this now does an app-error, so stop it: */
-               text_ptr[num_text].compression = PNG_TEXT_COMPRESSION_NONE;
-#           endif
-            break;
-
-         case PNG_ITXT_COMPRESSION_NONE:
-         case PNG_ITXT_COMPRESSION_zTXt:
-#           ifndef PNG_WRITE_iTXt_SUPPORTED
-               ++unsupported_chunks;
-               text_ptr[num_text].compression = PNG_TEXT_COMPRESSION_NONE;
-#           endif
-            break;
-
-         default:
-            /* This is an error */
-            png_error(png_ptr, "invalid text chunk compression field");
-            break;
-      }
-   }
-}
-#endif
-/* END of code to check that libpng has the required text support */
-
-/* Test one file */
-static int
-test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
-{
-   static png_FILE_p fpin;
-   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */
-   pngtest_error_parameters error_parameters;
-   png_structp read_ptr;
-   png_infop read_info_ptr, end_info_ptr;
-#ifdef PNG_WRITE_SUPPORTED
-   png_structp write_ptr;
-   png_infop write_info_ptr;
-   png_infop write_end_info_ptr;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   int interlace_preserved = 1;
-#endif /* WRITE_FILTER */
-#else /* !WRITE */
-   png_structp write_ptr = NULL;
-   png_infop write_info_ptr = NULL;
-   png_infop write_end_info_ptr = NULL;
-#endif /* !WRITE */
-   png_bytep row_buf;
-   png_uint_32 y;
-   png_uint_32 width, height;
-   volatile int num_passes;
-   int pass;
-   int bit_depth, color_type;
-
-   row_buf = NULL;
-   error_parameters.file_name = inname;
-
-   if ((fpin = fopen(inname, "rb")) == NULL)
-   {
-      fprintf(STDERR, "Could not find input file %s\n", inname);
-      return (1);
-   }
-
-   if ((fpout = fopen(outname, "wb")) == NULL)
-   {
-      fprintf(STDERR, "Could not open output file %s\n", outname);
-      FCLOSE(fpin);
-      return (1);
-   }
-
-   pngtest_debug("Allocating read and write structures");
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-   read_ptr =
-       png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
-       NULL, NULL, NULL, png_debug_malloc, png_debug_free);
-#else
-   read_ptr =
-       png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-#endif
-   png_set_error_fn(read_ptr, &error_parameters, pngtest_error,
-       pngtest_warning);
-
-#ifdef PNG_WRITE_SUPPORTED
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-   write_ptr =
-       png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
-       NULL, NULL, NULL, png_debug_malloc, png_debug_free);
-#else
-   write_ptr =
-       png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-#endif
-   png_set_error_fn(write_ptr, &error_parameters, pngtest_error,
-       pngtest_warning);
-#endif
-   pngtest_debug("Allocating read_info, write_info and end_info structures");
-   read_info_ptr = png_create_info_struct(read_ptr);
-   end_info_ptr = png_create_info_struct(read_ptr);
-#ifdef PNG_WRITE_SUPPORTED
-   write_info_ptr = png_create_info_struct(write_ptr);
-   write_end_info_ptr = png_create_info_struct(write_ptr);
-#endif
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-   init_callback_info(read_info_ptr);
-   png_set_read_user_chunk_fn(read_ptr, &user_chunk_data,
-       read_user_chunk_callback);
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   pngtest_debug("Setting jmpbuf for read struct");
-   if (setjmp(png_jmpbuf(read_ptr)))
-   {
-      fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
-      png_free(read_ptr, row_buf);
-      row_buf = NULL;
-      if (verbose != 0)
-        fprintf(STDERR, "   destroy read structs\n");
-      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
-#ifdef PNG_WRITE_SUPPORTED
-      if (verbose != 0)
-        fprintf(STDERR, "   destroy write structs\n");
-      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
-      png_destroy_write_struct(&write_ptr, &write_info_ptr);
-#endif
-      FCLOSE(fpin);
-      FCLOSE(fpout);
-      return (1);
-   }
-
-#ifdef PNG_WRITE_SUPPORTED
-   pngtest_debug("Setting jmpbuf for write struct");
-
-   if (setjmp(png_jmpbuf(write_ptr)))
-   {
-      fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
-      if (verbose != 0)
-        fprintf(STDERR, "   destroying read structs\n");
-      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
-      if (verbose != 0)
-        fprintf(STDERR, "   destroying write structs\n");
-      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
-      png_destroy_write_struct(&write_ptr, &write_info_ptr);
-      FCLOSE(fpin);
-      FCLOSE(fpout);
-      return (1);
-   }
-#endif
-#endif
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-   if (strict != 0)
-   {
-      /* Treat png_benign_error() as errors on read */
-      png_set_benign_errors(read_ptr, 0);
-
-# ifdef PNG_WRITE_SUPPORTED
-      /* Treat them as errors on write */
-      png_set_benign_errors(write_ptr, 0);
-# endif
-
-      /* if strict is not set, then app warnings and errors are treated as
-       * warnings in release builds, but not in unstable builds; this can be
-       * changed with '--relaxed'.
-       */
-   }
-
-   else if (relaxed != 0)
-   {
-      /* Allow application (pngtest) errors and warnings to pass */
-      png_set_benign_errors(read_ptr, 1);
-
-      /* Turn off CRC checking while reading */
-      png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
-
-#ifdef PNG_IGNORE_ADLER32
-      /* Turn off ADLER32 checking while reading */
-      png_set_option(read_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON);
-#endif
-
-# ifdef PNG_WRITE_SUPPORTED
-      png_set_benign_errors(write_ptr, 1);
-# endif
-
-   }
-#endif /* BENIGN_ERRORS */
-
-   pngtest_debug("Initializing input and output streams");
-#ifdef PNG_STDIO_SUPPORTED
-   png_init_io(read_ptr, fpin);
-#  ifdef PNG_WRITE_SUPPORTED
-   png_init_io(write_ptr, fpout);
-#  endif
-#else
-   png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
-#  ifdef PNG_WRITE_SUPPORTED
-   png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,
-#    ifdef PNG_WRITE_FLUSH_SUPPORTED
-       pngtest_flush);
-#    else
-       NULL);
-#    endif
-#  endif
-#endif
-
-   if (status_dots_requested == 1)
-   {
-#ifdef PNG_WRITE_SUPPORTED
-      png_set_write_status_fn(write_ptr, write_row_callback);
-#endif
-      png_set_read_status_fn(read_ptr, read_row_callback);
-   }
-
-   else
-   {
-#ifdef PNG_WRITE_SUPPORTED
-      png_set_write_status_fn(write_ptr, NULL);
-#endif
-      png_set_read_status_fn(read_ptr, NULL);
-   }
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   png_set_read_user_transform_fn(read_ptr, read_user_callback);
-#endif
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-   zero_samples = 0;
-   png_set_write_user_transform_fn(write_ptr, count_zero_samples);
-#endif
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-   /* Preserve all the unknown chunks, if possible.  If this is disabled then,
-    * even if the png_{get,set}_unknown_chunks stuff is enabled, we can't use
-    * libpng to *save* the unknown chunks on read (because we can't switch the
-    * save option on!)
-    *
-    * Notice that if SET_UNKNOWN_CHUNKS is *not* supported read will discard all
-    * unknown chunks and write will write them all.
-    */
-#ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
-       NULL, 0);
-#endif
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS,
-       NULL, 0);
-#endif
-#endif
-
-   pngtest_debug("Reading info struct");
-   png_read_info(read_ptr, read_info_ptr);
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-   /* This is a bit of a hack; there is no obvious way in the callback function
-    * to determine that the chunks before the first IDAT have been read, so
-    * remove the info_ptr (which is only used to determine position relative to
-    * PLTE) here to indicate that we are after the IDAT.
-    */
-   user_chunk_data.info_ptr = NULL;
-#endif
-
-   pngtest_debug("Transferring info struct");
-   {
-      int interlace_type, compression_type, filter_type;
-
-      if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
-          &color_type, &interlace_type, &compression_type, &filter_type) != 0)
-      {
-         png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
-             color_type, interlace_type, compression_type, filter_type);
-         /* num_passes may not be available below if interlace support is not
-          * provided by libpng for both read and write.
-          */
-         switch (interlace_type)
-         {
-            case PNG_INTERLACE_NONE:
-               num_passes = 1;
-               break;
-
-            case PNG_INTERLACE_ADAM7:
-               num_passes = 7;
-               break;
-
-            default:
-               png_error(read_ptr, "invalid interlace type");
-               /*NOT REACHED*/
-         }
-      }
-
-      else
-         png_error(read_ptr, "png_get_IHDR failed");
-   }
-#ifdef PNG_FIXED_POINT_SUPPORTED
-#ifdef PNG_cHRM_SUPPORTED
-   {
-      png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
-          blue_y;
-
-      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,
-          &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
-      {
-         png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
-             red_y, green_x, green_y, blue_x, blue_y);
-      }
-   }
-#endif
-#ifdef PNG_gAMA_SUPPORTED
-   {
-      png_fixed_point gamma;
-
-      if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma) != 0)
-         png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
-   }
-#endif
-#else /* Use floating point versions */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-#ifdef PNG_cHRM_SUPPORTED
-   {
-      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
-          blue_y;
-
-      if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
-          &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
-      {
-         png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
-             red_y, green_x, green_y, blue_x, blue_y);
-      }
-   }
-#endif
-#ifdef PNG_gAMA_SUPPORTED
-   {
-      double gamma;
-
-      if (png_get_gAMA(read_ptr, read_info_ptr, &gamma) != 0)
-         png_set_gAMA(write_ptr, write_info_ptr, gamma);
-   }
-#endif
-#endif /* Floating point */
-#endif /* Fixed point */
-#ifdef PNG_iCCP_SUPPORTED
-   {
-      png_charp name;
-      png_bytep profile;
-      png_uint_32 proflen;
-      int compression_type;
-
-      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
-          &profile, &proflen) != 0)
-      {
-         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
-             profile, proflen);
-      }
-   }
-#endif
-#ifdef PNG_sRGB_SUPPORTED
-   {
-      int intent;
-
-      if (png_get_sRGB(read_ptr, read_info_ptr, &intent) != 0)
-         png_set_sRGB(write_ptr, write_info_ptr, intent);
-   }
-#endif
-   {
-      png_colorp palette;
-      int num_palette;
-
-      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette) != 0)
-         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
-   }
-#ifdef PNG_bKGD_SUPPORTED
-   {
-      png_color_16p background;
-
-      if (png_get_bKGD(read_ptr, read_info_ptr, &background) != 0)
-      {
-         png_set_bKGD(write_ptr, write_info_ptr, background);
-      }
-   }
-#endif
-#ifdef PNG_READ_eXIf_SUPPORTED
-   {
-      png_bytep exif=NULL;
-      png_uint_32 exif_length;
-
-      if (png_get_eXIf_1(read_ptr, read_info_ptr, &exif_length, &exif) != 0)
-      {
-         if (exif_length > 1)
-            fprintf(STDERR," eXIf type %c%c, %lu bytes\n",exif[0],exif[1],
-               (unsigned long)exif_length);
-# ifdef PNG_WRITE_eXIf_SUPPORTED
-         png_set_eXIf_1(write_ptr, write_info_ptr, exif_length, exif);
-# endif
-      }
-   }
-#endif
-#ifdef PNG_hIST_SUPPORTED
-   {
-      png_uint_16p hist;
-
-      if (png_get_hIST(read_ptr, read_info_ptr, &hist) != 0)
-         png_set_hIST(write_ptr, write_info_ptr, hist);
-   }
-#endif
-#ifdef PNG_oFFs_SUPPORTED
-   {
-      png_int_32 offset_x, offset_y;
-      int unit_type;
-
-      if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,
-          &unit_type) != 0)
-      {
-         png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
-      }
-   }
-#endif
-#ifdef PNG_pCAL_SUPPORTED
-   {
-      png_charp purpose, units;
-      png_charpp params;
-      png_int_32 X0, X1;
-      int type, nparams;
-
-      if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
-          &nparams, &units, &params) != 0)
-      {
-         png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
-             nparams, units, params);
-      }
-   }
-#endif
-#ifdef PNG_pHYs_SUPPORTED
-   {
-      png_uint_32 res_x, res_y;
-      int unit_type;
-
-      if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y,
-          &unit_type) != 0)
-         png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
-   }
-#endif
-#ifdef PNG_sBIT_SUPPORTED
-   {
-      png_color_8p sig_bit;
-
-      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit) != 0)
-         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
-   }
-#endif
-#ifdef PNG_sCAL_SUPPORTED
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
-   {
-      int unit;
-      double scal_width, scal_height;
-
-      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
-          &scal_height) != 0)
-      {
-         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
-      }
-   }
-#else
-#ifdef PNG_FIXED_POINT_SUPPORTED
-   {
-      int unit;
-      png_charp scal_width, scal_height;
-
-      if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
-           &scal_height) != 0)
-      {
-         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,
-             scal_height);
-      }
-   }
-#endif
-#endif
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-   {
-       png_sPLT_tp entries;
-
-       int num_entries = (int) png_get_sPLT(read_ptr, read_info_ptr, &entries);
-       if (num_entries)
-       {
-           png_set_sPLT(write_ptr, write_info_ptr, entries, num_entries);
-       }
-   }
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-   {
-      png_textp text_ptr;
-      int num_text;
-
-      if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
-      {
-         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);
-
-         pngtest_check_text_support(read_ptr, text_ptr, num_text);
-
-         if (verbose != 0)
-         {
-            int i;
-
-            fprintf(STDERR,"\n");
-            for (i=0; i<num_text; i++)
-            {
-               fprintf(STDERR,"   Text compression[%d]=%d\n",
-                   i, text_ptr[i].compression);
-            }
-         }
-
-         png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
-      }
-   }
-#endif
-#ifdef PNG_tIME_SUPPORTED
-   {
-      png_timep mod_time;
-
-      if (png_get_tIME(read_ptr, read_info_ptr, &mod_time) != 0)
-      {
-         png_set_tIME(write_ptr, write_info_ptr, mod_time);
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-         if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
-            tIME_string[(sizeof tIME_string) - 1] = '\0';
-
-         else
-         {
-            strncpy(tIME_string, "*** invalid time ***", (sizeof tIME_string));
-            tIME_string[(sizeof tIME_string) - 1] = '\0';
-         }
-
-         tIME_chunk_present++;
-#endif /* TIME_RFC1123 */
-      }
-   }
-#endif
-#ifdef PNG_tRNS_SUPPORTED
-   {
-      png_bytep trans_alpha;
-      int num_trans;
-      png_color_16p trans_color;
-
-      if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans,
-          &trans_color) != 0)
-      {
-         int sample_max = (1 << bit_depth);
-         /* libpng doesn't reject a tRNS chunk with out-of-range samples */
-         if (!((color_type == PNG_COLOR_TYPE_GRAY &&
-             (int)trans_color->gray > sample_max) ||
-             (color_type == PNG_COLOR_TYPE_RGB &&
-             ((int)trans_color->red > sample_max ||
-             (int)trans_color->green > sample_max ||
-             (int)trans_color->blue > sample_max))))
-            png_set_tRNS(write_ptr, write_info_ptr, trans_alpha, num_trans,
-               trans_color);
-      }
-   }
-#endif
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   {
-      png_unknown_chunkp unknowns;
-      int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr,
-          &unknowns);
-
-      if (num_unknowns != 0)
-      {
-         png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
-             num_unknowns);
-#if PNG_LIBPNG_VER < 10600
-         /* Copy the locations from the read_info_ptr.  The automatically
-          * generated locations in write_end_info_ptr are wrong prior to 1.6.0
-          * because they are reset from the write pointer (removed in 1.6.0).
-          */
-         {
-            int i;
-            for (i = 0; i < num_unknowns; i++)
-              png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
-                  unknowns[i].location);
-         }
-#endif
-      }
-   }
-#endif
-
-#ifdef PNG_WRITE_SUPPORTED
-   pngtest_debug("Writing info struct");
-
-   /* Write the info in two steps so that if we write the 'unknown' chunks here
-    * they go to the correct place.
-    */
-   png_write_info_before_PLTE(write_ptr, write_info_ptr);
-
-   write_chunks(write_ptr, before_PLTE); /* before PLTE */
-
-   png_write_info(write_ptr, write_info_ptr);
-
-   write_chunks(write_ptr, before_IDAT); /* after PLTE */
-
-   png_write_info(write_ptr, write_end_info_ptr);
-
-   write_chunks(write_ptr, after_IDAT); /* after IDAT */
-
-#ifdef PNG_COMPRESSION_COMPAT
-   /* Test the 'compatibility' setting here, if it is available. */
-   png_set_compression(write_ptr, PNG_COMPRESSION_COMPAT);
-#endif
-#endif
-
-#ifdef SINGLE_ROWBUF_ALLOC
-   pngtest_debug("Allocating row buffer...");
-   row_buf = (png_bytep)png_malloc(read_ptr,
-       png_get_rowbytes(read_ptr, read_info_ptr));
-
-   pngtest_debug1("\t0x%08lx", (unsigned long)row_buf);
-#endif /* SINGLE_ROWBUF_ALLOC */
-   pngtest_debug("Writing row data");
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) &&\
-   defined(PNG_WRITE_INTERLACING_SUPPORTED)
-   /* Both must be defined for libpng to be able to handle the interlace,
-    * otherwise it gets handled below by simply reading and writing the passes
-    * directly.
-    */
-   if (png_set_interlace_handling(read_ptr) != num_passes)
-      png_error(write_ptr,
-          "png_set_interlace_handling(read): wrong pass count ");
-   if (png_set_interlace_handling(write_ptr) != num_passes)
-      png_error(write_ptr,
-          "png_set_interlace_handling(write): wrong pass count ");
-#else /* png_set_interlace_handling not called on either read or write */
-#  define calc_pass_height
-#endif /* not using libpng interlace handling */
-
-#ifdef PNGTEST_TIMING
-   t_stop = (float)clock();
-   t_misc += (t_stop - t_start);
-   t_start = t_stop;
-#endif
-   for (pass = 0; pass < num_passes; pass++)
-   {
-#     ifdef calc_pass_height
-         png_uint_32 pass_height;
-
-         if (num_passes == 7) /* interlaced */
-         {
-            if (PNG_PASS_COLS(width, pass) > 0)
-               pass_height = PNG_PASS_ROWS(height, pass);
-
-            else
-               pass_height = 0;
-         }
-
-         else /* not interlaced */
-            pass_height = height;
-#     else
-#        define pass_height height
-#     endif
-
-      pngtest_debug1("Writing row data for pass %d", pass);
-      for (y = 0; y < pass_height; y++)
-      {
-#ifndef SINGLE_ROWBUF_ALLOC
-         pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);
-
-         row_buf = (png_bytep)png_malloc(read_ptr,
-             png_get_rowbytes(read_ptr, read_info_ptr));
-
-         pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf,
-             (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));
-
-#endif /* !SINGLE_ROWBUF_ALLOC */
-         png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);
-
-#ifdef PNG_WRITE_SUPPORTED
-#ifdef PNGTEST_TIMING
-         t_stop = (float)clock();
-         t_decode += (t_stop - t_start);
-         t_start = t_stop;
-#endif
-         png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
-#ifdef PNGTEST_TIMING
-         t_stop = (float)clock();
-         t_encode += (t_stop - t_start);
-         t_start = t_stop;
-#endif
-#endif /* WRITE */
-
-#ifndef SINGLE_ROWBUF_ALLOC
-         pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);
-         png_free(read_ptr, row_buf);
-         row_buf = NULL;
-#endif /* !SINGLE_ROWBUF_ALLOC */
-      }
-   }
-
-#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#  ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-      png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
-#  endif
-#  ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-      png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
-#  endif
-#endif
-
-   pngtest_debug("Reading and writing end_info data");
-
-   png_read_end(read_ptr, end_info_ptr);
-#ifdef PNG_TEXT_SUPPORTED
-   {
-      png_textp text_ptr;
-      int num_text;
-
-      if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
-      {
-         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);
-
-         pngtest_check_text_support(read_ptr, text_ptr, num_text);
-
-         if (verbose != 0)
-         {
-            int i;
-
-            fprintf(STDERR,"\n");
-            for (i=0; i<num_text; i++)
-            {
-               fprintf(STDERR,"   Text compression[%d]=%d\n",
-                   i, text_ptr[i].compression);
-            }
-         }
-
-         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
-      }
-   }
-#endif
-#ifdef PNG_READ_eXIf_SUPPORTED
-   {
-      png_bytep exif=NULL;
-      png_uint_32 exif_length;
-
-      if (png_get_eXIf_1(read_ptr, end_info_ptr, &exif_length, &exif) != 0)
-      {
-         if (exif_length > 1)
-            fprintf(STDERR," eXIf type %c%c, %lu bytes\n",exif[0],exif[1],
-               (unsigned long)exif_length);
-# ifdef PNG_WRITE_eXIf_SUPPORTED
-         png_set_eXIf_1(write_ptr, write_end_info_ptr, exif_length, exif);
-# endif
-      }
-   }
-#endif
-#ifdef PNG_tIME_SUPPORTED
-   {
-      png_timep mod_time;
-
-      if (png_get_tIME(read_ptr, end_info_ptr, &mod_time) != 0)
-      {
-         png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-         if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
-            tIME_string[(sizeof tIME_string) - 1] = '\0';
-
-         else
-         {
-            strncpy(tIME_string, "*** invalid time ***", sizeof tIME_string);
-            tIME_string[(sizeof tIME_string)-1] = '\0';
-         }
-
-         tIME_chunk_present++;
-#endif /* TIME_RFC1123 */
-      }
-   }
-#endif
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   {
-      png_unknown_chunkp unknowns;
-      int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr,
-          &unknowns);
-
-      if (num_unknowns != 0)
-      {
-         png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
-             num_unknowns);
-#if PNG_LIBPNG_VER < 10600
-         /* Copy the locations from the read_info_ptr.  The automatically
-          * generated locations in write_end_info_ptr are wrong prior to 1.6.0
-          * because they are reset from the write pointer (removed in 1.6.0).
-          */
-         {
-            int i;
-            for (i = 0; i < num_unknowns; i++)
-              png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
-                  unknowns[i].location);
-         }
-#endif
-      }
-   }
-#endif
-
-#ifdef PNG_WRITE_SUPPORTED
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-   /* Normally one would use Z_DEFAULT_STRATEGY for text compression.
-    * This is here just to make pngtest replicate the results from libpng
-    * versions prior to 1.5.4, and to test this new API.
-    */
-   png_set_text_compression_strategy(write_ptr, Z_FILTERED);
-#endif
-
-   /* When the unknown vpAg/sTER chunks are written by pngtest the only way to
-    * do it is to write them *before* calling png_write_end.  When unknown
-    * chunks are written by libpng, however, they are written just before IEND.
-    * There seems to be no way round this, however vpAg/sTER are not expected
-    * after IDAT.
-    */
-   write_chunks(write_ptr, after_IDAT);
-
-   png_write_end(write_ptr, write_end_info_ptr);
-#endif
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-   if (verbose != 0)
-   {
-      png_uint_32 iwidth, iheight;
-      iwidth = png_get_image_width(write_ptr, write_info_ptr);
-      iheight = png_get_image_height(write_ptr, write_info_ptr);
-      fprintf(STDERR, "\n Image width = %lu, height = %lu\n",
-          (unsigned long)iwidth, (unsigned long)iheight);
-   }
-#endif
-
-   pngtest_debug("Destroying data structs");
-#ifdef SINGLE_ROWBUF_ALLOC
-   pngtest_debug("destroying row_buf for read_ptr");
-   png_free(read_ptr, row_buf);
-   row_buf = NULL;
-#endif /* SINGLE_ROWBUF_ALLOC */
-   pngtest_debug("destroying read_ptr, read_info_ptr, end_info_ptr");
-   png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
-#ifdef PNG_WRITE_SUPPORTED
-   pngtest_debug("destroying write_end_info_ptr");
-   png_destroy_info_struct(write_ptr, &write_end_info_ptr);
-   pngtest_debug("destroying write_ptr, write_info_ptr");
-   png_destroy_write_struct(&write_ptr, &write_info_ptr);
-#endif
-   pngtest_debug("Destruction complete.");
-
-   FCLOSE(fpin);
-   FCLOSE(fpout);
-
-   /* Summarize any warnings or errors and in 'strict' mode fail the test.
-    * Unsupported chunks can result in warnings, in that case ignore the strict
-    * setting, otherwise fail the test on warnings as well as errors.
-    */
-   if (error_count > 0)
-   {
-      /* We don't really expect to get here because of the setjmp handling
-       * above, but this is safe.
-       */
-      fprintf(STDERR, "\n  %s: %d libpng errors found (%d warnings)",
-          inname, error_count, warning_count);
-
-      if (strict != 0)
-         return (1);
-   }
-
-#  ifdef PNG_WRITE_SUPPORTED
-      /* If there is no write support nothing was written! */
-      else if (unsupported_chunks > 0)
-      {
-         fprintf(STDERR, "\n  %s: unsupported chunks (%d)%s",
-             inname, unsupported_chunks, strict ? ": IGNORED --strict!" : "");
-      }
-#  endif
-
-   else if (warning_count > 0)
-   {
-      fprintf(STDERR, "\n  %s: %d libpng warnings found",
-          inname, warning_count);
-
-      if (strict != 0)
-         return (1);
-   }
-
-   pngtest_debug("Opening files for comparison");
-   if ((fpin = fopen(inname, "rb")) == NULL)
-   {
-      fprintf(STDERR, "Could not find file %s\n", inname);
-      return (1);
-   }
-
-   if ((fpout = fopen(outname, "rb")) == NULL)
-   {
-      fprintf(STDERR, "Could not find file %s\n", outname);
-      FCLOSE(fpin);
-      return (1);
-   }
-
-#if defined (PNG_WRITE_SUPPORTED) /* else nothing was written */ &&\
-    defined (PNG_WRITE_FILTER_SUPPORTED)
-   if (interlace_preserved != 0) /* else the files will be changed */
-   {
-      for (;;)
-      {
-         static int wrote_question = 0;
-         png_size_t num_in, num_out;
-         char inbuf[256], outbuf[256];
-
-         num_in = fread(inbuf, 1, sizeof inbuf, fpin);
-         num_out = fread(outbuf, 1, sizeof outbuf, fpout);
-
-         if (num_in != num_out)
-         {
-            fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
-                inname, outname);
-
-            if (wrote_question == 0 && unsupported_chunks == 0)
-            {
-               fprintf(STDERR,
-                   "   Was %s written with the same maximum IDAT"
-                   " chunk size (%d bytes),",
-                   inname, PNG_ZBUF_SIZE);
-               fprintf(STDERR,
-                   "\n   filtering heuristic (libpng default), compression");
-               fprintf(STDERR,
-                   " level (zlib default),\n   and zlib version (%s)?\n\n",
-                   ZLIB_VERSION);
-               wrote_question = 1;
-            }
-
-            FCLOSE(fpin);
-            FCLOSE(fpout);
-
-            if (strict != 0 && unsupported_chunks == 0)
-              return (1);
-
-            else
-              return (0);
-         }
-
-         if (num_in == 0)
-            break;
-
-         if (memcmp(inbuf, outbuf, num_in))
-         {
-            fprintf(STDERR, "\nFiles %s and %s are different\n", inname,
-                outname);
-
-            if (wrote_question == 0 && unsupported_chunks == 0)
-            {
-               fprintf(STDERR,
-                   "   Was %s written with the same maximum"
-                   " IDAT chunk size (%d bytes),",
-                    inname, PNG_ZBUF_SIZE);
-               fprintf(STDERR,
-                   "\n   filtering heuristic (libpng default), compression");
-               fprintf(STDERR,
-                   " level (zlib default),\n   and zlib version (%s)?\n\n",
-                 ZLIB_VERSION);
-               wrote_question = 1;
-            }
-
-            FCLOSE(fpin);
-            FCLOSE(fpout);
-
-            /* NOTE: the unsupported_chunks escape is permitted here because
-             * unsupported text chunk compression will result in the compression
-             * mode being changed (to NONE) yet, in the test case, the result
-             * can be exactly the same size!
-             */
-            if (strict != 0 && unsupported_chunks == 0)
-              return (1);
-
-            else
-              return (0);
-         }
-      }
-   }
-#endif /* WRITE && WRITE_FILTER */
-
-   FCLOSE(fpin);
-   FCLOSE(fpout);
-
-   return (0);
-}
-
-/* Input and output filenames */
-#ifdef RISCOS
-static PNG_CONST char *inname = "pngtest/png";
-static PNG_CONST char *outname = "pngout/png";
-#else
-static PNG_CONST char *inname = "pngtest.png";
-static PNG_CONST char *outname = "pngout.png";
-#endif
-
-int
-main(int argc, char *argv[])
-{
-   int multiple = 0;
-   int ierror = 0;
-
-   png_structp dummy_ptr;
-
-   fprintf(STDERR, "\n Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
-   fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
-   fprintf(STDERR, "%s", png_get_copyright(NULL));
-   /* Show the version of libpng used in building the library */
-   fprintf(STDERR, " library (%lu):%s",
-       (unsigned long)png_access_version_number(),
-       png_get_header_version(NULL));
-
-   /* Show the version of libpng used in building the application */
-   fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
-       PNG_HEADER_VERSION_STRING);
-
-   /* Do some consistency checking on the memory allocation settings, I'm
-    * not sure this matters, but it is nice to know, the first of these
-    * tests should be impossible because of the way the macros are set
-    * in pngconf.h
-    */
-#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
-      fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
-#endif
-   /* I think the following can happen. */
-#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
-      fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
-#endif
-
-   if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
-   {
-      fprintf(STDERR,
-          "Warning: versions are different between png.h and png.c\n");
-      fprintf(STDERR, "  png.h version: %s\n", PNG_LIBPNG_VER_STRING);
-      fprintf(STDERR, "  png.c version: %s\n\n", png_libpng_ver);
-      ++ierror;
-   }
-
-   if (argc > 1)
-   {
-      if (strcmp(argv[1], "-m") == 0)
-      {
-         multiple = 1;
-         status_dots_requested = 0;
-      }
-
-      else if (strcmp(argv[1], "-mv") == 0 ||
-               strcmp(argv[1], "-vm") == 0 )
-      {
-         multiple = 1;
-         verbose = 1;
-         status_dots_requested = 1;
-      }
-
-      else if (strcmp(argv[1], "-v") == 0)
-      {
-         verbose = 1;
-         status_dots_requested = 1;
-         inname = argv[2];
-      }
-
-      else if (strcmp(argv[1], "--strict") == 0)
-      {
-         status_dots_requested = 0;
-         verbose = 1;
-         inname = argv[2];
-         strict++;
-         relaxed = 0;
-         multiple=1;
-      }
-
-      else if (strcmp(argv[1], "--relaxed") == 0)
-      {
-         status_dots_requested = 0;
-         verbose = 1;
-         inname = argv[2];
-         strict = 0;
-         relaxed++;
-         multiple=1;
-      }
-      else if (strcmp(argv[1], "--xfail") == 0)
-      {
-         status_dots_requested = 0;
-         verbose = 1;
-         inname = argv[2];
-         strict = 0;
-         xfail++;
-         relaxed++;
-         multiple=1;
-      }
-
-      else
-      {
-         inname = argv[1];
-         status_dots_requested = 0;
-      }
-   }
-
-   if (multiple == 0 && argc == 3 + verbose)
-      outname = argv[2 + verbose];
-
-   if ((multiple == 0 && argc > 3 + verbose) ||
-       (multiple != 0 && argc < 2))
-   {
-      fprintf(STDERR,
-          "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
-          argv[0], argv[0]);
-      fprintf(STDERR,
-          "  reads/writes one PNG file (without -m) or multiple files (-m)\n");
-      fprintf(STDERR,
-          "  with -m %s is used as a temporary file\n", outname);
-      exit(1);
-   }
-
-   if (multiple != 0)
-   {
-      int i;
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-      int allocation_now = current_allocation;
-#endif
-      for (i=2; i<argc; ++i)
-      {
-         int kerror;
-         fprintf(STDERR, "\n Testing %s:", argv[i]);
-#if PNG_DEBUG > 0
-         fprintf(STDERR, "\n");
-#endif
-         kerror = test_one_file(argv[i], outname);
-         if (kerror == 0)
-         {
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-            fprintf(STDERR, "\n PASS (%lu zero samples)\n",
-                (unsigned long)zero_samples);
-#else
-            fprintf(STDERR, " PASS\n");
-#endif
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-            if (tIME_chunk_present != 0)
-               fprintf(STDERR, " tIME = %s\n", tIME_string);
-
-            tIME_chunk_present = 0;
-#endif /* TIME_RFC1123 */
-         }
-
-         else
-         {
-            if (xfail)
-              fprintf(STDERR, " XFAIL\n");
-            else
-            {
-              fprintf(STDERR, " FAIL\n");
-              ierror += kerror;
-            }
-         }
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-         if (allocation_now != current_allocation)
-            fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
-                current_allocation - allocation_now);
-
-         if (current_allocation != 0)
-         {
-            memory_infop pinfo = pinformation;
-
-            fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
-                current_allocation);
-
-            while (pinfo != NULL)
-            {
-               fprintf(STDERR, " %lu bytes at %p\n",
-                   (unsigned long)pinfo->size,
-                   pinfo->pointer);
-               pinfo = pinfo->next;
-            }
-         }
-#endif
-      }
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-         fprintf(STDERR, " Current memory allocation: %10d bytes\n",
-             current_allocation);
-         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
-             maximum_allocation);
-         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
-             total_allocation);
-         fprintf(STDERR, "     Number of allocations: %10d\n",
-             num_allocations);
-#endif
-   }
-
-   else
-   {
-      int i;
-      for (i = 0; i<3; ++i)
-      {
-         int kerror;
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-         int allocation_now = current_allocation;
-#endif
-         if (i == 1)
-            status_dots_requested = 1;
-
-         else if (verbose == 0)
-            status_dots_requested = 0;
-
-         if (i == 0 || verbose == 1 || ierror != 0)
-         {
-            fprintf(STDERR, "\n Testing %s:", inname);
-#if PNG_DEBUG > 0
-            fprintf(STDERR, "\n");
-#endif
-         }
-
-         kerror = test_one_file(inname, outname);
-
-         if (kerror == 0)
-         {
-            if (verbose == 1 || i == 2)
-            {
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-                fprintf(STDERR, "\n PASS (%lu zero samples)\n",
-                    (unsigned long)zero_samples);
-#else
-                fprintf(STDERR, " PASS\n");
-#endif
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-             if (tIME_chunk_present != 0)
-                fprintf(STDERR, " tIME = %s\n", tIME_string);
-#endif /* TIME_RFC1123 */
-            }
-         }
-
-         else
-         {
-            if (verbose == 0 && i != 2)
-            {
-               fprintf(STDERR, "\n Testing %s:", inname);
-#if PNG_DEBUG > 0
-               fprintf(STDERR, "\n");
-#endif
-            }
-
-            if (xfail)
-              fprintf(STDERR, " XFAIL\n");
-            else
-            {
-              fprintf(STDERR, " FAIL\n");
-              ierror += kerror;
-            }
-         }
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-         if (allocation_now != current_allocation)
-             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
-                 current_allocation - allocation_now);
-
-         if (current_allocation != 0)
-         {
-             memory_infop pinfo = pinformation;
-
-             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
-                 current_allocation);
-
-             while (pinfo != NULL)
-             {
-                fprintf(STDERR, " %lu bytes at %p\n",
-                    (unsigned long)pinfo->size, pinfo->pointer);
-                pinfo = pinfo->next;
-             }
-          }
-#endif
-       }
-#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
-       fprintf(STDERR, " Current memory allocation: %10d bytes\n",
-           current_allocation);
-       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
-           maximum_allocation);
-       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
-           total_allocation);
-       fprintf(STDERR, "     Number of allocations: %10d\n",
-           num_allocations);
-#endif
-   }
-
-#ifdef PNGTEST_TIMING
-   t_stop = (float)clock();
-   t_misc += (t_stop - t_start);
-   t_start = t_stop;
-   fprintf(STDERR, " CPU time used = %.3f seconds",
-       (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
-   fprintf(STDERR, " (decoding %.3f,\n",
-       t_decode/(float)CLOCKS_PER_SEC);
-   fprintf(STDERR, "        encoding %.3f ,",
-       t_encode/(float)CLOCKS_PER_SEC);
-   fprintf(STDERR, " other %.3f seconds)\n\n",
-       t_misc/(float)CLOCKS_PER_SEC);
-#endif
-
-   if (ierror == 0)
-      fprintf(STDERR, " libpng passes test\n");
-
-   else
-      fprintf(STDERR, " libpng FAILS test\n");
-
-   dummy_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-   fprintf(STDERR, " Default limits:\n");
-   fprintf(STDERR, "  width_max  = %lu\n",
-       (unsigned long) png_get_user_width_max(dummy_ptr));
-   fprintf(STDERR, "  height_max = %lu\n",
-       (unsigned long) png_get_user_height_max(dummy_ptr));
-   if (png_get_chunk_cache_max(dummy_ptr) == 0)
-      fprintf(STDERR, "  cache_max  = unlimited\n");
-   else
-      fprintf(STDERR, "  cache_max  = %lu\n",
-          (unsigned long) png_get_chunk_cache_max(dummy_ptr));
-   if (png_get_chunk_malloc_max(dummy_ptr) == 0)
-      fprintf(STDERR, "  malloc_max = unlimited\n");
-   else
-      fprintf(STDERR, "  malloc_max = %lu\n",
-          (unsigned long) png_get_chunk_malloc_max(dummy_ptr));
-   png_destroy_read_struct(&dummy_ptr, NULL, NULL);
-
-   return (int)(ierror != 0);
-}
-#else
-int
-main(void)
-{
-   fprintf(STDERR,
-       " test ignored because libpng was not built with read support\n");
-   /* And skip this test */
-   return PNG_LIBPNG_VER < 10600 ? 0 : 77;
-}
-#endif
-
-/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_34 Your_png_h_is_not_version_1_6_34;
diff --git a/src/png/libpng/pngtrans.c b/src/png/libpng/pngtrans.c
deleted file mode 100644
index 6882f0fd7..000000000
--- a/src/png/libpng/pngtrans.c
+++ /dev/null
@@ -1,864 +0,0 @@
-
-/* pngtrans.c - transforms the data in a row (used by both readers and writers)
- *
- * Last changed in libpng 1.6.33 [September 28, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Turn on BGR-to-RGB mapping */
-void PNGAPI
-png_set_bgr(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_bgr");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_BGR;
-}
-#endif
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Turn on 16-bit byte swapping */
-void PNGAPI
-png_set_swap(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_swap");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth == 16)
-      png_ptr->transformations |= PNG_SWAP_BYTES;
-}
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Turn on pixel packing */
-void PNGAPI
-png_set_packing(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_packing");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth < 8)
-   {
-      png_ptr->transformations |= PNG_PACK;
-#     ifdef PNG_WRITE_SUPPORTED
-         png_ptr->usr_bit_depth = 8;
-#     endif
-   }
-}
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Turn on packed pixel swapping */
-void PNGAPI
-png_set_packswap(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_packswap");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth < 8)
-      png_ptr->transformations |= PNG_PACKSWAP;
-}
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-void PNGAPI
-png_set_shift(png_structrp png_ptr, png_const_color_8p true_bits)
-{
-   png_debug(1, "in png_set_shift");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_SHIFT;
-   png_ptr->shift = *true_bits;
-}
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-int PNGAPI
-png_set_interlace_handling(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_interlace handling");
-
-   if (png_ptr != 0 && png_ptr->interlaced != 0)
-   {
-      png_ptr->transformations |= PNG_INTERLACE;
-      return (7);
-   }
-
-   return (1);
-}
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte on read, or remove a filler or alpha byte on write.
- * The filler type has changed in v0.95 to allow future 2-byte fillers
- * for 48-bit input data, as well as to avoid problems with some compilers
- * that don't like bytes as parameters.
- */
-void PNGAPI
-png_set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
-{
-   png_debug(1, "in png_set_filler");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* In libpng 1.6 it is possible to determine whether this is a read or write
-    * operation and therefore to do more checking here for a valid call.
-    */
-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
-   {
-#     ifdef PNG_READ_FILLER_SUPPORTED
-         /* On read png_set_filler is always valid, regardless of the base PNG
-          * format, because other transformations can give a format where the
-          * filler code can execute (basically an 8 or 16-bit component RGB or G
-          * format.)
-          *
-          * NOTE: usr_channels is not used by the read code!  (This has led to
-          * confusion in the past.)  The filler is only used in the read code.
-          */
-         png_ptr->filler = (png_uint_16)filler;
-#     else
-         png_app_error(png_ptr, "png_set_filler not supported on read");
-         PNG_UNUSED(filler) /* not used in the write case */
-         return;
-#     endif
-   }
-
-   else /* write */
-   {
-#     ifdef PNG_WRITE_FILLER_SUPPORTED
-         /* On write the usr_channels parameter must be set correctly at the
-          * start to record the number of channels in the app-supplied data.
-          */
-         switch (png_ptr->color_type)
-         {
-            case PNG_COLOR_TYPE_RGB:
-               png_ptr->usr_channels = 4;
-               break;
-
-            case PNG_COLOR_TYPE_GRAY:
-               if (png_ptr->bit_depth >= 8)
-               {
-                  png_ptr->usr_channels = 2;
-                  break;
-               }
-
-               else
-               {
-                  /* There simply isn't any code in libpng to strip out bits
-                   * from bytes when the components are less than a byte in
-                   * size!
-                   */
-                  png_app_error(png_ptr,
-                      "png_set_filler is invalid for"
-                      " low bit depth gray output");
-                  return;
-               }
-
-            default:
-               png_app_error(png_ptr,
-                   "png_set_filler: inappropriate color type");
-               return;
-         }
-#     else
-         png_app_error(png_ptr, "png_set_filler not supported on write");
-         return;
-#     endif
-   }
-
-   /* Here on success - libpng supports the operation, set the transformation
-    * and the flag to say where the filler channel is.
-    */
-   png_ptr->transformations |= PNG_FILLER;
-
-   if (filler_loc == PNG_FILLER_AFTER)
-      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
-
-   else
-      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
-}
-
-/* Added to libpng-1.2.7 */
-void PNGAPI
-png_set_add_alpha(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
-{
-   png_debug(1, "in png_set_add_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_set_filler(png_ptr, filler, filler_loc);
-   /* The above may fail to do anything. */
-   if ((png_ptr->transformations & PNG_FILLER) != 0)
-      png_ptr->transformations |= PNG_ADD_ALPHA;
-}
-
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-void PNGAPI
-png_set_swap_alpha(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_swap_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_SWAP_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-void PNGAPI
-png_set_invert_alpha(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_invert_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_INVERT_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-void PNGAPI
-png_set_invert_mono(png_structrp png_ptr)
-{
-   png_debug(1, "in png_set_invert_mono");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_INVERT_MONO;
-}
-
-/* Invert monochrome grayscale data */
-void /* PRIVATE */
-png_do_invert(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_invert");
-
-  /* This test removed from libpng version 1.0.13 and 1.2.0:
-   *   if (row_info->bit_depth == 1 &&
-   */
-   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i++)
-      {
-         *rp = (png_byte)(~(*rp));
-         rp++;
-      }
-   }
-
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-      row_info->bit_depth == 8)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i += 2)
-      {
-         *rp = (png_byte)(~(*rp));
-         rp += 2;
-      }
-   }
-
-#ifdef PNG_16BIT_SUPPORTED
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-      row_info->bit_depth == 16)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i += 4)
-      {
-         *rp = (png_byte)(~(*rp));
-         *(rp + 1) = (png_byte)(~(*(rp + 1)));
-         rp += 4;
-      }
-   }
-#endif
-}
-#endif
-
-#ifdef PNG_16BIT_SUPPORTED
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swaps byte order on 16-bit depth images */
-void /* PRIVATE */
-png_do_swap(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_swap");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep rp = row;
-      png_uint_32 i;
-      png_uint_32 istop= row_info->width * row_info->channels;
-
-      for (i = 0; i < istop; i++, rp += 2)
-      {
-#ifdef PNG_BUILTIN_BSWAP16_SUPPORTED
-         /* Feature added to libpng-1.6.11 for testing purposes, not
-          * enabled by default.
-          */
-         *(png_uint_16*)rp = __builtin_bswap16(*(png_uint_16*)rp);
-#else
-         png_byte t = *rp;
-         *rp = *(rp + 1);
-         *(rp + 1) = t;
-#endif
-      }
-   }
-}
-#endif
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-static PNG_CONST png_byte onebppswaptable[256] = {
-   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
-   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
-   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
-   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
-   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
-   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
-   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
-   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
-   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
-   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
-   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
-   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
-   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
-   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
-   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
-   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
-   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
-   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
-   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
-   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
-   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
-   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
-   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
-   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
-   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
-   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
-   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
-   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
-   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
-   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
-   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
-   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-};
-
-static PNG_CONST png_byte twobppswaptable[256] = {
-   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
-   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
-   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
-   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
-   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
-   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
-   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
-   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
-   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
-   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
-   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
-   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
-   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
-   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
-   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
-   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
-   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
-   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
-   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
-   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
-   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
-   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
-   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
-   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
-   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
-   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
-   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
-   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
-   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
-   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
-   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
-   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
-};
-
-static PNG_CONST png_byte fourbppswaptable[256] = {
-   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
-   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
-   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
-   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
-   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
-   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
-   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
-   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
-   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
-   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
-   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
-   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
-   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
-   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
-   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
-   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
-   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
-   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
-   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
-   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
-   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
-   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
-   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
-   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
-   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
-   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
-   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
-   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
-   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
-   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
-   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
-   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
-};
-
-/* Swaps pixel packing order within bytes */
-void /* PRIVATE */
-png_do_packswap(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_packswap");
-
-   if (row_info->bit_depth < 8)
-   {
-      png_bytep rp;
-      png_const_bytep end, table;
-
-      end = row + row_info->rowbytes;
-
-      if (row_info->bit_depth == 1)
-         table = onebppswaptable;
-
-      else if (row_info->bit_depth == 2)
-         table = twobppswaptable;
-
-      else if (row_info->bit_depth == 4)
-         table = fourbppswaptable;
-
-      else
-         return;
-
-      for (rp = row; rp < end; rp++)
-         *rp = table[*rp];
-   }
-}
-#endif /* PACKSWAP || WRITE_PACKSWAP */
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-/* Remove a channel - this used to be 'png_do_strip_filler' but it used a
- * somewhat weird combination of flags to determine what to do.  All the calls
- * to png_do_strip_filler are changed in 1.5.2 to call this instead with the
- * correct arguments.
- *
- * The routine isn't general - the channel must be the channel at the start or
- * end (not in the middle) of each pixel.
- */
-void /* PRIVATE */
-png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start)
-{
-   png_bytep sp = row; /* source pointer */
-   png_bytep dp = row; /* destination pointer */
-   png_bytep ep = row + row_info->rowbytes; /* One beyond end of row */
-
-   /* At the start sp will point to the first byte to copy and dp to where
-    * it is copied to.  ep always points just beyond the end of the row, so
-    * the loop simply copies (channels-1) channels until sp reaches ep.
-    *
-    * at_start:        0 -- convert AG, XG, ARGB, XRGB, AAGG, XXGG, etc.
-    *            nonzero -- convert GA, GX, RGBA, RGBX, GGAA, RRGGBBXX, etc.
-    */
-
-   /* GA, GX, XG cases */
-   if (row_info->channels == 2)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (at_start != 0) /* Skip initial filler */
-            ++sp;
-         else          /* Skip initial channel and, for sp, the filler */
-         {
-            sp += 2; ++dp;
-         }
-
-         /* For a 1 pixel wide image there is nothing to do */
-         while (sp < ep)
-         {
-            *dp++ = *sp; sp += 2;
-         }
-
-         row_info->pixel_depth = 8;
-      }
-
-      else if (row_info->bit_depth == 16)
-      {
-         if (at_start != 0) /* Skip initial filler */
-            sp += 2;
-         else          /* Skip initial channel and, for sp, the filler */
-         {
-            sp += 4; dp += 2;
-         }
-
-         while (sp < ep)
-         {
-            *dp++ = *sp++; *dp++ = *sp; sp += 3;
-         }
-
-         row_info->pixel_depth = 16;
-      }
-
-      else
-         return; /* bad bit depth */
-
-      row_info->channels = 1;
-
-      /* Finally fix the color type if it records an alpha channel */
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-         row_info->color_type = PNG_COLOR_TYPE_GRAY;
-   }
-
-   /* RGBA, RGBX, XRGB cases */
-   else if (row_info->channels == 4)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (at_start != 0) /* Skip initial filler */
-            ++sp;
-         else          /* Skip initial channels and, for sp, the filler */
-         {
-            sp += 4; dp += 3;
-         }
-
-         /* Note that the loop adds 3 to dp and 4 to sp each time. */
-         while (sp < ep)
-         {
-            *dp++ = *sp++; *dp++ = *sp++; *dp++ = *sp; sp += 2;
-         }
-
-         row_info->pixel_depth = 24;
-      }
-
-      else if (row_info->bit_depth == 16)
-      {
-         if (at_start != 0) /* Skip initial filler */
-            sp += 2;
-         else          /* Skip initial channels and, for sp, the filler */
-         {
-            sp += 8; dp += 6;
-         }
-
-         while (sp < ep)
-         {
-            /* Copy 6 bytes, skip 2 */
-            *dp++ = *sp++; *dp++ = *sp++;
-            *dp++ = *sp++; *dp++ = *sp++;
-            *dp++ = *sp++; *dp++ = *sp; sp += 3;
-         }
-
-         row_info->pixel_depth = 48;
-      }
-
-      else
-         return; /* bad bit depth */
-
-      row_info->channels = 3;
-
-      /* Finally fix the color type if it records an alpha channel */
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         row_info->color_type = PNG_COLOR_TYPE_RGB;
-   }
-
-   else
-      return; /* The filler channel has gone already */
-
-   /* Fix the rowbytes value. */
-   row_info->rowbytes = (png_size_t)(dp-row);
-}
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Swaps red and blue bytes within a pixel */
-void /* PRIVATE */
-png_do_bgr(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_bgr");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
-   {
-      png_uint_32 row_width = row_info->width;
-      if (row_info->bit_depth == 8)
-      {
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 3)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 2);
-               *(rp + 2) = save;
-            }
-         }
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 4)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 2);
-               *(rp + 2) = save;
-            }
-         }
-      }
-
-#ifdef PNG_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 6)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 4);
-               *(rp + 4) = save;
-               save = *(rp + 1);
-               *(rp + 1) = *(rp + 5);
-               *(rp + 5) = save;
-            }
-         }
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 8)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 4);
-               *(rp + 4) = save;
-               save = *(rp + 1);
-               *(rp + 1) = *(rp + 5);
-               *(rp + 5) = save;
-            }
-         }
-      }
-#endif
-   }
-}
-#endif /* READ_BGR || WRITE_BGR */
-
-#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
-    defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
-/* Added at libpng-1.5.10 */
-void /* PRIVATE */
-png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
-{
-   if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
-      png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
-   {
-      /* Calculations moved outside switch in an attempt to stop different
-       * compiler warnings.  'padding' is in *bits* within the last byte, it is
-       * an 'int' because pixel_depth becomes an 'int' in the expression below,
-       * and this calculation is used because it avoids warnings that other
-       * forms produced on either GCC or MSVC.
-       */
-      int padding = PNG_PADBITS(row_info->pixel_depth, row_info->width);
-      png_bytep rp = png_ptr->row_buf + row_info->rowbytes - 1;
-
-      switch (row_info->bit_depth)
-      {
-         case 1:
-         {
-            /* in this case, all bytes must be 0 so we don't need
-             * to unpack the pixels except for the rightmost one.
-             */
-            for (; rp > png_ptr->row_buf; rp--)
-            {
-              if ((*rp >> padding) != 0)
-                 png_ptr->num_palette_max = 1;
-              padding = 0;
-            }
-
-            break;
-         }
-
-         case 2:
-         {
-            for (; rp > png_ptr->row_buf; rp--)
-            {
-              int i = ((*rp >> padding) & 0x03);
-
-              if (i > png_ptr->num_palette_max)
-                 png_ptr->num_palette_max = i;
-
-              i = (((*rp >> padding) >> 2) & 0x03);
-
-              if (i > png_ptr->num_palette_max)
-                 png_ptr->num_palette_max = i;
-
-              i = (((*rp >> padding) >> 4) & 0x03);
-
-              if (i > png_ptr->num_palette_max)
-                 png_ptr->num_palette_max = i;
-
-              i = (((*rp >> padding) >> 6) & 0x03);
-
-              if (i > png_ptr->num_palette_max)
-                 png_ptr->num_palette_max = i;
-
-              padding = 0;
-            }
-
-            break;
-         }
-
-         case 4:
-         {
-            for (; rp > png_ptr->row_buf; rp--)
-            {
-              int i = ((*rp >> padding) & 0x0f);
-
-              if (i > png_ptr->num_palette_max)
-                 png_ptr->num_palette_max = i;
-
-              i = (((*rp >> padding) >> 4) & 0x0f);
-
-              if (i > png_ptr->num_palette_max)
-                 png_ptr->num_palette_max = i;
-
-              padding = 0;
-            }
-
-            break;
-         }
-
-         case 8:
-         {
-            for (; rp > png_ptr->row_buf; rp--)
-            {
-               if (*rp > png_ptr->num_palette_max)
-                  png_ptr->num_palette_max = (int) *rp;
-            }
-
-            break;
-         }
-
-         default:
-            break;
-      }
-   }
-}
-#endif /* CHECK_FOR_INVALID_INDEX */
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-void PNGAPI
-png_set_user_transform_info(png_structrp png_ptr, png_voidp
-   user_transform_ptr, int user_transform_depth, int user_transform_channels)
-{
-   png_debug(1, "in png_set_user_transform_info");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-      (png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
-   {
-      png_app_error(png_ptr,
-          "info change after png_start_read_image or png_read_update_info");
-      return;
-   }
-#endif
-
-   png_ptr->user_transform_ptr = user_transform_ptr;
-   png_ptr->user_transform_depth = (png_byte)user_transform_depth;
-   png_ptr->user_transform_channels = (png_byte)user_transform_channels;
-}
-#endif
-
-/* This function returns a pointer to the user_transform_ptr associated with
- * the user transform functions.  The application should free any memory
- * associated with this pointer before png_write_destroy and png_read_destroy
- * are called.
- */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-png_voidp PNGAPI
-png_get_user_transform_ptr(png_const_structrp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return png_ptr->user_transform_ptr;
-}
-#endif
-
-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-png_uint_32 PNGAPI
-png_get_current_row_number(png_const_structrp png_ptr)
-{
-   /* See the comments in png.h - this is the sub-image row when reading an
-    * interlaced image.
-    */
-   if (png_ptr != NULL)
-      return png_ptr->row_number;
-
-   return PNG_UINT_32_MAX; /* help the app not to fail silently */
-}
-
-png_byte PNGAPI
-png_get_current_pass_number(png_const_structrp png_ptr)
-{
-   if (png_ptr != NULL)
-      return png_ptr->pass;
-   return 8; /* invalid */
-}
-#endif /* USER_TRANSFORM_INFO */
-#endif /* READ_USER_TRANSFORM || WRITE_USER_TRANSFORM */
-#endif /* READ || WRITE */
diff --git a/src/png/libpng/pngusr.dfa b/src/png/libpng/pngusr.dfa
deleted file mode 100644
index 83067c38c..000000000
--- a/src/png/libpng/pngusr.dfa
+++ /dev/null
@@ -1,14 +0,0 @@
-# pngusr.dfa
-#
-# Build time configuration of libpng
-#
-# Enter build configuration options in this file
-#
-# Security settings: by default these limits are unset, you can change them
-# here by entering the appropriate values as #defines preceded by '@' (to cause,
-# them to be passed through to the build of pnglibconf.h), for example:
-#
-# @# define PNG_USER_WIDTH_MAX 65535
-# @# define PNG_USER_HEIGHT_MAX 65535
-# @# define PNG_USER_CHUNK_CACHE_MAX 256
-# @# define PNG_USER_CHUNK_MALLOC_MAX 640000
diff --git a/src/png/libpng/pngwio.c b/src/png/libpng/pngwio.c
deleted file mode 100644
index 37c7c3a7f..000000000
--- a/src/png/libpng/pngwio.c
+++ /dev/null
@@ -1,168 +0,0 @@
-
-/* pngwio.c - functions for data output
- *
- * Last changed in libpng 1.6.24 [August 4, 2016]
- * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all output.  Users who need
- * special handling are expected to write functions that have the same
- * arguments as these and perform similar functions, but that possibly
- * use different output methods.  Note that you shouldn't change these
- * functions, but rather write replacement functions and then change
- * them at run time with png_set_write_fn(...).
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Write the data to whatever output you are using.  The default routine
- * writes to a file pointer.  Note that this routine sometimes gets called
- * with very small lengths, so you should implement some kind of simple
- * buffering if you are using unbuffered writes.  This should never be asked
- * to write more than 64K on a 16-bit machine.
- */
-
-void /* PRIVATE */
-png_write_data(png_structrp png_ptr, png_const_bytep data, png_size_t length)
-{
-   /* NOTE: write_data_fn must not change the buffer! */
-   if (png_ptr->write_data_fn != NULL )
-      (*(png_ptr->write_data_fn))(png_ptr, png_constcast(png_bytep,data),
-          length);
-
-   else
-      png_error(png_ptr, "Call to NULL write function");
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-/* This is the function that does the actual writing of data.  If you are
- * not writing to a standard C stream, you should create a replacement
- * write_data function and use it at run time with png_set_write_fn(), rather
- * than changing the library.
- */
-void PNGCBAPI
-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-
-   if (png_ptr == NULL)
-      return;
-
-   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
-
-   if (check != length)
-      png_error(png_ptr, "Write Error");
-}
-#endif
-
-/* This function is called to output any data pending writing (normally
- * to disk).  After png_flush is called, there should be no data pending
- * writing in any buffers.
- */
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-void /* PRIVATE */
-png_flush(png_structrp png_ptr)
-{
-   if (png_ptr->output_flush_fn != NULL)
-      (*(png_ptr->output_flush_fn))(png_ptr);
-}
-
-#  ifdef PNG_STDIO_SUPPORTED
-void PNGCBAPI
-png_default_flush(png_structp png_ptr)
-{
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   io_ptr = png_voidcast(png_FILE_p, (png_ptr->io_ptr));
-   fflush(io_ptr);
-}
-#  endif
-#endif
-
-/* This function allows the application to supply new output functions for
- * libpng if standard C streams aren't being used.
- *
- * This function takes as its arguments:
- * png_ptr       - pointer to a png output data structure
- * io_ptr        - pointer to user supplied structure containing info about
- *                 the output functions.  May be NULL.
- * write_data_fn - pointer to a new output function that takes as its
- *                 arguments a pointer to a png_struct, a pointer to
- *                 data to be written, and a 32-bit unsigned int that is
- *                 the number of bytes to be written.  The new write
- *                 function should call png_error(png_ptr, "Error msg")
- *                 to exit and output any fatal error messages.  May be
- *                 NULL, in which case libpng's default function will
- *                 be used.
- * flush_data_fn - pointer to a new flush function that takes as its
- *                 arguments a pointer to a png_struct.  After a call to
- *                 the flush function, there should be no data in any buffers
- *                 or pending transmission.  If the output method doesn't do
- *                 any buffering of output, a function prototype must still be
- *                 supplied although it doesn't have to do anything.  If
- *                 PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
- *                 time, output_flush_fn will be ignored, although it must be
- *                 supplied for compatibility.  May be NULL, in which case
- *                 libpng's default function will be used, if
- *                 PNG_WRITE_FLUSH_SUPPORTED is defined.  This is not
- *                 a good idea if io_ptr does not point to a standard
- *                 *FILE structure.
- */
-void PNGAPI
-png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr,
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = io_ptr;
-
-#ifdef PNG_STDIO_SUPPORTED
-   if (write_data_fn != NULL)
-      png_ptr->write_data_fn = write_data_fn;
-
-   else
-      png_ptr->write_data_fn = png_default_write_data;
-#else
-   png_ptr->write_data_fn = write_data_fn;
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_STDIO_SUPPORTED
-
-   if (output_flush_fn != NULL)
-      png_ptr->output_flush_fn = output_flush_fn;
-
-   else
-      png_ptr->output_flush_fn = png_default_flush;
-
-#  else
-   png_ptr->output_flush_fn = output_flush_fn;
-#  endif
-#else
-   PNG_UNUSED(output_flush_fn)
-#endif /* WRITE_FLUSH */
-
-#ifdef PNG_READ_SUPPORTED
-   /* It is an error to read while writing a png file */
-   if (png_ptr->read_data_fn != NULL)
-   {
-      png_ptr->read_data_fn = NULL;
-
-      png_warning(png_ptr,
-          "Can't set both read_data_fn and write_data_fn in the"
-          " same structure");
-   }
-#endif
-}
-#endif /* WRITE */
diff --git a/src/png/libpng/pngwrite.c b/src/png/libpng/pngwrite.c
deleted file mode 100644
index a16d77ce0..000000000
--- a/src/png/libpng/pngwrite.c
+++ /dev/null
@@ -1,2396 +0,0 @@
-
-/* pngwrite.c - general routines to write a PNG file
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-#  include <errno.h>
-#endif /* SIMPLIFIED_WRITE_STDIO */
-
-#ifdef PNG_WRITE_SUPPORTED
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-/* Write out all the unknown chunks for the current given location */
-static void
-write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
-    unsigned int where)
-{
-   if (info_ptr->unknown_chunks_num != 0)
-   {
-      png_const_unknown_chunkp up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           ++up)
-         if ((up->location & where) != 0)
-      {
-         /* If per-chunk unknown chunk handling is enabled use it, otherwise
-          * just write the chunks the application has set.
-          */
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-
-         /* NOTE: this code is radically different from the read side in the
-          * matter of handling an ancillary unknown chunk.  In the read side
-          * the default behavior is to discard it, in the code below the default
-          * behavior is to write it.  Critical chunks are, however, only
-          * written if explicitly listed or if the default is set to write all
-          * unknown chunks.
-          *
-          * The default handling is also slightly weird - it is not possible to
-          * stop the writing of all unsafe-to-copy chunks!
-          *
-          * TODO: REVIEW: this would seem to be a bug.
-          */
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             ((up->name[3] & 0x20) /* safe-to-copy overrides everything */ ||
-              keep == PNG_HANDLE_CHUNK_ALWAYS ||
-              (keep == PNG_HANDLE_CHUNK_AS_DEFAULT &&
-               png_ptr->unknown_default == PNG_HANDLE_CHUNK_ALWAYS)))
-#endif
-         {
-            /* TODO: review, what is wrong with a zero length unknown chunk? */
-            if (up->size == 0)
-               png_warning(png_ptr, "Writing zero-length unknown chunk");
-
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
-}
-#endif /* WRITE_UNKNOWN_CHUNKS */
-
-/* Writes all the PNG information.  This is the suggested way to use the
- * library.  If you have a new chunk to add, make a function to write it,
- * and put it in the correct location here.  If you want the chunk written
- * after the image data, put it in png_write_end().  I strongly encourage
- * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
- * the chunk, as that will keep the code from breaking if you want to just
- * write a plain PNG file.  If you have long comments, I suggest writing
- * them in png_write_end(), and compressing them.
- */
-void PNGAPI
-png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
-{
-   png_debug(1, "in png_write_info_before_PLTE");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
-   {
-      /* Write PNG signature */
-      png_write_sig(png_ptr);
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-      if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 && \
-          png_ptr->mng_features_permitted != 0)
-      {
-         png_warning(png_ptr,
-             "MNG features are not allowed in a PNG datastream");
-         png_ptr->mng_features_permitted = 0;
-      }
-#endif
-
-      /* Write IHDR information. */
-      png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
-          info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
-          info_ptr->filter_type,
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-          info_ptr->interlace_type
-#else
-          0
-#endif
-         );
-
-      /* The rest of these check to see if the valid field has the appropriate
-       * flag set, and if it does, writes the chunk.
-       *
-       * 1.6.0: COLORSPACE support controls the writing of these chunks too, and
-       * the chunks will be written if the WRITE routine is there and
-       * information * is available in the COLORSPACE. (See
-       * png_colorspace_sync_info in png.c for where the valid flags get set.)
-       *
-       * Under certain circumstances the colorspace can be invalidated without
-       * syncing the info_struct 'valid' flags; this happens if libpng detects
-       * an error and calls png_error while the color space is being set, yet
-       * the application continues writing the PNG.  So check the 'invalid'
-       * flag here too.
-       */
-#ifdef PNG_GAMMA_SUPPORTED
-#  ifdef PNG_WRITE_gAMA_SUPPORTED
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-          (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&
-          (info_ptr->valid & PNG_INFO_gAMA) != 0)
-         png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);
-#  endif
-#endif
-
-#ifdef PNG_COLORSPACE_SUPPORTED
-      /* Write only one of sRGB or an ICC profile.  If a profile was supplied
-       * and it matches one of the known sRGB ones issue a warning.
-       */
-#  ifdef PNG_WRITE_iCCP_SUPPORTED
-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-             (info_ptr->valid & PNG_INFO_iCCP) != 0)
-         {
-#    ifdef PNG_WRITE_sRGB_SUPPORTED
-               if ((info_ptr->valid & PNG_INFO_sRGB) != 0)
-                  png_app_warning(png_ptr,
-                      "profile matches sRGB but writing iCCP instead");
-#     endif
-
-            png_write_iCCP(png_ptr, info_ptr->iccp_name,
-                info_ptr->iccp_profile);
-         }
-#     ifdef PNG_WRITE_sRGB_SUPPORTED
-         else
-#     endif
-#  endif
-
-#  ifdef PNG_WRITE_sRGB_SUPPORTED
-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-             (info_ptr->valid & PNG_INFO_sRGB) != 0)
-            png_write_sRGB(png_ptr, info_ptr->colorspace.rendering_intent);
-#  endif /* WRITE_sRGB */
-#endif /* COLORSPACE */
-
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-         if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
-            png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
-#endif
-
-#ifdef PNG_COLORSPACE_SUPPORTED
-#  ifdef PNG_WRITE_cHRM_SUPPORTED
-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-             (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 &&
-             (info_ptr->valid & PNG_INFO_cHRM) != 0)
-            png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy);
-#  endif
-#endif
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-         write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_IHDR);
-#endif
-
-      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
-   }
-}
-
-void PNGAPI
-png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
-{
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-   int i;
-#endif
-
-   png_debug(1, "in png_write_info");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_write_info_before_PLTE(png_ptr, info_ptr);
-
-   if ((info_ptr->valid & PNG_INFO_PLTE) != 0)
-      png_write_PLTE(png_ptr, info_ptr->palette,
-          (png_uint_32)info_ptr->num_palette);
-
-   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      png_error(png_ptr, "Valid palette required for paletted images");
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_tRNS) !=0)
-   {
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-      /* Invert the alpha channel (in tRNS) */
-      if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0 &&
-          info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         int j, jend;
-
-         jend = info_ptr->num_trans;
-         if (jend > PNG_MAX_PALETTE_LENGTH)
-            jend = PNG_MAX_PALETTE_LENGTH;
-
-         for (j = 0; j<jend; ++j)
-            info_ptr->trans_alpha[j] =
-               (png_byte)(255 - info_ptr->trans_alpha[j]);
-      }
-#endif
-      png_write_tRNS(png_ptr, info_ptr->trans_alpha, &(info_ptr->trans_color),
-          info_ptr->num_trans, info_ptr->color_type);
-   }
-#endif
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_bKGD) != 0)
-      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
-#endif
-
-#ifdef PNG_WRITE_eXIf_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_eXIf) != 0)
-      png_write_eXIf(png_ptr, info_ptr->exif, info_ptr->num_exif);
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_hIST) != 0)
-      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_oFFs) != 0)
-      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
-          info_ptr->offset_unit_type);
-#endif
-
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_pCAL) != 0)
-      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
-          info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
-          info_ptr->pcal_units, info_ptr->pcal_params);
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_sCAL) != 0)
-      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
-          info_ptr->scal_s_width, info_ptr->scal_s_height);
-#endif /* sCAL */
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_pHYs) != 0)
-      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
-          info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
-#endif /* pHYs */
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_tIME) != 0)
-   {
-      png_write_tIME(png_ptr, &(info_ptr->mod_time));
-      png_ptr->mode |= PNG_WROTE_tIME;
-   }
-#endif /* tIME */
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_sPLT) != 0)
-      for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
-         png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
-#endif /* sPLT */
-
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-   /* Check to see if we need to write text chunks */
-   for (i = 0; i < info_ptr->num_text; i++)
-   {
-      png_debug2(2, "Writing header text chunk %d, type %d", i,
-          info_ptr->text[i].compression);
-      /* An internationalized chunk? */
-      if (info_ptr->text[i].compression > 0)
-      {
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-         /* Write international chunk */
-         png_write_iTXt(png_ptr,
-             info_ptr->text[i].compression,
-             info_ptr->text[i].key,
-             info_ptr->text[i].lang,
-             info_ptr->text[i].lang_key,
-             info_ptr->text[i].text);
-         /* Mark this chunk as written */
-         if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-         else
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-#else
-         png_warning(png_ptr, "Unable to write international text");
-#endif
-      }
-
-      /* If we want a compressed text chunk */
-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)
-      {
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-         /* Write compressed chunk */
-         png_write_zTXt(png_ptr, info_ptr->text[i].key,
-             info_ptr->text[i].text, info_ptr->text[i].compression);
-         /* Mark this chunk as written */
-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-#else
-         png_warning(png_ptr, "Unable to write compressed text");
-#endif
-      }
-
-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-      {
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-         /* Write uncompressed chunk */
-         png_write_tEXt(png_ptr, info_ptr->text[i].key,
-             info_ptr->text[i].text,
-             0);
-         /* Mark this chunk as written */
-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-#else
-         /* Can't get here */
-         png_warning(png_ptr, "Unable to write uncompressed text");
-#endif
-      }
-   }
-#endif /* tEXt */
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_PLTE);
-#endif
-}
-
-/* Writes the end of the PNG file.  If you don't want to write comments or
- * time information, you can pass NULL for info.  If you already wrote these
- * in png_write_info(), do not write them again here.  If you have long
- * comments, I suggest writing them here, and compressing them.
- */
-void PNGAPI
-png_write_end(png_structrp png_ptr, png_inforp info_ptr)
-{
-   png_debug(1, "in png_write_end");
-
-   if (png_ptr == NULL)
-      return;
-
-   if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
-      png_error(png_ptr, "No IDATs written into file");
-
-#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   if (png_ptr->num_palette_max > png_ptr->num_palette)
-      png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
-#endif
-
-   /* See if user wants us to write information chunks */
-   if (info_ptr != NULL)
-   {
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-      int i; /* local index variable */
-#endif
-#ifdef PNG_WRITE_tIME_SUPPORTED
-      /* Check to see if user has supplied a time chunk */
-      if ((info_ptr->valid & PNG_INFO_tIME) != 0 &&
-          (png_ptr->mode & PNG_WROTE_tIME) == 0)
-         png_write_tIME(png_ptr, &(info_ptr->mod_time));
-
-#endif
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-      /* Loop through comment chunks */
-      for (i = 0; i < info_ptr->num_text; i++)
-      {
-         png_debug2(2, "Writing trailer text chunk %d, type %d", i,
-             info_ptr->text[i].compression);
-         /* An internationalized chunk? */
-         if (info_ptr->text[i].compression > 0)
-         {
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-            /* Write international chunk */
-            png_write_iTXt(png_ptr,
-                info_ptr->text[i].compression,
-                info_ptr->text[i].key,
-                info_ptr->text[i].lang,
-                info_ptr->text[i].lang_key,
-                info_ptr->text[i].text);
-            /* Mark this chunk as written */
-            if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-               info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-            else
-               info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-#else
-            png_warning(png_ptr, "Unable to write international text");
-#endif
-         }
-
-         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
-         {
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-            /* Write compressed chunk */
-            png_write_zTXt(png_ptr, info_ptr->text[i].key,
-                info_ptr->text[i].text, info_ptr->text[i].compression);
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-#else
-            png_warning(png_ptr, "Unable to write compressed text");
-#endif
-         }
-
-         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-         {
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-            /* Write uncompressed chunk */
-            png_write_tEXt(png_ptr, info_ptr->text[i].key,
-                info_ptr->text[i].text, 0);
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-#else
-            png_warning(png_ptr, "Unable to write uncompressed text");
-#endif
-         }
-      }
-#endif
-
-#ifdef PNG_WRITE_eXIf_SUPPORTED
-   if ((info_ptr->valid & PNG_INFO_eXIf) != 0)
-      png_write_eXIf(png_ptr, info_ptr->exif, info_ptr->num_exif);
-#endif
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-      write_unknown_chunks(png_ptr, info_ptr, PNG_AFTER_IDAT);
-#endif
-   }
-
-   png_ptr->mode |= PNG_AFTER_IDAT;
-
-   /* Write end of PNG file */
-   png_write_IEND(png_ptr);
-
-   /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
-    * and restored again in libpng-1.2.30, may cause some applications that
-    * do not set png_ptr->output_flush_fn to crash.  If your application
-    * experiences a problem, please try building libpng with
-    * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to
-    * png-mng-implement at lists.sf.net .
-    */
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED
-   png_flush(png_ptr);
-#  endif
-#endif
-}
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-void PNGAPI
-png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm * ttime)
-{
-   png_debug(1, "in png_convert_from_struct_tm");
-
-   ptime->year = (png_uint_16)(1900 + ttime->tm_year);
-   ptime->month = (png_byte)(ttime->tm_mon + 1);
-   ptime->day = (png_byte)ttime->tm_mday;
-   ptime->hour = (png_byte)ttime->tm_hour;
-   ptime->minute = (png_byte)ttime->tm_min;
-   ptime->second = (png_byte)ttime->tm_sec;
-}
-
-void PNGAPI
-png_convert_from_time_t(png_timep ptime, time_t ttime)
-{
-   struct tm *tbuf;
-
-   png_debug(1, "in png_convert_from_time_t");
-
-   tbuf = gmtime(&ttime);
-   png_convert_from_struct_tm(ptime, tbuf);
-}
-#endif
-
-/* Initialize png_ptr structure, and allocate any memory needed */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
-{
-#ifndef PNG_USER_MEM_SUPPORTED
-   png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-       error_fn, warn_fn, NULL, NULL, NULL);
-#else
-   return png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
-       warn_fn, NULL, NULL, NULL);
-}
-
-/* Alternate initialize png_ptr structure, and allocate any memory needed */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-{
-   png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
-       error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
-#endif /* USER_MEM */
-   if (png_ptr != NULL)
-   {
-      /* Set the zlib control values to defaults; they can be overridden by the
-       * application after the struct has been created.
-       */
-      png_ptr->zbuffer_size = PNG_ZBUF_SIZE;
-
-      /* The 'zlib_strategy' setting is irrelevant because png_default_claim in
-       * pngwutil.c defaults it according to whether or not filters will be
-       * used, and ignores this setting.
-       */
-      png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
-      png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION;
-      png_ptr->zlib_mem_level = 8;
-      png_ptr->zlib_window_bits = 15;
-      png_ptr->zlib_method = 8;
-
-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-      png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
-      png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
-      png_ptr->zlib_text_mem_level = 8;
-      png_ptr->zlib_text_window_bits = 15;
-      png_ptr->zlib_text_method = 8;
-#endif /* WRITE_COMPRESSED_TEXT */
-
-      /* This is a highly dubious configuration option; by default it is off,
-       * but it may be appropriate for private builds that are testing
-       * extensions not conformant to the current specification, or of
-       * applications that must not fail to write at all costs!
-       */
-#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
-      /* In stable builds only warn if an application error can be completely
-       * handled.
-       */
-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
-#endif
-
-      /* App warnings are warnings in release (or release candidate) builds but
-       * are errors during development.
-       */
-#if PNG_RELEASE_BUILD
-      png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;
-#endif
-
-      /* TODO: delay this, it can be done in png_init_io() (if the app doesn't
-       * do it itself) avoiding setting the default function if it is not
-       * required.
-       */
-      png_set_write_fn(png_ptr, NULL, NULL, NULL);
-   }
-
-   return png_ptr;
-}
-
-
-/* Write a few rows of image data.  If the image is interlaced,
- * either you will have to write the 7 sub images, or, if you
- * have called png_set_interlace_handling(), you will have to
- * "write" the image seven times.
- */
-void PNGAPI
-png_write_rows(png_structrp png_ptr, png_bytepp row,
-    png_uint_32 num_rows)
-{
-   png_uint_32 i; /* row counter */
-   png_bytepp rp; /* row pointer */
-
-   png_debug(1, "in png_write_rows");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Loop through the rows */
-   for (i = 0, rp = row; i < num_rows; i++, rp++)
-   {
-      png_write_row(png_ptr, *rp);
-   }
-}
-
-/* Write the image.  You only need to call this function once, even
- * if you are writing an interlaced image.
- */
-void PNGAPI
-png_write_image(png_structrp png_ptr, png_bytepp image)
-{
-   png_uint_32 i; /* row index */
-   int pass, num_pass; /* pass variables */
-   png_bytepp rp; /* points to current row */
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug(1, "in png_write_image");
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Initialize interlace handling.  If image is not interlaced,
-    * this will set pass to 1
-    */
-   num_pass = png_set_interlace_handling(png_ptr);
-#else
-   num_pass = 1;
-#endif
-   /* Loop through passes */
-   for (pass = 0; pass < num_pass; pass++)
-   {
-      /* Loop through image */
-      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
-      {
-         png_write_row(png_ptr, *rp);
-      }
-   }
-}
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Performs intrapixel differencing  */
-static void
-png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_intrapixel");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
-   {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp)     = (png_byte)(*rp       - *(rp + 1));
-            *(rp + 2) = (png_byte)(*(rp + 2) - *(rp + 1));
-         }
-      }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (png_uint_32)(*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (png_uint_32)(*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (png_uint_32)(*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);
-            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
-            *(rp    ) = (png_byte)(red >> 8);
-            *(rp + 1) = (png_byte)red;
-            *(rp + 4) = (png_byte)(blue >> 8);
-            *(rp + 5) = (png_byte)blue;
-         }
-      }
-#endif /* WRITE_16BIT */
-   }
-}
-#endif /* MNG_FEATURES */
-
-/* Called by user to write a row of image data */
-void PNGAPI
-png_write_row(png_structrp png_ptr, png_const_bytep row)
-{
-   /* 1.5.6: moved from png_struct to be a local structure: */
-   png_row_info row_info;
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug2(1, "in png_write_row (row %u, pass %d)",
-       png_ptr->row_number, png_ptr->pass);
-
-   /* Initialize transformations and other stuff if first time */
-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
-   {
-      /* Make sure we wrote the header info */
-      if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
-         png_error(png_ptr,
-             "png_write_info was never called before png_write_row");
-
-      /* Check for transforms that have been set but were defined out */
-#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
-      if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
-         png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
-      if ((png_ptr->transformations & PNG_FILLER) != 0)
-         png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");
-#endif
-#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
-    defined(PNG_READ_PACKSWAP_SUPPORTED)
-      if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-         png_warning(png_ptr,
-             "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
-      if ((png_ptr->transformations & PNG_PACK) != 0)
-         png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
-      if ((png_ptr->transformations & PNG_SHIFT) != 0)
-         png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
-      if ((png_ptr->transformations & PNG_BGR) != 0)
-         png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
-      if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
-         png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");
-#endif
-
-      png_write_start_row(png_ptr);
-   }
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced and not interested in row, return */
-   if (png_ptr->interlaced != 0 &&
-       (png_ptr->transformations & PNG_INTERLACE) != 0)
-   {
-      switch (png_ptr->pass)
-      {
-         case 0:
-            if ((png_ptr->row_number & 0x07) != 0)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 1:
-            if ((png_ptr->row_number & 0x07) != 0 || png_ptr->width < 5)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 2:
-            if ((png_ptr->row_number & 0x07) != 4)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 3:
-            if ((png_ptr->row_number & 0x03) != 0 || png_ptr->width < 3)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 4:
-            if ((png_ptr->row_number & 0x03) != 2)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 5:
-            if ((png_ptr->row_number & 0x01) != 0 || png_ptr->width < 2)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 6:
-            if ((png_ptr->row_number & 0x01) == 0)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         default: /* error: ignore it */
-            break;
-      }
-   }
-#endif
-
-   /* Set up row info for transformations */
-   row_info.color_type = png_ptr->color_type;
-   row_info.width = png_ptr->usr_width;
-   row_info.channels = png_ptr->usr_channels;
-   row_info.bit_depth = png_ptr->usr_bit_depth;
-   row_info.pixel_depth = (png_byte)(row_info.bit_depth * row_info.channels);
-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-   png_debug1(3, "row_info->color_type = %d", row_info.color_type);
-   png_debug1(3, "row_info->width = %u", row_info.width);
-   png_debug1(3, "row_info->channels = %d", row_info.channels);
-   png_debug1(3, "row_info->bit_depth = %d", row_info.bit_depth);
-   png_debug1(3, "row_info->pixel_depth = %d", row_info.pixel_depth);
-   png_debug1(3, "row_info->rowbytes = %lu", (unsigned long)row_info.rowbytes);
-
-   /* Copy user's row into buffer, leaving room for filter byte. */
-   memcpy(png_ptr->row_buf + 1, row, row_info.rowbytes);
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Handle interlacing */
-   if (png_ptr->interlaced && png_ptr->pass < 6 &&
-       (png_ptr->transformations & PNG_INTERLACE) != 0)
-   {
-      png_do_write_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass);
-      /* This should always get caught above, but still ... */
-      if (row_info.width == 0)
-      {
-         png_write_finish_row(png_ptr);
-         return;
-      }
-   }
-#endif
-
-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-   /* Handle other transformations */
-   if (png_ptr->transformations != 0)
-      png_do_write_transformations(png_ptr, &row_info);
-#endif
-
-   /* At this point the row_info pixel depth must match the 'transformed' depth,
-    * which is also the output depth.
-    */
-   if (row_info.pixel_depth != png_ptr->pixel_depth ||
-       row_info.pixel_depth != png_ptr->transformed_pixel_depth)
-      png_error(png_ptr, "internal write transform logic error");
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   /* Write filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not write a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
-   {
-      /* Intrapixel differencing */
-      png_do_write_intrapixel(&row_info, png_ptr->row_buf + 1);
-   }
-#endif
-
-/* Added at libpng-1.5.10 */
-#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   /* Check for out-of-range palette index */
-   if (row_info.color_type == PNG_COLOR_TYPE_PALETTE &&
-       png_ptr->num_palette_max >= 0)
-      png_do_check_palette_indexes(png_ptr, &row_info);
-#endif
-
-   /* Find a filter if necessary, filter the row and write it out. */
-   png_write_find_filter(png_ptr, &row_info);
-
-   if (png_ptr->write_row_fn != NULL)
-      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-}
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set the automatic flush interval or 0 to turn flushing off */
-void PNGAPI
-png_set_flush(png_structrp png_ptr, int nrows)
-{
-   png_debug(1, "in png_set_flush");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flush_dist = (nrows < 0 ? 0 : (png_uint_32)nrows);
-}
-
-/* Flush the current output buffers now */
-void PNGAPI
-png_write_flush(png_structrp png_ptr)
-{
-   png_debug(1, "in png_write_flush");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* We have already written out all of the data */
-   if (png_ptr->row_number >= png_ptr->num_rows)
-      return;
-
-   png_compress_IDAT(png_ptr, NULL, 0, Z_SYNC_FLUSH);
-   png_ptr->flush_rows = 0;
-   png_flush(png_ptr);
-}
-#endif /* WRITE_FLUSH */
-
-/* Free any memory used in png_ptr struct without freeing the struct itself. */
-static void
-png_write_destroy(png_structrp png_ptr)
-{
-   png_debug(1, "in png_write_destroy");
-
-   /* Free any memory zlib uses */
-   if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
-      deflateEnd(&png_ptr->zstream);
-
-   /* Free our memory.  png_free checks NULL for us. */
-   png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
-   png_free(png_ptr, png_ptr->row_buf);
-   png_ptr->row_buf = NULL;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_free(png_ptr, png_ptr->prev_row);
-   png_free(png_ptr, png_ptr->try_row);
-   png_free(png_ptr, png_ptr->tst_row);
-   png_ptr->prev_row = NULL;
-   png_ptr->try_row = NULL;
-   png_ptr->tst_row = NULL;
-#endif
-
-#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-   png_free(png_ptr, png_ptr->chunk_list);
-   png_ptr->chunk_list = NULL;
-#endif
-
-   /* The error handling and memory handling information is left intact at this
-    * point: the jmp_buf may still have to be freed.  See png_destroy_png_struct
-    * for how this happens.
-    */
-}
-
-/* Free all memory used by the write.
- * In libpng 1.6.0 this API changed quietly to no longer accept a NULL value for
- * *png_ptr_ptr.  Prior to 1.6.0 it would accept such a value and it would free
- * the passed in info_structs but it would quietly fail to free any of the data
- * inside them.  In 1.6.0 it quietly does nothing (it has to be quiet because it
- * has no png_ptr.)
- */
-void PNGAPI
-png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
-{
-   png_debug(1, "in png_destroy_write_struct");
-
-   if (png_ptr_ptr != NULL)
-   {
-      png_structrp png_ptr = *png_ptr_ptr;
-
-      if (png_ptr != NULL) /* added in libpng 1.6.0 */
-      {
-         png_destroy_info_struct(png_ptr, info_ptr_ptr);
-
-         *png_ptr_ptr = NULL;
-         png_write_destroy(png_ptr);
-         png_destroy_png_struct(png_ptr);
-      }
-   }
-}
-
-/* Allow the application to select one or more row filters to use. */
-void PNGAPI
-png_set_filter(png_structrp png_ptr, int method, int filters)
-{
-   png_debug(1, "in png_set_filter");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
-       (method == PNG_INTRAPIXEL_DIFFERENCING))
-      method = PNG_FILTER_TYPE_BASE;
-
-#endif
-   if (method == PNG_FILTER_TYPE_BASE)
-   {
-      switch (filters & (PNG_ALL_FILTERS | 0x07))
-      {
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         case 5:
-         case 6:
-         case 7: png_app_error(png_ptr, "Unknown row filter for method 0");
-#endif /* WRITE_FILTER */
-            /* FALLTHROUGH */
-         case PNG_FILTER_VALUE_NONE:
-            png_ptr->do_filter = PNG_FILTER_NONE; break;
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         case PNG_FILTER_VALUE_SUB:
-            png_ptr->do_filter = PNG_FILTER_SUB; break;
-
-         case PNG_FILTER_VALUE_UP:
-            png_ptr->do_filter = PNG_FILTER_UP; break;
-
-         case PNG_FILTER_VALUE_AVG:
-            png_ptr->do_filter = PNG_FILTER_AVG; break;
-
-         case PNG_FILTER_VALUE_PAETH:
-            png_ptr->do_filter = PNG_FILTER_PAETH; break;
-
-         default:
-            png_ptr->do_filter = (png_byte)filters; break;
-#else
-         default:
-            png_app_error(png_ptr, "Unknown row filter for method 0");
-#endif /* WRITE_FILTER */
-      }
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-      /* If we have allocated the row_buf, this means we have already started
-       * with the image and we should have allocated all of the filter buffers
-       * that have been selected.  If prev_row isn't already allocated, then
-       * it is too late to start using the filters that need it, since we
-       * will be missing the data in the previous row.  If an application
-       * wants to start and stop using particular filters during compression,
-       * it should start out with all of the filters, and then remove them
-       * or add them back after the start of compression.
-       *
-       * NOTE: this is a nasty constraint on the code, because it means that the
-       * prev_row buffer must be maintained even if there are currently no
-       * 'prev_row' requiring filters active.
-       */
-      if (png_ptr->row_buf != NULL)
-      {
-         int num_filters;
-         png_alloc_size_t buf_size;
-
-         /* Repeat the checks in png_write_start_row; 1 pixel high or wide
-          * images cannot benefit from certain filters.  If this isn't done here
-          * the check below will fire on 1 pixel high images.
-          */
-         if (png_ptr->height == 1)
-            filters &= ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);
-
-         if (png_ptr->width == 1)
-            filters &= ~(PNG_FILTER_SUB|PNG_FILTER_AVG|PNG_FILTER_PAETH);
-
-         if ((filters & (PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH)) != 0
-            && png_ptr->prev_row == NULL)
-         {
-            /* This is the error case, however it is benign - the previous row
-             * is not available so the filter can't be used.  Just warn here.
-             */
-            png_app_warning(png_ptr,
-                "png_set_filter: UP/AVG/PAETH cannot be added after start");
-            filters &= ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);
-         }
-
-         num_filters = 0;
-
-         if (filters & PNG_FILTER_SUB)
-            num_filters++;
-
-         if (filters & PNG_FILTER_UP)
-            num_filters++;
-
-         if (filters & PNG_FILTER_AVG)
-            num_filters++;
-
-         if (filters & PNG_FILTER_PAETH)
-            num_filters++;
-
-         /* Allocate needed row buffers if they have not already been
-          * allocated.
-          */
-         buf_size = PNG_ROWBYTES(png_ptr->usr_channels * png_ptr->usr_bit_depth,
-             png_ptr->width) + 1;
-
-         if (png_ptr->try_row == NULL)
-            png_ptr->try_row = png_voidcast(png_bytep,
-                png_malloc(png_ptr, buf_size));
-
-         if (num_filters > 1)
-         {
-            if (png_ptr->tst_row == NULL)
-               png_ptr->tst_row = png_voidcast(png_bytep,
-                   png_malloc(png_ptr, buf_size));
-         }
-      }
-      png_ptr->do_filter = (png_byte)filters;
-#endif
-   }
-   else
-      png_error(png_ptr, "Unknown custom filter method");
-}
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */
-/* Provide floating and fixed point APIs */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_filter_heuristics(png_structrp png_ptr, int heuristic_method,
-    int num_weights, png_const_doublep filter_weights,
-    png_const_doublep filter_costs)
-{
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(heuristic_method)
-   PNG_UNUSED(num_weights)
-   PNG_UNUSED(filter_weights)
-   PNG_UNUSED(filter_costs)
-}
-#endif /* FLOATING_POINT */
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-void PNGAPI
-png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method,
-    int num_weights, png_const_fixed_point_p filter_weights,
-    png_const_fixed_point_p filter_costs)
-{
-   PNG_UNUSED(png_ptr)
-   PNG_UNUSED(heuristic_method)
-   PNG_UNUSED(num_weights)
-   PNG_UNUSED(filter_weights)
-   PNG_UNUSED(filter_costs)
-}
-#endif /* FIXED_POINT */
-#endif /* WRITE_WEIGHTED_FILTER */
-
-#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-void PNGAPI
-png_set_compression_level(png_structrp png_ptr, int level)
-{
-   png_debug(1, "in png_set_compression_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->zlib_level = level;
-}
-
-void PNGAPI
-png_set_compression_mem_level(png_structrp png_ptr, int mem_level)
-{
-   png_debug(1, "in png_set_compression_mem_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->zlib_mem_level = mem_level;
-}
-
-void PNGAPI
-png_set_compression_strategy(png_structrp png_ptr, int strategy)
-{
-   png_debug(1, "in png_set_compression_strategy");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* The flag setting here prevents the libpng dynamic selection of strategy.
-    */
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
-   png_ptr->zlib_strategy = strategy;
-}
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-void PNGAPI
-png_set_compression_window_bits(png_structrp png_ptr, int window_bits)
-{
-   if (png_ptr == NULL)
-      return;
-
-   /* Prior to 1.6.0 this would warn but then set the window_bits value. This
-    * meant that negative window bits values could be selected that would cause
-    * libpng to write a non-standard PNG file with raw deflate or gzip
-    * compressed IDAT or ancillary chunks.  Such files can be read and there is
-    * no warning on read, so this seems like a very bad idea.
-    */
-   if (window_bits > 15)
-   {
-      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
-      window_bits = 15;
-   }
-
-   else if (window_bits < 8)
-   {
-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-      window_bits = 8;
-   }
-
-   png_ptr->zlib_window_bits = window_bits;
-}
-
-void PNGAPI
-png_set_compression_method(png_structrp png_ptr, int method)
-{
-   png_debug(1, "in png_set_compression_method");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* This would produce an invalid PNG file if it worked, but it doesn't and
-    * deflate will fault it, so it is harmless to just warn here.
-    */
-   if (method != 8)
-      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
-
-   png_ptr->zlib_method = method;
-}
-#endif /* WRITE_CUSTOMIZE_COMPRESSION */
-
-/* The following were added to libpng-1.5.4 */
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-void PNGAPI
-png_set_text_compression_level(png_structrp png_ptr, int level)
-{
-   png_debug(1, "in png_set_text_compression_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->zlib_text_level = level;
-}
-
-void PNGAPI
-png_set_text_compression_mem_level(png_structrp png_ptr, int mem_level)
-{
-   png_debug(1, "in png_set_text_compression_mem_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->zlib_text_mem_level = mem_level;
-}
-
-void PNGAPI
-png_set_text_compression_strategy(png_structrp png_ptr, int strategy)
-{
-   png_debug(1, "in png_set_text_compression_strategy");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->zlib_text_strategy = strategy;
-}
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-void PNGAPI
-png_set_text_compression_window_bits(png_structrp png_ptr, int window_bits)
-{
-   if (png_ptr == NULL)
-      return;
-
-   if (window_bits > 15)
-   {
-      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
-      window_bits = 15;
-   }
-
-   else if (window_bits < 8)
-   {
-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-      window_bits = 8;
-   }
-
-   png_ptr->zlib_text_window_bits = window_bits;
-}
-
-void PNGAPI
-png_set_text_compression_method(png_structrp png_ptr, int method)
-{
-   png_debug(1, "in png_set_text_compression_method");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (method != 8)
-      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
-
-   png_ptr->zlib_text_method = method;
-}
-#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
-/* end of API added to libpng-1.5.4 */
-
-void PNGAPI
-png_set_write_status_fn(png_structrp png_ptr, png_write_status_ptr write_row_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->write_row_fn = write_row_fn;
-}
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-void PNGAPI
-png_set_write_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
-    write_user_transform_fn)
-{
-   png_debug(1, "in png_set_write_user_transform_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_USER_TRANSFORM;
-   png_ptr->write_user_transform_fn = write_user_transform_fn;
-}
-#endif
-
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_write_png(png_structrp png_ptr, png_inforp info_ptr,
-    int transforms, voidp params)
-{
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if ((info_ptr->valid & PNG_INFO_IDAT) == 0)
-   {
-      png_app_error(png_ptr, "no rows for png_write_image to write");
-      return;
-   }
-
-   /* Write the file header information. */
-   png_write_info(png_ptr, info_ptr);
-
-   /* ------ these transformations don't touch the info structure ------- */
-
-   /* Invert monochrome pixels */
-   if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
-#ifdef PNG_WRITE_INVERT_SUPPORTED
-      png_set_invert_mono(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");
-#endif
-
-   /* Shift the pixels up to a legal bit depth and fill in
-    * as appropriate to correctly scale the image.
-    */
-   if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-      if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
-         png_set_shift(png_ptr, &info_ptr->sig_bit);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
-#endif
-
-   /* Pack pixels into bytes */
-   if ((transforms & PNG_TRANSFORM_PACKING) != 0)
-#ifdef PNG_WRITE_PACK_SUPPORTED
-      png_set_packing(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");
-#endif
-
-   /* Swap location of alpha bytes from ARGB to RGBA */
-   if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-      png_set_swap_alpha(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");
-#endif
-
-   /* Remove a filler (X) from XRGB/RGBX/AG/GA into to convert it into
-    * RGB, note that the code expects the input color type to be G or RGB; no
-    * alpha channel.
-    */
-   if ((transforms & (PNG_TRANSFORM_STRIP_FILLER_AFTER|
-       PNG_TRANSFORM_STRIP_FILLER_BEFORE)) != 0)
-   {
-#ifdef PNG_WRITE_FILLER_SUPPORTED
-      if ((transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER) != 0)
-      {
-         if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
-            png_app_error(png_ptr,
-                "PNG_TRANSFORM_STRIP_FILLER: BEFORE+AFTER not supported");
-
-         /* Continue if ignored - this is the pre-1.6.10 behavior */
-         png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
-      }
-
-      else if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
-         png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_FILLER not supported");
-#endif
-   }
-
-   /* Flip BGR pixels to RGB */
-   if ((transforms & PNG_TRANSFORM_BGR) != 0)
-#ifdef PNG_WRITE_BGR_SUPPORTED
-      png_set_bgr(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");
-#endif
-
-   /* Swap bytes of 16-bit files to most significant byte first */
-   if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
-#ifdef PNG_WRITE_SWAP_SUPPORTED
-      png_set_swap(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");
-#endif
-
-   /* Swap bits of 1-bit, 2-bit, 4-bit packed pixel formats */
-   if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-      png_set_packswap(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");
-#endif
-
-   /* Invert the alpha channel from opacity to transparency */
-   if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-      png_set_invert_alpha(png_ptr);
-#else
-      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");
-#endif
-
-   /* ----------------------- end of transformations ------------------- */
-
-   /* Write the bits */
-   png_write_image(png_ptr, info_ptr->row_pointers);
-
-   /* It is REQUIRED to call this to finish writing the rest of the file */
-   png_write_end(png_ptr, info_ptr);
-
-   PNG_UNUSED(params)
-}
-#endif
-
-
-#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
-/* Initialize the write structure - general purpose utility. */
-static int
-png_image_write_init(png_imagep image)
-{
-   png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, image,
-       png_safe_error, png_safe_warning);
-
-   if (png_ptr != NULL)
-   {
-      png_infop info_ptr = png_create_info_struct(png_ptr);
-
-      if (info_ptr != NULL)
-      {
-         png_controlp control = png_voidcast(png_controlp,
-             png_malloc_warn(png_ptr, (sizeof *control)));
-
-         if (control != NULL)
-         {
-            memset(control, 0, (sizeof *control));
-
-            control->png_ptr = png_ptr;
-            control->info_ptr = info_ptr;
-            control->for_write = 1;
-
-            image->opaque = control;
-            return 1;
-         }
-
-         /* Error clean up */
-         png_destroy_info_struct(png_ptr, &info_ptr);
-      }
-
-      png_destroy_write_struct(&png_ptr, NULL);
-   }
-
-   return png_image_error(image, "png_image_write_: out of memory");
-}
-
-/* Arguments to png_image_write_main: */
-typedef struct
-{
-   /* Arguments: */
-   png_imagep      image;
-   png_const_voidp buffer;
-   png_int_32      row_stride;
-   png_const_voidp colormap;
-   int             convert_to_8bit;
-   /* Local variables: */
-   png_const_voidp first_row;
-   ptrdiff_t       row_bytes;
-   png_voidp       local_row;
-   /* Byte count for memory writing */
-   png_bytep        memory;
-   png_alloc_size_t memory_bytes; /* not used for STDIO */
-   png_alloc_size_t output_bytes; /* running total */
-} png_image_write_control;
-
-/* Write png_uint_16 input to a 16-bit PNG; the png_ptr has already been set to
- * do any necessary byte swapping.  The component order is defined by the
- * png_image format value.
- */
-static int
-png_write_image_16bit(png_voidp argument)
-{
-   png_image_write_control *display = png_voidcast(png_image_write_control*,
-       argument);
-   png_imagep image = display->image;
-   png_structrp png_ptr = image->opaque->png_ptr;
-
-   png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,
-       display->first_row);
-   png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row);
-   png_uint_16p row_end;
-   const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ?
-       3 : 1;
-   int aindex = 0;
-   png_uint_32 y = image->height;
-
-   if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
-   {
-#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-      if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
-      {
-         aindex = -1;
-         ++input_row; /* To point to the first component */
-         ++output_row;
-      }
-         else
-            aindex = (int)channels;
-#     else
-         aindex = (int)channels;
-#     endif
-   }
-
-   else
-      png_error(png_ptr, "png_write_image: internal call error");
-
-   /* Work out the output row end and count over this, note that the increment
-    * above to 'row' means that row_end can actually be beyond the end of the
-    * row; this is correct.
-    */
-   row_end = output_row + image->width * (channels+1);
-
-   for (; y > 0; --y)
-   {
-      png_const_uint_16p in_ptr = input_row;
-      png_uint_16p out_ptr = output_row;
-
-      while (out_ptr < row_end)
-      {
-         const png_uint_16 alpha = in_ptr[aindex];
-         png_uint_32 reciprocal = 0;
-         int c;
-
-         out_ptr[aindex] = alpha;
-
-         /* Calculate a reciprocal.  The correct calculation is simply
-          * component/alpha*65535 << 15. (I.e. 15 bits of precision); this
-          * allows correct rounding by adding .5 before the shift.  'reciprocal'
-          * is only initialized when required.
-          */
-         if (alpha > 0 && alpha < 65535)
-            reciprocal = ((0xffff<<15)+(alpha>>1))/alpha;
-
-         c = (int)channels;
-         do /* always at least one channel */
-         {
-            png_uint_16 component = *in_ptr++;
-
-            /* The following gives 65535 for an alpha of 0, which is fine,
-             * otherwise if 0/0 is represented as some other value there is more
-             * likely to be a discontinuity which will probably damage
-             * compression when moving from a fully transparent area to a
-             * nearly transparent one.  (The assumption here is that opaque
-             * areas tend not to be 0 intensity.)
-             */
-            if (component >= alpha)
-               component = 65535;
-
-            /* component<alpha, so component/alpha is less than one and
-             * component*reciprocal is less than 2^31.
-             */
-            else if (component > 0 && alpha < 65535)
-            {
-               png_uint_32 calc = component * reciprocal;
-               calc += 16384; /* round to nearest */
-               component = (png_uint_16)(calc >> 15);
-            }
-
-            *out_ptr++ = component;
-         }
-         while (--c > 0);
-
-         /* Skip to next component (skip the intervening alpha channel) */
-         ++in_ptr;
-         ++out_ptr;
-      }
-
-      png_write_row(png_ptr, png_voidcast(png_const_bytep, display->local_row));
-      input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));
-   }
-
-   return 1;
-}
-
-/* Given 16-bit input (1 to 4 channels) write 8-bit output.  If an alpha channel
- * is present it must be removed from the components, the components are then
- * written in sRGB encoding.  No components are added or removed.
- *
- * Calculate an alpha reciprocal to reverse pre-multiplication.  As above the
- * calculation can be done to 15 bits of accuracy; however, the output needs to
- * be scaled in the range 0..255*65535, so include that scaling here.
- */
-#   define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+(alpha>>1))/alpha)
-
-static png_byte
-png_unpremultiply(png_uint_32 component, png_uint_32 alpha,
-    png_uint_32 reciprocal/*from the above macro*/)
-{
-   /* The following gives 1.0 for an alpha of 0, which is fine, otherwise if 0/0
-    * is represented as some other value there is more likely to be a
-    * discontinuity which will probably damage compression when moving from a
-    * fully transparent area to a nearly transparent one.  (The assumption here
-    * is that opaque areas tend not to be 0 intensity.)
-    *
-    * There is a rounding problem here; if alpha is less than 128 it will end up
-    * as 0 when scaled to 8 bits.  To avoid introducing spurious colors into the
-    * output change for this too.
-    */
-   if (component >= alpha || alpha < 128)
-      return 255;
-
-   /* component<alpha, so component/alpha is less than one and
-    * component*reciprocal is less than 2^31.
-    */
-   else if (component > 0)
-   {
-      /* The test is that alpha/257 (rounded) is less than 255, the first value
-       * that becomes 255 is 65407.
-       * NOTE: this must agree with the PNG_DIV257 macro (which must, therefore,
-       * be exact!)  [Could also test reciprocal != 0]
-       */
-      if (alpha < 65407)
-      {
-         component *= reciprocal;
-         component += 64; /* round to nearest */
-         component >>= 7;
-      }
-
-      else
-         component *= 255;
-
-      /* Convert the component to sRGB. */
-      return (png_byte)PNG_sRGB_FROM_LINEAR(component);
-   }
-
-   else
-      return 0;
-}
-
-static int
-png_write_image_8bit(png_voidp argument)
-{
-   png_image_write_control *display = png_voidcast(png_image_write_control*,
-       argument);
-   png_imagep image = display->image;
-   png_structrp png_ptr = image->opaque->png_ptr;
-
-   png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,
-       display->first_row);
-   png_bytep output_row = png_voidcast(png_bytep, display->local_row);
-   png_uint_32 y = image->height;
-   const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ?
-       3 : 1;
-
-   if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
-   {
-      png_bytep row_end;
-      int aindex;
-
-#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-      if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
-      {
-         aindex = -1;
-         ++input_row; /* To point to the first component */
-         ++output_row;
-      }
-
-      else
-#   endif
-      aindex = (int)channels;
-
-      /* Use row_end in place of a loop counter: */
-      row_end = output_row + image->width * (channels+1);
-
-      for (; y > 0; --y)
-      {
-         png_const_uint_16p in_ptr = input_row;
-         png_bytep out_ptr = output_row;
-
-         while (out_ptr < row_end)
-         {
-            png_uint_16 alpha = in_ptr[aindex];
-            png_byte alphabyte = (png_byte)PNG_DIV257(alpha);
-            png_uint_32 reciprocal = 0;
-            int c;
-
-            /* Scale and write the alpha channel. */
-            out_ptr[aindex] = alphabyte;
-
-            if (alphabyte > 0 && alphabyte < 255)
-               reciprocal = UNP_RECIPROCAL(alpha);
-
-            c = (int)channels;
-            do /* always at least one channel */
-               *out_ptr++ = png_unpremultiply(*in_ptr++, alpha, reciprocal);
-            while (--c > 0);
-
-            /* Skip to next component (skip the intervening alpha channel) */
-            ++in_ptr;
-            ++out_ptr;
-         } /* while out_ptr < row_end */
-
-         png_write_row(png_ptr, png_voidcast(png_const_bytep,
-             display->local_row));
-         input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));
-      } /* while y */
-   }
-
-   else
-   {
-      /* No alpha channel, so the row_end really is the end of the row and it
-       * is sufficient to loop over the components one by one.
-       */
-      png_bytep row_end = output_row + image->width * channels;
-
-      for (; y > 0; --y)
-      {
-         png_const_uint_16p in_ptr = input_row;
-         png_bytep out_ptr = output_row;
-
-         while (out_ptr < row_end)
-         {
-            png_uint_32 component = *in_ptr++;
-
-            component *= 255;
-            *out_ptr++ = (png_byte)PNG_sRGB_FROM_LINEAR(component);
-         }
-
-         png_write_row(png_ptr, output_row);
-         input_row += (png_uint_16)display->row_bytes/(sizeof (png_uint_16));
-      }
-   }
-
-   return 1;
-}
-
-static void
-png_image_set_PLTE(png_image_write_control *display)
-{
-   const png_imagep image = display->image;
-   const void *cmap = display->colormap;
-   const int entries = image->colormap_entries > 256 ? 256 :
-       (int)image->colormap_entries;
-
-   /* NOTE: the caller must check for cmap != NULL and entries != 0 */
-   const png_uint_32 format = image->format;
-   const unsigned int channels = PNG_IMAGE_SAMPLE_CHANNELS(format);
-
-#   if defined(PNG_FORMAT_BGR_SUPPORTED) &&\
-      defined(PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED)
-      const int afirst = (format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
-          (format & PNG_FORMAT_FLAG_ALPHA) != 0;
-#   else
-#     define afirst 0
-#   endif
-
-#   ifdef PNG_FORMAT_BGR_SUPPORTED
-      const int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
-#   else
-#     define bgr 0
-#   endif
-
-   int i, num_trans;
-   png_color palette[256];
-   png_byte tRNS[256];
-
-   memset(tRNS, 255, (sizeof tRNS));
-   memset(palette, 0, (sizeof palette));
-
-   for (i=num_trans=0; i<entries; ++i)
-   {
-      /* This gets automatically converted to sRGB with reversal of the
-       * pre-multiplication if the color-map has an alpha channel.
-       */
-      if ((format & PNG_FORMAT_FLAG_LINEAR) != 0)
-      {
-         png_const_uint_16p entry = png_voidcast(png_const_uint_16p, cmap);
-
-         entry += (unsigned int)i * channels;
-
-         if ((channels & 1) != 0) /* no alpha */
-         {
-            if (channels >= 3) /* RGB */
-            {
-               palette[i].blue = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
-                   entry[(2 ^ bgr)]);
-               palette[i].green = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
-                   entry[1]);
-               palette[i].red = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
-                   entry[bgr]);
-            }
-
-            else /* Gray */
-               palette[i].blue = palette[i].red = palette[i].green =
-                  (png_byte)PNG_sRGB_FROM_LINEAR(255 * *entry);
-         }
-
-         else /* alpha */
-         {
-            png_uint_16 alpha = entry[afirst ? 0 : channels-1];
-            png_byte alphabyte = (png_byte)PNG_DIV257(alpha);
-            png_uint_32 reciprocal = 0;
-
-            /* Calculate a reciprocal, as in the png_write_image_8bit code above
-             * this is designed to produce a value scaled to 255*65535 when
-             * divided by 128 (i.e. asr 7).
-             */
-            if (alphabyte > 0 && alphabyte < 255)
-               reciprocal = (((0xffff*0xff)<<7)+(alpha>>1))/alpha;
-
-            tRNS[i] = alphabyte;
-            if (alphabyte < 255)
-               num_trans = i+1;
-
-            if (channels >= 3) /* RGB */
-            {
-               palette[i].blue = png_unpremultiply(entry[afirst + (2 ^ bgr)],
-                   alpha, reciprocal);
-               palette[i].green = png_unpremultiply(entry[afirst + 1], alpha,
-                   reciprocal);
-               palette[i].red = png_unpremultiply(entry[afirst + bgr], alpha,
-                   reciprocal);
-            }
-
-            else /* gray */
-               palette[i].blue = palette[i].red = palette[i].green =
-                   png_unpremultiply(entry[afirst], alpha, reciprocal);
-         }
-      }
-
-      else /* Color-map has sRGB values */
-      {
-         png_const_bytep entry = png_voidcast(png_const_bytep, cmap);
-
-         entry += (unsigned int)i * channels;
-
-         switch (channels)
-         {
-            case 4:
-               tRNS[i] = entry[afirst ? 0 : 3];
-               if (tRNS[i] < 255)
-                  num_trans = i+1;
-               /* FALLTHROUGH */
-            case 3:
-               palette[i].blue = entry[afirst + (2 ^ bgr)];
-               palette[i].green = entry[afirst + 1];
-               palette[i].red = entry[afirst + bgr];
-               break;
-
-            case 2:
-               tRNS[i] = entry[1 ^ afirst];
-               if (tRNS[i] < 255)
-                  num_trans = i+1;
-               /* FALLTHROUGH */
-            case 1:
-               palette[i].blue = palette[i].red = palette[i].green =
-                  entry[afirst];
-               break;
-
-            default:
-               break;
-         }
-      }
-   }
-
-#   ifdef afirst
-#     undef afirst
-#   endif
-#   ifdef bgr
-#     undef bgr
-#   endif
-
-   png_set_PLTE(image->opaque->png_ptr, image->opaque->info_ptr, palette,
-       entries);
-
-   if (num_trans > 0)
-      png_set_tRNS(image->opaque->png_ptr, image->opaque->info_ptr, tRNS,
-          num_trans, NULL);
-
-   image->colormap_entries = (png_uint_32)entries;
-}
-
-static int
-png_image_write_main(png_voidp argument)
-{
-   png_image_write_control *display = png_voidcast(png_image_write_control*,
-       argument);
-   png_imagep image = display->image;
-   png_structrp png_ptr = image->opaque->png_ptr;
-   png_inforp info_ptr = image->opaque->info_ptr;
-   png_uint_32 format = image->format;
-
-   /* The following four ints are actually booleans */
-   int colormap = (format & PNG_FORMAT_FLAG_COLORMAP);
-   int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */
-   int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA);
-   int write_16bit = linear && (display->convert_to_8bit == 0);
-
-#   ifdef PNG_BENIGN_ERRORS_SUPPORTED
-      /* Make sure we error out on any bad situation */
-      png_set_benign_errors(png_ptr, 0/*error*/);
-#   endif
-
-   /* Default the 'row_stride' parameter if required, also check the row stride
-    * and total image size to ensure that they are within the system limits.
-    */
-   {
-      const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
-
-      if (image->width <= 0x7fffffffU/channels) /* no overflow */
-      {
-         png_uint_32 check;
-         const png_uint_32 png_row_stride = image->width * channels;
-
-         if (display->row_stride == 0)
-            display->row_stride = (png_int_32)/*SAFE*/png_row_stride;
-
-         if (display->row_stride < 0)
-            check = (png_uint_32)(-display->row_stride);
-
-         else
-            check = (png_uint_32)display->row_stride;
-
-         if (check >= png_row_stride)
-         {
-            /* Now check for overflow of the image buffer calculation; this
-             * limits the whole image size to 32 bits for API compatibility with
-             * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.
-             */
-            if (image->height > 0xffffffffU/png_row_stride)
-               png_error(image->opaque->png_ptr, "memory image too large");
-         }
-
-         else
-            png_error(image->opaque->png_ptr, "supplied row stride too small");
-      }
-
-      else
-         png_error(image->opaque->png_ptr, "image row stride too large");
-   }
-
-   /* Set the required transforms then write the rows in the correct order. */
-   if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0)
-   {
-      if (display->colormap != NULL && image->colormap_entries > 0)
-      {
-         png_uint_32 entries = image->colormap_entries;
-
-         png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
-             entries > 16 ? 8 : (entries > 4 ? 4 : (entries > 2 ? 2 : 1)),
-             PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
-             PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
-         png_image_set_PLTE(display);
-      }
-
-      else
-         png_error(image->opaque->png_ptr,
-             "no color-map for color-mapped image");
-   }
-
-   else
-      png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
-          write_16bit ? 16 : 8,
-          ((format & PNG_FORMAT_FLAG_COLOR) ? PNG_COLOR_MASK_COLOR : 0) +
-          ((format & PNG_FORMAT_FLAG_ALPHA) ? PNG_COLOR_MASK_ALPHA : 0),
-          PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
-   /* Counter-intuitively the data transformations must be called *after*
-    * png_write_info, not before as in the read code, but the 'set' functions
-    * must still be called before.  Just set the color space information, never
-    * write an interlaced image.
-    */
-
-   if (write_16bit != 0)
-   {
-      /* The gamma here is 1.0 (linear) and the cHRM chunk matches sRGB. */
-      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_LINEAR);
-
-      if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
-         png_set_cHRM_fixed(png_ptr, info_ptr,
-             /* color      x       y */
-             /* white */ 31270, 32900,
-             /* red   */ 64000, 33000,
-             /* green */ 30000, 60000,
-             /* blue  */ 15000,  6000
-         );
-   }
-
-   else if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
-      png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL);
-
-   /* Else writing an 8-bit file and the *colors* aren't sRGB, but the 8-bit
-    * space must still be gamma encoded.
-    */
-   else
-      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
-
-   /* Write the file header. */
-   png_write_info(png_ptr, info_ptr);
-
-   /* Now set up the data transformations (*after* the header is written),
-    * remove the handled transformations from the 'format' flags for checking.
-    *
-    * First check for a little endian system if writing 16-bit files.
-    */
-   if (write_16bit != 0)
-   {
-      PNG_CONST png_uint_16 le = 0x0001;
-
-      if ((*(png_const_bytep) & le) != 0)
-         png_set_swap(png_ptr);
-   }
-
-#   ifdef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-      if ((format & PNG_FORMAT_FLAG_BGR) != 0)
-      {
-         if (colormap == 0 && (format & PNG_FORMAT_FLAG_COLOR) != 0)
-            png_set_bgr(png_ptr);
-         format &= ~PNG_FORMAT_FLAG_BGR;
-      }
-#   endif
-
-#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-      if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
-      {
-         if (colormap == 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0)
-            png_set_swap_alpha(png_ptr);
-         format &= ~PNG_FORMAT_FLAG_AFIRST;
-      }
-#   endif
-
-   /* If there are 16 or fewer color-map entries we wrote a lower bit depth
-    * above, but the application data is still byte packed.
-    */
-   if (colormap != 0 && image->colormap_entries <= 16)
-      png_set_packing(png_ptr);
-
-   /* That should have handled all (both) the transforms. */
-   if ((format & ~(png_uint_32)(PNG_FORMAT_FLAG_COLOR | PNG_FORMAT_FLAG_LINEAR |
-         PNG_FORMAT_FLAG_ALPHA | PNG_FORMAT_FLAG_COLORMAP)) != 0)
-      png_error(png_ptr, "png_write_image: unsupported transformation");
-
-   {
-      png_const_bytep row = png_voidcast(png_const_bytep, display->buffer);
-      ptrdiff_t row_bytes = display->row_stride;
-
-      if (linear != 0)
-         row_bytes *= (sizeof (png_uint_16));
-
-      if (row_bytes < 0)
-         row += (image->height-1) * (-row_bytes);
-
-      display->first_row = row;
-      display->row_bytes = row_bytes;
-   }
-
-   /* Apply 'fast' options if the flag is set. */
-   if ((image->flags & PNG_IMAGE_FLAG_FAST) != 0)
-   {
-      png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_NO_FILTERS);
-      /* NOTE: determined by experiment using pngstest, this reflects some
-       * balance between the time to write the image once and the time to read
-       * it about 50 times.  The speed-up in pngstest was about 10-20% of the
-       * total (user) time on a heavily loaded system.
-       */
-#   ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-      png_set_compression_level(png_ptr, 3);
-#   endif
-   }
-
-   /* Check for the cases that currently require a pre-transform on the row
-    * before it is written.  This only applies when the input is 16-bit and
-    * either there is an alpha channel or it is converted to 8-bit.
-    */
-   if ((linear != 0 && alpha != 0 ) ||
-       (colormap == 0 && display->convert_to_8bit != 0))
-   {
-      png_bytep row = png_voidcast(png_bytep, png_malloc(png_ptr,
-          png_get_rowbytes(png_ptr, info_ptr)));
-      int result;
-
-      display->local_row = row;
-      if (write_16bit != 0)
-         result = png_safe_execute(image, png_write_image_16bit, display);
-      else
-         result = png_safe_execute(image, png_write_image_8bit, display);
-      display->local_row = NULL;
-
-      png_free(png_ptr, row);
-
-      /* Skip the 'write_end' on error: */
-      if (result == 0)
-         return 0;
-   }
-
-   /* Otherwise this is the case where the input is in a format currently
-    * supported by the rest of the libpng write code; call it directly.
-    */
-   else
-   {
-      png_const_bytep row = png_voidcast(png_const_bytep, display->first_row);
-      ptrdiff_t row_bytes = display->row_bytes;
-      png_uint_32 y = image->height;
-
-      for (; y > 0; --y)
-      {
-         png_write_row(png_ptr, row);
-         row += row_bytes;
-      }
-   }
-
-   png_write_end(png_ptr, info_ptr);
-   return 1;
-}
-
-
-static void (PNGCBAPI
-image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data,
-    png_size_t size)
-{
-   png_image_write_control *display = png_voidcast(png_image_write_control*,
-       png_ptr->io_ptr/*backdoor: png_get_io_ptr(png_ptr)*/);
-   const png_alloc_size_t ob = display->output_bytes;
-
-   /* Check for overflow; this should never happen: */
-   if (size <= ((png_alloc_size_t)-1) - ob)
-   {
-      /* I don't think libpng ever does this, but just in case: */
-      if (size > 0)
-      {
-         if (display->memory_bytes >= ob+size) /* writing */
-            memcpy(display->memory+ob, data, size);
-
-         /* Always update the size: */
-         display->output_bytes = ob+size;
-      }
-   }
-
-   else
-      png_error(png_ptr, "png_image_write_to_memory: PNG too big");
-}
-
-static void (PNGCBAPI
-image_memory_flush)(png_structp png_ptr)
-{
-   PNG_UNUSED(png_ptr)
-}
-
-static int
-png_image_write_memory(png_voidp argument)
-{
-   png_image_write_control *display = png_voidcast(png_image_write_control*,
-       argument);
-
-   /* The rest of the memory-specific init and write_main in an error protected
-    * environment.  This case needs to use callbacks for the write operations
-    * since libpng has no built in support for writing to memory.
-    */
-   png_set_write_fn(display->image->opaque->png_ptr, display/*io_ptr*/,
-       image_memory_write, image_memory_flush);
-
-   return png_image_write_main(display);
-}
-
-int PNGAPI
-png_image_write_to_memory(png_imagep image, void *memory,
-    png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8bit,
-    const void *buffer, png_int_32 row_stride, const void *colormap)
-{
-   /* Write the image to the given buffer, or count the bytes if it is NULL */
-   if (image != NULL && image->version == PNG_IMAGE_VERSION)
-   {
-      if (memory_bytes != NULL && buffer != NULL)
-      {
-         /* This is to give the caller an easier error detection in the NULL
-          * case and guard against uninitialized variable problems:
-          */
-         if (memory == NULL)
-            *memory_bytes = 0;
-
-         if (png_image_write_init(image) != 0)
-         {
-            png_image_write_control display;
-            int result;
-
-            memset(&display, 0, (sizeof display));
-            display.image = image;
-            display.buffer = buffer;
-            display.row_stride = row_stride;
-            display.colormap = colormap;
-            display.convert_to_8bit = convert_to_8bit;
-            display.memory = png_voidcast(png_bytep, memory);
-            display.memory_bytes = *memory_bytes;
-            display.output_bytes = 0;
-
-            result = png_safe_execute(image, png_image_write_memory, &display);
-            png_image_free(image);
-
-            /* write_memory returns true even if we ran out of buffer. */
-            if (result)
-            {
-               /* On out-of-buffer this function returns '0' but still updates
-                * memory_bytes:
-                */
-               if (memory != NULL && display.output_bytes > *memory_bytes)
-                  result = 0;
-
-               *memory_bytes = display.output_bytes;
-            }
-
-            return result;
-         }
-
-         else
-            return 0;
-      }
-
-      else
-         return png_image_error(image,
-             "png_image_write_to_memory: invalid argument");
-   }
-
-   else if (image != NULL)
-      return png_image_error(image,
-          "png_image_write_to_memory: incorrect PNG_IMAGE_VERSION");
-
-   else
-      return 0;
-}
-
-#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-int PNGAPI
-png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit,
-    const void *buffer, png_int_32 row_stride, const void *colormap)
-{
-   /* Write the image to the given (FILE*). */
-   if (image != NULL && image->version == PNG_IMAGE_VERSION)
-   {
-      if (file != NULL && buffer != NULL)
-      {
-         if (png_image_write_init(image) != 0)
-         {
-            png_image_write_control display;
-            int result;
-
-            /* This is slightly evil, but png_init_io doesn't do anything other
-             * than this and we haven't changed the standard IO functions so
-             * this saves a 'safe' function.
-             */
-            image->opaque->png_ptr->io_ptr = file;
-
-            memset(&display, 0, (sizeof display));
-            display.image = image;
-            display.buffer = buffer;
-            display.row_stride = row_stride;
-            display.colormap = colormap;
-            display.convert_to_8bit = convert_to_8bit;
-
-            result = png_safe_execute(image, png_image_write_main, &display);
-            png_image_free(image);
-            return result;
-         }
-
-         else
-            return 0;
-      }
-
-      else
-         return png_image_error(image,
-             "png_image_write_to_stdio: invalid argument");
-   }
-
-   else if (image != NULL)
-      return png_image_error(image,
-          "png_image_write_to_stdio: incorrect PNG_IMAGE_VERSION");
-
-   else
-      return 0;
-}
-
-int PNGAPI
-png_image_write_to_file(png_imagep image, const char *file_name,
-    int convert_to_8bit, const void *buffer, png_int_32 row_stride,
-    const void *colormap)
-{
-   /* Write the image to the named file. */
-   if (image != NULL && image->version == PNG_IMAGE_VERSION)
-   {
-      if (file_name != NULL && buffer != NULL)
-      {
-         FILE *fp = fopen(file_name, "wb");
-
-         if (fp != NULL)
-         {
-            if (png_image_write_to_stdio(image, fp, convert_to_8bit, buffer,
-                row_stride, colormap) != 0)
-            {
-               int error; /* from fflush/fclose */
-
-               /* Make sure the file is flushed correctly. */
-               if (fflush(fp) == 0 && ferror(fp) == 0)
-               {
-                  if (fclose(fp) == 0)
-                     return 1;
-
-                  error = errno; /* from fclose */
-               }
-
-               else
-               {
-                  error = errno; /* from fflush or ferror */
-                  (void)fclose(fp);
-               }
-
-               (void)remove(file_name);
-               /* The image has already been cleaned up; this is just used to
-                * set the error (because the original write succeeded).
-                */
-               return png_image_error(image, strerror(error));
-            }
-
-            else
-            {
-               /* Clean up: just the opened file. */
-               (void)fclose(fp);
-               (void)remove(file_name);
-               return 0;
-            }
-         }
-
-         else
-            return png_image_error(image, strerror(errno));
-      }
-
-      else
-         return png_image_error(image,
-             "png_image_write_to_file: invalid argument");
-   }
-
-   else if (image != NULL)
-      return png_image_error(image,
-          "png_image_write_to_file: incorrect PNG_IMAGE_VERSION");
-
-   else
-      return 0;
-}
-#endif /* SIMPLIFIED_WRITE_STDIO */
-#endif /* SIMPLIFIED_WRITE */
-#endif /* WRITE */
diff --git a/src/png/libpng/pngwtran.c b/src/png/libpng/pngwtran.c
deleted file mode 100644
index 377b43e5c..000000000
--- a/src/png/libpng/pngwtran.c
+++ /dev/null
@@ -1,576 +0,0 @@
-
-/* pngwtran.c - transforms the data in a row for PNG writers
- *
- * Last changed in libpng 1.6.26 [October 20, 2016]
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
- * row_info bit depth should be 8 (one pixel per byte).  The channels
- * should be 1 (this only happens on grayscale and paletted images).
- */
-static void
-png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
-{
-   png_debug(1, "in png_do_pack");
-
-   if (row_info->bit_depth == 8 &&
-      row_info->channels == 1)
-   {
-      switch ((int)bit_depth)
-      {
-         case 1:
-         {
-            png_bytep sp, dp;
-            int mask, v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            mask = 0x80;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               if (*sp != 0)
-                  v |= mask;
-
-               sp++;
-
-               if (mask > 1)
-                  mask >>= 1;
-
-               else
-               {
-                  mask = 0x80;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-            }
-
-            if (mask != 0x80)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp, dp;
-            unsigned int shift;
-            int v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            shift = 6;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte value;
-
-               value = (png_byte)(*sp & 0x03);
-               v |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 6;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-
-               else
-                  shift -= 2;
-
-               sp++;
-            }
-
-            if (shift != 6)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp, dp;
-            unsigned int shift;
-            int v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            shift = 4;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte value;
-
-               value = (png_byte)(*sp & 0x0f);
-               v |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 4;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-
-               else
-                  shift -= 4;
-
-               sp++;
-            }
-
-            if (shift != 4)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         default:
-            break;
-      }
-
-      row_info->bit_depth = (png_byte)bit_depth;
-      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-          row_info->width);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-/* Shift pixel values to take advantage of whole range.  Pass the
- * true number of bits in bit_depth.  The row should be packed
- * according to row_info->bit_depth.  Thus, if you had a row of
- * bit depth 4, but the pixels only had values from 0 to 7, you
- * would pass 3 as bit_depth, and this routine would translate the
- * data to 0 to 15.
- */
-static void
-png_do_shift(png_row_infop row_info, png_bytep row,
-    png_const_color_8p bit_depth)
-{
-   png_debug(1, "in png_do_shift");
-
-   if (row_info->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      int shift_start[4], shift_dec[4];
-      unsigned int channels = 0;
-
-      if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->red;
-         shift_dec[channels] = bit_depth->red;
-         channels++;
-
-         shift_start[channels] = row_info->bit_depth - bit_depth->green;
-         shift_dec[channels] = bit_depth->green;
-         channels++;
-
-         shift_start[channels] = row_info->bit_depth - bit_depth->blue;
-         shift_dec[channels] = bit_depth->blue;
-         channels++;
-      }
-
-      else
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->gray;
-         shift_dec[channels] = bit_depth->gray;
-         channels++;
-      }
-
-      if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
-         shift_dec[channels] = bit_depth->alpha;
-         channels++;
-      }
-
-      /* With low row depths, could only be grayscale, so one channel */
-      if (row_info->bit_depth < 8)
-      {
-         png_bytep bp = row;
-         png_size_t i;
-         unsigned int mask;
-         png_size_t row_bytes = row_info->rowbytes;
-
-         if (bit_depth->gray == 1 && row_info->bit_depth == 2)
-            mask = 0x55;
-
-         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
-            mask = 0x11;
-
-         else
-            mask = 0xff;
-
-         for (i = 0; i < row_bytes; i++, bp++)
-         {
-            int j;
-            unsigned int v, out;
-
-            v = *bp;
-            out = 0;
-
-            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
-            {
-               if (j > 0)
-                  out |= v << j;
-
-               else
-                  out |= (v >> (-j)) & mask;
-            }
-
-            *bp = (png_byte)(out & 0xff);
-         }
-      }
-
-      else if (row_info->bit_depth == 8)
-      {
-         png_bytep bp = row;
-         png_uint_32 i;
-         png_uint_32 istop = channels * row_info->width;
-
-         for (i = 0; i < istop; i++, bp++)
-         {
-
-            const unsigned int c = i%channels;
-            int j;
-            unsigned int v, out;
-
-            v = *bp;
-            out = 0;
-
-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
-            {
-               if (j > 0)
-                  out |= v << j;
-
-               else
-                  out |= v >> (-j);
-            }
-
-            *bp = (png_byte)(out & 0xff);
-         }
-      }
-
-      else
-      {
-         png_bytep bp;
-         png_uint_32 i;
-         png_uint_32 istop = channels * row_info->width;
-
-         for (bp = row, i = 0; i < istop; i++)
-         {
-            const unsigned int c = i%channels;
-            int j;
-            unsigned int value, v;
-
-            v = png_get_uint_16(bp);
-            value = 0;
-
-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
-            {
-               if (j > 0)
-                  value |= v << j;
-
-               else
-                  value |= v >> (-j);
-            }
-            *bp++ = (png_byte)((value >> 8) & 0xff);
-            *bp++ = (png_byte)(value & 0xff);
-         }
-      }
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-static void
-png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_swap_alpha");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This converts from ARGB to RGBA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save;
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This converts from AARRGGBB to RRGGBBAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save[2];
-               save[0] = *(sp++);
-               save[1] = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save[0];
-               *(dp++) = save[1];
-            }
-         }
-#endif /* WRITE_16BIT */
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This converts from AG to GA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save;
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This converts from AAGG to GGAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save[2];
-               save[0] = *(sp++);
-               save[1] = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save[0];
-               *(dp++) = save[1];
-            }
-         }
-#endif /* WRITE_16BIT */
-      }
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-static void
-png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_invert_alpha");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This inverts the alpha channel in RGBA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=3; dp = sp;
-               *dp = (png_byte)(255 - *(sp++));
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This inverts the alpha channel in RRGGBBAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=6; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-               *dp     = (png_byte)(255 - *(sp++));
-            }
-         }
-#endif /* WRITE_16BIT */
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This inverts the alpha channel in GA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               *(dp++) = *(sp++);
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This inverts the alpha channel in GGAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=2; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-               *dp     = (png_byte)(255 - *(sp++));
-            }
-         }
-#endif /* WRITE_16BIT */
-      }
-   }
-}
-#endif
-
-/* Transform the data according to the user's wishes.  The order of
- * transformations is significant.
- */
-void /* PRIVATE */
-png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info)
-{
-   png_debug(1, "in png_do_write_transformations");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
-      if (png_ptr->write_user_transform_fn != NULL)
-         (*(png_ptr->write_user_transform_fn)) /* User write transform
-                                                 function */
-             (png_ptr,  /* png_ptr */
-             row_info,  /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);      /* start of pixel data for row */
-#endif
-
-#ifdef PNG_WRITE_FILLER_SUPPORTED
-   if ((png_ptr->transformations & PNG_FILLER) != 0)
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-          !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
-#endif
-
-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
-      png_do_packswap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) != 0)
-      png_do_pack(row_info, png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->bit_depth);
-#endif
-
-#ifdef PNG_WRITE_SWAP_SUPPORTED
-#  ifdef PNG_16BIT_SUPPORTED
-   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
-      png_do_swap(row_info, png_ptr->row_buf + 1);
-#  endif
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-   if ((png_ptr->transformations & PNG_SHIFT) != 0)
-      png_do_shift(row_info, png_ptr->row_buf + 1,
-           &(png_ptr->shift));
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
-      png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
-      png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_BGR_SUPPORTED
-   if ((png_ptr->transformations & PNG_BGR) != 0)
-      png_do_bgr(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_SUPPORTED
-   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
-      png_do_invert(row_info, png_ptr->row_buf + 1);
-#endif
-}
-#endif /* WRITE_TRANSFORMS */
-#endif /* WRITE */
diff --git a/src/png/libpng/pngwutil.c b/src/png/libpng/pngwutil.c
deleted file mode 100644
index 0d4fb1336..000000000
--- a/src/png/libpng/pngwutil.c
+++ /dev/null
@@ -1,2784 +0,0 @@
-
-/* pngwutil.c - utilities to write a PNG file
- *
- * Last changed in libpng 1.6.32 [August 24, 2017]
- * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-/* Place a 32-bit number into a buffer in PNG byte order.  We work
- * with unsigned numbers for convenience, although one supported
- * ancillary chunk uses signed (two's complement) numbers.
- */
-void PNGAPI
-png_save_uint_32(png_bytep buf, png_uint_32 i)
-{
-   buf[0] = (png_byte)((i >> 24) & 0xffU);
-   buf[1] = (png_byte)((i >> 16) & 0xffU);
-   buf[2] = (png_byte)((i >>  8) & 0xffU);
-   buf[3] = (png_byte)( i        & 0xffU);
-}
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-void PNGAPI
-png_save_uint_16(png_bytep buf, unsigned int i)
-{
-   buf[0] = (png_byte)((i >> 8) & 0xffU);
-   buf[1] = (png_byte)( i       & 0xffU);
-}
-#endif
-
-/* Simple function to write the signature.  If we have already written
- * the magic bytes of the signature, or more likely, the PNG stream is
- * being embedded into another stream and doesn't need its own signature,
- * we should call png_set_sig_bytes() to tell libpng how many of the
- * bytes have already been written.
- */
-void PNGAPI
-png_write_sig(png_structrp png_ptr)
-{
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the signature is being written */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_SIGNATURE;
-#endif
-
-   /* Write the rest of the 8 byte signature */
-   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
-       (png_size_t)(8 - png_ptr->sig_bytes));
-
-   if (png_ptr->sig_bytes < 3)
-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-}
-
-/* Write the start of a PNG chunk.  The type is the chunk type.
- * The total_length is the sum of the lengths of all the data you will be
- * passing in png_write_chunk_data().
- */
-static void
-png_write_chunk_header(png_structrp png_ptr, png_uint_32 chunk_name,
-    png_uint_32 length)
-{
-   png_byte buf[8];
-
-#if defined(PNG_DEBUG) && (PNG_DEBUG > 0)
-   PNG_CSTRING_FROM_CHUNK(buf, chunk_name);
-   png_debug2(0, "Writing %s chunk, length = %lu", buf, (unsigned long)length);
-#endif
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk header is being written.
-    * PNG_IO_CHUNK_HDR requires a single I/O call.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_HDR;
-#endif
-
-   /* Write the length and the chunk name */
-   png_save_uint_32(buf, length);
-   png_save_uint_32(buf + 4, chunk_name);
-   png_write_data(png_ptr, buf, 8);
-
-   /* Put the chunk name into png_ptr->chunk_name */
-   png_ptr->chunk_name = chunk_name;
-
-   /* Reset the crc and run it over the chunk name */
-   png_reset_crc(png_ptr);
-
-   png_calculate_crc(png_ptr, buf + 4, 4);
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that chunk data will (possibly) be written.
-    * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_DATA;
-#endif
-}
-
-void PNGAPI
-png_write_chunk_start(png_structrp png_ptr, png_const_bytep chunk_string,
-    png_uint_32 length)
-{
-   png_write_chunk_header(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), length);
-}
-
-/* Write the data of a PNG chunk started with png_write_chunk_header().
- * Note that multiple calls to this function are allowed, and that the
- * sum of the lengths from these calls *must* add up to the total_length
- * given to png_write_chunk_header().
- */
-void PNGAPI
-png_write_chunk_data(png_structrp png_ptr, png_const_bytep data,
-    png_size_t length)
-{
-   /* Write the data, and run the CRC over it */
-   if (png_ptr == NULL)
-      return;
-
-   if (data != NULL && length > 0)
-   {
-      png_write_data(png_ptr, data, length);
-
-      /* Update the CRC after writing the data,
-       * in case the user I/O routine alters it.
-       */
-      png_calculate_crc(png_ptr, data, length);
-   }
-}
-
-/* Finish a chunk started with png_write_chunk_header(). */
-void PNGAPI
-png_write_chunk_end(png_structrp png_ptr)
-{
-   png_byte buf[4];
-
-   if (png_ptr == NULL) return;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk CRC is being written.
-    * PNG_IO_CHUNK_CRC requires a single I/O function call.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_CRC;
-#endif
-
-   /* Write the crc in a single operation */
-   png_save_uint_32(buf, png_ptr->crc);
-
-   png_write_data(png_ptr, buf, (png_size_t)4);
-}
-
-/* Write a PNG chunk all at once.  The type is an array of ASCII characters
- * representing the chunk name.  The array must be at least 4 bytes in
- * length, and does not need to be null terminated.  To be safe, pass the
- * pre-defined chunk names here, and if you need a new one, define it
- * where the others are defined.  The length is the length of the data.
- * All the data must be present.  If that is not possible, use the
- * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
- * functions instead.
- */
-static void
-png_write_complete_chunk(png_structrp png_ptr, png_uint_32 chunk_name,
-    png_const_bytep data, png_size_t length)
-{
-   if (png_ptr == NULL)
-      return;
-
-   /* On 64-bit architectures 'length' may not fit in a png_uint_32. */
-   if (length > PNG_UINT_31_MAX)
-      png_error(png_ptr, "length exceeds PNG maximum");
-
-   png_write_chunk_header(png_ptr, chunk_name, (png_uint_32)length);
-   png_write_chunk_data(png_ptr, data, length);
-   png_write_chunk_end(png_ptr);
-}
-
-/* This is the API that calls the internal function above. */
-void PNGAPI
-png_write_chunk(png_structrp png_ptr, png_const_bytep chunk_string,
-    png_const_bytep data, png_size_t length)
-{
-   png_write_complete_chunk(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), data,
-       length);
-}
-
-/* This is used below to find the size of an image to pass to png_deflate_claim,
- * so it only needs to be accurate if the size is less than 16384 bytes (the
- * point at which a lower LZ window size can be used.)
- */
-static png_alloc_size_t
-png_image_size(png_structrp png_ptr)
-{
-   /* Only return sizes up to the maximum of a png_uint_32; do this by limiting
-    * the width and height used to 15 bits.
-    */
-   png_uint_32 h = png_ptr->height;
-
-   if (png_ptr->rowbytes < 32768 && h < 32768)
-   {
-      if (png_ptr->interlaced != 0)
-      {
-         /* Interlacing makes the image larger because of the replication of
-          * both the filter byte and the padding to a byte boundary.
-          */
-         png_uint_32 w = png_ptr->width;
-         unsigned int pd = png_ptr->pixel_depth;
-         png_alloc_size_t cb_base;
-         int pass;
-
-         for (cb_base=0, pass=0; pass<=6; ++pass)
-         {
-            png_uint_32 pw = PNG_PASS_COLS(w, pass);
-
-            if (pw > 0)
-               cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass);
-         }
-
-         return cb_base;
-      }
-
-      else
-         return (png_ptr->rowbytes+1) * h;
-   }
-
-   else
-      return 0xffffffffU;
-}
-
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-   /* This is the code to hack the first two bytes of the deflate stream (the
-    * deflate header) to correct the windowBits value to match the actual data
-    * size.  Note that the second argument is the *uncompressed* size but the
-    * first argument is the *compressed* data (and it must be deflate
-    * compressed.)
-    */
-static void
-optimize_cmf(png_bytep data, png_alloc_size_t data_size)
-{
-   /* Optimize the CMF field in the zlib stream.  The resultant zlib stream is
-    * still compliant to the stream specification.
-    */
-   if (data_size <= 16384) /* else windowBits must be 15 */
-   {
-      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
-
-      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-      {
-         unsigned int z_cinfo;
-         unsigned int half_z_window_size;
-
-         z_cinfo = z_cmf >> 4;
-         half_z_window_size = 1U << (z_cinfo + 7);
-
-         if (data_size <= half_z_window_size) /* else no change */
-         {
-            unsigned int tmp;
-
-            do
-            {
-               half_z_window_size >>= 1;
-               --z_cinfo;
-            }
-            while (z_cinfo > 0 && data_size <= half_z_window_size);
-
-            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
-
-            data[0] = (png_byte)z_cmf;
-            tmp = data[1] & 0xe0;
-            tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-            data[1] = (png_byte)tmp;
-         }
-      }
-   }
-}
-#endif /* WRITE_OPTIMIZE_CMF */
-
-/* Initialize the compressor for the appropriate type of compression. */
-static int
-png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
-    png_alloc_size_t data_size)
-{
-   if (png_ptr->zowner != 0)
-   {
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
-      char msg[64];
-
-      PNG_STRING_FROM_CHUNK(msg, owner);
-      msg[4] = ':';
-      msg[5] = ' ';
-      PNG_STRING_FROM_CHUNK(msg+6, png_ptr->zowner);
-      /* So the message that results is "<chunk> using zstream"; this is an
-       * internal error, but is very useful for debugging.  i18n requirements
-       * are minimal.
-       */
-      (void)png_safecat(msg, (sizeof msg), 10, " using zstream");
-#endif
-#if PNG_RELEASE_BUILD
-         png_warning(png_ptr, msg);
-
-         /* Attempt sane error recovery */
-         if (png_ptr->zowner == png_IDAT) /* don't steal from IDAT */
-         {
-            png_ptr->zstream.msg = PNGZ_MSG_CAST("in use by IDAT");
-            return Z_STREAM_ERROR;
-         }
-
-         png_ptr->zowner = 0;
-#else
-         png_error(png_ptr, msg);
-#endif
-   }
-
-   {
-      int level = png_ptr->zlib_level;
-      int method = png_ptr->zlib_method;
-      int windowBits = png_ptr->zlib_window_bits;
-      int memLevel = png_ptr->zlib_mem_level;
-      int strategy; /* set below */
-      int ret; /* zlib return code */
-
-      if (owner == png_IDAT)
-      {
-         if ((png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) != 0)
-            strategy = png_ptr->zlib_strategy;
-
-         else if (png_ptr->do_filter != PNG_FILTER_NONE)
-            strategy = PNG_Z_DEFAULT_STRATEGY;
-
-         else
-            strategy = PNG_Z_DEFAULT_NOFILTER_STRATEGY;
-      }
-
-      else
-      {
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-            level = png_ptr->zlib_text_level;
-            method = png_ptr->zlib_text_method;
-            windowBits = png_ptr->zlib_text_window_bits;
-            memLevel = png_ptr->zlib_text_mem_level;
-            strategy = png_ptr->zlib_text_strategy;
-#else
-            /* If customization is not supported the values all come from the
-             * IDAT values except for the strategy, which is fixed to the
-             * default.  (This is the pre-1.6.0 behavior too, although it was
-             * implemented in a very different way.)
-             */
-            strategy = Z_DEFAULT_STRATEGY;
-#endif
-      }
-
-      /* Adjust 'windowBits' down if larger than 'data_size'; to stop this
-       * happening just pass 32768 as the data_size parameter.  Notice that zlib
-       * requires an extra 262 bytes in the window in addition to the data to be
-       * able to see the whole of the data, so if data_size+262 takes us to the
-       * next windowBits size we need to fix up the value later.  (Because even
-       * though deflate needs the extra window, inflate does not!)
-       */
-      if (data_size <= 16384)
-      {
-         /* IMPLEMENTATION NOTE: this 'half_window_size' stuff is only here to
-          * work round a Microsoft Visual C misbehavior which, contrary to C-90,
-          * widens the result of the following shift to 64-bits if (and,
-          * apparently, only if) it is used in a test.
-          */
-         unsigned int half_window_size = 1U << (windowBits-1);
-
-         while (data_size + 262 <= half_window_size)
-         {
-            half_window_size >>= 1;
-            --windowBits;
-         }
-      }
-
-      /* Check against the previous initialized values, if any. */
-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0 &&
-         (png_ptr->zlib_set_level != level ||
-         png_ptr->zlib_set_method != method ||
-         png_ptr->zlib_set_window_bits != windowBits ||
-         png_ptr->zlib_set_mem_level != memLevel ||
-         png_ptr->zlib_set_strategy != strategy))
-      {
-         if (deflateEnd(&png_ptr->zstream) != Z_OK)
-            png_warning(png_ptr, "deflateEnd failed (ignored)");
-
-         png_ptr->flags &= ~PNG_FLAG_ZSTREAM_INITIALIZED;
-      }
-
-      /* For safety clear out the input and output pointers (currently zlib
-       * doesn't use them on Init, but it might in the future).
-       */
-      png_ptr->zstream.next_in = NULL;
-      png_ptr->zstream.avail_in = 0;
-      png_ptr->zstream.next_out = NULL;
-      png_ptr->zstream.avail_out = 0;
-
-      /* Now initialize if required, setting the new parameters, otherwise just
-       * do a simple reset to the previous parameters.
-       */
-      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
-         ret = deflateReset(&png_ptr->zstream);
-
-      else
-      {
-         ret = deflateInit2(&png_ptr->zstream, level, method, windowBits,
-             memLevel, strategy);
-
-         if (ret == Z_OK)
-            png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
-      }
-
-      /* The return code is from either deflateReset or deflateInit2; they have
-       * pretty much the same set of error codes.
-       */
-      if (ret == Z_OK)
-         png_ptr->zowner = owner;
-
-      else
-         png_zstream_error(png_ptr, ret);
-
-      return ret;
-   }
-}
-
-/* Clean up (or trim) a linked list of compression buffers. */
-void /* PRIVATE */
-png_free_buffer_list(png_structrp png_ptr, png_compression_bufferp *listp)
-{
-   png_compression_bufferp list = *listp;
-
-   if (list != NULL)
-   {
-      *listp = NULL;
-
-      do
-      {
-         png_compression_bufferp next = list->next;
-
-         png_free(png_ptr, list);
-         list = next;
-      }
-      while (list != NULL);
-   }
-}
-
-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-/* This pair of functions encapsulates the operation of (a) compressing a
- * text string, and (b) issuing it later as a series of chunk data writes.
- * The compression_state structure is shared context for these functions
- * set up by the caller to allow access to the relevant local variables.
- *
- * compression_buffer (new in 1.6.0) is just a linked list of zbuffer_size
- * temporary buffers.  From 1.6.0 it is retained in png_struct so that it will
- * be correctly freed in the event of a write error (previous implementations
- * just leaked memory.)
- */
-typedef struct
-{
-   png_const_bytep      input;        /* The uncompressed input data */
-   png_alloc_size_t     input_len;    /* Its length */
-   png_uint_32          output_len;   /* Final compressed length */
-   png_byte             output[1024]; /* First block of output */
-} compression_state;
-
-static void
-png_text_compress_init(compression_state *comp, png_const_bytep input,
-    png_alloc_size_t input_len)
-{
-   comp->input = input;
-   comp->input_len = input_len;
-   comp->output_len = 0;
-}
-
-/* Compress the data in the compression state input */
-static int
-png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name,
-    compression_state *comp, png_uint_32 prefix_len)
-{
-   int ret;
-
-   /* To find the length of the output it is necessary to first compress the
-    * input. The result is buffered rather than using the two-pass algorithm
-    * that is used on the inflate side; deflate is assumed to be slower and a
-    * PNG writer is assumed to have more memory available than a PNG reader.
-    *
-    * IMPLEMENTATION NOTE: the zlib API deflateBound() can be used to find an
-    * upper limit on the output size, but it is always bigger than the input
-    * size so it is likely to be more efficient to use this linked-list
-    * approach.
-    */
-   ret = png_deflate_claim(png_ptr, chunk_name, comp->input_len);
-
-   if (ret != Z_OK)
-      return ret;
-
-   /* Set up the compression buffers, we need a loop here to avoid overflowing a
-    * uInt.  Use ZLIB_IO_MAX to limit the input.  The output is always limited
-    * by the output buffer size, so there is no need to check that.  Since this
-    * is ANSI-C we know that an 'int', hence a uInt, is always at least 16 bits
-    * in size.
-    */
-   {
-      png_compression_bufferp *end = &png_ptr->zbuffer_list;
-      png_alloc_size_t input_len = comp->input_len; /* may be zero! */
-      png_uint_32 output_len;
-
-      /* zlib updates these for us: */
-      png_ptr->zstream.next_in = PNGZ_INPUT_CAST(comp->input);
-      png_ptr->zstream.avail_in = 0; /* Set below */
-      png_ptr->zstream.next_out = comp->output;
-      png_ptr->zstream.avail_out = (sizeof comp->output);
-
-      output_len = png_ptr->zstream.avail_out;
-
-      do
-      {
-         uInt avail_in = ZLIB_IO_MAX;
-
-         if (avail_in > input_len)
-            avail_in = (uInt)input_len;
-
-         input_len -= avail_in;
-
-         png_ptr->zstream.avail_in = avail_in;
-
-         if (png_ptr->zstream.avail_out == 0)
-         {
-            png_compression_buffer *next;
-
-            /* Chunk data is limited to 2^31 bytes in length, so the prefix
-             * length must be counted here.
-             */
-            if (output_len + prefix_len > PNG_UINT_31_MAX)
-            {
-               ret = Z_MEM_ERROR;
-               break;
-            }
-
-            /* Need a new (malloc'ed) buffer, but there may be one present
-             * already.
-             */
-            next = *end;
-            if (next == NULL)
-            {
-               next = png_voidcast(png_compression_bufferp, png_malloc_base
-                  (png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
-
-               if (next == NULL)
-               {
-                  ret = Z_MEM_ERROR;
-                  break;
-               }
-
-               /* Link in this buffer (so that it will be freed later) */
-               next->next = NULL;
-               *end = next;
-            }
-
-            png_ptr->zstream.next_out = next->output;
-            png_ptr->zstream.avail_out = png_ptr->zbuffer_size;
-            output_len += png_ptr->zstream.avail_out;
-
-            /* Move 'end' to the next buffer pointer. */
-            end = &next->next;
-         }
-
-         /* Compress the data */
-         ret = deflate(&png_ptr->zstream,
-             input_len > 0 ? Z_NO_FLUSH : Z_FINISH);
-
-         /* Claw back input data that was not consumed (because avail_in is
-          * reset above every time round the loop).
-          */
-         input_len += png_ptr->zstream.avail_in;
-         png_ptr->zstream.avail_in = 0; /* safety */
-      }
-      while (ret == Z_OK);
-
-      /* There may be some space left in the last output buffer. This needs to
-       * be subtracted from output_len.
-       */
-      output_len -= png_ptr->zstream.avail_out;
-      png_ptr->zstream.avail_out = 0; /* safety */
-      comp->output_len = output_len;
-
-      /* Now double check the output length, put in a custom message if it is
-       * too long.  Otherwise ensure the z_stream::msg pointer is set to
-       * something.
-       */
-      if (output_len + prefix_len >= PNG_UINT_31_MAX)
-      {
-         png_ptr->zstream.msg = PNGZ_MSG_CAST("compressed data too long");
-         ret = Z_MEM_ERROR;
-      }
-
-      else
-         png_zstream_error(png_ptr, ret);
-
-      /* Reset zlib for another zTXt/iTXt or image data */
-      png_ptr->zowner = 0;
-
-      /* The only success case is Z_STREAM_END, input_len must be 0; if not this
-       * is an internal error.
-       */
-      if (ret == Z_STREAM_END && input_len == 0)
-      {
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-         /* Fix up the deflate header, if required */
-         optimize_cmf(comp->output, comp->input_len);
-#endif
-         /* But Z_OK is returned, not Z_STREAM_END; this allows the claim
-          * function above to return Z_STREAM_END on an error (though it never
-          * does in the current versions of zlib.)
-          */
-         return Z_OK;
-      }
-
-      else
-         return ret;
-   }
-}
-
-/* Ship the compressed text out via chunk writes */
-static void
-png_write_compressed_data_out(png_structrp png_ptr, compression_state *comp)
-{
-   png_uint_32 output_len = comp->output_len;
-   png_const_bytep output = comp->output;
-   png_uint_32 avail = (sizeof comp->output);
-   png_compression_buffer *next = png_ptr->zbuffer_list;
-
-   for (;;)
-   {
-      if (avail > output_len)
-         avail = output_len;
-
-      png_write_chunk_data(png_ptr, output, avail);
-
-      output_len -= avail;
-
-      if (output_len == 0 || next == NULL)
-         break;
-
-      avail = png_ptr->zbuffer_size;
-      output = next->output;
-      next = next->next;
-   }
-
-   /* This is an internal error; 'next' must have been NULL! */
-   if (output_len > 0)
-      png_error(png_ptr, "error writing ancillary chunked compressed data");
-}
-#endif /* WRITE_COMPRESSED_TEXT */
-
-/* Write the IHDR chunk, and update the png_struct with the necessary
- * information.  Note that the rest of this code depends upon this
- * information being correct.
- */
-void /* PRIVATE */
-png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
-    int bit_depth, int color_type, int compression_type, int filter_type,
-    int interlace_type)
-{
-   png_byte buf[13]; /* Buffer to store the IHDR info */
-   int is_invalid_depth;
-
-   png_debug(1, "in png_write_IHDR");
-
-   /* Check that we have valid input data from the application info */
-   switch (color_type)
-   {
-      case PNG_COLOR_TYPE_GRAY:
-         switch (bit_depth)
-         {
-            case 1:
-            case 2:
-            case 4:
-            case 8:
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-            case 16:
-#endif
-               png_ptr->channels = 1; break;
-
-            default:
-               png_error(png_ptr,
-                   "Invalid bit depth for grayscale image");
-         }
-         break;
-
-      case PNG_COLOR_TYPE_RGB:
-         is_invalid_depth = (bit_depth != 8);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         is_invalid_depth = (is_invalid_depth && bit_depth != 16);
-#endif
-         if (is_invalid_depth)
-            png_error(png_ptr, "Invalid bit depth for RGB image");
-
-         png_ptr->channels = 3;
-         break;
-
-      case PNG_COLOR_TYPE_PALETTE:
-         switch (bit_depth)
-         {
-            case 1:
-            case 2:
-            case 4:
-            case 8:
-               png_ptr->channels = 1;
-               break;
-
-            default:
-               png_error(png_ptr, "Invalid bit depth for paletted image");
-         }
-         break;
-
-      case PNG_COLOR_TYPE_GRAY_ALPHA:
-         is_invalid_depth = (bit_depth != 8);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         is_invalid_depth = (is_invalid_depth && bit_depth != 16);
-#endif
-         if (is_invalid_depth)
-            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
-
-         png_ptr->channels = 2;
-         break;
-
-      case PNG_COLOR_TYPE_RGB_ALPHA:
-         is_invalid_depth = (bit_depth != 8);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         is_invalid_depth = (is_invalid_depth && bit_depth != 16);
-#endif
-         if (is_invalid_depth)
-            png_error(png_ptr, "Invalid bit depth for RGBA image");
-
-         png_ptr->channels = 4;
-         break;
-
-      default:
-         png_error(png_ptr, "Invalid image color type specified");
-   }
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Invalid compression type specified");
-      compression_type = PNG_COMPRESSION_TYPE_BASE;
-   }
-
-   /* Write filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not write a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if (
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-       !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
-       ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
-       (color_type == PNG_COLOR_TYPE_RGB ||
-        color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
-       (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
-#endif
-       filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Invalid filter type specified");
-      filter_type = PNG_FILTER_TYPE_BASE;
-   }
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   if (interlace_type != PNG_INTERLACE_NONE &&
-       interlace_type != PNG_INTERLACE_ADAM7)
-   {
-      png_warning(png_ptr, "Invalid interlace type specified");
-      interlace_type = PNG_INTERLACE_ADAM7;
-   }
-#else
-   interlace_type=PNG_INTERLACE_NONE;
-#endif
-
-   /* Save the relevant information */
-   png_ptr->bit_depth = (png_byte)bit_depth;
-   png_ptr->color_type = (png_byte)color_type;
-   png_ptr->interlaced = (png_byte)interlace_type;
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_ptr->filter_type = (png_byte)filter_type;
-#endif
-   png_ptr->compression_type = (png_byte)compression_type;
-   png_ptr->width = width;
-   png_ptr->height = height;
-
-   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
-   /* Set the usr info, so any transformations can modify it */
-   png_ptr->usr_width = png_ptr->width;
-   png_ptr->usr_bit_depth = png_ptr->bit_depth;
-   png_ptr->usr_channels = png_ptr->channels;
-
-   /* Pack the header information into the buffer */
-   png_save_uint_32(buf, width);
-   png_save_uint_32(buf + 4, height);
-   buf[8] = (png_byte)bit_depth;
-   buf[9] = (png_byte)color_type;
-   buf[10] = (png_byte)compression_type;
-   buf[11] = (png_byte)filter_type;
-   buf[12] = (png_byte)interlace_type;
-
-   /* Write the chunk */
-   png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
-
-   if ((png_ptr->do_filter) == PNG_NO_FILTERS)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
-          png_ptr->bit_depth < 8)
-         png_ptr->do_filter = PNG_FILTER_NONE;
-
-      else
-         png_ptr->do_filter = PNG_ALL_FILTERS;
-   }
-
-   png_ptr->mode = PNG_HAVE_IHDR; /* not READY_FOR_ZTXT */
-}
-
-/* Write the palette.  We are careful not to trust png_color to be in the
- * correct order for PNG, so people can redefine it to any convenient
- * structure.
- */
-void /* PRIVATE */
-png_write_PLTE(png_structrp png_ptr, png_const_colorp palette,
-    png_uint_32 num_pal)
-{
-   png_uint_32 max_palette_length, i;
-   png_const_colorp pal_ptr;
-   png_byte buf[3];
-
-   png_debug(1, "in png_write_PLTE");
-
-   max_palette_length = (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
-      (1 << png_ptr->bit_depth) : PNG_MAX_PALETTE_LENGTH;
-
-   if ((
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-       (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0 &&
-#endif
-       num_pal == 0) || num_pal > max_palette_length)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_error(png_ptr, "Invalid number of colors in palette");
-      }
-
-      else
-      {
-         png_warning(png_ptr, "Invalid number of colors in palette");
-         return;
-      }
-   }
-
-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
-   {
-      png_warning(png_ptr,
-          "Ignoring request to write a PLTE chunk in grayscale PNG");
-
-      return;
-   }
-
-   png_ptr->num_palette = (png_uint_16)num_pal;
-   png_debug1(3, "num_palette = %d", png_ptr->num_palette);
-
-   png_write_chunk_header(png_ptr, png_PLTE, (png_uint_32)(num_pal * 3));
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-
-   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
-   {
-      buf[0] = pal_ptr->red;
-      buf[1] = pal_ptr->green;
-      buf[2] = pal_ptr->blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
-   }
-
-#else
-   /* This is a little slower but some buggy compilers need to do this
-    * instead
-    */
-   pal_ptr=palette;
-
-   for (i = 0; i < num_pal; i++)
-   {
-      buf[0] = pal_ptr[i].red;
-      buf[1] = pal_ptr[i].green;
-      buf[2] = pal_ptr[i].blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
-   }
-
-#endif
-   png_write_chunk_end(png_ptr);
-   png_ptr->mode |= PNG_HAVE_PLTE;
-}
-
-/* This is similar to png_text_compress, above, except that it does not require
- * all of the data at once and, instead of buffering the compressed result,
- * writes it as IDAT chunks.  Unlike png_text_compress it *can* png_error out
- * because it calls the write interface.  As a result it does its own error
- * reporting and does not return an error code.  In the event of error it will
- * just call png_error.  The input data length may exceed 32-bits.  The 'flush'
- * parameter is exactly the same as that to deflate, with the following
- * meanings:
- *
- * Z_NO_FLUSH: normal incremental output of compressed data
- * Z_SYNC_FLUSH: do a SYNC_FLUSH, used by png_write_flush
- * Z_FINISH: this is the end of the input, do a Z_FINISH and clean up
- *
- * The routine manages the acquire and release of the png_ptr->zstream by
- * checking and (at the end) clearing png_ptr->zowner; it does some sanity
- * checks on the 'mode' flags while doing this.
- */
-void /* PRIVATE */
-png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,
-    png_alloc_size_t input_len, int flush)
-{
-   if (png_ptr->zowner != png_IDAT)
-   {
-      /* First time.   Ensure we have a temporary buffer for compression and
-       * trim the buffer list if it has more than one entry to free memory.
-       * If 'WRITE_COMPRESSED_TEXT' is not set the list will never have been
-       * created at this point, but the check here is quick and safe.
-       */
-      if (png_ptr->zbuffer_list == NULL)
-      {
-         png_ptr->zbuffer_list = png_voidcast(png_compression_bufferp,
-             png_malloc(png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
-         png_ptr->zbuffer_list->next = NULL;
-      }
-
-      else
-         png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list->next);
-
-      /* It is a terminal error if we can't claim the zstream. */
-      if (png_deflate_claim(png_ptr, png_IDAT, png_image_size(png_ptr)) != Z_OK)
-         png_error(png_ptr, png_ptr->zstream.msg);
-
-      /* The output state is maintained in png_ptr->zstream, so it must be
-       * initialized here after the claim.
-       */
-      png_ptr->zstream.next_out = png_ptr->zbuffer_list->output;
-      png_ptr->zstream.avail_out = png_ptr->zbuffer_size;
-   }
-
-   /* Now loop reading and writing until all the input is consumed or an error
-    * terminates the operation.  The _out values are maintained across calls to
-    * this function, but the input must be reset each time.
-    */
-   png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);
-   png_ptr->zstream.avail_in = 0; /* set below */
-   for (;;)
-   {
-      int ret;
-
-      /* INPUT: from the row data */
-      uInt avail = ZLIB_IO_MAX;
-
-      if (avail > input_len)
-         avail = (uInt)input_len; /* safe because of the check */
-
-      png_ptr->zstream.avail_in = avail;
-      input_len -= avail;
-
-      ret = deflate(&png_ptr->zstream, input_len > 0 ? Z_NO_FLUSH : flush);
-
-      /* Include as-yet unconsumed input */
-      input_len += png_ptr->zstream.avail_in;
-      png_ptr->zstream.avail_in = 0;
-
-      /* OUTPUT: write complete IDAT chunks when avail_out drops to zero. Note
-       * that these two zstream fields are preserved across the calls, therefore
-       * there is no need to set these up on entry to the loop.
-       */
-      if (png_ptr->zstream.avail_out == 0)
-      {
-         png_bytep data = png_ptr->zbuffer_list->output;
-         uInt size = png_ptr->zbuffer_size;
-
-         /* Write an IDAT containing the data then reset the buffer.  The
-          * first IDAT may need deflate header optimization.
-          */
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-            if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
-                png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
-               optimize_cmf(data, png_image_size(png_ptr));
-#endif
-
-         if (size > 0)
-            png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-         png_ptr->mode |= PNG_HAVE_IDAT;
-
-         png_ptr->zstream.next_out = data;
-         png_ptr->zstream.avail_out = size;
-
-         /* For SYNC_FLUSH or FINISH it is essential to keep calling zlib with
-          * the same flush parameter until it has finished output, for NO_FLUSH
-          * it doesn't matter.
-          */
-         if (ret == Z_OK && flush != Z_NO_FLUSH)
-            continue;
-      }
-
-      /* The order of these checks doesn't matter much; it just affects which
-       * possible error might be detected if multiple things go wrong at once.
-       */
-      if (ret == Z_OK) /* most likely return code! */
-      {
-         /* If all the input has been consumed then just return.  If Z_FINISH
-          * was used as the flush parameter something has gone wrong if we get
-          * here.
-          */
-         if (input_len == 0)
-         {
-            if (flush == Z_FINISH)
-               png_error(png_ptr, "Z_OK on Z_FINISH with output space");
-
-            return;
-         }
-      }
-
-      else if (ret == Z_STREAM_END && flush == Z_FINISH)
-      {
-         /* This is the end of the IDAT data; any pending output must be
-          * flushed.  For small PNG files we may still be at the beginning.
-          */
-         png_bytep data = png_ptr->zbuffer_list->output;
-         uInt size = png_ptr->zbuffer_size - png_ptr->zstream.avail_out;
-
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-         if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
-             png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
-            optimize_cmf(data, png_image_size(png_ptr));
-#endif
-
-         if (size > 0)
-            png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-         png_ptr->zstream.avail_out = 0;
-         png_ptr->zstream.next_out = NULL;
-         png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
-
-         png_ptr->zowner = 0; /* Release the stream */
-         return;
-      }
-
-      else
-      {
-         /* This is an error condition. */
-         png_zstream_error(png_ptr, ret);
-         png_error(png_ptr, png_ptr->zstream.msg);
-      }
-   }
-}
-
-/* Write an IEND chunk */
-void /* PRIVATE */
-png_write_IEND(png_structrp png_ptr)
-{
-   png_debug(1, "in png_write_IEND");
-
-   png_write_complete_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);
-   png_ptr->mode |= PNG_HAVE_IEND;
-}
-
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-/* Write a gAMA chunk */
-void /* PRIVATE */
-png_write_gAMA_fixed(png_structrp png_ptr, png_fixed_point file_gamma)
-{
-   png_byte buf[4];
-
-   png_debug(1, "in png_write_gAMA");
-
-   /* file_gamma is saved in 1/100,000ths */
-   png_save_uint_32(buf, (png_uint_32)file_gamma);
-   png_write_complete_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
-}
-#endif
-
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-/* Write a sRGB chunk */
-void /* PRIVATE */
-png_write_sRGB(png_structrp png_ptr, int srgb_intent)
-{
-   png_byte buf[1];
-
-   png_debug(1, "in png_write_sRGB");
-
-   if (srgb_intent >= PNG_sRGB_INTENT_LAST)
-      png_warning(png_ptr,
-          "Invalid sRGB rendering intent specified");
-
-   buf[0]=(png_byte)srgb_intent;
-   png_write_complete_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
-}
-#endif
-
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-/* Write an iCCP chunk */
-void /* PRIVATE */
-png_write_iCCP(png_structrp png_ptr, png_const_charp name,
-    png_const_bytep profile)
-{
-   png_uint_32 name_len;
-   png_uint_32 profile_len;
-   png_byte new_name[81]; /* 1 byte for the compression byte */
-   compression_state comp;
-   png_uint_32 temp;
-
-   png_debug(1, "in png_write_iCCP");
-
-   /* These are all internal problems: the profile should have been checked
-    * before when it was stored.
-    */
-   if (profile == NULL)
-      png_error(png_ptr, "No profile for iCCP chunk"); /* internal error */
-
-   profile_len = png_get_uint_32(profile);
-
-   if (profile_len < 132)
-      png_error(png_ptr, "ICC profile too short");
-
-   temp = (png_uint_32) (*(profile+8));
-   if (temp > 3 && (profile_len & 0x03))
-      png_error(png_ptr, "ICC profile length invalid (not a multiple of 4)");
-
-   {
-      png_uint_32 embedded_profile_len = png_get_uint_32(profile);
-
-      if (profile_len != embedded_profile_len)
-         png_error(png_ptr, "Profile length does not match profile");
-   }
-
-   name_len = png_check_keyword(png_ptr, name, new_name);
-
-   if (name_len == 0)
-      png_error(png_ptr, "iCCP: invalid keyword");
-
-   new_name[++name_len] = PNG_COMPRESSION_TYPE_BASE;
-
-   /* Make sure we include the NULL after the name and the compression type */
-   ++name_len;
-
-   png_text_compress_init(&comp, profile, profile_len);
-
-   /* Allow for keyword terminator and compression byte */
-   if (png_text_compress(png_ptr, png_iCCP, &comp, name_len) != Z_OK)
-      png_error(png_ptr, png_ptr->zstream.msg);
-
-   png_write_chunk_header(png_ptr, png_iCCP, name_len + comp.output_len);
-
-   png_write_chunk_data(png_ptr, new_name, name_len);
-
-   png_write_compressed_data_out(png_ptr, &comp);
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-/* Write a sPLT chunk */
-void /* PRIVATE */
-png_write_sPLT(png_structrp png_ptr, png_const_sPLT_tp spalette)
-{
-   png_uint_32 name_len;
-   png_byte new_name[80];
-   png_byte entrybuf[10];
-   png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);
-   png_size_t palette_size = entry_size * (png_size_t)spalette->nentries;
-   png_sPLT_entryp ep;
-#ifndef PNG_POINTER_INDEXING_SUPPORTED
-   int i;
-#endif
-
-   png_debug(1, "in png_write_sPLT");
-
-   name_len = png_check_keyword(png_ptr, spalette->name, new_name);
-
-   if (name_len == 0)
-      png_error(png_ptr, "sPLT: invalid keyword");
-
-   /* Make sure we include the NULL after the name */
-   png_write_chunk_header(png_ptr, png_sPLT,
-       (png_uint_32)(name_len + 2 + palette_size));
-
-   png_write_chunk_data(png_ptr, (png_bytep)new_name,
-       (png_size_t)(name_len + 1));
-
-   png_write_chunk_data(png_ptr, &spalette->depth, (png_size_t)1);
-
-   /* Loop through each palette entry, writing appropriately */
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (ep = spalette->entries; ep<spalette->entries + spalette->nentries; ep++)
-   {
-      if (spalette->depth == 8)
-      {
-         entrybuf[0] = (png_byte)ep->red;
-         entrybuf[1] = (png_byte)ep->green;
-         entrybuf[2] = (png_byte)ep->blue;
-         entrybuf[3] = (png_byte)ep->alpha;
-         png_save_uint_16(entrybuf + 4, ep->frequency);
-      }
-
-      else
-      {
-         png_save_uint_16(entrybuf + 0, ep->red);
-         png_save_uint_16(entrybuf + 2, ep->green);
-         png_save_uint_16(entrybuf + 4, ep->blue);
-         png_save_uint_16(entrybuf + 6, ep->alpha);
-         png_save_uint_16(entrybuf + 8, ep->frequency);
-      }
-
-      png_write_chunk_data(png_ptr, entrybuf, entry_size);
-   }
-#else
-   ep=spalette->entries;
-   for (i = 0; i>spalette->nentries; i++)
-   {
-      if (spalette->depth == 8)
-      {
-         entrybuf[0] = (png_byte)ep[i].red;
-         entrybuf[1] = (png_byte)ep[i].green;
-         entrybuf[2] = (png_byte)ep[i].blue;
-         entrybuf[3] = (png_byte)ep[i].alpha;
-         png_save_uint_16(entrybuf + 4, ep[i].frequency);
-      }
-
-      else
-      {
-         png_save_uint_16(entrybuf + 0, ep[i].red);
-         png_save_uint_16(entrybuf + 2, ep[i].green);
-         png_save_uint_16(entrybuf + 4, ep[i].blue);
-         png_save_uint_16(entrybuf + 6, ep[i].alpha);
-         png_save_uint_16(entrybuf + 8, ep[i].frequency);
-      }
-
-      png_write_chunk_data(png_ptr, entrybuf, entry_size);
-   }
-#endif
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-/* Write the sBIT chunk */
-void /* PRIVATE */
-png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type)
-{
-   png_byte buf[4];
-   png_size_t size;
-
-   png_debug(1, "in png_write_sBIT");
-
-   /* Make sure we don't depend upon the order of PNG_COLOR_8 */
-   if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
-   {
-      png_byte maxbits;
-
-      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :
-          png_ptr->usr_bit_depth);
-
-      if (sbit->red == 0 || sbit->red > maxbits ||
-          sbit->green == 0 || sbit->green > maxbits ||
-          sbit->blue == 0 || sbit->blue > maxbits)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[0] = sbit->red;
-      buf[1] = sbit->green;
-      buf[2] = sbit->blue;
-      size = 3;
-   }
-
-   else
-   {
-      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[0] = sbit->gray;
-      size = 1;
-   }
-
-   if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
-   {
-      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[size++] = sbit->alpha;
-   }
-
-   png_write_complete_chunk(png_ptr, png_sBIT, buf, size);
-}
-#endif
-
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-/* Write the cHRM chunk */
-void /* PRIVATE */
-png_write_cHRM_fixed(png_structrp png_ptr, const png_xy *xy)
-{
-   png_byte buf[32];
-
-   png_debug(1, "in png_write_cHRM");
-
-   /* Each value is saved in 1/100,000ths */
-   png_save_int_32(buf,      xy->whitex);
-   png_save_int_32(buf +  4, xy->whitey);
-
-   png_save_int_32(buf +  8, xy->redx);
-   png_save_int_32(buf + 12, xy->redy);
-
-   png_save_int_32(buf + 16, xy->greenx);
-   png_save_int_32(buf + 20, xy->greeny);
-
-   png_save_int_32(buf + 24, xy->bluex);
-   png_save_int_32(buf + 28, xy->bluey);
-
-   png_write_complete_chunk(png_ptr, png_cHRM, buf, 32);
-}
-#endif
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-/* Write the tRNS chunk */
-void /* PRIVATE */
-png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
-    png_const_color_16p tran, int num_trans, int color_type)
-{
-   png_byte buf[6];
-
-   png_debug(1, "in png_write_tRNS");
-
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
-      {
-         png_app_warning(png_ptr,
-             "Invalid number of transparent colors specified");
-         return;
-      }
-
-      /* Write the chunk out as it is */
-      png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha,
-          (png_size_t)num_trans);
-   }
-
-   else if (color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      /* One 16-bit value */
-      if (tran->gray >= (1 << png_ptr->bit_depth))
-      {
-         png_app_warning(png_ptr,
-             "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
-
-         return;
-      }
-
-      png_save_uint_16(buf, tran->gray);
-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
-   }
-
-   else if (color_type == PNG_COLOR_TYPE_RGB)
-   {
-      /* Three 16-bit values */
-      png_save_uint_16(buf, tran->red);
-      png_save_uint_16(buf + 2, tran->green);
-      png_save_uint_16(buf + 4, tran->blue);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
-#else
-      if ((buf[0] | buf[2] | buf[4]) != 0)
-#endif
-      {
-         png_app_warning(png_ptr,
-             "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
-         return;
-      }
-
-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
-   }
-
-   else
-   {
-      png_app_warning(png_ptr, "Can't write tRNS with an alpha channel");
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-/* Write the background chunk */
-void /* PRIVATE */
-png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type)
-{
-   png_byte buf[6];
-
-   png_debug(1, "in png_write_bKGD");
-
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-          (png_ptr->num_palette != 0 ||
-          (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0) &&
-#endif
-         back->index >= png_ptr->num_palette)
-      {
-         png_warning(png_ptr, "Invalid background palette index");
-         return;
-      }
-
-      buf[0] = back->index;
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
-   }
-
-   else if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
-   {
-      png_save_uint_16(buf, back->red);
-      png_save_uint_16(buf + 2, back->green);
-      png_save_uint_16(buf + 4, back->blue);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
-#else
-      if ((buf[0] | buf[2] | buf[4]) != 0)
-#endif
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write 16-bit bKGD chunk "
-             "when bit_depth is 8");
-
-         return;
-      }
-
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
-   }
-
-   else
-   {
-      if (back->gray >= (1 << png_ptr->bit_depth))
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");
-
-         return;
-      }
-
-      png_save_uint_16(buf, back->gray);
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_eXIf_SUPPORTED
-/* Write the Exif data */
-void /* PRIVATE */
-png_write_eXIf(png_structrp png_ptr, png_bytep exif, int num_exif)
-{
-   int i;
-   png_byte buf[1];
-
-   png_debug(1, "in png_write_eXIf");
-
-   png_write_chunk_header(png_ptr, png_eXIf, (png_uint_32)(num_exif));
-
-   for (i = 0; i < num_exif; i++)
-   {
-      buf[0] = exif[i];
-      png_write_chunk_data(png_ptr, buf, (png_size_t)1);
-   }
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-/* Write the histogram */
-void /* PRIVATE */
-png_write_hIST(png_structrp png_ptr, png_const_uint_16p hist, int num_hist)
-{
-   int i;
-   png_byte buf[3];
-
-   png_debug(1, "in png_write_hIST");
-
-   if (num_hist > (int)png_ptr->num_palette)
-   {
-      png_debug2(3, "num_hist = %d, num_palette = %d", num_hist,
-          png_ptr->num_palette);
-
-      png_warning(png_ptr, "Invalid number of histogram entries specified");
-      return;
-   }
-
-   png_write_chunk_header(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));
-
-   for (i = 0; i < num_hist; i++)
-   {
-      png_save_uint_16(buf, hist[i]);
-      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
-   }
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-/* Write a tEXt chunk */
-void /* PRIVATE */
-png_write_tEXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,
-    png_size_t text_len)
-{
-   png_uint_32 key_len;
-   png_byte new_key[80];
-
-   png_debug(1, "in png_write_tEXt");
-
-   key_len = png_check_keyword(png_ptr, key, new_key);
-
-   if (key_len == 0)
-      png_error(png_ptr, "tEXt: invalid keyword");
-
-   if (text == NULL || *text == '\0')
-      text_len = 0;
-
-   else
-      text_len = strlen(text);
-
-   if (text_len > PNG_UINT_31_MAX - (key_len+1))
-      png_error(png_ptr, "tEXt: text too long");
-
-   /* Make sure we include the 0 after the key */
-   png_write_chunk_header(png_ptr, png_tEXt,
-       (png_uint_32)/*checked above*/(key_len + text_len + 1));
-   /*
-    * We leave it to the application to meet PNG-1.0 requirements on the
-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-    */
-   png_write_chunk_data(png_ptr, new_key, key_len + 1);
-
-   if (text_len != 0)
-      png_write_chunk_data(png_ptr, (png_const_bytep)text, text_len);
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-/* Write a compressed text chunk */
-void /* PRIVATE */
-png_write_zTXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,
-    int compression)
-{
-   png_uint_32 key_len;
-   png_byte new_key[81];
-   compression_state comp;
-
-   png_debug(1, "in png_write_zTXt");
-
-   if (compression == PNG_TEXT_COMPRESSION_NONE)
-   {
-      png_write_tEXt(png_ptr, key, text, 0);
-      return;
-   }
-
-   if (compression != PNG_TEXT_COMPRESSION_zTXt)
-      png_error(png_ptr, "zTXt: invalid compression type");
-
-   key_len = png_check_keyword(png_ptr, key, new_key);
-
-   if (key_len == 0)
-      png_error(png_ptr, "zTXt: invalid keyword");
-
-   /* Add the compression method and 1 for the keyword separator. */
-   new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;
-   ++key_len;
-
-   /* Compute the compressed data; do it now for the length */
-   png_text_compress_init(&comp, (png_const_bytep)text,
-       text == NULL ? 0 : strlen(text));
-
-   if (png_text_compress(png_ptr, png_zTXt, &comp, key_len) != Z_OK)
-      png_error(png_ptr, png_ptr->zstream.msg);
-
-   /* Write start of chunk */
-   png_write_chunk_header(png_ptr, png_zTXt, key_len + comp.output_len);
-
-   /* Write key */
-   png_write_chunk_data(png_ptr, new_key, key_len);
-
-   /* Write the compressed data */
-   png_write_compressed_data_out(png_ptr, &comp);
-
-   /* Close the chunk */
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-/* Write an iTXt chunk */
-void /* PRIVATE */
-png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
-    png_const_charp lang, png_const_charp lang_key, png_const_charp text)
-{
-   png_uint_32 key_len, prefix_len;
-   png_size_t lang_len, lang_key_len;
-   png_byte new_key[82];
-   compression_state comp;
-
-   png_debug(1, "in png_write_iTXt");
-
-   key_len = png_check_keyword(png_ptr, key, new_key);
-
-   if (key_len == 0)
-      png_error(png_ptr, "iTXt: invalid keyword");
-
-   /* Set the compression flag */
-   switch (compression)
-   {
-      case PNG_ITXT_COMPRESSION_NONE:
-      case PNG_TEXT_COMPRESSION_NONE:
-         compression = new_key[++key_len] = 0; /* no compression */
-         break;
-
-      case PNG_TEXT_COMPRESSION_zTXt:
-      case PNG_ITXT_COMPRESSION_zTXt:
-         compression = new_key[++key_len] = 1; /* compressed */
-         break;
-
-      default:
-         png_error(png_ptr, "iTXt: invalid compression");
-   }
-
-   new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;
-   ++key_len; /* for the keywod separator */
-
-   /* We leave it to the application to meet PNG-1.0 requirements on the
-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG, however,
-    * specifies that the text is UTF-8 and this really doesn't require any
-    * checking.
-    *
-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-    *
-    * TODO: validate the language tag correctly (see the spec.)
-    */
-   if (lang == NULL) lang = ""; /* empty language is valid */
-   lang_len = strlen(lang)+1;
-   if (lang_key == NULL) lang_key = ""; /* may be empty */
-   lang_key_len = strlen(lang_key)+1;
-   if (text == NULL) text = ""; /* may be empty */
-
-   prefix_len = key_len;
-   if (lang_len > PNG_UINT_31_MAX-prefix_len)
-      prefix_len = PNG_UINT_31_MAX;
-   else
-      prefix_len = (png_uint_32)(prefix_len + lang_len);
-
-   if (lang_key_len > PNG_UINT_31_MAX-prefix_len)
-      prefix_len = PNG_UINT_31_MAX;
-   else
-      prefix_len = (png_uint_32)(prefix_len + lang_key_len);
-
-   png_text_compress_init(&comp, (png_const_bytep)text, strlen(text));
-
-   if (compression != 0)
-   {
-      if (png_text_compress(png_ptr, png_iTXt, &comp, prefix_len) != Z_OK)
-         png_error(png_ptr, png_ptr->zstream.msg);
-   }
-
-   else
-   {
-      if (comp.input_len > PNG_UINT_31_MAX-prefix_len)
-         png_error(png_ptr, "iTXt: uncompressed text too long");
-
-      /* So the string will fit in a chunk: */
-      comp.output_len = (png_uint_32)/*SAFE*/comp.input_len;
-   }
-
-   png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
-
-   png_write_chunk_data(png_ptr, new_key, key_len);
-
-   png_write_chunk_data(png_ptr, (png_const_bytep)lang, lang_len);
-
-   png_write_chunk_data(png_ptr, (png_const_bytep)lang_key, lang_key_len);
-
-   if (compression != 0)
-      png_write_compressed_data_out(png_ptr, &comp);
-
-   else
-      png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.output_len);
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-/* Write the oFFs chunk */
-void /* PRIVATE */
-png_write_oFFs(png_structrp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
-    int unit_type)
-{
-   png_byte buf[9];
-
-   png_debug(1, "in png_write_oFFs");
-
-   if (unit_type >= PNG_OFFSET_LAST)
-      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
-
-   png_save_int_32(buf, x_offset);
-   png_save_int_32(buf + 4, y_offset);
-   buf[8] = (png_byte)unit_type;
-
-   png_write_complete_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
-}
-#endif
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-/* Write the pCAL chunk (described in the PNG extensions document) */
-void /* PRIVATE */
-png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
-    png_int_32 X1, int type, int nparams, png_const_charp units,
-    png_charpp params)
-{
-   png_uint_32 purpose_len;
-   png_size_t units_len, total_len;
-   png_size_tp params_len;
-   png_byte buf[10];
-   png_byte new_purpose[80];
-   int i;
-
-   png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);
-
-   if (type >= PNG_EQUATION_LAST)
-      png_error(png_ptr, "Unrecognized equation type for pCAL chunk");
-
-   purpose_len = png_check_keyword(png_ptr, purpose, new_purpose);
-
-   if (purpose_len == 0)
-      png_error(png_ptr, "pCAL: invalid keyword");
-
-   ++purpose_len; /* terminator */
-
-   png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);
-   units_len = strlen(units) + (nparams == 0 ? 0 : 1);
-   png_debug1(3, "pCAL units length = %d", (int)units_len);
-   total_len = purpose_len + units_len + 10;
-
-   params_len = (png_size_tp)png_malloc(png_ptr,
-       (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (png_size_t))));
-
-   /* Find the length of each parameter, making sure we don't count the
-    * null terminator for the last parameter.
-    */
-   for (i = 0; i < nparams; i++)
-   {
-      params_len[i] = strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
-      png_debug2(3, "pCAL parameter %d length = %lu", i,
-          (unsigned long)params_len[i]);
-      total_len += params_len[i];
-   }
-
-   png_debug1(3, "pCAL total length = %d", (int)total_len);
-   png_write_chunk_header(png_ptr, png_pCAL, (png_uint_32)total_len);
-   png_write_chunk_data(png_ptr, new_purpose, purpose_len);
-   png_save_int_32(buf, X0);
-   png_save_int_32(buf + 4, X1);
-   buf[8] = (png_byte)type;
-   buf[9] = (png_byte)nparams;
-   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
-   png_write_chunk_data(png_ptr, (png_const_bytep)units, (png_size_t)units_len);
-
-   for (i = 0; i < nparams; i++)
-   {
-      png_write_chunk_data(png_ptr, (png_const_bytep)params[i], params_len[i]);
-   }
-
-   png_free(png_ptr, params_len);
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-/* Write the sCAL chunk */
-void /* PRIVATE */
-png_write_sCAL_s(png_structrp png_ptr, int unit, png_const_charp width,
-    png_const_charp height)
-{
-   png_byte buf[64];
-   png_size_t wlen, hlen, total_len;
-
-   png_debug(1, "in png_write_sCAL_s");
-
-   wlen = strlen(width);
-   hlen = strlen(height);
-   total_len = wlen + hlen + 2;
-
-   if (total_len > 64)
-   {
-      png_warning(png_ptr, "Can't write sCAL (buffer too small)");
-      return;
-   }
-
-   buf[0] = (png_byte)unit;
-   memcpy(buf + 1, width, wlen + 1);      /* Append the '\0' here */
-   memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */
-
-   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
-   png_write_complete_chunk(png_ptr, png_sCAL, buf, total_len);
-}
-#endif
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-/* Write the pHYs chunk */
-void /* PRIVATE */
-png_write_pHYs(png_structrp png_ptr, png_uint_32 x_pixels_per_unit,
-    png_uint_32 y_pixels_per_unit,
-    int unit_type)
-{
-   png_byte buf[9];
-
-   png_debug(1, "in png_write_pHYs");
-
-   if (unit_type >= PNG_RESOLUTION_LAST)
-      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
-
-   png_save_uint_32(buf, x_pixels_per_unit);
-   png_save_uint_32(buf + 4, y_pixels_per_unit);
-   buf[8] = (png_byte)unit_type;
-
-   png_write_complete_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
-}
-#endif
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-/* Write the tIME chunk.  Use either png_convert_from_struct_tm()
- * or png_convert_from_time_t(), or fill in the structure yourself.
- */
-void /* PRIVATE */
-png_write_tIME(png_structrp png_ptr, png_const_timep mod_time)
-{
-   png_byte buf[7];
-
-   png_debug(1, "in png_write_tIME");
-
-   if (mod_time->month  > 12 || mod_time->month  < 1 ||
-       mod_time->day    > 31 || mod_time->day    < 1 ||
-       mod_time->hour   > 23 || mod_time->second > 60)
-   {
-      png_warning(png_ptr, "Invalid time specified for tIME chunk");
-      return;
-   }
-
-   png_save_uint_16(buf, mod_time->year);
-   buf[2] = mod_time->month;
-   buf[3] = mod_time->day;
-   buf[4] = mod_time->hour;
-   buf[5] = mod_time->minute;
-   buf[6] = mod_time->second;
-
-   png_write_complete_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
-}
-#endif
-
-/* Initializes the row writing capability of libpng */
-void /* PRIVATE */
-png_write_start_row(png_structrp png_ptr)
-{
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   png_alloc_size_t buf_size;
-   int usr_pixel_depth;
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_byte filters;
-#endif
-
-   png_debug(1, "in png_write_start_row");
-
-   usr_pixel_depth = png_ptr->usr_channels * png_ptr->usr_bit_depth;
-   buf_size = PNG_ROWBYTES(usr_pixel_depth, png_ptr->width) + 1;
-
-   /* 1.5.6: added to allow checking in the row write code. */
-   png_ptr->transformed_pixel_depth = png_ptr->pixel_depth;
-   png_ptr->maximum_pixel_depth = (png_byte)usr_pixel_depth;
-
-   /* Set up row buffer */
-   png_ptr->row_buf = png_voidcast(png_bytep, png_malloc(png_ptr, buf_size));
-
-   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   filters = png_ptr->do_filter;
-
-   if (png_ptr->height == 1)
-      filters &= 0xff & ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);
-
-   if (png_ptr->width == 1)
-      filters &= 0xff & ~(PNG_FILTER_SUB|PNG_FILTER_AVG|PNG_FILTER_PAETH);
-
-   if (filters == 0)
-      filters = PNG_FILTER_NONE;
-
-   png_ptr->do_filter = filters;
-
-   if (((filters & (PNG_FILTER_SUB | PNG_FILTER_UP | PNG_FILTER_AVG |
-       PNG_FILTER_PAETH)) != 0) && png_ptr->try_row == NULL)
-   {
-      int num_filters = 0;
-
-      png_ptr->try_row = png_voidcast(png_bytep, png_malloc(png_ptr, buf_size));
-
-      if (filters & PNG_FILTER_SUB)
-         num_filters++;
-
-      if (filters & PNG_FILTER_UP)
-         num_filters++;
-
-      if (filters & PNG_FILTER_AVG)
-         num_filters++;
-
-      if (filters & PNG_FILTER_PAETH)
-         num_filters++;
-
-      if (num_filters > 1)
-         png_ptr->tst_row = png_voidcast(png_bytep, png_malloc(png_ptr,
-             buf_size));
-   }
-
-   /* We only need to keep the previous row if we are using one of the following
-    * filters.
-    */
-   if ((filters & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) != 0)
-      png_ptr->prev_row = png_voidcast(png_bytep,
-          png_calloc(png_ptr, buf_size));
-#endif /* WRITE_FILTER */
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced, we need to set up width and height of pass */
-   if (png_ptr->interlaced != 0)
-   {
-      if ((png_ptr->transformations & PNG_INTERLACE) == 0)
-      {
-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
-             png_pass_ystart[0]) / png_pass_yinc[0];
-
-         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
-             png_pass_start[0]) / png_pass_inc[0];
-      }
-
-      else
-      {
-         png_ptr->num_rows = png_ptr->height;
-         png_ptr->usr_width = png_ptr->width;
-      }
-   }
-
-   else
-#endif
-   {
-      png_ptr->num_rows = png_ptr->height;
-      png_ptr->usr_width = png_ptr->width;
-   }
-}
-
-/* Internal use only.  Called when finished processing a row of data. */
-void /* PRIVATE */
-png_write_finish_row(png_structrp png_ptr)
-{
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   png_debug(1, "in png_write_finish_row");
-
-   /* Next row */
-   png_ptr->row_number++;
-
-   /* See if we are done */
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced, go to next pass */
-   if (png_ptr->interlaced != 0)
-   {
-      png_ptr->row_number = 0;
-      if ((png_ptr->transformations & PNG_INTERLACE) != 0)
-      {
-         png_ptr->pass++;
-      }
-
-      else
-      {
-         /* Loop until we find a non-zero width or height pass */
-         do
-         {
-            png_ptr->pass++;
-
-            if (png_ptr->pass >= 7)
-               break;
-
-            png_ptr->usr_width = (png_ptr->width +
-                png_pass_inc[png_ptr->pass] - 1 -
-                png_pass_start[png_ptr->pass]) /
-                png_pass_inc[png_ptr->pass];
-
-            png_ptr->num_rows = (png_ptr->height +
-                png_pass_yinc[png_ptr->pass] - 1 -
-                png_pass_ystart[png_ptr->pass]) /
-                png_pass_yinc[png_ptr->pass];
-
-            if ((png_ptr->transformations & PNG_INTERLACE) != 0)
-               break;
-
-         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
-
-      }
-
-      /* Reset the row above the image for the next pass */
-      if (png_ptr->pass < 7)
-      {
-         if (png_ptr->prev_row != NULL)
-            memset(png_ptr->prev_row, 0,
-                (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
-                png_ptr->usr_bit_depth, png_ptr->width)) + 1);
-
-         return;
-      }
-   }
-#endif
-
-   /* If we get here, we've just written the last row, so we need
-      to flush the compressor */
-   png_compress_IDAT(png_ptr, NULL, 0, Z_FINISH);
-}
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-/* Pick out the correct pixels for the interlace pass.
- * The basic idea here is to go through the row with a source
- * pointer and a destination pointer (sp and dp), and copy the
- * correct pixels for the pass.  As the row gets compacted,
- * sp will always be >= dp, so we should never overwrite anything.
- * See the default: case for the easiest code to understand.
- */
-void /* PRIVATE */
-png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte  png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   png_debug(1, "in png_do_write_interlace");
-
-   /* We don't have to do anything on the last pass (6) */
-   if (pass < 6)
-   {
-      /* Each pixel depth is handled separately */
-      switch (row_info->pixel_depth)
-      {
-         case 1:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            unsigned int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            d = 0;
-            shift = 7;
-
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 3);
-               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 7;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift--;
-
-            }
-            if (shift != 7)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            unsigned int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            shift = 6;
-            d = 0;
-
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 2);
-               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 6;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift -= 2;
-            }
-            if (shift != 6)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            unsigned int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            shift = 4;
-            d = 0;
-            for (i = png_pass_start[pass]; i < row_width;
-                i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 1);
-               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 4;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift -= 4;
-            }
-            if (shift != 4)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         default:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-            png_size_t pixel_bytes;
-
-            /* Start at the beginning */
-            dp = row;
-
-            /* Find out how many bytes each pixel takes up */
-            pixel_bytes = (row_info->pixel_depth >> 3);
-
-            /* Loop through the row, only looking at the pixels that matter */
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               /* Find out where the original pixel is */
-               sp = row + (png_size_t)i * pixel_bytes;
-
-               /* Move the pixel */
-               if (dp != sp)
-                  memcpy(dp, sp, pixel_bytes);
-
-               /* Next pixel */
-               dp += pixel_bytes;
-            }
-            break;
-         }
-      }
-      /* Set new row width */
-      row_info->width = (row_info->width +
-          png_pass_inc[pass] - 1 -
-          png_pass_start[pass]) /
-          png_pass_inc[pass];
-
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-          row_info->width);
-   }
-}
-#endif
-
-
-/* This filters the row, chooses which filter to use, if it has not already
- * been specified by the application, and then writes the row out with the
- * chosen filter.
- */
-static void /* PRIVATE */
-png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
-    png_size_t row_bytes);
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-static png_size_t /* PRIVATE */
-png_setup_sub_row(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes, const png_size_t lmins)
-{
-   png_bytep rp, dp, lp;
-   png_size_t i;
-   png_size_t sum = 0;
-   unsigned int v;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1; i < bpp;
-        i++, rp++, dp++)
-   {
-      v = *dp = *rp;
-#ifdef PNG_USE_ABS
-      sum += 128 - abs((int)v - 128);
-#else
-      sum += (v < 128) ? v : 256 - v;
-#endif
-   }
-
-   for (lp = png_ptr->row_buf + 1; i < row_bytes;
-      i++, rp++, lp++, dp++)
-   {
-      v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-#ifdef PNG_USE_ABS
-      sum += 128 - abs((int)v - 128);
-#else
-      sum += (v < 128) ? v : 256 - v;
-#endif
-
-      if (sum > lmins)  /* We are already worse, don't continue. */
-        break;
-   }
-
-   return (sum);
-}
-
-static void /* PRIVATE */
-png_setup_sub_row_only(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes)
-{
-   png_bytep rp, dp, lp;
-   png_size_t i;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1; i < bpp;
-        i++, rp++, dp++)
-   {
-      *dp = *rp;
-   }
-
-   for (lp = png_ptr->row_buf + 1; i < row_bytes;
-      i++, rp++, lp++, dp++)
-   {
-      *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-   }
-}
-
-static png_size_t /* PRIVATE */
-png_setup_up_row(png_structrp png_ptr, const png_size_t row_bytes,
-    const png_size_t lmins)
-{
-   png_bytep rp, dp, pp;
-   png_size_t i;
-   png_size_t sum = 0;
-   unsigned int v;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
-       pp = png_ptr->prev_row + 1; i < row_bytes;
-       i++, rp++, pp++, dp++)
-   {
-      v = *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
-#ifdef PNG_USE_ABS
-      sum += 128 - abs((int)v - 128);
-#else
-      sum += (v < 128) ? v : 256 - v;
-#endif
-
-      if (sum > lmins)  /* We are already worse, don't continue. */
-        break;
-   }
-
-   return (sum);
-}
-static void /* PRIVATE */
-png_setup_up_row_only(png_structrp png_ptr, const png_size_t row_bytes)
-{
-   png_bytep rp, dp, pp;
-   png_size_t i;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
-       pp = png_ptr->prev_row + 1; i < row_bytes;
-       i++, rp++, pp++, dp++)
-   {
-      *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
-   }
-}
-
-static png_size_t /* PRIVATE */
-png_setup_avg_row(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes, const png_size_t lmins)
-{
-   png_bytep rp, dp, pp, lp;
-   png_uint_32 i;
-   png_size_t sum = 0;
-   unsigned int v;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
-       pp = png_ptr->prev_row + 1; i < bpp; i++)
-   {
-      v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
-
-#ifdef PNG_USE_ABS
-      sum += 128 - abs((int)v - 128);
-#else
-      sum += (v < 128) ? v : 256 - v;
-#endif
-   }
-
-   for (lp = png_ptr->row_buf + 1; i < row_bytes; i++)
-   {
-      v = *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
-          & 0xff);
-
-#ifdef PNG_USE_ABS
-      sum += 128 - abs((int)v - 128);
-#else
-      sum += (v < 128) ? v : 256 - v;
-#endif
-
-      if (sum > lmins)  /* We are already worse, don't continue. */
-        break;
-   }
-
-   return (sum);
-}
-static void /* PRIVATE */
-png_setup_avg_row_only(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes)
-{
-   png_bytep rp, dp, pp, lp;
-   png_uint_32 i;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
-       pp = png_ptr->prev_row + 1; i < bpp; i++)
-   {
-      *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
-   }
-
-   for (lp = png_ptr->row_buf + 1; i < row_bytes; i++)
-   {
-      *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
-          & 0xff);
-   }
-}
-
-static png_size_t /* PRIVATE */
-png_setup_paeth_row(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes, const png_size_t lmins)
-{
-   png_bytep rp, dp, pp, cp, lp;
-   png_size_t i;
-   png_size_t sum = 0;
-   unsigned int v;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
-       pp = png_ptr->prev_row + 1; i < bpp; i++)
-   {
-      v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-
-#ifdef PNG_USE_ABS
-      sum += 128 - abs((int)v - 128);
-#else
-      sum += (v < 128) ? v : 256 - v;
-#endif
-   }
-
-   for (lp = png_ptr->row_buf + 1, cp = png_ptr->prev_row + 1; i < row_bytes;
-        i++)
-   {
-      int a, b, c, pa, pb, pc, p;
-
-      b = *pp++;
-      c = *cp++;
-      a = *lp++;
-
-      p = b - c;
-      pc = a - c;
-
-#ifdef PNG_USE_ABS
-      pa = abs(p);
-      pb = abs(pc);
-      pc = abs(p + pc);
-#else
-      pa = p < 0 ? -p : p;
-      pb = pc < 0 ? -pc : pc;
-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-      p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-
-      v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-
-#ifdef PNG_USE_ABS
-      sum += 128 - abs((int)v - 128);
-#else
-      sum += (v < 128) ? v : 256 - v;
-#endif
-
-      if (sum > lmins)  /* We are already worse, don't continue. */
-        break;
-   }
-
-   return (sum);
-}
-static void /* PRIVATE */
-png_setup_paeth_row_only(png_structrp png_ptr, const png_uint_32 bpp,
-    const png_size_t row_bytes)
-{
-   png_bytep rp, dp, pp, cp, lp;
-   png_size_t i;
-
-   png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;
-
-   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
-       pp = png_ptr->prev_row + 1; i < bpp; i++)
-   {
-      *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-   }
-
-   for (lp = png_ptr->row_buf + 1, cp = png_ptr->prev_row + 1; i < row_bytes;
-        i++)
-   {
-      int a, b, c, pa, pb, pc, p;
-
-      b = *pp++;
-      c = *cp++;
-      a = *lp++;
-
-      p = b - c;
-      pc = a - c;
-
-#ifdef PNG_USE_ABS
-      pa = abs(p);
-      pb = abs(pc);
-      pc = abs(p + pc);
-#else
-      pa = p < 0 ? -p : p;
-      pb = pc < 0 ? -pc : pc;
-      pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-      p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-
-      *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-   }
-}
-#endif /* WRITE_FILTER */
-
-void /* PRIVATE */
-png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
-{
-#ifndef PNG_WRITE_FILTER_SUPPORTED
-   png_write_filtered_row(png_ptr, png_ptr->row_buf, row_info->rowbytes+1);
-#else
-   unsigned int filter_to_do = png_ptr->do_filter;
-   png_bytep row_buf;
-   png_bytep best_row;
-   png_uint_32 bpp;
-   png_size_t mins;
-   png_size_t row_bytes = row_info->rowbytes;
-
-   png_debug(1, "in png_write_find_filter");
-
-   /* Find out how many bytes offset each pixel is */
-   bpp = (row_info->pixel_depth + 7) >> 3;
-
-   row_buf = png_ptr->row_buf;
-   mins = PNG_SIZE_MAX - 256/* so we can detect potential overflow of the
-                               running sum */;
-
-   /* The prediction method we use is to find which method provides the
-    * smallest value when summing the absolute values of the distances
-    * from zero, using anything >= 128 as negative numbers.  This is known
-    * as the "minimum sum of absolute differences" heuristic.  Other
-    * heuristics are the "weighted minimum sum of absolute differences"
-    * (experimental and can in theory improve compression), and the "zlib
-    * predictive" method (not implemented yet), which does test compressions
-    * of lines using different filter methods, and then chooses the
-    * (series of) filter(s) that give minimum compressed data size (VERY
-    * computationally expensive).
-    *
-    * GRR 980525:  consider also
-    *
-    *   (1) minimum sum of absolute differences from running average (i.e.,
-    *       keep running sum of non-absolute differences & count of bytes)
-    *       [track dispersion, too?  restart average if dispersion too large?]
-    *
-    *  (1b) minimum sum of absolute differences from sliding average, probably
-    *       with window size <= deflate window (usually 32K)
-    *
-    *   (2) minimum sum of squared differences from zero or running average
-    *       (i.e., ~ root-mean-square approach)
-    */
-
-
-   /* We don't need to test the 'no filter' case if this is the only filter
-    * that has been chosen, as it doesn't actually do anything to the data.
-    */
-   best_row = png_ptr->row_buf;
-
-   if (PNG_SIZE_MAX/128 <= row_bytes)
-   {
-      /* Overflow can occur in the calculation, just select the lowest set
-       * filter.
-       */
-      filter_to_do &= 0U-filter_to_do;
-   }
-   else if ((filter_to_do & PNG_FILTER_NONE) != 0 &&
-         filter_to_do != PNG_FILTER_NONE)
-   {
-      /* Overflow not possible and multiple filters in the list, including the
-       * 'none' filter.
-       */
-      png_bytep rp;
-      png_size_t sum = 0;
-      png_size_t i;
-      unsigned int v;
-
-      {
-         for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
-         {
-            v = *rp;
-#ifdef PNG_USE_ABS
-            sum += 128 - abs((int)v - 128);
-#else
-            sum += (v < 128) ? v : 256 - v;
-#endif
-         }
-      }
-
-      mins = sum;
-   }
-
-   /* Sub filter */
-   if (filter_to_do == PNG_FILTER_SUB)
-   /* It's the only filter so no testing is needed */
-   {
-      png_setup_sub_row_only(png_ptr, bpp, row_bytes);
-      best_row = png_ptr->try_row;
-   }
-
-   else if ((filter_to_do & PNG_FILTER_SUB) != 0)
-   {
-      png_size_t sum;
-      png_size_t lmins = mins;
-
-      sum = png_setup_sub_row(png_ptr, bpp, row_bytes, lmins);
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->try_row;
-         if (png_ptr->tst_row != NULL)
-         {
-            png_ptr->try_row = png_ptr->tst_row;
-            png_ptr->tst_row = best_row;
-         }
-      }
-   }
-
-   /* Up filter */
-   if (filter_to_do == PNG_FILTER_UP)
-   {
-      png_setup_up_row_only(png_ptr, row_bytes);
-      best_row = png_ptr->try_row;
-   }
-
-   else if ((filter_to_do & PNG_FILTER_UP) != 0)
-   {
-      png_size_t sum;
-      png_size_t lmins = mins;
-
-      sum = png_setup_up_row(png_ptr, row_bytes, lmins);
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->try_row;
-         if (png_ptr->tst_row != NULL)
-         {
-            png_ptr->try_row = png_ptr->tst_row;
-            png_ptr->tst_row = best_row;
-         }
-      }
-   }
-
-   /* Avg filter */
-   if (filter_to_do == PNG_FILTER_AVG)
-   {
-      png_setup_avg_row_only(png_ptr, bpp, row_bytes);
-      best_row = png_ptr->try_row;
-   }
-
-   else if ((filter_to_do & PNG_FILTER_AVG) != 0)
-   {
-      png_size_t sum;
-      png_size_t lmins = mins;
-
-      sum= png_setup_avg_row(png_ptr, bpp, row_bytes, lmins);
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->try_row;
-         if (png_ptr->tst_row != NULL)
-         {
-            png_ptr->try_row = png_ptr->tst_row;
-            png_ptr->tst_row = best_row;
-         }
-      }
-   }
-
-   /* Paeth filter */
-   if (filter_to_do == PNG_FILTER_PAETH)
-   {
-      png_setup_paeth_row_only(png_ptr, bpp, row_bytes);
-      best_row = png_ptr->try_row;
-   }
-
-   else if ((filter_to_do & PNG_FILTER_PAETH) != 0)
-   {
-      png_size_t sum;
-      png_size_t lmins = mins;
-
-      sum = png_setup_paeth_row(png_ptr, bpp, row_bytes, lmins);
-
-      if (sum < mins)
-      {
-         best_row = png_ptr->try_row;
-         if (png_ptr->tst_row != NULL)
-         {
-            png_ptr->try_row = png_ptr->tst_row;
-            png_ptr->tst_row = best_row;
-         }
-      }
-   }
-
-   /* Do the actual writing of the filtered row data from the chosen filter. */
-   png_write_filtered_row(png_ptr, best_row, row_info->rowbytes+1);
-
-#endif /* WRITE_FILTER */
-}
-
-
-/* Do the actual writing of a previously filtered row. */
-static void
-png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
-    png_size_t full_row_length/*includes filter byte*/)
-{
-   png_debug(1, "in png_write_filtered_row");
-
-   png_debug1(2, "filter = %d", filtered_row[0]);
-
-   png_compress_IDAT(png_ptr, filtered_row, full_row_length, Z_NO_FLUSH);
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   /* Swap the current and previous rows */
-   if (png_ptr->prev_row != NULL)
-   {
-      png_bytep tptr;
-
-      tptr = png_ptr->prev_row;
-      png_ptr->prev_row = png_ptr->row_buf;
-      png_ptr->row_buf = tptr;
-   }
-#endif /* WRITE_FILTER */
-
-   /* Finish row - updates counters and flushes zlib if last row */
-   png_write_finish_row(png_ptr);
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_ptr->flush_rows++;
-
-   if (png_ptr->flush_dist > 0 &&
-       png_ptr->flush_rows >= png_ptr->flush_dist)
-   {
-      png_write_flush(png_ptr);
-   }
-#endif /* WRITE_FLUSH */
-}
-#endif /* WRITE */
diff --git a/src/png/libpng/powerpc/filter_vsx_intrinsics.c b/src/png/libpng/powerpc/filter_vsx_intrinsics.c
deleted file mode 100644
index e3de496bd..000000000
--- a/src/png/libpng/powerpc/filter_vsx_intrinsics.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* filter_vsx_intrinsics.c - PowerPC optimised filter functions
- *
- * Copyright (c) 2017 Glenn Randers-Pehrson
- * Written by Vadim Barkov, 2017.
- * Last changed in libpng 1.6.29 [March 16, 2017]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-#include <stdio.h>
-#include <stdint.h>
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* This code requires -maltivec and -mvsx on the command line: */
-#if PNG_POWERPC_VSX_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
-
-#include <altivec.h>
-
-#if PNG_POWERPC_VSX_OPT > 0
-
-#ifndef __VSX__
-#  error "This code requires VSX support (POWER7 and later). Please provide -mvsx compiler flag."
-#endif
-
-#define vec_ld_unaligned(vec,data) vec = vec_vsx_ld(0,data)
-#define vec_st_unaligned(vec,data) vec_vsx_st(vec,0,data)
-
-
-/* Functions in this file look at most 3 pixels (a,b,c) to predict the 4th (d).
- * They're positioned like this:
- *    prev:  c b
- *    row:   a d
- * The Sub filter predicts d=a, Avg d=(a+b)/2, and Paeth predicts d to be
- * whichever of a, b, or c is closest to p=a+b-c.
- * ( this is taken from ../intel/filter_sse2_intrinsics.c )
- */
-
-#define vsx_declare_common_vars(row_info,row,prev_row,offset) \
-   png_byte i;\
-   png_bytep rp = row + offset;\
-   png_const_bytep pp = prev_row;\
-   png_size_t unaligned_top = 16 - (((png_size_t)rp % 16));\
-   png_size_t istop;\
-   if(unaligned_top == 16)\
-      unaligned_top = 0;\
-   istop = row_info->rowbytes;\
-   if((unaligned_top < istop))\
-      istop -= unaligned_top;\
-   else{\
-      unaligned_top = istop;\
-      istop = 0;\
-   }
-
-void png_read_filter_row_up_vsx(png_row_infop row_info, png_bytep row,
-                                png_const_bytep prev_row)
-{
-   vector unsigned char rp_vec;
-   vector unsigned char pp_vec;
-   vsx_declare_common_vars(row_info,row,prev_row,0)
-
-   /* Altivec operations require 16-byte aligned data
-    * but input can be unaligned. So we calculate
-    * unaligned part as usual.
-    */
-   for (i = 0; i < unaligned_top; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-      rp++;
-   }
-
-   /* Using SIMD while we can */
-   while( istop >= 16 )
-   {
-      rp_vec = vec_ld(0,rp);
-      vec_ld_unaligned(pp_vec,pp);
-
-      rp_vec = vec_add(rp_vec,pp_vec);
-
-      vec_st(rp_vec,0,rp);
-
-      pp += 16;
-      rp += 16;
-      istop -= 16;
-   }
-
-   if(istop > 0)
-   {
-      /* If byte count of row is not divisible by 16
-       * we will process remaining part as usual
-       */
-      for (i = 0; i < istop; i++)
-      {
-         *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-         rp++;
-      }
-}
-
-}
-
-static const vector unsigned char VSX_LEFTSHIFTED1_4 = {16,16,16,16, 0, 1, 2, 3,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_LEFTSHIFTED2_4 = {16,16,16,16,16,16,16,16, 4, 5, 6, 7,16,16,16,16};
-static const vector unsigned char VSX_LEFTSHIFTED3_4 = {16,16,16,16,16,16,16,16,16,16,16,16, 8, 9,10,11};
-
-static const vector unsigned char VSX_LEFTSHIFTED1_3 = {16,16,16, 0, 1, 2,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_LEFTSHIFTED2_3 = {16,16,16,16,16,16, 3, 4, 5,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_LEFTSHIFTED3_3 = {16,16,16,16,16,16,16,16,16, 6, 7, 8,16,16,16,16};
-static const vector unsigned char VSX_LEFTSHIFTED4_3 = {16,16,16,16,16,16,16,16,16,16,16,16, 9,10,11,16};
-
-static const vector unsigned char VSX_NOT_SHIFTED1_4 = {16,16,16,16, 4, 5, 6, 7,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_NOT_SHIFTED2_4 = {16,16,16,16,16,16,16,16, 8, 9,10,11,16,16,16,16};
-static const vector unsigned char VSX_NOT_SHIFTED3_4 = {16,16,16,16,16,16,16,16,16,16,16,16,12,13,14,15};
-
-static const vector unsigned char VSX_NOT_SHIFTED1_3 = {16,16,16, 3, 4, 5,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_NOT_SHIFTED2_3 = {16,16,16,16,16,16, 6, 7, 8,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_NOT_SHIFTED3_3 = {16,16,16,16,16,16,16,16,16, 9,10,11,16,16,16,16};
-static const vector unsigned char VSX_NOT_SHIFTED4_3 = {16,16,16,16,16,16,16,16,16,16,16,16,12,13,14,16};
-
-static const vector unsigned char VSX_CHAR_ZERO = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-#ifdef __LITTLE_ENDIAN__
-
-static const vector unsigned char VSX_CHAR_TO_SHORT1_4 = { 4,16, 5,16, 6,16, 7,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT2_4 = { 8,16, 9,16,10,16,11,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT3_4 = {12,16,13,16,14,16,15,16,16,16,16,16,16,16,16,16};
-
-static const vector unsigned char VSX_SHORT_TO_CHAR1_4 = {16,16,16,16, 0, 2, 4, 6,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR2_4 = {16,16,16,16,16,16,16,16, 0, 2, 4, 6,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR3_4 = {16,16,16,16,16,16,16,16,16,16,16,16, 0, 2, 4, 6};
-
-static const vector unsigned char VSX_CHAR_TO_SHORT1_3 = { 3,16, 4,16, 5,16,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT2_3 = { 6,16, 7,16, 8,16,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT3_3 = { 9,16,10,16,11,16,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT4_3 = {12,16,13,16,14,16,16,16,16,16,16,16,16,16,16,16};
-
-static const vector unsigned char VSX_SHORT_TO_CHAR1_3 = {16,16,16, 0, 2, 4,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR2_3 = {16,16,16,16,16,16, 0, 2, 4,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR3_3 = {16,16,16,16,16,16,16,16,16, 0, 2, 4,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR4_3 = {16,16,16,16,16,16,16,16,16,16,16,16, 0, 2, 4,16};
-
-#elif defined(__BIG_ENDIAN__)
-
-static const vector unsigned char VSX_CHAR_TO_SHORT1_4 = {16, 4,16, 5,16, 6,16, 7,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT2_4 = {16, 8,16, 9,16,10,16,11,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT3_4 = {16,12,16,13,16,14,16,15,16,16,16,16,16,16,16,16};
-
-static const vector unsigned char VSX_SHORT_TO_CHAR1_4 = {16,16,16,16, 1, 3, 5, 7,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR2_4 = {16,16,16,16,16,16,16,16, 1, 3, 5, 7,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR3_4 = {16,16,16,16,16,16,16,16,16,16,16,16, 1, 3, 5, 7};
-
-static const vector unsigned char VSX_CHAR_TO_SHORT1_3 = {16, 3,16, 4,16, 5,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT2_3 = {16, 6,16, 7,16, 8,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT3_3 = {16, 9,16,10,16,11,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_CHAR_TO_SHORT4_3 = {16,12,16,13,16,14,16,16,16,16,16,16,16,16,16,16};
-
-static const vector unsigned char VSX_SHORT_TO_CHAR1_3 = {16,16,16, 1, 3, 5,16,16,16,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR2_3 = {16,16,16,16,16,16, 1, 3, 5,16,16,16,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR3_3 = {16,16,16,16,16,16,16,16,16, 1, 3, 5,16,16,16,16};
-static const vector unsigned char VSX_SHORT_TO_CHAR4_3 = {16,16,16,16,16,16,16,16,16,16,16,16, 1, 3, 5,16};
-
-#endif
-
-#define vsx_char_to_short(vec,offset,bpp) (vector unsigned short)vec_perm((vec),VSX_CHAR_ZERO,VSX_CHAR_TO_SHORT##offset##_##bpp)
-#define vsx_short_to_char(vec,offset,bpp) vec_perm(((vector unsigned char)(vec)),VSX_CHAR_ZERO,VSX_SHORT_TO_CHAR##offset##_##bpp)
-
-#ifdef PNG_USE_ABS
-#  define vsx_abs(number) abs(number)
-#else
-#  define vsx_abs(number) (number > 0) ? (number) : -(number)
-#endif
-
-void png_read_filter_row_sub4_vsx(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   const png_byte bpp = 4;
-
-   vector unsigned char rp_vec;
-   vector unsigned char part_vec;
-
-   vsx_declare_common_vars(row_info,row,prev_row,bpp)
-
-   PNG_UNUSED(pp)
-
-   /* Altivec operations require 16-byte aligned data
-    * but input can be unaligned. So we calculate
-    * unaligned part as usual.
-    */
-   for (i = 0; i < unaligned_top; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-      rp++;
-   }
-
-   /* Using SIMD while we can */
-   while( istop >= 16 )
-   {
-      for(i=0;i < bpp ; i++)
-      {
-         *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-         rp++;
-      }
-      rp -= bpp;
-
-      rp_vec = vec_ld(0,rp);
-      part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED1_4);
-      rp_vec = vec_add(rp_vec,part_vec);
-
-      part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED2_4);
-      rp_vec = vec_add(rp_vec,part_vec);
-
-      part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED3_4);
-      rp_vec = vec_add(rp_vec,part_vec);
-
-      vec_st(rp_vec,0,rp);
-
-      rp += 16;
-      istop -= 16;
-   }
-
-   if(istop > 0)
-      for (i = 0; i < istop % 16; i++)
-      {
-         *rp = (png_byte)(((int)(*rp) + (int)(*(rp - bpp))) & 0xff);
-         rp++;
-      }
-
-}
-
-void png_read_filter_row_sub3_vsx(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   const png_byte bpp = 3;
-
-   vector unsigned char rp_vec;
-   vector unsigned char part_vec;
-
-   vsx_declare_common_vars(row_info,row,prev_row,bpp)
-
-   PNG_UNUSED(pp)
-
-   /* Altivec operations require 16-byte aligned data
-    * but input can be unaligned. So we calculate
-    * unaligned part as usual.
-    */
-   for (i = 0; i < unaligned_top; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-      rp++;
-   }
-
-   /* Using SIMD while we can */
-   while( istop >= 16 )
-   {
-      for(i=0;i < bpp ; i++)
-      {
-         *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-         rp++;
-      }
-      rp -= bpp;
-
-      rp_vec = vec_ld(0,rp);
-      part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED1_3);
-      rp_vec = vec_add(rp_vec,part_vec);
-
-      part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED2_3);
-      rp_vec = vec_add(rp_vec,part_vec);
-
-      part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED3_3);
-      rp_vec = vec_add(rp_vec,part_vec);
-
-      part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED4_3);
-      rp_vec = vec_add(rp_vec,part_vec);
-
-      vec_st(rp_vec,0,rp);
-      rp += 15;
-      istop -= 16;
-
-      /* Since 16 % bpp = 16 % 3 = 1, last element of array must
-       * be proceeded manually
-       */
-      *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-      rp++;
-   }
-
-   if(istop > 0)
-      for (i = 0; i < istop % 16; i++)
-      {
-         *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-         rp++;
-      }
-}
-
-void png_read_filter_row_avg4_vsx(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   const png_byte bpp = 4;
-
-   vector unsigned char rp_vec;
-   vector unsigned char pp_vec;
-   vector unsigned char pp_part_vec;
-   vector unsigned char rp_part_vec;
-   vector unsigned char avg_vec;
-
-   vsx_declare_common_vars(row_info,row,prev_row,bpp)
-   rp -= bpp;
-   if(istop >= bpp)
-      istop -= bpp;
-
-   for (i = 0; i < bpp; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) +
-         ((int)(*pp++) / 2 )) & 0xff);
-
-      rp++;
-   }
-
-   /* Altivec operations require 16-byte aligned data
-    * but input can be unaligned. So we calculate
-    * unaligned part as usual.
-    */
-   for (i = 0; i < unaligned_top; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) +
-         (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-      rp++;
-   }
-
-   /* Using SIMD while we can */
-   while( istop >= 16 )
-   {
-      for(i=0;i < bpp ; i++)
-      {
-         *rp = (png_byte)(((int)(*rp) +
-            (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-         rp++;
-      }
-      rp -= bpp;
-      pp -= bpp;
-
-      vec_ld_unaligned(pp_vec,pp);
-      rp_vec = vec_ld(0,rp);
-
-      rp_part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED1_4);
-      pp_part_vec = vec_perm(pp_vec,VSX_CHAR_ZERO,VSX_NOT_SHIFTED1_4);
-      avg_vec = vec_avg(rp_part_vec,pp_part_vec);
-      avg_vec = vec_sub(avg_vec, vec_and(vec_xor(rp_part_vec,pp_part_vec),vec_splat_u8(1)));
-      rp_vec = vec_add(rp_vec,avg_vec);
-
-      rp_part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED2_4);
-      pp_part_vec = vec_perm(pp_vec,VSX_CHAR_ZERO,VSX_NOT_SHIFTED2_4);
-      avg_vec = vec_avg(rp_part_vec,pp_part_vec);
-      avg_vec = vec_sub(avg_vec, vec_and(vec_xor(rp_part_vec,pp_part_vec),vec_splat_u8(1)));
-      rp_vec = vec_add(rp_vec,avg_vec);
-
-      rp_part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED3_4);
-      pp_part_vec = vec_perm(pp_vec,VSX_CHAR_ZERO,VSX_NOT_SHIFTED3_4);
-      avg_vec = vec_avg(rp_part_vec,pp_part_vec);
-      avg_vec = vec_sub(avg_vec, vec_and(vec_xor(rp_part_vec,pp_part_vec),vec_splat_u8(1)));
-      rp_vec = vec_add(rp_vec,avg_vec);
-
-      vec_st(rp_vec,0,rp);
-
-      rp += 16;
-      pp += 16;
-      istop -= 16;
-   }
-
-   if(istop  > 0)
-      for (i = 0; i < istop % 16; i++)
-      {
-         *rp = (png_byte)(((int)(*rp) +
-            (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-         rp++;
-      }
-}
-
-void png_read_filter_row_avg3_vsx(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-  const png_byte bpp = 3;
-
-  vector unsigned char rp_vec;
-  vector unsigned char pp_vec;
-  vector unsigned char pp_part_vec;
-  vector unsigned char rp_part_vec;
-  vector unsigned char avg_vec;
-
-  vsx_declare_common_vars(row_info,row,prev_row,bpp)
-  rp -= bpp;
-  if(istop >= bpp)
-     istop -= bpp;
-
-  for (i = 0; i < bpp; i++)
-  {
-     *rp = (png_byte)(((int)(*rp) +
-        ((int)(*pp++) / 2 )) & 0xff);
-
-     rp++;
-  }
-
-  /* Altivec operations require 16-byte aligned data
-   * but input can be unaligned. So we calculate
-   * unaligned part as usual.
-   */
-  for (i = 0; i < unaligned_top; i++)
-  {
-     *rp = (png_byte)(((int)(*rp) +
-        (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-     rp++;
-  }
-
-  /* Using SIMD while we can */
-  while( istop >= 16 )
-  {
-     for(i=0;i < bpp ; i++)
-     {
-        *rp = (png_byte)(((int)(*rp) +
-           (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-        rp++;
-     }
-     rp -= bpp;
-     pp -= bpp;
-
-     vec_ld_unaligned(pp_vec,pp);
-     rp_vec = vec_ld(0,rp);
-
-     rp_part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED1_3);
-     pp_part_vec = vec_perm(pp_vec,VSX_CHAR_ZERO,VSX_NOT_SHIFTED1_3);
-     avg_vec = vec_avg(rp_part_vec,pp_part_vec);
-     avg_vec = vec_sub(avg_vec, vec_and(vec_xor(rp_part_vec,pp_part_vec),vec_splat_u8(1)));
-     rp_vec = vec_add(rp_vec,avg_vec);
-
-     rp_part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED2_3);
-     pp_part_vec = vec_perm(pp_vec,VSX_CHAR_ZERO,VSX_NOT_SHIFTED2_3);
-     avg_vec = vec_avg(rp_part_vec,pp_part_vec);
-     avg_vec = vec_sub(avg_vec, vec_and(vec_xor(rp_part_vec,pp_part_vec),vec_splat_u8(1)));
-     rp_vec = vec_add(rp_vec,avg_vec);
-
-     rp_part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED3_3);
-     pp_part_vec = vec_perm(pp_vec,VSX_CHAR_ZERO,VSX_NOT_SHIFTED3_3);
-     avg_vec = vec_avg(rp_part_vec,pp_part_vec);
-     avg_vec = vec_sub(avg_vec, vec_and(vec_xor(rp_part_vec,pp_part_vec),vec_splat_u8(1)));
-     rp_vec = vec_add(rp_vec,avg_vec);
-
-     rp_part_vec = vec_perm(rp_vec,VSX_CHAR_ZERO,VSX_LEFTSHIFTED4_3);
-     pp_part_vec = vec_perm(pp_vec,VSX_CHAR_ZERO,VSX_NOT_SHIFTED4_3);
-     avg_vec = vec_avg(rp_part_vec,pp_part_vec);
-     avg_vec = vec_sub(avg_vec, vec_and(vec_xor(rp_part_vec,pp_part_vec),vec_splat_u8(1)));
-     rp_vec = vec_add(rp_vec,avg_vec);
-
-     vec_st(rp_vec,0,rp);
-
-     rp += 15;
-     pp += 15;
-     istop -= 16;
-
-     /* Since 16 % bpp = 16 % 3 = 1, last element of array must
-      * be proceeded manually
-      */
-     *rp = (png_byte)(((int)(*rp) +
-        (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-     rp++;
-  }
-
-  if(istop  > 0)
-     for (i = 0; i < istop % 16; i++)
-     {
-        *rp = (png_byte)(((int)(*rp) +
-           (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-        rp++;
-     }
-}
-
-/* Bytewise c ? t : e. */
-#define if_then_else(c,t,e) vec_sel(e,t,c)
-
-#define vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp) {\
-      c = *(pp - bpp);\
-      a = *(rp - bpp);\
-      b = *pp++;\
-      p = b - c;\
-      pc = a - c;\
-      pa = vsx_abs(p);\
-      pb = vsx_abs(pc);\
-      pc = vsx_abs(p + pc);\
-      if (pb < pa) pa = pb, a = b;\
-      if (pc < pa) a = c;\
-      a += *rp;\
-      *rp++ = (png_byte)a;\
-      }
-
-void png_read_filter_row_paeth4_vsx(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   const png_byte bpp = 4;
-
-   int a, b, c, pa, pb, pc, p;
-   vector unsigned char rp_vec;
-   vector unsigned char pp_vec;
-   vector unsigned short a_vec,b_vec,c_vec,nearest_vec;
-   vector signed short pa_vec,pb_vec,pc_vec,smallest_vec;
-
-   vsx_declare_common_vars(row_info,row,prev_row,bpp)
-   rp -= bpp;
-   if(istop >= bpp)
-      istop -= bpp;
-
-   /* Process the first pixel in the row completely (this is the same as 'up'
-    * because there is only one candidate predictor for the first row).
-    */
-   for(i = 0; i < bpp ; i++)
-   {
-      *rp = (png_byte)( *rp + *pp);
-      rp++;
-      pp++;
-   }
-
-   for(i = 0; i < unaligned_top ; i++)
-   {
-      vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp)
-   }
-
-   while( istop >= 16)
-   {
-      for(i = 0; i < bpp ; i++)
-      {
-         vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp)
-      }
-
-      rp -= bpp;
-      pp -= bpp;
-      rp_vec = vec_ld(0,rp);
-      vec_ld_unaligned(pp_vec,pp);
-
-      a_vec = vsx_char_to_short(vec_perm(rp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED1_4),1,4);
-      b_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_NOT_SHIFTED1_4),1,4);
-      c_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED1_4),1,4);
-      pa_vec = (vector signed short) vec_sub(b_vec,c_vec);
-      pb_vec = (vector signed short) vec_sub(a_vec , c_vec);
-      pc_vec = vec_add(pa_vec,pb_vec);
-      pa_vec = vec_abs(pa_vec);
-      pb_vec = vec_abs(pb_vec);
-      pc_vec = vec_abs(pc_vec);
-      smallest_vec = vec_min(pc_vec, vec_min(pa_vec,pb_vec));
-      nearest_vec =  if_then_else(
-            vec_cmpeq(pa_vec,smallest_vec),
-            a_vec,
-            if_then_else(
-              vec_cmpeq(pb_vec,smallest_vec),
-              b_vec,
-              c_vec
-              )
-            );
-      rp_vec = vec_add(rp_vec,(vsx_short_to_char(nearest_vec,1,4)));
-
-      a_vec = vsx_char_to_short(vec_perm(rp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED2_4),2,4);
-      b_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_NOT_SHIFTED2_4),2,4);
-      c_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED2_4),2,4);
-      pa_vec = (vector signed short) vec_sub(b_vec,c_vec);
-      pb_vec = (vector signed short) vec_sub(a_vec , c_vec);
-      pc_vec = vec_add(pa_vec,pb_vec);
-      pa_vec = vec_abs(pa_vec);
-      pb_vec = vec_abs(pb_vec);
-      pc_vec = vec_abs(pc_vec);
-      smallest_vec = vec_min(pc_vec, vec_min(pa_vec,pb_vec));
-      nearest_vec =  if_then_else(
-            vec_cmpeq(pa_vec,smallest_vec),
-            a_vec,
-            if_then_else(
-              vec_cmpeq(pb_vec,smallest_vec),
-              b_vec,
-              c_vec
-              )
-            );
-      rp_vec = vec_add(rp_vec,(vsx_short_to_char(nearest_vec,2,4)));
-
-      a_vec = vsx_char_to_short(vec_perm(rp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED3_4),3,4);
-      b_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_NOT_SHIFTED3_4),3,4);
-      c_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED3_4),3,4);
-      pa_vec = (vector signed short) vec_sub(b_vec,c_vec);
-      pb_vec = (vector signed short) vec_sub(a_vec , c_vec);
-      pc_vec = vec_add(pa_vec,pb_vec);
-      pa_vec = vec_abs(pa_vec);
-      pb_vec = vec_abs(pb_vec);
-      pc_vec = vec_abs(pc_vec);
-      smallest_vec = vec_min(pc_vec, vec_min(pa_vec,pb_vec));
-      nearest_vec =  if_then_else(
-            vec_cmpeq(pa_vec,smallest_vec),
-            a_vec,
-            if_then_else(
-              vec_cmpeq(pb_vec,smallest_vec),
-              b_vec,
-              c_vec
-              )
-            );
-      rp_vec = vec_add(rp_vec,(vsx_short_to_char(nearest_vec,3,4)));
-
-      vec_st(rp_vec,0,rp);
-
-      rp += 16;
-      pp += 16;
-      istop -= 16;
-   }
-
-   if(istop > 0)
-      for (i = 0; i < istop % 16; i++)
-      {
-         vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp)
-      }
-}
-
-void png_read_filter_row_paeth3_vsx(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-  const png_byte bpp = 3;
-
-  int a, b, c, pa, pb, pc, p;
-  vector unsigned char rp_vec;
-  vector unsigned char pp_vec;
-  vector unsigned short a_vec,b_vec,c_vec,nearest_vec;
-  vector signed short pa_vec,pb_vec,pc_vec,smallest_vec;
-
-  vsx_declare_common_vars(row_info,row,prev_row,bpp)
-  rp -= bpp;
-  if(istop >= bpp)
-     istop -= bpp;
-
-  /* Process the first pixel in the row completely (this is the same as 'up'
-   * because there is only one candidate predictor for the first row).
-   */
-  for(i = 0; i < bpp ; i++)
-  {
-     *rp = (png_byte)( *rp + *pp);
-     rp++;
-     pp++;
-  }
-
-  for(i = 0; i < unaligned_top ; i++)
-  {
-     vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp)
-  }
-
-  while( istop >= 16)
-  {
-     for(i = 0; i < bpp ; i++)
-     {
-        vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp)
-     }
-
-     rp -= bpp;
-     pp -= bpp;
-     rp_vec = vec_ld(0,rp);
-     vec_ld_unaligned(pp_vec,pp);
-
-     a_vec = vsx_char_to_short(vec_perm(rp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED1_3),1,3);
-     b_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_NOT_SHIFTED1_3),1,3);
-     c_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED1_3),1,3);
-     pa_vec = (vector signed short) vec_sub(b_vec,c_vec);
-     pb_vec = (vector signed short) vec_sub(a_vec , c_vec);
-     pc_vec = vec_add(pa_vec,pb_vec);
-     pa_vec = vec_abs(pa_vec);
-     pb_vec = vec_abs(pb_vec);
-     pc_vec = vec_abs(pc_vec);
-     smallest_vec = vec_min(pc_vec, vec_min(pa_vec,pb_vec));
-     nearest_vec =  if_then_else(
-           vec_cmpeq(pa_vec,smallest_vec),
-           a_vec,
-           if_then_else(
-             vec_cmpeq(pb_vec,smallest_vec),
-             b_vec,
-             c_vec
-             )
-           );
-     rp_vec = vec_add(rp_vec,(vsx_short_to_char(nearest_vec,1,3)));
-
-     a_vec = vsx_char_to_short(vec_perm(rp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED2_3),2,3);
-     b_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_NOT_SHIFTED2_3),2,3);
-     c_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED2_3),2,3);
-     pa_vec = (vector signed short) vec_sub(b_vec,c_vec);
-     pb_vec = (vector signed short) vec_sub(a_vec , c_vec);
-     pc_vec = vec_add(pa_vec,pb_vec);
-     pa_vec = vec_abs(pa_vec);
-     pb_vec = vec_abs(pb_vec);
-     pc_vec = vec_abs(pc_vec);
-     smallest_vec = vec_min(pc_vec, vec_min(pa_vec,pb_vec));
-     nearest_vec =  if_then_else(
-           vec_cmpeq(pa_vec,smallest_vec),
-           a_vec,
-           if_then_else(
-             vec_cmpeq(pb_vec,smallest_vec),
-             b_vec,
-             c_vec
-             )
-           );
-     rp_vec = vec_add(rp_vec,(vsx_short_to_char(nearest_vec,2,3)));
-
-     a_vec = vsx_char_to_short(vec_perm(rp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED3_3),3,3);
-     b_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_NOT_SHIFTED3_3),3,3);
-     c_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED3_3),3,3);
-     pa_vec = (vector signed short) vec_sub(b_vec,c_vec);
-     pb_vec = (vector signed short) vec_sub(a_vec , c_vec);
-     pc_vec = vec_add(pa_vec,pb_vec);
-     pa_vec = vec_abs(pa_vec);
-     pb_vec = vec_abs(pb_vec);
-     pc_vec = vec_abs(pc_vec);
-     smallest_vec = vec_min(pc_vec, vec_min(pa_vec,pb_vec));
-     nearest_vec =  if_then_else(
-           vec_cmpeq(pa_vec,smallest_vec),
-           a_vec,
-           if_then_else(
-             vec_cmpeq(pb_vec,smallest_vec),
-             b_vec,
-             c_vec
-             )
-           );
-     rp_vec = vec_add(rp_vec,(vsx_short_to_char(nearest_vec,3,3)));
-
-     a_vec = vsx_char_to_short(vec_perm(rp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED4_3),4,3);
-     b_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_NOT_SHIFTED4_3),4,3);
-     c_vec = vsx_char_to_short(vec_perm(pp_vec , VSX_CHAR_ZERO , VSX_LEFTSHIFTED4_3),4,3);
-     pa_vec = (vector signed short) vec_sub(b_vec,c_vec);
-     pb_vec = (vector signed short) vec_sub(a_vec , c_vec);
-     pc_vec = vec_add(pa_vec,pb_vec);
-     pa_vec = vec_abs(pa_vec);
-     pb_vec = vec_abs(pb_vec);
-     pc_vec = vec_abs(pc_vec);
-     smallest_vec = vec_min(pc_vec, vec_min(pa_vec,pb_vec));
-     nearest_vec =  if_then_else(
-           vec_cmpeq(pa_vec,smallest_vec),
-           a_vec,
-           if_then_else(
-             vec_cmpeq(pb_vec,smallest_vec),
-             b_vec,
-             c_vec
-             )
-           );
-     rp_vec = vec_add(rp_vec,(vsx_short_to_char(nearest_vec,4,3)));
-
-     vec_st(rp_vec,0,rp);
-
-     rp += 15;
-     pp += 15;
-     istop -= 16;
-
-     /* Since 16 % bpp = 16 % 3 = 1, last element of array must
-      * be proceeded manually
-      */
-     vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp)
-  }
-
-  if(istop > 0)
-     for (i = 0; i < istop % 16; i++)
-     {
-        vsx_paeth_process(rp,pp,a,b,c,pa,pb,pc,bpp)
-     }
-}
-
-#endif /* PNG_POWERPC_VSX_OPT > 0 */
-#endif /* PNG_POWERPC_VSX_IMPLEMENTATION == 1 (intrinsics) */
-#endif /* READ */
diff --git a/src/png/libpng/powerpc/powerpc_init.c b/src/png/libpng/powerpc/powerpc_init.c
deleted file mode 100644
index 07016177c..000000000
--- a/src/png/libpng/powerpc/powerpc_init.c
+++ /dev/null
@@ -1,125 +0,0 @@
-
-/* powerpc_init.c - POWERPC optimised filter functions
- *
- * Copyright (c) 2017 Glenn Randers-Pehrson
- * Written by Vadim Barkov, 2017.
- * Last changed in libpng 1.6.29 [March 16, 2017]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
- * called.
- */
-#define _POSIX_SOURCE 1
-
-#include <stdio.h>
-#include "../pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-#if PNG_POWERPC_VSX_OPT > 0
-#ifdef PNG_POWERPC_VSX_CHECK_SUPPORTED /* Do run-time checks */
-/* WARNING: it is strongly recommended that you do not build libpng with
- * run-time checks for CPU features if at all possible.  In the case of the PowerPC
- * VSX instructions there is no processor-specific way of detecting the
- * presence of the required support, therefore run-time detection is extremely
- * OS specific.
- *
- * You may set the macro PNG_POWERPC_VSX_FILE to the file name of file containing
- * a fragment of C source code which defines the png_have_vsx function.  There
- * are a number of implementations in contrib/powerpc-vsx, but the only one that
- * has partial support is contrib/powerpc-vsx/linux.c - a generic Linux
- * implementation which reads /proc/cpufino.
- */
-#ifndef PNG_POWERPC_VSX_FILE
-#  ifdef __linux__
-#     define  PNG_POWERPC_VSX_FILE "contrib/powerpc-vsx/linux_aux.c"
-#  endif
-#endif
-
-#ifdef PNG_POWERPC_VSX_FILE
-
-#include <signal.h> /* for sig_atomic_t */
-static int png_have_vsx(png_structp png_ptr);
-#include PNG_POWERPC_VSX_FILE
-
-#else  /* PNG_POWERPC_VSX_FILE */
-#  error "PNG_POWERPC_VSX_FILE undefined: no support for run-time POWERPC VSX checks"
-#endif /* PNG_POWERPC_VSX_FILE */
-#endif /* PNG_POWERPC_VSX_CHECK_SUPPORTED */
-
-void
-png_init_filter_functions_vsx(png_structp pp, unsigned int bpp)
-{
-   /* The switch statement is compiled in for POWERPC_VSX_API, the call to
-    * png_have_vsx is compiled in for POWERPC_VSX_CHECK. If both are defined
-    * the check is only performed if the API has not set the PowerPC option on
-    * or off explicitly. In this case the check controls what happens.
-    */
-
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
-   switch ((pp->options >> PNG_POWERPC_VSX) & 3)
-   {
-      case PNG_OPTION_UNSET:
-         /* Allow the run-time check to execute if it has been enabled -
-          * thus both API and CHECK can be turned on.  If it isn't supported
-          * this case will fall through to the 'default' below, which just
-          * returns.
-          */
-#endif /* PNG_POWERPC_VSX_API_SUPPORTED */
-#ifdef PNG_POWERPC_VSX_CHECK_SUPPORTED
-         {
-            static volatile sig_atomic_t no_vsx = -1; /* not checked */
-
-            if (no_vsx < 0)
-               no_vsx = !png_have_vsx(pp);
-
-            if (no_vsx)
-               return;
-         }
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
-         break;
-#endif
-#endif /* PNG_POWERPC_VSX_CHECK_SUPPORTED */
-
-#ifdef PNG_POWERPC_VSX_API_SUPPORTED
-      default: /* OFF or INVALID */
-         return;
-
-      case PNG_OPTION_ON:
-         /* Option turned on */
-         break;
-   }
-#endif
-
-   /* IMPORTANT: any new internal functions used here must be declared using
-    * PNG_INTERNAL_FUNCTION in ../pngpriv.h.  This is required so that the
-    * 'prefix' option to configure works:
-    *
-    *    ./configure --with-libpng-prefix=foobar_
-    *
-    * Verify you have got this right by running the above command, doing a build
-    * and examining pngprefix.h; it must contain a #define for every external
-    * function you add.  (Notice that this happens automatically for the
-    * initialization function.)
-    */
-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_vsx;
-
-   if (bpp == 3)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_vsx;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_vsx;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth3_vsx;
-   }
-
-   else if (bpp == 4)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_vsx;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_vsx;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth4_vsx;
-   }
-}
-#endif /* PNG_POWERPC_VSX_OPT > 0 */
-#endif /* READ */
diff --git a/src/png/libpng/scripts/checksym.awk b/src/png/libpng/scripts/checksym.awk
deleted file mode 100644
index fe3af55e0..000000000
--- a/src/png/libpng/scripts/checksym.awk
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/bin/awk -f
-# Check a list of symbols against the master definition
-# (official) list.  Arguments:
-#
-# awk -f checksym.awk official-def list-to-check
-#
-# Output is a file in the current directory called 'symbols.new',
-# the value of the awk variable "of" (which can be changed on the
-# command line if required.)  stdout holds error messages.  Error
-# code indicates success or failure.
-#
-# NOTE: this is a pure, old fashioned, awk script.  It will
-# work with any awk
-
-BEGIN{
-   err=0
-   master=""        # master file
-   official[1] = "" # defined symbols from master file
-   symbol[1] = ""   # defined symbols from png.h
-   removed[1] = ""  # removed symbols from png.h
-   lasto = 0        # last ordinal value from png.h
-   mastero = 0      # highest ordinal in master file
-   symbolo = 0      # highest ordinal in png.h
-   missing = "error"# log an error on missing symbols
-   of="symbols.new" # default to a fixed name
-}
-
-# Read existing definitions from the master file (the first
-# file on the command line.)  This must be a def file and it
-# has definition lines (others are ignored) of the form:
-#
-#   symbol @ordinal
-#
-master == "" {
-   master = FILENAME
-}
-FILENAME==master && NF==2 && $2~/^@/ && $1!~/^;/ {
-   o=0+substr($2,2)
-   if (o > 0) {
-      if (official[o] == "") {
-         official[o] = $1
-         if (o > mastero) mastero = o
-         next
-      } else
-         print master ": duplicated symbol:", official[o] ":", $0
-   } else
-      print master ": bad export line format:", $0
-   err = 1
-}
-FILENAME==master && $1==";missing" && NF==2{
-   # This allows the master file to control how missing symbols
-   # are handled; symbols that aren't in either the master or
-   # the new file.  Valid values are 'ignore', 'warning' and
-   # 'error'
-   missing = $2
-}
-FILENAME==master {
-   next
-}
-
-# Read new definitions, these are free form but the lines must
-# just be symbol definitions.  Lines will be commented out for
-# 'removed' symbols, introduced in png.h using PNG_REMOVED rather
-# than PNG_EXPORT.  Use symbols.dfn or pngwin.dfn to generate the
-# input file.
-#
-#  symbol @ordinal   # two fields, exported symbol
-#  ; symbol @ordinal # three fields, removed symbol
-#  ; @ordinal        # two fields, the last ordinal
-NF==2 && $1 == ";" && $2 ~ /^@[1-9][0-9]*$/ { # last ordinal
-   o=0+substr($2,2)
-   if (lasto == 0 || lasto == o)
-      lasto=o
-   else {
-      print "png.h: duplicated last ordinal:", lasto, o
-      err = 1
-   }
-   next
-}
-NF==3 && $1 == ";" && $3 ~ /^@[1-9][0-9]*$/ { # removed symbol
-   o=0+substr($3,2)
-   if (removed[o] == "" || removed[o] == $2) {
-      removed[o] = $2
-      if (o > symbolo) symbolo = o
-   } else {
-      print "png.h: duplicated removed symbol", o ": '" removed[o] "' != '" $2 "'"
-      err = 1
-   }
-   next
-}
-NF==2 && $2 ~ /^@[1-9][0-9]*$/ { # exported symbol
-   o=0+substr($2,2)
-   if (symbol[o] == "" || symbol[o] == $1) {
-      symbol[o] = $1
-      if (o > symbolo) symbolo = o
-   } else {
-      print "png.h: duplicated symbol", o ": '" symbol[o] "' != '" $1 "'"
-      err = 1
-   }
-}
-{
-   next # skip all other lines
-}
-
-# At the end check for symbols marked as both duplicated and removed
-END{
-   if (symbolo > lasto) {
-      print "highest symbol ordinal in png.h,", symbolo ", exceeds last ordinal from png.h", lasto
-      err = 1
-   }
-   if (mastero > lasto) {
-      print "highest symbol ordinal in", master ",", mastero ", exceeds last ordinal from png.h", lasto
-      err = 1
-   }
-   unexported=0
-   # Add a standard header to symbols.new:
-   print ";Version INSERT-VERSION-HERE" >of
-   print ";--------------------------------------------------------------" >of
-   print "; LIBPNG symbol list as a Win32 DEF file" >of
-   print "; Contains all the symbols that can be exported from libpng" >of
-   print ";--------------------------------------------------------------" >of
-   print "LIBRARY" >of
-   print "" >of
-   print "EXPORTS" >of
-
-   for (o=1; o<=lasto; ++o) {
-      if (symbol[o] == "" && removed[o] == "") {
-         if (unexported == 0) unexported = o
-         if (official[o] == "") {
-            # missing in export list too, so ok
-            if (o < lasto) continue
-         }
-      }
-      if (unexported != 0) {
-         # Symbols in the .def but not in the new file are errors, but
-         # the 'unexported' symbols aren't in either.  By default this
-         # is an error too (see the setting of 'missing' at the start),
-         # but this can be reset on the command line or by stuff in the
-         # file - see the comments above.
-         if (missing != "ignore") {
-            if (o-1 > unexported)
-               print "png.h:", missing ": missing symbols:", unexported "-" o-1
-            else
-               print "png.h:", missing ": missing symbol:", unexported
-            if (missing != "warning")
-               err = 1
-         }
-         unexported = 0
-      }
-      if (symbol[o] != "" && removed[o] != "") {
-         print "png.h: symbol", o, "both exported as '" symbol[o] "' and removed as '" removed[o] "'"
-         err = 1
-      } else if (symbol[o] != official[o]) {
-         # either the symbol is missing somewhere or it changed
-         err = 1
-         if (symbol[o] == "")
-            print "png.h: symbol", o, "is exported as '" official[o] "' in", master
-         else if (official[o] == "")
-            print "png.h: exported symbol", o, "'" symbol[o] "' not present in", master
-         else
-            print "png.h: exported symbol", o, "'" symbol[o] "' exists as '" official[o] "' in", master
-      }
-
-      # Finally generate symbols.new
-      if (symbol[o] != "")
-         print " " symbol[o], "@" o > of
-   }
-
-   if (err != 0) {
-      print "*** A new list is in", of, "***"
-      exit 1
-   }
-}
diff --git a/src/png/libpng/scripts/def.c b/src/png/libpng/scripts/def.c
deleted file mode 100644
index 0ffcbeb0c..000000000
--- a/src/png/libpng/scripts/def.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* def.c - define format of libpng.def
- *
- * Last changed in libpng version 1.6.16 [December 22, 2014]
- * Copyright (c) 2011-2014 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* Write the export file header: */
-PNG_DFN ";--------------------------------------------------------------"
-PNG_DFN "; LIBPNG module definition file for OS/2"
-PNG_DFN ";--------------------------------------------------------------"
-PNG_DFN ""
-PNG_DFN "; If you give the library an explicit name one or other files"
-PNG_DFN "; may need modifying to support the new name on one or more"
-PNG_DFN "; systems."
-PNG_DFN "LIBRARY"
-PNG_DFN "OS2 DESCRIPTION "PNG image compression library""
-PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
-PNG_DFN ""
-PNG_DFN "EXPORTS"
-PNG_DFN ";Version 1.6.35beta02"
-
-#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-        PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
-
-#include "../png.h"
diff --git a/src/png/libpng/scripts/dfn.awk b/src/png/libpng/scripts/dfn.awk
deleted file mode 100644
index 346b9db7d..000000000
--- a/src/png/libpng/scripts/dfn.awk
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/bin/awk -f
-# scripts/dfn.awk - process a .dfn file
-#
-# last changed in libpng version 1.5.19 - August 21, 2014
-#
-# Copyright (c) 2013-2014 Glenn Randers-Pehrson
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# The output of this script is written to the file given by
-# the variable 'out', which should be set on the command line.
-# Error messages are printed to stdout and if any are printed
-# the script will exit with error code 1.
-
-BEGIN{
-   out="/dev/null"       # as a flag
-   out_count=0           # count of output lines
-   err=0                 # set if an error occurred
-   sort=0                # sort the output
-   array[""]=""
-}
-
-# The output file must be specified before any input:
-NR==1 && out == "/dev/null" {
-   print "out=output.file must be given on the command line"
-   # but continue without setting the error code; this allows the
-   # script to be checked easily
-}
-
-# Output can be sorted; two lines are recognized
-$1 == "PNG_DFN_START_SORT"{
-   sort=0+$2
-   next
-}
-
-$1 ~ /^PNG_DFN_END_SORT/{
-   # Do a very simple, slow, sort; notice that blank lines won't be
-   # output by this
-   for (entry in array) {
-      while (array[entry] != "") {
-         key = entry
-         value = array[key]
-         array[key] = ""
-
-         for (alt in array) {
-            if (array[alt] != "" && alt < key) {
-               array[key] = value
-               value = array[alt]
-               key = alt
-               array[alt] = ""
-            }
-         }
-
-         print value >out
-      }
-   }
-   sort=0
-   next
-}
-
-/^[^"]*PNG_DFN *".*"[^"]*$/{
-   # A definition line, apparently correctly formatted; extract the
-   # definition then replace any doubled "" that remain with a single
-   # double quote.  Notice that the original doubled double quotes
-   # may have been split by tokenization
-   #
-   # Sometimes GCC splits the PNG_DFN lines; we know this has happened
-   # if the quotes aren't closed and must read another line.  In this
-   # case it is essential to reject lines that start with '#' because those
-   # are introduced #line directives.
-   orig=$0
-   line=$0
-   lineno=FNR
-   if (lineno == "") lineno=NR
-
-   if (sub(/^[^"]*PNG_DFN *"/,"",line) != 1) {
-	print "line", lineno ": processing failed:"
-	print orig
-	err=1
-       next
-   } else {
-	++out_count
-   }
-
-   # Now examine quotes within the value:
-   #
-   #   @" - delete this and any following spaces
-   #   "@ - delete this and any preceding spaces
-   #   @' - replace this by a double quote
-   #
-   # This allows macro substitution by the C compiler thus:
-   #
-   #   #define first_name John
-   #   #define last_name Smith
-   #
-   #	PNG_DFN"#define name @'@" first_name "@ @" last_name "@@'"
-   #
-   # Might get C preprocessed to:
-   #
-   #   PNG_DFN "#define foo @'@" John "@ @" Smith "@@'"
-   #
-   # Which this script reduces to:
-   #
-   #	#define name "John Smith"
-   #
-   while (1) {
-      # While there is an @" remove it and the next "@
-      if (line ~ /@"/) {
-         if (line ~ /@".*"@/) {
-            # Do this special case first to avoid swallowing extra spaces
-            # before or after the @ stuff:
-            if (!sub(/@" *"@/, "", line)) {
-               # Ok, do it in pieces - there has to be a non-space between the
-               # two.  NOTE: really weird things happen if a leading @" is
-               # lost - the code will error out below (I believe).
-               if (!sub(/@" */, "", line) || !sub(/ *"@/, "", line)) {
-                  print "line", lineno, ": internal error:", orig
-                  exit 1
-               }
-            }
-         }
-
-         # There is no matching "@.  Assume a split line
-         else while (1) {
-            if (getline nextline) {
-               # If the line starts with '#' it is a preprocesor line directive
-               # from cc -E; skip it:
-               if (nextline !~ /^#/) {
-                  line = line " " nextline
-                  break
-               }
-            } else {
-               # This is end-of-input - probably a missing "@ on the first line:
-               print "line", lineno ": unbalanced @\" ... \"@ pair"
-               err=1
-               next
-            }
-         }
-
-         # Keep going until all the @" have gone
-         continue
-      }
-
-      # Attempt to remove a trailing " (not preceded by '@') - if this can
-      # be done, stop now; if not assume a split line again
-      if (sub(/"[^"]*$/, "", line))
-         break
-
-      # Read another line
-      while (1) {
-         if (getline nextline) {
-            if (nextline !~ /^#/) {
-               line = line " " nextline
-               # Go back to stripping @" "@ pairs
-               break
-            }
-         } else {
-            print "line", lineno ": unterminated PNG_DFN string"
-            err=1
-            next
-         }
-      }
-   }
-
-   # Put any needed double quotes in (at the end, because these would otherwise
-   # interfere with the processing above.)
-   gsub(/@'/,"\"", line)
-
-   # Remove any trailing spaces (not really required, but for
-   # editorial consistency
-   sub(/ *$/, "", line)
-
-   # Remove trailing CR
-   sub(/
$/, "", line)
-
-   if (sort) {
-      if (split(line, parts) < sort) {
-         print "line", lineno ": missing sort field:", line
-         err=1
-      } else
-         array[parts[sort]] = line
-   }
-
-   else
-      print line >out
-   next
-}
-
-/PNG_DFN/{
-   print "line", NR, "incorrectly formatted PNG_DFN line:"
-   print $0
-   err = 1
-}
-
-END{
-   if (out_count > 0 || err > 0)
-	exit err
-
-   print "no definition lines found"
-   exit 1
-}
diff --git a/src/png/libpng/scripts/genchk.cmake.in b/src/png/libpng/scripts/genchk.cmake.in
deleted file mode 100644
index ab3b9d746..000000000
--- a/src/png/libpng/scripts/genchk.cmake.in
+++ /dev/null
@@ -1,37 +0,0 @@
-# genchk.cmake.in
-# Generate .chk from .out with awk (generic), based upon the automake logic.
-
-# Copyright (C) 2016 Glenn Randers-Pehrson
-# Written by Roger Leigh, 2016
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Variables substituted from CMakeLists.txt
-set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@")
-
-set(AWK "@AWK@")
-
-get_filename_component(INPUTEXT "${INPUT}" EXT)
-get_filename_component(OUTPUTEXT "${OUTPUT}" EXT)
-get_filename_component(INPUTBASE "${INPUT}" NAME_WE)
-get_filename_component(OUTPUTBASE "${OUTPUT}" NAME_WE)
-get_filename_component(INPUTDIR "${INPUT}" PATH)
-get_filename_component(OUTPUTDIR "${OUTPUT}" PATH)
-
-if("${INPUTEXT}" STREQUAL ".out" AND "${OUTPUTEXT}" STREQUAL ".chk")
-  # Generate .chk from .out with awk (generic)
-  file(REMOVE "${OUTPUT}" "${OUTPUTDIR}/${OUTPUTBASE}.new")
-  execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/checksym.awk"
-                          "${SRCDIR}/scripts/${INPUTBASE}.def"
-                          "of=${OUTPUTDIR}/${OUTPUTBASE}.new"
-                          "${INPUT}"
-                  RESULT_VARIABLE AWK_FAIL)
-  if(AWK_FAIL)
-    message(FATAL_ERROR "Failed to generate ${OUTPUTDIR}/${OUTPUTBASE}.new")
-  endif()
-  file(RENAME "${OUTPUTDIR}/${OUTPUTBASE}.new" "${OUTPUT}")
-else()
-  message(FATAL_ERROR "Unsupported conversion: ${INPUTEXT} to ${OUTPUTEXT}")
-endif()
diff --git a/src/png/libpng/scripts/genout.cmake.in b/src/png/libpng/scripts/genout.cmake.in
deleted file mode 100644
index 01f12de2f..000000000
--- a/src/png/libpng/scripts/genout.cmake.in
+++ /dev/null
@@ -1,93 +0,0 @@
-# genout.cmake.in
-# Generate .out from .c with awk (generic), based upon the automake logic.
-
-# Copyright (C) 2016 Glenn Randers-Pehrson
-# Written by Roger Leigh, 2016
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Variables substituted from CMakeLists.txt
-set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@")
-set(BINDIR "@CMAKE_CURRENT_BINARY_DIR@")
-
-set(AWK "@AWK@")
-set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
-set(CMAKE_C_FLAGS @CMAKE_C_FLAGS@)
-set(INCDIR "@CMAKE_CURRENT_BINARY_DIR@")
-set(PNG_PREFIX "@PNG_PREFIX@")
-set(PNGLIB_MAJOR "@PNGLIB_MAJOR@")
-set(PNGLIB_MINOR "@PNGLIB_MINOR@")
-set(PNGLIB_VERSION "@PNGLIB_VERSION@")
-set(ZLIBINCDIR "@ZLIB_INCLUDE_DIR@")
-
-set(PLATFORM_C_FLAGS)
-if(APPLE)
-  set(CMAKE_OSX_ARCHITECTURES "@CMAKE_OSX_ARCHITECTURES@")
-  set(CMAKE_OSX_SYSROOT "@CMAKE_OSX_SYSROOT@")
-  if(CMAKE_OSX_ARCHITECTURES)
-    set(PLATFORM_C_FLAGS ${PLATFORM_C_FLAGS} -arch ${CMAKE_OSX_ARCHITECTURES})
-  endif()
-  if(CMAKE_OSX_SYSROOT)
-    set(PLATFORM_C_FLAGS ${PLATFORM_C_FLAGS} -isysroot ${CMAKE_OSX_SYSROOT})
-  endif()
-endif()
-
-get_filename_component(INPUTEXT "${INPUT}" EXT)
-get_filename_component(OUTPUTEXT "${OUTPUT}" EXT)
-get_filename_component(INPUTBASE "${INPUT}" NAME_WE)
-get_filename_component(OUTPUTBASE "${OUTPUT}" NAME_WE)
-get_filename_component(INPUTDIR "${INPUT}" PATH)
-get_filename_component(OUTPUTDIR "${OUTPUT}" PATH)
-
-if ("${INPUTEXT}" STREQUAL ".c" AND "${OUTPUTEXT}" STREQUAL ".out")
-  get_filename_component(GENDIR "${OUTPUT}" PATH)
-  file(MAKE_DIRECTORY "${GENDIR}")
-
-  file(REMOVE "${OUTPUT}.tf1" "${OUTPUT}.tf2")
-
-  set(INCLUDES "-I${INCDIR}")
-  if(ZLIBINCDIR)
-    foreach(dir ${ZLIBINCDIR})
-      list(APPEND INCLUDES "-I${dir}")
-    endforeach()
-  endif()
-
-  if(PNG_PREFIX)
-    set(PNG_PREFIX_DEF "-DPNG_PREFIX=${PNG_PREFIX}")
-  endif()
-
-  execute_process(COMMAND "${CMAKE_C_COMPILER}" "-E"
-                          ${CMAKE_C_FLAGS}
-                          ${PLATFORM_C_FLAGS}
-                          "-I${SRCDIR}"
-                          "-I${BINDIR}"
-                          ${INCLUDES}
-                          "-DPNGLIB_LIBNAME=PNG${PNGLIB_MAJOR}${PNGLIB_MINOR}_0"
-                          "-DPNGLIB_VERSION=${PNGLIB_VERSION}"
-                          "-DSYMBOL_PREFIX=${SYMBOL_PREFIX}"
-                          "-DPNG_NO_USE_READ_MACROS"
-                          "-DPNG_BUILDING_SYMBOL_TABLE"
-                          ${PNG_PREFIX_DEF}
-                          "${INPUT}"
-                  OUTPUT_FILE "${OUTPUT}.tf1"
-                  WORKING_DIRECTORY "${BINDIR}"
-                  RESULT_VARIABLE CPP_FAIL)
-  if(CPP_FAIL)
-    message(FATAL_ERROR "Failed to generate ${OUTPUT}.tf1")
-  endif()
-
-  execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/dfn.awk"
-                          "out=${OUTPUT}.tf2" "${OUTPUT}.tf1"
-                  WORKING_DIRECTORY "${BINDIR}"
-                  RESULT_VARIABLE AWK_FAIL)
-  if(AWK_FAIL)
-    message(FATAL_ERROR "Failed to generate ${OUTPUT}.tf2")
-  endif()
-
-  file(REMOVE "${OUTPUT}.tf1")
-  file(RENAME "${OUTPUT}.tf2" "${OUTPUT}")
-else()
-  message(FATAL_ERROR "Unsupported conversion: ${INPUTEXT} to ${OUTPUTEXT}")
-endif()
diff --git a/src/png/libpng/scripts/gensrc.cmake.in b/src/png/libpng/scripts/gensrc.cmake.in
deleted file mode 100644
index f28a62266..000000000
--- a/src/png/libpng/scripts/gensrc.cmake.in
+++ /dev/null
@@ -1,138 +0,0 @@
-# gensrc.cmake.in
-# Generate source files with awk, based upon the automake logic.
-
-# Copyright (C) 2016 Glenn Randers-Pehrson
-# Written by Roger Leigh, 2016
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Variables substituted from CMakeLists.txt
-set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@")
-set(BINDIR "@CMAKE_CURRENT_BINARY_DIR@")
-
-set(AWK "@AWK@")
-set(DFA_XTRA "@DFA_XTRA@")
-set(PNG_PREFIX "@PNG_PREFIX@")
-set(PNGLIB_VERSION "@PNGLIB_VERSION@")
-
-if("${OUTPUT}" STREQUAL "scripts/pnglibconf.c")
-  # Generate scripts/pnglibconf.c
-
-  file(REMOVE "${BINDIR}/pnglibconf.tf6" "${BINDIR}/pnglibconf.tf7")
-
-  execute_process(COMMAND "${CMAKE_COMMAND}" -E echo "com ${PNGLIB_VERSION} STANDARD API DEFINITION"
-                  COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
-                          "out=pnglibconf.tf6" "logunsupported=1" "version=search"
-                          "${SRCDIR}/pngconf.h" "-"
-                          "${SRCDIR}/scripts/pnglibconf.dfa"
-                  WORKING_DIRECTORY "${BINDIR}"
-                  RESULT_VARIABLE AWK_FAIL)
-  if(AWK_FAIL)
-    message(FATAL_ERROR "Failed to generate pnglibconf.tf6")
-  endif()
-
-  execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
-                  "out=pnglibconf.tf7" "pnglibconf.tf6"
-                  WORKING_DIRECTORY "${BINDIR}"
-                  RESULT_VARIABLE AWK_FAIL)
-  if(AWK_FAIL)
-    message(FATAL_ERROR "Failed to generate pnglibconf.tf7")
-  endif()
-
-  file(REMOVE "pnglibconf.tf6")
-  file(MAKE_DIRECTORY "${BINDIR}/scripts")
-  file(RENAME "pnglibconf.tf7" "${BINDIR}/scripts/pnglibconf.c")
-
-elseif ("${OUTPUT}" STREQUAL "pnglibconf.c")
-  # Generate pnglibconf.c
-
-  file(REMOVE "${BINDIR}/pnglibconf.tf4" "${BINDIR}/pnglibconf.tf5")
-
-  execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
-                  out=pnglibconf.tf4 version=search
-                  ${SRCDIR}/pngconf.h ${SRCDIR}/scripts/pnglibconf.dfa
-                  ${SRCDIR}/pngusr.dfa ${DFA_XTRA}
-                  WORKING_DIRECTORY "${BINDIR}"
-                  RESULT_VARIABLE AWK_FAIL)
-  if(AWK_FAIL)
-    message(FATAL_ERROR "Failed to generate pnglibconf.tf4")
-  endif()
-
-  execute_process(COMMAND "${AWK}" -f "${SRCDIR}/scripts/options.awk"
-                  out=pnglibconf.tf5 pnglibconf.tf4
-                  WORKING_DIRECTORY "${BINDIR}"
-                  RESULT_VARIABLE AWK_FAIL)
-  if(AWK_FAIL)
-    message(FATAL_ERROR "Failed to generate pnglibconf.tf5")
-  endif()
-
-  file(REMOVE "pnglibconf.tf4")
-  file(MAKE_DIRECTORY "${BINDIR}/scripts")
-  file(RENAME "pnglibconf.tf5" "${BINDIR}/pnglibconf.c")
-
-elseif ("${OUTPUT}" STREQUAL "pnglibconf.h")
-  # Generate pnglibconf.h
-
-  file(REMOVE "${BINDIR}/${OUTPUT}")
-  if(PNG_PREFIX)
-    file(REMOVE "pnglibconf.tf8")
-
-    execute_process(COMMAND "${AWK}" "s==0 && NR>1{print prev}
-                             s==0{prev=\$0}
-                             s==1{print \"#define\", \$1, \"${PNG_PREFIX}\" \$1}
-                             s==2{print \"#define ${PNG_PREFIX}png_\" \$1, \"PNG_\" \$1}
-                             END{print prev}" s=0 pnglibconf.out s=1 "${BINDIR}/scripts/prefix.out"
-                             s=2 "${SRCDIR}/scripts/macro.lst"
-                    OUTPUT_FILE pnglibconf.tf8
-                    RESULT_VARIABLE AWK_FAIL)
-    if(AWK_FAIL)
-      message(FATAL_ERROR "Failed to generate pnglibconf.tf8")
-    endif()
-
-    file(RENAME "pnglibconf.tf8" "${BINDIR}/${OUTPUT}")
-  else()
-    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${BINDIR}/pnglibconf.out"
-                                                       "${BINDIR}/${OUTPUT}"
-                    RESULT_VARIABLE COPY_FAIL)
-    if(COPY_FAIL)
-      message(FATAL_ERROR "Failed to create pnglibconf.h")
-    endif()
-  endif()
-
-elseif ("${OUTPUT}" STREQUAL "pngprefix.h")
-  # Generate pngprefix.h
-
-  file(REMOVE "${BINDIR}/${OUTPUT}")
-
-  if(PNG_PREFIX)
-    file(REMOVE "pngprefix.tf1")
-
-    execute_process(COMMAND "${AWK}"
-                            "{print \"#define\", \$1, \"${PNG_PREFIX}\" \$1}"
-                            "${BINDIR}/scripts/intprefix.out"
-                    OUTPUT_FILE "pngprefix.tf1"
-                    RESULT_VARIABLE AWK_FAIL)
-    if(AWK_FAIL)
-      message(FATAL_ERROR "Failed to generate pngprefix.tf1")
-    endif()
-
-    file(RENAME "pngprefix.tf1" "${BINDIR}/${OUTPUT}")
-  else()
-    file(WRITE "${BINDIR}/${OUTPUT}" "/* No libpng symbol prefix configured. */")
-  endif()
-
-elseif("${OUTPUT}" STREQUAL "scripts/pnglibconf.h.prebuilt")
-  # Generate scripts/pnglibconf.h.prebuilt (fails build)
-
-  message(STATUS "Attempting to build scripts/pnglibconf.h.prebuilt")
-  message(STATUS "This is a machine generated file, but if you want to make")
-  message(STATUS "a new one simply build the 'genfiles' target, and copy")
-  message(STATUS "scripts/pnglibconf.out to scripts/pnglibconf.h.prebuilt")
-  message(STATUS "AND set PNG_ZLIB_VERNUM to 0 (you MUST do this)")
-  message(FATAL_ERROR "Stopping build")
-
-else()
-  message(FATAL_ERROR "Unsupported output: ${OUTPUT}")
-endif()
diff --git a/src/png/libpng/scripts/intprefix.c b/src/png/libpng/scripts/intprefix.c
deleted file mode 100644
index 254f8e94b..000000000
--- a/src/png/libpng/scripts/intprefix.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-/* intprefix.c - generate an unprefixed internal symbol list
- *
- * Last changed in libpng version 1.6.16 [December 22, 2014]
- * Copyright (c) 2013-2014 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#define PNG_INTERNAL_DATA(type, name, array)\
-        PNG_DFN "@" name "@"
-
-#define PNG_INTERNAL_FUNCTION(type, name, args, attributes)\
-        PNG_DFN "@" name "@"
-
-#define PNG_INTERNAL_CALLBACK(type, name, args, attributes)\
-        PNG_DFN "@" name "@"
-
-#define PNGPREFIX_H /* self generation */
-#include "../pngpriv.h"
diff --git a/src/png/libpng/scripts/libpng-config-body.in b/src/png/libpng/scripts/libpng-config-body.in
deleted file mode 100644
index b466432d5..000000000
--- a/src/png/libpng/scripts/libpng-config-body.in
+++ /dev/null
@@ -1,96 +0,0 @@
-
-usage()
-{
-    cat <<EOF
-Usage: libpng-config [OPTION] ...
-
-Known values for OPTION are:
-
-  --prefix        print libpng prefix
-  --libdir        print path to directory containing library
-  --libs          print library linking information
-  --ccopts        print compiler options
-  --cppflags      print pre-processor flags
-  --cflags        print preprocessor flags, I_opts, and compiler options
-  --I_opts        print "-I" include options
-  --L_opts        print linker "-L" flags for dynamic linking
-  --R_opts        print dynamic linker "-R" or "-rpath" flags
-  --ldopts        print linker options
-  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)
-  --static        revise subsequent outputs for static linking
-  --help          print this help and exit
-  --version       print version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-while test $# -gt 0; do
-    case "$1" in
-
-    --prefix)
-        echo ${prefix}
-        ;;
-
-    --version)
-        echo ${version}
-        exit 0
-        ;;
-
-    --help)
-        usage 0
-        ;;
-
-    --ccopts)
-        echo ${ccopts}
-        ;;
-
-    --cppflags)
-        echo ${cppflags}
-        ;;
-
-    --cflags)
-        echo ${I_opts} ${cppflags} ${ccopts}
-        ;;
-
-    --libdir)
-        echo ${libdir}
-        ;;
-
-    --libs)
-        echo ${libs}
-        ;;
-
-    --I_opts)
-        echo ${I_opts}
-        ;;
-
-    --L_opts)
-        echo ${L_opts}
-        ;;
-
-    --R_opts)
-        echo ${R_opts}
-        ;;
-
-    --ldflags)
-        echo ${ldflags} ${L_opts} ${R_opts} ${libs}
-        ;;
-
-    --static)
-        R_opts=""
-        ;;
-
-    *)
-        usage
-        exit 1
-        ;;
-    esac
-    shift
-done
-
-exit 0
diff --git a/src/png/libpng/scripts/libpng-config-head.in b/src/png/libpng/scripts/libpng-config-head.in
deleted file mode 100644
index 64dd3987d..000000000
--- a/src/png/libpng/scripts/libpng-config-head.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-# libpng-config
-# provides configuration info for libpng.
-
-# Copyright (C) 2002 Glenn Randers-Pehrson
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Modeled after libxml-config.
-
-version=1.6.34
-prefix=""
-libdir=""
-libs=""
-I_opts=""
-L_opts=""
-R_opts=""
-cppflags=""
-ccopts=""
-ldopts=""
-
diff --git a/src/png/libpng/scripts/libpng.pc.in b/src/png/libpng/scripts/libpng.pc.in
deleted file mode 100644
index 33c65767b..000000000
--- a/src/png/libpng/scripts/libpng.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/libpng16
-
-Name: libpng
-Description: Loads and saves PNG files
-Version: 1.6.34
-Libs: -L${libdir} -lpng16
-Cflags: -I${includedir}
diff --git a/src/png/libpng/scripts/options.awk b/src/png/libpng/scripts/options.awk
deleted file mode 100644
index fef5dfd78..000000000
--- a/src/png/libpng/scripts/options.awk
+++ /dev/null
@@ -1,898 +0,0 @@
-#!/bin/awk -f
-# scripts/options.awk - library build configuration control
-#
-# last changed in libpng version 1.6.11 - June 5, 2014
-#
-# Copyright (c) 1998-2014 Glenn Randers-Pehrson
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# The output of this script is written to the file given by
-# the variable 'out'.  The script is run twice, once with
-# an intermediate output file, 'options.tmp' then again on
-# that file to produce the final output:
-#
-#  awk -f scripts/options.awk out=options.tmp scripts/options.dfa 1>&2
-#  awk -f scripts/options.awk out=options.dfn options.tmp 1>&2
-#
-# Some options may be specified on the command line:
-#
-#  deb=1            Causes debugging to be output
-#  logunsupported=1 Causes all options to be recorded in the output
-#  everything=off   Causes all options to be disabled by default
-#  everything=on    Causes all options to be enabled by default
-#
-# If awk fails on your platform, try nawk instead.
-#
-# These options may also be specified in the original input file (and
-# are copied to the preprocessed file).
-
-BEGIN{
-   out=""                       # intermediate, preprocessed, file
-   pre=-1                       # preprocess (first line)
-   version="libpng version unknown" # version information
-   version_file=""              # where to find the version
-   err=0                        # in-line exit sets this
-   # The following definitions prevent the C preprocessor noticing the lines
-   # that will be in the final output file.  Some C preprocessors tokenise
-   # the lines, for example by inserting spaces around operators, and all
-   # C preprocessors notice lines that start with '#', most remove comments.
-   # The technique adopted here is to make the final output lines into
-   # C strings (enclosed in double quotes), preceded by PNG_DFN.  As a
-   # consequence the output cannot contain a 'raw' double quote - instead put
-   # @' in, this will be replaced by a single " afterward.  See the parser
-   # script dfn.awk for more capabilities (not required here).  Note that if
-   # you need a " in a 'setting' in pnglibconf.dfa it must also be @'!
-   dq="@'"                      # For a single double quote
-   start=" PNG_DFN \""          # Start stuff to output (can't contain a "!)
-   end="\" "                    # End stuff to output
-   subs="@\" "                  # Substitute start (substitute a C macro)
-   sube=" \"@"                  # Substitute end
-   comment=start "/*"           # Comment start
-   cend="*/" end                # Comment end
-   def=start "#define PNG_"     # Arbitrary define
-   sup="_SUPPORTED" end         # end supported option
-   und=comment "#undef PNG_"    # Unsupported option
-   une="_SUPPORTED" cend        # end unsupported option
-   error=start "ERROR:"         # error message, terminate with 'end'
-
-   # Variables
-   deb=0                        # debug - set on command line
-   everything=""                # do not override defaults
-   logunsupported=0             # write unsupported options too
-
-   # Precreate arrays
-   # for each option:
-   option[""] = ""    # list of all options: default enabled/disabled
-   done[""] = 1       # marks option as having been output
-   requires[""] = ""  # requires by option
-   iffs[""] = ""      # if by option
-   enabledby[""] = "" # options that enable it by option
-   sets[""] = ""      # settings set by each option
-   setval[""] = ""    # value to set (indexed: 'option sets[option]')
-   # for each setting:
-   setting[""] = ""   # requires by setting
-   defaults[""] = ""  # used for a defaulted value
-   doneset[""] = 1    # marks setting as having been output
-   r[""] = ""         # Temporary array
-
-   # For decorating the output file
-   protect = ""
-}
-
-# The output file must be specified before any input:
-out == "" {
-   print "out=output.file must be given on the command line"
-   err = 1
-   exit 1
-}
-
-# The very first line indicates whether we are reading pre-processed
-# input or not, this must come *first* because 'PREPROCESSED' needs
-# to be the very first line in the temporary file.
-pre == -1{
-   if ($0 == "PREPROCESSED") {
-      pre = 0
-      next
-   } else {
-      pre = 1
-      print "PREPROCESSED" >out
-      # And fall through to continue processing
-   }
-}
-
-# While pre-processing if version is set to "search" look for a version string
-# in the following file.
-pre && version == "search" && version_file == ""{
-   version_file = FILENAME
-}
-
-pre && version == "search" && version_file != FILENAME{
-   print "version string not found in", version_file
-   err = 1
-   exit 1
-}
-
-pre && version == "search" && $0 ~ /^ \* libpng version/{
-   version = substr($0, 4)
-   print "version =", version >out
-   next
-}
-
-pre && FILENAME == version_file{
-   next
-}
-
-# variable=value
-#   Sets the given variable to the given value (the syntax is fairly
-#   free form, except for deb (you are expected to understand how to
-#   set the debug variable...)
-#
-#   This happens before the check on 'pre' below skips most of the
-#   rest of the actions, so the variable settings happen during
-#   preprocessing but are recorded in the END action too.  This
-#   allows them to be set on the command line too.
-$0 ~ /^[ 	]*version[ 	]*=/{
-   sub(/^[  ]*version[  ]*=[  ]*/, "")
-   version = $0
-   next
-}
-$0 ~ /^[ 	]*everything[ 	=]*off[ 	]*$/{
-   everything = "off"
-   next
-}
-$0 ~ /^[ 	]*everything[ 	=]*on[ 	]*$/{
-   everything = "on"
-   next
-}
-$0 ~ /^[ 	]*logunsupported[ 	=]*0[ 	]*$/{
-   logunsupported = 0
-   next
-}
-$0 ~ /^[ 	]*logunsupported[ 	=]*1[ 	]*$/{
-   logunsupported = 1
-   next
-}
-$1 == "deb" && $2 == "=" && NF == 3{
-   deb = $3
-   next
-}
-
-# Preprocessing - this just copies the input file with lines
-# that need preprocessing (just chunk at present) expanded
-# The bare "pre" instead of "pre != 0" crashes under Sunos awk
-pre && $1 != "chunk"{
-   print >out
-   next
-}
-
-# The first characters of the line determine how it is processed,
-# leading spaces are ignored.  In general tokens that are not
-# keywords are the names of options.  An option 'name' is
-# controlled by the definition of the corresponding macros:
-#
-#   PNG_name_SUPPORTED    The option is turned on
-#   PNG_NO_name
-#   PNG_NO_name_SUPPORTED If the first macro is not defined
-#                         either of these will turn the option off
-#
-# If none of these macros are defined the option is turned on, unless
-# the keyword 'off' is given in a line relating to the option.  The
-# keyword 'on' can also be given, but it will be ignored (since it is
-# the default.)
-#
-# In the syntax below a 'name' is indicated by "NAME", other macro
-# values are indicated by "MACRO", as with "NAME" the leading "PNG_"
-# is omitted, but in this case the "NO_" prefix and the "_SUPPORTED"
-# suffix are never used.
-#
-# Each line is introduced by a keyword - the first non-space characters
-# on the line.  A line starting with a '#' is a comment - it is totally
-# ignored.  Keywords are as follows, a NAME, is simply a macro name
-# without the leading PNG_, PNG_NO_ or the trailing _SUPPORTED.
-
-$1 ~ /^#/ || $0 ~ /^[ 	]*$/{
-   next
-}
-
-# com <comment>
-#   The whole line is placed in the output file as a comment with
-#   the preceding 'com' removed
-$1 == "com"{
-   if (NF > 1) {
-      # sub(/^[ 	]*com[ 	]*/, "")
-      $1 = ""
-      print comment $0, cend >out
-   } else
-      print start end >out
-   next
-}
-
-# version
-#   Inserts a version comment
-$1 == "version" && NF == 1{
-   if (version == "") {
-      print "ERROR: no version string set"
-      err = 1 # prevent END{} running
-      exit 1
-   }
-
-   print comment, version, cend >out
-   next
-}
-
-# file output input protect
-#   Informational: the official name of the input file (without
-#   make generated local directories), the official name of the
-#   output file and, if required, a name to use in a protection
-#   macro for the contents.
-$1 == "file" && NF >= 2{
-   print comment, $2, cend >out
-   print comment, "Machine generated file: DO NOT EDIT", cend >out
-   if (NF >= 3)
-      print comment, "Derived from:", $3, cend >out
-   protect = $4
-   if (protect != "") {
-      print start "#ifndef", protect end >out
-      print start "#define", protect end >out
-   }
-   next
-}
-
-# option NAME ( (requires|enables|if) NAME* | on | off | disabled |
-#                sets SETTING VALUE+ )*
-#     
-#   Declares an option 'NAME' and describes its default setting (disabled)
-#   and its relationship to other options.  The option is disabled
-#   unless *all* the options listed after 'requires' are set and at
-#   least one of the options listed after 'if' is set.  If the
-#   option is set then it turns on all the options listed after 'enables'.
-#
-#   Note that "enables" takes priority over the required/if/disabled/off
-#   setting of the target option.
-#
-#   The definition file may list an option as 'disabled': off by default,
-#   otherwise the option is enabled: on by default.  A later (and it must
-#   be later) entry may turn an option on or off explicitly.
-
-$1 == "option" && NF >= 2{
-   opt = $2
-   sub(/,$/,"",opt)
-   onoff = option[opt]  # records current (and the default is "", enabled)
-   key = ""
-   istart = 3
-   do {
-      if (istart == 1) {     # continuation line
-         val = getline
-
-         if (val != 1) { # error reading it
-            if (val == 0)
-               print "option", opt ": ERROR: missing continuation line"
-            else
-               print "option", opt ": ERROR: error reading continuation line"
-
-            # This is a hard error
-            err = 1 # prevent END{} running
-            exit 1
-         }
-      }
-
-      for (i=istart; i<=NF; ++i) {
-         val=$(i)
-         sub(/,$/,"",val)
-         if (val == "on" || val == "off" || val == "disabled" || val =="enabled") {
-            key = ""
-            if (onoff != val) {
-               # on or off can zap disabled or enabled:
-               if (onoff == "" || (onoff == "disabled" || onoff == "enabled") &&
-                   (val == "on" || val == "off")) {
-                  # It's easy to mis-spell the option when turning it
-                  # on or off, so warn about it here:
-                  if (onoff == "" && (val == "on" || val == "off")) {
-                     print "option", opt ": ERROR: turning unrecognized option", val
-                     # For the moment error out - it is safer
-                     err = 1 # prevent END{} running
-                     exit 1
-                  }
-                  onoff = val
-               } else {
-                  # Print a message, otherwise the error
-                  # below is incomprehensible
-                  print "option", opt ": currently", onoff ": attempt to turn", val
-                  break
-               }
-            }
-         } else if (val == "requires" || val == "if" || val == "enables" || val =="sets") {
-            key = val
-         } else if (key == "requires") {
-            requires[opt] = requires[opt] " " val
-         } else if (key == "if") {
-            iffs[opt] = iffs[opt] " " val
-         } else if (key == "enables") {
-            enabledby[val] = enabledby[val] " " opt
-         } else if (key == "sets") {
-            sets[opt] = sets[opt] " " val
-            key = "setval"
-            set = val
-         } else if (key == "setval") {
-            setval[opt " " set] = setval[opt " " set] " " val
-         } else
-            break # bad line format
-      }
-
-      istart = 1
-   } while (i > NF && $0 ~ /,$/)
-
-   if (i > NF) {
-      # Set the option, defaulting to 'enabled'
-      if (onoff == "") onoff = "enabled"
-      option[opt] = onoff
-      next
-   }
-   # Else fall through to the error handler
-}
-
-# chunk NAME [requires OPT] [enables LIST] [on|off|disabled]
-#   Expands to the 'option' settings appropriate to the reading and
-#   writing of an ancillary PNG chunk 'NAME':
-#
-#   option READ_NAME requires READ_ANCILLARY_CHUNKS [READ_OPT]
-#   option READ_NAME enables NAME LIST
-#   [option READ_NAME off]
-#   option WRITE_NAME requires WRITE_ANCILLARY_CHUNKS [WRITE_OPT]
-#   option WRITE_NAME enables NAME LIST
-#   [option WRITE_NAME off]
-
-pre != 0 && $1 == "chunk" && NF >= 2{
-   # 'chunk' is handled on the first pass by writing appropriate
-   # 'option' lines into the intermediate file.
-   opt = $2
-   sub(/,$/,"",opt)
-   onoff = ""
-   reqread = ""
-   reqwrite = ""
-   enables = ""
-   req = 0
-   istart = 3
-   do {
-      if (istart == 1) {     # continuation line
-         val = getline
-
-         if (val != 1) { # error reading it
-            if (val == 0)
-               print "chunk", opt ": ERROR: missing continuation line"
-            else
-               print "chunk", opt ": ERROR: error reading continuation line"
-
-            # This is a hard error
-            err = 1 # prevent END{} running
-            exit 1
-         }
-      }
-
-      # read the keywords/additional OPTS
-      for (i=istart; i<=NF; ++i) {
-         val = $(i)
-         sub(/,$/,"",val)
-         if (val == "on" || val == "off" || val == "disabled") {
-            if (onoff != val) {
-               if (onoff == "")
-                  onoff = val
-               else
-                  break # on/off conflict
-            }
-            req = 0
-         } else if (val == "requires")
-            req = 1
-         else if (val == "enables")
-            req = 2
-         else if (req == 1){
-            reqread = reqread " READ_" val
-            reqwrite = reqwrite " WRITE_" val
-         } else if (req == 2)
-            enables = enables " " val
-         else
-            break # bad line: handled below
-      }
-
-      istart = 1
-   } while (i > NF && $0 ~ /,$/)
-
-   if (i > NF) {
-      # Output new 'option' lines to the intermediate file (out)
-      print "option READ_" opt, "requires READ_ANCILLARY_CHUNKS" reqread, "enables", opt enables , onoff >out
-      print "option WRITE_" opt, "requires WRITE_ANCILLARY_CHUNKS" reqwrite, "enables", opt enables, onoff >out
-      next
-   }
-   # Else hit the error handler below - bad line format!
-}
-
-# setting MACRO ( requires MACRO* )* [ default VALUE ]
-#   Behaves in a similar way to 'option' without looking for NO_ or
-#   _SUPPORTED; the macro is enabled if it is defined so long as all
-#   the 'requires' macros are also defined.  The definitions may be
-#   empty, an error will be issued if the 'requires' macros are
-#   *not* defined.  If given the 'default' value is used if the
-#   macro is not defined.  The default value will be re-tokenised.
-#   (BTW: this is somewhat restrictive, it mainly exists for the
-#   support of non-standard configurations and numeric parameters,
-#   see the uses in scripts/options.dat
-
-$1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default")){
-   reqs = ""
-   deflt = ""
-   isdef = 0
-   key = ""
-   for (i=3; i<=NF; ++i)
-      if ($(i) == "requires" || $(i) == "default") {
-         key = $(i)
-         if (key == "default") isdef = 1
-      } else if (key == "requires")
-         reqs = reqs " " $(i)
-      else if (key == "default")
-         deflt = deflt " " $(i)
-      else
-         break # Format error, handled below
-
-   setting[$2] = reqs
-   # NOTE: this overwrites a previous value silently
-   if (isdef && deflt == "")
-      deflt = " " # as a flag to force output
-   defaults[$2] = deflt
-   next
-}
-
-# The order of the dependency lines (option, chunk, setting) is irrelevant
-# - the 'enables', 'requires' and 'if' settings will be used to determine
-# the correct order in the output and the final values in pnglibconf.h are
-# not order dependent.  'requires' and 'if' entries take precedence over
-# 'enables' from other options; if an option requires another option it
-# won't be set regardless of any options that enable it unless the other
-# option is also enabled.
-#
-# Similarly 'enables' trumps a NO_ definition in CFLAGS or pngusr.h
-#
-# For simplicity cycles in the definitions are regarded as errors,
-# even if they are not ambiguous.
-# A given NAME can be specified in as many 'option' lines as required, the
-# definitions are additive.
-
-# For backwards compatibility equivalent macros may be listed thus:
-#
-# = [NO_]NAME MACRO
-#   Makes -DMACRO equivalent to -DPNG_NO_NAME or -DPNG_NAME_SUPPORTED
-#   as appropriate.
-#
-# The definition is injected into the C compiler input when encountered
-# in the second pass (so all these definitions appear *after* the @
-# lines!)
-#
-# 'NAME' is as above, but 'MACRO' is the full text of the equivalent
-# old, deprecated, macro.
-
-$1 == "=" && NF == 3{
-   print "#ifdef PNG_" $3 >out
-   if ($2 ~ /^NO_/)
-      print "#   define PNG_" $2 >out
-   else
-      print "#   define PNG_" $2 "_SUPPORTED" >out
-   print "#endif" >out
-   next
-}
-
-# Lines may be injected into the C compiler input by preceding them
-# with an "@" character.  The line is copied with just the leading
-# @ removed.
-
-$1 ~ /^@/{
-   # sub(/^[ 	]*@/, "")
-   $1 = substr($1, 2)
-   print >out
-   next
-}
-
-# Check for unrecognized lines, because of the preprocessing chunk
-# format errors will be detected on the first pass independent of
-# any other format errors.
-{
-   print "options.awk: bad line (" NR "):", $0
-   err = 1 # prevent END{} running
-   exit 1
-}
-
-# For checking purposes names that start with "ok_" or "fail_" are
-# not output to pnglibconf.h and must be either enabled or disabled
-# respectively for the build to succeed.  This allows interdependencies
-# between options of the form "at least one of" or "at most one of"
-# to be checked.  For example:
-#
-# option FLOATING_POINT enables ok_math
-# option FIXED_POINT enables ok_math
-#   This ensures that at least one of FLOATING_POINT and FIXED_POINT
-#   must be set for the build to succeed.
-#
-# option fail_math requires FLOATING_POINT FIXED_POINT
-#   This means the build will fail if *both* FLOATING_POINT and
-#   FIXED_POINT are set (this is an example; in fact both are allowed.)
-#
-# If all these options were given the build would require exactly one
-# of the names to be enabled.
-
-END{
-   # END{} gets run on an exit (a traditional awk feature)
-   if (err) exit 1
-
-   if (pre) {
-      # Record the final value of the variables
-      print "deb =", deb >out
-      if (everything != "") {
-         print "everything =", everything >out
-      }
-      print "logunsupported =", logunsupported >out
-      exit 0
-   }
-
-   # Do the options first (allowing options to set settings).  The dependency
-   # tree is thus:
-   #
-   #   name     >     name
-   #   name requires  name
-   #   name if        name
-   #   name enabledby name
-   #
-   # First build a list 'tree' by option of all the things on which
-   # it depends.
-   print "" >out
-   print "/* OPTIONS */" >out
-   print comment, "options", cend >out
-   for (opt in enabledby) tree[opt] = 1  # may not be explicit options
-   for (opt in option) if (opt != "") {
-      o = option[opt]
-      # option should always be one of the following values
-      if (o != "on" && o != "off" && o != "disabled" && o != "enabled") {
-         print "internal option error (" o ")"
-         exit 1
-      }
-      tree[opt] = ""   # so unlisted options marked
-   }
-   for (opt in tree) if (opt != "") {
-      if (tree[opt] == 1) {
-         tree[opt] = ""
-         if (option[opt] != "") {
-            print "internal error (1)"
-            exit 1
-         }
-         # Macros only listed in 'enables' remain off unless
-         # one of the enabling macros is on.
-         option[opt] = "disabled"
-      }
-
-      split("", list) # clear 'list'
-      # Now add every requires, iffs or enabledby entry to 'list'
-      # so that we can add a unique list of requirements to tree[i]
-      split(requires[opt] iffs[opt] enabledby[opt], r)
-      for (i in r) list[r[i]] = 1
-      for (i in list) tree[opt] = tree[opt] " " i
-   }
-
-   # print the tree for extreme debugging
-   if (deb > 2) for (i in tree) if (i != "") print i, "depends-on" tree[i]
-
-   # Ok, now check all options marked explicitly 'on' or 'off':
-   #
-   # If an option[opt] is 'on' then turn on all requires[opt]
-   # If an option[opt] is 'off' then turn off all enabledby[opt]
-   #
-   # Error out if we have to turn 'on' to an 'off' option or vice versa.
-   npending = 0
-   for (opt in option) if (opt != "") {
-      if (option[opt] == "on" || option[opt] == "off") {
-         pending[++npending] = opt
-      }
-   }
-
-   err = 0 # set on error
-   while (npending > 0) {
-      opt = pending[npending--]
-      if (option[opt] == "on") {
-         nreqs = split(requires[opt], r)
-         for (j=1; j<=nreqs; ++j) {
-            if (option[r[j]] == "off") {
-               print "option", opt, "turned on, but requirement", r[j], "is turned off"
-               err = 1
-            } else if (option[r[j]] != "on") {
-               option[r[j]] = "on"
-               pending[++npending] = r[j]
-            }
-         }
-      } else {
-         if (option[opt] != "off") {
-            print "internal error (2)"
-            exit 1
-         }
-         nreqs = split(enabledby[opt], r)
-         for (j=1; j<=nreqs; ++j) {
-            if (option[r[j]] == "on") {
-               print "option", opt, "turned off, but enabled by", r[j], "which is turned on"
-               err = 1
-            } else if (option[r[j]] != "off") {
-               option[r[j]] = "off"
-               pending[++npending] = r[j]
-            }
-         }
-      }
-   }
-   if (err) exit 1
-
-   # Sort options:
-   print "PNG_DFN_START_SORT 2" >out
-
-   # option[i] is now the complete list of all the tokens we may
-   # need to output, go through it as above, depth first.
-   finished = 0
-   while (!finished) {
-      finished = 1
-      movement = 0 # done nothing
-      for (i in option) if (!done[i]) {
-         nreqs = split(tree[i], r)
-         if (nreqs > 0) {
-            for (j=1; j<=nreqs; ++j) if (!done[r[j]]) {
-               break
-            }
-            if (j<=nreqs) {
-               finished = 0
-               continue  # next option
-            }
-         }
-
-         # All the requirements have been processed, output
-         # this option.  An option is _SUPPORTED if:
-         #
-         # all 'requires' are _SUPPORTED AND
-         # at least one of the 'if' options are _SUPPORTED AND
-         # EITHER:
-         #   The name is _SUPPORTED (on the command line)
-         # OR:
-         #   an 'enabledby' is _SUPPORTED
-         # OR:
-         #   NO_name is not defined AND
-         #   the option is not disabled; an option is disabled if:
-         #    option == off
-         #    option == disabled && everything != on
-         #    option == "" && everything == off
-         if (deb) print "option", i
-         print "" >out
-         print "/* option:", i, option[i] >out
-         print " *   requires:  " requires[i] >out
-         print " *   if:        " iffs[i] >out
-         print " *   enabled-by:" enabledby[i] >out
-         print " *   sets:      " sets[i], "*/" >out
-         print "#undef PNG_on" >out
-         print "#define PNG_on 1" >out
-
-         # requires
-         nreqs = split(requires[i], r)
-         for (j=1; j<=nreqs; ++j) {
-            print "#ifndef PNG_" r[j] "_SUPPORTED" >out
-            print "#   undef PNG_on /*!" r[j] "*/" >out
-            # This error appears in the final output if something
-            # was switched 'on' but the processing above to force
-            # the requires did not work
-            if (option[i] == "on") {
-               print error, i, "requires", r[j] end >out
-            }
-            print "#endif" >out
-         }
-
-         # if
-         have_ifs = 0
-         nreqs = split(iffs[i], r)
-         print "#undef PNG_no_if" >out
-         if (nreqs > 0) {
-            have_ifs = 1
-            print "/* if" iffs[i], "*/" >out
-            print "#define PNG_no_if 1" >out
-            for (j=1; j<=nreqs; ++j) {
-               print "#ifdef PNG_" r[j] "_SUPPORTED" >out
-               print "#   undef PNG_no_if /*" r[j] "*/" >out
-               print "#endif" >out
-            }
-            print "#ifdef PNG_no_if /*missing if*/" >out
-            print "#   undef PNG_on" >out
-            # There is no checking above for this, because we
-            # don't know which 'if' to choose, so whine about
-            # it here:
-            if (option[i] == "on") {
-               print error, i, "needs one of:", iffs[i] end >out
-            }
-            print "#endif" >out
-         }
-
-         print "#ifdef PNG_on /*requires, if*/" >out
-         # enables
-         print "#   undef PNG_not_enabled" >out
-         print "#   define PNG_not_enabled 1" >out
-         print "   /* enabled by" enabledby[i], "*/" >out
-         nreqs = split(enabledby[i], r)
-         for (j=1; j<=nreqs; ++j) {
-            print "#ifdef PNG_" r[j] "_SUPPORTED" >out
-            print "#   undef PNG_not_enabled /*" r[j] "*/" >out
-            # Oops, probably not intended (should be factored
-            # out by the checks above).
-            if (option[i] == "off") {
-               print error, i, "enabled by:", r[j] end >out
-            }
-            print "#endif" >out
-         }
-
-         print "#   ifndef PNG_" i "_SUPPORTED /*!command line*/" >out
-         print "#    ifdef PNG_not_enabled /*!enabled*/" >out
-         # 'have_ifs' here means that everything = "off" still allows an 'if' on
-         # an otherwise enabled option to turn it on; otherwise the 'if'
-         # handling is effectively disabled by 'everything = off'
-         if (option[i] == "off" || option[i] == "disabled" && everything != "on" || option[i] == "enabled" && everything == "off" && !have_ifs) {
-            print "#      undef PNG_on /*default off*/" >out
-         } else {
-            print "#      ifdef PNG_NO_" i >out
-            print "#       undef PNG_on /*turned off*/" >out
-            print "#      endif" >out
-            print "#      ifdef PNG_NO_" i "_SUPPORTED" >out
-            print "#       undef PNG_on /*turned off*/" >out
-            print "#      endif" >out
-         }
-         print "#    endif /*!enabled*/" >out
-         print "#    ifdef PNG_on" >out
-         # The _SUPPORTED macro must be defined so that dependent
-         # options output later work.
-         print "#      define PNG_" i "_SUPPORTED" >out
-         print "#    endif" >out
-         print "#   endif /*!command line*/" >out
-         # If PNG_on is still set the option should be defined in
-         # pnglibconf.h
-         print "#   ifdef PNG_on" >out
-         if (i ~ /^fail_/) {
-            print error, i, "is on: enabled by:" iffs[i] enabledby[i] ", requires" requires[i] end >out
-         } else if (i !~ /^ok_/) {
-            print def i sup >out
-            # Supported option, set required settings
-            nreqs = split(sets[i], r)
-            for (j=1; j<=nreqs; ++j) {
-               print "#    ifdef PNG_set_" r[j] >out
-               # Some other option has already set a value:
-               print error, i, "sets", r[j] ": duplicate setting" end >out
-               print error, "   previous value: " end "PNG_set_" r[j] >out
-               print "#    else" >out
-               # Else set the default: note that this won't accept arbitrary
-               # values, the setval string must be acceptable to all the C
-               # compilers we use.  That means it must be VERY simple; a number,
-               # a name or a string.
-               print "#     define PNG_set_" r[j], setval[i " " r[j]] >out
-               print "#    endif" >out
-            }
-         }
-         print "#   endif /* definition */" >out
-         print "#endif /*requires, if*/" >out
-         if (logunsupported || i ~ /^ok_/) {
-            print "#ifndef  PNG_on" >out
-            if (logunsupported) {
-               print und i une >out
-            }
-            if (i ~ /^ok_/) {
-               print error, i, "not enabled: requires:" requires[i] ", enabled by:" iffs[i] enabledby[i] end >out
-            }
-            print "#endif" >out
-         }
-
-         done[i] = 1
-         ++movement
-      }
-
-      if (!finished && !movement) {
-         print "option: loop or missing option in dependency tree, cannot process:"
-         for (i in option) if (!done[i]) {
-            print "  option", i, "depends on" tree[i], "needs:"
-            nreqs = split(tree[i], r)
-            if (nreqs > 0) for (j=1; j<=nreqs; ++j) if (!done[r[j]]) {
-               print "   " r[j]
-            }
-         }
-         exit 1
-      }
-   }
-   print "PNG_DFN_END_SORT" >out
-   print comment, "end of options", cend >out
-
-   # Do the 'setting' values second, the algorithm the standard
-   # tree walk (O(1)) done in an O(2) while/for loop; iterations
-   # settings x depth, outputting the deepest required macros
-   # first.
-   print "" >out
-   print "/* SETTINGS */" >out
-   print comment, "settings", cend >out
-   # Sort (in dfn.awk) on field 2, the setting name
-   print "PNG_DFN_START_SORT 2" >out
-   finished = 0
-   while (!finished) {
-      finished = 1
-      movement = 0 # done nothing
-      for (i in setting) if (!doneset[i]) {
-         nreqs = split(setting[i], r)
-         if (nreqs > 0) {
-            # By default assume the requires values are options, but if there
-            # is no option with that name check for a setting
-            for (j=1; j<=nreqs; ++j) if (option[r[j]] == "" && !doneset[r[j]]) {
-               break
-            }
-            if (j<=nreqs) {
-               finished = 0
-               continue # try a different setting
-            }
-         }
-
-         # All the requirements have been processed, output
-         # this setting.
-         if (deb) print "setting", i
-         deflt = defaults[i]
-         # Remove any spurious trailing spaces
-         sub(/ *$/,"",deflt)
-         # A leading @ means leave it unquoted so the preprocessor
-         # can substitute the build time value
-         if (deflt ~ /^ @/)
-            deflt = " " subs substr(deflt, 3) sube
-         print "" >out
-         print "/* setting: ", i >out
-         print " *   requires:" setting[i] >out
-         print " *   default: ", defaults[i] deflt, "*/" >out
-         for (j=1; j<=nreqs; ++j) {
-            if (option[r[j]] != "")
-               print "#ifndef PNG_" r[j] "_SUPPORTED" >out
-            else
-               print "#ifndef PNG_" r[j] >out
-            print error, i, "requires", r[j] end >out
-            print "# endif" >out
-         }
-         # The precedence is:
-         #
-         #  1) External definition; trumps:
-         #  2) Option 'sets' value; trumps:
-         #  3) Setting 'default'
-         #
-         print "#ifdef PNG_" i >out
-         # PNG_<i> is defined, so substitute the value:
-         print def i, subs "PNG_" i sube end >out
-         print "#else /* use default */" >out
-         print "# ifdef PNG_set_" i >out
-         # Value from an option 'sets' argument
-         print def i, subs "PNG_set_" i sube end >out
-         # This is so that subsequent tests on the setting work:
-         print "#  define PNG_" i, "1" >out
-         if (defaults[i] != "") {
-            print "# else /*default*/" >out
-            print def i deflt end >out
-            print "#  define PNG_" i, "1" >out
-         }
-         print "# endif /* defaults */" >out
-         print "#endif /* setting", i, "*/" >out
-
-         doneset[i] = 1
-         ++movement
-      }
-
-      if (!finished && !movement) {
-         print "setting: loop or missing setting in 'requires', cannot process:"
-         for (i in setting) if (!doneset[i]) {
-            print "  setting", i, "requires" setting[i]
-         }
-         exit 1
-      }
-   }
-   print "PNG_DFN_END_SORT" >out
-   print comment, "end of settings", cend >out
-
-   # Regular end - everything looks ok
-   if (protect != "") {
-      print start "#endif", "/*", protect, "*/" end >out
-   }
-}
diff --git a/src/png/libpng/scripts/pnglibconf.dfa b/src/png/libpng/scripts/pnglibconf.dfa
deleted file mode 100644
index b298a72f3..000000000
--- a/src/png/libpng/scripts/pnglibconf.dfa
+++ /dev/null
@@ -1,919 +0,0 @@
-# scripts/pnglibconf.dfa - library build configuration control
-#
-@/*- pnglibconf.dfn intermediate file
-@ *  generated from scripts/pnglibconf.dfa
-@ */
-#
-com pnglibconf.h - library build configuration
-com
-version
-com
-com Copyright (c) 1998-2017 Glenn Randers-Pehrson
-com
-com This code is released under the libpng license.
-com For conditions of distribution and use, see the disclaimer
-com and license in png.h
-com
-
-file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
-
-# This file is preprocessed by scripts/options.awk and the
-# C compiler to generate 'pnglibconf.h' - a list of all the
-# configuration options.  The file lists the various options
-# that can *only* be specified during the libpng build;
-# pnglibconf.h freezes the definitions selected for the specific
-# build.
-#
-# The syntax is detailed in scripts/options.awk; this is a summary
-# only:
-#
-# setting <name> [requires ...] [default]
-#    #define PNG_<name> <value>  /* value comes from current setting */
-# option <name> [requires ...] [if ...] [enables ...] [disabled]
-#    #define PNG_<name>_SUPPORTED if the requirements are met and
-#    enable the other options listed
-# chunk <name> [requires ...] [enables ...] [disabled]
-#    Enable chunk processing for the given ancillary chunk; any
-#    'requires something' expands to READ_something for read and
-#    WRITE_something for write, but the enables list members are
-#    used as given (e.g. enables GAMMA just expands to that on the
-#    correspond READ_name and WRITE_name lines.)
-#
-# "," may be used to separate options on an 'option' line and is ignored; it
-# doesn't change the meaning of the line.  (NOT setting, where "," becomes
-# part of the setting!)  A comma at the end of an option line causes a
-# continuation (the next line is included in the option too.)
-#
-# Note that the 'on' and 'off' keywords, while valid on both option
-# and chunk, should not be used in this file because they force the
-# relevant options on or off.
-
-#----------------------------------------------------------------------
-
-# The following setting, option and chunk values can all be changed
-# while building libpng:
-#
-# setting: change 'setting' lines to fine tune library performance;
-#   changes to the settings don't affect the libpng API functionally
-#
-# option: change 'option' lines to remove or add capabilities from
-#   or to the library; options change the library API
-#
-# chunk: change 'chunk' lines to remove capabilities to process
-#   optional ('ancillary') chunks.  This does not prevent PNG
-#   decoding but does change the libpng API because some chunks
-#   will be ignored.
-#
-# There are three ways of disabling features, in no particular order:
-#
-# 1) Create 'pngusr.h', enter the required private build information
-# detailed below and #define PNG_NO_<option> for each option you
-# don't want in that file in that file.  You can also turn on options
-# using PNG_<option>_SUPPORTED.  When you have finished rerun
-# configure and rebuild pnglibconf.h file with -DPNG_USER_CONFIG:
-#
-#  make clean
-#  CPPFLAGS='-DPNG_USER_CONFIG' ./configure
-#  make pnglibconf.h
-#
-# pngusr.h is only used during the creation of pnglibconf.h, but it
-# is safer to ensure that -DPNG_USER_CONFIG is specified throughout
-# the build by changing the CPPFLAGS passed to the initial ./configure
-#
-# 2) Add definitions of the settings you want to change to
-# CPPFLAGS; for example:
-#
-#   -DPNG_DEFAULT_READ_MACROS=0
-#
-# (This would change the default to *not* use read macros.)  Be
-# very careful to change only settings that don't alter the API
-# because this approach bypasses the private build checking.  You
-# can also change settings from pngpriv.h (read pngpriv.h) safely
-# without API changes.  Do that in the same way.
-#
-# 3) Write a new '.dfa' file (say 'pngusr.dfa') and in this file
-# provide override values for setting entries and turn option or
-# chunk values explicitly 'on' or 'off':
-#
-#    setting FOO default VALUE
-#    option BAR [on|off]
-#
-# Then add this file to the options.awk command line (the *first*
-# one) after this file.  The make macro DFA_XTRA is provided to make
-# this easier (set it like CPPFLAGS prior to running ./configure).
-# Look at the builds below contrib/pngminim for some extreme examples
-# of how this can be used.
-#
-# Don't edit this file unless you are contributing a patch to
-# libpng and need new or modified options/settings.
-#----------------------------------------------------------------------
-
-# The following causes commented out #undef lines to be written to
-# pnglibconf.h; this can be stopped by logunsupported=0 in a later
-# file or on the command line (after pnglibconf.dfa)
-
-logunsupported = 1
-
-# The following allows the output from configure to modify the contents of
-# pnglibconf.h
-
-@#ifdef HAVE_CONFIG_H
-@#  include "config.h"
-@#endif
-
-# PNG_USER_CONFIG has to be defined on the compiler command line
-# to cause pngusr.h to be read while constructing pnglibconf.h
-#
-# If you create a private DLL you need to define the following
-# macros in the file 'pngusr.h' and set -DPNG_USER_CONFIG for
-# compilation (i.e. in CPPFLAGS.)
-# #define PNG_USER_PRIVATEBUILD \
-#     <Describes by whom and why this version of the DLL was built>
-#  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
-# #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to
-#        distinguish your DLL from those of the official release. These
-#        correspond to the trailing letters that come after the version
-#        number and must match your private DLL name>
-#  e.g. // private DLL "libpng13gx.dll"
-#       #define PNG_USER_DLLFNAME_POSTFIX "gx"
-#
-# The following macros are also at your disposal if you want to complete the
-# DLL VERSIONINFO structure.
-# - PNG_USER_VERSIONINFO_COMMENTS
-# - PNG_USER_VERSIONINFO_COMPANYNAME
-# - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
-
-# It is necessary to include configures definitions here so that AC_DEFINE
-# in configure.ac works in a comprehensible way
-@#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
-@#  include "config.h"
-@#endif
-
-@#ifdef PNG_USER_CONFIG
-@#  include "pngusr.h"
-@#endif
-
-# This is a special fixup for the Watcom C compiler on Windows, which has
-# multiple procedure call standards.  Unless PNG_API_RULE is set explicitly
-# (i.e. if it is not defined at this point) it will be forced to '2' here when
-# using Watcom.  This indicates to the other header files that Watcom behaviour
-# is required where appropriate.
-
-@#ifdef __WATCOMC__
-@#  ifndef PNG_API_RULE
-@#     define PNG_API_RULE 2 /* Use Watcom calling conventions */
-@#  endif
-@#endif
-
-# IN DEVELOPMENT
-# These are currently experimental features; define them if you want (NOTE:
-# experimental options must be disabled before they are defined in this file!)
-
-# NONE
-
-# Note that PNG_USER_CONFIG only has an effect when building
-# pnglibconf.h
-
-setting USER_CONFIG
-setting USER_PRIVATEBUILD
-setting USER_DLLFNAME_POSTFIX
-setting USER_VERSIONINFO_COMMENTS
-setting USER_VERSIONINFO_COMPANYNAME
-setting USER_VERSIONINFO_LEGALTRADEMARKS
-
-# Record the 'API rule' used to select calling conventions on
-# those systems that support such things (see all the comments in
-# pngconf.h)
-# Changing this setting has a fundamental affect on the PNG ABI,
-# do not release shared libraries with this changed.
-
-setting API_RULE default 0
-
-# This allows a prefix to be added to the front of every API function name (and
-# therefore every symbol) by redefining all the function names with the prefix
-# at the end of pnglibconf.h.  It also turns on similar internal symbol renaming
-# by causing a similar build-time only file, pngprefix.h, to be generated.
-
-setting PREFIX
-
-# Implementation specific control of the optimizations, enabled by those
-# hardware or software options that need it (typically when run-time choices
-# must be made by the user)
-option SET_OPTION disabled
-
-# These options are specific to the ARM NEON hardware optimizations.  At present
-# these optimizations depend on GCC specific pre-processing of an assembler (.S)
-# file so they probably won't work with other compilers.
-#
-# ARM_NEON_OPT: unset: check at compile time (__ARM_NEON__ must be defined by
-#                      the compiler, typically as a result of specifying
-#                      CC="gcc -mfpu=neon".)
-#                   0: disable (even if the CPU has a NEON FPU.)
-#                   1: check at run time (via ARM_NEON_{API,CHECK})
-#                   2: switch on unconditionally (inadvisable - instead pass
-#                      -mfpu=neon to GCC in CC)
-#           When building libpng avoid using any setting other than '0'; '1' is
-#           set automatically when either 'API' or 'CHECK' are configured in,
-#           '2' should not be necessary as -mfpu=neon will achieve the same
-#           effect as well as applying NEON optimizations to the rest of the
-#           libpng code.
-#           NOTE: any setting other than '0' requires ALIGNED_MEMORY
-# ARM_NEON_API:   (PNG_ARM_NEON == 1) allow the optimization to be switched on
-#                 with png_set_option
-# ARM_NEON_CHECK: (PNG_ARM_NEON == 1) compile a run-time check to see if Neon
-#                 extensions are supported. This is poorly supported and
-#                 deprecated - use the png_set_option API.
-setting ARM_NEON_OPT
-option ARM_NEON_API disabled requires ALIGNED_MEMORY enables SET_OPTION,
-   sets ARM_NEON_OPT 1
-option ARM_NEON_CHECK disabled requires ALIGNED_MEMORY,
-   sets ARM_NEON_OPT 1
-
-# These options are specific to the PowerPC VSX hardware optimizations.
-#
-# POWERPC_VSX_OPT: unset: check at compile time (__PPC64__,__ALTIVEC__,__VSX__
-#                      must be defined by the compiler, typically as a result
-#                      of specifying
-#                      "-mvsx -maltivec" compiler flags)
-#                   0: disable (even if the CPU supports VSX.)
-#                   1: check at run time (via POWERPC_VSX_{API,CHECK})
-#                   2: switch on unconditionally (inadvisable - instead pass
-#                      -mvsx -maltivec to compiler options)
-#           When building libpng avoid using any setting other than '0'; '1' is
-#           set automatically when either 'API' or 'CHECK' are configured in,
-#           '2' should not be necessary as "-mvsx -maltivec" will achieve the same
-#           effect as well as applying VSX optimizations to the rest of the
-#           libpng code.
-# POWERPC_VSX_API:   (PNG_POWERPC_VSX == 1) allow the optimization to be switched on
-#                 with png_set_option
-# POWERPC_VSX_CHECK: (PNG_POWERPC_VSX == 1) compile a run-time check to see if VSX
-#                 extensions are supported. This is supported not for all OSes
-#                 (see contrib/powerpc/README)
-setting POWERPC_VSX_OPT
-option POWERPC_VSX_API disabled enables SET_OPTION,
-  sets POWERPC_VSX_OPT 1
-option POWERPC_VSX_CHECK disabled,
-  sets POWERPC_VSX_OPT 1
-
-
-# These settings configure the default compression level (0-9) and 'strategy';
-# strategy is as defined by the implementors of zlib. It describes the input
-# data and modifies the zlib parameters in an attempt to optimize the balance
-# between search and huffman encoding in the zlib algorithms.  The defaults are
-# the zlib.h defaults - the apparently recursive definition does not arise
-# because the name of the setting is prefixed by PNG_
-#
-# The TEXT values are the defaults when writing compressed text (all forms)
-
-# Include the zlib header so that the defaults below are known
-@#  include <zlib.h>
-
-# The '@' here means to substitute the value when pnglibconf.h is built
-setting Z_DEFAULT_COMPRESSION default @Z_DEFAULT_COMPRESSION
-# TODO: why aren't these Z_RLE; zlib.h says that Z_RLE, specifically, is
-# appropriate for PNG images, maybe it doesn't exist in all versions?
-setting Z_DEFAULT_STRATEGY default @Z_FILTERED
-setting Z_DEFAULT_NOFILTER_STRATEGY default @Z_DEFAULT_STRATEGY
-setting ZLIB_VERNUM default @ZLIB_VERNUM
-
-# Linkage of:
-#
-#  API:      libpng API functions
-#  CALLBACK: internal non-file-local callbacks
-#  FUNCTION: internal non-file-local functions
-#  DATA:     internal non-file-local (const) data
-setting LINKAGE_API default extern
-setting LINKAGE_CALLBACK default extern
-setting LINKAGE_FUNCTION default extern
-setting LINKAGE_DATA default extern
-
-setting TEXT_Z_DEFAULT_COMPRESSION default @Z_DEFAULT_COMPRESSION
-setting TEXT_Z_DEFAULT_STRATEGY default @Z_DEFAULT_STRATEGY
-
-# Default to using the read macros
-
-setting DEFAULT_READ_MACROS default 1
-
-# The alternative is to call functions to read PNG values, if
-# the functions are turned *off* the read macros must always
-# be enabled, so turning this off will actually force the
-# USE_READ_MACROS option on (see pngconf.h)
-
-option READ_INT_FUNCTIONS requires READ
-
-# The same for write  but these can only be switched off if no writing
-# is required at all - hence the use of a 'disabled', not a 'requires'.
-# If these are needed, they are enabled in the 'WRITE options' section
-# below.
-
-option WRITE_INT_FUNCTIONS disabled
-
-# Error controls
-#
-# WARNINGS: normally on, if off no warnings are generated
-# ERROR_TEXT: normally on, if off errors happen but there is no message
-# ERROR_NUMBERS: unimplemented feature, therefore disabled
-# BENIGN_ERRORS: support for just issuing warnings for recoverable errors
-#
-# BENIGN_READ_ERRORS:
-#     By default recoverable errors on read should just generate warnings,
-#     generally safe but PNG files that don't conform to the specification will
-#     be accepted if a meaningful result can be produced.
-#
-# BENIGN_WRITE_ERRORS:
-#     By default recoverable errors on write should just generate warnings,
-#     not generally safe because this allows the application to write invalid
-#     PNG files.  Applications should enable this themselves; it's useful
-#     because it means that a failure to write an ancillary chunk can often be
-#     ignored.
-
-option WARNINGS
-option ERROR_TEXT
-option ERROR_NUMBERS disabled
-
-option BENIGN_ERRORS
-option BENIGN_WRITE_ERRORS requires BENIGN_ERRORS disabled
-option BENIGN_READ_ERRORS requires BENIGN_ERRORS
-
-
-# Generic options - affect both read and write.
-
-option MNG_FEATURES
-
-# Arithmetic options, the first is the big switch that chooses between internal
-# floating and fixed point arithmetic implementations - it does not affect any
-# APIs.  The second two (the _POINT settings) switch off individual APIs.
-#
-# Prior to libpng 1.6.8 one of the API (_POINT) variants had to be selected.  At
-# 1.6.8 this restriction has been removed; the simplified API can be used
-# without enabling any of the low level fixed/floating APIs.
-
-option FLOATING_ARITHMETIC
-option FLOATING_POINT
-option FIXED_POINT
-
-# This protects us against compilers that run on a windowing system
-# and thus don't have or would rather us not use the stdio types:
-# stdin, stdout, and stderr.  The only one currently used is stderr
-# in png_error() and png_warning().  #defining PNG_NO_CONSOLE_IO will
-# prevent these from being compiled and used. #defining PNG_NO_STDIO
-# will also prevent these, plus will prevent the entire set of stdio
-# macros and functions (FILE *, printf, etc.) from being compiled and used,
-# unless (PNG_DEBUG > 0) has been #defined.
-
-option STDIO
-option CONSOLE_IO requires STDIO
-
-# Note: prior to 1.5.0 this option could not be disabled if STDIO
-# was enabled.  Prior to 1.5.3 this option required STDIO
-
-option TIME_RFC1123
-
-# PNG_SETJMP_NOT_SUPPORTED is an old equivalent for NO_SETJMP
-
-option SETJMP
-= NO_SETJMP SETJMP_NOT_SUPPORTED
-
-# If this is disabled it is not possible for apps to get the
-# values from the 'info' structure, this effectively removes
-# quite a lot of the READ API.
-
-option EASY_ACCESS
-
-# Added at libpng-1.2.0
-
-option USER_MEM
-
-# Added at libpng-1.4.0
-
-option IO_STATE
-
-# Libpng limits: limit the size of images and data on read.
-#
-# If this option is disabled all the limit checking code will be disabled:
-
-option USER_LIMITS requires READ
-
-# The default settings given below for the limits mean that libpng will
-# limit the size of images or the size of data in ancillary chunks to less
-# than the specification or implementation limits. Settings have the
-# following interpretations:
-#
-# USER_WIDTH_MAX: maximum width of an image that will be read
-# USER_HEIGHT_MAX: maximum height
-# USER_CHUNK_MALLOC_MAX: maximum in-memory (decompressed) size of a single chunk
-# USER_CHUNK_CACHE_MAX: maximum number of chunks to be cached
-#
-# Only chunks that are variable in number are counted towards the
-
-# Use 0x7fffffff for unlimited
-setting USER_WIDTH_MAX default        1000000
-setting USER_HEIGHT_MAX default       1000000
-
-# Use 0 for unlimited
-setting USER_CHUNK_CACHE_MAX default     1000
-setting USER_CHUNK_MALLOC_MAX default 8000000
-
-# If this option is enabled APIs to set the above limits at run time are added;
-# without this the hardwired (compile time) limits will be used.
-option SET_USER_LIMITS requires USER_LIMITS
-
-# All of the following options relate to code capabilities for
-# processing image data before creating a PNG or after reading one.
-# You can remove these capabilities safely and still be PNG
-# conformant, however the library that results is still non-standard.
-# See the comments above about how to change options and settings.
-
-# READ options
-#
-# WARNING: in libpng 1.5 maintained configuration compatibility with earlier
-# versions.  In some cases turning off an option turned off other options, in
-# others it was ineffective unless dependent options were also turned off.
-# Libpng 1.6 changes this: in general if you turn off an option that affects
-# APIs it stays off and simply disables APIs that depend on it.
-#
-# As a result if you simply port the libpng 1.5 configuration to libpng 1.6 you
-# will probably see build failures due to missing APIs.  Fixing these failures
-# requires some, perhaps considerable, knowledge of what your libpng using
-# applications are doing, fortunately there is no great reason for you to move
-# to libpng 1.6; the new interfaces in 1.6 will take several years to become
-# popular.
-
-option READ enables READ_INTERLACING SET_OPTION
-
-# Disabling READ_16BIT does not disable reading 16-bit PNG files, but it
-# forces them to be chopped down to 8-bit, and disables any 16-bit
-# processing after that has happened.  You need to be sure to enable
-# READ_SCALE_16_TO_8 or READ_STRIP_16_TO_8 when you disable READ_16BIT for
-# this to work properly.  You should disable the other option if you need to
-# ensure a particular conversion (otherwise the app can chose.)
-
-option READ_16BIT requires READ enables 16BIT
-
-option READ_QUANTIZE requires READ
-
-option READ_TRANSFORMS requires READ
-= NO_READ_TRANSFORMS READ_TRANSFORMS_NOT_SUPPORTED
-
-# Read gamma handling.  Gamma processing is a core part of libpng and many of
-# the capabilities are dependent on libpng performing gamma correction.
-#
-# In libpng 1.6 disabling gamma processing (setting PNG_NO_READ_GAMMA)
-# consistently disables those parts of the API that depend on it.  Prior to
-# 1.6.0 this was not true; the results were unpredictable and varied between
-# releases.
-#
-# If you disable gamma processing and your program no longer compiles you need
-# to ask whether you really need the APIs that are missing.  If you do then you
-# almost certainly need the gamma processing.
-#
-# If you handle gamma issues outside libpng then you do not need the libpng
-# gamma processing; and it is an enormous waste of space.  You just need to
-# remove the use of libpng APIs that depend on it.
-option READ_GAMMA requires READ_TRANSFORMS, READ_gAMA, READ_sRGB
-
-option READ_ALPHA_MODE requires READ_TRANSFORMS, READ_GAMMA
-option READ_BACKGROUND requires READ_TRANSFORMS, READ_STRIP_ALPHA, READ_GAMMA
-option READ_BGR requires READ_TRANSFORMS
-option READ_EXPAND_16 requires READ_TRANSFORMS, READ_16BIT, READ_EXPAND
-option READ_EXPAND requires READ_TRANSFORMS
-option READ_FILLER requires READ_TRANSFORMS
-option READ_GRAY_TO_RGB requires READ_TRANSFORMS
-option READ_INVERT_ALPHA requires READ_TRANSFORMS
-option READ_INVERT requires READ_TRANSFORMS
-option READ_PACK requires READ_TRANSFORMS
-option READ_PACKSWAP requires READ_TRANSFORMS
-option READ_RGB_TO_GRAY requires READ_TRANSFORMS, READ_GAMMA enables COLORSPACE
-option READ_SCALE_16_TO_8 requires READ_TRANSFORMS
-option READ_SHIFT requires READ_TRANSFORMS
-option READ_STRIP_16_TO_8 requires READ_TRANSFORMS
-option READ_STRIP_ALPHA requires READ_TRANSFORMS
-option READ_SWAP_ALPHA requires READ_TRANSFORMS
-option READ_SWAP requires READ_TRANSFORMS, READ_16BIT
-option READ_USER_TRANSFORM requires READ_TRANSFORMS
-
-option PROGRESSIVE_READ requires READ
-option SEQUENTIAL_READ requires READ
-
-# You can define PNG_NO_PROGRESSIVE_READ if you don't do progressive reading.
-# This is not talking about interlacing capability!  You'll still have
-# interlacing unless you turn off the following which is required
-# for PNG-compliant decoders.  (In other words, do not do this - in
-# fact it can't be disabled from the command line!)
-#option READ_INTERLACING requires READ
-
-option READ_COMPOSITE_NODIV requires READ
-= NO_READ_COMPOSITE_NODIV NO_READ_COMPOSITED_NODIV
-
-# Inch conversions
-
-option INCH_CONVERSIONS
-= INCH_CONVERSIONS INCH_CONVERSIONS
-
-# API to build a grayscale palette
-# NOTE: this is not used internally by libpng at present.
-
-option BUILD_GRAYSCALE_PALETTE
-
-# WRITE options
-
-option WRITE enables WRITE_INT_FUNCTIONS
-
-# Disabling WRITE_16BIT prevents 16-bit PNG files from being
-# generated.
-option WRITE_16BIT requires WRITE enables 16BIT
-
-option WRITE_TRANSFORMS requires WRITE
-= NO_WRITE_TRANSFORMS WRITE_TRANSFORMS_NOT_SUPPORTED
-
-option WRITE_SHIFT requires WRITE_TRANSFORMS
-option WRITE_PACK requires WRITE_TRANSFORMS
-option WRITE_BGR requires WRITE_TRANSFORMS
-option WRITE_SWAP requires WRITE_TRANSFORMS, WRITE_16BIT
-option WRITE_PACKSWAP requires WRITE_TRANSFORMS
-option WRITE_INVERT requires WRITE_TRANSFORMS
-option WRITE_FILLER requires WRITE_TRANSFORMS
-option WRITE_SWAP_ALPHA requires WRITE_TRANSFORMS
-option WRITE_INVERT_ALPHA requires WRITE_TRANSFORMS
-option WRITE_USER_TRANSFORM requires WRITE_TRANSFORMS
-
-# This is not required for PNG-compliant encoders, but can cause
-# trouble if left undefined
-
-option WRITE_INTERLACING requires WRITE
-
-# Deprecated, will be removed.
-option WRITE_WEIGHTED_FILTER requires WRITE
-
-option WRITE_FLUSH requires WRITE
-
-# Note: these can be turned off explicitly if not required by the
-# apps implementing the user transforms
-option USER_TRANSFORM_PTR if READ_USER_TRANSFORM, WRITE_USER_TRANSFORM
-option USER_TRANSFORM_INFO if READ_USER_TRANSFORM, WRITE_USER_TRANSFORM
-
-# This enables API to set compression parameters for compressing
-# non-IDAT chunks (zTXt, iTXt, iCCP, and unknown chunks).  This feature
-# was added at libpng-1.5.3.
-option WRITE_CUSTOMIZE_ZTXT_COMPRESSION requires WRITE
-option WRITE_CUSTOMIZE_COMPRESSION requires WRITE
-
-# Any chunks you are not interested in, you can undef here.  The
-# ones that allocate memory may be especially important (hIST,
-# tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
-# a bit smaller.
-
-# The size of the png_text structure changed in libpng-1.0.6 when
-# iTXt support was added.  iTXt support was turned off by default through
-# libpng-1.2.x, to support old apps that malloc the png_text structure
-# instead of calling png_set_text() and letting libpng malloc it.  It
-# was turned on by default in libpng-1.4.0.
-
-option READ_ANCILLARY_CHUNKS requires READ
-# PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated.
-= NO_READ_ANCILLARY_CHUNKS READ_ANCILLARY_CHUNKS_NOT_SUPPORTED
-
-option WRITE_ANCILLARY_CHUNKS requires WRITE
-# PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated.
-= NO_WRITE_ANCILLARY_CHUNKS WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED
-
-# These options disable *all* the text chunks if turned off
-
-option TEXT disabled
-option READ_TEXT requires READ_ANCILLARY_CHUNKS enables TEXT
-option WRITE_TEXT requires WRITE_ANCILLARY_CHUNKS enables TEXT
-
-# Moved to pnglibconf.h at libpng-1.5.0
-# Feature support: in 1.4 this was in pngconf.h, but the following
-# features have no affect on the libpng API.  Add library
-# only features to the end of this list.  Add features that
-# affect the API above.  (Note: the list of chunks follows
-# the library-only settings.)
-#
-# BUILD TIME ONLY OPTIONS
-#   These options do not affect the API but rather alter how the
-#   API is implemented, they get recorded in pnglibconf.h, but
-#   can't be changed by the application.
-
-# Colorspace support (enabled as required); just the support for colorant
-# information.  Gamma support, likewise, is just support for the gamma
-# information, READ_GAMMA is required for gamma transformations (so it
-# is possible to read PNG gamma without enabling all the libpng transform
-# code - do this for applications that do their own gamma processing)
-#
-# As of 1.6.0 COLORSPACE is only useful if the application processes the
-# information; this is because the library does not do any colorspace
-# processing, it just validates the data in the PNG file.
-
-option GAMMA disabled
-option COLORSPACE enables GAMMA disabled
-
-# When an ICC profile is read, or png_set, it will be checked for a match
-# against known sRGB profiles if the sRGB handling is enabled.  The
-# PNG_sRGB_PROFILE_CHECKS setting controls how much work is done during the
-# check:
-#
-# -1: Don't do any sRGB profile checking.
-#
-#  0: Just validate the profile MD5 signature if present, otherwise use
-#     the checks in option 1.
-#
-#  1: Additionally check the length, intent and adler32 checksum of the
-#     actual data.   If enabled this will reject known profiles that have
-#     had the rendering intent in the header changed as well as other edits
-#     done without updating the checksum.  See the discussion below.
-#
-#  2: Additionally checksum all the data using the ethernet CRC32 algorithm.
-#     This makes it more difficult to fake profiles and makes it less likely
-#     to get a false positive on profiles with no signature, but is probably
-#     just a waste of time since all currently approved ICC sRGB profiles have
-#     a secure MD5 signature.
-#
-# The rendering intent.  An ICC profile stores an intended rendering intent,
-# but does not include the value in the signature.  The intent is documented
-# as the intent that should be used when combining two profiles.  The sRGB
-# profile is intended, however, to be used with any of the four defined intents.
-# For this reason the sRGB chunk includes an 'intent' to be used when displaying
-# the image (intent is really a property of the image not the profile.)
-#
-# Unfortunately the iCCP chunk does not.  It may therefore be that some
-# applications modify the intent in profiles (including sRGB profiles) to work
-# round this problem.  Selecting an option other than option '0' will cause such
-# modified profiles to be rejected.
-#
-# Security.  The use of Adler32 and CRC32 checksums does not help significantly
-# with any security issues.  It is relatively easy to produce arbitrary profiles
-# with the required checksums on current computer systems.  Nevertheless
-# security does not seem to be an issue because the only consequence of a false
-# positive is a false assertion that the profile is an sRGB profile.  This might
-# be used to hide data from libpng using applications, but it doesn't seem
-# possible to damage them.
-
-setting sRGB_PROFILE_CHECKS default 2
-
-# Artificially align memory - the code typically aligns to 8 byte
-# boundaries if this is switched on, it's a small waste of space
-# but can help (in theory) on some architectures.  Only affects
-# internal structures.  Added at libpng 1.4.0
-
-option ALIGNED_MEMORY
-
-# Buggy compilers (e.g., gcc 2.7.2.2) need PNG_NO_POINTER_INDEXING
-# See png[wr]util.c, normally this should always be *on*
-
-option POINTER_INDEXING
-
-# Other defines for things like memory and the like can go here.
-
-# BUILD TIME SETTINGS
-# Like build time options these do not affect the API, but they
-# may be useful to applications because they record details of
-# how the API will behave particularly with regard to overall
-# accuracy.
-
-# This controls how fine the quantizing gets.  As this allocates
-# a largish chunk of memory (32K), those who are not as concerned
-# with quantizing quality can decrease some or all of these.
-
-setting QUANTIZE_RED_BITS default 5
-setting QUANTIZE_GREEN_BITS default 5
-setting QUANTIZE_BLUE_BITS default 5
-
-# This controls how fine the gamma correction becomes when you
-# are only interested in 8 bits anyway.  Increasing this value
-# results in more memory being used, and more pow() functions
-# being called to fill in the gamma tables.  Don't set this value
-# less than 8, and even that may not work (I haven't tested it).
-
-setting MAX_GAMMA_8 default 11
-
-# This controls how much a difference in gamma we can tolerate before
-# we actually start doing gamma conversion, it's a fixed point value,
-# so the default below is 0.05, meaning libpng ignores corrections in
-# the range 0.95 to 1.05
-
-setting GAMMA_THRESHOLD_FIXED default 5000
-
-# Precision to use when converting a floating point value to a PNG
-# extension format string in an sCAL chunk (only relevant if the
-# floating point API is enabled)
-
-setting sCAL_PRECISION default 5
-
-# This is the size of the compression buffer, and thus the size of
-# an IDAT chunk.  Make this whatever size you feel is best for your
-# machine.  One of these will be allocated per png_struct.  When this
-# is full, it writes the data to the disk, and does some other
-# calculations.  Making this an extremely small size may slow
-# the library down, but you may want to experiment to determine
-# where it becomes significant, if you are concerned with memory
-# usage.  Note that zlib allocates at least 32Kb also.  For readers,
-# this describes the size of the buffer available to read the data in.
-# Unless this gets smaller than the size of a row (compressed),
-# it should not make much difference how big this is.
-
-setting ZBUF_SIZE default 8192
-
-# This is the size of the decompression buffer used when counting or checking
-# the decompressed size of an LZ stream from a compressed ancillary chunk; the
-# decompressed data is never used so a different size may be optimal.  This size
-# was determined using contrib/libtests/timepng.c with compressed zTXt data
-# around 11MByte in size.  Slight speed improvements (up to about 14% in
-# timepng) can be achieved by very large increases (to 32kbyte) on regular data,
-# but highly compressible data shows only around 2% improvement.   The size is
-# chosen to minimize the effects of DoS attacks based on using very large
-# amounts of highly compressible data.
-
-setting INFLATE_BUF_SIZE default 1024
-
-# This is the maximum amount of IDAT data that the sequential reader will
-# process at one time.  The setting does not affect the size of IDAT chunks
-# read, just the amount read at once.  Neither does it affect the progressive
-# reader, which processes just the amount of data the application gives it.
-# The sequential reader is currently unable to process more than one IDAT at
-# once - it has to read and process each one in turn.  There is no point setting
-# this to a value larger than the IDAT chunks typically encountered (it would
-# just waste memory) but there may be some point in reducing it below the value
-# of ZBUF_SIZE (the size of IDAT chunks written by libpng.)
-
-setting IDAT_READ_SIZE default PNG_ZBUF_SIZE
-
-# Ancillary chunks
-chunk bKGD
-chunk cHRM enables COLORSPACE
-chunk eXIf
-chunk gAMA enables GAMMA
-chunk hIST
-chunk iCCP enables COLORSPACE, GAMMA
-chunk iTXt enables TEXT
-chunk oFFs
-chunk pCAL
-chunk pHYs
-chunk sBIT
-chunk sCAL
-chunk sPLT
-chunk sRGB enables COLORSPACE, GAMMA, SET_OPTION
-chunk tEXt requires TEXT
-chunk tIME
-chunk tRNS
-chunk zTXt enables TEXT
-
-# This only affects support of the optional PLTE chunk in RGB and RGBA
-# images.  Notice that READ_ANCILLARY_CHUNKS therefore disables part
-# of the regular chunk reading too.
-
-option READ_OPT_PLTE requires READ_ANCILLARY_CHUNKS
-
-# Unknown chunk handling
-#
-# 'UNKNOWN_CHUNKS' is a global option to disable all unknown chunk handling on
-# read or write; everything else below requires it (directly or indirectly).
-option UNKNOWN_CHUNKS
-
-# There are three main options to control the ability to read and write unknown
-# chunks.  If either read option is turned on then unknown chunks will be read,
-# otherwise they are skipped.  If the write option is turned on unknown chunks
-# set by png_set_unknown_chunks will be written otherwise it is an error to call
-# that API on a write struct.
-option WRITE_UNKNOWN_CHUNKS requires WRITE requires UNKNOWN_CHUNKS
-option WRITE_UNKNOWN_CHUNKS enables STORE_UNKNOWN_CHUNKS
-
-# The first way to read user chunks is to have libpng save them for a later call
-# to png_get_unknown_chunks, the application must call
-# png_set_keep_unknown_chunks to cause this to actually happen (see png.h)
-option SAVE_UNKNOWN_CHUNKS requires READ requires SET_UNKNOWN_CHUNKS
-option SAVE_UNKNOWN_CHUNKS enables READ_UNKNOWN_CHUNKS, STORE_UNKNOWN_CHUNKS
-
-# The second approach is to use an application provided callback to process the
-# chunks, the callback can either handle the chunk entirely itself or request
-# that libpng store the chunk for later retrieval via png_get_unknown_chunks.
-#
-# NOTE: If STORE_UNKNOWN_CHUNKS is not enabled (which is the default if
-# both SAVE_UNKNOWN_CHUNKS and WRITE_UNKNOWN_CHUNKS are disabled) then a
-# 0 result from the callback will be ignored because no support for saving
-# unknown chunks has been compiled in.  The normal symptom is that your app
-# fails to compile because png_get_unknown_chunks is no longer defined in png.h.
-# If you encounter this issue simply enable STORE_UNKNOWN_CHUNKS in your build.
-#
-# Note that there is no 'WRITE_USER_CHUNKS' so the USER_CHUNKS option is always
-# the same as READ_USER_CHUNKS at present
-option READ_USER_CHUNKS requires READ, UNKNOWN_CHUNKS
-option READ_USER_CHUNKS enables READ_UNKNOWN_CHUNKS, USER_CHUNKS
-
-# Two further options are provided to allow detailed control of the handling.
-# The first enables png_set_keep_unknown_chunks; this allows the default to be
-# changed from discarding unknown chunks and allows per-chunk control.  This is
-# required to use the SAVE_UNKNOWN_CHUNKS option.  If enabled this option also
-# applies to write (see png.h), otherwise the write API simply writes all the
-# chunks it is given.
-#
-# The second option extends the unknown handling to allow known chunks to be
-# handled as though they were unknown.  This option doesn't change any APIs, it
-# merely turns on the code to check known as well as unknown chunks.
-#
-# This option no longer affects the write code.  It can be safely disabled and
-# will prevent applications stopping libpng reading known chunks.
-option SET_UNKNOWN_CHUNKS requires UNKNOWN_CHUNKS
-option HANDLE_AS_UNKNOWN requires SET_UNKNOWN_CHUNKS
-
-# The following options are derived from the above and should not be turned on
-# explicitly.
-option READ_UNKNOWN_CHUNKS requires UNKNOWN_CHUNKS disabled
-option STORE_UNKNOWN_CHUNKS requires UNKNOWN_CHUNKS disabled
-
-option CONVERT_tIME requires WRITE_ANCILLARY_CHUNKS
-# The "tm" structure is not supported on WindowsCE
-
-@#ifdef _WIN32_WCE
-@#   define PNG_NO_CONVERT_tIME
-@#endif
-
-option WRITE_FILTER requires WRITE
-
-option SAVE_INT_32 disabled
-# png_save_int_32 is required internally for writing the ancillary chunks oFFs
-# and pCAL and for both reading and writing iCCP (for the generation/checking of
-# the corresponding cHRM/gAMA chunks) if full ICC is supported.
-
-# added at libpng-1.5.4
-
-option WRITE_OPTIMIZE_CMF requires WRITE
-
-option READ_COMPRESSED_TEXT disabled
-option READ_iCCP enables READ_COMPRESSED_TEXT
-option READ_iTXt enables READ_COMPRESSED_TEXT
-option READ_zTXt enables READ_COMPRESSED_TEXT
-
-option WRITE_oFFs enables SAVE_INT_32
-option WRITE_pCAL enables SAVE_INT_32
-option WRITE_cHRM enables SAVE_INT_32
-
-option WRITE_COMPRESSED_TEXT disabled
-option WRITE_iCCP enables WRITE_COMPRESSED_TEXT
-option WRITE_iTXt enables WRITE_COMPRESSED_TEXT
-option WRITE_zTXt enables WRITE_COMPRESSED_TEXT
-
-# Turn this off to disable png_read_png() and png_write_png() and
-# leave the row_pointers member out of the info structure.
-
-option INFO_IMAGE
-
-# added at libpng-1.5.10
-# Turn this off to disable warning about invalid palette index and
-# leave the num_palette_max member out of the png structure.
-
-option CHECK_FOR_INVALID_INDEX enables READ_CHECK_FOR_INVALID_INDEX
-option CHECK_FOR_INVALID_INDEX enables WRITE_CHECK_FOR_INVALID_INDEX
-option READ_CHECK_FOR_INVALID_INDEX requires READ, CHECK_FOR_INVALID_INDEX
-option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE, CHECK_FOR_INVALID_INDEX
-
-# added at libpng-1.5.15
-option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX
-option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX disabled
-option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX disabled
-
-# Simplified API options (added at libpng-1.6.0)
-#  In libpng 1.6.8 the handling of these options was changed to used 'requires'
-#  throughout, so that disabling some of the low level support always disables
-#  the base simplified read/write API.  This much simplifies the handling and
-#  makes 'everything = off' work in a more intuitive way.  It eliminates a
-#  previously reported feature that APIs previously enabled by the simplified
-#  API couldn't be turned off without explicitly turning off the simplified
-#  APIs.
-#
-# Read:
-option SIMPLIFIED_READ,
-   requires SEQUENTIAL_READ, READ_TRANSFORMS, SETJMP, BENIGN_ERRORS,
-      READ_EXPAND, READ_16BIT, READ_EXPAND_16, READ_SCALE_16_TO_8,
-      READ_RGB_TO_GRAY, READ_ALPHA_MODE, READ_BACKGROUND, READ_STRIP_ALPHA,
-      READ_FILLER, READ_SWAP, READ_PACK, READ_GRAY_TO_RGB, READ_GAMMA,
-      READ_tRNS, READ_bKGD, READ_gAMA, READ_cHRM, READ_sRGB, READ_sBIT
-
-# AFIRST and BGR read options:
-#  Prior to libpng 1.6.8 these were disabled but switched on if the low level
-#  libpng routines that do the swaps were enabled.  This worked but was
-#  confusing.  In libpng 1.6.8 the options were changed to simple 'requires'
-#  and are enabled by default.  This should work the same way in practice.
-option SIMPLIFIED_READ_AFIRST enables FORMAT_AFIRST,
-   requires SIMPLIFIED_READ READ_SWAP_ALPHA
-
-option SIMPLIFIED_READ_BGR enables FORMAT_BGR,
-   requires SIMPLIFIED_READ READ_BGR
-
-# Write:
-option SIMPLIFIED_WRITE,
-   requires WRITE, SETJMP, WRITE_SWAP, WRITE_PACK,
-      WRITE_tRNS, WRITE_gAMA, WRITE_sRGB, WRITE_cHRM
-
-# 1.6.22: allow simplified write without stdio support:
-option SIMPLIFIED_WRITE_STDIO requires SIMPLIFIED_WRITE STDIO
-
-option SIMPLIFIED_WRITE_AFIRST enables FORMAT_AFIRST,
-   requires SIMPLIFIED_WRITE WRITE_SWAP_ALPHA
-
-option SIMPLIFIED_WRITE_BGR enables FORMAT_BGR,
-   requires SIMPLIFIED_WRITE WRITE_BGR
-
-# Formats:
-option FORMAT_AFIRST disabled
-option FORMAT_BGR disabled
diff --git a/src/png/libpng/scripts/pnglibconf.h.prebuilt b/src/png/libpng/scripts/pnglibconf.h.prebuilt
deleted file mode 100644
index 53b5e442c..000000000
--- a/src/png/libpng/scripts/pnglibconf.h.prebuilt
+++ /dev/null
@@ -1,220 +0,0 @@
-/* libpng 1.6.34 STANDARD API DEFINITION */
-
-/* pnglibconf.h - library build configuration */
-
-/* Libpng version 1.6.34 - September 29, 2017 */
-
-/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
-
-/* This code is released under the libpng license. */
-/* For conditions of distribution and use, see the disclaimer */
-/* and license in png.h */
-
-/* pnglibconf.h */
-/* Machine generated file: DO NOT EDIT */
-/* Derived from: scripts/pnglibconf.dfa */
-#ifndef PNGLCONF_H
-#define PNGLCONF_H
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGNED_MEMORY_SUPPORTED
-/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
-/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_BENIGN_READ_ERRORS_SUPPORTED
-/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_COLORSPACE_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_FORMAT_AFIRST_SUPPORTED
-#define PNG_FORMAT_BGR_SUPPORTED
-#define PNG_GAMMA_SUPPORTED
-#define PNG_GET_PALETTE_MAX_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_eXIf_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_OPTION_SUPPORTED
-#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_READ_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_eXIf_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_eXIf_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
-/* settings */
-#define PNG_API_RULE 0
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
-#define PNG_INFLATE_BUF_SIZE 1024
-#define PNG_LINKAGE_API extern
-#define PNG_LINKAGE_CALLBACK extern
-#define PNG_LINKAGE_DATA extern
-#define PNG_LINKAGE_FUNCTION extern
-#define PNG_MAX_GAMMA_8 11
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
-#define PNG_USER_CHUNK_CACHE_MAX 1000
-#define PNG_USER_CHUNK_MALLOC_MAX 8000000
-#define PNG_USER_HEIGHT_MAX 1000000
-#define PNG_USER_WIDTH_MAX 1000000
-#define PNG_ZBUF_SIZE 8192
-#define PNG_ZLIB_VERNUM 0 /* unknown */
-#define PNG_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
-#define PNG_Z_DEFAULT_STRATEGY 1
-#define PNG_sCAL_PRECISION 5
-#define PNG_sRGB_PROFILE_CHECKS 2
-/* end of settings */
-#endif /* PNGLCONF_H */
diff --git a/src/png/libpng/scripts/prefix.c b/src/png/libpng/scripts/prefix.c
deleted file mode 100644
index 8b604a091..000000000
--- a/src/png/libpng/scripts/prefix.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/* prefix.c - generate an unprefixed symbol list
- *
- * Last changed in libpng version 1.6.16 [December 22, 2014]
- * Copyright (c) 2013-2014 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-        PNG_DFN "@" name "@"
-
-/* The configuration information *before* the additional of symbol renames,
- * the list is the C name list; no symbol prefix.
- */
-#include "pnglibconf.out"
-
-PNG_DFN_START_SORT 1
-
-#include "../png.h"
-
-PNG_DFN_END_SORT
diff --git a/src/png/libpng/scripts/sym.c b/src/png/libpng/scripts/sym.c
deleted file mode 100644
index ea9e4c507..000000000
--- a/src/png/libpng/scripts/sym.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/* sym.c - define format of libpng.sym
- *
- * Last changed in libpng version 1.6.16 [December 22, 2014]
- * Copyright (c) 2011-2014 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-        PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
-
-#include "../png.h"
diff --git a/src/png/libpng/scripts/symbols.c b/src/png/libpng/scripts/symbols.c
deleted file mode 100644
index 28b841d8b..000000000
--- a/src/png/libpng/scripts/symbols.c
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/* symbols.c - find all exported symbols
- *
- * Last changed in libpng version 1.6.16 [December 22, 2014]
- * Copyright (c) 2011-2014 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* NOTE: making 'symbols.chk' checks both that the exported
- * symbols in the library don't change and (implicitly) that
- * scripts/pnglibconf.h.prebuilt is as expected.
- * If scripts/pnglibconf.h.prebuilt is remade using
- * scripts/pnglibconf.dfa then this checks the .dfa file too.
- */
-
-#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-        PNG_DFN "@" name "@ @@" ordinal "@"
-#define PNG_REMOVED(ordinal, type, name, args, attributes)\
-        PNG_DFN "; @" name "@ @@" ordinal "@"
-#define PNG_EXPORT_LAST_ORDINAL(ordinal)\
-        PNG_DFN "; @@" ordinal "@"
-
-/* Read the defaults, but use scripts/pnglibconf.h.prebuilt; the 'standard'
- * header file.
- */
-#include "pnglibconf.h.prebuilt"
-#include "../png.h"
-
-/* Some things are turned off by default.  Turn these things
- * on here (by hand) to get the APIs they expose and validate
- * that no harm is done.  This list is the set of options
- * defaulted to 'off' in scripts/pnglibconf.dfa
- *
- * Maintenance: if scripts/pnglibconf.dfa options are changed
- * from, or to, 'disabled' this needs updating!
- */
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_ERROR_NUMBERS_SUPPORTED
-#define PNG_READ_BIG_ENDIAN_SUPPORTED  /* should do nothing! */
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
-#define PNG_SET_OPTION_SUPPORTED
-
-#undef PNG_H
-#include "../png.h"
-
-/* Finally there are a couple of places where option support
- * actually changes the APIs revealed using a #if/#else/#endif
- * test in png.h, test these here.
- */
-#undef  PNG_FLOATING_POINT_SUPPORTED /* Exposes 'fixed' APIs */
-#undef  PNG_ERROR_TEXT_SUPPORTED     /* Exposes unsupported APIs */
-
-#undef PNG_H
-#include "../png.h"
diff --git a/src/png/libpng/scripts/symbols.def b/src/png/libpng/scripts/symbols.def
deleted file mode 100644
index 4a3c3ff41..000000000
--- a/src/png/libpng/scripts/symbols.def
+++ /dev/null
@@ -1,256 +0,0 @@
-;Version 1.6.35beta02
-;--------------------------------------------------------------
-; LIBPNG symbol list as a Win32 DEF file
-; Contains all the symbols that can be exported from libpng
-;--------------------------------------------------------------
-LIBRARY
-
-EXPORTS
- png_access_version_number @1
- png_set_sig_bytes @2
- png_sig_cmp @3
- png_create_read_struct @4
- png_create_write_struct @5
- png_get_compression_buffer_size @6
- png_set_compression_buffer_size @7
- png_set_longjmp_fn @8
- png_longjmp @9
- png_reset_zstream @10
- png_create_read_struct_2 @11
- png_create_write_struct_2 @12
- png_write_sig @13
- png_write_chunk @14
- png_write_chunk_start @15
- png_write_chunk_data @16
- png_write_chunk_end @17
- png_create_info_struct @18
- png_info_init_3 @19
- png_write_info_before_PLTE @20
- png_write_info @21
- png_read_info @22
- png_convert_to_rfc1123 @23
- png_convert_from_struct_tm @24
- png_convert_from_time_t @25
- png_set_expand @26
- png_set_expand_gray_1_2_4_to_8 @27
- png_set_palette_to_rgb @28
- png_set_tRNS_to_alpha @29
- png_set_bgr @30
- png_set_gray_to_rgb @31
- png_set_rgb_to_gray @32
- png_set_rgb_to_gray_fixed @33
- png_get_rgb_to_gray_status @34
- png_build_grayscale_palette @35
- png_set_strip_alpha @36
- png_set_swap_alpha @37
- png_set_invert_alpha @38
- png_set_filler @39
- png_set_add_alpha @40
- png_set_swap @41
- png_set_packing @42
- png_set_packswap @43
- png_set_shift @44
- png_set_interlace_handling @45
- png_set_invert_mono @46
- png_set_background @47
- png_set_strip_16 @48
- png_set_quantize @49
- png_set_gamma @50
- png_set_flush @51
- png_write_flush @52
- png_start_read_image @53
- png_read_update_info @54
- png_read_rows @55
- png_read_row @56
- png_read_image @57
- png_write_row @58
- png_write_rows @59
- png_write_image @60
- png_write_end @61
- png_read_end @62
- png_destroy_info_struct @63
- png_destroy_read_struct @64
- png_destroy_write_struct @65
- png_set_crc_action @66
- png_set_filter @67
- png_set_filter_heuristics @68
- png_set_compression_level @69
- png_set_compression_mem_level @70
- png_set_compression_strategy @71
- png_set_compression_window_bits @72
- png_set_compression_method @73
- png_init_io @74
- png_set_error_fn @75
- png_get_error_ptr @76
- png_set_write_fn @77
- png_set_read_fn @78
- png_get_io_ptr @79
- png_set_read_status_fn @80
- png_set_write_status_fn @81
- png_set_mem_fn @82
- png_get_mem_ptr @83
- png_set_read_user_transform_fn @84
- png_set_write_user_transform_fn @85
- png_set_user_transform_info @86
- png_get_user_transform_ptr @87
- png_set_read_user_chunk_fn @88
- png_get_user_chunk_ptr @89
- png_set_progressive_read_fn @90
- png_get_progressive_ptr @91
- png_process_data @92
- png_progressive_combine_row @93
- png_malloc @94
- png_calloc @95
- png_malloc_warn @96
- png_free @97
- png_free_data @98
- png_data_freer @99
- png_malloc_default @100
- png_free_default @101
- png_error @102
- png_chunk_error @103
- png_err @104
- png_warning @105
- png_chunk_warning @106
- png_benign_error @107
- png_chunk_benign_error @108
- png_set_benign_errors @109
- png_get_valid @110
- png_get_rowbytes @111
- png_get_rows @112
- png_set_rows @113
- png_get_channels @114
- png_get_image_width @115
- png_get_image_height @116
- png_get_bit_depth @117
- png_get_color_type @118
- png_get_filter_type @119
- png_get_interlace_type @120
- png_get_compression_type @121
- png_get_pixels_per_meter @122
- png_get_x_pixels_per_meter @123
- png_get_y_pixels_per_meter @124
- png_get_pixel_aspect_ratio @125
- png_get_x_offset_pixels @126
- png_get_y_offset_pixels @127
- png_get_x_offset_microns @128
- png_get_y_offset_microns @129
- png_get_signature @130
- png_get_bKGD @131
- png_set_bKGD @132
- png_get_cHRM @133
- png_get_cHRM_fixed @134
- png_set_cHRM @135
- png_set_cHRM_fixed @136
- png_get_gAMA @137
- png_get_gAMA_fixed @138
- png_set_gAMA @139
- png_set_gAMA_fixed @140
- png_get_hIST @141
- png_set_hIST @142
- png_get_IHDR @143
- png_set_IHDR @144
- png_get_oFFs @145
- png_set_oFFs @146
- png_get_pCAL @147
- png_set_pCAL @148
- png_get_pHYs @149
- png_set_pHYs @150
- png_get_PLTE @151
- png_set_PLTE @152
- png_get_sBIT @153
- png_set_sBIT @154
- png_get_sRGB @155
- png_set_sRGB @156
- png_set_sRGB_gAMA_and_cHRM @157
- png_get_iCCP @158
- png_set_iCCP @159
- png_get_sPLT @160
- png_set_sPLT @161
- png_get_text @162
- png_set_text @163
- png_get_tIME @164
- png_set_tIME @165
- png_get_tRNS @166
- png_set_tRNS @167
- png_get_sCAL @168
- png_get_sCAL_s @169
- png_set_sCAL @170
- png_set_sCAL_s @171
- png_set_keep_unknown_chunks @172
- png_handle_as_unknown @173
- png_set_unknown_chunks @174
- png_set_unknown_chunk_location @175
- png_get_unknown_chunks @176
- png_set_invalid @177
- png_read_png @178
- png_write_png @179
- png_get_copyright @180
- png_get_header_ver @181
- png_get_header_version @182
- png_get_libpng_ver @183
- png_permit_mng_features @184
- png_set_strip_error_numbers @185
- png_set_user_limits @186
- png_get_user_width_max @187
- png_get_user_height_max @188
- png_set_chunk_cache_max @189
- png_get_chunk_cache_max @190
- png_set_chunk_malloc_max @191
- png_get_chunk_malloc_max @192
- png_get_pixels_per_inch @193
- png_get_x_pixels_per_inch @194
- png_get_y_pixels_per_inch @195
- png_get_x_offset_inches @196
- png_get_y_offset_inches @197
- png_get_pHYs_dpi @198
- png_get_io_state @199
- png_get_uint_32 @201
- png_get_uint_16 @202
- png_get_int_32 @203
- png_get_uint_31 @204
- png_save_uint_32 @205
- png_save_int_32 @206
- png_save_uint_16 @207
- png_set_gamma_fixed @208
- png_set_filter_heuristics_fixed @209
- png_get_pixel_aspect_ratio_fixed @210
- png_get_x_offset_inches_fixed @211
- png_get_y_offset_inches_fixed @212
- png_set_sCAL_fixed @213
- png_get_sCAL_fixed @214
- png_set_background_fixed @215
- png_get_io_chunk_type @216
- png_get_current_row_number @217
- png_get_current_pass_number @218
- png_process_data_pause @219
- png_process_data_skip @220
- png_set_expand_16 @221
- png_set_text_compression_level @222
- png_set_text_compression_mem_level @223
- png_set_text_compression_strategy @224
- png_set_text_compression_window_bits @225
- png_set_text_compression_method @226
- png_set_alpha_mode @227
- png_set_alpha_mode_fixed @228
- png_set_scale_16 @229
- png_get_cHRM_XYZ @230
- png_get_cHRM_XYZ_fixed @231
- png_set_cHRM_XYZ @232
- png_set_cHRM_XYZ_fixed @233
- png_image_begin_read_from_file @234
- png_image_begin_read_from_stdio @235
- png_image_begin_read_from_memory @236
- png_image_finish_read @237
- png_image_free @238
- png_image_write_to_file @239
- png_image_write_to_stdio @240
- png_convert_to_rfc1123_buffer @241
- png_set_check_for_invalid_index @242
- png_get_palette_max @243
- png_set_option @244
- png_image_write_to_memory @245
- png_get_eXIf @246
- png_set_eXIf @247
- png_get_eXIf_1 @248
- png_set_eXIf_1 @249
diff --git a/src/png/libpng/scripts/test.cmake.in b/src/png/libpng/scripts/test.cmake.in
deleted file mode 100644
index fa6a889bb..000000000
--- a/src/png/libpng/scripts/test.cmake.in
+++ /dev/null
@@ -1,31 +0,0 @@
-# test.cmake.in
-
-# Copyright (C) 2016 Glenn Randers-Pehrson
-# Written by Roger Leigh, 2016
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-set(TEST_OPTIONS "@TEST_OPTIONS@")
-set(TEST_FILES "@TEST_FILES@")
-
-foreach(file ${TEST_FILES})
-  file(TO_NATIVE_PATH "${file}" native_file)
-  list(APPEND NATIVE_TEST_FILES "${native_file}")
-endforeach()
-
-# Add the directory containing libpng to the PATH (Windows only)
-if(WIN32)
-  get_filename_component(LIBPNG_DIR "${LIBPNG}" PATH)
-  file(TO_NATIVE_PATH "${LIBPNG_DIR}" LIBPNG_DIR)
-  set(ENV{PATH} "${LIBPNG_DIR};$ENV{PATH}")
-endif()
-
-execute_process(COMMAND "${CMAKE_COMMAND}" -E echo "Running ${TEST_COMMAND}" ${TEST_OPTIONS} ${NATIVE_TEST_FILES})
-
-execute_process(COMMAND "${TEST_COMMAND}" ${TEST_OPTIONS} ${NATIVE_TEST_FILES}
-                RESULT_VARIABLE TEST_STATUS)
-if(TEST_STATUS)
-  message(FATAL_ERROR "Returned failed status ${TEST_STATUS}!")
-endif()
diff --git a/src/png/libpng/scripts/vers.c b/src/png/libpng/scripts/vers.c
deleted file mode 100644
index de7319716..000000000
--- a/src/png/libpng/scripts/vers.c
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/* vers.c - define format of libpng.vers
- *
- * Last changed in libpng version 1.6.16 [December 22, 2014]
- * Copyright (c) 2011-2014 Glenn Randers-Pehrson
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-        PNG_DFN " @" SYMBOL_PREFIX "@@" name "@;"
-
-PNG_DFN "@" PNGLIB_LIBNAME "@ {global:"
-
-#include "../png.h"
-
-PNG_DFN "local: *; };"
diff --git a/src/png/palette.hpp b/src/png/palette.hpp
deleted file mode 100644
index 917f28007..000000000
--- a/src/png/palette.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_PALETTE_HPP_INCLUDED
-#define PNGPP_PALETTE_HPP_INCLUDED
-
-#include <vector>
-#include "color.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief The palette type.  Currently implemented as \c std::vector
-     * of png::color.
-     */
-    typedef std::vector< color > palette;
-
-} // namespace png
-
-#endif // PNGPP_PALETTE_HPP_INCLUDED
diff --git a/src/png/pixel_traits.hpp b/src/png/pixel_traits.hpp
deleted file mode 100644
index 8ffdfeedb..000000000
--- a/src/png/pixel_traits.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_PIXEL_TRAITS_HPP_INCLUDED
-#define PNGPP_PIXEL_TRAITS_HPP_INCLUDED
-
-#include <limits>
-#include "types.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief Pixel traits class template.
-     *
-     * Provides information about pixel color type and components bit depth.
-     * Not implemented--see specializations.
-     *
-     * \see  pixel_traits<rgb_pixel>, pixel_traits<rgba_pixel>
-     */
-    template< typename pixel > struct pixel_traits;
-
-    /**
-     * \brief Basic pixel traits class template.
-     *
-     * Provides common implementation for various pixel_traits<>
-     * specializations.
-     */
-    template< typename pixel,
-              typename component,
-              color_type pixel_color_type,
-              int channels_value = sizeof(pixel) / sizeof(component),
-              int bit_depth_value = std::numeric_limits< component >::digits >
-    struct basic_pixel_traits
-    {
-        typedef pixel pixel_type;
-        typedef component component_type;
-
-        static color_type get_color_type()
-        {
-            return pixel_color_type;
-        }
-        
-        static const int channels = channels_value;
-        static int get_channels()
-        {
-            return channels;
-        }
-        
-        static const int bit_depth = bit_depth_value;
-        static int get_bit_depth()
-        {
-            return bit_depth;
-        }
-    };
-
-    /**
-     * \brief Basic pixel traits class template for pixels with alpha
-     * channel.
-     */
-    template< typename component >
-    struct basic_alpha_pixel_traits
-    {
-        /**
-         * \brief Returns the default alpha channel filler for full
-         * opacity.
-         */
-        static component get_alpha_filler()
-        {
-            return std::numeric_limits< component >::max();
-        }
-    };
-
-} // namespace png
-
-#endif // PNGPP_PIXEL_TRAITS_HPP_INCLUDED
diff --git a/src/png/tRNS.hpp b/src/png/tRNS.hpp
deleted file mode 100644
index ff0181643..000000000
--- a/src/png/tRNS.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_TRNS_HPP_INCLUDED
-#define PNGPP_TRNS_HPP_INCLUDED
-
-#include <vector>
-#include "color.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief The palette transparency map type.  Currently
-     * implemented as \c std::vector of png::byte.
-     */
-    typedef std::vector< byte > tRNS;
-
-} // namespace png
-
-#endif // PNGPP_TRNS_HPP_INCLUDED
diff --git a/src/png/types.hpp b/src/png/types.hpp
deleted file mode 100644
index 1538d6bd2..000000000
--- a/src/png/types.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_TYPES_HPP_INCLUDED
-#define PNGPP_TYPES_HPP_INCLUDED
-
-#include <png.h>
-
-namespace png
-{
-
-    typedef png_byte byte;
-    typedef png_uint_16 uint_16;
-    typedef png_uint_32 uint_32;
-    typedef png_fixed_point fixed_point;
-    typedef png_color_8 color_info;
-    typedef png_color_16 color_info_16;
-
-    enum color_type
-    {
-        color_type_none       = -1,
-        color_type_gray       = PNG_COLOR_TYPE_GRAY,
-        color_type_palette    = PNG_COLOR_TYPE_PALETTE,
-        color_type_rgb        = PNG_COLOR_TYPE_RGB,
-        color_type_rgb_alpha  = PNG_COLOR_TYPE_RGB_ALPHA,
-        color_type_gray_alpha = PNG_COLOR_TYPE_GRAY_ALPHA,
-        color_type_rgba       = PNG_COLOR_TYPE_RGBA,
-        color_type_ga         = PNG_COLOR_TYPE_GA
-    };
-
-    enum color_mask
-    {
-        color_mask_palette = PNG_COLOR_MASK_PALETTE,
-        color_mask_color   = PNG_COLOR_MASK_COLOR,
-        color_mask_rgb     = color_mask_color,
-        color_mask_alpha   = PNG_COLOR_MASK_ALPHA
-    };
-
-    enum filler_type
-    {
-        filler_before = PNG_FILLER_BEFORE,
-        filler_after  = PNG_FILLER_AFTER
-    };
-
-    enum rgb_to_gray_error_action
-    {
-        rgb_to_gray_silent  = 1,
-        rgb_to_gray_warning = 2,
-        rgb_to_gray_error   = 3
-    };
-
-    enum interlace_type
-    {
-        interlace_none  = PNG_INTERLACE_NONE,
-        interlace_adam7 = PNG_INTERLACE_ADAM7
-    };
-
-    enum compression_type
-    {
-        compression_type_base    = PNG_COMPRESSION_TYPE_BASE,
-        compression_type_default = PNG_COMPRESSION_TYPE_DEFAULT
-    };
-
-    enum filter_type
-    {
-        filter_type_base        = PNG_FILTER_TYPE_BASE,
-        intrapixel_differencing = PNG_INTRAPIXEL_DIFFERENCING,
-        filter_type_default     = PNG_FILTER_TYPE_DEFAULT
-    };
-
-    enum chunk
-    {
-        chunk_gAMA = PNG_INFO_gAMA,
-        chunk_sBIT = PNG_INFO_sBIT,
-        chunk_cHRM = PNG_INFO_cHRM,
-        chunk_PLTE = PNG_INFO_PLTE,
-        chunk_tRNS = PNG_INFO_tRNS,
-        chunk_bKGD = PNG_INFO_bKGD,
-        chunk_hIST = PNG_INFO_hIST,
-        chunk_pHYs = PNG_INFO_pHYs,
-        chunk_oFFs = PNG_INFO_oFFs,
-        chunk_tIME = PNG_INFO_tIME,
-        chunk_pCAL = PNG_INFO_pCAL,
-        chunk_sRGB = PNG_INFO_sRGB,
-        chunk_iCCP = PNG_INFO_iCCP,
-        chunk_sPLT = PNG_INFO_sPLT,
-        chunk_sCAL = PNG_INFO_sCAL,
-        chunk_IDAT = PNG_INFO_IDAT
-    };
-
-} // namespace png
-
-#endif // PNGPP_TYPES_HPP_INCLUDED
diff --git a/src/png/writer.hpp b/src/png/writer.hpp
deleted file mode 100644
index 448dfd50b..000000000
--- a/src/png/writer.hpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2007,2008   Alex Shulgin
- *
- * This file is part of png++ the C++ wrapper for libpng.  PNG++ is free
- * software; the exact copying conditions are as follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef PNGPP_WRITER_HPP_INCLUDED
-#define PNGPP_WRITER_HPP_INCLUDED
-
-#include <cassert>
-#include "io_base.hpp"
-
-namespace png
-{
-
-    /**
-     * \brief PNG writer class template.  This is the low-level
-     * writing interface--use image class or generator class to
-     * actually write images.
-     *
-     * The \c ostream template parameter specifies the type of output
-     * stream to work with.  The \c ostream class should implement the
-     * minimum of the following interface:
-     *
-     * \code
-     * class my_ostream
-     * {
-     * public:
-     *     void write(char const*, size_t);
-     *     void flush();
-     *     bool good();
-     * };
-     * \endcode
-     *
-     * With the semantics similar to the \c std::ostream.  Naturally,
-     * \c std::ostream fits this requirement and can be used with the
-     * writer class as is.
-     *
-     * \see image, reader, generator, io_base
-     */
-    template< class ostream >
-    class writer
-        : public io_base
-    {
-    public:
-        /**
-         * \brief Constructs a writer prepared to write PNG image into
-         * a \a stream.
-         */
-        explicit writer(ostream& stream)
-            : io_base(png_create_write_struct(PNG_LIBPNG_VER_STRING,
-                                              static_cast< io_base* >(this),
-                                              raise_error,
-                                              0))
-        {
-            png_set_write_fn(m_png, & stream, write_data, flush_data);
-        }
-
-        ~writer()
-        {
-            m_end_info.destroy();
-            png_destroy_write_struct(& m_png, m_info.get_png_info_ptr());
-        }
-
-        void write_png() const
-        {
-            if (setjmp(png_jmpbuf(m_png)))
-            {
-                throw error(m_error);
-            }
-            png_write_png(m_png,
-                          m_info.get_png_info(),
-                          /* transforms = */ 0,
-                          /* params = */ 0);
-        }
-
-        /**
-         * \brief Write info about PNG image.
-         */
-        void write_info() const
-        {
-            if (setjmp(png_jmpbuf(m_png)))
-            {
-                throw error(m_error);
-            }
-            m_info.write();
-        }
-
-        /**
-         * \brief Writes a row of image data at a time.
-         */
-        void write_row(byte* bytes)
-        {
-            if (setjmp(png_jmpbuf(m_png)))
-            {
-                throw error(m_error);
-            }
-            png_write_row(m_png, bytes);
-        }
-
-        /**
-         * \brief Reads ending info about PNG image.
-         */
-        void write_end_info() const
-        {
-            if (setjmp(png_jmpbuf(m_png)))
-            {
-                throw error(m_error);
-            }
-            m_end_info.write();
-        }
-
-    private:
-        static void write_data(png_struct* png, byte* data, png_size_t length)
-        {
-            io_base* io = static_cast< io_base* >(png_get_error_ptr(png));
-            writer* wr = static_cast< writer* >(io);
-            wr->reset_error();
-            ostream* stream = reinterpret_cast< ostream* >(png_get_io_ptr(png));
-            try
-            {
-                stream->write(reinterpret_cast< char* >(data), length);
-                if (!stream->good())
-                {
-                    wr->set_error("ostream::write() failed");
-                }
-            }
-            catch (std::exception const& error)
-            {
-                wr->set_error(error.what());
-            }
-            catch (...)
-            {
-                assert(!"caught something wrong");
-                wr->set_error("write_data: caught something wrong");
-            }
-            if (wr->is_error())
-            {
-                wr->raise_error();
-            }
-        }
-
-        static void flush_data(png_struct* png)
-        {
-            io_base* io = static_cast< io_base* >(png_get_error_ptr(png));
-            writer* wr = static_cast< writer* >(io);
-            wr->reset_error();
-            ostream* stream = reinterpret_cast< ostream* >(png_get_io_ptr(png));
-            try
-            {
-                stream->flush();
-                if (!stream->good())
-                {
-                    wr->set_error("ostream::flush() failed");
-                }
-            }
-            catch (std::exception const& error)
-            {
-                wr->set_error(error.what());
-            }
-            catch (...)
-            {
-                assert(!"caught something wrong");
-                wr->set_error("flush_data: caught something wrong");
-            }
-            if (wr->is_error())
-            {
-                wr->raise_error();
-            }
-        }
-    };
-
-} // namespace png
-
-#endif // PNGPP_WRITER_HPP_INCLUDED
diff --git a/src/png/zlib/CMakeLists.txt b/src/png/zlib/CMakeLists.txt
deleted file mode 100644
index 1ea38fef1..000000000
--- a/src/png/zlib/CMakeLists.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-cmake_minimum_required(VERSION 2.4.4)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-
-project(zlib C)
-
-set(VERSION "1.2.11")
-
-option(ASM686 "Enable building i686 assembly implementation")
-option(AMD64 "Enable building amd64 assembly implementation")
-
-set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
-set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
-
-include(CheckTypeSize)
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-include(CheckCSourceCompiles)
-#enable_testing()
-
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(stdint.h    HAVE_STDINT_H)
-check_include_file(stddef.h    HAVE_STDDEF_H)
-
-#
-# Check to see if we have large file support
-#
-set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-# We add these other definitions here because CheckTypeSize.cmake
-# in CMake 2.4.x does not automatically do so and we want
-# compatibility with CMake 2.4.x.
-if(HAVE_SYS_TYPES_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
-endif()
-if(HAVE_STDINT_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
-endif()
-if(HAVE_STDDEF_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
-endif()
-check_type_size(off64_t OFF64_T)
-if(HAVE_OFF64_T)
-   add_definitions(-D_LARGEFILE64_SOURCE=1)
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
-
-#
-# Check for fseeko
-#
-check_function_exists(fseeko HAVE_FSEEKO)
-if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
-endif()
-
-#
-# Check for unistd.h
-#
-check_include_file(unistd.h Z_HAVE_UNISTD_H)
-
-if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-endif()
-
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    # If we're doing an out of source build and the user has a zconf.h
-    # in their source tree...
-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
-        message(STATUS "Renaming")
-        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
-        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
-        message(STATUS "but CMake generates it automatically in the build directory.")
-        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
-  endif()
-endif()
-
-set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
-		${ZLIB_PC} @ONLY)
-configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-
-
-#============================================================================
-# zlib
-#============================================================================
-
-set(ZLIB_PUBLIC_HDRS
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
-    zlib.h
-)
-set(ZLIB_PRIVATE_HDRS
-    crc32.h
-    deflate.h
-    gzguts.h
-    inffast.h
-    inffixed.h
-    inflate.h
-    inftrees.h
-    trees.h
-    zutil.h
-)
-set(ZLIB_SRCS
-    adler32.c
-    compress.c
-    crc32.c
-    deflate.c
-    gzclose.c
-    gzlib.c
-    gzread.c
-    gzwrite.c
-    inflate.c
-    infback.c
-    inftrees.c
-    inffast.c
-    trees.c
-    uncompr.c
-    zutil.c
-)
-
-if(NOT MINGW)
-    set(ZLIB_DLL_SRCS
-        win32/zlib1.rc # If present will override custom build rule below.
-    )
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCC)
-    if(ASM686)
-        set(ZLIB_ASMS contrib/asm686/match.S)
-    elseif (AMD64)
-        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
-    endif ()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV)
-		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
-	endif()
-endif()
-
-if(MSVC)
-    if(ASM686)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx86/inffas32.asm
-			contrib/masmx86/match686.asm
-		)
-    elseif (AMD64)
-		ENABLE_LANGUAGE(ASM_MASM)
-        set(ZLIB_ASMS
-			contrib/masmx64/gvmat64.asm
-			contrib/masmx64/inffasx64.asm
-		)
-    endif()
-
-	if(ZLIB_ASMS)
-		add_definitions(-DASMV -DASMINF)
-	endif()
-endif()
-
-# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
-
-if(MINGW)
-    # This gets us DLL resource information when compiling on MinGW.
-    if(NOT CMAKE_RC_COMPILER)
-        set(CMAKE_RC_COMPILER windres.exe)
-    endif()
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                       COMMAND ${CMAKE_RC_COMPILER}
-                            -D GCC_WINDRES
-                            -I ${CMAKE_CURRENT_SOURCE_DIR}
-                            -I ${CMAKE_CURRENT_BINARY_DIR}
-                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-endif(MINGW)
-
-#add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-#set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-#set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-if(NOT CYGWIN)
-    # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-    # seems to be the default.
-    #
-    # This has no effect with MSVC, on that platform the version info for
-    # the DLL comes from the resource file win32/zlib1.rc
-#    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-endif()
-
-if(UNIX)
-    # On unix-like platforms the library is almost always called libz
-   set_target_properties(
-   # zlib 
-   zlibstatic PROPERTIES OUTPUT_NAME z)
-   if(NOT APPLE)
-     # set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-   endif()
-elseif(BUILD_SHARED_LIBS AND WIN32)
-    # Creates zlib1.dll when building shared library version
-    # set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-endif()
-
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-    install(TARGETS
-#            zlib
-            zlibstatic
-        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-endif()
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
-endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-#add_executable(example test/example.c)
-#target_link_libraries(example zlib)
-#add_test(example example)
-
-#add_executable(minigzip test/minigzip.c)
-#target_link_libraries(minigzip zlib)
-
-#if(HAVE_OFF64_T)
-#    add_executable(example64 test/example.c)
-#    target_link_libraries(example64 zlib)
-#    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-#    add_test(example64 example64)
-
-#    add_executable(minigzip64 test/minigzip.c)
-#    target_link_libraries(minigzip64 zlib)
-#    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-#endif()
diff --git a/src/png/zlib/ChangeLog b/src/png/zlib/ChangeLog
deleted file mode 100644
index 30199a65a..000000000
--- a/src/png/zlib/ChangeLog
+++ /dev/null
@@ -1,1515 +0,0 @@
-
-                ChangeLog file for zlib
-
-Changes in 1.2.11 (15 Jan 2017)
-- Fix deflate stored bug when pulling last block from window
-- Permit immediate deflateParams changes before any deflate input
-
-Changes in 1.2.10 (2 Jan 2017)
-- Avoid warnings on snprintf() return value
-- Fix bug in deflate_stored() for zero-length input
-- Fix bug in gzwrite.c that produced corrupt gzip files
-- Remove files to be installed before copying them in Makefile.in
-- Add warnings when compiling with assembler code
-
-Changes in 1.2.9 (31 Dec 2016)
-- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
-- Improve contrib/blast to return unused bytes
-- Assure that gzoffset() is correct when appending
-- Improve compress() and uncompress() to support large lengths
-- Fix bug in test/example.c where error code not saved
-- Remedy Coverity warning [Randers-Pehrson]
-- Improve speed of gzprintf() in transparent mode
-- Fix inflateInit2() bug when windowBits is 16 or 32
-- Change DEBUG macro to ZLIB_DEBUG
-- Avoid uninitialized access by gzclose_w()
-- Allow building zlib outside of the source directory
-- Fix bug that accepted invalid zlib header when windowBits is zero
-- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
-- Loop on write() calls in gzwrite.c in case of non-blocking I/O
-- Add --warn (-w) option to ./configure for more compiler warnings
-- Reject a window size of 256 bytes if not using the zlib wrapper
-- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
-- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
-- Fix bugs in creating a very large gzip header
-- Add uncompress2() function, which returns the input size used
-- Assure that deflateParams() will not switch functions mid-block
-- Dramatically speed up deflation for level 0 (storing)
-- Add gzfread(), duplicating the interface of fread()
-- Add gzfwrite(), duplicating the interface of fwrite()
-- Add deflateGetDictionary() function
-- Use snprintf() for later versions of Microsoft C
-- Fix *Init macros to use z_ prefix when requested
-- Replace as400 with os400 for OS/400 support [Monnerat]
-- Add crc32_z() and adler32_z() functions with size_t lengths
-- Update Visual Studio project files [AraHaan]
-
-Changes in 1.2.8 (28 Apr 2013)
-- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
-- Do not force Z_CONST for C++
-- Clean up contrib/vstudio [Roß]
-- Correct spelling error in zlib.h
-- Fix mixed line endings in contrib/vstudio
-
-Changes in 1.2.7.3 (13 Apr 2013)
-- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
-
-Changes in 1.2.7.2 (13 Apr 2013)
-- Change check for a four-byte type back to hexadecimal
-- Fix typo in win32/Makefile.msc
-- Add casts in gzwrite.c for pointer differences
-
-Changes in 1.2.7.1 (24 Mar 2013)
-- Replace use of unsafe string functions with snprintf if available
-- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
-- Fix gzgetc undefine when Z_PREFIX set [Turk]
-- Eliminate use of mktemp in Makefile (not always available)
-- Fix bug in 'F' mode for gzopen()
-- Add inflateGetDictionary() function
-- Correct comment in deflate.h
-- Use _snprintf for snprintf in Microsoft C
-- On Darwin, only use /usr/bin/libtool if libtool is not Apple
-- Delete "--version" file if created by "ar --version" [Richard G.]
-- Fix configure check for veracity of compiler error return codes
-- Fix CMake compilation of static lib for MSVC2010 x64
-- Remove unused variable in infback9.c
-- Fix argument checks in gzlog_compress() and gzlog_write()
-- Clean up the usage of z_const and respect const usage within zlib
-- Clean up examples/gzlog.[ch] comparisons of different types
-- Avoid shift equal to bits in type (caused endless loop)
-- Fix uninitialized value bug in gzputc() introduced by const patches
-- Fix memory allocation error in examples/zran.c [Nor]
-- Fix bug where gzopen(), gzclose() would write an empty file
-- Fix bug in gzclose() when gzwrite() runs out of memory
-- Check for input buffer malloc failure in examples/gzappend.c
-- Add note to contrib/blast to use binary mode in stdio
-- Fix comparisons of differently signed integers in contrib/blast
-- Check for invalid code length codes in contrib/puff
-- Fix serious but very rare decompression bug in inftrees.c
-- Update inflateBack() comments, since inflate() can be faster
-- Use underscored I/O function names for WINAPI_FAMILY
-- Add _tr_flush_bits to the external symbols prefixed by --zprefix
-- Add contrib/vstudio/vc10 pre-build step for static only
-- Quote --version-script argument in CMakeLists.txt
-- Don't specify --version-script on Apple platforms in CMakeLists.txt
-- Fix casting error in contrib/testzlib/testzlib.c
-- Fix types in contrib/minizip to match result of get_crc_table()
-- Simplify contrib/vstudio/vc10 with 'd' suffix
-- Add TOP support to win32/Makefile.msc
-- Suport i686 and amd64 assembler builds in CMakeLists.txt
-- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
-- Add vc11 and vc12 build files to contrib/vstudio
-- Add gzvprintf() as an undocumented function in zlib
-- Fix configure for Sun shell
-- Remove runtime check in configure for four-byte integer type
-- Add casts and consts to ease user conversion to C++
-- Add man pages for minizip and miniunzip
-- In Makefile uninstall, don't rm if preceding cd fails
-- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
-
-Changes in 1.2.7 (2 May 2012)
-- Replace use of memmove() with a simple copy for portability
-- Test for existence of strerror
-- Restore gzgetc_ for backward compatibility with 1.2.6
-- Fix build with non-GNU make on Solaris
-- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
-- Include unistd.h for Watcom C
-- Use __WATCOMC__ instead of __WATCOM__
-- Do not use the visibility attribute if NO_VIZ defined
-- Improve the detection of no hidden visibility attribute
-- Avoid using __int64 for gcc or solo compilation
-- Cast to char * in gzprintf to avoid warnings [Zinser]
-- Fix make_vms.com for VAX [Zinser]
-- Don't use library or built-in byte swaps
-- Simplify test and use of gcc hidden attribute
-- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
-- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
-- Fix bug in test/minigzip.c for configure --solo
-- Fix contrib/vstudio project link errors [Mohanathas]
-- Add ability to choose the builder in make_vms.com [Schweda]
-- Add DESTDIR support to mingw32 win32/Makefile.gcc
-- Fix comments in win32/Makefile.gcc for proper usage
-- Allow overriding the default install locations for cmake
-- Generate and install the pkg-config file with cmake
-- Build both a static and a shared version of zlib with cmake
-- Include version symbols for cmake builds
-- If using cmake with MSVC, add the source directory to the includes
-- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
-- Move obsolete emx makefile to old [Truta]
-- Allow the use of -Wundef when compiling or using zlib
-- Avoid the use of the -u option with mktemp
-- Improve inflate() documentation on the use of Z_FINISH
-- Recognize clang as gcc
-- Add gzopen_w() in Windows for wide character path names
-- Rename zconf.h in CMakeLists.txt to move it out of the way
-- Add source directory in CMakeLists.txt for building examples
-- Look in build directory for zlib.pc in CMakeLists.txt
-- Remove gzflags from zlibvc.def in vc9 and vc10
-- Fix contrib/minizip compilation in the MinGW environment
-- Update ./configure for Solaris, support --64 [Mooney]
-- Remove -R. from Solaris shared build (possible security issue)
-- Avoid race condition for parallel make (-j) running example
-- Fix type mismatch between get_crc_table() and crc_table
-- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
-- Fix the path to zlib.map in CMakeLists.txt
-- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
-- Add instructions to win32/Makefile.gcc for shared install [Torri]
-
-Changes in 1.2.6.1 (12 Feb 2012)
-- Avoid the use of the Objective-C reserved name "id"
-- Include io.h in gzguts.h for Microsoft compilers
-- Fix problem with ./configure --prefix and gzgetc macro
-- Include gz_header definition when compiling zlib solo
-- Put gzflags() functionality back in zutil.c
-- Avoid library header include in crc32.c for Z_SOLO
-- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
-- Minor cleanup in contrib/minizip/zip.c [Vollant]
-- Update make_vms.com [Zinser]
-- Remove unnecessary gzgetc_ function
-- Use optimized byte swap operations for Microsoft and GNU [Snyder]
-- Fix minor typo in zlib.h comments [Rzesniowiecki]
-
-Changes in 1.2.6 (29 Jan 2012)
-- Update the Pascal interface in contrib/pascal
-- Fix function numbers for gzgetc_ in zlibvc.def files
-- Fix configure.ac for contrib/minizip [Schiffer]
-- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
-- Have ./configure use the compiler return code for error indication
-- Fix CMakeLists.txt for cross compilation [McClure]
-- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
-- Fix compilation of contrib/minizip on FreeBSD [Marquez]
-- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
-- Include io.h for Turbo C / Borland C on all platforms [Truta]
-- Make version explicit in contrib/minizip/configure.ac [Bosmans]
-- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
-- Minor cleanup up contrib/minizip/unzip.c [Vollant]
-- Fix bug when compiling minizip with C++ [Vollant]
-- Protect for long name and extra fields in contrib/minizip [Vollant]
-- Avoid some warnings in contrib/minizip [Vollant]
-- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
-- Add missing libs to minizip linker command
-- Add support for VPATH builds in contrib/minizip
-- Add an --enable-demos option to contrib/minizip/configure
-- Add the generation of configure.log by ./configure
-- Exit when required parameters not provided to win32/Makefile.gcc
-- Have gzputc return the character written instead of the argument
-- Use the -m option on ldconfig for BSD systems [Tobias]
-- Correct in zlib.map when deflateResetKeep was added
-
-Changes in 1.2.5.3 (15 Jan 2012)
-- Restore gzgetc function for binary compatibility
-- Do not use _lseeki64 under Borland C++ [Truta]
-- Update win32/Makefile.msc to build test/*.c [Truta]
-- Remove old/visualc6 given CMakefile and other alternatives
-- Update AS400 build files and documentation [Monnerat]
-- Update win32/Makefile.gcc to build test/*.c [Truta]
-- Permit stronger flushes after Z_BLOCK flushes
-- Avoid extraneous empty blocks when doing empty flushes
-- Permit Z_NULL arguments to deflatePending
-- Allow deflatePrime() to insert bits in the middle of a stream
-- Remove second empty static block for Z_PARTIAL_FLUSH
-- Write out all of the available bits when using Z_BLOCK
-- Insert the first two strings in the hash table after a flush
-
-Changes in 1.2.5.2 (17 Dec 2011)
-- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
-- use relative symlinks for shared libs
-- Avoid searching past window for Z_RLE strategy
-- Assure that high-water mark initialization is always applied in deflate
-- Add assertions to fill_window() in deflate.c to match comments
-- Update python link in README
-- Correct spelling error in gzread.c
-- Fix bug in gzgets() for a concatenated empty gzip stream
-- Correct error in comment for gz_make()
-- Change gzread() and related to ignore junk after gzip streams
-- Allow gzread() and related to continue after gzclearerr()
-- Allow gzrewind() and gzseek() after a premature end-of-file
-- Simplify gzseek() now that raw after gzip is ignored
-- Change gzgetc() to a macro for speed (~40% speedup in testing)
-- Fix gzclose() to return the actual error last encountered
-- Always add large file support for windows
-- Include zconf.h for windows large file support
-- Include zconf.h.cmakein for windows large file support
-- Update zconf.h.cmakein on make distclean
-- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
-- Clarify how gzopen() appends in zlib.h comments
-- Correct documentation of gzdirect() since junk at end now ignored
-- Add a transparent write mode to gzopen() when 'T' is in the mode
-- Update python link in zlib man page
-- Get inffixed.h and MAKEFIXED result to match
-- Add a ./config --solo option to make zlib subset with no library use
-- Add undocumented inflateResetKeep() function for CAB file decoding
-- Add --cover option to ./configure for gcc coverage testing
-- Add #define ZLIB_CONST option to use const in the z_stream interface
-- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
-- Note behavior of uncompress() to provide as much data as it can
-- Add files in contrib/minizip to aid in building libminizip
-- Split off AR options in Makefile.in and configure
-- Change ON macro to Z_ARG to avoid application conflicts
-- Facilitate compilation with Borland C++ for pragmas and vsnprintf
-- Include io.h for Turbo C / Borland C++
-- Move example.c and minigzip.c to test/
-- Simplify incomplete code table filling in inflate_table()
-- Remove code from inflate.c and infback.c that is impossible to execute
-- Test the inflate code with full coverage
-- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
-- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
-- Fix gzwrite.c to accommodate reduced memory zlib compilation
-- Have inflate() with Z_FINISH avoid the allocation of a window
-- Do not set strm->adler when doing raw inflate
-- Fix gzeof() to behave just like feof() when read is not past end of file
-- Fix bug in gzread.c when end-of-file is reached
-- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
-- Document gzread() capability to read concurrently written files
-- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
-
-Changes in 1.2.5.1 (10 Sep 2011)
-- Update FAQ entry on shared builds (#13)
-- Avoid symbolic argument to chmod in Makefile.in
-- Fix bug and add consts in contrib/puff [Oberhumer]
-- Update contrib/puff/zeros.raw test file to have all block types
-- Add full coverage test for puff in contrib/puff/Makefile
-- Fix static-only-build install in Makefile.in
-- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
-- Add libz.a dependency to shared in Makefile.in for parallel builds
-- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
-- Replace $(...) with `...` in configure for non-bash sh [Bowler]
-- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
-- Add solaris* to Linux* in configure to allow gcc use [Groffen]
-- Add *bsd* to Linux* case in configure [Bar-Lev]
-- Add inffast.obj to dependencies in win32/Makefile.msc
-- Correct spelling error in deflate.h [Kohler]
-- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
-- Add test to configure for GNU C looking for gcc in output of $cc -v
-- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
-- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
-- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
-- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
-- Make stronger test in zconf.h to include unistd.h for LFS
-- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
-- Fix zlib.h LFS support when Z_PREFIX used
-- Add updated as400 support (removed from old) [Monnerat]
-- Avoid deflate sensitivity to volatile input data
-- Avoid division in adler32_combine for NO_DIVIDE
-- Clarify the use of Z_FINISH with deflateBound() amount of space
-- Set binary for output file in puff.c
-- Use u4 type for crc_table to avoid conversion warnings
-- Apply casts in zlib.h to avoid conversion warnings
-- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
-- Improve inflateSync() documentation to note indeterminancy
-- Add deflatePending() function to return the amount of pending output
-- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
-- Add a check in configure for stdarg.h, use for gzprintf()
-- Check that pointers fit in ints when gzprint() compiled old style
-- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
-- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
-- Add debug records in assmebler code [Londer]
-- Update RFC references to use http://tools.ietf.org/html/... [Li]
-- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
-
-Changes in 1.2.5 (19 Apr 2010)
-- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
-- Default to libdir as sharedlibdir in configure [Nieder]
-- Update copyright dates on modified source files
-- Update trees.c to be able to generate modified trees.h
-- Exit configure for MinGW, suggesting win32/Makefile.gcc
-- Check for NULL path in gz_open [Homurlu]
-
-Changes in 1.2.4.5 (18 Apr 2010)
-- Set sharedlibdir in configure [Torok]
-- Set LDFLAGS in Makefile.in [Bar-Lev]
-- Avoid mkdir objs race condition in Makefile.in [Bowler]
-- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
-- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
-- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
-
-Changes in 1.2.4.4 (18 Apr 2010)
-- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
-- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
-- Try to use bash or ksh regardless of functionality of /bin/sh
-- Fix configure incompatibility with NetBSD sh
-- Remove attempt to run under bash or ksh since have better NetBSD fix
-- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
-- Add diagnostic messages when using CROSS_PREFIX in configure
-- Added --sharedlibdir option to configure [Weigelt]
-- Use hidden visibility attribute when available [Frysinger]
-
-Changes in 1.2.4.3 (10 Apr 2010)
-- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
-- Use CROSS_PREFIX for nm [Bar-Lev]
-- Assume _LARGEFILE64_SOURCE defined is equivalent to true
-- Avoid use of undefined symbols in #if with && and ||
-- Make *64 prototypes in gzguts.h consistent with functions
-- Add -shared load option for MinGW in configure [Bowler]
-- Move z_off64_t to public interface, use instead of off64_t
-- Remove ! from shell test in configure (not portable to Solaris)
-- Change +0 macro tests to -0 for possibly increased portability
-
-Changes in 1.2.4.2 (9 Apr 2010)
-- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
-- Really provide prototypes for *64 functions when building without LFS
-- Only define unlink() in minigzip.c if unistd.h not included
-- Update README to point to contrib/vstudio project files
-- Move projects/vc6 to old/ and remove projects/
-- Include stdlib.h in minigzip.c for setmode() definition under WinCE
-- Clean up assembler builds in win32/Makefile.msc [Rowe]
-- Include sys/types.h for Microsoft for off_t definition
-- Fix memory leak on error in gz_open()
-- Symbolize nm as $NM in configure [Weigelt]
-- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
-- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
-- Fix bug in gzeof() to take into account unused input data
-- Avoid initialization of structures with variables in puff.c
-- Updated win32/README-WIN32.txt [Rowe]
-
-Changes in 1.2.4.1 (28 Mar 2010)
-- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
-- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
-- Restore "for debugging" comment on sprintf() in gzlib.c
-- Remove fdopen for MVS from gzguts.h
-- Put new README-WIN32.txt in win32 [Rowe]
-- Add check for shell to configure and invoke another shell if needed
-- Fix big fat stinking bug in gzseek() on uncompressed files
-- Remove vestigial F_OPEN64 define in zutil.h
-- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
-- Avoid errors on non-LFS systems when applications define LFS macros
-- Set EXE to ".exe" in configure for MINGW [Kahle]
-- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
-- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
-- Add DLL install in win32/makefile.gcc [Bar-Lev]
-- Allow Linux* or linux* from uname in configure [Bar-Lev]
-- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
-- Add cross-compilation prefixes to configure [Bar-Lev]
-- Match type exactly in gz_load() invocation in gzread.c
-- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
-- Provide prototypes for *64 functions when building zlib without LFS
-- Don't use -lc when linking shared library on MinGW
-- Remove errno.h check in configure and vestigial errno code in zutil.h
-
-Changes in 1.2.4 (14 Mar 2010)
-- Fix VER3 extraction in configure for no fourth subversion
-- Update zlib.3, add docs to Makefile.in to make .pdf out of it
-- Add zlib.3.pdf to distribution
-- Don't set error code in gzerror() if passed pointer is NULL
-- Apply destination directory fixes to CMakeLists.txt [Lowman]
-- Move #cmakedefine's to a new zconf.in.cmakein
-- Restore zconf.h for builds that don't use configure or cmake
-- Add distclean to dummy Makefile for convenience
-- Update and improve INDEX, README, and FAQ
-- Update CMakeLists.txt for the return of zconf.h [Lowman]
-- Update contrib/vstudio/vc9 and vc10 [Vollant]
-- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
-- Apply license and readme changes to contrib/asm686 [Raiter]
-- Check file name lengths and add -c option in minigzip.c [Li]
-- Update contrib/amd64 and contrib/masmx86/ [Vollant]
-- Avoid use of "eof" parameter in trees.c to not shadow library variable
-- Update make_vms.com for removal of zlibdefs.h [Zinser]
-- Update assembler code and vstudio projects in contrib [Vollant]
-- Remove outdated assembler code contrib/masm686 and contrib/asm586
-- Remove old vc7 and vc8 from contrib/vstudio
-- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
-- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
-- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
-- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
-- Fix bug in void-returning vsprintf() case in gzwrite.c
-- Fix name change from inflate.h in contrib/inflate86/inffas86.c
-- Check if temporary file exists before removing in make_vms.com [Zinser]
-- Fix make install and uninstall for --static option
-- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
-- Update readme.txt in contrib/masmx64 and masmx86 to assemble
-
-Changes in 1.2.3.9 (21 Feb 2010)
-- Expunge gzio.c
-- Move as400 build information to old
-- Fix updates in contrib/minizip and contrib/vstudio
-- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
-- Delete zconf.h (made by configure) [Weigelt]
-- Change zconf.in.h to zconf.h.in per convention [Weigelt]
-- Check for NULL buf in gzgets()
-- Return empty string for gzgets() with len == 1 (like fgets())
-- Fix description of gzgets() in zlib.h for end-of-file, NULL return
-- Update minizip to 1.1 [Vollant]
-- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
-- Note in zlib.h that gzerror() should be used to distinguish from EOF
-- Remove use of snprintf() from gzlib.c
-- Fix bug in gzseek()
-- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
-- Fix zconf.h generation in CMakeLists.txt [Lowman]
-- Improve comments in zconf.h where modified by configure
-
-Changes in 1.2.3.8 (13 Feb 2010)
-- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
-- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
-- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
-- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
-- Fix missing error return in gzflush(), add zlib.h note
-- Add *64 functions to zlib.map [Levin]
-- Fix signed/unsigned comparison in gz_comp()
-- Use SFLAGS when testing shared linking in configure
-- Add --64 option to ./configure to use -m64 with gcc
-- Fix ./configure --help to correctly name options
-- Have make fail if a test fails [Levin]
-- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
-- Remove assembler object files from contrib
-
-Changes in 1.2.3.7 (24 Jan 2010)
-- Always gzopen() with O_LARGEFILE if available
-- Fix gzdirect() to work immediately after gzopen() or gzdopen()
-- Make gzdirect() more precise when the state changes while reading
-- Improve zlib.h documentation in many places
-- Catch memory allocation failure in gz_open()
-- Complete close operation if seek forward in gzclose_w() fails
-- Return Z_ERRNO from gzclose_r() if close() fails
-- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
-- Return zero for gzwrite() errors to match zlib.h description
-- Return -1 on gzputs() error to match zlib.h description
-- Add zconf.in.h to allow recovery from configure modification [Weigelt]
-- Fix static library permissions in Makefile.in [Weigelt]
-- Avoid warnings in configure tests that hide functionality [Weigelt]
-- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
-- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
-- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
-- Keep object files in subdirectories to reduce the clutter somewhat
-- Remove default Makefile and zlibdefs.h, add dummy Makefile
-- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
-- Remove zlibdefs.h completely -- modify zconf.h instead
-
-Changes in 1.2.3.6 (17 Jan 2010)
-- Avoid void * arithmetic in gzread.c and gzwrite.c
-- Make compilers happier with const char * for gz_error message
-- Avoid unused parameter warning in inflate.c
-- Avoid signed-unsigned comparison warning in inflate.c
-- Indent #pragma's for traditional C
-- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
-- Correct email address in configure for system options
-- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
-- Update zlib.map [Brown]
-- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
-- Apply various fixes to CMakeLists.txt [Lowman]
-- Add checks on len in gzread() and gzwrite()
-- Add error message for no more room for gzungetc()
-- Remove zlib version check in gzwrite()
-- Defer compression of gzprintf() result until need to
-- Use snprintf() in gzdopen() if available
-- Remove USE_MMAP configuration determination (only used by minigzip)
-- Remove examples/pigz.c (available separately)
-- Update examples/gun.c to 1.6
-
-Changes in 1.2.3.5 (8 Jan 2010)
-- Add space after #if in zutil.h for some compilers
-- Fix relatively harmless bug in deflate_fast() [Exarevsky]
-- Fix same problem in deflate_slow()
-- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
-- Add deflate_rle() for faster Z_RLE strategy run-length encoding
-- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
-- Change name of "write" variable in inffast.c to avoid library collisions
-- Fix premature EOF from gzread() in gzio.c [Brown]
-- Use zlib header window size if windowBits is 0 in inflateInit2()
-- Remove compressBound() call in deflate.c to avoid linking compress.o
-- Replace use of errno in gz* with functions, support WinCE [Alves]
-- Provide alternative to perror() in minigzip.c for WinCE [Alves]
-- Don't use _vsnprintf on later versions of MSVC [Lowman]
-- Add CMake build script and input file [Lowman]
-- Update contrib/minizip to 1.1 [Svensson, Vollant]
-- Moved nintendods directory from contrib to .
-- Replace gzio.c with a new set of routines with the same functionality
-- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
-- Update contrib/minizip to 1.1b
-- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
-
-Changes in 1.2.3.4 (21 Dec 2009)
-- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
-- Update comments in configure and Makefile.in for default --shared
-- Fix test -z's in configure [Marquess]
-- Build examplesh and minigzipsh when not testing
-- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
-- Import LDFLAGS from the environment in configure
-- Fix configure to populate SFLAGS with discovered CFLAGS options
-- Adapt make_vms.com to the new Makefile.in [Zinser]
-- Add zlib2ansi script for C++ compilation [Marquess]
-- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
-- Add AMD64 assembler code for longest match to contrib [Teterin]
-- Include options from $SFLAGS when doing $LDSHARED
-- Simplify 64-bit file support by introducing z_off64_t type
-- Make shared object files in objs directory to work around old Sun cc
-- Use only three-part version number for Darwin shared compiles
-- Add rc option to ar in Makefile.in for when ./configure not run
-- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
-- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
-- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
-- Rename Makefile.in targets allstatic to static and allshared to shared
-- Fix static and shared Makefile.in targets to be independent
-- Correct error return bug in gz_open() by setting state [Brown]
-- Put spaces before ;;'s in configure for better sh compatibility
-- Add pigz.c (parallel implementation of gzip) to examples/
-- Correct constant in crc32.c to UL [Leventhal]
-- Reject negative lengths in crc32_combine()
-- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
-- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
-- Correct typo in doc/algorithm.txt [Janik]
-- Fix bug in adler32_combine() [Zhu]
-- Catch missing-end-of-block-code error in all inflates and in puff
-    Assures that random input to inflate eventually results in an error
-- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
-- Update ENOUGH and its usage to reflect discovered bounds
-- Fix gzerror() error report on empty input file [Brown]
-- Add ush casts in trees.c to avoid pedantic runtime errors
-- Fix typo in zlib.h uncompress() description [Reiss]
-- Correct inflate() comments with regard to automatic header detection
-- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
-- Put new version of gzlog (2.0) in examples with interruption recovery
-- Add puff compile option to permit invalid distance-too-far streams
-- Add puff TEST command options, ability to read piped input
-- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
-  _LARGEFILE64_SOURCE not defined
-- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
-- Fix deflateSetDictionary() to use all 32K for output consistency
-- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
-- Clear bytes after deflate lookahead to avoid use of uninitialized data
-- Change a limit in inftrees.c to be more transparent to Coverity Prevent
-- Update win32/zlib.def with exported symbols from zlib.h
-- Correct spelling errors in zlib.h [Willem, Sobrado]
-- Allow Z_BLOCK for deflate() to force a new block
-- Allow negative bits in inflatePrime() to delete existing bit buffer
-- Add Z_TREES flush option to inflate() to return at end of trees
-- Add inflateMark() to return current state information for random access
-- Add Makefile for NintendoDS to contrib [Costa]
-- Add -w in configure compile tests to avoid spurious warnings [Beucler]
-- Fix typos in zlib.h comments for deflateSetDictionary()
-- Fix EOF detection in transparent gzread() [Maier]
-
-Changes in 1.2.3.3 (2 October 2006)
-- Make --shared the default for configure, add a --static option
-- Add compile option to permit invalid distance-too-far streams
-- Add inflateUndermine() function which is required to enable above
-- Remove use of "this" variable name for C++ compatibility [Marquess]
-- Add testing of shared library in make test, if shared library built
-- Use ftello() and fseeko() if available instead of ftell() and fseek()
-- Provide two versions of all functions that use the z_off_t type for
-  binary compatibility -- a normal version and a 64-bit offset version,
-  per the Large File Support Extension when _LARGEFILE64_SOURCE is
-  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
-  is defined to be 64
-- Add a --uname= option to configure to perhaps help with cross-compiling
-
-Changes in 1.2.3.2 (3 September 2006)
-- Turn off silly Borland warnings [Hay]
-- Use off64_t and define _LARGEFILE64_SOURCE when present
-- Fix missing dependency on inffixed.h in Makefile.in
-- Rig configure --shared to build both shared and static [Teredesai, Truta]
-- Remove zconf.in.h and instead create a new zlibdefs.h file
-- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
-- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
-
-Changes in 1.2.3.1 (16 August 2006)
-- Add watcom directory with OpenWatcom make files [Daniel]
-- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
-- Update make_vms.com [Zinser]
-- Use -fPIC for shared build in configure [Teredesai, Nicholson]
-- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
-- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
-- Add some FAQ entries about the contrib directory
-- Update the MVS question in the FAQ
-- Avoid extraneous reads after EOF in gzio.c [Brown]
-- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
-- Add comments to zlib.h about gzerror() usage [Brown]
-- Set extra flags in gzip header in gzopen() like deflate() does
-- Make configure options more compatible with double-dash conventions
-  [Weigelt]
-- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
-- Fix uninstall target in Makefile.in [Truta]
-- Add pkgconfig support [Weigelt]
-- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
-- Replace set_data_type() with a more accurate detect_data_type() in
-  trees.c, according to the txtvsbin.txt document [Truta]
-- Swap the order of #include <stdio.h> and #include "zlib.h" in
-  gzio.c, example.c and minigzip.c [Truta]
-- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
-  Truta] (where?)
-- Fix target "clean" from win32/Makefile.bor [Truta]
-- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
-- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
-- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
-- Enable browse info in the "Debug" and "ASM Debug" configurations in
-  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
-- Add pkgconfig support [Weigelt]
-- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
-  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
-- Add a document that explains the new text detection scheme to
-  doc/txtvsbin.txt [Truta]
-- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
-- Move algorithm.txt into doc/ [Truta]
-- Synchronize FAQ with website
-- Fix compressBound(), was low for some pathological cases [Fearnley]
-- Take into account wrapper variations in deflateBound()
-- Set examples/zpipe.c input and output to binary mode for Windows
-- Update examples/zlib_how.html with new zpipe.c (also web site)
-- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
-  that gcc became pickier in 4.0)
-- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
-  un-versioned, the patch adds versioning only for symbols introduced in
-  zlib-1.2.0 or later.  It also declares as local those symbols which are
-  not designed to be exported." [Levin]
-- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
-- Do not initialize global static by default in trees.c, add a response
-  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
-- Don't use strerror() in gzio.c under WinCE [Yakimov]
-- Don't use errno.h in zutil.h under WinCE [Yakimov]
-- Move arguments for AR to its usage to allow replacing ar [Marot]
-- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
-- Improve inflateInit() and inflateInit2() documentation
-- Fix structure size comment in inflate.h
-- Change configure help option from --h* to --help [Santos]
-
-Changes in 1.2.3 (18 July 2005)
-- Apply security vulnerability fixes to contrib/infback9 as well
-- Clean up some text files (carriage returns, trailing space)
-- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
-
-Changes in 1.2.2.4 (11 July 2005)
-- Add inflatePrime() function for starting inflation at bit boundary
-- Avoid some Visual C warnings in deflate.c
-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
-  compile
-- Fix some spelling errors in comments [Betts]
-- Correct inflateInit2() error return documentation in zlib.h
-- Add zran.c example of compressed data random access to examples
-  directory, shows use of inflatePrime()
-- Fix cast for assignments to strm->state in inflate.c and infback.c
-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
-- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
-- Add cast in trees.c t avoid a warning [Oberhumer]
-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
-- Update make_vms.com [Zinser]
-- Initialize state->write in inflateReset() since copied in inflate_fast()
-- Be more strict on incomplete code sets in inflate_table() and increase
-  ENOUGH and MAXD -- this repairs a possible security vulnerability for
-  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
-  discovering the vulnerability and providing test cases.
-- Add ia64 support to configure for HP-UX [Smith]
-- Add error return to gzread() for format or i/o error [Levin]
-- Use malloc.h for OS/2 [Necasek]
-
-Changes in 1.2.2.3 (27 May 2005)
-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
-- Typecast fread() return values in gzio.c [Vollant]
-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
-- Fix crc check bug in gzread() after gzungetc() [Heiner]
-- Add the deflateTune() function to adjust internal compression parameters
-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
-- Remove an incorrect assertion in examples/zpipe.c
-- Add C++ wrapper in infback9.h [Donais]
-- Fix bug in inflateCopy() when decoding fixed codes
-- Note in zlib.h how much deflateSetDictionary() actually uses
-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
-- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
-- Add gzdirect() function to indicate transparent reads
-- Update contrib/minizip [Vollant]
-- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
-- Add casts in crc32.c to avoid warnings [Oberhumer]
-- Add contrib/masmx64 [Vollant]
-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
-
-Changes in 1.2.2.2 (30 December 2004)
-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
-  avoid implicit memcpy calls (portability for no-library compilation)
-- Increase sprintf() buffer size in gzdopen() to allow for large numbers
-- Add INFLATE_STRICT to check distances against zlib header
-- Improve WinCE errno handling and comments [Chang]
-- Remove comment about no gzip header processing in FAQ
-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
-- Add updated make_vms.com [Coghlan], update README
-- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
-  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
-- Add FAQ entry and comments in deflate.c on uninitialized memory access
-- Add Solaris 9 make options in configure [Gilbert]
-- Allow strerror() usage in gzio.c for STDC
-- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
-- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
-- Use z_off_t for adler32_combine() and crc32_combine() lengths
-- Make adler32() much faster for small len
-- Use OS_CODE in deflate() default gzip header
-
-Changes in 1.2.2.1 (31 October 2004)
-- Allow inflateSetDictionary() call for raw inflate
-- Fix inflate header crc check bug for file names and comments
-- Add deflateSetHeader() and gz_header structure for custom gzip headers
-- Add inflateGetheader() to retrieve gzip headers
-- Add crc32_combine() and adler32_combine() functions
-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
-- Use zstreamp consistently in zlib.h (inflate_back functions)
-- Remove GUNZIP condition from definition of inflate_mode in inflate.h
-  and in contrib/inflate86/inffast.S [Truta, Anderson]
-- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
-- Update projects/README.projects and projects/visualc6 [Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
-- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
-- Use a new algorithm for setting strm->data_type in trees.c [Truta]
-- Do not define an exit() prototype in zutil.c unless DEBUG defined
-- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
-- Fix Darwin build version identification [Peterson]
-
-Changes in 1.2.2 (3 October 2004)
-- Update zlib.h comments on gzip in-memory processing
-- Set adler to 1 in inflateReset() to support Java test suite [Walles]
-- Add contrib/dotzlib [Ravn]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update contrib/minizip [Vollant]
-- Move contrib/visual-basic.txt to old/ [Truta]
-- Fix assembler builds in projects/visualc6/ [Truta]
-
-Changes in 1.2.1.2 (9 September 2004)
-- Update INDEX file
-- Fix trees.c to update strm->data_type (no one ever noticed!)
-- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
-- Add limited multitasking protection to DYNAMIC_CRC_TABLE
-- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
-- Don't declare strerror() under VMS [Mozilla]
-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
-- Update contrib/ada [Anisimkov]
-- Update contrib/minizip [Vollant]
-- Fix configure to not hardcode directories for Darwin [Peterson]
-- Fix gzio.c to not return error on empty files [Brown]
-- Fix indentation; update version in contrib/delphi/ZLib.pas and
-  contrib/pascal/zlibpas.pas [Truta]
-- Update mkasm.bat in contrib/masmx86 [Truta]
-- Update contrib/untgz [Truta]
-- Add projects/README.projects [Truta]
-- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
-- Update win32/DLL_FAQ.txt [Truta]
-- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
-- Remove an unnecessary assignment to curr in inftrees.c [Truta]
-- Add OS/2 to exe builds in configure [Poltorak]
-- Remove err dummy parameter in zlib.h [Kientzle]
-
-Changes in 1.2.1.1 (9 January 2004)
-- Update email address in README
-- Several FAQ updates
-- Fix a big fat bug in inftrees.c that prevented decoding valid
-  dynamic blocks with only literals and no distance codes --
-  Thanks to "Hot Emu" for the bug report and sample file
-- Add a note to puff.c on no distance codes case.
-
-Changes in 1.2.1 (17 November 2003)
-- Remove a tab in contrib/gzappend/gzappend.c
-- Update some interfaces in contrib for new zlib functions
-- Update zlib version number in some contrib entries
-- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
-- Support shared libraries on Hurd and KFreeBSD [Brown]
-- Fix error in NO_DIVIDE option of adler32.c
-
-Changes in 1.2.0.8 (4 November 2003)
-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
-- Add experimental NO_DIVIDE #define in adler32.c
-    - Possibly faster on some processors (let me know if it is)
-- Correct Z_BLOCK to not return on first inflate call if no wrap
-- Fix strm->data_type on inflate() return to correctly indicate EOB
-- Add deflatePrime() function for appending in the middle of a byte
-- Add contrib/gzappend for an example of appending to a stream
-- Update win32/DLL_FAQ.txt [Truta]
-- Delete Turbo C comment in README [Truta]
-- Improve some indentation in zconf.h [Truta]
-- Fix infinite loop on bad input in configure script [Church]
-- Fix gzeof() for concatenated gzip files [Johnson]
-- Add example to contrib/visual-basic.txt [Michael B.]
-- Add -p to mkdir's in Makefile.in [vda]
-- Fix configure to properly detect presence or lack of printf functions
-- Add AS400 support [Monnerat]
-- Add a little Cygwin support [Wilson]
-
-Changes in 1.2.0.7 (21 September 2003)
-- Correct some debug formats in contrib/infback9
-- Cast a type in a debug statement in trees.c
-- Change search and replace delimiter in configure from % to # [Beebe]
-- Update contrib/untgz to 0.2 with various fixes [Truta]
-- Add build support for Amiga [Nikl]
-- Remove some directories in old that have been updated to 1.2
-- Add dylib building for Mac OS X in configure and Makefile.in
-- Remove old distribution stuff from Makefile
-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
-- Update links in README
-
-Changes in 1.2.0.6 (13 September 2003)
-- Minor FAQ updates
-- Update contrib/minizip to 1.00 [Vollant]
-- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
-- Update POSTINC comment for 68060 [Nikl]
-- Add contrib/infback9 with deflate64 decoding (unsupported)
-- For MVS define NO_vsnprintf and undefine FAR [van Burik]
-- Add pragma for fdopen on MVS [van Burik]
-
-Changes in 1.2.0.5 (8 September 2003)
-- Add OF to inflateBackEnd() declaration in zlib.h
-- Remember start when using gzdopen in the middle of a file
-- Use internal off_t counters in gz* functions to properly handle seeks
-- Perform more rigorous check for distance-too-far in inffast.c
-- Add Z_BLOCK flush option to return from inflate at block boundary
-- Set strm->data_type on return from inflate
-    - Indicate bits unused, if at block boundary, and if in last block
-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
-- Add condition so old NO_DEFLATE define still works for compatibility
-- FAQ update regarding the Windows DLL [Truta]
-- INDEX update: add qnx entry, remove aix entry [Truta]
-- Install zlib.3 into mandir [Wilson]
-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
-- Adapt the zlib interface to the new DLL convention guidelines [Truta]
-- Introduce ZLIB_WINAPI macro to allow the export of functions using
-  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
-- Update msdos and win32 scripts and makefiles [Truta]
-- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
-- Add contrib/ada [Anisimkov]
-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
-- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
-- Add contrib/masm686 [Truta]
-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
-  [Truta, Vollant]
-- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
-- Remove contrib/delphi2; add a new contrib/delphi [Truta]
-- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
-  and fix some method prototypes [Truta]
-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
-  [Truta]
-- Avoid the use of backslash (\) in contrib/minizip [Vollant]
-- Fix file time handling in contrib/untgz; update makefiles [Truta]
-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
-  [Vollant]
-- Remove contrib/vstudio/vc15_16 [Vollant]
-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
-- Update README.contrib [Truta]
-- Invert the assignment order of match_head and s->prev[...] in
-  INSERT_STRING [Truta]
-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
-  [Truta]
-- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
-- Fix prototype of syncsearch in inflate.c [Truta]
-- Introduce ASMINF macro to be enabled when using an ASM implementation
-  of inflate_fast [Truta]
-- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
-- Modify test_gzio in example.c to take a single file name as a
-  parameter [Truta]
-- Exit the example.c program if gzopen fails [Truta]
-- Add type casts around strlen in example.c [Truta]
-- Remove casting to sizeof in minigzip.c; give a proper type
-  to the variable compared with SUFFIX_LEN [Truta]
-- Update definitions of STDC and STDC99 in zconf.h [Truta]
-- Synchronize zconf.h with the new Windows DLL interface [Truta]
-- Use SYS16BIT instead of __32BIT__ to distinguish between
-  16- and 32-bit platforms [Truta]
-- Use far memory allocators in small 16-bit memory models for
-  Turbo C [Truta]
-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
-  zlibCompileFlags [Truta]
-- Cygwin has vsnprintf [Wilson]
-- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
-
-Changes in 1.2.0.4 (10 August 2003)
-- Minor FAQ updates
-- Be more strict when checking inflateInit2's windowBits parameter
-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
-- Add gzip wrapper option to deflateInit2 using windowBits
-- Add updated QNX rule in configure and qnx directory [Bonnefoy]
-- Make inflate distance-too-far checks more rigorous
-- Clean up FAR usage in inflate
-- Add casting to sizeof() in gzio.c and minigzip.c
-
-Changes in 1.2.0.3 (19 July 2003)
-- Fix silly error in gzungetc() implementation [Vollant]
-- Update contrib/minizip and contrib/vstudio [Vollant]
-- Fix printf format in example.c
-- Correct cdecl support in zconf.in.h [Anisimkov]
-- Minor FAQ updates
-
-Changes in 1.2.0.2 (13 July 2003)
-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
-- Attempt to avoid warnings in crc32.c for pointer-int conversion
-- Add AIX to configure, remove aix directory [Bakker]
-- Add some casts to minigzip.c
-- Improve checking after insecure sprintf() or vsprintf() calls
-- Remove #elif's from crc32.c
-- Change leave label to inf_leave in inflate.c and infback.c to avoid
-  library conflicts
-- Remove inflate gzip decoding by default--only enable gzip decoding by
-  special request for stricter backward compatibility
-- Add zlibCompileFlags() function to return compilation information
-- More typecasting in deflate.c to avoid warnings
-- Remove leading underscore from _Capital #defines [Truta]
-- Fix configure to link shared library when testing
-- Add some Windows CE target adjustments [Mai]
-- Remove #define ZLIB_DLL in zconf.h [Vollant]
-- Add zlib.3 [Rodgers]
-- Update RFC URL in deflate.c and algorithm.txt [Mai]
-- Add zlib_dll_FAQ.txt to contrib [Truta]
-- Add UL to some constants [Truta]
-- Update minizip and vstudio [Vollant]
-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
-- Expand use of NO_DUMMY_DECL to avoid all dummy structures
-- Added iostream3 to contrib [Schwardt]
-- Replace rewind() with fseek() for WinCE [Truta]
-- Improve setting of zlib format compression level flags
-    - Report 0 for huffman and rle strategies and for level == 0 or 1
-    - Report 2 only for level == 6
-- Only deal with 64K limit when necessary at compile time [Truta]
-- Allow TOO_FAR check to be turned off at compile time [Truta]
-- Add gzclearerr() function [Souza]
-- Add gzungetc() function
-
-Changes in 1.2.0.1 (17 March 2003)
-- Add Z_RLE strategy for run-length encoding [Truta]
-    - When Z_RLE requested, restrict matches to distance one
-    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
-- Correct FASTEST compilation to allow level == 0
-- Clean up what gets compiled for FASTEST
-- Incorporate changes to zconf.in.h [Vollant]
-    - Refine detection of Turbo C need for dummy returns
-    - Refine ZLIB_DLL compilation
-    - Include additional header file on VMS for off_t typedef
-- Try to use _vsnprintf where it supplants vsprintf [Vollant]
-- Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
-  write more than 4095 bytes before compression
-- Remove unused state from inflateBackEnd()
-- Remove exit(0) from minigzip.c, example.c
-- Get rid of all those darn tabs
-- Add "check" target to Makefile.in that does the same thing as "test"
-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
-- Update contrib/inflate86 [Anderson]
-- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
-- Add msdos and win32 directories with makefiles [Truta]
-- More additions and improvements to the FAQ
-
-Changes in 1.2.0 (9 March 2003)
-- New and improved inflate code
-    - About 20% faster
-    - Does not allocate 32K window unless and until needed
-    - Automatically detects and decompresses gzip streams
-    - Raw inflate no longer needs an extra dummy byte at end
-    - Added inflateBack functions using a callback interface--even faster
-      than inflate, useful for file utilities (gzip, zip)
-    - Added inflateCopy() function to record state for random access on
-      externally generated deflate streams (e.g. in gzip files)
-    - More readable code (I hope)
-- New and improved crc32()
-    - About 50% faster, thanks to suggestions from Rodney Brown
-- Add deflateBound() and compressBound() functions
-- Fix memory leak in deflateInit2()
-- Permit setting dictionary for raw deflate (for parallel deflate)
-- Fix const declaration for gzwrite()
-- Check for some malloc() failures in gzio.c
-- Fix bug in gzopen() on single-byte file 0x1f
-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
-  and next buffer doesn't start with 0x8b
-- Fix uncompress() to return Z_DATA_ERROR on truncated input
-- Free memory at end of example.c
-- Remove MAX #define in trees.c (conflicted with some libraries)
-- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
-- Declare malloc() and free() in gzio.c if STDC not defined
-- Use malloc() instead of calloc() in zutil.c if int big enough
-- Define STDC for AIX
-- Add aix/ with approach for compiling shared library on AIX
-- Add HP-UX support for shared libraries in configure
-- Add OpenUNIX support for shared libraries in configure
-- Use $cc instead of gcc to build shared library
-- Make prefix directory if needed when installing
-- Correct Macintosh avoidance of typedef Byte in zconf.h
-- Correct Turbo C memory allocation when under Linux
-- Use libz.a instead of -lz in Makefile (assure use of compiled library)
-- Update configure to check for snprintf or vsnprintf functions and their
-  return value, warn during make if using an insecure function
-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
-  is lost when library is used--resolution is to build new zconf.h
-- Documentation improvements (in zlib.h):
-    - Document raw deflate and inflate
-    - Update RFCs URL
-    - Point out that zlib and gzip formats are different
-    - Note that Z_BUF_ERROR is not fatal
-    - Document string limit for gzprintf() and possible buffer overflow
-    - Note requirement on avail_out when flushing
-    - Note permitted values of flush parameter of inflate()
-- Add some FAQs (and even answers) to the FAQ
-- Add contrib/inflate86/ for x86 faster inflate
-- Add contrib/blast/ for PKWare Data Compression Library decompression
-- Add contrib/puff/ simple inflate for deflate format description
-
-Changes in 1.1.4 (11 March 2002)
-- ZFREE was repeated on same allocation on some error conditions.
-  This creates a security problem described in
-  http://www.zlib.org/advisory-2002-03-11.txt
-- Returned incorrect error (Z_MEM_ERROR) on some invalid data
-- Avoid accesses before window for invalid distances with inflate window
-  less than 32K.
-- force windowBits > 8 to avoid a bug in the encoder for a window size
-  of 256 bytes. (A complete fix will be available in 1.1.5).
-
-Changes in 1.1.3 (9 July 1998)
-- fix "an inflate input buffer bug that shows up on rare but persistent
-  occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
-  (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-- Support gzdopen on Mac with Metrowerks (Jason Linhart)
-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
-- avoid some warnings with Borland C (Tom Tanner)
-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
-- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
-- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
-- use libdir and includedir in Makefile.in (Tim Mooney)
-- support shared libraries on OSF1 V4 (Tim Mooney)
-- remove so_locations in "make clean"  (Tim Mooney)
-- fix maketree.c compilation error (Glenn, Mark)
-- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
-- new Makefile.riscos (Rich Walker)
-- initialize static descriptors in trees.c for embedded targets (Nick Smith)
-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
-- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
-- fix maketree.c to allow clean compilation of inffixed.h (Mark)
-- fix parameter check in deflateCopy (Gunther Nikl)
-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
-- Many portability patches by Christian Spieler:
-  . zutil.c, zutil.h: added "const" for zmem*
-  . Make_vms.com: fixed some typos
-  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
-  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
-  . msdos/Makefile.*: use model-dependent name for the built zlib library
-  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
-     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-- replace __far with _far for better portability (Christian Spieler, Tom Lane)
-- fix test for errno.h in configure (Tim Newsham)
-
-Changes in 1.1.2 (19 March 98)
-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
-  See http://www.winimage.com/zLibDll/unzip.html
-- preinitialize the inflate tables for fixed codes, to make the code
-  completely thread safe (Mark)
-- some simplifications and slight speed-up to the inflate code (Mark)
-- fix gzeof on non-compressed files (Allan Schrum)
-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
-- do not wrap extern "C" around system includes (Tom Lane)
-- mention zlib binding for TCL in README (Andreas Kupries)
-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
-- allow "configure --prefix $HOME" (Tim Mooney)
-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
-- move Makefile.sas to amiga/Makefile.sas
-
-Changes in 1.1.1 (27 Feb 98)
-- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
-- remove block truncation heuristic which had very marginal effect for zlib
-  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
-  compression ratio on some files. This also allows inlining _tr_tally for
-  matches in deflate_slow.
-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
-
-Changes in 1.1.0 (24 Feb 98)
-- do not return STREAM_END prematurely in inflate (John Bowler)
-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
-- compile with -DFASTEST to get compression code optimized for speed only
-- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
-  on Sun but significant on HP)
-
-- add a pointer to experimental unzip library in README (Gilles Vollant)
-- initialize variable gcc in configure (Chris Herborth)
-
-Changes in 1.0.9 (17 Feb 1998)
-- added gzputs and gzgets functions
-- do not clear eof flag in gzseek (Mark Diekhans)
-- fix gzseek for files in transparent mode (Mark Diekhans)
-- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-- replace EXPORT with ZEXPORT to avoid conflict with other programs
-- added compress2 in zconf.h, zlib.def, zlib.dnt
-- new asm code from Gilles Vollant in contrib/asm386
-- simplify the inflate code (Mark):
- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
- . ZALLOC the length list in inflate_trees_fixed() instead of using stack
- . ZALLOC the value area for huft_build() instead of using stack
- . Simplify Z_FINISH check in inflate()
-
-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
-  the declaration of FAR (Gilles VOllant)
-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
-- read_buf buf parameter of type Bytef* instead of charf*
-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
-- fix check for presence of directories in "make install" (Ian Willis)
-
-Changes in 1.0.8 (27 Jan 1998)
-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
-- added compress2() to allow setting the compression level
-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
-- use constant arrays for the static trees in trees.c instead of computing
-  them at run time (thanks to Ken Raeburn for this suggestion). To create
-  trees.h, compile with GEN_TREES_H and run "make test".
-- check return code of example in "make test" and display result
-- pass minigzip command line options to file_compress
-- simplifying code of inflateSync to avoid gcc 2.8 bug
-
-- support CC="gcc -Wall" in configure -s (QingLong)
-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
-- fix test for shared library support to avoid compiler warnings
-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
-- do not use fdopen for Metrowerks on Mac (Brad Pettit))
-- add checks for gzputc and gzputc in example.c
-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
-- use const for the CRC table (Ken Raeburn)
-- fixed "make uninstall" for shared libraries
-- use Tracev instead of Trace in infblock.c
-- in example.c use correct compressed length for test_sync
-- suppress +vnocompatwarnings in configure for HPUX (not always supported)
-
-Changes in 1.0.7 (20 Jan 1998)
-- fix gzseek which was broken in write mode
-- return error for gzseek to negative absolute position
-- fix configure for Linux (Chun-Chung Chen)
-- increase stack space for MSC (Tim Wegner)
-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
-- define EXPORTVA for gzprintf (Gilles Vollant)
-- added man page zlib.3 (Rick Rodgers)
-- for contrib/untgz, fix makedir() and improve Makefile
-
-- check gzseek in write mode in example.c
-- allocate extra buffer for seeks only if gzseek is actually called
-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
-- add inflateSyncPoint in zconf.h
-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
-
-Changes in 1.0.6 (19 Jan 1998)
-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
-  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-- Fix a deflate bug occurring only with compression level 0 (thanks to
-  Andy Buckler for finding this one).
-- In minigzip, pass transparently also the first byte for .Z files.
-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
-- check Z_FINISH in inflate (thanks to Marc Schluper)
-- Implement deflateCopy (thanks to Adam Costello)
-- make static libraries by default in configure, add --shared option.
-- move MSDOS or Windows specific files to directory msdos
-- suppress the notion of partial flush to simplify the interface
-  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
-- suppress history buffer provided by application to simplify the interface
-  (this feature was not implemented anyway in 1.0.4)
-- next_in and avail_in must be initialized before calling inflateInit or
-  inflateInit2
-- add EXPORT in all exported functions (for Windows DLL)
-- added Makefile.nt (thanks to Stephen Williams)
-- added the unsupported "contrib" directory:
-   contrib/asm386/ by Gilles Vollant <info@winimage.com>
-        386 asm code replacing longest_match().
-   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
-        A C++ I/O streams interface to the zlib gz* functions
-   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
-        Another C++ I/O streams interface
-   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-        A very simple tar.gz file extractor using zlib
-   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
-        How to use compress(), uncompress() and the gz* functions from VB.
-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
-  level) in minigzip (thanks to Tom Lane)
-
-- use const for rommable constants in deflate
-- added test for gzseek and gztell in example.c
-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
-- add undocumented function zError to convert error code to string
-  (for Tim Smithers)
-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
-- Use default memcpy for Symantec MSDOS compiler.
-- Add EXPORT keyword for check_func (needed for Windows DLL)
-- add current directory to LD_LIBRARY_PATH for "make test"
-- create also a link for libz.so.1
-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
-- added -soname for Linux in configure (Chun-Chung Chen,
-- assign numbers to the exported functions in zlib.def (for Windows DLL)
-- add advice in zlib.h for best usage of deflateSetDictionary
-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
-- allow compilation with ANSI keywords only enabled for TurboC in large model
-- avoid "versionString"[0] (Borland bug)
-- add NEED_DUMMY_RETURN for Borland
-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
-- allow compilation with CC
-- defined STDC for OS/2 (David Charlap)
-- limit external names to 8 chars for MVS (Thomas Lund)
-- in minigzip.c, use static buffers only for 16-bit systems
-- fix suffix check for "minigzip -d foo.gz"
-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
-- added makelcc.bat for lcc-win32 (Tom St Denis)
-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
-- check for unistd.h in configure (for off_t)
-- remove useless check parameter in inflate_blocks_free
-- avoid useless assignment of s->check to itself in inflate_blocks_new
-- do not flush twice in gzclose (thanks to Ken Raeburn)
-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
-- work around buggy fclose on pipes for HP/UX
-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
-- fix configure if CC is already equal to gcc
-
-Changes in 1.0.5 (3 Jan 98)
-- Fix inflate to terminate gracefully when fed corrupted or invalid data
-- Use const for rommable constants in inflate
-- Eliminate memory leaks on error conditions in inflate
-- Removed some vestigial code in inflate
-- Update web address in README
-
-Changes in 1.0.4 (24 Jul 96)
-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
-  bit, so the decompressor could decompress all the correct data but went
-  on to attempt decompressing extra garbage data. This affected minigzip too.
-- zlibVersion and gzerror return const char* (needed for DLL)
-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
-- use z_error only for DEBUG (avoid problem with DLLs)
-
-Changes in 1.0.3 (2 Jul 96)
-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
-  small and medium models; this makes the library incompatible with previous
-  versions for these models. (No effect in large model or on other systems.)
-- return OK instead of BUF_ERROR if previous deflate call returned with
-  avail_out as zero but there is nothing to do
-- added memcmp for non STDC compilers
-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
-- better check for 16-bit mode MSC (avoids problem with Symantec)
-
-Changes in 1.0.2 (23 May 96)
-- added Windows DLL support
-- added a function zlibVersion (for the DLL support)
-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
-- Bytef is define's instead of typedef'd only for Borland C
-- avoid reading uninitialized memory in example.c
-- mention in README that the zlib format is now RFC1950
-- updated Makefile.dj2
-- added algorithm.doc
-
-Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
-- fix array overlay in deflate.c which sometimes caused bad compressed data
-- fix inflate bug with empty stored block
-- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generate bad compressed data.
-- Bytef is define'd instead of typedef'ed (work around Borland bug)
-- added an INDEX file
-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
-  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
-- speed up adler32 for modern machines without auto-increment
-- added -ansi for IRIX in configure
-- static_init_done in trees.c is an int
-- define unlink as delete for VMS
-- fix configure for QNX
-- add configure branch for SCO and HPUX
-- avoid many warnings (unused variables, dead assignments, etc...)
-- no fdopen for BeOS
-- fix the Watcom fix for 32 bit mode (define FAR as empty)
-- removed redefinition of Byte for MKWERKS
-- work around an MWKERKS bug (incorrect merge of all .h files)
-
-Changes in 0.99 (27 Jan 96)
-- allow preset dictionary shared between compressor and decompressor
-- allow compression level 0 (no compression)
-- add deflateParams in zlib.h: allow dynamic change of compression level
-  and compression strategy.
-- test large buffers and deflateParams in example.c
-- add optional "configure" to build zlib as a shared library
-- suppress Makefile.qnx, use configure instead
-- fixed deflate for 64-bit systems (detected on Cray)
-- fixed inflate_blocks for 64-bit systems (detected on Alpha)
-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
-- always return Z_BUF_ERROR when deflate() has nothing to do
-- deflateInit and inflateInit are now macros to allow version checking
-- prefix all global functions and types with z_ with -DZ_PREFIX
-- make falloc completely reentrant (inftrees.c)
-- fixed very unlikely race condition in ct_static_init
-- free in reverse order of allocation to help memory manager
-- use zlib-1.0/* instead of zlib/* inside the tar.gz
-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
-  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
-- allow gzread on concatenated .gz files
-- deflateEnd now returns Z_DATA_ERROR if it was premature
-- deflate is finally (?) fully deterministic (no matches beyond end of input)
-- Document Z_SYNC_FLUSH
-- add uninstall in Makefile
-- Check for __cpluplus in zlib.h
-- Better test in ct_align for partial flush
-- avoid harmless warnings for Borland C++
-- initialize hash_head in deflate.c
-- avoid warning on fdopen (gzio.c) for HP cc -Aa
-- include stdlib.h for STDC compilers
-- include errno.h for Cray
-- ignore error if ranlib doesn't exist
-- call ranlib twice for NeXTSTEP
-- use exec_prefix instead of prefix for libz.a
-- renamed ct_* as _tr_* to avoid conflict with applications
-- clear z->msg in inflateInit2 before any error return
-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
-- fixed typo in zconf.h (_GNUC__ => __GNUC__)
-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
-- in fcalloc, normalize pointer if size > 65520 bytes
-- don't use special fcalloc for 32 bit Borland C++
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
-- use Z_BINARY instead of BINARY
-- document that gzclose after gzdopen will close the file
-- allow "a" as mode in gzopen.
-- fix error checking in gzread
-- allow skipping .gz extra-field on pipes
-- added reference to Perl interface in README
-- put the crc table in FAR data (I dislike more and more the medium model :)
-- added get_crc_table
-- added a dimension to all arrays (Borland C can't count).
-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
-- guard against multiple inclusion of *.h (for precompiled header on Mac)
-- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
-- don't use unsized arrays to avoid silly warnings by Visual C++:
-     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
-     (what's wrong with far data in far model?).
-- define enum out of inflate_blocks_state to allow compilation with C++
-
-Changes in 0.95 (16 Aug 95)
-- fix MSDOS small and medium model (now easier to adapt to any compiler)
-- inlined send_bits
-- fix the final (:-) bug for deflate with flush (output was correct but
-  not completely flushed in rare occasions).
-- default window size is same for compression and decompression
-  (it's now sufficient to set MAX_WBITS in zconf.h).
-- voidp -> voidpf and voidnp -> voidp (for consistency with other
-  typedefs and because voidnp was not near in large model).
-
-Changes in 0.94 (13 Aug 95)
-- support MSDOS medium model
-- fix deflate with flush (could sometimes generate bad output)
-- fix deflateReset (zlib header was incorrectly suppressed)
-- added support for VMS
-- allow a compression level in gzopen()
-- gzflush now calls fflush
-- For deflate with flush, flush even if no more input is provided.
-- rename libgz.a as libz.a
-- avoid complex expression in infcodes.c triggering Turbo C bug
-- work around a problem with gcc on Alpha (in INSERT_STRING)
-- don't use inline functions (problem with some gcc versions)
-- allow renaming of Byte, uInt, etc... with #define.
-- avoid warning about (unused) pointer before start of array in deflate.c
-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
-- avoid reserved word 'new' in trees.c
-
-Changes in 0.93 (25 June 95)
-- temporarily disable inline functions
-- make deflate deterministic
-- give enough lookahead for PARTIAL_FLUSH
-- Set binary mode for stdin/stdout in minigzip.c for OS/2
-- don't even use signed char in inflate (not portable enough)
-- fix inflate memory leak for segmented architectures
-
-Changes in 0.92 (3 May 95)
-- don't assume that char is signed (problem on SGI)
-- Clear bit buffer when starting a stored block
-- no memcpy on Pyramid
-- suppressed inftest.c
-- optimized fill_window, put longest_match inline for gcc
-- optimized inflate on stored blocks.
-- untabify all sources to simplify patches
-
-Changes in 0.91 (2 May 95)
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-- Document the memory requirements in zconf.h
-- added "make install"
-- fix sync search logic in inflateSync
-- deflate(Z_FULL_FLUSH) now works even if output buffer too short
-- after inflateSync, don't scare people with just "lo world"
-- added support for DJGPP
-
-Changes in 0.9 (1 May 95)
-- don't assume that zalloc clears the allocated memory (the TurboC bug
-  was Mark's bug after all :)
-- let again gzread copy uncompressed data unchanged (was working in 0.71)
-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
-- added a test of inflateSync in example.c
-- moved MAX_WBITS to zconf.h because users might want to change that.
-- document explicitly that zalloc(64K) on MSDOS must return a normalized
-  pointer (zero offset)
-- added Makefiles for Microsoft C, Turbo C, Borland C++
-- faster crc32()
-
-Changes in 0.8 (29 April 95)
-- added fast inflate (inffast.c)
-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
-  is incompatible with previous versions of zlib which returned Z_OK.
-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
-  (actually that was not a compiler bug, see 0.81 above)
-- gzread no longer reads one extra byte in certain cases
-- In gzio destroy(), don't reference a freed structure
-- avoid many warnings for MSDOS
-- avoid the ERROR symbol which is used by MS Windows
-
-Changes in 0.71 (14 April 95)
-- Fixed more MSDOS compilation problems :( There is still a bug with
-  TurboC large model.
-
-Changes in 0.7 (14 April 95)
-- Added full inflate support.
-- Simplified the crc32() interface. The pre- and post-conditioning
-  (one's complement) is now done inside crc32(). WARNING: this is
-  incompatible with previous versions; see zlib.h for the new usage.
-
-Changes in 0.61 (12 April 95)
-- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
-
-Changes in 0.6 (11 April 95)
-- added minigzip.c
-- added gzdopen to reopen a file descriptor as gzFile
-- added transparent reading of non-gziped files in gzread.
-- fixed bug in gzread (don't read crc as data)
-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
-- don't allocate big arrays in the stack (for MSDOS)
-- fix some MSDOS compilation problems
-
-Changes in 0.5:
-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
-  not yet Z_FULL_FLUSH.
-- support decompression but only in a single step (forced Z_FINISH)
-- added opaque object for zalloc and zfree.
-- added deflateReset and inflateReset
-- added a variable zlib_version for consistency checking.
-- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
-  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
-
-Changes in 0.4:
-- avoid "zip" everywhere, use zlib instead of ziplib.
-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
-  if compression method == 8.
-- added adler32 and crc32
-- renamed deflateOptions as deflateInit2, call one or the other but not both
-- added the method parameter for deflateInit2.
-- added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
-  user-provided history buffer. This is supported only in deflateInit2
-  and inflateInit2.
-
-Changes in 0.3:
-- prefix all macro names with Z_
-- use Z_FINISH instead of deflateEnd to finish compression.
-- added Z_HUFFMAN_ONLY
-- added gzerror()
diff --git a/src/png/zlib/FAQ b/src/png/zlib/FAQ
deleted file mode 100644
index 99b7cf92e..000000000
--- a/src/png/zlib/FAQ
+++ /dev/null
@@ -1,368 +0,0 @@
-
-                Frequently Asked Questions about zlib
-
-
-If your question is not there, please check the zlib home page
-http://zlib.net/ which may have more recent information.
-The lastest zlib FAQ is at http://zlib.net/zlib_faq.html
-
-
- 1. Is zlib Y2K-compliant?
-
-    Yes. zlib doesn't handle dates.
-
- 2. Where can I get a Windows DLL version?
-
-    The zlib sources can be compiled without change to produce a DLL.  See the
-    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
-    precompiled DLL are found in the zlib web site at http://zlib.net/ .
-
- 3. Where can I get a Visual Basic interface to zlib?
-
-    See
-        * http://marknelson.us/1997/01/01/zlib-engine/
-        * win32/DLL_FAQ.txt in the zlib distribution
-
- 4. compress() returns Z_BUF_ERROR.
-
-    Make sure that before the call of compress(), the length of the compressed
-    buffer is equal to the available size of the compressed buffer and not
-    zero.  For Visual Basic, check that this parameter is passed by reference
-    ("as any"), not by value ("as long").
-
- 5. deflate() or inflate() returns Z_BUF_ERROR.
-
-    Before making the call, make sure that avail_in and avail_out are not zero.
-    When setting the parameter flush equal to Z_FINISH, also make sure that
-    avail_out is big enough to allow processing all pending input.  Note that a
-    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be
-    made with more input or output space.  A Z_BUF_ERROR may in fact be
-    unavoidable depending on how the functions are used, since it is not
-    possible to tell whether or not there is more output pending when
-    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a
-    heavily annotated example.
-
- 6. Where's the zlib documentation (man pages, etc.)?
-
-    It's in zlib.h .  Examples of zlib usage are in the files test/example.c
-    and test/minigzip.c, with more in examples/ .
-
- 7. Why don't you use GNU autoconf or libtool or ...?
-
-    Because we would like to keep zlib as a very small and simple package.
-    zlib is rather portable and doesn't need much configuration.
-
- 8. I found a bug in zlib.
-
-    Most of the time, such problems are due to an incorrect usage of zlib.
-    Please try to reproduce the problem with a small program and send the
-    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte
-    data files without prior agreement.
-
- 9. Why do I get "undefined reference to gzputc"?
-
-    If "make test" produces something like
-
-       example.o(.text+0x154): undefined reference to `gzputc'
-
-    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
-    /usr/X11R6/lib. Remove any old versions, then do "make install".
-
-10. I need a Delphi interface to zlib.
-
-    See the contrib/delphi directory in the zlib distribution.
-
-11. Can zlib handle .zip archives?
-
-    Not by itself, no.  See the directory contrib/minizip in the zlib
-    distribution.
-
-12. Can zlib handle .Z files?
-
-    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt
-    the code of uncompress on your own.
-
-13. How can I make a Unix shared library?
-
-    By default a shared (and a static) library is built for Unix.  So:
-
-    make distclean
-    ./configure
-    make
-
-14. How do I install a shared zlib library on Unix?
-
-    After the above, then:
-
-    make install
-
-    However, many flavors of Unix come with a shared zlib already installed.
-    Before going to the trouble of compiling a shared version of zlib and
-    trying to install it, you may want to check if it's already there!  If you
-    can #include <zlib.h>, it's there.  The -lz option will probably link to
-    it.  You can check the version at the top of zlib.h or with the
-    ZLIB_VERSION symbol defined in zlib.h .
-
-15. I have a question about OttoPDF.
-
-    We are not the authors of OttoPDF. The real author is on the OttoPDF web
-    site: Joel Hainley, jhainley@myndkryme.com.
-
-16. Can zlib decode Flate data in an Adobe PDF file?
-
-    Yes. See http://www.pdflib.com/ . To modify PDF forms, see
-    http://sourceforge.net/projects/acroformtool/ .
-
-17. Why am I getting this "register_frame_info not found" error on Solaris?
-
-    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
-    generates an error such as:
-
-        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
-        symbol __register_frame_info: referenced symbol not found
-
-    The symbol __register_frame_info is not part of zlib, it is generated by
-    the C compiler (cc or gcc).  You must recompile applications using zlib
-    which have this problem.  This problem is specific to Solaris.  See
-    http://www.sunfreeware.com for Solaris versions of zlib and applications
-    using zlib.
-
-18. Why does gzip give an error on a file I make with compress/deflate?
-
-    The compress and deflate functions produce data in the zlib format, which
-    is different and incompatible with the gzip format.  The gz* functions in
-    zlib on the other hand use the gzip format.  Both the zlib and gzip formats
-    use the same compressed data format internally, but have different headers
-    and trailers around the compressed data.
-
-19. Ok, so why are there two different formats?
-
-    The gzip format was designed to retain the directory information about a
-    single file, such as the name and last modification date.  The zlib format
-    on the other hand was designed for in-memory and communication channel
-    applications, and has a much more compact header and trailer and uses a
-    faster integrity check than gzip.
-
-20. Well that's nice, but how do I make a gzip file in memory?
-
-    You can request that deflate write the gzip format instead of the zlib
-    format using deflateInit2().  You can also request that inflate decode the
-    gzip format using inflateInit2().  Read zlib.h for more details.
-
-21. Is zlib thread-safe?
-
-    Yes.  However any library routines that zlib uses and any application-
-    provided memory allocation routines must also be thread-safe.  zlib's gz*
-    functions use stdio library routines, and most of zlib's functions use the
-    library memory allocation routines by default.  zlib's *Init* functions
-    allow for the application to provide custom memory allocation routines.
-
-    Of course, you should only operate on any given zlib or gzip stream from a
-    single thread at a time.
-
-22. Can I use zlib in my commercial application?
-
-    Yes.  Please read the license in zlib.h.
-
-23. Is zlib under the GNU license?
-
-    No.  Please read the license in zlib.h.
-
-24. The license says that altered source versions must be "plainly marked". So
-    what exactly do I need to do to meet that requirement?
-
-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In
-    particular, the final version number needs to be changed to "f", and an
-    identification string should be appended to ZLIB_VERSION.  Version numbers
-    x.x.x.f are reserved for modifications to zlib by others than the zlib
-    maintainers.  For example, if the version of the base zlib you are altering
-    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also
-    update the version strings in deflate.c and inftrees.c.
-
-    For altered source distributions, you should also note the origin and
-    nature of the changes in zlib.h, as well as in ChangeLog and README, along
-    with the dates of the alterations.  The origin should include at least your
-    name (or your company's name), and an email address to contact for help or
-    issues with the library.
-
-    Note that distributing a compiled zlib library along with zlib.h and
-    zconf.h is also a source distribution, and so you should change
-    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
-    in zlib.h as you would for a full source distribution.
-
-25. Will zlib work on a big-endian or little-endian architecture, and can I
-    exchange compressed data between them?
-
-    Yes and yes.
-
-26. Will zlib work on a 64-bit machine?
-
-    Yes.  It has been tested on 64-bit machines, and has no dependence on any
-    data types being limited to 32-bits in length.  If you have any
-    difficulties, please provide a complete problem report to zlib@gzip.org
-
-27. Will zlib decompress data from the PKWare Data Compression Library?
-
-    No.  The PKWare DCL uses a completely different compressed data format than
-    does PKZIP and zlib.  However, you can look in zlib's contrib/blast
-    directory for a possible solution to your problem.
-
-28. Can I access data randomly in a compressed stream?
-
-    No, not without some preparation.  If when compressing you periodically use
-    Z_FULL_FLUSH, carefully write all the pending data at those points, and
-    keep an index of those locations, then you can start decompression at those
-    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it
-    can significantly degrade compression.  Alternatively, you can scan a
-    deflate stream once to generate an index, and then use that index for
-    random access.  See examples/zran.c .
-
-29. Does zlib work on MVS, OS/390, CICS, etc.?
-
-    It has in the past, but we have not heard of any recent evidence.  There
-    were working ports of zlib 1.1.4 to MVS, but those links no longer work.
-    If you know of recent, successful applications of zlib on these operating
-    systems, please let us know.  Thanks.
-
-30. Is there some simpler, easier to read version of inflate I can look at to
-    understand the deflate format?
-
-    First off, you should read RFC 1951.  Second, yes.  Look in zlib's
-    contrib/puff directory.
-
-31. Does zlib infringe on any patents?
-
-    As far as we know, no.  In fact, that was originally the whole point behind
-    zlib.  Look here for some more information:
-
-    http://www.gzip.org/#faq11
-
-32. Can zlib work with greater than 4 GB of data?
-
-    Yes.  inflate() and deflate() will process any amount of data correctly.
-    Each call of inflate() or deflate() is limited to input and output chunks
-    of the maximum value that can be stored in the compiler's "unsigned int"
-    type, but there is no limit to the number of chunks.  Note however that the
-    strm.total_in and strm_total_out counters may be limited to 4 GB.  These
-    counters are provided as a convenience and are not used internally by
-    inflate() or deflate().  The application can easily set up its own counters
-    updated after each call of inflate() or deflate() to count beyond 4 GB.
-    compress() and uncompress() may be limited to 4 GB, since they operate in a
-    single call.  gzseek() and gztell() may be limited to 4 GB depending on how
-    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.
-
-    The word "may" appears several times above since there is a 4 GB limit only
-    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is
-    64 bits, then the limit is 16 exabytes.
-
-33. Does zlib have any security vulnerabilities?
-
-    The only one that we are aware of is potentially in gzprintf().  If zlib is
-    compiled to use sprintf() or vsprintf(), then there is no protection
-    against a buffer overflow of an 8K string space (or other value as set by
-    gzbuffer()), other than the caller of gzprintf() assuring that the output
-    will not exceed 8K.  On the other hand, if zlib is compiled to use
-    snprintf() or vsnprintf(), which should normally be the case, then there is
-    no vulnerability.  The ./configure script will display warnings if an
-    insecure variation of sprintf() will be used by gzprintf().  Also the
-    zlibCompileFlags() function will return information on what variant of
-    sprintf() is used by gzprintf().
-
-    If you don't have snprintf() or vsnprintf() and would like one, you can
-    find a portable implementation here:
-
-        http://www.ijs.si/software/snprintf/
-
-    Note that you should be using the most recent version of zlib.  Versions
-    1.1.3 and before were subject to a double-free vulnerability, and versions
-    1.2.1 and 1.2.2 were subject to an access exception when decompressing
-    invalid compressed data.
-
-34. Is there a Java version of zlib?
-
-    Probably what you want is to use zlib in Java. zlib is already included
-    as part of the Java SDK in the java.util.zip package. If you really want
-    a version of zlib written in the Java language, look on the zlib home
-    page for links: http://zlib.net/ .
-
-35. I get this or that compiler or source-code scanner warning when I crank it
-    up to maximally-pedantic. Can't you guys write proper code?
-
-    Many years ago, we gave up attempting to avoid warnings on every compiler
-    in the universe.  It just got to be a waste of time, and some compilers
-    were downright silly as well as contradicted each other.  So now, we simply
-    make sure that the code always works.
-
-36. Valgrind (or some similar memory access checker) says that deflate is
-    performing a conditional jump that depends on an uninitialized value.
-    Isn't that a bug?
-
-    No.  That is intentional for performance reasons, and the output of deflate
-    is not affected.  This only started showing up recently since zlib 1.2.x
-    uses malloc() by default for allocations, whereas earlier versions used
-    calloc(), which zeros out the allocated memory.  Even though the code was
-    correct, versions 1.2.4 and later was changed to not stimulate these
-    checkers.
-
-37. Will zlib read the (insert any ancient or arcane format here) compressed
-    data format?
-
-    Probably not. Look in the comp.compression FAQ for pointers to various
-    formats and associated software.
-
-38. How can I encrypt/decrypt zip files with zlib?
-
-    zlib doesn't support encryption.  The original PKZIP encryption is very
-    weak and can be broken with freely available programs.  To get strong
-    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib
-    compression.  For PKZIP compatible "encryption", look at
-    http://www.info-zip.org/
-
-39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
-
-    "gzip" is the gzip format, and "deflate" is the zlib format.  They should
-    probably have called the second one "zlib" instead to avoid confusion with
-    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616
-    correctly points to the zlib specification in RFC 1950 for the "deflate"
-    transfer encoding, there have been reports of servers and browsers that
-    incorrectly produce or expect raw deflate data per the deflate
-    specification in RFC 1951, most notably Microsoft.  So even though the
-    "deflate" transfer encoding using the zlib format would be the more
-    efficient approach (and in fact exactly what the zlib format was designed
-    for), using the "gzip" transfer encoding is probably more reliable due to
-    an unfortunate choice of name on the part of the HTTP 1.1 authors.
-
-    Bottom line: use the gzip format for HTTP 1.1 encoding.
-
-40. Does zlib support the new "Deflate64" format introduced by PKWare?
-
-    No.  PKWare has apparently decided to keep that format proprietary, since
-    they have not documented it as they have previous compression formats.  In
-    any case, the compression improvements are so modest compared to other more
-    modern approaches, that it's not worth the effort to implement.
-
-41. I'm having a problem with the zip functions in zlib, can you help?
-
-    There are no zip functions in zlib.  You are probably using minizip by
-    Giles Vollant, which is found in the contrib directory of zlib.  It is not
-    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The
-    files in there are not supported by the zlib authors.  You need to contact
-    the authors of the respective contribution for help.
-
-42. The match.asm code in contrib is under the GNU General Public License.
-    Since it's part of zlib, doesn't that mean that all of zlib falls under the
-    GNU GPL?
-
-    No.  The files in contrib are not part of zlib.  They were contributed by
-    other authors and are provided as a convenience to the user within the zlib
-    distribution.  Each item in contrib has its own license.
-
-43. Is zlib subject to export controls?  What is its ECCN?
-
-    zlib is not subject to export controls, and so is classified as EAR99.
-
-44. Can you please sign these lengthy legal documents and fax them back to us
-    so that we can use your software in our product?
-
-    No. Go away. Shoo.
diff --git a/src/png/zlib/INDEX b/src/png/zlib/INDEX
deleted file mode 100644
index 2ba064120..000000000
--- a/src/png/zlib/INDEX
+++ /dev/null
@@ -1,68 +0,0 @@
-CMakeLists.txt  cmake build file
-ChangeLog       history of changes
-FAQ             Frequently Asked Questions about zlib
-INDEX           this file
-Makefile        dummy Makefile that tells you to ./configure
-Makefile.in     template for Unix Makefile
-README          guess what
-configure       configure script for Unix
-make_vms.com    makefile for VMS
-test/example.c  zlib usages examples for build testing
-test/minigzip.c minimal gzip-like functionality for build testing
-test/infcover.c inf*.c code coverage for build coverage testing
-treebuild.xml   XML description of source file dependencies
-zconf.h.cmakein zconf.h template for cmake
-zconf.h.in      zconf.h template for configure
-zlib.3          Man page for zlib
-zlib.3.pdf      Man page in PDF format
-zlib.map        Linux symbol information
-zlib.pc.in      Template for pkg-config descriptor
-zlib.pc.cmakein zlib.pc template for cmake
-zlib2ansi       perl script to convert source files for C++ compilation
-
-amiga/          makefiles for Amiga SAS C
-as400/          makefiles for AS/400
-doc/            documentation for formats and algorithms
-msdos/          makefiles for MSDOS
-nintendods/     makefile for Nintendo DS
-old/            makefiles for various architectures and zlib documentation
-                files that have not yet been updated for zlib 1.2.x
-qnx/            makefiles for QNX
-watcom/         makefiles for OpenWatcom
-win32/          makefiles for Windows
-
-                zlib public header files (required for library use):
-zconf.h
-zlib.h
-
-                private source files used to build the zlib library:
-adler32.c
-compress.c
-crc32.c
-crc32.h
-deflate.c
-deflate.h
-gzclose.c
-gzguts.h
-gzlib.c
-gzread.c
-gzwrite.c
-infback.c
-inffast.c
-inffast.h
-inffixed.h
-inflate.c
-inflate.h
-inftrees.c
-inftrees.h
-trees.c
-trees.h
-uncompr.c
-zutil.c
-zutil.h
-
-                source files for sample programs
-See examples/README.examples
-
-                unsupported contributions by third parties
-See contrib/README.contrib
diff --git a/src/png/zlib/Makefile b/src/png/zlib/Makefile
deleted file mode 100644
index 6bba86c73..000000000
--- a/src/png/zlib/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	-@echo "Please use ./configure first.  Thank you."
-
-distclean:
-	make -f Makefile.in distclean
diff --git a/src/png/zlib/Makefile.in b/src/png/zlib/Makefile.in
deleted file mode 100644
index 5a77949ff..000000000
--- a/src/png/zlib/Makefile.in
+++ /dev/null
@@ -1,410 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-#    ./configure; make test
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-
-# To use the asm code, type:
-#    cp contrib/asm?86/match.S ./match.S
-#    make LOC=-DASMV OBJA=match.o
-
-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
-#    make install
-# To install in $HOME instead of /usr/local, use:
-#    make install prefix=$HOME
-
-CC=cc
-
-CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DZLIB_DEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-SFLAGS=-O
-LDFLAGS=
-TEST_LDFLAGS=-L. libz.a
-LDSHARED=$(CC)
-CPP=$(CC) -E
-
-STATICLIB=libz.a
-SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.11
-SHAREDLIBM=libz.so.1
-LIBS=$(STATICLIB) $(SHAREDLIBV)
-
-AR=ar
-ARFLAGS=rc
-RANLIB=ranlib
-LDCONFIG=ldconfig
-LDSHAREDLIBC=-lc
-TAR=tar
-SHELL=/bin/sh
-EXE=
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-libdir = ${exec_prefix}/lib
-sharedlibdir = ${libdir}
-includedir = ${prefix}/include
-mandir = ${prefix}/share/man
-man3dir = ${mandir}/man3
-pkgconfigdir = ${libdir}/pkgconfig
-SRCDIR=
-ZINC=
-ZINCOUT=-I.
-
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
-OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
-OBJC = $(OBJZ) $(OBJG)
-
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
-PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
-PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
-
-# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
-OBJA =
-PIC_OBJA =
-
-OBJS = $(OBJC) $(OBJA)
-
-PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
-
-all: static shared
-
-static: example$(EXE) minigzip$(EXE)
-
-shared: examplesh$(EXE) minigzipsh$(EXE)
-
-all64: example64$(EXE) minigzip64$(EXE)
-
-check: test
-
-test: all teststatic testshared
-
-teststatic: static
-	@TMPST=tmpst_$$; \
-	if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
-	  echo '		*** zlib test OK ***'; \
-	else \
-	  echo '		*** zlib test FAILED ***'; false; \
-	fi; \
-	rm -f $$TMPST
-
-testshared: shared
-	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
-	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
-	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
-	TMPSH=tmpsh_$$; \
-	if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
-	  echo '		*** zlib shared test OK ***'; \
-	else \
-	  echo '		*** zlib shared test FAILED ***'; false; \
-	fi; \
-	rm -f $$TMPSH
-
-test64: all64
-	@TMP64=tmp64_$$; \
-	if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
-	  echo '		*** zlib 64-bit test OK ***'; \
-	else \
-	  echo '		*** zlib 64-bit test FAILED ***'; false; \
-	fi; \
-	rm -f $$TMP64
-
-infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
-
-infcover: infcover.o libz.a
-	$(CC) $(CFLAGS) -o $@ infcover.o libz.a
-
-cover: infcover
-	rm -f *.gcda
-	./infcover
-	gcov inf*.c
-
-libz.a: $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
-example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
-
-minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
-
-example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
-
-minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
-	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
-
-
-adler32.o: $(SRCDIR)adler32.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
-
-crc32.o: $(SRCDIR)crc32.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
-
-deflate.o: $(SRCDIR)deflate.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
-
-infback.o: $(SRCDIR)infback.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
-
-inffast.o: $(SRCDIR)inffast.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
-
-inflate.o: $(SRCDIR)inflate.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
-
-inftrees.o: $(SRCDIR)inftrees.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
-
-trees.o: $(SRCDIR)trees.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
-
-zutil.o: $(SRCDIR)zutil.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
-
-compress.o: $(SRCDIR)compress.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
-
-uncompr.o: $(SRCDIR)uncompr.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
-
-gzclose.o: $(SRCDIR)gzclose.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
-
-gzlib.o: $(SRCDIR)gzlib.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
-
-gzread.o: $(SRCDIR)gzread.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
-
-gzwrite.o: $(SRCDIR)gzwrite.c
-	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
-
-
-adler32.lo: $(SRCDIR)adler32.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
-	-@mv objs/adler32.o $@
-
-crc32.lo: $(SRCDIR)crc32.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
-	-@mv objs/crc32.o $@
-
-deflate.lo: $(SRCDIR)deflate.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
-	-@mv objs/deflate.o $@
-
-infback.lo: $(SRCDIR)infback.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
-	-@mv objs/infback.o $@
-
-inffast.lo: $(SRCDIR)inffast.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
-	-@mv objs/inffast.o $@
-
-inflate.lo: $(SRCDIR)inflate.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
-	-@mv objs/inflate.o $@
-
-inftrees.lo: $(SRCDIR)inftrees.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
-	-@mv objs/inftrees.o $@
-
-trees.lo: $(SRCDIR)trees.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
-	-@mv objs/trees.o $@
-
-zutil.lo: $(SRCDIR)zutil.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
-	-@mv objs/zutil.o $@
-
-compress.lo: $(SRCDIR)compress.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
-	-@mv objs/compress.o $@
-
-uncompr.lo: $(SRCDIR)uncompr.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
-	-@mv objs/uncompr.o $@
-
-gzclose.lo: $(SRCDIR)gzclose.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
-	-@mv objs/gzclose.o $@
-
-gzlib.lo: $(SRCDIR)gzlib.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
-	-@mv objs/gzlib.o $@
-
-gzread.lo: $(SRCDIR)gzread.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
-	-@mv objs/gzread.o $@
-
-gzwrite.lo: $(SRCDIR)gzwrite.c
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
-	-@mv objs/gzwrite.o $@
-
-
-placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
-	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
-	rm -f $(SHAREDLIB) $(SHAREDLIBM)
-	ln -s $@ $(SHAREDLIB)
-	ln -s $@ $(SHAREDLIBM)
-	-@rmdir objs
-
-example$(EXE): example.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
-
-minigzip$(EXE): minigzip.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
-
-examplesh$(EXE): example.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
-
-minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
-
-example64$(EXE): example64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
-
-minigzip64$(EXE): minigzip64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
-
-install-libs: $(LIBS)
-	-@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
-	-@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
-	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
-	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
-	rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
-	cp $(STATICLIB) $(DESTDIR)$(libdir)
-	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
-	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
-	-@if test -n "$(SHAREDLIBV)"; then \
-	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
-	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
-	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
-	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
-	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
-	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
-	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
-	fi
-	rm -f $(DESTDIR)$(man3dir)/zlib.3
-	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
-	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
-	rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
-	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
-	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
-# The ranlib in install is needed on NeXTSTEP which checks file times
-# ldconfig is for Linux
-
-install: install-libs
-	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
-	rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
-	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
-	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
-
-uninstall:
-	cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
-	cd $(DESTDIR)$(libdir) && rm -f libz.a; \
-	if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
-	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
-	fi
-	cd $(DESTDIR)$(man3dir) && rm -f zlib.3
-	cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
-
-docs: zlib.3.pdf
-
-zlib.3.pdf: $(SRCDIR)zlib.3
-	groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
-
-zconf.h.cmakein: $(SRCDIR)zconf.h.in
-	-@ TEMPFILE=zconfh_$$; \
-	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
-	sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
-	touch -r $(SRCDIR)zconf.h.in $@ &&\
-	rm $$TEMPFILE
-
-zconf: $(SRCDIR)zconf.h.in
-	cp -p $(SRCDIR)zconf.h.in zconf.h
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~ \
-	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
-	   example64$(EXE) minigzip64$(EXE) \
-	   infcover \
-	   libz.* foo.gz so_locations \
-	   _match.s maketree contrib/infback9/*.o
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-	rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
-
-maintainer-clean: distclean
-distclean: clean zconf zconf.h.cmakein docs
-	rm -f Makefile zlib.pc configure.log
-	-@rm -f .DS_Store
-	@if [ -f Makefile.in ]; then \
-	printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile ; \
-	printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
-	touch -r $(SRCDIR)Makefile.in Makefile ; fi
-	@if [ ! -f zconf.h.in ]; then rm -f zconf.h zconf.h.cmakein ; fi
-	@if [ ! -f zlib.3 ]; then rm -f zlib.3.pdf ; fi
-
-tags:
-	etags $(SRCDIR)*.[ch]
-
-adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
-compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h
-crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
-deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
-inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
-inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
-trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
-
-adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
-compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h
-crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
-deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
-infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
-inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
-inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
-trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
diff --git a/src/png/zlib/README b/src/png/zlib/README
deleted file mode 100644
index 51106de47..000000000
--- a/src/png/zlib/README
+++ /dev/null
@@ -1,115 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.11 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
-rfc1952 (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
-of the library is given in the file test/example.c which also tests that
-the library is working correctly.  Another example is given in the file
-test/minigzip.c.  The compression library itself is composed of all source
-files in the root directory.
-
-To compile all files and run the test program, follow the instructions given at
-the top of Makefile.in.  In short "./configure; make test", and if that goes
-well, "make install" should work for most flavors of Unix.  For Windows, use
-one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
-make_vms.com.
-
-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
-<info@winimage.com> for the Windows DLL version.  The zlib home page is
-http://zlib.net/ .  Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
-
-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
-issue of Dr.  Dobb's Journal; a copy of the article is available at
-http://marknelson.us/1997/01/01/zlib-engine/ .
-
-The changes made in version 1.2.11 are documented in the file ChangeLog.
-
-Unsupported third party contributions are provided in directory contrib/ .
-
-zlib is available in Java using the java.util.zip package, documented at
-http://java.sun.com/developer/technicalArticles/Programming/compression/ .
-
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
-at CPAN (Comprehensive Perl Archive Network) sites, including
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
-
-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
-available in Python 1.5 and later versions, see
-http://docs.python.org/library/zlib.html .
-
-zlib is built into tcl: http://wiki.tcl.tk/4610 .
-
-An experimental package to read and write files in .zip format, written on top
-of zlib by Gilles Vollant <info@winimage.com>, is available in the
-contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- For Windows DLL versions, please see win32/DLL_FAQ.txt
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With
-  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
-  compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
-  when compiled with cc.
-
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
-  necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
-  other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS or BEOS.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz.  The deflate and
-  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
-  people who reported problems and suggested various improvements in zlib; they
-  are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.
diff --git a/src/png/zlib/adler32.c b/src/png/zlib/adler32.c
deleted file mode 100644
index d0be4380a..000000000
--- a/src/png/zlib/adler32.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
-#define BASE 65521U     /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware --
-   try it both ways to see which is faster */
-#ifdef NO_DIVIDE
-/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
-   (thank you to John Reiser for pointing this out) */
-#  define CHOP(a) \
-    do { \
-        unsigned long tmp = a >> 16; \
-        a &= 0xffffUL; \
-        a += (tmp << 4) - tmp; \
-    } while (0)
-#  define MOD28(a) \
-    do { \
-        CHOP(a); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#  define MOD(a) \
-    do { \
-        CHOP(a); \
-        MOD28(a); \
-    } while (0)
-#  define MOD63(a) \
-    do { /* this assumes a is not negative */ \
-        z_off64_t tmp = a >> 32; \
-        a &= 0xffffffffL; \
-        a += (tmp << 8) - (tmp << 5) + tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#else
-#  define MOD(a) a %= BASE
-#  define MOD28(a) a %= BASE
-#  define MOD63(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_z(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    z_size_t len;
-{
-    unsigned long sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1) {
-        adler += buf[0];
-        if (adler >= BASE)
-            adler -= BASE;
-        sum2 += adler;
-        if (sum2 >= BASE)
-            sum2 -= BASE;
-        return adler | (sum2 << 16);
-    }
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == Z_NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16) {
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        if (adler >= BASE)
-            adler -= BASE;
-        MOD28(sum2);            /* only added so many BASE's */
-        return adler | (sum2 << 16);
-    }
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-        do {
-            DO16(buf);          /* 16 sums unrolled */
-            buf += 16;
-        } while (--n);
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len) {                  /* avoid modulos if none remaining */
-        while (len >= 16) {
-            len -= 16;
-            DO16(buf);
-            buf += 16;
-        }
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    return adler32_z(adler, buf, len);
-}
-
-/* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    unsigned long sum1;
-    unsigned long sum2;
-    unsigned rem;
-
-    /* for negative len, return invalid adler32 as a clue for debugging */
-    if (len2 < 0)
-        return 0xffffffffUL;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    MOD63(len2);                /* assumes len2 >= 0 */
-    rem = (unsigned)len2;
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    MOD(sum2);
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
-    if (sum2 >= BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
-
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
-    return adler32_combine_(adler1, adler2, len2);
-}
diff --git a/src/png/zlib/amiga/Makefile.pup b/src/png/zlib/amiga/Makefile.pup
deleted file mode 100644
index 8940c120f..000000000
--- a/src/png/zlib/amiga/Makefile.pup
+++ /dev/null
@@ -1,69 +0,0 @@
-# Amiga powerUP (TM) Makefile
-# makefile for libpng and SAS C V6.58/7.00 PPC compiler
-# Copyright (C) 1998 by Andreas R. Kleinert
-
-LIBNAME	= libzip.a
-
-CC	= scppc
-CFLAGS	= NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL \
-	  OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8 NOVER
-AR	= ppc-amigaos-ar cr
-RANLIB	= ppc-amigaos-ranlib
-LD	= ppc-amigaos-ld -r
-LDFLAGS	= -o
-LDLIBS	= LIB:scppc.a LIB:end.o
-RM	= delete quiet
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example minigzip
-
-check: test
-test: all
-	example
-	echo hello world | minigzip | minigzip -d
-
-$(LIBNAME): $(OBJS)
-	$(AR) $@ $(OBJS)
-	-$(RANLIB) $@
-
-example: example.o $(LIBNAME)
-	$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
-
-minigzip: minigzip.o $(LIBNAME)
-	$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
-
-mostlyclean: clean
-clean:
-	$(RM) *.o example minigzip $(LIBNAME) foo.gz
-
-zip:
-	zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
-	  descrip.mms *.[ch]
-
-tgz:
-	cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-	  zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzclose.o: zlib.h zconf.h gzguts.h
-gzlib.o: zlib.h zconf.h gzguts.h
-gzread.o: zlib.h zconf.h gzguts.h
-gzwrite.o: zlib.h zconf.h gzguts.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/png/zlib/amiga/Makefile.sas b/src/png/zlib/amiga/Makefile.sas
deleted file mode 100644
index 749e29152..000000000
--- a/src/png/zlib/amiga/Makefile.sas
+++ /dev/null
@@ -1,68 +0,0 @@
-# SMakefile for zlib
-# Modified from the standard UNIX Makefile Copyright Jean-loup Gailly
-# Osma Ahvenlampi <Osma.Ahvenlampi@hut.fi>
-# Amiga, SAS/C 6.56 & Smake
-
-CC=sc
-CFLAGS=OPT
-#CFLAGS=OPT CPU=68030
-#CFLAGS=DEBUG=LINE
-LDFLAGS=LIB z.lib
-
-SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
-       NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \
-       DEF=POSTINC
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: SCOPTIONS example minigzip
-
-check: test
-test: all
-	example
-	echo hello world | minigzip | minigzip -d
-
-install: z.lib
-	copy clone zlib.h zconf.h INCLUDE:
-	copy clone z.lib LIB:
-
-z.lib: $(OBJS)
-	oml z.lib r $(OBJS)
-
-example: example.o z.lib
-	$(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS)
-
-minigzip: minigzip.o z.lib
-	$(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS)
-
-mostlyclean: clean
-clean:
-	-delete force quiet example minigzip *.o z.lib foo.gz *.lnk SCOPTIONS
-
-SCOPTIONS: Makefile.sas
-	copy to $@ <from <
-$(SCOPTIONS)
-<
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzclose.o: zlib.h zconf.h gzguts.h
-gzlib.o: zlib.h zconf.h gzguts.h
-gzread.o: zlib.h zconf.h gzguts.h
-gzwrite.o: zlib.h zconf.h gzguts.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/png/zlib/compress.c b/src/png/zlib/compress.c
deleted file mode 100644
index e2db404ab..000000000
--- a/src/png/zlib/compress.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
-    z_stream stream;
-    int err;
-    const uInt max = (uInt)-1;
-    uLong left;
-
-    left = *destLen;
-    *destLen = 0;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    stream.next_out = dest;
-    stream.avail_out = 0;
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = 0;
-
-    do {
-        if (stream.avail_out == 0) {
-            stream.avail_out = left > (uLong)max ? max : (uInt)left;
-            left -= stream.avail_out;
-        }
-        if (stream.avail_in == 0) {
-            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
-            sourceLen -= stream.avail_in;
-        }
-        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
-    } while (err == Z_OK);
-
-    *destLen = stream.total_out;
-    deflateEnd(&stream);
-    return err == Z_STREAM_END ? Z_OK : err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
-
-/* ===========================================================================
-     If the default memLevel or windowBits for deflateInit() is changed, then
-   this function needs to be updated.
- */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13;
-}
diff --git a/src/png/zlib/configure b/src/png/zlib/configure
deleted file mode 100644
index e974d1fd7..000000000
--- a/src/png/zlib/configure
+++ /dev/null
@@ -1,921 +0,0 @@
-#!/bin/sh
-# configure script for zlib.
-#
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-#
-# To impose specific compiler or flags or install directory, use for example:
-#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure
-# or for csh/tcsh users:
-#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
-
-# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
-# If you have problems, try without defining CC and CFLAGS before reporting
-# an error.
-
-# start off configure.log
-echo -------------------- >> configure.log
-echo $0 $* >> configure.log
-date >> configure.log
-
-# get source directory
-SRCDIR=`dirname $0`
-if test $SRCDIR = "."; then
-    ZINC=""
-    ZINCOUT="-I."
-    SRCDIR=""
-else
-    ZINC='-include zconf.h'
-    ZINCOUT='-I. -I$(SRCDIR)'
-    SRCDIR="$SRCDIR/"
-fi
-
-# set command prefix for cross-compilation
-if [ -n "${CHOST}" ]; then
-    uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
-    CROSS_PREFIX="${CHOST}-"
-fi
-
-# destination name for static library
-STATICLIB=libz.a
-
-# extract zlib version numbers from zlib.h
-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
-VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h`
-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
-
-# establish commands for library building
-if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    AR=${AR-"${CROSS_PREFIX}ar"}
-    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-else
-    AR=${AR-"ar"}
-    test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-fi
-ARFLAGS=${ARFLAGS-"rc"}
-if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
-    test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log
-else
-    RANLIB=${RANLIB-"ranlib"}
-fi
-if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
-    NM=${NM-"${CROSS_PREFIX}nm"}
-    test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log
-else
-    NM=${NM-"nm"}
-fi
-
-# set defaults before processing command line options
-LDCONFIG=${LDCONFIG-"ldconfig"}
-LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
-ARCHS=
-prefix=${prefix-/usr/local}
-exec_prefix=${exec_prefix-'${prefix}'}
-libdir=${libdir-'${exec_prefix}/lib'}
-sharedlibdir=${sharedlibdir-'${libdir}'}
-includedir=${includedir-'${prefix}/include'}
-mandir=${mandir-'${prefix}/share/man'}
-shared_ext='.so'
-shared=1
-solo=0
-cover=0
-zprefix=0
-zconst=0
-build64=0
-gcc=0
-warn=0
-debug=0
-old_cc="$CC"
-old_cflags="$CFLAGS"
-OBJC='$(OBJZ) $(OBJG)'
-PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
-
-# leave this script, optionally in a bad way
-leave()
-{
-  if test "$*" != "0"; then
-    echo "** $0 aborting." | tee -a configure.log
-  fi
-  rm -f $test.[co] $test $test$shared_ext $test.gcno ./--version
-  echo -------------------- >> configure.log
-  echo >> configure.log
-  echo >> configure.log
-  exit $1
-}
-
-# process command line options
-while test $# -ge 1
-do
-case "$1" in
-    -h* | --help)
-      echo 'usage:' | tee -a configure.log
-      echo '  configure [--const] [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]' | tee -a configure.log
-      echo '    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log
-      echo '    [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log
-        exit 0 ;;
-    -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
-    -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
-    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
-    --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
-    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
-    -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
-    -p* | --prefix) prefix="$2"; shift; shift ;;
-    -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
-    -l* | --libdir) libdir="$2"; shift; shift ;;
-    -i* | --includedir) includedir="$2"; shift; shift ;;
-    -s* | --shared | --enable-shared) shared=1; shift ;;
-    -t | --static) shared=0; shift ;;
-    --solo) solo=1; shift ;;
-    --cover) cover=1; shift ;;
-    -z* | --zprefix) zprefix=1; shift ;;
-    -6* | --64) build64=1; shift ;;
-    -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;
-    --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
-    --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
-    -c* | --const) zconst=1; shift ;;
-    -w* | --warn) warn=1; shift ;;
-    -d* | --debug) debug=1; shift ;;
-    *)
-      echo "unknown option: $1" | tee -a configure.log
-      echo "$0 --help for help" | tee -a configure.log
-      leave 1;;
-    esac
-done
-
-# temporary file name
-test=ztest$$
-
-# put arguments in log, also put test file in log if used in arguments
-show()
-{
-  case "$*" in
-    *$test.c*)
-      echo === $test.c === >> configure.log
-      cat $test.c >> configure.log
-      echo === >> configure.log;;
-  esac
-  echo $* >> configure.log
-}
-
-# check for gcc vs. cc and set compile and link flags based on the system identified by uname
-cat > $test.c <<EOF
-extern int getchar();
-int hello() {return getchar();}
-EOF
-
-test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
-cc=${CC-${CROSS_PREFIX}gcc}
-cflags=${CFLAGS-"-O3"}
-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
-case "$cc" in
-  *gcc*) gcc=1 ;;
-  *clang*) gcc=1 ;;
-esac
-case `$cc -v 2>&1` in
-  *gcc*) gcc=1 ;;
-  *clang*) gcc=1 ;;
-esac
-
-show $cc -c $test.c
-if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
-  echo ... using gcc >> configure.log
-  CC="$cc"
-  CFLAGS="${CFLAGS--O3}"
-  SFLAGS="${CFLAGS--O3} -fPIC"
-  if test "$ARCHS"; then
-    CFLAGS="${CFLAGS} ${ARCHS}"
-    LDFLAGS="${LDFLAGS} ${ARCHS}"
-  fi
-  if test $build64 -eq 1; then
-    CFLAGS="${CFLAGS} -m64"
-    SFLAGS="${SFLAGS} -m64"
-  fi
-  if test "$warn" -eq 1; then
-    if test "$zconst" -eq 1; then
-      CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST"
-    else
-      CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
-    fi
-  fi
-  if test $debug -eq 1; then
-    CFLAGS="${CFLAGS} -DZLIB_DEBUG"
-    SFLAGS="${SFLAGS} -DZLIB_DEBUG"
-  fi
-  if test -z "$uname"; then
-    uname=`(uname -s || echo unknown) 2>/dev/null`
-  fi
-  case "$uname" in
-  Linux* | linux* | GNU | GNU/* | solaris*)
-        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
-  *BSD | *bsd* | DragonFly)
-        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
-        LDCONFIG="ldconfig -m" ;;
-  CYGWIN* | Cygwin* | cygwin* | OS/2*)
-        EXE='.exe' ;;
-  MINGW* | mingw*)
-# temporary bypass
-        rm -f $test.[co] $test $test$shared_ext
-        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
-        leave 1
-        LDSHARED=${LDSHARED-"$cc -shared"}
-        LDSHAREDLIBC=""
-        EXE='.exe' ;;
-  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
-         # (alain.bonnefoy@icbt.com)
-                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
-  HP-UX*)
-         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
-         case `(uname -m || echo unknown) 2>/dev/null` in
-         ia64)
-                 shared_ext='.so'
-                 SHAREDLIB='libz.so' ;;
-         *)
-                 shared_ext='.sl'
-                 SHAREDLIB='libz.sl' ;;
-         esac ;;
-  Darwin* | darwin*)
-             shared_ext='.dylib'
-             SHAREDLIB=libz$shared_ext
-             SHAREDLIBV=libz.$VER$shared_ext
-             SHAREDLIBM=libz.$VER1$shared_ext
-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
-             if libtool -V 2>&1 | grep Apple > /dev/null; then
-                 AR="libtool"
-             else
-                 AR="/usr/bin/libtool"
-             fi
-             ARFLAGS="-o" ;;
-  *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
-  esac
-else
-  # find system name and corresponding cc options
-  CC=${CC-cc}
-  gcc=0
-  echo ... using $CC >> configure.log
-  if test -z "$uname"; then
-    uname=`(uname -sr || echo unknown) 2>/dev/null`
-  fi
-  case "$uname" in
-  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}
-             CFLAGS=${CFLAGS-"-O"}
-#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
-             LDSHARED=${LDSHARED-"ld -b"}
-         case `(uname -m || echo unknown) 2>/dev/null` in
-         ia64)
-             shared_ext='.so'
-             SHAREDLIB='libz.so' ;;
-         *)
-             shared_ext='.sl'
-             SHAREDLIB='libz.sl' ;;
-         esac ;;
-  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
-             CFLAGS=${CFLAGS-"-ansi -O2"}
-             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
-  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
-             CFLAGS=${CFLAGS-"-O -std1"}
-             LDFLAGS="${LDFLAGS} -Wl,-rpath,."
-             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
-  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}
-             CFLAGS=${CFLAGS-"-O -std1"}
-             LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
-  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}
-             CFLAGS=${CFLAGS-"-4 -O"}
-             LDSHARED=${LDSHARED-"cc"}
-             RANLIB=${RANLIB-"true"}
-             AR="cc"
-             ARFLAGS="-A" ;;
-  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
-             CFLAGS=${CFLAGS-"-O3"}
-             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
-  SunOS\ 5* | solaris*)
-         LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}
-         SFLAGS=${CFLAGS-"-fast -KPIC"}
-         CFLAGS=${CFLAGS-"-fast"}
-         if test $build64 -eq 1; then
-             # old versions of SunPRO/Workshop/Studio don't support -m64,
-             # but newer ones do.  Check for it.
-             flag64=`$CC -flags | egrep -- '^-m64'`
-             if test x"$flag64" != x"" ; then
-                 CFLAGS="${CFLAGS} -m64"
-                 SFLAGS="${SFLAGS} -m64"
-             else
-                 case `(uname -m || echo unknown) 2>/dev/null` in
-                   i86*)
-                     SFLAGS="$SFLAGS -xarch=amd64"
-                     CFLAGS="$CFLAGS -xarch=amd64" ;;
-                   *)
-                     SFLAGS="$SFLAGS -xarch=v9"
-                     CFLAGS="$CFLAGS -xarch=v9" ;;
-                 esac
-             fi
-         fi
-         if test -n "$ZINC"; then
-             ZINC='-I- -I. -I$(SRCDIR)'
-         fi
-         ;;
-  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
-             CFLAGS=${CFLAGS-"-O2"}
-             LDSHARED=${LDSHARED-"ld"} ;;
-  SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
-             CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"}
-             LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
-  UNIX_System_V\ 4.2.0)
-             SFLAGS=${CFLAGS-"-KPIC -O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"} ;;
-  UNIX_SV\ 4.2MP)
-             SFLAGS=${CFLAGS-"-Kconform_pic -O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"} ;;
-  OpenUNIX\ 5)
-             SFLAGS=${CFLAGS-"-KPIC -O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -G"} ;;
-  AIX*)  # Courtesy of dbakker@arrayasolutions.com
-             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
-             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
-             LDSHARED=${LDSHARED-"xlc -G"} ;;
-  # send working options for other systems to zlib@gzip.org
-  *)         SFLAGS=${CFLAGS-"-O"}
-             CFLAGS=${CFLAGS-"-O"}
-             LDSHARED=${LDSHARED-"cc -shared"} ;;
-  esac
-fi
-
-# destination names for shared library if not defined above
-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
-
-echo >> configure.log
-
-# define functions for testing compiler and library characteristics and logging the results
-
-cat > $test.c <<EOF
-#error error
-EOF
-if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
-  try()
-  {
-    show $*
-    test "`( $* ) 2>&1 | tee -a configure.log`" = ""
-  }
-  echo - using any output from compiler to indicate an error >> configure.log
-else
-  try()
-  {
-    show $*
-    ( $* ) >> configure.log 2>&1
-    ret=$?
-    if test $ret -ne 0; then
-      echo "(exit code "$ret")" >> configure.log
-    fi
-    return $ret
-  }
-fi
-
-tryboth()
-{
-  show $*
-  got=`( $* ) 2>&1`
-  ret=$?
-  printf %s "$got" >> configure.log
-  if test $ret -ne 0; then
-    return $ret
-  fi
-  test "$got" = ""
-}
-
-cat > $test.c << EOF
-int foo() { return 0; }
-EOF
-echo "Checking for obsessive-compulsive compiler options..." >> configure.log
-if try $CC -c $CFLAGS $test.c; then
-  :
-else
-  echo "Compiler error reporting is too harsh for $0 (perhaps remove -Werror)." | tee -a configure.log
-  leave 1
-fi
-
-echo >> configure.log
-
-# see if shared library build supported
-cat > $test.c <<EOF
-extern int getchar();
-int hello() {return getchar();}
-EOF
-if test $shared -eq 1; then
-  echo Checking for shared library support... | tee -a configure.log
-  # we must test in two steps (cc then ld), required at least on SunOS 4.x
-  if try $CC -w -c $SFLAGS $test.c &&
-     try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
-    echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
-  elif test -z "$old_cc" -a -z "$old_cflags"; then
-    echo No shared library support. | tee -a configure.log
-    shared=0;
-  else
-    echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log
-    shared=0;
-  fi
-fi
-if test $shared -eq 0; then
-  LDSHARED="$CC"
-  ALL="static"
-  TEST="all teststatic"
-  SHAREDLIB=""
-  SHAREDLIBV=""
-  SHAREDLIBM=""
-  echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log
-else
-  ALL="static shared"
-  TEST="all teststatic testshared"
-fi
-
-# check for underscores in external names for use by assembler code
-CPP=${CPP-"$CC -E"}
-case $CFLAGS in
-  *ASMV*)
-    echo >> configure.log
-    show "$NM $test.o | grep _hello"
-    if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
-      CPP="$CPP -DNO_UNDERLINE"
-      echo Checking for underline in external names... No. | tee -a configure.log
-    else
-      echo Checking for underline in external names... Yes. | tee -a configure.log
-    fi ;;
-esac
-
-echo >> configure.log
-
-# check for size_t
-cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdlib.h>
-size_t dummy = 0;
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  echo "Checking for size_t... Yes." | tee -a configure.log
-  need_sizet=0
-else
-  echo "Checking for size_t... No." | tee -a configure.log
-  need_sizet=1
-fi
-
-echo >> configure.log
-
-# find the size_t integer type, if needed
-if test $need_sizet -eq 1; then
-  cat > $test.c <<EOF
-long long dummy = 0;
-EOF
-  if try $CC -c $CFLAGS $test.c; then
-    echo "Checking for long long... Yes." | tee -a configure.log
-    cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
-    if (sizeof(void *) <= sizeof(int)) puts("int");
-    else if (sizeof(void *) <= sizeof(long)) puts("long");
-    else puts("z_longlong");
-    return 0;
-}
-EOF
-  else
-    echo "Checking for long long... No." | tee -a configure.log
-    cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
-    if (sizeof(void *) <= sizeof(int)) puts("int");
-    else puts("long");
-    return 0;
-}
-EOF
-  fi
-  if try $CC $CFLAGS -o $test $test.c; then
-    sizet=`./$test`
-    echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
-  else
-    echo "Failed to find a pointer-size integer type." | tee -a configure.log
-    leave 1
-  fi
-fi
-
-if test $need_sizet -eq 1; then
-  CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
-  SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}"
-fi
-
-echo >> configure.log
-
-# check for large file support, and if none, check for fseeko()
-cat > $test.c <<EOF
-#include <sys/types.h>
-off64_t dummy = 0;
-EOF
-if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
-  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
-  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
-  ALL="${ALL} all64"
-  TEST="${TEST} test64"
-  echo "Checking for off64_t... Yes." | tee -a configure.log
-  echo "Checking for fseeko... Yes." | tee -a configure.log
-else
-  echo "Checking for off64_t... No." | tee -a configure.log
-  echo >> configure.log
-  cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
-  fseeko(NULL, 0, 0);
-  return 0;
-}
-EOF
-  if try $CC $CFLAGS -o $test $test.c; then
-    echo "Checking for fseeko... Yes." | tee -a configure.log
-  else
-    CFLAGS="${CFLAGS} -DNO_FSEEKO"
-    SFLAGS="${SFLAGS} -DNO_FSEEKO"
-    echo "Checking for fseeko... No." | tee -a configure.log
-  fi
-fi
-
-echo >> configure.log
-
-# check for strerror() for use by gz* functions
-cat > $test.c <<EOF
-#include <string.h>
-#include <errno.h>
-int main() { return strlen(strerror(errno)); }
-EOF
-if try $CC $CFLAGS -o $test $test.c; then
-  echo "Checking for strerror... Yes." | tee -a configure.log
-else
-  CFLAGS="${CFLAGS} -DNO_STRERROR"
-  SFLAGS="${SFLAGS} -DNO_STRERROR"
-  echo "Checking for strerror... No." | tee -a configure.log
-fi
-
-# copy clean zconf.h for subsequent edits
-cp -p ${SRCDIR}zconf.h.in zconf.h
-
-echo >> configure.log
-
-# check for unistd.h and save result in zconf.h
-cat > $test.c <<EOF
-#include <unistd.h>
-int main() { return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
-  mv zconf.temp.h zconf.h
-  echo "Checking for unistd.h... Yes." | tee -a configure.log
-else
-  echo "Checking for unistd.h... No." | tee -a configure.log
-fi
-
-echo >> configure.log
-
-# check for stdarg.h and save result in zconf.h
-cat > $test.c <<EOF
-#include <stdarg.h>
-int main() { return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  sed < zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
-  mv zconf.temp.h zconf.h
-  echo "Checking for stdarg.h... Yes." | tee -a configure.log
-else
-  echo "Checking for stdarg.h... No." | tee -a configure.log
-fi
-
-# if the z_ prefix was requested, save that in zconf.h
-if test $zprefix -eq 1; then
-  sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h
-  mv zconf.temp.h zconf.h
-  echo >> configure.log
-  echo "Using z_ prefix on all symbols." | tee -a configure.log
-fi
-
-# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists
-if test $solo -eq 1; then
-  sed '/#define ZCONF_H/a\
-#define Z_SOLO
-
-' < zconf.h > zconf.temp.h
-  mv zconf.temp.h zconf.h
-OBJC='$(OBJZ)'
-PIC_OBJC='$(PIC_OBJZ)'
-fi
-
-# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X
-if test $cover -eq 1; then
-  CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
-  if test -n "$GCC_CLASSIC"; then
-    CC=$GCC_CLASSIC
-  fi
-fi
-
-echo >> configure.log
-
-# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions
-# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a
-# return value.  The most secure result is vsnprintf() with a return value.  snprintf() with a
-# return value is secure as well, but then gzprintf() will be limited to 20 arguments.
-cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-#include "zconf.h"
-int main()
-{
-#ifndef STDC
-  choke me
-#endif
-  return 0;
-}
-EOF
-if try $CC -c $CFLAGS $test.c; then
-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." | tee -a configure.log
-
-  echo >> configure.log
-  cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
-  char buf[20];
-  va_list ap;
-  va_start(ap, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return 0;
-}
-int main()
-{
-  return (mytest("Hello%d\n", 1));
-}
-EOF
-  if try $CC $CFLAGS -o $test $test.c; then
-    echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
-  int n;
-  char buf[20];
-  va_list ap;
-  va_start(ap, fmt);
-  n = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-  return n;
-}
-int main()
-{
-  return (mytest("Hello%d\n", 1));
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
-      SFLAGS="$SFLAGS -DHAS_vsnprintf_void"
-      echo "Checking for return value of vsnprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  else
-    CFLAGS="$CFLAGS -DNO_vsnprintf"
-    SFLAGS="$SFLAGS -DNO_vsnprintf"
-    echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log
-    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log
-    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log
-    echo "  vulnerabilities." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
-  int n;
-  char buf[20];
-  va_list ap;
-  va_start(ap, fmt);
-  n = vsprintf(buf, fmt, ap);
-  va_end(ap);
-  return n;
-}
-int main()
-{
-  return (mytest("Hello%d\n", 1));
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_vsprintf_void"
-      SFLAGS="$SFLAGS -DHAS_vsprintf_void"
-      echo "Checking for return value of vsprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  fi
-else
-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." | tee -a configure.log
-
-  echo >> configure.log
-  cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
-  char buf[20];
-  snprintf(buf, sizeof(buf), "%s", "foo");
-  return 0;
-}
-int main()
-{
-  return (mytest());
-}
-EOF
-
-  if try $CC $CFLAGS -o $test $test.c; then
-    echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
-  char buf[20];
-  return snprintf(buf, sizeof(buf), "%s", "foo");
-}
-int main()
-{
-  return (mytest());
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of snprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_snprintf_void"
-      SFLAGS="$SFLAGS -DHAS_snprintf_void"
-      echo "Checking for return value of snprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  else
-    CFLAGS="$CFLAGS -DNO_snprintf"
-    SFLAGS="$SFLAGS -DNO_snprintf"
-    echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log
-    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log
-    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log
-    echo "  vulnerabilities." | tee -a configure.log
-
-    echo >> configure.log
-    cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
-  char buf[20];
-  return sprintf(buf, "%s", "foo");
-}
-int main()
-{
-  return (mytest());
-}
-EOF
-
-    if try $CC -c $CFLAGS $test.c; then
-      echo "Checking for return value of sprintf()... Yes." | tee -a configure.log
-    else
-      CFLAGS="$CFLAGS -DHAS_sprintf_void"
-      SFLAGS="$SFLAGS -DHAS_sprintf_void"
-      echo "Checking for return value of sprintf()... No." | tee -a configure.log
-      echo "  WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log
-      echo "  can build but will be open to possible string-format security" | tee -a configure.log
-      echo "  vulnerabilities." | tee -a configure.log
-    fi
-  fi
-fi
-
-# see if we can hide zlib internal symbols that are linked between separate source files
-if test "$gcc" -eq 1; then
-  echo >> configure.log
-  cat > $test.c <<EOF
-#define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-int ZLIB_INTERNAL foo;
-int main()
-{
-  return 0;
-}
-EOF
-  if tryboth $CC -c $CFLAGS $test.c; then
-    CFLAGS="$CFLAGS -DHAVE_HIDDEN"
-    SFLAGS="$SFLAGS -DHAVE_HIDDEN"
-    echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log
-  else
-    echo "Checking for attribute(visibility) support... No." | tee -a configure.log
-  fi
-fi
-
-# show the results in the log
-echo >> configure.log
-echo ALL = $ALL >> configure.log
-echo AR = $AR >> configure.log
-echo ARFLAGS = $ARFLAGS >> configure.log
-echo CC = $CC >> configure.log
-echo CFLAGS = $CFLAGS >> configure.log
-echo CPP = $CPP >> configure.log
-echo EXE = $EXE >> configure.log
-echo LDCONFIG = $LDCONFIG >> configure.log
-echo LDFLAGS = $LDFLAGS >> configure.log
-echo LDSHARED = $LDSHARED >> configure.log
-echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log
-echo OBJC = $OBJC >> configure.log
-echo PIC_OBJC = $PIC_OBJC >> configure.log
-echo RANLIB = $RANLIB >> configure.log
-echo SFLAGS = $SFLAGS >> configure.log
-echo SHAREDLIB = $SHAREDLIB >> configure.log
-echo SHAREDLIBM = $SHAREDLIBM >> configure.log
-echo SHAREDLIBV = $SHAREDLIBV >> configure.log
-echo STATICLIB = $STATICLIB >> configure.log
-echo TEST = $TEST >> configure.log
-echo VER = $VER >> configure.log
-echo Z_U4 = $Z_U4 >> configure.log
-echo SRCDIR = $SRCDIR >> configure.log
-echo exec_prefix = $exec_prefix >> configure.log
-echo includedir = $includedir >> configure.log
-echo libdir = $libdir >> configure.log
-echo mandir = $mandir >> configure.log
-echo prefix = $prefix >> configure.log
-echo sharedlibdir = $sharedlibdir >> configure.log
-echo uname = $uname >> configure.log
-
-# udpate Makefile with the configure results
-sed < ${SRCDIR}Makefile.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^SFLAGS *=/s#=.*#=$SFLAGS#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^CPP *=/s#=.*#=$CPP#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^LDCONFIG *=/s#=.*#=$LDCONFIG#
-/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
-/^EXE *=/s#=.*#=$EXE#
-/^SRCDIR *=/s#=.*#=$SRCDIR#
-/^ZINC *=/s#=.*#=$ZINC#
-/^ZINCOUT *=/s#=.*#=$ZINCOUT#
-/^prefix *=/s#=.*#=$prefix#
-/^exec_prefix *=/s#=.*#=$exec_prefix#
-/^libdir *=/s#=.*#=$libdir#
-/^sharedlibdir *=/s#=.*#=$sharedlibdir#
-/^includedir *=/s#=.*#=$includedir#
-/^mandir *=/s#=.*#=$mandir#
-/^OBJC *=/s#=.*#= $OBJC#
-/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
-/^all: */s#:.*#: $ALL#
-/^test: */s#:.*#: $TEST#
-" > Makefile
-
-# create zlib.pc with the configure results
-sed < ${SRCDIR}zlib.pc.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^CPP *=/s#=.*#=$CPP#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^EXE *=/s#=.*#=$EXE#
-/^prefix *=/s#=.*#=$prefix#
-/^exec_prefix *=/s#=.*#=$exec_prefix#
-/^libdir *=/s#=.*#=$libdir#
-/^sharedlibdir *=/s#=.*#=$sharedlibdir#
-/^includedir *=/s#=.*#=$includedir#
-/^mandir *=/s#=.*#=$mandir#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-" | sed -e "
-s/\@VERSION\@/$VER/g;
-" > zlib.pc
-
-# done
-leave 0
diff --git a/src/png/zlib/contrib/README.contrib b/src/png/zlib/contrib/README.contrib
deleted file mode 100644
index a411d5c39..000000000
--- a/src/png/zlib/contrib/README.contrib
+++ /dev/null
@@ -1,78 +0,0 @@
-All files under this contrib directory are UNSUPPORTED. There were
-provided by users of zlib and were not tested by the authors of zlib.
-Use at your own risk. Please contact the authors of the contributions
-for help about these, not the zlib authors. Thanks.
-
-
-ada/        by Dmitriy Anisimkov <anisimkov@yahoo.com>
-        Support for Ada
-        See http://zlib-ada.sourceforge.net/
-
-amd64/      by Mikhail Teterin <mi@ALDAN.algebra.com>
-        asm code for AMD64
-        See patch at http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/96393
-
-asm686/     by Brian Raiter <breadbox@muppetlabs.com>
-        asm code for Pentium and PPro/PII, using the AT&T (GNU as) syntax
-        See http://www.muppetlabs.com/~breadbox/software/assembly.html
-
-blast/      by Mark Adler <madler@alumni.caltech.edu>
-        Decompressor for output of PKWare Data Compression Library (DCL)
-
-delphi/     by Cosmin Truta <cosmint@cs.ubbcluj.ro>
-        Support for Delphi and C++ Builder
-
-dotzlib/    by Henrik Ravn <henrik@ravn.com>
-        Support for Microsoft .Net and Visual C++ .Net
-
-gcc_gvmat64/by Gilles Vollant <info@winimage.com>
-        GCC Version of x86 64-bit (AMD64 and Intel EM64t) code for x64
-        assembler to replace longest_match() and inflate_fast()
-
-infback9/   by Mark Adler <madler@alumni.caltech.edu>
-        Unsupported diffs to infback to decode the deflate64 format
-
-inflate86/  by Chris Anderson <christop@charm.net>
-        Tuned x86 gcc asm code to replace inflate_fast()
-
-iostream/   by Kevin Ruland <kevin@rodin.wustl.edu>
-        A C++ I/O streams interface to the zlib gz* functions
-
-iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
-        Another C++ I/O streams interface
-
-iostream3/  by Ludwig Schwardt <schwardt@sun.ac.za>
-            and Kevin Ruland <kevin@rodin.wustl.edu>
-        Yet another C++ I/O streams interface
-
-masmx64/    by Gilles Vollant <info@winimage.com>
-        x86 64-bit (AMD64 and Intel EM64t) code for x64 assembler to
-        replace longest_match() and inflate_fast(),  also masm x86
-        64-bits translation of Chris Anderson inflate_fast()
-
-masmx86/    by Gilles Vollant <info@winimage.com>
-        x86 asm code to replace longest_match() and inflate_fast(),
-        for Visual C++ and MASM (32 bits).
-        Based on Brian Raiter (asm686) and Chris Anderson (inflate86)
-
-minizip/    by Gilles Vollant <info@winimage.com>
-        Mini zip and unzip based on zlib
-        Includes Zip64 support by Mathias Svensson <mathias@result42.com>
-        See http://www.winimage.com/zLibDll/minizip.html
-
-pascal/     by Bob Dellaca <bobdl@xtra.co.nz> et al.
-        Support for Pascal
-
-puff/       by Mark Adler <madler@alumni.caltech.edu>
-        Small, low memory usage inflate.  Also serves to provide an
-        unambiguous description of the deflate format.
-
-testzlib/   by Gilles Vollant <info@winimage.com>
-        Example of the use of zlib
-
-untgz/      by Pedro A. Aranda Gutierrez <paag@tid.es>
-        A very simple tar.gz file extractor using zlib
-
-vstudio/    by Gilles Vollant <info@winimage.com>
-        Building a minizip-enhanced zlib with Microsoft Visual Studio
-        Includes vc11 from kreuzerkrieg and vc12 from davispuh
diff --git a/src/png/zlib/contrib/ada/buffer_demo.adb b/src/png/zlib/contrib/ada/buffer_demo.adb
deleted file mode 100644
index 46b863810..000000000
--- a/src/png/zlib/contrib/ada/buffer_demo.adb
+++ /dev/null
@@ -1,106 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
---
---  $Id: buffer_demo.adb,v 1.3 2004/09/06 06:55:35 vagul Exp $
-
---  This demo program provided by Dr Steve Sangwine <sjs@essex.ac.uk>
---
---  Demonstration of a problem with Zlib-Ada (already fixed) when a buffer
---  of exactly the correct size is used for decompressed data, and the last
---  few bytes passed in to Zlib are checksum bytes.
-
---  This program compresses a string of text, and then decompresses the
---  compressed text into a buffer of the same size as the original text.
-
-with Ada.Streams; use Ada.Streams;
-with Ada.Text_IO;
-
-with ZLib; use ZLib;
-
-procedure Buffer_Demo is
-   EOL  : Character renames ASCII.LF;
-   Text : constant String
-     := "Four score and seven years ago our fathers brought forth," & EOL &
-        "upon this continent, a new nation, conceived in liberty," & EOL &
-        "and dedicated to the proposition that `all men are created equal'.";
-
-   Source : Stream_Element_Array (1 .. Text'Length);
-   for Source'Address use Text'Address;
-
-begin
-   Ada.Text_IO.Put (Text);
-   Ada.Text_IO.New_Line;
-   Ada.Text_IO.Put_Line
-     ("Uncompressed size : " & Positive'Image (Text'Length) & " bytes");
-
-   declare
-      Compressed_Data : Stream_Element_Array (1 .. Text'Length);
-      L               : Stream_Element_Offset;
-   begin
-      Compress : declare
-         Compressor : Filter_Type;
-         I : Stream_Element_Offset;
-      begin
-         Deflate_Init (Compressor);
-
-         --  Compress the whole of T at once.
-
-         Translate (Compressor, Source, I, Compressed_Data, L, Finish);
-         pragma Assert (I = Source'Last);
-
-         Close (Compressor);
-
-         Ada.Text_IO.Put_Line
-           ("Compressed size :   "
-            & Stream_Element_Offset'Image (L) & " bytes");
-      end Compress;
-
-      --  Now we decompress the data, passing short blocks of data to Zlib
-      --  (because this demonstrates the problem - the last block passed will
-      --  contain checksum information and there will be no output, only a
-      --  check inside Zlib that the checksum is correct).
-
-      Decompress : declare
-         Decompressor : Filter_Type;
-
-         Uncompressed_Data : Stream_Element_Array (1 .. Text'Length);
-
-         Block_Size : constant := 4;
-         --  This makes sure that the last block contains
-         --  only Adler checksum data.
-
-         P : Stream_Element_Offset := Compressed_Data'First - 1;
-         O : Stream_Element_Offset;
-      begin
-         Inflate_Init (Decompressor);
-
-         loop
-            Translate
-              (Decompressor,
-               Compressed_Data
-                 (P + 1 .. Stream_Element_Offset'Min (P + Block_Size, L)),
-               P,
-               Uncompressed_Data
-                 (Total_Out (Decompressor) + 1 .. Uncompressed_Data'Last),
-               O,
-               No_Flush);
-
-               Ada.Text_IO.Put_Line
-                 ("Total in : " & Count'Image (Total_In (Decompressor)) &
-                  ", out : " & Count'Image (Total_Out (Decompressor)));
-
-               exit when P = L;
-         end loop;
-
-         Ada.Text_IO.New_Line;
-         Ada.Text_IO.Put_Line
-           ("Decompressed text matches original text : "
-             & Boolean'Image (Uncompressed_Data = Source));
-      end Decompress;
-   end;
-end Buffer_Demo;
diff --git a/src/png/zlib/contrib/ada/mtest.adb b/src/png/zlib/contrib/ada/mtest.adb
deleted file mode 100644
index c4dfd080f..000000000
--- a/src/png/zlib/contrib/ada/mtest.adb
+++ /dev/null
@@ -1,156 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
---  Continuous test for ZLib multithreading. If the test would fail
---  we should provide thread safe allocation routines for the Z_Stream.
---
---  $Id: mtest.adb,v 1.4 2004/07/23 07:49:54 vagul Exp $
-
-with ZLib;
-with Ada.Streams;
-with Ada.Numerics.Discrete_Random;
-with Ada.Text_IO;
-with Ada.Exceptions;
-with Ada.Task_Identification;
-
-procedure MTest is
-   use Ada.Streams;
-   use ZLib;
-
-   Stop : Boolean := False;
-
-   pragma Atomic (Stop);
-
-   subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#;
-
-   package Random_Elements is
-      new Ada.Numerics.Discrete_Random (Visible_Symbols);
-
-   task type Test_Task;
-
-   task body Test_Task is
-      Buffer : Stream_Element_Array (1 .. 100_000);
-      Gen : Random_Elements.Generator;
-
-      Buffer_First  : Stream_Element_Offset;
-      Compare_First : Stream_Element_Offset;
-
-      Deflate : Filter_Type;
-      Inflate : Filter_Type;
-
-      procedure Further (Item : in Stream_Element_Array);
-
-      procedure Read_Buffer
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset);
-
-      -------------
-      -- Further --
-      -------------
-
-      procedure Further (Item : in Stream_Element_Array) is
-
-         procedure Compare (Item : in Stream_Element_Array);
-
-         -------------
-         -- Compare --
-         -------------
-
-         procedure Compare (Item : in Stream_Element_Array) is
-            Next_First : Stream_Element_Offset := Compare_First + Item'Length;
-         begin
-            if Buffer (Compare_First .. Next_First - 1) /= Item then
-               raise Program_Error;
-            end if;
-
-            Compare_First := Next_First;
-         end Compare;
-
-         procedure Compare_Write is new ZLib.Write (Write => Compare);
-      begin
-         Compare_Write (Inflate, Item, No_Flush);
-      end Further;
-
-      -----------------
-      -- Read_Buffer --
-      -----------------
-
-      procedure Read_Buffer
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset)
-      is
-         Buff_Diff   : Stream_Element_Offset := Buffer'Last - Buffer_First;
-         Next_First : Stream_Element_Offset;
-      begin
-         if Item'Length <= Buff_Diff then
-            Last := Item'Last;
-
-            Next_First := Buffer_First + Item'Length;
-
-            Item := Buffer (Buffer_First .. Next_First - 1);
-
-            Buffer_First := Next_First;
-         else
-            Last := Item'First + Buff_Diff;
-            Item (Item'First .. Last) := Buffer (Buffer_First .. Buffer'Last);
-            Buffer_First := Buffer'Last + 1;
-         end if;
-      end Read_Buffer;
-
-      procedure Translate is new Generic_Translate
-                                   (Data_In  => Read_Buffer,
-                                    Data_Out => Further);
-
-   begin
-      Random_Elements.Reset (Gen);
-
-      Buffer := (others => 20);
-
-      Main : loop
-         for J in Buffer'Range loop
-            Buffer (J) := Random_Elements.Random (Gen);
-
-            Deflate_Init (Deflate);
-            Inflate_Init (Inflate);
-
-            Buffer_First  := Buffer'First;
-            Compare_First := Buffer'First;
-
-            Translate (Deflate);
-
-            if Compare_First /= Buffer'Last + 1 then
-               raise Program_Error;
-            end if;
-
-            Ada.Text_IO.Put_Line
-              (Ada.Task_Identification.Image
-                 (Ada.Task_Identification.Current_Task)
-               & Stream_Element_Offset'Image (J)
-               & ZLib.Count'Image (Total_Out (Deflate)));
-
-            Close (Deflate);
-            Close (Inflate);
-
-            exit Main when Stop;
-         end loop;
-      end loop Main;
-   exception
-      when E : others =>
-         Ada.Text_IO.Put_Line (Ada.Exceptions.Exception_Information (E));
-         Stop := True;
-   end Test_Task;
-
-   Test : array (1 .. 4) of Test_Task;
-
-   pragma Unreferenced (Test);
-
-   Dummy : Character;
-
-begin
-   Ada.Text_IO.Get_Immediate (Dummy);
-   Stop := True;
-end MTest;
diff --git a/src/png/zlib/contrib/ada/read.adb b/src/png/zlib/contrib/ada/read.adb
deleted file mode 100644
index 1f2efbfeb..000000000
--- a/src/png/zlib/contrib/ada/read.adb
+++ /dev/null
@@ -1,156 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: read.adb,v 1.8 2004/05/31 10:53:40 vagul Exp $
-
---  Test/demo program for the generic read interface.
-
-with Ada.Numerics.Discrete_Random;
-with Ada.Streams;
-with Ada.Text_IO;
-
-with ZLib;
-
-procedure Read is
-
-   use Ada.Streams;
-
-   ------------------------------------
-   --  Test configuration parameters --
-   ------------------------------------
-
-   File_Size   : Stream_Element_Offset := 100_000;
-
-   Continuous  : constant Boolean          := False;
-   --  If this constant is True, the test would be repeated again and again,
-   --  with increment File_Size for every iteration.
-
-   Header      : constant ZLib.Header_Type := ZLib.Default;
-   --  Do not use Header other than Default in ZLib versions 1.1.4 and older.
-
-   Init_Random : constant := 8;
-   --  We are using the same random sequence, in case of we catch bug,
-   --  so we would be able to reproduce it.
-
-   -- End --
-
-   Pack_Size : Stream_Element_Offset;
-   Offset    : Stream_Element_Offset;
-
-   Filter     : ZLib.Filter_Type;
-
-   subtype Visible_Symbols
-      is Stream_Element range 16#20# .. 16#7E#;
-
-   package Random_Elements is new
-      Ada.Numerics.Discrete_Random (Visible_Symbols);
-
-   Gen : Random_Elements.Generator;
-   Period  : constant Stream_Element_Offset := 200;
-   --  Period constant variable for random generator not to be very random.
-   --  Bigger period, harder random.
-
-   Read_Buffer : Stream_Element_Array (1 .. 2048);
-   Read_First  : Stream_Element_Offset;
-   Read_Last   : Stream_Element_Offset;
-
-   procedure Reset;
-
-   procedure Read
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset);
-   --  this procedure is for generic instantiation of
-   --  ZLib.Read
-   --  reading data from the File_In.
-
-   procedure Read is new ZLib.Read
-                           (Read,
-                            Read_Buffer,
-                            Rest_First => Read_First,
-                            Rest_Last  => Read_Last);
-
-   ----------
-   -- Read --
-   ----------
-
-   procedure Read
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset) is
-   begin
-      Last := Stream_Element_Offset'Min
-               (Item'Last,
-                Item'First + File_Size - Offset);
-
-      for J in Item'First .. Last loop
-         if J < Item'First + Period then
-            Item (J) := Random_Elements.Random (Gen);
-         else
-            Item (J) := Item (J - Period);
-         end if;
-
-         Offset   := Offset + 1;
-      end loop;
-   end Read;
-
-   -----------
-   -- Reset --
-   -----------
-
-   procedure Reset is
-   begin
-      Random_Elements.Reset (Gen, Init_Random);
-      Pack_Size := 0;
-      Offset := 1;
-      Read_First := Read_Buffer'Last + 1;
-      Read_Last  := Read_Buffer'Last;
-   end Reset;
-
-begin
-   Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version);
-
-   loop
-      for Level in ZLib.Compression_Level'Range loop
-
-         Ada.Text_IO.Put ("Level ="
-            & ZLib.Compression_Level'Image (Level));
-
-         --  Deflate using generic instantiation.
-
-         ZLib.Deflate_Init
-               (Filter,
-                Level,
-                Header => Header);
-
-         Reset;
-
-         Ada.Text_IO.Put
-           (Stream_Element_Offset'Image (File_Size) & " ->");
-
-         loop
-            declare
-               Buffer : Stream_Element_Array (1 .. 1024);
-               Last   : Stream_Element_Offset;
-            begin
-               Read (Filter, Buffer, Last);
-
-               Pack_Size := Pack_Size + Last - Buffer'First + 1;
-
-               exit when Last < Buffer'Last;
-            end;
-         end loop;
-
-         Ada.Text_IO.Put_Line (Stream_Element_Offset'Image (Pack_Size));
-
-         ZLib.Close (Filter);
-      end loop;
-
-      exit when not Continuous;
-
-      File_Size := File_Size + 1;
-   end loop;
-end Read;
diff --git a/src/png/zlib/contrib/ada/readme.txt b/src/png/zlib/contrib/ada/readme.txt
deleted file mode 100644
index ce4d2cadf..000000000
--- a/src/png/zlib/contrib/ada/readme.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-                        ZLib for Ada thick binding (ZLib.Ada)
-                        Release 1.3
-
-ZLib.Ada is a thick binding interface to the popular ZLib data
-compression library, available at http://www.gzip.org/zlib/.
-It provides Ada-style access to the ZLib C library.
-
-
-        Here are the main changes since ZLib.Ada 1.2:
-
-- Attension: ZLib.Read generic routine have a initialization requirement
-  for Read_Last parameter now. It is a bit incompartible with previous version,
-  but extends functionality, we could use new parameters Allow_Read_Some and
-  Flush now.
-
-- Added Is_Open routines to ZLib and ZLib.Streams packages.
-
-- Add pragma Assert to check Stream_Element is 8 bit.
-
-- Fix extraction to buffer with exact known decompressed size. Error reported by
-  Steve Sangwine.
-
-- Fix definition of ULong (changed to unsigned_long), fix regression on 64 bits
-  computers. Patch provided by Pascal Obry.
-
-- Add Status_Error exception definition.
-
-- Add pragma Assertion that Ada.Streams.Stream_Element size is 8 bit.
-
-
-        How to build ZLib.Ada under GNAT
-
-You should have the ZLib library already build on your computer, before
-building ZLib.Ada. Make the directory of ZLib.Ada sources current and
-issue the command:
-
-  gnatmake test -largs -L<directory where libz.a is> -lz
-
-Or use the GNAT project file build for GNAT 3.15 or later:
-
-  gnatmake -Pzlib.gpr -L<directory where libz.a is>
-
-
-        How to build ZLib.Ada under Aonix ObjectAda for Win32 7.2.2
-
-1. Make a project with all *.ads and *.adb files from the distribution.
-2. Build the libz.a library from the ZLib C sources.
-3. Rename libz.a to z.lib.
-4. Add the library z.lib to the project.
-5. Add the libc.lib library from the ObjectAda distribution to the project.
-6. Build the executable using test.adb as a main procedure.
-
-
-        How to use ZLib.Ada
-
-The source files test.adb and read.adb are small demo programs that show
-the main functionality of ZLib.Ada.
-
-The routines from the package specifications are commented.
-
-
-Homepage: http://zlib-ada.sourceforge.net/
-Author: Dmitriy Anisimkov <anisimkov@yahoo.com>
-
-Contributors: Pascal Obry <pascal@obry.org>, Steve Sangwine <sjs@essex.ac.uk>
diff --git a/src/png/zlib/contrib/ada/test.adb b/src/png/zlib/contrib/ada/test.adb
deleted file mode 100644
index 90773acfa..000000000
--- a/src/png/zlib/contrib/ada/test.adb
+++ /dev/null
@@ -1,463 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: test.adb,v 1.17 2003/08/12 12:13:30 vagul Exp $
-
---  The program has a few aims.
---  1. Test ZLib.Ada95 thick binding functionality.
---  2. Show the example of use main functionality of the ZLib.Ada95 binding.
---  3. Build this program automatically compile all ZLib.Ada95 packages under
---     GNAT Ada95 compiler.
-
-with ZLib.Streams;
-with Ada.Streams.Stream_IO;
-with Ada.Numerics.Discrete_Random;
-
-with Ada.Text_IO;
-
-with Ada.Calendar;
-
-procedure Test is
-
-   use Ada.Streams;
-   use Stream_IO;
-
-   ------------------------------------
-   --  Test configuration parameters --
-   ------------------------------------
-
-   File_Size   : Count   := 100_000;
-   Continuous  : constant Boolean := False;
-
-   Header      : constant ZLib.Header_Type := ZLib.Default;
-                                              --  ZLib.None;
-                                              --  ZLib.Auto;
-                                              --  ZLib.GZip;
-   --  Do not use Header other then Default in ZLib versions 1.1.4
-   --  and older.
-
-   Strategy    : constant ZLib.Strategy_Type := ZLib.Default_Strategy;
-   Init_Random : constant := 10;
-
-   -- End --
-
-   In_File_Name  : constant String := "testzlib.in";
-   --  Name of the input file
-
-   Z_File_Name   : constant String := "testzlib.zlb";
-   --  Name of the compressed file.
-
-   Out_File_Name : constant String := "testzlib.out";
-   --  Name of the decompressed file.
-
-   File_In   : File_Type;
-   File_Out  : File_Type;
-   File_Back : File_Type;
-   File_Z    : ZLib.Streams.Stream_Type;
-
-   Filter : ZLib.Filter_Type;
-
-   Time_Stamp : Ada.Calendar.Time;
-
-   procedure Generate_File;
-   --  Generate file of spetsified size with some random data.
-   --  The random data is repeatable, for the good compression.
-
-   procedure Compare_Streams
-     (Left, Right : in out Root_Stream_Type'Class);
-   --  The procedure compearing data in 2 streams.
-   --  It is for compare data before and after compression/decompression.
-
-   procedure Compare_Files (Left, Right : String);
-   --  Compare files. Based on the Compare_Streams.
-
-   procedure Copy_Streams
-     (Source, Target : in out Root_Stream_Type'Class;
-      Buffer_Size    : in     Stream_Element_Offset := 1024);
-   --  Copying data from one stream to another. It is for test stream
-   --  interface of the library.
-
-   procedure Data_In
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset);
-   --  this procedure is for generic instantiation of
-   --  ZLib.Generic_Translate.
-   --  reading data from the File_In.
-
-   procedure Data_Out (Item : in Stream_Element_Array);
-   --  this procedure is for generic instantiation of
-   --  ZLib.Generic_Translate.
-   --  writing data to the File_Out.
-
-   procedure Stamp;
-   --  Store the timestamp to the local variable.
-
-   procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count);
-   --  Print the time statistic with the message.
-
-   procedure Translate is new ZLib.Generic_Translate
-                                (Data_In  => Data_In,
-                                 Data_Out => Data_Out);
-   --  This procedure is moving data from File_In to File_Out
-   --  with compression or decompression, depend on initialization of
-   --  Filter parameter.
-
-   -------------------
-   -- Compare_Files --
-   -------------------
-
-   procedure Compare_Files (Left, Right : String) is
-      Left_File, Right_File : File_Type;
-   begin
-      Open (Left_File, In_File, Left);
-      Open (Right_File, In_File, Right);
-      Compare_Streams (Stream (Left_File).all, Stream (Right_File).all);
-      Close (Left_File);
-      Close (Right_File);
-   end Compare_Files;
-
-   ---------------------
-   -- Compare_Streams --
-   ---------------------
-
-   procedure Compare_Streams
-     (Left, Right : in out Ada.Streams.Root_Stream_Type'Class)
-   is
-      Left_Buffer, Right_Buffer : Stream_Element_Array (0 .. 16#FFF#);
-      Left_Last, Right_Last : Stream_Element_Offset;
-   begin
-      loop
-         Read (Left, Left_Buffer, Left_Last);
-         Read (Right, Right_Buffer, Right_Last);
-
-         if Left_Last /= Right_Last then
-            Ada.Text_IO.Put_Line ("Compare error :"
-              & Stream_Element_Offset'Image (Left_Last)
-              & " /= "
-              & Stream_Element_Offset'Image (Right_Last));
-
-            raise Constraint_Error;
-
-         elsif Left_Buffer (0 .. Left_Last)
-               /= Right_Buffer (0 .. Right_Last)
-         then
-            Ada.Text_IO.Put_Line ("ERROR: IN and OUT files is not equal.");
-            raise Constraint_Error;
-
-         end if;
-
-         exit when Left_Last < Left_Buffer'Last;
-      end loop;
-   end Compare_Streams;
-
-   ------------------
-   -- Copy_Streams --
-   ------------------
-
-   procedure Copy_Streams
-     (Source, Target : in out Ada.Streams.Root_Stream_Type'Class;
-      Buffer_Size    : in     Stream_Element_Offset := 1024)
-   is
-      Buffer : Stream_Element_Array (1 .. Buffer_Size);
-      Last   : Stream_Element_Offset;
-   begin
-      loop
-         Read  (Source, Buffer, Last);
-         Write (Target, Buffer (1 .. Last));
-
-         exit when Last < Buffer'Last;
-      end loop;
-   end Copy_Streams;
-
-   -------------
-   -- Data_In --
-   -------------
-
-   procedure Data_In
-     (Item : out Stream_Element_Array;
-      Last : out Stream_Element_Offset) is
-   begin
-      Read (File_In, Item, Last);
-   end Data_In;
-
-   --------------
-   -- Data_Out --
-   --------------
-
-   procedure Data_Out (Item : in Stream_Element_Array) is
-   begin
-      Write (File_Out, Item);
-   end Data_Out;
-
-   -------------------
-   -- Generate_File --
-   -------------------
-
-   procedure Generate_File is
-      subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#;
-
-      package Random_Elements is
-         new Ada.Numerics.Discrete_Random (Visible_Symbols);
-
-      Gen    : Random_Elements.Generator;
-      Buffer : Stream_Element_Array := (1 .. 77 => 16#20#) & 10;
-
-      Buffer_Count : constant Count := File_Size / Buffer'Length;
-      --  Number of same buffers in the packet.
-
-      Density : constant Count := 30; --  from 0 to Buffer'Length - 2;
-
-      procedure Fill_Buffer (J, D : in Count);
-      --  Change the part of the buffer.
-
-      -----------------
-      -- Fill_Buffer --
-      -----------------
-
-      procedure Fill_Buffer (J, D : in Count) is
-      begin
-         for K in 0 .. D loop
-            Buffer
-              (Stream_Element_Offset ((J + K) mod (Buffer'Length - 1) + 1))
-             := Random_Elements.Random (Gen);
-
-         end loop;
-      end Fill_Buffer;
-
-   begin
-      Random_Elements.Reset (Gen, Init_Random);
-
-      Create (File_In, Out_File, In_File_Name);
-
-      Fill_Buffer (1, Buffer'Length - 2);
-
-      for J in 1 .. Buffer_Count loop
-         Write (File_In, Buffer);
-
-         Fill_Buffer (J, Density);
-      end loop;
-
-      --  fill remain size.
-
-      Write
-        (File_In,
-         Buffer
-           (1 .. Stream_Element_Offset
-                   (File_Size - Buffer'Length * Buffer_Count)));
-
-      Flush (File_In);
-      Close (File_In);
-   end Generate_File;
-
-   ---------------------
-   -- Print_Statistic --
-   ---------------------
-
-   procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count) is
-      use Ada.Calendar;
-      use Ada.Text_IO;
-
-      package Count_IO is new Integer_IO (ZLib.Count);
-
-      Curr_Dur : Duration := Clock - Time_Stamp;
-   begin
-      Put (Msg);
-
-      Set_Col (20);
-      Ada.Text_IO.Put ("size =");
-
-      Count_IO.Put
-        (Data_Size,
-         Width => Stream_IO.Count'Image (File_Size)'Length);
-
-      Put_Line (" duration =" & Duration'Image (Curr_Dur));
-   end Print_Statistic;
-
-   -----------
-   -- Stamp --
-   -----------
-
-   procedure Stamp is
-   begin
-      Time_Stamp := Ada.Calendar.Clock;
-   end Stamp;
-
-begin
-   Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version);
-
-   loop
-      Generate_File;
-
-      for Level in ZLib.Compression_Level'Range loop
-
-         Ada.Text_IO.Put_Line ("Level ="
-            & ZLib.Compression_Level'Image (Level));
-
-         --  Test generic interface.
-         Open   (File_In, In_File, In_File_Name);
-         Create (File_Out, Out_File, Z_File_Name);
-
-         Stamp;
-
-         --  Deflate using generic instantiation.
-
-         ZLib.Deflate_Init
-               (Filter   => Filter,
-                Level    => Level,
-                Strategy => Strategy,
-                Header   => Header);
-
-         Translate (Filter);
-         Print_Statistic ("Generic compress", ZLib.Total_Out (Filter));
-         ZLib.Close (Filter);
-
-         Close (File_In);
-         Close (File_Out);
-
-         Open   (File_In, In_File, Z_File_Name);
-         Create (File_Out, Out_File, Out_File_Name);
-
-         Stamp;
-
-         --  Inflate using generic instantiation.
-
-         ZLib.Inflate_Init (Filter, Header => Header);
-
-         Translate (Filter);
-         Print_Statistic ("Generic decompress", ZLib.Total_Out (Filter));
-
-         ZLib.Close (Filter);
-
-         Close (File_In);
-         Close (File_Out);
-
-         Compare_Files (In_File_Name, Out_File_Name);
-
-         --  Test stream interface.
-
-         --  Compress to the back stream.
-
-         Open   (File_In, In_File, In_File_Name);
-         Create (File_Back, Out_File, Z_File_Name);
-
-         Stamp;
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.Out_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => True,
-            Level           => Level,
-            Strategy        => Strategy,
-            Header          => Header);
-
-         Copy_Streams
-           (Source => Stream (File_In).all,
-            Target => File_Z);
-
-         --  Flushing internal buffers to the back stream.
-
-         ZLib.Streams.Flush (File_Z, ZLib.Finish);
-
-         Print_Statistic ("Write compress",
-                          ZLib.Streams.Write_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-
-         Close (File_In);
-         Close (File_Back);
-
-         --  Compare reading from original file and from
-         --  decompression stream.
-
-         Open (File_In,   In_File, In_File_Name);
-         Open (File_Back, In_File, Z_File_Name);
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.In_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => True,
-            Header          => Header);
-
-         Stamp;
-         Compare_Streams (Stream (File_In).all, File_Z);
-
-         Print_Statistic ("Read decompress",
-                          ZLib.Streams.Read_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-         Close (File_In);
-         Close (File_Back);
-
-         --  Compress by reading from compression stream.
-
-         Open (File_Back, In_File, In_File_Name);
-         Create (File_Out, Out_File, Z_File_Name);
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.In_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => False,
-            Level           => Level,
-            Strategy        => Strategy,
-            Header          => Header);
-
-         Stamp;
-         Copy_Streams
-           (Source => File_Z,
-            Target => Stream (File_Out).all);
-
-         Print_Statistic ("Read compress",
-                          ZLib.Streams.Read_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-
-         Close (File_Out);
-         Close (File_Back);
-
-         --  Decompress to decompression stream.
-
-         Open   (File_In,   In_File, Z_File_Name);
-         Create (File_Back, Out_File, Out_File_Name);
-
-         ZLib.Streams.Create
-           (Stream          => File_Z,
-            Mode            => ZLib.Streams.Out_Stream,
-            Back            => ZLib.Streams.Stream_Access
-                                 (Stream (File_Back)),
-            Back_Compressed => False,
-            Header          => Header);
-
-         Stamp;
-
-         Copy_Streams
-           (Source => Stream (File_In).all,
-            Target => File_Z);
-
-         Print_Statistic ("Write decompress",
-                          ZLib.Streams.Write_Total_Out (File_Z));
-
-         ZLib.Streams.Close (File_Z);
-         Close (File_In);
-         Close (File_Back);
-
-         Compare_Files (In_File_Name, Out_File_Name);
-      end loop;
-
-      Ada.Text_IO.Put_Line (Count'Image (File_Size) & " Ok.");
-
-      exit when not Continuous;
-
-      File_Size := File_Size + 1;
-   end loop;
-end Test;
diff --git a/src/png/zlib/contrib/ada/zlib-streams.adb b/src/png/zlib/contrib/ada/zlib-streams.adb
deleted file mode 100644
index b6497bae2..000000000
--- a/src/png/zlib/contrib/ada/zlib-streams.adb
+++ /dev/null
@@ -1,225 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-streams.adb,v 1.10 2004/05/31 10:53:40 vagul Exp $
-
-with Ada.Unchecked_Deallocation;
-
-package body ZLib.Streams is
-
-   -----------
-   -- Close --
-   -----------
-
-   procedure Close (Stream : in out Stream_Type) is
-      procedure Free is new Ada.Unchecked_Deallocation
-         (Stream_Element_Array, Buffer_Access);
-   begin
-      if Stream.Mode = Out_Stream or Stream.Mode = Duplex then
-         --  We should flush the data written by the writer.
-
-         Flush (Stream, Finish);
-
-         Close (Stream.Writer);
-      end if;
-
-      if Stream.Mode = In_Stream or Stream.Mode = Duplex then
-         Close (Stream.Reader);
-         Free (Stream.Buffer);
-      end if;
-   end Close;
-
-   ------------
-   -- Create --
-   ------------
-
-   procedure Create
-     (Stream            :    out Stream_Type;
-      Mode              : in     Stream_Mode;
-      Back              : in     Stream_Access;
-      Back_Compressed   : in     Boolean;
-      Level             : in     Compression_Level := Default_Compression;
-      Strategy          : in     Strategy_Type     := Default_Strategy;
-      Header            : in     Header_Type       := Default;
-      Read_Buffer_Size  : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size;
-      Write_Buffer_Size : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size)
-   is
-
-      subtype Buffer_Subtype is Stream_Element_Array (1 .. Read_Buffer_Size);
-
-      procedure Init_Filter
-         (Filter   : in out Filter_Type;
-          Compress : in     Boolean);
-
-      -----------------
-      -- Init_Filter --
-      -----------------
-
-      procedure Init_Filter
-         (Filter   : in out Filter_Type;
-          Compress : in     Boolean) is
-      begin
-         if Compress then
-            Deflate_Init
-              (Filter, Level, Strategy, Header => Header);
-         else
-            Inflate_Init (Filter, Header => Header);
-         end if;
-      end Init_Filter;
-
-   begin
-      Stream.Back := Back;
-      Stream.Mode := Mode;
-
-      if Mode = Out_Stream or Mode = Duplex then
-         Init_Filter (Stream.Writer, Back_Compressed);
-         Stream.Buffer_Size := Write_Buffer_Size;
-      else
-         Stream.Buffer_Size := 0;
-      end if;
-
-      if Mode = In_Stream or Mode = Duplex then
-         Init_Filter (Stream.Reader, not Back_Compressed);
-
-         Stream.Buffer     := new Buffer_Subtype;
-         Stream.Rest_First := Stream.Buffer'Last + 1;
-         Stream.Rest_Last  := Stream.Buffer'Last;
-      end if;
-   end Create;
-
-   -----------
-   -- Flush --
-   -----------
-
-   procedure Flush
-     (Stream : in out Stream_Type;
-      Mode   : in     Flush_Mode := Sync_Flush)
-   is
-      Buffer : Stream_Element_Array (1 .. Stream.Buffer_Size);
-      Last   : Stream_Element_Offset;
-   begin
-      loop
-         Flush (Stream.Writer, Buffer, Last, Mode);
-
-         Ada.Streams.Write (Stream.Back.all, Buffer (1 .. Last));
-
-         exit when Last < Buffer'Last;
-      end loop;
-   end Flush;
-
-   -------------
-   -- Is_Open --
-   -------------
-
-   function Is_Open (Stream : Stream_Type) return Boolean is
-   begin
-      return Is_Open (Stream.Reader) or else Is_Open (Stream.Writer);
-   end Is_Open;
-
-   ----------
-   -- Read --
-   ----------
-
-   procedure Read
-     (Stream : in out Stream_Type;
-      Item   :    out Stream_Element_Array;
-      Last   :    out Stream_Element_Offset)
-   is
-
-      procedure Read
-        (Item : out Stream_Element_Array;
-         Last : out Stream_Element_Offset);
-
-      ----------
-      -- Read --
-      ----------
-
-      procedure Read
-        (Item : out Stream_Element_Array;
-         Last : out Stream_Element_Offset) is
-      begin
-         Ada.Streams.Read (Stream.Back.all, Item, Last);
-      end Read;
-
-      procedure Read is new ZLib.Read
-         (Read       => Read,
-          Buffer     => Stream.Buffer.all,
-          Rest_First => Stream.Rest_First,
-          Rest_Last  => Stream.Rest_Last);
-
-   begin
-      Read (Stream.Reader, Item, Last);
-   end Read;
-
-   -------------------
-   -- Read_Total_In --
-   -------------------
-
-   function Read_Total_In (Stream : in Stream_Type) return Count is
-   begin
-      return Total_In (Stream.Reader);
-   end Read_Total_In;
-
-   --------------------
-   -- Read_Total_Out --
-   --------------------
-
-   function Read_Total_Out (Stream : in Stream_Type) return Count is
-   begin
-      return Total_Out (Stream.Reader);
-   end Read_Total_Out;
-
-   -----------
-   -- Write --
-   -----------
-
-   procedure Write
-     (Stream : in out Stream_Type;
-      Item   : in     Stream_Element_Array)
-   is
-
-      procedure Write (Item : in Stream_Element_Array);
-
-      -----------
-      -- Write --
-      -----------
-
-      procedure Write (Item : in Stream_Element_Array) is
-      begin
-         Ada.Streams.Write (Stream.Back.all, Item);
-      end Write;
-
-      procedure Write is new ZLib.Write
-         (Write       => Write,
-          Buffer_Size => Stream.Buffer_Size);
-
-   begin
-      Write (Stream.Writer, Item, No_Flush);
-   end Write;
-
-   --------------------
-   -- Write_Total_In --
-   --------------------
-
-   function Write_Total_In (Stream : in Stream_Type) return Count is
-   begin
-      return Total_In (Stream.Writer);
-   end Write_Total_In;
-
-   ---------------------
-   -- Write_Total_Out --
-   ---------------------
-
-   function Write_Total_Out (Stream : in Stream_Type) return Count is
-   begin
-      return Total_Out (Stream.Writer);
-   end Write_Total_Out;
-
-end ZLib.Streams;
diff --git a/src/png/zlib/contrib/ada/zlib-streams.ads b/src/png/zlib/contrib/ada/zlib-streams.ads
deleted file mode 100644
index 8e26cd450..000000000
--- a/src/png/zlib/contrib/ada/zlib-streams.ads
+++ /dev/null
@@ -1,114 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-streams.ads,v 1.12 2004/05/31 10:53:40 vagul Exp $
-
-package ZLib.Streams is
-
-   type Stream_Mode is (In_Stream, Out_Stream, Duplex);
-
-   type Stream_Access is access all Ada.Streams.Root_Stream_Type'Class;
-
-   type Stream_Type is
-      new Ada.Streams.Root_Stream_Type with private;
-
-   procedure Read
-     (Stream : in out Stream_Type;
-      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset);
-
-   procedure Write
-     (Stream : in out Stream_Type;
-      Item   : in     Ada.Streams.Stream_Element_Array);
-
-   procedure Flush
-     (Stream : in out Stream_Type;
-      Mode   : in     Flush_Mode := Sync_Flush);
-   --  Flush the written data to the back stream,
-   --  all data placed to the compressor is flushing to the Back stream.
-   --  Should not be used until necessary, because it is decreasing
-   --  compression.
-
-   function Read_Total_In (Stream : in Stream_Type) return Count;
-   pragma Inline (Read_Total_In);
-   --  Return total number of bytes read from back stream so far.
-
-   function Read_Total_Out (Stream : in Stream_Type) return Count;
-   pragma Inline (Read_Total_Out);
-   --  Return total number of bytes read so far.
-
-   function Write_Total_In (Stream : in Stream_Type) return Count;
-   pragma Inline (Write_Total_In);
-   --  Return total number of bytes written so far.
-
-   function Write_Total_Out (Stream : in Stream_Type) return Count;
-   pragma Inline (Write_Total_Out);
-   --  Return total number of bytes written to the back stream.
-
-   procedure Create
-     (Stream            :    out Stream_Type;
-      Mode              : in     Stream_Mode;
-      Back              : in     Stream_Access;
-      Back_Compressed   : in     Boolean;
-      Level             : in     Compression_Level := Default_Compression;
-      Strategy          : in     Strategy_Type     := Default_Strategy;
-      Header            : in     Header_Type       := Default;
-      Read_Buffer_Size  : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size;
-      Write_Buffer_Size : in     Ada.Streams.Stream_Element_Offset
-                                    := Default_Buffer_Size);
-   --  Create the Comression/Decompression stream.
-   --  If mode is In_Stream then Write operation is disabled.
-   --  If mode is Out_Stream then Read operation is disabled.
-
-   --  If Back_Compressed is true then
-   --  Data written to the Stream is compressing to the Back stream
-   --  and data read from the Stream is decompressed data from the Back stream.
-
-   --  If Back_Compressed is false then
-   --  Data written to the Stream is decompressing to the Back stream
-   --  and data read from the Stream is compressed data from the Back stream.
-
-   --  !!! When the Need_Header is False ZLib-Ada is using undocumented
-   --  ZLib 1.1.4 functionality to do not create/wait for ZLib headers.
-
-   function Is_Open (Stream : Stream_Type) return Boolean;
-
-   procedure Close (Stream : in out Stream_Type);
-
-private
-
-   use Ada.Streams;
-
-   type Buffer_Access is access all Stream_Element_Array;
-
-   type Stream_Type
-     is new Root_Stream_Type with
-   record
-      Mode       : Stream_Mode;
-
-      Buffer     : Buffer_Access;
-      Rest_First : Stream_Element_Offset;
-      Rest_Last  : Stream_Element_Offset;
-      --  Buffer for Read operation.
-      --  We need to have this buffer in the record
-      --  because not all read data from back stream
-      --  could be processed during the read operation.
-
-      Buffer_Size : Stream_Element_Offset;
-      --  Buffer size for write operation.
-      --  We do not need to have this buffer
-      --  in the record because all data could be
-      --  processed in the write operation.
-
-      Back       : Stream_Access;
-      Reader     : Filter_Type;
-      Writer     : Filter_Type;
-   end record;
-
-end ZLib.Streams;
diff --git a/src/png/zlib/contrib/ada/zlib-thin.adb b/src/png/zlib/contrib/ada/zlib-thin.adb
deleted file mode 100644
index 0ca4a7120..000000000
--- a/src/png/zlib/contrib/ada/zlib-thin.adb
+++ /dev/null
@@ -1,141 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-thin.adb,v 1.8 2003/12/14 18:27:31 vagul Exp $
-
-package body ZLib.Thin is
-
-   ZLIB_VERSION  : constant Chars_Ptr := zlibVersion;
-
-   Z_Stream_Size : constant Int := Z_Stream'Size / System.Storage_Unit;
-
-   --------------
-   -- Avail_In --
-   --------------
-
-   function Avail_In (Strm : in Z_Stream) return UInt is
-   begin
-      return Strm.Avail_In;
-   end Avail_In;
-
-   ---------------
-   -- Avail_Out --
-   ---------------
-
-   function Avail_Out (Strm : in Z_Stream) return UInt is
-   begin
-      return Strm.Avail_Out;
-   end Avail_Out;
-
-   ------------------
-   -- Deflate_Init --
-   ------------------
-
-   function Deflate_Init
-     (strm       : Z_Streamp;
-      level      : Int;
-      method     : Int;
-      windowBits : Int;
-      memLevel   : Int;
-      strategy   : Int)
-      return       Int is
-   begin
-      return deflateInit2
-               (strm,
-                level,
-                method,
-                windowBits,
-                memLevel,
-                strategy,
-                ZLIB_VERSION,
-                Z_Stream_Size);
-   end Deflate_Init;
-
-   ------------------
-   -- Inflate_Init --
-   ------------------
-
-   function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int is
-   begin
-      return inflateInit2 (strm, windowBits, ZLIB_VERSION, Z_Stream_Size);
-   end Inflate_Init;
-
-   ------------------------
-   -- Last_Error_Message --
-   ------------------------
-
-   function Last_Error_Message (Strm : in Z_Stream) return String is
-      use Interfaces.C.Strings;
-   begin
-      if Strm.msg = Null_Ptr then
-         return "";
-      else
-         return Value (Strm.msg);
-      end if;
-   end Last_Error_Message;
-
-   ------------
-   -- Set_In --
-   ------------
-
-   procedure Set_In
-     (Strm   : in out Z_Stream;
-      Buffer : in     Voidp;
-      Size   : in     UInt) is
-   begin
-      Strm.Next_In  := Buffer;
-      Strm.Avail_In := Size;
-   end Set_In;
-
-   ------------------
-   -- Set_Mem_Func --
-   ------------------
-
-   procedure Set_Mem_Func
-     (Strm   : in out Z_Stream;
-      Opaque : in     Voidp;
-      Alloc  : in     alloc_func;
-      Free   : in     free_func) is
-   begin
-      Strm.opaque := Opaque;
-      Strm.zalloc := Alloc;
-      Strm.zfree  := Free;
-   end Set_Mem_Func;
-
-   -------------
-   -- Set_Out --
-   -------------
-
-   procedure Set_Out
-     (Strm   : in out Z_Stream;
-      Buffer : in     Voidp;
-      Size   : in     UInt) is
-   begin
-      Strm.Next_Out  := Buffer;
-      Strm.Avail_Out := Size;
-   end Set_Out;
-
-   --------------
-   -- Total_In --
-   --------------
-
-   function Total_In (Strm : in Z_Stream) return ULong is
-   begin
-      return Strm.Total_In;
-   end Total_In;
-
-   ---------------
-   -- Total_Out --
-   ---------------
-
-   function Total_Out (Strm : in Z_Stream) return ULong is
-   begin
-      return Strm.Total_Out;
-   end Total_Out;
-
-end ZLib.Thin;
diff --git a/src/png/zlib/contrib/ada/zlib-thin.ads b/src/png/zlib/contrib/ada/zlib-thin.ads
deleted file mode 100644
index 810173cff..000000000
--- a/src/png/zlib/contrib/ada/zlib-thin.ads
+++ /dev/null
@@ -1,450 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2003 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib-thin.ads,v 1.11 2004/07/23 06:33:11 vagul Exp $
-
-with Interfaces.C.Strings;
-
-with System;
-
-private package ZLib.Thin is
-
-   --  From zconf.h
-
-   MAX_MEM_LEVEL : constant := 9;         --  zconf.h:105
-                                          --  zconf.h:105
-   MAX_WBITS : constant := 15;      --  zconf.h:115
-                                    --  32K LZ77 window
-                                    --  zconf.h:115
-   SEEK_SET : constant := 8#0000#;  --  zconf.h:244
-                                    --  Seek from beginning of file.
-                                    --  zconf.h:244
-   SEEK_CUR : constant := 1;        --  zconf.h:245
-                                    --  Seek from current position.
-                                    --  zconf.h:245
-   SEEK_END : constant := 2;        --  zconf.h:246
-                                    --  Set file pointer to EOF plus "offset"
-                                    --  zconf.h:246
-
-   type Byte is new Interfaces.C.unsigned_char; --  8 bits
-                                                --  zconf.h:214
-   type UInt is new Interfaces.C.unsigned;      --  16 bits or more
-                                                --  zconf.h:216
-   type Int is new Interfaces.C.int;
-
-   type ULong is new Interfaces.C.unsigned_long;     --  32 bits or more
-                                                     --  zconf.h:217
-   subtype Chars_Ptr is Interfaces.C.Strings.chars_ptr;
-
-   type ULong_Access is access ULong;
-   type Int_Access is access Int;
-
-   subtype Voidp is System.Address;            --  zconf.h:232
-
-   subtype Byte_Access is Voidp;
-
-   Nul : constant Voidp := System.Null_Address;
-   --  end from zconf
-
-   Z_NO_FLUSH : constant := 8#0000#;   --  zlib.h:125
-                                       --  zlib.h:125
-   Z_PARTIAL_FLUSH : constant := 1;       --  zlib.h:126
-                                          --  will be removed, use
-                                          --  Z_SYNC_FLUSH instead
-                                          --  zlib.h:126
-   Z_SYNC_FLUSH : constant := 2;       --  zlib.h:127
-                                       --  zlib.h:127
-   Z_FULL_FLUSH : constant := 3;       --  zlib.h:128
-                                       --  zlib.h:128
-   Z_FINISH : constant := 4;        --  zlib.h:129
-                                    --  zlib.h:129
-   Z_OK : constant := 8#0000#;   --  zlib.h:132
-                                 --  zlib.h:132
-   Z_STREAM_END : constant := 1;       --  zlib.h:133
-                                       --  zlib.h:133
-   Z_NEED_DICT : constant := 2;        --  zlib.h:134
-                                       --  zlib.h:134
-   Z_ERRNO : constant := -1;        --  zlib.h:135
-                                    --  zlib.h:135
-   Z_STREAM_ERROR : constant := -2;       --  zlib.h:136
-                                          --  zlib.h:136
-   Z_DATA_ERROR : constant := -3;      --  zlib.h:137
-                                       --  zlib.h:137
-   Z_MEM_ERROR : constant := -4;       --  zlib.h:138
-                                       --  zlib.h:138
-   Z_BUF_ERROR : constant := -5;       --  zlib.h:139
-                                       --  zlib.h:139
-   Z_VERSION_ERROR : constant := -6;      --  zlib.h:140
-                                          --  zlib.h:140
-   Z_NO_COMPRESSION : constant := 8#0000#;   --  zlib.h:145
-                                             --  zlib.h:145
-   Z_BEST_SPEED : constant := 1;       --  zlib.h:146
-                                       --  zlib.h:146
-   Z_BEST_COMPRESSION : constant := 9;       --  zlib.h:147
-                                             --  zlib.h:147
-   Z_DEFAULT_COMPRESSION : constant := -1;      --  zlib.h:148
-                                                --  zlib.h:148
-   Z_FILTERED : constant := 1;      --  zlib.h:151
-                                    --  zlib.h:151
-   Z_HUFFMAN_ONLY : constant := 2;        --  zlib.h:152
-                                          --  zlib.h:152
-   Z_DEFAULT_STRATEGY : constant := 8#0000#; --  zlib.h:153
-                                             --  zlib.h:153
-   Z_BINARY : constant := 8#0000#;  --  zlib.h:156
-                                    --  zlib.h:156
-   Z_ASCII : constant := 1;      --  zlib.h:157
-                                 --  zlib.h:157
-   Z_UNKNOWN : constant := 2;       --  zlib.h:158
-                                    --  zlib.h:158
-   Z_DEFLATED : constant := 8;      --  zlib.h:161
-                                    --  zlib.h:161
-   Z_NULL : constant := 8#0000#; --  zlib.h:164
-                                 --  for initializing zalloc, zfree, opaque
-                                 --  zlib.h:164
-   type gzFile is new Voidp;                  --  zlib.h:646
-
-   type Z_Stream is private;
-
-   type Z_Streamp is access all Z_Stream;     --  zlib.h:89
-
-   type alloc_func is access function
-     (Opaque : Voidp;
-      Items  : UInt;
-      Size   : UInt)
-      return Voidp; --  zlib.h:63
-
-   type free_func is access procedure (opaque : Voidp; address : Voidp);
-
-   function zlibVersion return Chars_Ptr;
-
-   function Deflate (strm : Z_Streamp; flush : Int) return Int;
-
-   function DeflateEnd (strm : Z_Streamp) return Int;
-
-   function Inflate (strm : Z_Streamp; flush : Int) return Int;
-
-   function InflateEnd (strm : Z_Streamp) return Int;
-
-   function deflateSetDictionary
-     (strm       : Z_Streamp;
-      dictionary : Byte_Access;
-      dictLength : UInt)
-      return       Int;
-
-   function deflateCopy (dest : Z_Streamp; source : Z_Streamp) return Int;
-   --  zlib.h:478
-
-   function deflateReset (strm : Z_Streamp) return Int; -- zlib.h:495
-
-   function deflateParams
-     (strm     : Z_Streamp;
-      level    : Int;
-      strategy : Int)
-      return     Int;       -- zlib.h:506
-
-   function inflateSetDictionary
-     (strm       : Z_Streamp;
-      dictionary : Byte_Access;
-      dictLength : UInt)
-      return       Int; --  zlib.h:548
-
-   function inflateSync (strm : Z_Streamp) return Int;  --  zlib.h:565
-
-   function inflateReset (strm : Z_Streamp) return Int; --  zlib.h:580
-
-   function compress
-     (dest      : Byte_Access;
-      destLen   : ULong_Access;
-      source    : Byte_Access;
-      sourceLen : ULong)
-      return      Int;           -- zlib.h:601
-
-   function compress2
-     (dest      : Byte_Access;
-      destLen   : ULong_Access;
-      source    : Byte_Access;
-      sourceLen : ULong;
-      level     : Int)
-      return      Int;          -- zlib.h:615
-
-   function uncompress
-     (dest      : Byte_Access;
-      destLen   : ULong_Access;
-      source    : Byte_Access;
-      sourceLen : ULong)
-      return      Int;
-
-   function gzopen (path : Chars_Ptr; mode : Chars_Ptr) return gzFile;
-
-   function gzdopen (fd : Int; mode : Chars_Ptr) return gzFile;
-
-   function gzsetparams
-     (file     : gzFile;
-      level    : Int;
-      strategy : Int)
-      return     Int;
-
-   function gzread
-     (file : gzFile;
-      buf  : Voidp;
-      len  : UInt)
-      return Int;
-
-   function gzwrite
-     (file : in gzFile;
-      buf  : in Voidp;
-      len  : in UInt)
-      return Int;
-
-   function gzprintf (file : in gzFile; format : in Chars_Ptr) return Int;
-
-   function gzputs (file : in gzFile; s : in Chars_Ptr) return Int;
-
-   function gzgets
-     (file : gzFile;
-      buf  : Chars_Ptr;
-      len  : Int)
-      return Chars_Ptr;
-
-   function gzputc (file : gzFile; char : Int) return Int;
-
-   function gzgetc (file : gzFile) return Int;
-
-   function gzflush (file : gzFile; flush : Int) return Int;
-
-   function gzseek
-     (file   : gzFile;
-      offset : Int;
-      whence : Int)
-      return   Int;
-
-   function gzrewind (file : gzFile) return Int;
-
-   function gztell (file : gzFile) return Int;
-
-   function gzeof (file : gzFile) return Int;
-
-   function gzclose (file : gzFile) return Int;
-
-   function gzerror (file : gzFile; errnum : Int_Access) return Chars_Ptr;
-
-   function adler32
-     (adler : ULong;
-      buf   : Byte_Access;
-      len   : UInt)
-      return  ULong;
-
-   function crc32
-     (crc  : ULong;
-      buf  : Byte_Access;
-      len  : UInt)
-      return ULong;
-
-   function deflateInit
-     (strm        : Z_Streamp;
-      level       : Int;
-      version     : Chars_Ptr;
-      stream_size : Int)
-      return        Int;
-
-   function deflateInit2
-     (strm        : Z_Streamp;
-      level       : Int;
-      method      : Int;
-      windowBits  : Int;
-      memLevel    : Int;
-      strategy    : Int;
-      version     : Chars_Ptr;
-      stream_size : Int)
-      return        Int;
-
-   function Deflate_Init
-     (strm       : Z_Streamp;
-      level      : Int;
-      method     : Int;
-      windowBits : Int;
-      memLevel   : Int;
-      strategy   : Int)
-      return       Int;
-   pragma Inline (Deflate_Init);
-
-   function inflateInit
-     (strm        : Z_Streamp;
-      version     : Chars_Ptr;
-      stream_size : Int)
-      return        Int;
-
-   function inflateInit2
-     (strm        : in Z_Streamp;
-      windowBits  : in Int;
-      version     : in Chars_Ptr;
-      stream_size : in Int)
-      return      Int;
-
-   function inflateBackInit
-     (strm        : in Z_Streamp;
-      windowBits  : in Int;
-      window      : in Byte_Access;
-      version     : in Chars_Ptr;
-      stream_size : in Int)
-      return      Int;
-   --  Size of window have to be 2**windowBits.
-
-   function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int;
-   pragma Inline (Inflate_Init);
-
-   function zError (err : Int) return Chars_Ptr;
-
-   function inflateSyncPoint (z : Z_Streamp) return Int;
-
-   function get_crc_table return ULong_Access;
-
-   --  Interface to the available fields of the z_stream structure.
-   --  The application must update next_in and avail_in when avail_in has
-   --  dropped to zero. It must update next_out and avail_out when avail_out
-   --  has dropped to zero. The application must initialize zalloc, zfree and
-   --  opaque before calling the init function.
-
-   procedure Set_In
-     (Strm   : in out Z_Stream;
-      Buffer : in Voidp;
-      Size   : in UInt);
-   pragma Inline (Set_In);
-
-   procedure Set_Out
-     (Strm   : in out Z_Stream;
-      Buffer : in Voidp;
-      Size   : in UInt);
-   pragma Inline (Set_Out);
-
-   procedure Set_Mem_Func
-     (Strm   : in out Z_Stream;
-      Opaque : in Voidp;
-      Alloc  : in alloc_func;
-      Free   : in free_func);
-   pragma Inline (Set_Mem_Func);
-
-   function Last_Error_Message (Strm : in Z_Stream) return String;
-   pragma Inline (Last_Error_Message);
-
-   function Avail_Out (Strm : in Z_Stream) return UInt;
-   pragma Inline (Avail_Out);
-
-   function Avail_In (Strm : in Z_Stream) return UInt;
-   pragma Inline (Avail_In);
-
-   function Total_In (Strm : in Z_Stream) return ULong;
-   pragma Inline (Total_In);
-
-   function Total_Out (Strm : in Z_Stream) return ULong;
-   pragma Inline (Total_Out);
-
-   function inflateCopy
-     (dest   : in Z_Streamp;
-      Source : in Z_Streamp)
-      return Int;
-
-   function compressBound (Source_Len : in ULong) return ULong;
-
-   function deflateBound
-     (Strm       : in Z_Streamp;
-      Source_Len : in ULong)
-      return     ULong;
-
-   function gzungetc (C : in Int; File : in  gzFile) return Int;
-
-   function zlibCompileFlags return ULong;
-
-private
-
-   type Z_Stream is record            -- zlib.h:68
-      Next_In   : Voidp      := Nul;  -- next input byte
-      Avail_In  : UInt       := 0;    -- number of bytes available at next_in
-      Total_In  : ULong      := 0;    -- total nb of input bytes read so far
-      Next_Out  : Voidp      := Nul;  -- next output byte should be put there
-      Avail_Out : UInt       := 0;    -- remaining free space at next_out
-      Total_Out : ULong      := 0;    -- total nb of bytes output so far
-      msg       : Chars_Ptr;          -- last error message, NULL if no error
-      state     : Voidp;              -- not visible by applications
-      zalloc    : alloc_func := null; -- used to allocate the internal state
-      zfree     : free_func  := null; -- used to free the internal state
-      opaque    : Voidp;              -- private data object passed to
-                                      --  zalloc and zfree
-      data_type : Int;                -- best guess about the data type:
-                                      --  ascii or binary
-      adler     : ULong;              -- adler32 value of the uncompressed
-                                      --  data
-      reserved  : ULong;              -- reserved for future use
-   end record;
-
-   pragma Convention (C, Z_Stream);
-
-   pragma Import (C, zlibVersion, "zlibVersion");
-   pragma Import (C, Deflate, "deflate");
-   pragma Import (C, DeflateEnd, "deflateEnd");
-   pragma Import (C, Inflate, "inflate");
-   pragma Import (C, InflateEnd, "inflateEnd");
-   pragma Import (C, deflateSetDictionary, "deflateSetDictionary");
-   pragma Import (C, deflateCopy, "deflateCopy");
-   pragma Import (C, deflateReset, "deflateReset");
-   pragma Import (C, deflateParams, "deflateParams");
-   pragma Import (C, inflateSetDictionary, "inflateSetDictionary");
-   pragma Import (C, inflateSync, "inflateSync");
-   pragma Import (C, inflateReset, "inflateReset");
-   pragma Import (C, compress, "compress");
-   pragma Import (C, compress2, "compress2");
-   pragma Import (C, uncompress, "uncompress");
-   pragma Import (C, gzopen, "gzopen");
-   pragma Import (C, gzdopen, "gzdopen");
-   pragma Import (C, gzsetparams, "gzsetparams");
-   pragma Import (C, gzread, "gzread");
-   pragma Import (C, gzwrite, "gzwrite");
-   pragma Import (C, gzprintf, "gzprintf");
-   pragma Import (C, gzputs, "gzputs");
-   pragma Import (C, gzgets, "gzgets");
-   pragma Import (C, gzputc, "gzputc");
-   pragma Import (C, gzgetc, "gzgetc");
-   pragma Import (C, gzflush, "gzflush");
-   pragma Import (C, gzseek, "gzseek");
-   pragma Import (C, gzrewind, "gzrewind");
-   pragma Import (C, gztell, "gztell");
-   pragma Import (C, gzeof, "gzeof");
-   pragma Import (C, gzclose, "gzclose");
-   pragma Import (C, gzerror, "gzerror");
-   pragma Import (C, adler32, "adler32");
-   pragma Import (C, crc32, "crc32");
-   pragma Import (C, deflateInit, "deflateInit_");
-   pragma Import (C, inflateInit, "inflateInit_");
-   pragma Import (C, deflateInit2, "deflateInit2_");
-   pragma Import (C, inflateInit2, "inflateInit2_");
-   pragma Import (C, zError, "zError");
-   pragma Import (C, inflateSyncPoint, "inflateSyncPoint");
-   pragma Import (C, get_crc_table, "get_crc_table");
-
-   --  since zlib 1.2.0:
-
-   pragma Import (C, inflateCopy, "inflateCopy");
-   pragma Import (C, compressBound, "compressBound");
-   pragma Import (C, deflateBound, "deflateBound");
-   pragma Import (C, gzungetc, "gzungetc");
-   pragma Import (C, zlibCompileFlags, "zlibCompileFlags");
-
-   pragma Import (C, inflateBackInit, "inflateBackInit_");
-
-   --  I stopped binding the inflateBack routines, because realize that
-   --  it does not support zlib and gzip headers for now, and have no
-   --  symmetric deflateBack routines.
-   --  ZLib-Ada is symmetric regarding deflate/inflate data transformation
-   --  and has a similar generic callback interface for the
-   --  deflate/inflate transformation based on the regular Deflate/Inflate
-   --  routines.
-
-   --  pragma Import (C, inflateBack, "inflateBack");
-   --  pragma Import (C, inflateBackEnd, "inflateBackEnd");
-
-end ZLib.Thin;
diff --git a/src/png/zlib/contrib/ada/zlib.adb b/src/png/zlib/contrib/ada/zlib.adb
deleted file mode 100644
index 8b6fd686a..000000000
--- a/src/png/zlib/contrib/ada/zlib.adb
+++ /dev/null
@@ -1,701 +0,0 @@
-----------------------------------------------------------------
---  ZLib for Ada thick binding.                               --
---                                                            --
---  Copyright (C) 2002-2004 Dmitriy Anisimkov                 --
---                                                            --
---  Open source license information is in the zlib.ads file.  --
-----------------------------------------------------------------
-
---  $Id: zlib.adb,v 1.31 2004/09/06 06:53:19 vagul Exp $
-
-with Ada.Exceptions;
-with Ada.Unchecked_Conversion;
-with Ada.Unchecked_Deallocation;
-
-with Interfaces.C.Strings;
-
-with ZLib.Thin;
-
-package body ZLib is
-
-   use type Thin.Int;
-
-   type Z_Stream is new Thin.Z_Stream;
-
-   type Return_Code_Enum is
-      (OK,
-       STREAM_END,
-       NEED_DICT,
-       ERRNO,
-       STREAM_ERROR,
-       DATA_ERROR,
-       MEM_ERROR,
-       BUF_ERROR,
-       VERSION_ERROR);
-
-   type Flate_Step_Function is access
-     function (Strm : in Thin.Z_Streamp; Flush : in Thin.Int) return Thin.Int;
-   pragma Convention (C, Flate_Step_Function);
-
-   type Flate_End_Function is access
-      function (Ctrm : in Thin.Z_Streamp) return Thin.Int;
-   pragma Convention (C, Flate_End_Function);
-
-   type Flate_Type is record
-      Step : Flate_Step_Function;
-      Done : Flate_End_Function;
-   end record;
-
-   subtype Footer_Array is Stream_Element_Array (1 .. 8);
-
-   Simple_GZip_Header : constant Stream_Element_Array (1 .. 10)
-     := (16#1f#, 16#8b#,                 --  Magic header
-         16#08#,                         --  Z_DEFLATED
-         16#00#,                         --  Flags
-         16#00#, 16#00#, 16#00#, 16#00#, --  Time
-         16#00#,                         --  XFlags
-         16#03#                          --  OS code
-        );
-   --  The simplest gzip header is not for informational, but just for
-   --  gzip format compatibility.
-   --  Note that some code below is using assumption
-   --  Simple_GZip_Header'Last > Footer_Array'Last, so do not make
-   --  Simple_GZip_Header'Last <= Footer_Array'Last.
-
-   Return_Code : constant array (Thin.Int range <>) of Return_Code_Enum
-     := (0 => OK,
-         1 => STREAM_END,
-         2 => NEED_DICT,
-        -1 => ERRNO,
-        -2 => STREAM_ERROR,
-        -3 => DATA_ERROR,
-        -4 => MEM_ERROR,
-        -5 => BUF_ERROR,
-        -6 => VERSION_ERROR);
-
-   Flate : constant array (Boolean) of Flate_Type
-     := (True  => (Step => Thin.Deflate'Access,
-                   Done => Thin.DeflateEnd'Access),
-         False => (Step => Thin.Inflate'Access,
-                   Done => Thin.InflateEnd'Access));
-
-   Flush_Finish : constant array (Boolean) of Flush_Mode
-     := (True => Finish, False => No_Flush);
-
-   procedure Raise_Error (Stream : in Z_Stream);
-   pragma Inline (Raise_Error);
-
-   procedure Raise_Error (Message : in String);
-   pragma Inline (Raise_Error);
-
-   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int);
-
-   procedure Free is new Ada.Unchecked_Deallocation
-      (Z_Stream, Z_Stream_Access);
-
-   function To_Thin_Access is new Ada.Unchecked_Conversion
-     (Z_Stream_Access, Thin.Z_Streamp);
-
-   procedure Translate_GZip
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   --  Separate translate routine for make gzip header.
-
-   procedure Translate_Auto
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   --  translate routine without additional headers.
-
-   -----------------
-   -- Check_Error --
-   -----------------
-
-   procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int) is
-      use type Thin.Int;
-   begin
-      if Code /= Thin.Z_OK then
-         Raise_Error
-            (Return_Code_Enum'Image (Return_Code (Code))
-              & ": " & Last_Error_Message (Stream));
-      end if;
-   end Check_Error;
-
-   -----------
-   -- Close --
-   -----------
-
-   procedure Close
-     (Filter       : in out Filter_Type;
-      Ignore_Error : in     Boolean := False)
-   is
-      Code : Thin.Int;
-   begin
-      if not Ignore_Error and then not Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      Code := Flate (Filter.Compression).Done (To_Thin_Access (Filter.Strm));
-
-      if Ignore_Error or else Code = Thin.Z_OK then
-         Free (Filter.Strm);
-      else
-         declare
-            Error_Message : constant String
-              := Last_Error_Message (Filter.Strm.all);
-         begin
-            Free (Filter.Strm);
-            Ada.Exceptions.Raise_Exception
-               (ZLib_Error'Identity,
-                Return_Code_Enum'Image (Return_Code (Code))
-                  & ": " & Error_Message);
-         end;
-      end if;
-   end Close;
-
-   -----------
-   -- CRC32 --
-   -----------
-
-   function CRC32
-     (CRC  : in Unsigned_32;
-      Data : in Ada.Streams.Stream_Element_Array)
-      return Unsigned_32
-   is
-      use Thin;
-   begin
-      return Unsigned_32 (crc32 (ULong (CRC),
-                                 Data'Address,
-                                 Data'Length));
-   end CRC32;
-
-   procedure CRC32
-     (CRC  : in out Unsigned_32;
-      Data : in     Ada.Streams.Stream_Element_Array) is
-   begin
-      CRC := CRC32 (CRC, Data);
-   end CRC32;
-
-   ------------------
-   -- Deflate_Init --
-   ------------------
-
-   procedure Deflate_Init
-     (Filter       : in out Filter_Type;
-      Level        : in     Compression_Level  := Default_Compression;
-      Strategy     : in     Strategy_Type      := Default_Strategy;
-      Method       : in     Compression_Method := Deflated;
-      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
-      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
-      Header       : in     Header_Type        := Default)
-   is
-      use type Thin.Int;
-      Win_Bits : Thin.Int := Thin.Int (Window_Bits);
-   begin
-      if Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      --  We allow ZLib to make header only in case of default header type.
-      --  Otherwise we would either do header by ourselfs, or do not do
-      --  header at all.
-
-      if Header = None or else Header = GZip then
-         Win_Bits := -Win_Bits;
-      end if;
-
-      --  For the GZip CRC calculation and make headers.
-
-      if Header = GZip then
-         Filter.CRC    := 0;
-         Filter.Offset := Simple_GZip_Header'First;
-      else
-         Filter.Offset := Simple_GZip_Header'Last + 1;
-      end if;
-
-      Filter.Strm        := new Z_Stream;
-      Filter.Compression := True;
-      Filter.Stream_End  := False;
-      Filter.Header      := Header;
-
-      if Thin.Deflate_Init
-           (To_Thin_Access (Filter.Strm),
-            Level      => Thin.Int (Level),
-            method     => Thin.Int (Method),
-            windowBits => Win_Bits,
-            memLevel   => Thin.Int (Memory_Level),
-            strategy   => Thin.Int (Strategy)) /= Thin.Z_OK
-      then
-         Raise_Error (Filter.Strm.all);
-      end if;
-   end Deflate_Init;
-
-   -----------
-   -- Flush --
-   -----------
-
-   procedure Flush
-     (Filter    : in out Filter_Type;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode)
-   is
-      No_Data : Stream_Element_Array := (1 .. 0 => 0);
-      Last    : Stream_Element_Offset;
-   begin
-      Translate (Filter, No_Data, Last, Out_Data, Out_Last, Flush);
-   end Flush;
-
-   -----------------------
-   -- Generic_Translate --
-   -----------------------
-
-   procedure Generic_Translate
-     (Filter          : in out ZLib.Filter_Type;
-      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
-      Out_Buffer_Size : in     Integer := Default_Buffer_Size)
-   is
-      In_Buffer  : Stream_Element_Array
-                     (1 .. Stream_Element_Offset (In_Buffer_Size));
-      Out_Buffer : Stream_Element_Array
-                     (1 .. Stream_Element_Offset (Out_Buffer_Size));
-      Last       : Stream_Element_Offset;
-      In_Last    : Stream_Element_Offset;
-      In_First   : Stream_Element_Offset;
-      Out_Last   : Stream_Element_Offset;
-   begin
-      Main : loop
-         Data_In (In_Buffer, Last);
-
-         In_First := In_Buffer'First;
-
-         loop
-            Translate
-              (Filter   => Filter,
-               In_Data  => In_Buffer (In_First .. Last),
-               In_Last  => In_Last,
-               Out_Data => Out_Buffer,
-               Out_Last => Out_Last,
-               Flush    => Flush_Finish (Last < In_Buffer'First));
-
-            if Out_Buffer'First <= Out_Last then
-               Data_Out (Out_Buffer (Out_Buffer'First .. Out_Last));
-            end if;
-
-            exit Main when Stream_End (Filter);
-
-            --  The end of in buffer.
-
-            exit when In_Last = Last;
-
-            In_First := In_Last + 1;
-         end loop;
-      end loop Main;
-
-   end Generic_Translate;
-
-   ------------------
-   -- Inflate_Init --
-   ------------------
-
-   procedure Inflate_Init
-     (Filter      : in out Filter_Type;
-      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
-      Header      : in     Header_Type      := Default)
-   is
-      use type Thin.Int;
-      Win_Bits : Thin.Int := Thin.Int (Window_Bits);
-
-      procedure Check_Version;
-      --  Check the latest header types compatibility.
-
-      procedure Check_Version is
-      begin
-         if Version <= "1.1.4" then
-            Raise_Error
-              ("Inflate header type " & Header_Type'Image (Header)
-               & " incompatible with ZLib version " & Version);
-         end if;
-      end Check_Version;
-
-   begin
-      if Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      case Header is
-         when None =>
-            Check_Version;
-
-            --  Inflate data without headers determined
-            --  by negative Win_Bits.
-
-            Win_Bits := -Win_Bits;
-         when GZip =>
-            Check_Version;
-
-            --  Inflate gzip data defined by flag 16.
-
-            Win_Bits := Win_Bits + 16;
-         when Auto =>
-            Check_Version;
-
-            --  Inflate with automatic detection
-            --  of gzip or native header defined by flag 32.
-
-            Win_Bits := Win_Bits + 32;
-         when Default => null;
-      end case;
-
-      Filter.Strm        := new Z_Stream;
-      Filter.Compression := False;
-      Filter.Stream_End  := False;
-      Filter.Header      := Header;
-
-      if Thin.Inflate_Init
-         (To_Thin_Access (Filter.Strm), Win_Bits) /= Thin.Z_OK
-      then
-         Raise_Error (Filter.Strm.all);
-      end if;
-   end Inflate_Init;
-
-   -------------
-   -- Is_Open --
-   -------------
-
-   function Is_Open (Filter : in Filter_Type) return Boolean is
-   begin
-      return Filter.Strm /= null;
-   end Is_Open;
-
-   -----------------
-   -- Raise_Error --
-   -----------------
-
-   procedure Raise_Error (Message : in String) is
-   begin
-      Ada.Exceptions.Raise_Exception (ZLib_Error'Identity, Message);
-   end Raise_Error;
-
-   procedure Raise_Error (Stream : in Z_Stream) is
-   begin
-      Raise_Error (Last_Error_Message (Stream));
-   end Raise_Error;
-
-   ----------
-   -- Read --
-   ----------
-
-   procedure Read
-     (Filter : in out Filter_Type;
-      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset;
-      Flush  : in     Flush_Mode := No_Flush)
-   is
-      In_Last    : Stream_Element_Offset;
-      Item_First : Ada.Streams.Stream_Element_Offset := Item'First;
-      V_Flush    : Flush_Mode := Flush;
-
-   begin
-      pragma Assert (Rest_First in Buffer'First .. Buffer'Last + 1);
-      pragma Assert (Rest_Last in Buffer'First - 1 .. Buffer'Last);
-
-      loop
-         if Rest_Last = Buffer'First - 1 then
-            V_Flush := Finish;
-
-         elsif Rest_First > Rest_Last then
-            Read (Buffer, Rest_Last);
-            Rest_First := Buffer'First;
-
-            if Rest_Last < Buffer'First then
-               V_Flush := Finish;
-            end if;
-         end if;
-
-         Translate
-           (Filter   => Filter,
-            In_Data  => Buffer (Rest_First .. Rest_Last),
-            In_Last  => In_Last,
-            Out_Data => Item (Item_First .. Item'Last),
-            Out_Last => Last,
-            Flush    => V_Flush);
-
-         Rest_First := In_Last + 1;
-
-         exit when Stream_End (Filter)
-           or else Last = Item'Last
-           or else (Last >= Item'First and then Allow_Read_Some);
-
-         Item_First := Last + 1;
-      end loop;
-   end Read;
-
-   ----------------
-   -- Stream_End --
-   ----------------
-
-   function Stream_End (Filter : in Filter_Type) return Boolean is
-   begin
-      if Filter.Header = GZip and Filter.Compression then
-         return Filter.Stream_End
-            and then Filter.Offset = Footer_Array'Last + 1;
-      else
-         return Filter.Stream_End;
-      end if;
-   end Stream_End;
-
-   --------------
-   -- Total_In --
-   --------------
-
-   function Total_In (Filter : in Filter_Type) return Count is
-   begin
-      return Count (Thin.Total_In (To_Thin_Access (Filter.Strm).all));
-   end Total_In;
-
-   ---------------
-   -- Total_Out --
-   ---------------
-
-   function Total_Out (Filter : in Filter_Type) return Count is
-   begin
-      return Count (Thin.Total_Out (To_Thin_Access (Filter.Strm).all));
-   end Total_Out;
-
-   ---------------
-   -- Translate --
-   ---------------
-
-   procedure Translate
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode) is
-   begin
-      if Filter.Header = GZip and then Filter.Compression then
-         Translate_GZip
-           (Filter   => Filter,
-            In_Data  => In_Data,
-            In_Last  => In_Last,
-            Out_Data => Out_Data,
-            Out_Last => Out_Last,
-            Flush    => Flush);
-      else
-         Translate_Auto
-           (Filter   => Filter,
-            In_Data  => In_Data,
-            In_Last  => In_Last,
-            Out_Data => Out_Data,
-            Out_Last => Out_Last,
-            Flush    => Flush);
-      end if;
-   end Translate;
-
-   --------------------
-   -- Translate_Auto --
-   --------------------
-
-   procedure Translate_Auto
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode)
-   is
-      use type Thin.Int;
-      Code : Thin.Int;
-
-   begin
-      if not Is_Open (Filter) then
-         raise Status_Error;
-      end if;
-
-      if Out_Data'Length = 0 and then In_Data'Length = 0 then
-         raise Constraint_Error;
-      end if;
-
-      Set_Out (Filter.Strm.all, Out_Data'Address, Out_Data'Length);
-      Set_In  (Filter.Strm.all, In_Data'Address, In_Data'Length);
-
-      Code := Flate (Filter.Compression).Step
-        (To_Thin_Access (Filter.Strm),
-         Thin.Int (Flush));
-
-      if Code = Thin.Z_STREAM_END then
-         Filter.Stream_End := True;
-      else
-         Check_Error (Filter.Strm.all, Code);
-      end if;
-
-      In_Last  := In_Data'Last
-         - Stream_Element_Offset (Avail_In (Filter.Strm.all));
-      Out_Last := Out_Data'Last
-         - Stream_Element_Offset (Avail_Out (Filter.Strm.all));
-   end Translate_Auto;
-
-   --------------------
-   -- Translate_GZip --
-   --------------------
-
-   procedure Translate_GZip
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode)
-   is
-      Out_First : Stream_Element_Offset;
-
-      procedure Add_Data (Data : in Stream_Element_Array);
-      --  Add data to stream from the Filter.Offset till necessary,
-      --  used for add gzip headr/footer.
-
-      procedure Put_32
-        (Item : in out Stream_Element_Array;
-         Data : in     Unsigned_32);
-      pragma Inline (Put_32);
-
-      --------------
-      -- Add_Data --
-      --------------
-
-      procedure Add_Data (Data : in Stream_Element_Array) is
-         Data_First : Stream_Element_Offset renames Filter.Offset;
-         Data_Last  : Stream_Element_Offset;
-         Data_Len   : Stream_Element_Offset; --  -1
-         Out_Len    : Stream_Element_Offset; --  -1
-      begin
-         Out_First := Out_Last + 1;
-
-         if Data_First > Data'Last then
-            return;
-         end if;
-
-         Data_Len  := Data'Last     - Data_First;
-         Out_Len   := Out_Data'Last - Out_First;
-
-         if Data_Len <= Out_Len then
-            Out_Last  := Out_First  + Data_Len;
-            Data_Last := Data'Last;
-         else
-            Out_Last  := Out_Data'Last;
-            Data_Last := Data_First + Out_Len;
-         end if;
-
-         Out_Data (Out_First .. Out_Last) := Data (Data_First .. Data_Last);
-
-         Data_First := Data_Last + 1;
-         Out_First  := Out_Last + 1;
-      end Add_Data;
-
-      ------------
-      -- Put_32 --
-      ------------
-
-      procedure Put_32
-        (Item : in out Stream_Element_Array;
-         Data : in     Unsigned_32)
-      is
-         D : Unsigned_32 := Data;
-      begin
-         for J in Item'First .. Item'First + 3 loop
-            Item (J) := Stream_Element (D and 16#FF#);
-            D := Shift_Right (D, 8);
-         end loop;
-      end Put_32;
-
-   begin
-      Out_Last := Out_Data'First - 1;
-
-      if not Filter.Stream_End then
-         Add_Data (Simple_GZip_Header);
-
-         Translate_Auto
-           (Filter   => Filter,
-            In_Data  => In_Data,
-            In_Last  => In_Last,
-            Out_Data => Out_Data (Out_First .. Out_Data'Last),
-            Out_Last => Out_Last,
-            Flush    => Flush);
-
-         CRC32 (Filter.CRC, In_Data (In_Data'First .. In_Last));
-      end if;
-
-      if Filter.Stream_End and then Out_Last <= Out_Data'Last then
-         --  This detection method would work only when
-         --  Simple_GZip_Header'Last > Footer_Array'Last
-
-         if Filter.Offset = Simple_GZip_Header'Last + 1 then
-            Filter.Offset := Footer_Array'First;
-         end if;
-
-         declare
-            Footer : Footer_Array;
-         begin
-            Put_32 (Footer, Filter.CRC);
-            Put_32 (Footer (Footer'First + 4 .. Footer'Last),
-                    Unsigned_32 (Total_In (Filter)));
-            Add_Data (Footer);
-         end;
-      end if;
-   end Translate_GZip;
-
-   -------------
-   -- Version --
-   -------------
-
-   function Version return String is
-   begin
-      return Interfaces.C.Strings.Value (Thin.zlibVersion);
-   end Version;
-
-   -----------
-   -- Write --
-   -----------
-
-   procedure Write
-     (Filter : in out Filter_Type;
-      Item   : in     Ada.Streams.Stream_Element_Array;
-      Flush  : in     Flush_Mode := No_Flush)
-   is
-      Buffer   : Stream_Element_Array (1 .. Buffer_Size);
-      In_Last  : Stream_Element_Offset;
-      Out_Last : Stream_Element_Offset;
-      In_First : Stream_Element_Offset := Item'First;
-   begin
-      if Item'Length = 0 and Flush = No_Flush then
-         return;
-      end if;
-
-      loop
-         Translate
-           (Filter   => Filter,
-            In_Data  => Item (In_First .. Item'Last),
-            In_Last  => In_Last,
-            Out_Data => Buffer,
-            Out_Last => Out_Last,
-            Flush    => Flush);
-
-         if Out_Last >= Buffer'First then
-            Write (Buffer (1 .. Out_Last));
-         end if;
-
-         exit when In_Last = Item'Last or Stream_End (Filter);
-
-         In_First := In_Last + 1;
-      end loop;
-   end Write;
-
-end ZLib;
diff --git a/src/png/zlib/contrib/ada/zlib.ads b/src/png/zlib/contrib/ada/zlib.ads
deleted file mode 100644
index 79ffc4095..000000000
--- a/src/png/zlib/contrib/ada/zlib.ads
+++ /dev/null
@@ -1,328 +0,0 @@
-------------------------------------------------------------------------------
---                      ZLib for Ada thick binding.                         --
---                                                                          --
---              Copyright (C) 2002-2004 Dmitriy Anisimkov                   --
---                                                                          --
---  This library is free software; you can redistribute it and/or modify    --
---  it under the terms of the GNU General Public License as published by    --
---  the Free Software Foundation; either version 2 of the License, or (at   --
---  your option) any later version.                                         --
---                                                                          --
---  This library is distributed in the hope that it will be useful, but     --
---  WITHOUT ANY WARRANTY; without even the implied warranty of              --
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       --
---  General Public License for more details.                                --
---                                                                          --
---  You should have received a copy of the GNU General Public License       --
---  along with this library; if not, write to the Free Software Foundation, --
---  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.          --
---                                                                          --
---  As a special exception, if other files instantiate generics from this   --
---  unit, or you link this unit with other files to produce an executable,  --
---  this  unit  does not  by itself cause  the resulting executable to be   --
---  covered by the GNU General Public License. This exception does not      --
---  however invalidate any other reasons why the executable file  might be  --
---  covered by the  GNU Public License.                                     --
-------------------------------------------------------------------------------
-
---  $Id: zlib.ads,v 1.26 2004/09/06 06:53:19 vagul Exp $
-
-with Ada.Streams;
-
-with Interfaces;
-
-package ZLib is
-
-   ZLib_Error   : exception;
-   Status_Error : exception;
-
-   type Compression_Level is new Integer range -1 .. 9;
-
-   type Flush_Mode is private;
-
-   type Compression_Method is private;
-
-   type Window_Bits_Type is new Integer range 8 .. 15;
-
-   type Memory_Level_Type is new Integer range 1 .. 9;
-
-   type Unsigned_32 is new Interfaces.Unsigned_32;
-
-   type Strategy_Type is private;
-
-   type Header_Type is (None, Auto, Default, GZip);
-   --  Header type usage have a some limitation for inflate.
-   --  See comment for Inflate_Init.
-
-   subtype Count is Ada.Streams.Stream_Element_Count;
-
-   Default_Memory_Level : constant Memory_Level_Type := 8;
-   Default_Window_Bits  : constant Window_Bits_Type  := 15;
-
-   ----------------------------------
-   -- Compression method constants --
-   ----------------------------------
-
-   Deflated : constant Compression_Method;
-   --  Only one method allowed in this ZLib version
-
-   ---------------------------------
-   -- Compression level constants --
-   ---------------------------------
-
-   No_Compression      : constant Compression_Level := 0;
-   Best_Speed          : constant Compression_Level := 1;
-   Best_Compression    : constant Compression_Level := 9;
-   Default_Compression : constant Compression_Level := -1;
-
-   --------------------------
-   -- Flush mode constants --
-   --------------------------
-
-   No_Flush      : constant Flush_Mode;
-   --  Regular way for compression, no flush
-
-   Partial_Flush : constant Flush_Mode;
-   --  Will be removed, use Z_SYNC_FLUSH instead
-
-   Sync_Flush    : constant Flush_Mode;
-   --  All pending output is flushed to the output buffer and the output
-   --  is aligned on a byte boundary, so that the decompressor can get all
-   --  input data available so far. (In particular avail_in is zero after the
-   --  call if enough output space has been provided  before the call.)
-   --  Flushing may degrade compression for some compression algorithms and so
-   --  it should be used only when necessary.
-
-   Block_Flush   : constant Flush_Mode;
-   --  Z_BLOCK requests that inflate() stop
-   --  if and when it get to the next deflate block boundary. When decoding the
-   --  zlib or gzip format, this will cause inflate() to return immediately
-   --  after the header and before the first block. When doing a raw inflate,
-   --  inflate() will go ahead and process the first block, and will return
-   --  when it gets to the end of that block, or when it runs out of data.
-
-   Full_Flush    : constant Flush_Mode;
-   --  All output is flushed as with SYNC_FLUSH, and the compression state
-   --  is reset so that decompression can restart from this point if previous
-   --  compressed data has been damaged or if random access is desired. Using
-   --  Full_Flush too often can seriously degrade the compression.
-
-   Finish        : constant Flush_Mode;
-   --  Just for tell the compressor that input data is complete.
-
-   ------------------------------------
-   -- Compression strategy constants --
-   ------------------------------------
-
-   --  RLE stategy could be used only in version 1.2.0 and later.
-
-   Filtered         : constant Strategy_Type;
-   Huffman_Only     : constant Strategy_Type;
-   RLE              : constant Strategy_Type;
-   Default_Strategy : constant Strategy_Type;
-
-   Default_Buffer_Size : constant := 4096;
-
-   type Filter_Type is tagged limited private;
-   --  The filter is for compression and for decompression.
-   --  The usage of the type is depend of its initialization.
-
-   function Version return String;
-   pragma Inline (Version);
-   --  Return string representation of the ZLib version.
-
-   procedure Deflate_Init
-     (Filter       : in out Filter_Type;
-      Level        : in     Compression_Level  := Default_Compression;
-      Strategy     : in     Strategy_Type      := Default_Strategy;
-      Method       : in     Compression_Method := Deflated;
-      Window_Bits  : in     Window_Bits_Type   := Default_Window_Bits;
-      Memory_Level : in     Memory_Level_Type  := Default_Memory_Level;
-      Header       : in     Header_Type        := Default);
-   --  Compressor initialization.
-   --  When Header parameter is Auto or Default, then default zlib header
-   --  would be provided for compressed data.
-   --  When Header is GZip, then gzip header would be set instead of
-   --  default header.
-   --  When Header is None, no header would be set for compressed data.
-
-   procedure Inflate_Init
-     (Filter      : in out Filter_Type;
-      Window_Bits : in     Window_Bits_Type := Default_Window_Bits;
-      Header      : in     Header_Type      := Default);
-   --  Decompressor initialization.
-   --  Default header type mean that ZLib default header is expecting in the
-   --  input compressed stream.
-   --  Header type None mean that no header is expecting in the input stream.
-   --  GZip header type mean that GZip header is expecting in the
-   --  input compressed stream.
-   --  Auto header type mean that header type (GZip or Native) would be
-   --  detected automatically in the input stream.
-   --  Note that header types parameter values None, GZip and Auto are
-   --  supported for inflate routine only in ZLib versions 1.2.0.2 and later.
-   --  Deflate_Init is supporting all header types.
-
-   function Is_Open (Filter : in Filter_Type) return Boolean;
-   pragma Inline (Is_Open);
-   --  Is the filter opened for compression or decompression.
-
-   procedure Close
-     (Filter       : in out Filter_Type;
-      Ignore_Error : in     Boolean := False);
-   --  Closing the compression or decompressor.
-   --  If stream is closing before the complete and Ignore_Error is False,
-   --  The exception would be raised.
-
-   generic
-      with procedure Data_In
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset);
-      with procedure Data_Out
-        (Item : in Ada.Streams.Stream_Element_Array);
-   procedure Generic_Translate
-     (Filter          : in out Filter_Type;
-      In_Buffer_Size  : in     Integer := Default_Buffer_Size;
-      Out_Buffer_Size : in     Integer := Default_Buffer_Size);
-   --  Compress/decompress data fetch from Data_In routine and pass the result
-   --  to the Data_Out routine. User should provide Data_In and Data_Out
-   --  for compression/decompression data flow.
-   --  Compression or decompression depend on Filter initialization.
-
-   function Total_In (Filter : in Filter_Type) return Count;
-   pragma Inline (Total_In);
-   --  Returns total number of input bytes read so far
-
-   function Total_Out (Filter : in Filter_Type) return Count;
-   pragma Inline (Total_Out);
-   --  Returns total number of bytes output so far
-
-   function CRC32
-     (CRC    : in Unsigned_32;
-      Data   : in Ada.Streams.Stream_Element_Array)
-      return Unsigned_32;
-   pragma Inline (CRC32);
-   --  Compute CRC32, it could be necessary for make gzip format
-
-   procedure CRC32
-     (CRC  : in out Unsigned_32;
-      Data : in     Ada.Streams.Stream_Element_Array);
-   pragma Inline (CRC32);
-   --  Compute CRC32, it could be necessary for make gzip format
-
-   -------------------------------------------------
-   --  Below is more complex low level routines.  --
-   -------------------------------------------------
-
-   procedure Translate
-     (Filter    : in out Filter_Type;
-      In_Data   : in     Ada.Streams.Stream_Element_Array;
-      In_Last   :    out Ada.Streams.Stream_Element_Offset;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   --  Compress/decompress the In_Data buffer and place the result into
-   --  Out_Data. In_Last is the index of last element from In_Data accepted by
-   --  the Filter. Out_Last is the last element of the received data from
-   --  Filter. To tell the filter that incoming data are complete put the
-   --  Flush parameter to Finish.
-
-   function Stream_End (Filter : in Filter_Type) return Boolean;
-   pragma Inline (Stream_End);
-   --  Return the true when the stream is complete.
-
-   procedure Flush
-     (Filter    : in out Filter_Type;
-      Out_Data  :    out Ada.Streams.Stream_Element_Array;
-      Out_Last  :    out Ada.Streams.Stream_Element_Offset;
-      Flush     : in     Flush_Mode);
-   pragma Inline (Flush);
-   --  Flushing the data from the compressor.
-
-   generic
-      with procedure Write
-        (Item : in Ada.Streams.Stream_Element_Array);
-      --  User should provide this routine for accept
-      --  compressed/decompressed data.
-
-      Buffer_Size : in Ada.Streams.Stream_Element_Offset
-         := Default_Buffer_Size;
-      --  Buffer size for Write user routine.
-
-   procedure Write
-     (Filter  : in out Filter_Type;
-      Item    : in     Ada.Streams.Stream_Element_Array;
-      Flush   : in     Flush_Mode := No_Flush);
-   --  Compress/Decompress data from Item to the generic parameter procedure
-   --  Write. Output buffer size could be set in Buffer_Size generic parameter.
-
-   generic
-      with procedure Read
-        (Item : out Ada.Streams.Stream_Element_Array;
-         Last : out Ada.Streams.Stream_Element_Offset);
-      --  User should provide data for compression/decompression
-      --  thru this routine.
-
-      Buffer : in out Ada.Streams.Stream_Element_Array;
-      --  Buffer for keep remaining data from the previous
-      --  back read.
-
-      Rest_First, Rest_Last : in out Ada.Streams.Stream_Element_Offset;
-      --  Rest_First have to be initialized to Buffer'Last + 1
-      --  Rest_Last have to be initialized to Buffer'Last
-      --  before usage.
-
-      Allow_Read_Some : in Boolean := False;
-      --  Is it allowed to return Last < Item'Last before end of data.
-
-   procedure Read
-     (Filter : in out Filter_Type;
-      Item   :    out Ada.Streams.Stream_Element_Array;
-      Last   :    out Ada.Streams.Stream_Element_Offset;
-      Flush  : in     Flush_Mode := No_Flush);
-   --  Compress/Decompress data from generic parameter procedure Read to the
-   --  Item. User should provide Buffer and initialized Rest_First, Rest_Last
-   --  indicators. If Allow_Read_Some is True, Read routines could return
-   --  Last < Item'Last only at end of stream.
-
-private
-
-   use Ada.Streams;
-
-   pragma Assert (Ada.Streams.Stream_Element'Size    =    8);
-   pragma Assert (Ada.Streams.Stream_Element'Modulus = 2**8);
-
-   type Flush_Mode is new Integer range 0 .. 5;
-
-   type Compression_Method is new Integer range 8 .. 8;
-
-   type Strategy_Type is new Integer range 0 .. 3;
-
-   No_Flush      : constant Flush_Mode := 0;
-   Partial_Flush : constant Flush_Mode := 1;
-   Sync_Flush    : constant Flush_Mode := 2;
-   Full_Flush    : constant Flush_Mode := 3;
-   Finish        : constant Flush_Mode := 4;
-   Block_Flush   : constant Flush_Mode := 5;
-
-   Filtered         : constant Strategy_Type := 1;
-   Huffman_Only     : constant Strategy_Type := 2;
-   RLE              : constant Strategy_Type := 3;
-   Default_Strategy : constant Strategy_Type := 0;
-
-   Deflated : constant Compression_Method := 8;
-
-   type Z_Stream;
-
-   type Z_Stream_Access is access all Z_Stream;
-
-   type Filter_Type is tagged limited record
-      Strm        : Z_Stream_Access;
-      Compression : Boolean;
-      Stream_End  : Boolean;
-      Header      : Header_Type;
-      CRC         : Unsigned_32;
-      Offset      : Stream_Element_Offset;
-      --  Offset for gzip header/footer output.
-   end record;
-
-end ZLib;
diff --git a/src/png/zlib/contrib/ada/zlib.gpr b/src/png/zlib/contrib/ada/zlib.gpr
deleted file mode 100644
index 296b22aa9..000000000
--- a/src/png/zlib/contrib/ada/zlib.gpr
+++ /dev/null
@@ -1,20 +0,0 @@
-project Zlib is
-
-   for Languages use ("Ada");
-   for Source_Dirs use (".");
-   for Object_Dir use ".";
-   for Main use ("test.adb", "mtest.adb", "read.adb", "buffer_demo");
-
-   package Compiler is
-      for Default_Switches ("ada") use ("-gnatwcfilopru", "-gnatVcdfimorst", "-gnatyabcefhiklmnoprst");
-   end Compiler;
-
-   package Linker is
-      for Default_Switches ("ada") use ("-lz");
-   end Linker;
-
-   package Builder is
-      for Default_Switches ("ada") use ("-s", "-gnatQ");
-   end Builder;
-
-end Zlib;
diff --git a/src/png/zlib/contrib/amd64/amd64-match.S b/src/png/zlib/contrib/amd64/amd64-match.S
deleted file mode 100644
index 81d4a1c94..000000000
--- a/src/png/zlib/contrib/amd64/amd64-match.S
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * match.S -- optimized version of longest_match()
- * based on the similar work by Gilles Vollant, and Brian Raiter, written 1998
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the BSD License. Use by owners of Che Guevarra
- * parafernalia is prohibited, where possible, and highly discouraged
- * elsewhere.
- */
-
-#ifndef NO_UNDERLINE
-#	define	match_init	_match_init
-#	define	longest_match	_longest_match
-#endif
-
-#define	scanend		ebx
-#define	scanendw	bx
-#define	chainlenwmask	edx /* high word: current chain len low word: s->wmask */
-#define	curmatch	rsi
-#define	curmatchd	esi
-#define	windowbestlen	r8
-#define	scanalign	r9
-#define	scanalignd	r9d
-#define	window		r10
-#define	bestlen		r11
-#define	bestlend	r11d
-#define	scanstart	r12d
-#define	scanstartw	r12w
-#define scan		r13
-#define nicematch	r14d
-#define	limit		r15
-#define	limitd		r15d
-#define prev		rcx
-
-/*
- * The 258 is a "magic number, not a parameter -- changing it
- * breaks the hell loose
- */
-#define	MAX_MATCH	(258)
-#define	MIN_MATCH	(3)
-#define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)
-#define	MAX_MATCH_8	((MAX_MATCH + 7) & ~7)
-
-/* stack frame offsets */
-#define	LocalVarsSize	(112)
-#define _chainlenwmask	( 8-LocalVarsSize)(%rsp)
-#define _windowbestlen	(16-LocalVarsSize)(%rsp)
-#define save_r14        (24-LocalVarsSize)(%rsp)
-#define save_rsi        (32-LocalVarsSize)(%rsp)
-#define save_rbx        (40-LocalVarsSize)(%rsp)
-#define save_r12        (56-LocalVarsSize)(%rsp)
-#define save_r13        (64-LocalVarsSize)(%rsp)
-#define save_r15        (80-LocalVarsSize)(%rsp)
-
-
-.globl	match_init, longest_match
-
-/*
- * On AMD64 the first argument of a function (in our case -- the pointer to
- * deflate_state structure) is passed in %rdi, hence our offsets below are
- * all off of that.
- */
-
-/* you can check the structure offset by running
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "deflate.h"
-
-void print_depl()
-{
-deflate_state ds;
-deflate_state *s=&ds;
-printf("size pointer=%u\n",(int)sizeof(void*));
-
-printf("#define dsWSize         (%3u)(%%rdi)\n",(int)(((char*)&(s->w_size))-((char*)s)));
-printf("#define dsWMask         (%3u)(%%rdi)\n",(int)(((char*)&(s->w_mask))-((char*)s)));
-printf("#define dsWindow        (%3u)(%%rdi)\n",(int)(((char*)&(s->window))-((char*)s)));
-printf("#define dsPrev          (%3u)(%%rdi)\n",(int)(((char*)&(s->prev))-((char*)s)));
-printf("#define dsMatchLen      (%3u)(%%rdi)\n",(int)(((char*)&(s->match_length))-((char*)s)));
-printf("#define dsPrevMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->prev_match))-((char*)s)));
-printf("#define dsStrStart      (%3u)(%%rdi)\n",(int)(((char*)&(s->strstart))-((char*)s)));
-printf("#define dsMatchStart    (%3u)(%%rdi)\n",(int)(((char*)&(s->match_start))-((char*)s)));
-printf("#define dsLookahead     (%3u)(%%rdi)\n",(int)(((char*)&(s->lookahead))-((char*)s)));
-printf("#define dsPrevLen       (%3u)(%%rdi)\n",(int)(((char*)&(s->prev_length))-((char*)s)));
-printf("#define dsMaxChainLen   (%3u)(%%rdi)\n",(int)(((char*)&(s->max_chain_length))-((char*)s)));
-printf("#define dsGoodMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->good_match))-((char*)s)));
-printf("#define dsNiceMatch     (%3u)(%%rdi)\n",(int)(((char*)&(s->nice_match))-((char*)s)));
-}
-
-*/
-
-
-/*
-  to compile for XCode 3.2 on MacOSX x86_64
-  - run "gcc -g -c -DXCODE_MAC_X64_STRUCTURE amd64-match.S"
- */
-
-
-#ifndef CURRENT_LINX_XCODE_MAC_X64_STRUCTURE
-#define dsWSize		( 68)(%rdi)
-#define dsWMask		( 76)(%rdi)
-#define dsWindow	( 80)(%rdi)
-#define dsPrev		( 96)(%rdi)
-#define dsMatchLen	(144)(%rdi)
-#define dsPrevMatch	(148)(%rdi)
-#define dsStrStart	(156)(%rdi)
-#define dsMatchStart	(160)(%rdi)
-#define dsLookahead	(164)(%rdi)
-#define dsPrevLen	(168)(%rdi)
-#define dsMaxChainLen	(172)(%rdi)
-#define dsGoodMatch	(188)(%rdi)
-#define dsNiceMatch	(192)(%rdi)
-
-#else 
-
-#ifndef STRUCT_OFFSET
-#	define STRUCT_OFFSET	(0)
-#endif
-
-
-#define dsWSize		( 56 + STRUCT_OFFSET)(%rdi)
-#define dsWMask		( 64 + STRUCT_OFFSET)(%rdi)
-#define dsWindow	( 72 + STRUCT_OFFSET)(%rdi)
-#define dsPrev		( 88 + STRUCT_OFFSET)(%rdi)
-#define dsMatchLen	(136 + STRUCT_OFFSET)(%rdi)
-#define dsPrevMatch	(140 + STRUCT_OFFSET)(%rdi)
-#define dsStrStart	(148 + STRUCT_OFFSET)(%rdi)
-#define dsMatchStart	(152 + STRUCT_OFFSET)(%rdi)
-#define dsLookahead	(156 + STRUCT_OFFSET)(%rdi)
-#define dsPrevLen	(160 + STRUCT_OFFSET)(%rdi)
-#define dsMaxChainLen	(164 + STRUCT_OFFSET)(%rdi)
-#define dsGoodMatch	(180 + STRUCT_OFFSET)(%rdi)
-#define dsNiceMatch	(184 + STRUCT_OFFSET)(%rdi)
-
-#endif
-
-
-
-
-.text
-
-/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
-
-longest_match:
-/*
- * Retrieve the function arguments. %curmatch will hold cur_match
- * throughout the entire function (passed via rsi on amd64).
- * rdi will hold the pointer to the deflate_state (first arg on amd64)
- */
-		mov     %rsi, save_rsi
-		mov     %rbx, save_rbx
-		mov	%r12, save_r12
-		mov     %r13, save_r13
-		mov     %r14, save_r14
-		mov     %r15, save_r15
-
-/* uInt wmask = s->w_mask;						*/
-/* unsigned chain_length = s->max_chain_length;				*/
-/* if (s->prev_length >= s->good_match) {				*/
-/*     chain_length >>= 2;						*/
-/* }									*/
-
-		movl	dsPrevLen, %eax
-		movl	dsGoodMatch, %ebx
-		cmpl	%ebx, %eax
-		movl	dsWMask, %eax
-		movl	dsMaxChainLen, %chainlenwmask
-		jl	LastMatchGood
-		shrl	$2, %chainlenwmask
-LastMatchGood:
-
-/* chainlen is decremented once beforehand so that the function can	*/
-/* use the sign flag instead of the zero flag for the exit test.	*/
-/* It is then shifted into the high word, to make room for the wmask	*/
-/* value, which it will always accompany.				*/
-
-		decl	%chainlenwmask
-		shll	$16, %chainlenwmask
-		orl	%eax, %chainlenwmask
-
-/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;	*/
-
-		movl	dsNiceMatch, %eax
-		movl	dsLookahead, %ebx
-		cmpl	%eax, %ebx
-		jl	LookaheadLess
-		movl	%eax, %ebx
-LookaheadLess:	movl	%ebx, %nicematch
-
-/* register Bytef *scan = s->window + s->strstart;			*/
-
-		mov	dsWindow, %window
-		movl	dsStrStart, %limitd
-		lea	(%limit, %window), %scan
-
-/* Determine how many bytes the scan ptr is off from being		*/
-/* dword-aligned.							*/
-
-		mov	%scan, %scanalign
-		negl	%scanalignd
-		andl	$3, %scanalignd
-
-/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?			*/
-/*     s->strstart - (IPos)MAX_DIST(s) : NIL;				*/
-
-		movl	dsWSize, %eax
-		subl	$MIN_LOOKAHEAD, %eax
-		xorl	%ecx, %ecx
-		subl	%eax, %limitd
-		cmovng	%ecx, %limitd
-
-/* int best_len = s->prev_length;					*/
-
-		movl	dsPrevLen, %bestlend
-
-/* Store the sum of s->window + best_len in %windowbestlen locally, and in memory.	*/
-
-		lea	(%window, %bestlen), %windowbestlen
-		mov	%windowbestlen, _windowbestlen
-
-/* register ush scan_start = *(ushf*)scan;				*/
-/* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/
-/* Posf *prev = s->prev;						*/
-
-		movzwl	(%scan), %scanstart
-		movzwl	-1(%scan, %bestlen), %scanend
-		mov	dsPrev, %prev
-
-/* Jump into the main loop.						*/
-
-		movl	%chainlenwmask, _chainlenwmask
-		jmp	LoopEntry
-
-.balign 16
-
-/* do {
- *     match = s->window + cur_match;
- *     if (*(ushf*)(match+best_len-1) != scan_end ||
- *         *(ushf*)match != scan_start) continue;
- *     [...]
- * } while ((cur_match = prev[cur_match & wmask]) > limit
- *          && --chain_length != 0);
- *
- * Here is the inner loop of the function. The function will spend the
- * majority of its time in this loop, and majority of that time will
- * be spent in the first ten instructions.
- */
-LookupLoop:
-		andl	%chainlenwmask, %curmatchd
-		movzwl	(%prev, %curmatch, 2), %curmatchd
-		cmpl	%limitd, %curmatchd
-		jbe	LeaveNow
-		subl	$0x00010000, %chainlenwmask
-		js	LeaveNow
-LoopEntry:	cmpw	-1(%windowbestlen, %curmatch), %scanendw
-		jne	LookupLoop
-		cmpw	%scanstartw, (%window, %curmatch)
-		jne	LookupLoop
-
-/* Store the current value of chainlen.					*/
-		movl	%chainlenwmask, _chainlenwmask
-
-/* %scan is the string under scrutiny, and %prev to the string we	*/
-/* are hoping to match it up with. In actuality, %esi and %edi are	*/
-/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/
-/* initialized to -(MAX_MATCH_8 - scanalign).				*/
-
-		mov	$(-MAX_MATCH_8), %rdx
-		lea	(%curmatch, %window), %windowbestlen
-		lea	MAX_MATCH_8(%windowbestlen, %scanalign), %windowbestlen
-		lea	MAX_MATCH_8(%scan, %scanalign), %prev
-
-/* the prefetching below makes very little difference... */
-		prefetcht1	(%windowbestlen, %rdx)
-		prefetcht1	(%prev, %rdx)
-
-/*
- * Test the strings for equality, 8 bytes at a time. At the end,
- * adjust %rdx so that it is offset to the exact byte that mismatched.
- *
- * It should be confessed that this loop usually does not represent
- * much of the total running time. Replacing it with a more
- * straightforward "rep cmpsb" would not drastically degrade
- * performance -- unrolling it, for example, makes no difference.
- */
-
-#undef USE_SSE	/* works, but is 6-7% slower, than non-SSE... */
-
-LoopCmps:
-#ifdef USE_SSE
-		/* Preload the SSE registers */
-		movdqu	  (%windowbestlen, %rdx), %xmm1
-		movdqu	  (%prev, %rdx), %xmm2
-		pcmpeqb	%xmm2, %xmm1
-		movdqu	16(%windowbestlen, %rdx), %xmm3
-		movdqu	16(%prev, %rdx), %xmm4
-		pcmpeqb	%xmm4, %xmm3
-		movdqu	32(%windowbestlen, %rdx), %xmm5
-		movdqu	32(%prev, %rdx), %xmm6
-		pcmpeqb	%xmm6, %xmm5
-		movdqu	48(%windowbestlen, %rdx), %xmm7
-		movdqu	48(%prev, %rdx), %xmm8
-		pcmpeqb	%xmm8, %xmm7
-
-		/* Check the comparisions' results */
-		pmovmskb %xmm1, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		/* this is the only iteration of the loop with a possibility of having
-		   incremented rdx by 0x108 (each loop iteration add 16*4 = 0x40 
-		   and (0x40*4)+8=0x108 */
-		add	$8, %rdx
-		jz LenMaximum
-		add	$8, %rdx
-
-		
-		pmovmskb %xmm3, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		
-		add	$16, %rdx
-
-
-		pmovmskb %xmm5, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		add	$16, %rdx
-
-
-		pmovmskb %xmm7, %rax
-		notw	%ax
-		bsfw	%ax, %ax
-		jnz	LeaveLoopCmps
-		
-		add	$16, %rdx
-		
-		jmp	LoopCmps
-LeaveLoopCmps:	add	%rax, %rdx
-#else
-		mov	(%windowbestlen, %rdx), %rax
-		xor	(%prev, %rdx), %rax
-		jnz	LeaveLoopCmps
-		
-		mov	8(%windowbestlen, %rdx), %rax
-		xor	8(%prev, %rdx), %rax
-		jnz	LeaveLoopCmps8
-
-		mov	16(%windowbestlen, %rdx), %rax
-		xor	16(%prev, %rdx), %rax
-		jnz	LeaveLoopCmps16
-				
-		add	$24, %rdx
-		jnz	LoopCmps
-		jmp	LenMaximum
-#	if 0
-/*
- * This three-liner is tantalizingly simple, but bsf is a slow instruction,
- * and the complicated alternative down below is quite a bit faster. Sad...
- */
-
-LeaveLoopCmps:	bsf	%rax, %rax /* find the first non-zero bit */
-		shrl	$3, %eax /* divide by 8 to get the byte */
-		add	%rax, %rdx
-#	else
-LeaveLoopCmps16:
-		add	$8, %rdx
-LeaveLoopCmps8:
-		add	$8, %rdx
-LeaveLoopCmps:	testl   $0xFFFFFFFF, %eax /* Check the first 4 bytes */
-		jnz     Check16
-		add     $4, %rdx
-		shr     $32, %rax
-Check16:        testw   $0xFFFF, %ax
-		jnz     LenLower
-		add	$2, %rdx
-		shrl	$16, %eax
-LenLower:	subb	$1, %al
-		adc	$0, %rdx
-#	endif
-#endif
-
-/* Calculate the length of the match. If it is longer than MAX_MATCH,	*/
-/* then automatically accept it as the best possible match and leave.	*/
-
-		lea	(%prev, %rdx), %rax
-		sub	%scan, %rax
-		cmpl	$MAX_MATCH, %eax
-		jge	LenMaximum
-
-/* If the length of the match is not longer than the best match we	*/
-/* have so far, then forget it and return to the lookup loop.		*/
-
-		cmpl	%bestlend, %eax
-		jg	LongerMatch
-		mov	_windowbestlen, %windowbestlen
-		mov	dsPrev, %prev
-		movl	_chainlenwmask, %edx
-		jmp	LookupLoop
-
-/*         s->match_start = cur_match;					*/
-/*         best_len = len;						*/
-/*         if (len >= nice_match) break;				*/
-/*         scan_end = *(ushf*)(scan+best_len-1);			*/
-
-LongerMatch:
-		movl	%eax, %bestlend
-		movl	%curmatchd, dsMatchStart
-		cmpl	%nicematch, %eax
-		jge	LeaveNow
-
-		lea	(%window, %bestlen), %windowbestlen
-		mov	%windowbestlen, _windowbestlen
-
-		movzwl	-1(%scan, %rax), %scanend
-		mov	dsPrev, %prev
-		movl	_chainlenwmask, %chainlenwmask
-		jmp	LookupLoop
-
-/* Accept the current string, with the maximum possible length.		*/
-
-LenMaximum:
-		movl	$MAX_MATCH, %bestlend
-		movl	%curmatchd, dsMatchStart
-
-/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;		*/
-/* return s->lookahead;							*/
-
-LeaveNow:
-		movl	dsLookahead, %eax
-		cmpl	%eax, %bestlend
-		cmovngl	%bestlend, %eax
-LookaheadRet:
-
-/* Restore the registers and return from whence we came.			*/
-
-	mov	save_rsi, %rsi
-	mov	save_rbx, %rbx
-	mov	save_r12, %r12
-	mov	save_r13, %r13
-	mov	save_r14, %r14
-	mov	save_r15, %r15
-
-	ret
-
-match_init:	ret
diff --git a/src/png/zlib/contrib/asm686/README.686 b/src/png/zlib/contrib/asm686/README.686
deleted file mode 100644
index a0bf3bea4..000000000
--- a/src/png/zlib/contrib/asm686/README.686
+++ /dev/null
@@ -1,51 +0,0 @@
-This is a patched version of zlib, modified to use
-Pentium-Pro-optimized assembly code in the deflation algorithm. The
-files changed/added by this patch are:
-
-README.686
-match.S
-
-The speedup that this patch provides varies, depending on whether the
-compiler used to build the original version of zlib falls afoul of the
-PPro's speed traps. My own tests show a speedup of around 10-20% at
-the default compression level, and 20-30% using -9, against a version
-compiled using gcc 2.7.2.3. Your mileage may vary.
-
-Note that this code has been tailored for the PPro/PII in particular,
-and will not perform particuarly well on a Pentium.
-
-If you are using an assembler other than GNU as, you will have to
-translate match.S to use your assembler's syntax. (Have fun.)
-
-Brian Raiter
-breadbox@muppetlabs.com
-April, 1998
-
-
-Added for zlib 1.1.3:
-
-The patches come from
-http://www.muppetlabs.com/~breadbox/software/assembly.html
-
-To compile zlib with this asm file, copy match.S to the zlib directory
-then do:
-
-CFLAGS="-O3 -DASMV" ./configure
-make OBJA=match.o
-
-
-Update:
-
-I've been ignoring these assembly routines for years, believing that
-gcc's generated code had caught up with it sometime around gcc 2.95
-and the major rearchitecting of the Pentium 4. However, I recently
-learned that, despite what I believed, this code still has some life
-in it. On the Pentium 4 and AMD64 chips, it continues to run about 8%
-faster than the code produced by gcc 4.1.
-
-In acknowledgement of its continuing usefulness, I've altered the
-license to match that of the rest of zlib. Share and Enjoy!
-
-Brian Raiter
-breadbox@muppetlabs.com
-April, 2007
diff --git a/src/png/zlib/contrib/asm686/match.S b/src/png/zlib/contrib/asm686/match.S
deleted file mode 100644
index fa4210927..000000000
--- a/src/png/zlib/contrib/asm686/match.S
+++ /dev/null
@@ -1,357 +0,0 @@
-/* match.S -- x86 assembly version of the zlib longest_match() function.
- * Optimized for the Intel 686 chips (PPro and later).
- *
- * Copyright (C) 1998, 2007 Brian Raiter <breadbox@muppetlabs.com>
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the author be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-#ifndef NO_UNDERLINE
-#define	match_init	_match_init
-#define	longest_match	_longest_match
-#endif
-
-#define	MAX_MATCH	(258)
-#define	MIN_MATCH	(3)
-#define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)
-#define	MAX_MATCH_8	((MAX_MATCH + 7) & ~7)
-
-/* stack frame offsets */
-
-#define	chainlenwmask		0	/* high word: current chain len	*/
-					/* low word: s->wmask		*/
-#define	window			4	/* local copy of s->window	*/
-#define	windowbestlen		8	/* s->window + bestlen		*/
-#define	scanstart		16	/* first two bytes of string	*/
-#define	scanend			12	/* last two bytes of string	*/
-#define	scanalign		20	/* dword-misalignment of string	*/
-#define	nicematch		24	/* a good enough match size	*/
-#define	bestlen			28	/* size of best match so far	*/
-#define	scan			32	/* ptr to string wanting match	*/
-
-#define	LocalVarsSize		(36)
-/*	saved ebx		36 */
-/*	saved edi		40 */
-/*	saved esi		44 */
-/*	saved ebp		48 */
-/*	return address		52 */
-#define	deflatestate		56	/* the function arguments	*/
-#define	curmatch		60
-
-/* All the +zlib1222add offsets are due to the addition of fields
- *  in zlib in the deflate_state structure since the asm code was first written
- * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
- * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
- * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
- */
-
-#define zlib1222add		(8)
-
-#define	dsWSize			(36+zlib1222add)
-#define	dsWMask			(44+zlib1222add)
-#define	dsWindow		(48+zlib1222add)
-#define	dsPrev			(56+zlib1222add)
-#define	dsMatchLen		(88+zlib1222add)
-#define	dsPrevMatch		(92+zlib1222add)
-#define	dsStrStart		(100+zlib1222add)
-#define	dsMatchStart		(104+zlib1222add)
-#define	dsLookahead		(108+zlib1222add)
-#define	dsPrevLen		(112+zlib1222add)
-#define	dsMaxChainLen		(116+zlib1222add)
-#define	dsGoodMatch		(132+zlib1222add)
-#define	dsNiceMatch		(136+zlib1222add)
-
-
-.file "match.S"
-
-.globl	match_init, longest_match
-
-.text
-
-/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */
-.cfi_sections	.debug_frame
-
-longest_match:
-
-.cfi_startproc
-/* Save registers that the compiler may be using, and adjust %esp to	*/
-/* make room for our stack frame.					*/
-
-		pushl	%ebp
-		.cfi_def_cfa_offset 8
-		.cfi_offset ebp, -8
-		pushl	%edi
-		.cfi_def_cfa_offset 12
-		pushl	%esi
-		.cfi_def_cfa_offset 16
-		pushl	%ebx
-		.cfi_def_cfa_offset 20
-		subl	$LocalVarsSize, %esp
-		.cfi_def_cfa_offset LocalVarsSize+20
-
-/* Retrieve the function arguments. %ecx will hold cur_match		*/
-/* throughout the entire function. %edx will hold the pointer to the	*/
-/* deflate_state structure during the function's setup (before		*/
-/* entering the main loop).						*/
-
-		movl	deflatestate(%esp), %edx
-		movl	curmatch(%esp), %ecx
-
-/* uInt wmask = s->w_mask;						*/
-/* unsigned chain_length = s->max_chain_length;				*/
-/* if (s->prev_length >= s->good_match) {				*/
-/*     chain_length >>= 2;						*/
-/* }									*/
- 
-		movl	dsPrevLen(%edx), %eax
-		movl	dsGoodMatch(%edx), %ebx
-		cmpl	%ebx, %eax
-		movl	dsWMask(%edx), %eax
-		movl	dsMaxChainLen(%edx), %ebx
-		jl	LastMatchGood
-		shrl	$2, %ebx
-LastMatchGood:
-
-/* chainlen is decremented once beforehand so that the function can	*/
-/* use the sign flag instead of the zero flag for the exit test.	*/
-/* It is then shifted into the high word, to make room for the wmask	*/
-/* value, which it will always accompany.				*/
-
-		decl	%ebx
-		shll	$16, %ebx
-		orl	%eax, %ebx
-		movl	%ebx, chainlenwmask(%esp)
-
-/* if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;	*/
-
-		movl	dsNiceMatch(%edx), %eax
-		movl	dsLookahead(%edx), %ebx
-		cmpl	%eax, %ebx
-		jl	LookaheadLess
-		movl	%eax, %ebx
-LookaheadLess:	movl	%ebx, nicematch(%esp)
-
-/* register Bytef *scan = s->window + s->strstart;			*/
-
-		movl	dsWindow(%edx), %esi
-		movl	%esi, window(%esp)
-		movl	dsStrStart(%edx), %ebp
-		lea	(%esi,%ebp), %edi
-		movl	%edi, scan(%esp)
-
-/* Determine how many bytes the scan ptr is off from being		*/
-/* dword-aligned.							*/
-
-		movl	%edi, %eax
-		negl	%eax
-		andl	$3, %eax
-		movl	%eax, scanalign(%esp)
-
-/* IPos limit = s->strstart > (IPos)MAX_DIST(s) ?			*/
-/*     s->strstart - (IPos)MAX_DIST(s) : NIL;				*/
-
-		movl	dsWSize(%edx), %eax
-		subl	$MIN_LOOKAHEAD, %eax
-		subl	%eax, %ebp
-		jg	LimitPositive
-		xorl	%ebp, %ebp
-LimitPositive:
-
-/* int best_len = s->prev_length;					*/
-
-		movl	dsPrevLen(%edx), %eax
-		movl	%eax, bestlen(%esp)
-
-/* Store the sum of s->window + best_len in %esi locally, and in %esi.	*/
-
-		addl	%eax, %esi
-		movl	%esi, windowbestlen(%esp)
-
-/* register ush scan_start = *(ushf*)scan;				*/
-/* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/
-/* Posf *prev = s->prev;						*/
-
-		movzwl	(%edi), %ebx
-		movl	%ebx, scanstart(%esp)
-		movzwl	-1(%edi,%eax), %ebx
-		movl	%ebx, scanend(%esp)
-		movl	dsPrev(%edx), %edi
-
-/* Jump into the main loop.						*/
-
-		movl	chainlenwmask(%esp), %edx
-		jmp	LoopEntry
-
-.balign 16
-
-/* do {
- *     match = s->window + cur_match;
- *     if (*(ushf*)(match+best_len-1) != scan_end ||
- *         *(ushf*)match != scan_start) continue;
- *     [...]
- * } while ((cur_match = prev[cur_match & wmask]) > limit
- *          && --chain_length != 0);
- *
- * Here is the inner loop of the function. The function will spend the
- * majority of its time in this loop, and majority of that time will
- * be spent in the first ten instructions.
- *
- * Within this loop:
- * %ebx = scanend
- * %ecx = curmatch
- * %edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
- * %esi = windowbestlen - i.e., (window + bestlen)
- * %edi = prev
- * %ebp = limit
- */
-LookupLoop:
-		andl	%edx, %ecx
-		movzwl	(%edi,%ecx,2), %ecx
-		cmpl	%ebp, %ecx
-		jbe	LeaveNow
-		subl	$0x00010000, %edx
-		js	LeaveNow
-LoopEntry:	movzwl	-1(%esi,%ecx), %eax
-		cmpl	%ebx, %eax
-		jnz	LookupLoop
-		movl	window(%esp), %eax
-		movzwl	(%eax,%ecx), %eax
-		cmpl	scanstart(%esp), %eax
-		jnz	LookupLoop
-
-/* Store the current value of chainlen.					*/
-
-		movl	%edx, chainlenwmask(%esp)
-
-/* Point %edi to the string under scrutiny, and %esi to the string we	*/
-/* are hoping to match it up with. In actuality, %esi and %edi are	*/
-/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/
-/* initialized to -(MAX_MATCH_8 - scanalign).				*/
-
-		movl	window(%esp), %esi
-		movl	scan(%esp), %edi
-		addl	%ecx, %esi
-		movl	scanalign(%esp), %eax
-		movl	$(-MAX_MATCH_8), %edx
-		lea	MAX_MATCH_8(%edi,%eax), %edi
-		lea	MAX_MATCH_8(%esi,%eax), %esi
-
-/* Test the strings for equality, 8 bytes at a time. At the end,
- * adjust %edx so that it is offset to the exact byte that mismatched.
- *
- * We already know at this point that the first three bytes of the
- * strings match each other, and they can be safely passed over before
- * starting the compare loop. So what this code does is skip over 0-3
- * bytes, as much as necessary in order to dword-align the %edi
- * pointer. (%esi will still be misaligned three times out of four.)
- *
- * It should be confessed that this loop usually does not represent
- * much of the total running time. Replacing it with a more
- * straightforward "rep cmpsb" would not drastically degrade
- * performance.
- */
-LoopCmps:
-		movl	(%esi,%edx), %eax
-		xorl	(%edi,%edx), %eax
-		jnz	LeaveLoopCmps
-		movl	4(%esi,%edx), %eax
-		xorl	4(%edi,%edx), %eax
-		jnz	LeaveLoopCmps4
-		addl	$8, %edx
-		jnz	LoopCmps
-		jmp	LenMaximum
-LeaveLoopCmps4:	addl	$4, %edx
-LeaveLoopCmps:	testl	$0x0000FFFF, %eax
-		jnz	LenLower
-		addl	$2, %edx
-		shrl	$16, %eax
-LenLower:	subb	$1, %al
-		adcl	$0, %edx
-
-/* Calculate the length of the match. If it is longer than MAX_MATCH,	*/
-/* then automatically accept it as the best possible match and leave.	*/
-
-		lea	(%edi,%edx), %eax
-		movl	scan(%esp), %edi
-		subl	%edi, %eax
-		cmpl	$MAX_MATCH, %eax
-		jge	LenMaximum
-
-/* If the length of the match is not longer than the best match we	*/
-/* have so far, then forget it and return to the lookup loop.		*/
-
-		movl	deflatestate(%esp), %edx
-		movl	bestlen(%esp), %ebx
-		cmpl	%ebx, %eax
-		jg	LongerMatch
-		movl	windowbestlen(%esp), %esi
-		movl	dsPrev(%edx), %edi
-		movl	scanend(%esp), %ebx
-		movl	chainlenwmask(%esp), %edx
-		jmp	LookupLoop
-
-/*         s->match_start = cur_match;					*/
-/*         best_len = len;						*/
-/*         if (len >= nice_match) break;				*/
-/*         scan_end = *(ushf*)(scan+best_len-1);			*/
-
-LongerMatch:	movl	nicematch(%esp), %ebx
-		movl	%eax, bestlen(%esp)
-		movl	%ecx, dsMatchStart(%edx)
-		cmpl	%ebx, %eax
-		jge	LeaveNow
-		movl	window(%esp), %esi
-		addl	%eax, %esi
-		movl	%esi, windowbestlen(%esp)
-		movzwl	-1(%edi,%eax), %ebx
-		movl	dsPrev(%edx), %edi
-		movl	%ebx, scanend(%esp)
-		movl	chainlenwmask(%esp), %edx
-		jmp	LookupLoop
-
-/* Accept the current string, with the maximum possible length.		*/
-
-LenMaximum:	movl	deflatestate(%esp), %edx
-		movl	$MAX_MATCH, bestlen(%esp)
-		movl	%ecx, dsMatchStart(%edx)
-
-/* if ((uInt)best_len <= s->lookahead) return (uInt)best_len;		*/
-/* return s->lookahead;							*/
-
-LeaveNow:
-		movl	deflatestate(%esp), %edx
-		movl	bestlen(%esp), %ebx
-		movl	dsLookahead(%edx), %eax
-		cmpl	%eax, %ebx
-		jg	LookaheadRet
-		movl	%ebx, %eax
-LookaheadRet:
-
-/* Restore the stack and return from whence we came.			*/
-
-		addl	$LocalVarsSize, %esp
-		.cfi_def_cfa_offset 20
-		popl	%ebx
-		.cfi_def_cfa_offset 16
-		popl	%esi
-		.cfi_def_cfa_offset 12
-		popl	%edi
-		.cfi_def_cfa_offset 8
-		popl	%ebp
-		.cfi_def_cfa_offset 4
-.cfi_endproc
-match_init:	ret
diff --git a/src/png/zlib/contrib/blast/Makefile b/src/png/zlib/contrib/blast/Makefile
deleted file mode 100644
index 9be80bafe..000000000
--- a/src/png/zlib/contrib/blast/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-blast: blast.c blast.h
-	cc -DTEST -o blast blast.c
-
-test: blast
-	blast < test.pk | cmp - test.txt
-
-clean:
-	rm -f blast blast.o
diff --git a/src/png/zlib/contrib/blast/README b/src/png/zlib/contrib/blast/README
deleted file mode 100644
index e3a60b3f5..000000000
--- a/src/png/zlib/contrib/blast/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Read blast.h for purpose and usage.
-
-Mark Adler
-madler@alumni.caltech.edu
diff --git a/src/png/zlib/contrib/blast/blast.c b/src/png/zlib/contrib/blast/blast.c
deleted file mode 100644
index e6e659073..000000000
--- a/src/png/zlib/contrib/blast/blast.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* blast.c
- * Copyright (C) 2003, 2012, 2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in blast.h
- * version 1.3, 24 Aug 2013
- *
- * blast.c decompresses data compressed by the PKWare Compression Library.
- * This function provides functionality similar to the explode() function of
- * the PKWare library, hence the name "blast".
- *
- * This decompressor is based on the excellent format description provided by
- * Ben Rudiak-Gould in comp.compression on August 13, 2001.  Interestingly, the
- * example Ben provided in the post is incorrect.  The distance 110001 should
- * instead be 111000.  When corrected, the example byte stream becomes:
- *
- *    00 04 82 24 25 8f 80 7f
- *
- * which decompresses to "AIAIAIAIAIAIA" (without the quotes).
- */
-
-/*
- * Change history:
- *
- * 1.0  12 Feb 2003     - First version
- * 1.1  16 Feb 2003     - Fixed distance check for > 4 GB uncompressed data
- * 1.2  24 Oct 2012     - Add note about using binary mode in stdio
- *                      - Fix comparisons of differently signed integers
- * 1.3  24 Aug 2013     - Return unused input from blast()
- *                      - Fix test code to correctly report unused input
- *                      - Enable the provision of initial input to blast()
- */
-
-#include <stddef.h>             /* for NULL */
-#include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
-#include "blast.h"              /* prototype for blast() */
-
-#define local static            /* for local function definitions */
-#define MAXBITS 13              /* maximum code length */
-#define MAXWIN 4096             /* maximum window size */
-
-/* input and output state */
-struct state {
-    /* input state */
-    blast_in infun;             /* input function provided by user */
-    void *inhow;                /* opaque information passed to infun() */
-    unsigned char *in;          /* next input location */
-    unsigned left;              /* available input at in */
-    int bitbuf;                 /* bit buffer */
-    int bitcnt;                 /* number of bits in bit buffer */
-
-    /* input limit error return state for bits() and decode() */
-    jmp_buf env;
-
-    /* output state */
-    blast_out outfun;           /* output function provided by user */
-    void *outhow;               /* opaque information passed to outfun() */
-    unsigned next;              /* index of next write location in out[] */
-    int first;                  /* true to check distances (for first 4K) */
-    unsigned char out[MAXWIN];  /* output buffer and sliding window */
-};
-
-/*
- * Return need bits from the input stream.  This always leaves less than
- * eight bits in the buffer.  bits() works properly for need == 0.
- *
- * Format notes:
- *
- * - Bits are stored in bytes from the least significant bit to the most
- *   significant bit.  Therefore bits are dropped from the bottom of the bit
- *   buffer, using shift right, and new bytes are appended to the top of the
- *   bit buffer, using shift left.
- */
-local int bits(struct state *s, int need)
-{
-    int val;            /* bit accumulator */
-
-    /* load at least need bits into val */
-    val = s->bitbuf;
-    while (s->bitcnt < need) {
-        if (s->left == 0) {
-            s->left = s->infun(s->inhow, &(s->in));
-            if (s->left == 0) longjmp(s->env, 1);       /* out of input */
-        }
-        val |= (int)(*(s->in)++) << s->bitcnt;          /* load eight bits */
-        s->left--;
-        s->bitcnt += 8;
-    }
-
-    /* drop need bits and update buffer, always zero to seven bits left */
-    s->bitbuf = val >> need;
-    s->bitcnt -= need;
-
-    /* return need bits, zeroing the bits above that */
-    return val & ((1 << need) - 1);
-}
-
-/*
- * Huffman code decoding tables.  count[1..MAXBITS] is the number of symbols of
- * each length, which for a canonical code are stepped through in order.
- * symbol[] are the symbol values in canonical order, where the number of
- * entries is the sum of the counts in count[].  The decoding process can be
- * seen in the function decode() below.
- */
-struct huffman {
-    short *count;       /* number of symbols of each length */
-    short *symbol;      /* canonically ordered symbols */
-};
-
-/*
- * Decode a code from the stream s using huffman table h.  Return the symbol or
- * a negative value if there is an error.  If all of the lengths are zero, i.e.
- * an empty code, or if the code is incomplete and an invalid code is received,
- * then -9 is returned after reading MAXBITS bits.
- *
- * Format notes:
- *
- * - The codes as stored in the compressed data are bit-reversed relative to
- *   a simple integer ordering of codes of the same lengths.  Hence below the
- *   bits are pulled from the compressed data one at a time and used to
- *   build the code value reversed from what is in the stream in order to
- *   permit simple integer comparisons for decoding.
- *
- * - The first code for the shortest length is all ones.  Subsequent codes of
- *   the same length are simply integer decrements of the previous code.  When
- *   moving up a length, a one bit is appended to the code.  For a complete
- *   code, the last code of the longest length will be all zeros.  To support
- *   this ordering, the bits pulled during decoding are inverted to apply the
- *   more "natural" ordering starting with all zeros and incrementing.
- */
-local int decode(struct state *s, struct huffman *h)
-{
-    int len;            /* current number of bits in code */
-    int code;           /* len bits being decoded */
-    int first;          /* first code of length len */
-    int count;          /* number of codes of length len */
-    int index;          /* index of first code of length len in symbol table */
-    int bitbuf;         /* bits from stream */
-    int left;           /* bits left in next or left to process */
-    short *next;        /* next number of codes */
-
-    bitbuf = s->bitbuf;
-    left = s->bitcnt;
-    code = first = index = 0;
-    len = 1;
-    next = h->count + 1;
-    while (1) {
-        while (left--) {
-            code |= (bitbuf & 1) ^ 1;   /* invert code */
-            bitbuf >>= 1;
-            count = *next++;
-            if (code < first + count) { /* if length len, return symbol */
-                s->bitbuf = bitbuf;
-                s->bitcnt = (s->bitcnt - len) & 7;
-                return h->symbol[index + (code - first)];
-            }
-            index += count;             /* else update for next length */
-            first += count;
-            first <<= 1;
-            code <<= 1;
-            len++;
-        }
-        left = (MAXBITS+1) - len;
-        if (left == 0) break;
-        if (s->left == 0) {
-            s->left = s->infun(s->inhow, &(s->in));
-            if (s->left == 0) longjmp(s->env, 1);       /* out of input */
-        }
-        bitbuf = *(s->in)++;
-        s->left--;
-        if (left > 8) left = 8;
-    }
-    return -9;                          /* ran out of codes */
-}
-
-/*
- * Given a list of repeated code lengths rep[0..n-1], where each byte is a
- * count (high four bits + 1) and a code length (low four bits), generate the
- * list of code lengths.  This compaction reduces the size of the object code.
- * Then given the list of code lengths length[0..n-1] representing a canonical
- * Huffman code for n symbols, construct the tables required to decode those
- * codes.  Those tables are the number of codes of each length, and the symbols
- * sorted by length, retaining their original order within each length.  The
- * return value is zero for a complete code set, negative for an over-
- * subscribed code set, and positive for an incomplete code set.  The tables
- * can be used if the return value is zero or positive, but they cannot be used
- * if the return value is negative.  If the return value is zero, it is not
- * possible for decode() using that table to return an error--any stream of
- * enough bits will resolve to a symbol.  If the return value is positive, then
- * it is possible for decode() using that table to return an error for received
- * codes past the end of the incomplete lengths.
- */
-local int construct(struct huffman *h, const unsigned char *rep, int n)
-{
-    int symbol;         /* current symbol when stepping through length[] */
-    int len;            /* current length when stepping through h->count[] */
-    int left;           /* number of possible codes left of current length */
-    short offs[MAXBITS+1];      /* offsets in symbol table for each length */
-    short length[256];  /* code lengths */
-
-    /* convert compact repeat counts into symbol bit length list */
-    symbol = 0;
-    do {
-        len = *rep++;
-        left = (len >> 4) + 1;
-        len &= 15;
-        do {
-            length[symbol++] = len;
-        } while (--left);
-    } while (--n);
-    n = symbol;
-
-    /* count number of codes of each length */
-    for (len = 0; len <= MAXBITS; len++)
-        h->count[len] = 0;
-    for (symbol = 0; symbol < n; symbol++)
-        (h->count[length[symbol]])++;   /* assumes lengths are within bounds */
-    if (h->count[0] == n)               /* no codes! */
-        return 0;                       /* complete, but decode() will fail */
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;                           /* one possible code of zero length */
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;                     /* one more bit, double codes left */
-        left -= h->count[len];          /* deduct count from possible codes */
-        if (left < 0) return left;      /* over-subscribed--return negative */
-    }                                   /* left > 0 means incomplete */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + h->count[len];
-
-    /*
-     * put symbols in table sorted by length, by symbol order within each
-     * length
-     */
-    for (symbol = 0; symbol < n; symbol++)
-        if (length[symbol] != 0)
-            h->symbol[offs[length[symbol]]++] = symbol;
-
-    /* return zero for complete set, positive for incomplete set */
-    return left;
-}
-
-/*
- * Decode PKWare Compression Library stream.
- *
- * Format notes:
- *
- * - First byte is 0 if literals are uncoded or 1 if they are coded.  Second
- *   byte is 4, 5, or 6 for the number of extra bits in the distance code.
- *   This is the base-2 logarithm of the dictionary size minus six.
- *
- * - Compressed data is a combination of literals and length/distance pairs
- *   terminated by an end code.  Literals are either Huffman coded or
- *   uncoded bytes.  A length/distance pair is a coded length followed by a
- *   coded distance to represent a string that occurs earlier in the
- *   uncompressed data that occurs again at the current location.
- *
- * - A bit preceding a literal or length/distance pair indicates which comes
- *   next, 0 for literals, 1 for length/distance.
- *
- * - If literals are uncoded, then the next eight bits are the literal, in the
- *   normal bit order in the stream, i.e. no bit-reversal is needed. Similarly,
- *   no bit reversal is needed for either the length extra bits or the distance
- *   extra bits.
- *
- * - Literal bytes are simply written to the output.  A length/distance pair is
- *   an instruction to copy previously uncompressed bytes to the output.  The
- *   copy is from distance bytes back in the output stream, copying for length
- *   bytes.
- *
- * - Distances pointing before the beginning of the output data are not
- *   permitted.
- *
- * - Overlapped copies, where the length is greater than the distance, are
- *   allowed and common.  For example, a distance of one and a length of 518
- *   simply copies the last byte 518 times.  A distance of four and a length of
- *   twelve copies the last four bytes three times.  A simple forward copy
- *   ignoring whether the length is greater than the distance or not implements
- *   this correctly.
- */
-local int decomp(struct state *s)
-{
-    int lit;            /* true if literals are coded */
-    int dict;           /* log2(dictionary size) - 6 */
-    int symbol;         /* decoded symbol, extra bits for distance */
-    int len;            /* length for copy */
-    unsigned dist;      /* distance for copy */
-    int copy;           /* copy counter */
-    unsigned char *from, *to;   /* copy pointers */
-    static int virgin = 1;                              /* build tables once */
-    static short litcnt[MAXBITS+1], litsym[256];        /* litcode memory */
-    static short lencnt[MAXBITS+1], lensym[16];         /* lencode memory */
-    static short distcnt[MAXBITS+1], distsym[64];       /* distcode memory */
-    static struct huffman litcode = {litcnt, litsym};   /* length code */
-    static struct huffman lencode = {lencnt, lensym};   /* length code */
-    static struct huffman distcode = {distcnt, distsym};/* distance code */
-        /* bit lengths of literal codes */
-    static const unsigned char litlen[] = {
-        11, 124, 8, 7, 28, 7, 188, 13, 76, 4, 10, 8, 12, 10, 12, 10, 8, 23, 8,
-        9, 7, 6, 7, 8, 7, 6, 55, 8, 23, 24, 12, 11, 7, 9, 11, 12, 6, 7, 22, 5,
-        7, 24, 6, 11, 9, 6, 7, 22, 7, 11, 38, 7, 9, 8, 25, 11, 8, 11, 9, 12,
-        8, 12, 5, 38, 5, 38, 5, 11, 7, 5, 6, 21, 6, 10, 53, 8, 7, 24, 10, 27,
-        44, 253, 253, 253, 252, 252, 252, 13, 12, 45, 12, 45, 12, 61, 12, 45,
-        44, 173};
-        /* bit lengths of length codes 0..15 */
-    static const unsigned char lenlen[] = {2, 35, 36, 53, 38, 23};
-        /* bit lengths of distance codes 0..63 */
-    static const unsigned char distlen[] = {2, 20, 53, 230, 247, 151, 248};
-    static const short base[16] = {     /* base for length codes */
-        3, 2, 4, 5, 6, 7, 8, 9, 10, 12, 16, 24, 40, 72, 136, 264};
-    static const char extra[16] = {     /* extra bits for length codes */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8};
-
-    /* set up decoding tables (once--might not be thread-safe) */
-    if (virgin) {
-        construct(&litcode, litlen, sizeof(litlen));
-        construct(&lencode, lenlen, sizeof(lenlen));
-        construct(&distcode, distlen, sizeof(distlen));
-        virgin = 0;
-    }
-
-    /* read header */
-    lit = bits(s, 8);
-    if (lit > 1) return -1;
-    dict = bits(s, 8);
-    if (dict < 4 || dict > 6) return -2;
-
-    /* decode literals and length/distance pairs */
-    do {
-        if (bits(s, 1)) {
-            /* get length */
-            symbol = decode(s, &lencode);
-            len = base[symbol] + bits(s, extra[symbol]);
-            if (len == 519) break;              /* end code */
-
-            /* get distance */
-            symbol = len == 2 ? 2 : dict;
-            dist = decode(s, &distcode) << symbol;
-            dist += bits(s, symbol);
-            dist++;
-            if (s->first && dist > s->next)
-                return -3;              /* distance too far back */
-
-            /* copy length bytes from distance bytes back */
-            do {
-                to = s->out + s->next;
-                from = to - dist;
-                copy = MAXWIN;
-                if (s->next < dist) {
-                    from += copy;
-                    copy = dist;
-                }
-                copy -= s->next;
-                if (copy > len) copy = len;
-                len -= copy;
-                s->next += copy;
-                do {
-                    *to++ = *from++;
-                } while (--copy);
-                if (s->next == MAXWIN) {
-                    if (s->outfun(s->outhow, s->out, s->next)) return 1;
-                    s->next = 0;
-                    s->first = 0;
-                }
-            } while (len != 0);
-        }
-        else {
-            /* get literal and write it */
-            symbol = lit ? decode(s, &litcode) : bits(s, 8);
-            s->out[s->next++] = symbol;
-            if (s->next == MAXWIN) {
-                if (s->outfun(s->outhow, s->out, s->next)) return 1;
-                s->next = 0;
-                s->first = 0;
-            }
-        }
-    } while (1);
-    return 0;
-}
-
-/* See comments in blast.h */
-int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
-          unsigned *left, unsigned char **in)
-{
-    struct state s;             /* input/output state */
-    int err;                    /* return value */
-
-    /* initialize input state */
-    s.infun = infun;
-    s.inhow = inhow;
-    if (left != NULL && *left) {
-        s.left = *left;
-        s.in = *in;
-    }
-    else
-        s.left = 0;
-    s.bitbuf = 0;
-    s.bitcnt = 0;
-
-    /* initialize output state */
-    s.outfun = outfun;
-    s.outhow = outhow;
-    s.next = 0;
-    s.first = 1;
-
-    /* return if bits() or decode() tries to read past available input */
-    if (setjmp(s.env) != 0)             /* if came back here via longjmp(), */
-        err = 2;                        /*  then skip decomp(), return error */
-    else
-        err = decomp(&s);               /* decompress */
-
-    /* return unused input */
-    if (left != NULL)
-        *left = s.left;
-    if (in != NULL)
-        *in = s.left ? s.in : NULL;
-
-    /* write any leftover output and update the error code if needed */
-    if (err != 1 && s.next && s.outfun(s.outhow, s.out, s.next) && err == 0)
-        err = 1;
-    return err;
-}
-
-#ifdef TEST
-/* Example of how to use blast() */
-#include <stdio.h>
-#include <stdlib.h>
-
-#define CHUNK 16384
-
-local unsigned inf(void *how, unsigned char **buf)
-{
-    static unsigned char hold[CHUNK];
-
-    *buf = hold;
-    return fread(hold, 1, CHUNK, (FILE *)how);
-}
-
-local int outf(void *how, unsigned char *buf, unsigned len)
-{
-    return fwrite(buf, 1, len, (FILE *)how) != len;
-}
-
-/* Decompress a PKWare Compression Library stream from stdin to stdout */
-int main(void)
-{
-    int ret;
-    unsigned left;
-
-    /* decompress to stdout */
-    left = 0;
-    ret = blast(inf, stdin, outf, stdout, &left, NULL);
-    if (ret != 0)
-        fprintf(stderr, "blast error: %d\n", ret);
-
-    /* count any leftover bytes */
-    while (getchar() != EOF)
-        left++;
-    if (left)
-        fprintf(stderr, "blast warning: %u unused bytes of input\n", left);
-
-    /* return blast() error code */
-    return ret;
-}
-#endif
diff --git a/src/png/zlib/contrib/blast/blast.h b/src/png/zlib/contrib/blast/blast.h
deleted file mode 100644
index 6cf65eda1..000000000
--- a/src/png/zlib/contrib/blast/blast.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* blast.h -- interface for blast.c
-  Copyright (C) 2003, 2012, 2013 Mark Adler
-  version 1.3, 24 Aug 2013
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Mark Adler    madler@alumni.caltech.edu
- */
-
-
-/*
- * blast() decompresses the PKWare Data Compression Library (DCL) compressed
- * format.  It provides the same functionality as the explode() function in
- * that library.  (Note: PKWare overused the "implode" verb, and the format
- * used by their library implode() function is completely different and
- * incompatible with the implode compression method supported by PKZIP.)
- *
- * The binary mode for stdio functions should be used to assure that the
- * compressed data is not corrupted when read or written.  For example:
- * fopen(..., "rb") and fopen(..., "wb").
- */
-
-
-typedef unsigned (*blast_in)(void *how, unsigned char **buf);
-typedef int (*blast_out)(void *how, unsigned char *buf, unsigned len);
-/* Definitions for input/output functions passed to blast().  See below for
- * what the provided functions need to do.
- */
-
-
-int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
-          unsigned *left, unsigned char **in);
-/* Decompress input to output using the provided infun() and outfun() calls.
- * On success, the return value of blast() is zero.  If there is an error in
- * the source data, i.e. it is not in the proper format, then a negative value
- * is returned.  If there is not enough input available or there is not enough
- * output space, then a positive error is returned.
- *
- * The input function is invoked: len = infun(how, &buf), where buf is set by
- * infun() to point to the input buffer, and infun() returns the number of
- * available bytes there.  If infun() returns zero, then blast() returns with
- * an input error.  (blast() only asks for input if it needs it.)  inhow is for
- * use by the application to pass an input descriptor to infun(), if desired.
- *
- * If left and in are not NULL and *left is not zero when blast() is called,
- * then the *left bytes are *in are consumed for input before infun() is used.
- *
- * The output function is invoked: err = outfun(how, buf, len), where the bytes
- * to be written are buf[0..len-1].  If err is not zero, then blast() returns
- * with an output error.  outfun() is always called with len <= 4096.  outhow
- * is for use by the application to pass an output descriptor to outfun(), if
- * desired.
- *
- * If there is any unused input, *left is set to the number of bytes that were
- * read and *in points to them.  Otherwise *left is set to zero and *in is set
- * to NULL.  If left or in are NULL, then they are not set.
- *
- * The return codes are:
- *
- *   2:  ran out of input before completing decompression
- *   1:  output error before completing decompression
- *   0:  successful decompression
- *  -1:  literal flag not zero or one
- *  -2:  dictionary size not in 4..6
- *  -3:  distance is too far back
- *
- * At the bottom of blast.c is an example program that uses blast() that can be
- * compiled to produce a command-line decompression filter by defining TEST.
- */
diff --git a/src/png/zlib/contrib/blast/test.pk b/src/png/zlib/contrib/blast/test.pk
deleted file mode 100644
index be10b2bbb..000000000
Binary files a/src/png/zlib/contrib/blast/test.pk and /dev/null differ
diff --git a/src/png/zlib/contrib/blast/test.txt b/src/png/zlib/contrib/blast/test.txt
deleted file mode 100644
index bfdf1c5dc..000000000
--- a/src/png/zlib/contrib/blast/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-AIAIAIAIAIAIA
\ No newline at end of file
diff --git a/src/png/zlib/contrib/delphi/ZLib.pas b/src/png/zlib/contrib/delphi/ZLib.pas
deleted file mode 100644
index 060e19911..000000000
--- a/src/png/zlib/contrib/delphi/ZLib.pas
+++ /dev/null
@@ -1,557 +0,0 @@
-{*******************************************************}
-{                                                       }
-{       Borland Delphi Supplemental Components          }
-{       ZLIB Data Compression Interface Unit            }
-{                                                       }
-{       Copyright (c) 1997,99 Borland Corporation       }
-{                                                       }
-{*******************************************************}
-
-{ Updated for zlib 1.2.x by Cosmin Truta <cosmint@cs.ubbcluj.ro> }
-
-unit ZLib;
-
-interface
-
-uses SysUtils, Classes;
-
-type
-  TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
-  TFree = procedure (AppData, Block: Pointer); cdecl;
-
-  // Internal structure.  Ignore.
-  TZStreamRec = packed record
-    next_in: PChar;       // next input byte
-    avail_in: Integer;    // number of bytes available at next_in
-    total_in: Longint;    // total nb of input bytes read so far
-
-    next_out: PChar;      // next output byte should be put here
-    avail_out: Integer;   // remaining free space at next_out
-    total_out: Longint;   // total nb of bytes output so far
-
-    msg: PChar;           // last error message, NULL if no error
-    internal: Pointer;    // not visible by applications
-
-    zalloc: TAlloc;       // used to allocate the internal state
-    zfree: TFree;         // used to free the internal state
-    AppData: Pointer;     // private data object passed to zalloc and zfree
-
-    data_type: Integer;   // best guess about the data type: ascii or binary
-    adler: Longint;       // adler32 value of the uncompressed data
-    reserved: Longint;    // reserved for future use
-  end;
-
-  // Abstract ancestor class
-  TCustomZlibStream = class(TStream)
-  private
-    FStrm: TStream;
-    FStrmPos: Integer;
-    FOnProgress: TNotifyEvent;
-    FZRec: TZStreamRec;
-    FBuffer: array [Word] of Char;
-  protected
-    procedure Progress(Sender: TObject); dynamic;
-    property OnProgress: TNotifyEvent read FOnProgress write FOnProgress;
-    constructor Create(Strm: TStream);
-  end;
-
-{ TCompressionStream compresses data on the fly as data is written to it, and
-  stores the compressed data to another stream.
-
-  TCompressionStream is write-only and strictly sequential. Reading from the
-  stream will raise an exception. Using Seek to move the stream pointer
-  will raise an exception.
-
-  Output data is cached internally, written to the output stream only when
-  the internal output buffer is full.  All pending output data is flushed
-  when the stream is destroyed.
-
-  The Position property returns the number of uncompressed bytes of
-  data that have been written to the stream so far.
-
-  CompressionRate returns the on-the-fly percentage by which the original
-  data has been compressed:  (1 - (CompressedBytes / UncompressedBytes)) * 100
-  If raw data size = 100 and compressed data size = 25, the CompressionRate
-  is 75%
-
-  The OnProgress event is called each time the output buffer is filled and
-  written to the output stream.  This is useful for updating a progress
-  indicator when you are writing a large chunk of data to the compression
-  stream in a single call.}
-
-
-  TCompressionLevel = (clNone, clFastest, clDefault, clMax);
-
-  TCompressionStream = class(TCustomZlibStream)
-  private
-    function GetCompressionRate: Single;
-  public
-    constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream);
-    destructor Destroy; override;
-    function Read(var Buffer; Count: Longint): Longint; override;
-    function Write(const Buffer; Count: Longint): Longint; override;
-    function Seek(Offset: Longint; Origin: Word): Longint; override;
-    property CompressionRate: Single read GetCompressionRate;
-    property OnProgress;
-  end;
-
-{ TDecompressionStream decompresses data on the fly as data is read from it.
-
-  Compressed data comes from a separate source stream.  TDecompressionStream
-  is read-only and unidirectional; you can seek forward in the stream, but not
-  backwards.  The special case of setting the stream position to zero is
-  allowed.  Seeking forward decompresses data until the requested position in
-  the uncompressed data has been reached.  Seeking backwards, seeking relative
-  to the end of the stream, requesting the size of the stream, and writing to
-  the stream will raise an exception.
-
-  The Position property returns the number of bytes of uncompressed data that
-  have been read from the stream so far.
-
-  The OnProgress event is called each time the internal input buffer of
-  compressed data is exhausted and the next block is read from the input stream.
-  This is useful for updating a progress indicator when you are reading a
-  large chunk of data from the decompression stream in a single call.}
-
-  TDecompressionStream = class(TCustomZlibStream)
-  public
-    constructor Create(Source: TStream);
-    destructor Destroy; override;
-    function Read(var Buffer; Count: Longint): Longint; override;
-    function Write(const Buffer; Count: Longint): Longint; override;
-    function Seek(Offset: Longint; Origin: Word): Longint; override;
-    property OnProgress;
-  end;
-
-
-
-{ CompressBuf compresses data, buffer to buffer, in one call.
-   In: InBuf = ptr to compressed data
-       InBytes = number of bytes in InBuf
-  Out: OutBuf = ptr to newly allocated buffer containing decompressed data
-       OutBytes = number of bytes in OutBuf   }
-procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
-                      out OutBuf: Pointer; out OutBytes: Integer);
-
-
-{ DecompressBuf decompresses data, buffer to buffer, in one call.
-   In: InBuf = ptr to compressed data
-       InBytes = number of bytes in InBuf
-       OutEstimate = zero, or est. size of the decompressed data
-  Out: OutBuf = ptr to newly allocated buffer containing decompressed data
-       OutBytes = number of bytes in OutBuf   }
-procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
- OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
-
-{ DecompressToUserBuf decompresses data, buffer to buffer, in one call.
-   In: InBuf = ptr to compressed data
-       InBytes = number of bytes in InBuf
-  Out: OutBuf = ptr to user-allocated buffer to contain decompressed data
-       BufSize = number of bytes in OutBuf   }
-procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
-  const OutBuf: Pointer; BufSize: Integer);
-
-const
-  zlib_version = '1.2.11';
-
-type
-  EZlibError = class(Exception);
-  ECompressionError = class(EZlibError);
-  EDecompressionError = class(EZlibError);
-
-implementation
-
-uses ZLibConst;
-
-const
-  Z_NO_FLUSH      = 0;
-  Z_PARTIAL_FLUSH = 1;
-  Z_SYNC_FLUSH    = 2;
-  Z_FULL_FLUSH    = 3;
-  Z_FINISH        = 4;
-
-  Z_OK            = 0;
-  Z_STREAM_END    = 1;
-  Z_NEED_DICT     = 2;
-  Z_ERRNO         = (-1);
-  Z_STREAM_ERROR  = (-2);
-  Z_DATA_ERROR    = (-3);
-  Z_MEM_ERROR     = (-4);
-  Z_BUF_ERROR     = (-5);
-  Z_VERSION_ERROR = (-6);
-
-  Z_NO_COMPRESSION       =   0;
-  Z_BEST_SPEED           =   1;
-  Z_BEST_COMPRESSION     =   9;
-  Z_DEFAULT_COMPRESSION  = (-1);
-
-  Z_FILTERED            = 1;
-  Z_HUFFMAN_ONLY        = 2;
-  Z_RLE                 = 3;
-  Z_DEFAULT_STRATEGY    = 0;
-
-  Z_BINARY   = 0;
-  Z_ASCII    = 1;
-  Z_UNKNOWN  = 2;
-
-  Z_DEFLATED = 8;
-
-
-{$L adler32.obj}
-{$L compress.obj}
-{$L crc32.obj}
-{$L deflate.obj}
-{$L infback.obj}
-{$L inffast.obj}
-{$L inflate.obj}
-{$L inftrees.obj}
-{$L trees.obj}
-{$L uncompr.obj}
-{$L zutil.obj}
-
-procedure adler32; external;
-procedure compressBound; external;
-procedure crc32; external;
-procedure deflateInit2_; external;
-procedure deflateParams; external;
-
-function _malloc(Size: Integer): Pointer; cdecl;
-begin
-  Result := AllocMem(Size);
-end;
-
-procedure _free(Block: Pointer); cdecl;
-begin
-  FreeMem(Block);
-end;
-
-procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
-begin
-  FillChar(P^, count, B);
-end;
-
-procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
-begin
-  Move(source^, dest^, count);
-end;
-
-
-
-// deflate compresses data
-function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar;
-  recsize: Integer): Integer; external;
-function deflate(var strm: TZStreamRec; flush: Integer): Integer; external;
-function deflateEnd(var strm: TZStreamRec): Integer; external;
-
-// inflate decompresses data
-function inflateInit_(var strm: TZStreamRec; version: PChar;
-  recsize: Integer): Integer; external;
-function inflate(var strm: TZStreamRec; flush: Integer): Integer; external;
-function inflateEnd(var strm: TZStreamRec): Integer; external;
-function inflateReset(var strm: TZStreamRec): Integer; external;
-
-
-function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
-begin
-//  GetMem(Result, Items*Size);
-  Result := AllocMem(Items * Size);
-end;
-
-procedure zlibFreeMem(AppData, Block: Pointer); cdecl;
-begin
-  FreeMem(Block);
-end;
-
-{function zlibCheck(code: Integer): Integer;
-begin
-  Result := code;
-  if code < 0 then
-    raise EZlibError.Create('error');    //!!
-end;}
-
-function CCheck(code: Integer): Integer;
-begin
-  Result := code;
-  if code < 0 then
-    raise ECompressionError.Create('error'); //!!
-end;
-
-function DCheck(code: Integer): Integer;
-begin
-  Result := code;
-  if code < 0 then
-    raise EDecompressionError.Create('error');  //!!
-end;
-
-procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
-                      out OutBuf: Pointer; out OutBytes: Integer);
-var
-  strm: TZStreamRec;
-  P: Pointer;
-begin
-  FillChar(strm, sizeof(strm), 0);
-  strm.zalloc := zlibAllocMem;
-  strm.zfree := zlibFreeMem;
-  OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255;
-  GetMem(OutBuf, OutBytes);
-  try
-    strm.next_in := InBuf;
-    strm.avail_in := InBytes;
-    strm.next_out := OutBuf;
-    strm.avail_out := OutBytes;
-    CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm)));
-    try
-      while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do
-      begin
-        P := OutBuf;
-        Inc(OutBytes, 256);
-        ReallocMem(OutBuf, OutBytes);
-        strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
-        strm.avail_out := 256;
-      end;
-    finally
-      CCheck(deflateEnd(strm));
-    end;
-    ReallocMem(OutBuf, strm.total_out);
-    OutBytes := strm.total_out;
-  except
-    FreeMem(OutBuf);
-    raise
-  end;
-end;
-
-
-procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
-  OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
-var
-  strm: TZStreamRec;
-  P: Pointer;
-  BufInc: Integer;
-begin
-  FillChar(strm, sizeof(strm), 0);
-  strm.zalloc := zlibAllocMem;
-  strm.zfree := zlibFreeMem;
-  BufInc := (InBytes + 255) and not 255;
-  if OutEstimate = 0 then
-    OutBytes := BufInc
-  else
-    OutBytes := OutEstimate;
-  GetMem(OutBuf, OutBytes);
-  try
-    strm.next_in := InBuf;
-    strm.avail_in := InBytes;
-    strm.next_out := OutBuf;
-    strm.avail_out := OutBytes;
-    DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
-    try
-      while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do
-      begin
-        P := OutBuf;
-        Inc(OutBytes, BufInc);
-        ReallocMem(OutBuf, OutBytes);
-        strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
-        strm.avail_out := BufInc;
-      end;
-    finally
-      DCheck(inflateEnd(strm));
-    end;
-    ReallocMem(OutBuf, strm.total_out);
-    OutBytes := strm.total_out;
-  except
-    FreeMem(OutBuf);
-    raise
-  end;
-end;
-
-procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
-  const OutBuf: Pointer; BufSize: Integer);
-var
-  strm: TZStreamRec;
-begin
-  FillChar(strm, sizeof(strm), 0);
-  strm.zalloc := zlibAllocMem;
-  strm.zfree := zlibFreeMem;
-  strm.next_in := InBuf;
-  strm.avail_in := InBytes;
-  strm.next_out := OutBuf;
-  strm.avail_out := BufSize;
-  DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
-  try
-    if DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END then
-      raise EZlibError.CreateRes(@sTargetBufferTooSmall);
-  finally
-    DCheck(inflateEnd(strm));
-  end;
-end;
-
-// TCustomZlibStream
-
-constructor TCustomZLibStream.Create(Strm: TStream);
-begin
-  inherited Create;
-  FStrm := Strm;
-  FStrmPos := Strm.Position;
-  FZRec.zalloc := zlibAllocMem;
-  FZRec.zfree := zlibFreeMem;
-end;
-
-procedure TCustomZLibStream.Progress(Sender: TObject);
-begin
-  if Assigned(FOnProgress) then FOnProgress(Sender);
-end;
-
-
-// TCompressionStream
-
-constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel;
-  Dest: TStream);
-const
-  Levels: array [TCompressionLevel] of ShortInt =
-    (Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION);
-begin
-  inherited Create(Dest);
-  FZRec.next_out := FBuffer;
-  FZRec.avail_out := sizeof(FBuffer);
-  CCheck(deflateInit_(FZRec, Levels[CompressionLevel], zlib_version, sizeof(FZRec)));
-end;
-
-destructor TCompressionStream.Destroy;
-begin
-  FZRec.next_in := nil;
-  FZRec.avail_in := 0;
-  try
-    if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
-    while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END)
-      and (FZRec.avail_out = 0) do
-    begin
-      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
-      FZRec.next_out := FBuffer;
-      FZRec.avail_out := sizeof(FBuffer);
-    end;
-    if FZRec.avail_out < sizeof(FBuffer) then
-      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out);
-  finally
-    deflateEnd(FZRec);
-  end;
-  inherited Destroy;
-end;
-
-function TCompressionStream.Read(var Buffer; Count: Longint): Longint;
-begin
-  raise ECompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TCompressionStream.Write(const Buffer; Count: Longint): Longint;
-begin
-  FZRec.next_in := @Buffer;
-  FZRec.avail_in := Count;
-  if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
-  while (FZRec.avail_in > 0) do
-  begin
-    CCheck(deflate(FZRec, 0));
-    if FZRec.avail_out = 0 then
-    begin
-      FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
-      FZRec.next_out := FBuffer;
-      FZRec.avail_out := sizeof(FBuffer);
-      FStrmPos := FStrm.Position;
-      Progress(Self);
-    end;
-  end;
-  Result := Count;
-end;
-
-function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
-begin
-  if (Offset = 0) and (Origin = soFromCurrent) then
-    Result := FZRec.total_in
-  else
-    raise ECompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TCompressionStream.GetCompressionRate: Single;
-begin
-  if FZRec.total_in = 0 then
-    Result := 0
-  else
-    Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0;
-end;
-
-
-// TDecompressionStream
-
-constructor TDecompressionStream.Create(Source: TStream);
-begin
-  inherited Create(Source);
-  FZRec.next_in := FBuffer;
-  FZRec.avail_in := 0;
-  DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec)));
-end;
-
-destructor TDecompressionStream.Destroy;
-begin
-  FStrm.Seek(-FZRec.avail_in, 1);
-  inflateEnd(FZRec);
-  inherited Destroy;
-end;
-
-function TDecompressionStream.Read(var Buffer; Count: Longint): Longint;
-begin
-  FZRec.next_out := @Buffer;
-  FZRec.avail_out := Count;
-  if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
-  while (FZRec.avail_out > 0) do
-  begin
-    if FZRec.avail_in = 0 then
-    begin
-      FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer));
-      if FZRec.avail_in = 0 then
-      begin
-        Result := Count - FZRec.avail_out;
-        Exit;
-      end;
-      FZRec.next_in := FBuffer;
-      FStrmPos := FStrm.Position;
-      Progress(Self);
-    end;
-    CCheck(inflate(FZRec, 0));
-  end;
-  Result := Count;
-end;
-
-function TDecompressionStream.Write(const Buffer; Count: Longint): Longint;
-begin
-  raise EDecompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
-var
-  I: Integer;
-  Buf: array [0..4095] of Char;
-begin
-  if (Offset = 0) and (Origin = soFromBeginning) then
-  begin
-    DCheck(inflateReset(FZRec));
-    FZRec.next_in := FBuffer;
-    FZRec.avail_in := 0;
-    FStrm.Position := 0;
-    FStrmPos := 0;
-  end
-  else if ( (Offset >= 0) and (Origin = soFromCurrent)) or
-          ( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then
-  begin
-    if Origin = soFromBeginning then Dec(Offset, FZRec.total_out);
-    if Offset > 0 then
-    begin
-      for I := 1 to Offset div sizeof(Buf) do
-        ReadBuffer(Buf, sizeof(Buf));
-      ReadBuffer(Buf, Offset mod sizeof(Buf));
-    end;
-  end
-  else
-    raise EDecompressionError.CreateRes(@sInvalidStreamOp);
-  Result := FZRec.total_out;
-end;
-
-
-end.
diff --git a/src/png/zlib/contrib/delphi/ZLibConst.pas b/src/png/zlib/contrib/delphi/ZLibConst.pas
deleted file mode 100644
index cdfe13671..000000000
--- a/src/png/zlib/contrib/delphi/ZLibConst.pas
+++ /dev/null
@@ -1,11 +0,0 @@
-unit ZLibConst;
-
-interface
-
-resourcestring
-  sTargetBufferTooSmall = 'ZLib error: target buffer may be too small';
-  sInvalidStreamOp = 'Invalid stream operation';
-
-implementation
-
-end.
diff --git a/src/png/zlib/contrib/delphi/readme.txt b/src/png/zlib/contrib/delphi/readme.txt
deleted file mode 100644
index 2dc9a8bba..000000000
--- a/src/png/zlib/contrib/delphi/readme.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-
-Overview
-========
-
-This directory contains an update to the ZLib interface unit,
-distributed by Borland as a Delphi supplemental component.
-
-The original ZLib unit is Copyright (c) 1997,99 Borland Corp.,
-and is based on zlib version 1.0.4.  There are a series of bugs
-and security problems associated with that old zlib version, and
-we recommend the users to update their ZLib unit.
-
-
-Summary of modifications
-========================
-
-- Improved makefile, adapted to zlib version 1.2.1.
-
-- Some field types from TZStreamRec are changed from Integer to
-  Longint, for consistency with the zlib.h header, and for 64-bit
-  readiness.
-
-- The zlib_version constant is updated.
-
-- The new Z_RLE strategy has its corresponding symbolic constant.
-
-- The allocation and deallocation functions and function types
-  (TAlloc, TFree, zlibAllocMem and zlibFreeMem) are now cdecl,
-  and _malloc and _free are added as C RTL stubs.  As a result,
-  the original C sources of zlib can be compiled out of the box,
-  and linked to the ZLib unit.
-
-
-Suggestions for improvements
-============================
-
-Currently, the ZLib unit provides only a limited wrapper around
-the zlib library, and much of the original zlib functionality is
-missing.  Handling compressed file formats like ZIP/GZIP or PNG
-cannot be implemented without having this functionality.
-Applications that handle these formats are either using their own,
-duplicated code, or not using the ZLib unit at all.
-
-Here are a few suggestions:
-
-- Checksum class wrappers around adler32() and crc32(), similar
-  to the Java classes that implement the java.util.zip.Checksum
-  interface.
-
-- The ability to read and write raw deflate streams, without the
-  zlib stream header and trailer.  Raw deflate streams are used
-  in the ZIP file format.
-
-- The ability to read and write gzip streams, used in the GZIP
-  file format, and normally produced by the gzip program.
-
-- The ability to select a different compression strategy, useful
-  to PNG and MNG image compression, and to multimedia compression
-  in general.  Besides the compression level
-
-    TCompressionLevel = (clNone, clFastest, clDefault, clMax);
-
-  which, in fact, could have used the 'z' prefix and avoided
-  TColor-like symbols
-
-    TCompressionLevel = (zcNone, zcFastest, zcDefault, zcMax);
-
-  there could be a compression strategy
-
-    TCompressionStrategy = (zsDefault, zsFiltered, zsHuffmanOnly, zsRle);
-
-- ZIP and GZIP stream handling via TStreams.
-
-
---
-Cosmin Truta <cosmint@cs.ubbcluj.ro>
diff --git a/src/png/zlib/contrib/delphi/zlibd32.mak b/src/png/zlib/contrib/delphi/zlibd32.mak
deleted file mode 100644
index 9bb00b7cc..000000000
--- a/src/png/zlib/contrib/delphi/zlibd32.mak
+++ /dev/null
@@ -1,99 +0,0 @@
-# Makefile for zlib
-# For use with Delphi and C++ Builder under Win32
-# Updated for zlib 1.2.x by Cosmin Truta
-
-# ------------ Borland C++ ------------
-
-# This project uses the Delphi (fastcall/register) calling convention:
-LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
-
-CC = bcc32
-LD = bcc32
-AR = tlib
-# do not use "-pr" in CFLAGS
-CFLAGS = -a -d -k- -O2 $(LOC)
-LDFLAGS =
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del *.obj
-	-del *.exe
-	-del *.lib
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz
-
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib.build b/src/png/zlib/contrib/dotzlib/DotZLib.build
deleted file mode 100644
index e69630cec..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib.build
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="DotZLib" default="build" basedir="./DotZLib">
-	<description>A .Net wrapper library around ZLib1.dll</description>
-
-	<property name="nunit.location" value="c:/program files/NUnit V2.1/bin" />
-	<property name="build.root" value="bin" />
-
-	<property name="debug" value="true" />
-	<property name="nunit" value="true" />
-
-	<property name="build.folder" value="${build.root}/debug/" if="${debug}" />
-	<property name="build.folder" value="${build.root}/release/" unless="${debug}" />
-
-	<target name="clean" description="Remove all generated files">
-		<delete dir="${build.root}" failonerror="false" />
-	</target>
-
-	<target name="build" description="compiles the source code">
-
-		<mkdir dir="${build.folder}" />
-		<csc target="library" output="${build.folder}DotZLib.dll" debug="${debug}">
-			<references basedir="${nunit.location}">
-				<includes if="${nunit}" name="nunit.framework.dll" />
-			</references>
-			<sources>
-				<includes name="*.cs" />
-				<excludes name="UnitTests.cs" unless="${nunit}" />
-			</sources>
-			<arg value="/d:nunit" if="${nunit}" />
-		</csc>
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib.chm b/src/png/zlib/contrib/dotzlib/DotZLib.chm
deleted file mode 100644
index f214a444a..000000000
Binary files a/src/png/zlib/contrib/dotzlib/DotZLib.chm and /dev/null differ
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib.sln b/src/png/zlib/contrib/dotzlib/DotZLib.sln
deleted file mode 100644
index 5d533d6bc..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET
-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET
-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET
-		{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/src/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
deleted file mode 100644
index 724c5347f..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("DotZLib")]
-[assembly: AssemblyDescription(".Net bindings for ZLib compression dll 1.2.x")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Henrik Ravn")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing.
-//
-// Notes:
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/src/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
deleted file mode 100644
index b110dae6a..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-
-
-namespace DotZLib
-{
-    #region ChecksumGeneratorBase
-    /// <summary>
-    /// Implements the common functionality needed for all <see cref="ChecksumGenerator"/>s
-    /// </summary>
-    /// <example></example>
-    public abstract class ChecksumGeneratorBase : ChecksumGenerator
-    {
-        /// <summary>
-        /// The value of the current checksum
-        /// </summary>
-        protected uint _current;
-
-        /// <summary>
-        /// Initializes a new instance of the checksum generator base - the current checksum is
-        /// set to zero
-        /// </summary>
-        public ChecksumGeneratorBase()
-        {
-            _current = 0;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the checksum generator basewith a specified value
-        /// </summary>
-        /// <param name="initialValue">The value to set the current checksum to</param>
-        public ChecksumGeneratorBase(uint initialValue)
-        {
-            _current = initialValue;
-        }
-
-        /// <summary>
-        /// Resets the current checksum to zero
-        /// </summary>
-        public void Reset() { _current = 0; }
-
-        /// <summary>
-        /// Gets the current checksum value
-        /// </summary>
-        public uint Value { get { return _current; } }
-
-        /// <summary>
-        /// Updates the current checksum with part of an array of bytes
-        /// </summary>
-        /// <param name="data">The data to update the checksum with</param>
-        /// <param name="offset">Where in <c>data</c> to start updating</param>
-        /// <param name="count">The number of bytes from <c>data</c> to use</param>
-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
-        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
-        /// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one.
-        /// This is therefore the only method a derived class has to implement</remarks>
-        public abstract void Update(byte[] data, int offset, int count);
-
-        /// <summary>
-        /// Updates the current checksum with an array of bytes.
-        /// </summary>
-        /// <param name="data">The data to update the checksum with</param>
-        public void Update(byte[] data)
-        {
-            Update(data, 0, data.Length);
-        }
-
-        /// <summary>
-        /// Updates the current checksum with the data from a string
-        /// </summary>
-        /// <param name="data">The string to update the checksum with</param>
-        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>
-        public void Update(string data)
-        {
-			Update(Encoding.UTF8.GetBytes(data));
-        }
-
-        /// <summary>
-        /// Updates the current checksum with the data from a string, using a specific encoding
-        /// </summary>
-        /// <param name="data">The string to update the checksum with</param>
-        /// <param name="encoding">The encoding to use</param>
-        public void Update(string data, Encoding encoding)
-        {
-            Update(encoding.GetBytes(data));
-        }
-
-    }
-    #endregion
-
-    #region CRC32
-    /// <summary>
-    /// Implements a CRC32 checksum generator
-    /// </summary>
-    public sealed class CRC32Checksum : ChecksumGeneratorBase
-    {
-        #region DLL imports
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern uint crc32(uint crc, int data, uint length);
-
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the CRC32 checksum generator
-        /// </summary>
-        public CRC32Checksum() : base() {}
-
-        /// <summary>
-        /// Initializes a new instance of the CRC32 checksum generator with a specified value
-        /// </summary>
-        /// <param name="initialValue">The value to set the current checksum to</param>
-        public CRC32Checksum(uint initialValue) : base(initialValue) {}
-
-        /// <summary>
-        /// Updates the current checksum with part of an array of bytes
-        /// </summary>
-        /// <param name="data">The data to update the checksum with</param>
-        /// <param name="offset">Where in <c>data</c> to start updating</param>
-        /// <param name="count">The number of bytes from <c>data</c> to use</param>
-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
-        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
-        public override void Update(byte[] data, int offset, int count)
-        {
-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
-            if ((offset+count) > data.Length) throw new ArgumentException();
-            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
-            try
-            {
-                _current = crc32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
-            }
-            finally
-            {
-                hData.Free();
-            }
-        }
-
-    }
-    #endregion
-
-    #region Adler
-    /// <summary>
-    /// Implements a checksum generator that computes the Adler checksum on data
-    /// </summary>
-    public sealed class AdlerChecksum : ChecksumGeneratorBase
-    {
-        #region DLL imports
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern uint adler32(uint adler, int data, uint length);
-
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the Adler checksum generator
-        /// </summary>
-        public AdlerChecksum() : base() {}
-
-        /// <summary>
-        /// Initializes a new instance of the Adler checksum generator with a specified value
-        /// </summary>
-        /// <param name="initialValue">The value to set the current checksum to</param>
-        public AdlerChecksum(uint initialValue) : base(initialValue) {}
-
-        /// <summary>
-        /// Updates the current checksum with part of an array of bytes
-        /// </summary>
-        /// <param name="data">The data to update the checksum with</param>
-        /// <param name="offset">Where in <c>data</c> to start updating</param>
-        /// <param name="count">The number of bytes from <c>data</c> to use</param>
-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
-        /// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
-        public override void Update(byte[] data, int offset, int count)
-        {
-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
-            if ((offset+count) > data.Length) throw new ArgumentException();
-            GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned);
-            try
-            {
-                _current = adler32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count);
-            }
-            finally
-            {
-                hData.Free();
-            }
-        }
-
-    }
-    #endregion
-
-}
\ No newline at end of file
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/src/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
deleted file mode 100644
index 9c8d60195..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.Diagnostics;
-
-namespace DotZLib
-{
-
-	/// <summary>
-	/// This class implements a circular buffer
-	/// </summary>
-	internal class CircularBuffer
-	{
-        #region Private data
-        private int _capacity;
-        private int _head;
-        private int _tail;
-        private int _size;
-        private byte[] _buffer;
-        #endregion
-
-        public CircularBuffer(int capacity)
-        {
-            Debug.Assert( capacity > 0 );
-            _buffer = new byte[capacity];
-            _capacity = capacity;
-            _head = 0;
-            _tail = 0;
-            _size = 0;
-        }
-
-        public int Size { get { return _size; } }
-
-        public int Put(byte[] source, int offset, int count)
-        {
-            Debug.Assert( count > 0 );
-            int trueCount = Math.Min(count, _capacity - Size);
-            for (int i = 0; i < trueCount; ++i)
-                _buffer[(_tail+i) % _capacity] = source[offset+i];
-            _tail += trueCount;
-            _tail %= _capacity;
-            _size += trueCount;
-            return trueCount;
-        }
-
-        public bool Put(byte b)
-        {
-            if (Size == _capacity) // no room
-                return false;
-            _buffer[_tail++] = b;
-            _tail %= _capacity;
-            ++_size;
-            return true;
-        }
-
-        public int Get(byte[] destination, int offset, int count)
-        {
-            int trueCount = Math.Min(count,Size);
-            for (int i = 0; i < trueCount; ++i)
-                destination[offset + i] = _buffer[(_head+i) % _capacity];
-            _head += trueCount;
-            _head %= _capacity;
-            _size -= trueCount;
-            return trueCount;
-        }
-
-        public int Get()
-        {
-            if (Size == 0)
-                return -1;
-
-            int result = (int)_buffer[_head++ % _capacity];
-            --_size;
-            return result;
-        }
-
-    }
-}
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/src/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
deleted file mode 100644
index b0eb78a02..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace DotZLib
-{
-	/// <summary>
-	/// Implements the common functionality needed for all <see cref="Codec"/>s
-	/// </summary>
-	public abstract class CodecBase : Codec, IDisposable
-	{
-
-        #region Data members
-
-        /// <summary>
-        /// Instance of the internal zlib buffer structure that is
-        /// passed to all functions in the zlib dll
-        /// </summary>
-        internal ZStream _ztream = new ZStream();
-
-        /// <summary>
-        /// True if the object instance has been disposed, false otherwise
-        /// </summary>
-        protected bool _isDisposed = false;
-
-        /// <summary>
-        /// The size of the internal buffers
-        /// </summary>
-        protected const int kBufferSize = 16384;
-
-        private byte[] _outBuffer = new byte[kBufferSize];
-        private byte[] _inBuffer = new byte[kBufferSize];
-
-        private GCHandle _hInput;
-        private GCHandle _hOutput;
-
-        private uint _checksum = 0;
-
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the <c>CodeBase</c> class.
-        /// </summary>
-		public CodecBase()
-		{
-            try
-            {
-                _hInput = GCHandle.Alloc(_inBuffer, GCHandleType.Pinned);
-                _hOutput = GCHandle.Alloc(_outBuffer, GCHandleType.Pinned);
-            }
-            catch (Exception)
-            {
-                CleanUp(false);
-                throw;
-            }
-        }
-
-
-        #region Codec Members
-
-        /// <summary>
-        /// Occurs when more processed data are available.
-        /// </summary>
-        public event DataAvailableHandler DataAvailable;
-
-        /// <summary>
-        /// Fires the <see cref="DataAvailable"/> event
-        /// </summary>
-        protected void OnDataAvailable()
-        {
-            if (_ztream.total_out > 0)
-            {
-                if (DataAvailable != null)
-                    DataAvailable( _outBuffer, 0, (int)_ztream.total_out);
-                resetOutput();
-            }
-        }
-
-        /// <summary>
-        /// Adds more data to the codec to be processed.
-        /// </summary>
-        /// <param name="data">Byte array containing the data to be added to the codec</param>
-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
-        public void Add(byte[] data)
-        {
-            Add(data,0,data.Length);
-        }
-
-        /// <summary>
-        /// Adds more data to the codec to be processed.
-        /// </summary>
-        /// <param name="data">Byte array containing the data to be added to the codec</param>
-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
-        /// <param name="count">The number of bytes to add</param>
-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
-        /// <remarks>This must be implemented by a derived class</remarks>
-        public abstract void Add(byte[] data, int offset, int count);
-
-        /// <summary>
-        /// Finishes up any pending data that needs to be processed and handled.
-        /// </summary>
-        /// <remarks>This must be implemented by a derived class</remarks>
-        public abstract void Finish();
-
-        /// <summary>
-        /// Gets the checksum of the data that has been added so far
-        /// </summary>
-        public uint Checksum { get { return _checksum; } }
-
-        #endregion
-
-        #region Destructor & IDisposable stuff
-
-        /// <summary>
-        /// Destroys this instance
-        /// </summary>
-        ~CodecBase()
-        {
-            CleanUp(false);
-        }
-
-        /// <summary>
-        /// Releases any unmanaged resources and calls the <see cref="CleanUp()"/> method of the derived class
-        /// </summary>
-        public void Dispose()
-        {
-            CleanUp(true);
-        }
-
-        /// <summary>
-        /// Performs any codec specific cleanup
-        /// </summary>
-        /// <remarks>This must be implemented by a derived class</remarks>
-        protected abstract void CleanUp();
-
-        // performs the release of the handles and calls the dereived CleanUp()
-        private void CleanUp(bool isDisposing)
-        {
-            if (!_isDisposed)
-            {
-                CleanUp();
-                if (_hInput.IsAllocated)
-                    _hInput.Free();
-                if (_hOutput.IsAllocated)
-                    _hOutput.Free();
-
-                _isDisposed = true;
-            }
-        }
-
-
-        #endregion
-
-        #region Helper methods
-
-        /// <summary>
-        /// Copies a number of bytes to the internal codec buffer - ready for proccesing
-        /// </summary>
-        /// <param name="data">The byte array that contains the data to copy</param>
-        /// <param name="startIndex">The index of the first byte to copy</param>
-        /// <param name="count">The number of bytes to copy from <c>data</c></param>
-        protected void copyInput(byte[] data, int startIndex, int count)
-        {
-            Array.Copy(data, startIndex, _inBuffer,0, count);
-            _ztream.next_in = _hInput.AddrOfPinnedObject();
-            _ztream.total_in = 0;
-            _ztream.avail_in = (uint)count;
-
-        }
-
-        /// <summary>
-        /// Resets the internal output buffers to a known state - ready for processing
-        /// </summary>
-        protected void resetOutput()
-        {
-            _ztream.total_out = 0;
-            _ztream.avail_out = kBufferSize;
-            _ztream.next_out = _hOutput.AddrOfPinnedObject();
-        }
-
-        /// <summary>
-        /// Updates the running checksum property
-        /// </summary>
-        /// <param name="newSum">The new checksum value</param>
-        protected void setChecksum(uint newSum)
-        {
-            _checksum = newSum;
-        }
-        #endregion
-
-    }
-}
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/src/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs
deleted file mode 100644
index 9039f41f6..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/Deflater.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace DotZLib
-{
-
-    /// <summary>
-    /// Implements a data compressor, using the deflate algorithm in the ZLib dll
-    /// </summary>
-	public sealed class Deflater : CodecBase
-	{
-        #region Dll imports
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
-        private static extern int deflateInit_(ref ZStream sz, int level, string vs, int size);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int deflate(ref ZStream sz, int flush);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int deflateReset(ref ZStream sz);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int deflateEnd(ref ZStream sz);
-        #endregion
-
-        /// <summary>
-        /// Constructs an new instance of the <c>Deflater</c>
-        /// </summary>
-        /// <param name="level">The compression level to use for this <c>Deflater</c></param>
-		public Deflater(CompressLevel level) : base()
-		{
-            int retval = deflateInit_(ref _ztream, (int)level, Info.Version, Marshal.SizeOf(_ztream));
-            if (retval != 0)
-                throw new ZLibException(retval, "Could not initialize deflater");
-
-            resetOutput();
-		}
-
-        /// <summary>
-        /// Adds more data to the codec to be processed.
-        /// </summary>
-        /// <param name="data">Byte array containing the data to be added to the codec</param>
-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
-        /// <param name="count">The number of bytes to add</param>
-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
-        public override void Add(byte[] data, int offset, int count)
-        {
-            if (data == null) throw new ArgumentNullException();
-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
-            if ((offset+count) > data.Length) throw new ArgumentException();
-
-            int total = count;
-            int inputIndex = offset;
-            int err = 0;
-
-            while (err >= 0 && inputIndex < total)
-            {
-                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));
-                while (err >= 0 && _ztream.avail_in > 0)
-                {
-                    err = deflate(ref _ztream, (int)FlushTypes.None);
-                    if (err == 0)
-                        while (_ztream.avail_out == 0)
-                        {
-                            OnDataAvailable();
-                            err = deflate(ref _ztream, (int)FlushTypes.None);
-                        }
-                    inputIndex += (int)_ztream.total_in;
-                }
-            }
-            setChecksum( _ztream.adler );
-        }
-
-
-        /// <summary>
-        /// Finishes up any pending data that needs to be processed and handled.
-        /// </summary>
-        public override void Finish()
-        {
-            int err;
-            do
-            {
-                err = deflate(ref _ztream, (int)FlushTypes.Finish);
-                OnDataAvailable();
-            }
-            while (err == 0);
-            setChecksum( _ztream.adler );
-            deflateReset(ref _ztream);
-            resetOutput();
-        }
-
-        /// <summary>
-        /// Closes the internal zlib deflate stream
-        /// </summary>
-        protected override void CleanUp() { deflateEnd(ref _ztream); }
-
-    }
-}
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
deleted file mode 100644
index 90c7c3b38..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-
-
-namespace DotZLib
-{
-
-    #region Internal types
-
-    /// <summary>
-    /// Defines constants for the various flush types used with zlib
-    /// </summary>
-    internal enum FlushTypes
-    {
-        None,  Partial,  Sync,  Full,  Finish,  Block
-    }
-
-    #region ZStream structure
-    // internal mapping of the zlib zstream structure for marshalling
-    [StructLayoutAttribute(LayoutKind.Sequential, Pack=4, Size=0, CharSet=CharSet.Ansi)]
-    internal struct ZStream
-    {
-        public IntPtr next_in;
-        public uint avail_in;
-        public uint total_in;
-
-        public IntPtr next_out;
-        public uint avail_out;
-        public uint total_out;
-
-        [MarshalAs(UnmanagedType.LPStr)]
-        string msg;
-        uint state;
-
-        uint zalloc;
-        uint zfree;
-        uint opaque;
-
-        int data_type;
-        public uint adler;
-        uint reserved;
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Public enums
-    /// <summary>
-    /// Defines constants for the available compression levels in zlib
-    /// </summary>
-    public enum CompressLevel : int
-    {
-        /// <summary>
-        /// The default compression level with a reasonable compromise between compression and speed
-        /// </summary>
-        Default = -1,
-        /// <summary>
-        /// No compression at all. The data are passed straight through.
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// The maximum compression rate available.
-        /// </summary>
-        Best = 9,
-        /// <summary>
-        /// The fastest available compression level.
-        /// </summary>
-        Fastest = 1
-    }
-    #endregion
-
-    #region Exception classes
-    /// <summary>
-    /// The exception that is thrown when an error occurs on the zlib dll
-    /// </summary>
-    public class ZLibException : ApplicationException
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified
-        /// error message and error code
-        /// </summary>
-        /// <param name="errorCode">The zlib error code that caused the exception</param>
-        /// <param name="msg">A message that (hopefully) describes the error</param>
-        public ZLibException(int errorCode, string msg) : base(String.Format("ZLib error {0} {1}", errorCode, msg))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ZLibException"/> class with a specified
-        /// error code
-        /// </summary>
-        /// <param name="errorCode">The zlib error code that caused the exception</param>
-        public ZLibException(int errorCode) : base(String.Format("ZLib error {0}", errorCode))
-        {
-        }
-    }
-    #endregion
-
-    #region Interfaces
-
-    /// <summary>
-    /// Declares methods and properties that enables a running checksum to be calculated
-    /// </summary>
-    public interface ChecksumGenerator
-    {
-        /// <summary>
-        /// Gets the current value of the checksum
-        /// </summary>
-        uint Value { get; }
-
-        /// <summary>
-        /// Clears the current checksum to 0
-        /// </summary>
-        void Reset();
-
-        /// <summary>
-        /// Updates the current checksum with an array of bytes
-        /// </summary>
-        /// <param name="data">The data to update the checksum with</param>
-        void Update(byte[] data);
-
-        /// <summary>
-        /// Updates the current checksum with part of an array of bytes
-        /// </summary>
-        /// <param name="data">The data to update the checksum with</param>
-        /// <param name="offset">Where in <c>data</c> to start updating</param>
-        /// <param name="count">The number of bytes from <c>data</c> to use</param>
-        /// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception>
-        /// <exception cref="ArgumentNullException"><c>data</c> is a null reference</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception>
-        void Update(byte[] data, int offset, int count);
-
-        /// <summary>
-        /// Updates the current checksum with the data from a string
-        /// </summary>
-        /// <param name="data">The string to update the checksum with</param>
-        /// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks>
-        void Update(string data);
-
-        /// <summary>
-        /// Updates the current checksum with the data from a string, using a specific encoding
-        /// </summary>
-        /// <param name="data">The string to update the checksum with</param>
-        /// <param name="encoding">The encoding to use</param>
-        void Update(string data, Encoding encoding);
-    }
-
-
-    /// <summary>
-    /// Represents the method that will be called from a codec when new data
-    /// are available.
-    /// </summary>
-    /// <paramref name="data">The byte array containing the processed data</paramref>
-    /// <paramref name="startIndex">The index of the first processed byte in <c>data</c></paramref>
-    /// <paramref name="count">The number of processed bytes available</paramref>
-    /// <remarks>On return from this method, the data may be overwritten, so grab it while you can.
-    /// You cannot assume that startIndex will be zero.
-    /// </remarks>
-    public delegate void DataAvailableHandler(byte[] data, int startIndex, int count);
-
-    /// <summary>
-    /// Declares methods and events for implementing compressors/decompressors
-    /// </summary>
-    public interface Codec
-    {
-        /// <summary>
-        /// Occurs when more processed data are available.
-        /// </summary>
-        event DataAvailableHandler DataAvailable;
-
-        /// <summary>
-        /// Adds more data to the codec to be processed.
-        /// </summary>
-        /// <param name="data">Byte array containing the data to be added to the codec</param>
-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
-        void Add(byte[] data);
-
-        /// <summary>
-        /// Adds more data to the codec to be processed.
-        /// </summary>
-        /// <param name="data">Byte array containing the data to be added to the codec</param>
-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
-        /// <param name="count">The number of bytes to add</param>
-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
-        void Add(byte[] data, int offset, int count);
-
-        /// <summary>
-        /// Finishes up any pending data that needs to be processed and handled.
-        /// </summary>
-        void Finish();
-
-        /// <summary>
-        /// Gets the checksum of the data that has been added so far
-        /// </summary>
-        uint Checksum { get; }
-
-
-    }
-
-    #endregion
-
-    #region Classes
-    /// <summary>
-    /// Encapsulates general information about the ZLib library
-    /// </summary>
-    public class Info
-    {
-        #region DLL imports
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern uint zlibCompileFlags();
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern string zlibVersion();
-        #endregion
-
-        #region Private stuff
-        private uint _flags;
-
-        // helper function that unpacks a bitsize mask
-        private static int bitSize(uint bits)
-        {
-            switch (bits)
-            {
-                case 0: return 16;
-                case 1: return 32;
-                case 2: return 64;
-            }
-            return -1;
-        }
-        #endregion
-
-        /// <summary>
-        /// Constructs an instance of the <c>Info</c> class.
-        /// </summary>
-        public Info()
-        {
-            _flags = zlibCompileFlags();
-        }
-
-        /// <summary>
-        /// True if the library is compiled with debug info
-        /// </summary>
-        public bool HasDebugInfo { get { return 0 != (_flags & 0x100); } }
-
-        /// <summary>
-        /// True if the library is compiled with assembly optimizations
-        /// </summary>
-        public bool UsesAssemblyCode { get { return 0 != (_flags & 0x200); } }
-
-        /// <summary>
-        /// Gets the size of the unsigned int that was compiled into Zlib
-        /// </summary>
-        public int SizeOfUInt { get { return bitSize(_flags & 3); } }
-
-        /// <summary>
-        /// Gets the size of the unsigned long that was compiled into Zlib
-        /// </summary>
-        public int SizeOfULong { get { return bitSize((_flags >> 2) & 3); } }
-
-        /// <summary>
-        /// Gets the size of the pointers that were compiled into Zlib
-        /// </summary>
-        public int SizeOfPointer { get { return bitSize((_flags >> 4) & 3); } }
-
-        /// <summary>
-        /// Gets the size of the z_off_t type that was compiled into Zlib
-        /// </summary>
-        public int SizeOfOffset { get { return bitSize((_flags >> 6) & 3); } }
-
-        /// <summary>
-        /// Gets the version of ZLib as a string, e.g. "1.2.1"
-        /// </summary>
-        public static string Version { get { return zlibVersion(); } }
-    }
-
-    #endregion
-
-}
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj b/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
deleted file mode 100644
index dea7fb16a..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
+++ /dev/null
@@ -1,141 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "DotZLib"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Library"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "DotZLib"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = "docs\DotZLib.xml"
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = "1591"
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = "docs\DotZLib.xml"
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "nunit.framework"
-                    AssemblyName = "nunit.framework"
-                    HintPath = "E:\apps\NUnit V2.1\\bin\nunit.framework.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ChecksumImpl.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "CircularBuffer.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "CodecBase.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Deflater.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "DotZLib.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "GZipStream.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Inflater.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "UnitTests.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/src/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
deleted file mode 100644
index f0eada1d2..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-
-namespace DotZLib
-{
-	/// <summary>
-	/// Implements a compressed <see cref="Stream"/>, in GZip (.gz) format.
-	/// </summary>
-	public class GZipStream : Stream, IDisposable
-	{
-        #region Dll Imports
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
-        private static extern IntPtr gzopen(string name, string mode);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int gzclose(IntPtr gzFile);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int gzwrite(IntPtr gzFile, int data, int length);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int gzread(IntPtr gzFile, int data, int length);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int gzgetc(IntPtr gzFile);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int gzputc(IntPtr gzFile, int c);
-
-        #endregion
-
-        #region Private data
-        private IntPtr _gzFile;
-        private bool _isDisposed = false;
-        private bool _isWriting;
-        #endregion
-
-        #region Constructors
-        /// <summary>
-        /// Creates a new file as a writeable GZipStream
-        /// </summary>
-        /// <param name="fileName">The name of the compressed file to create</param>
-        /// <param name="level">The compression level to use when adding data</param>
-        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>
-		public GZipStream(string fileName, CompressLevel level)
-		{
-            _isWriting = true;
-            _gzFile = gzopen(fileName, String.Format("wb{0}", (int)level));
-            if (_gzFile == IntPtr.Zero)
-                throw new ZLibException(-1, "Could not open " + fileName);
-		}
-
-        /// <summary>
-        /// Opens an existing file as a readable GZipStream
-        /// </summary>
-        /// <param name="fileName">The name of the file to open</param>
-        /// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception>
-        public GZipStream(string fileName)
-        {
-            _isWriting = false;
-            _gzFile = gzopen(fileName, "rb");
-            if (_gzFile == IntPtr.Zero)
-                throw new ZLibException(-1, "Could not open " + fileName);
-
-        }
-        #endregion
-
-        #region Access properties
-        /// <summary>
-        /// Returns true of this stream can be read from, false otherwise
-        /// </summary>
-        public override bool CanRead
-        {
-            get
-            {
-                return !_isWriting;
-            }
-        }
-
-
-        /// <summary>
-        /// Returns false.
-        /// </summary>
-        public override bool CanSeek
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Returns true if this tsream is writeable, false otherwise
-        /// </summary>
-        public override bool CanWrite
-        {
-            get
-            {
-                return _isWriting;
-            }
-        }
-        #endregion
-
-        #region Destructor & IDispose stuff
-
-        /// <summary>
-        /// Destroys this instance
-        /// </summary>
-        ~GZipStream()
-        {
-            cleanUp(false);
-        }
-
-        /// <summary>
-        /// Closes the external file handle
-        /// </summary>
-        public void Dispose()
-        {
-            cleanUp(true);
-        }
-
-        // Does the actual closing of the file handle.
-        private void cleanUp(bool isDisposing)
-        {
-            if (!_isDisposed)
-            {
-                gzclose(_gzFile);
-                _isDisposed = true;
-            }
-        }
-        #endregion
-
-        #region Basic reading and writing
-        /// <summary>
-        /// Attempts to read a number of bytes from the stream.
-        /// </summary>
-        /// <param name="buffer">The destination data buffer</param>
-        /// <param name="offset">The index of the first destination byte in <c>buffer</c></param>
-        /// <param name="count">The number of bytes requested</param>
-        /// <returns>The number of bytes read</returns>
-        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>
-        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>
-        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>
-        /// <exception cref="NotSupportedException">If this stream is not readable.</exception>
-        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (!CanRead) throw new NotSupportedException();
-            if (buffer == null) throw new ArgumentNullException();
-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
-            if ((offset+count) > buffer.Length) throw new ArgumentException();
-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
-
-            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);
-            int result;
-            try
-            {
-                result = gzread(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);
-                if (result < 0)
-                    throw new IOException();
-            }
-            finally
-            {
-                h.Free();
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Attempts to read a single byte from the stream.
-        /// </summary>
-        /// <returns>The byte that was read, or -1 in case of error or End-Of-File</returns>
-        public override int ReadByte()
-        {
-            if (!CanRead) throw new NotSupportedException();
-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
-            return gzgetc(_gzFile);
-        }
-
-        /// <summary>
-        /// Writes a number of bytes to the stream
-        /// </summary>
-        /// <param name="buffer"></param>
-        /// <param name="offset"></param>
-        /// <param name="count"></param>
-        /// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception>
-        /// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception>
-        /// <exception cref="ArgumentException">If <c>offset</c>  + <c>count</c> is &gt; buffer.Length</exception>
-        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>
-        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            if (!CanWrite) throw new NotSupportedException();
-            if (buffer == null) throw new ArgumentNullException();
-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
-            if ((offset+count) > buffer.Length) throw new ArgumentException();
-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
-
-            GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned);
-            try
-            {
-                int result = gzwrite(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count);
-                if (result < 0)
-                    throw new IOException();
-            }
-            finally
-            {
-                h.Free();
-            }
-        }
-
-        /// <summary>
-        /// Writes a single byte to the stream
-        /// </summary>
-        /// <param name="value">The byte to add to the stream.</param>
-        /// <exception cref="NotSupportedException">If this stream is not writeable.</exception>
-        /// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception>
-        public override void WriteByte(byte value)
-        {
-            if (!CanWrite) throw new NotSupportedException();
-            if (_isDisposed) throw new ObjectDisposedException("GZipStream");
-
-            int result = gzputc(_gzFile, (int)value);
-            if (result < 0)
-                throw new IOException();
-        }
-        #endregion
-
-        #region Position & length stuff
-        /// <summary>
-        /// Not supported.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <exception cref="NotSupportedException">Always thrown</exception>
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        ///  Not suppported.
-        /// </summary>
-        /// <param name="offset"></param>
-        /// <param name="origin"></param>
-        /// <returns></returns>
-        /// <exception cref="NotSupportedException">Always thrown</exception>
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <summary>
-        /// Flushes the <c>GZipStream</c>.
-        /// </summary>
-        /// <remarks>In this implementation, this method does nothing. This is because excessive
-        /// flushing may degrade the achievable compression rates.</remarks>
-        public override void Flush()
-        {
-            // left empty on purpose
-        }
-
-        /// <summary>
-        /// Gets/sets the current position in the <c>GZipStream</c>. Not suppported.
-        /// </summary>
-        /// <remarks>In this implementation this property is not supported</remarks>
-        /// <exception cref="NotSupportedException">Always thrown</exception>
-        public override long Position
-        {
-            get
-            {
-                throw new NotSupportedException();
-            }
-            set
-            {
-                throw new NotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Gets the size of the stream. Not suppported.
-        /// </summary>
-        /// <remarks>In this implementation this property is not supported</remarks>
-        /// <exception cref="NotSupportedException">Always thrown</exception>
-        public override long Length
-        {
-            get
-            {
-                throw new NotSupportedException();
-            }
-        }
-        #endregion
-    }
-}
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/src/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs
deleted file mode 100644
index d295f2680..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/Inflater.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace DotZLib
-{
-
-    /// <summary>
-    /// Implements a data decompressor, using the inflate algorithm in the ZLib dll
-    /// </summary>
-    public class Inflater : CodecBase
-	{
-        #region Dll imports
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)]
-        private static extern int inflateInit_(ref ZStream sz, string vs, int size);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int inflate(ref ZStream sz, int flush);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int inflateReset(ref ZStream sz);
-
-        [DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)]
-        private static extern int inflateEnd(ref ZStream sz);
-        #endregion
-
-        /// <summary>
-        /// Constructs an new instance of the <c>Inflater</c>
-        /// </summary>
-        public Inflater() : base()
-		{
-            int retval = inflateInit_(ref _ztream, Info.Version, Marshal.SizeOf(_ztream));
-            if (retval != 0)
-                throw new ZLibException(retval, "Could not initialize inflater");
-
-            resetOutput();
-        }
-
-
-        /// <summary>
-        /// Adds more data to the codec to be processed.
-        /// </summary>
-        /// <param name="data">Byte array containing the data to be added to the codec</param>
-        /// <param name="offset">The index of the first byte to add from <c>data</c></param>
-        /// <param name="count">The number of bytes to add</param>
-        /// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks>
-        public override void Add(byte[] data, int offset, int count)
-        {
-            if (data == null) throw new ArgumentNullException();
-            if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException();
-            if ((offset+count) > data.Length) throw new ArgumentException();
-
-            int total = count;
-            int inputIndex = offset;
-            int err = 0;
-
-            while (err >= 0 && inputIndex < total)
-            {
-                copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize));
-                err = inflate(ref _ztream, (int)FlushTypes.None);
-                if (err == 0)
-                    while (_ztream.avail_out == 0)
-                    {
-                        OnDataAvailable();
-                        err = inflate(ref _ztream, (int)FlushTypes.None);
-                    }
-
-                inputIndex += (int)_ztream.total_in;
-            }
-            setChecksum( _ztream.adler );
-        }
-
-
-        /// <summary>
-        /// Finishes up any pending data that needs to be processed and handled.
-        /// </summary>
-        public override void Finish()
-        {
-            int err;
-            do
-            {
-                err = inflate(ref _ztream, (int)FlushTypes.Finish);
-                OnDataAvailable();
-            }
-            while (err == 0);
-            setChecksum( _ztream.adler );
-            inflateReset(ref _ztream);
-            resetOutput();
-        }
-
-        /// <summary>
-        /// Closes the internal zlib inflate stream
-        /// </summary>
-        protected override void CleanUp() { inflateEnd(ref _ztream); }
-
-
-	}
-}
diff --git a/src/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/src/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
deleted file mode 100644
index 6d8aebb79..000000000
--- a/src/png/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.Collections;
-using System.IO;
-
-// uncomment the define below to include unit tests
-//#define nunit
-#if nunit
-using NUnit.Framework;
-
-// Unit tests for the DotZLib class library
-// ----------------------------------------
-//
-// Use this with NUnit 2 from http://www.nunit.org
-//
-
-namespace DotZLibTests
-{
-    using DotZLib;
-
-    // helper methods
-    internal class Utils
-    {
-        public static bool byteArrEqual( byte[] lhs, byte[] rhs )
-        {
-            if (lhs.Length != rhs.Length)
-                return false;
-            for (int i = lhs.Length-1; i >= 0; --i)
-                if (lhs[i] != rhs[i])
-                    return false;
-            return true;
-        }
-
-    }
-
-
-    [TestFixture]
-    public class CircBufferTests
-    {
-        #region Circular buffer tests
-        [Test]
-        public void SinglePutGet()
-        {
-            CircularBuffer buf = new CircularBuffer(10);
-            Assert.AreEqual( 0, buf.Size );
-            Assert.AreEqual( -1, buf.Get() );
-
-            Assert.IsTrue(buf.Put( 1 ));
-            Assert.AreEqual( 1, buf.Size );
-            Assert.AreEqual( 1, buf.Get() );
-            Assert.AreEqual( 0, buf.Size );
-            Assert.AreEqual( -1, buf.Get() );
-        }
-
-        [Test]
-        public void BlockPutGet()
-        {
-            CircularBuffer buf = new CircularBuffer(10);
-            byte[] arr = {1,2,3,4,5,6,7,8,9,10};
-            Assert.AreEqual( 10, buf.Put(arr,0,10) );
-            Assert.AreEqual( 10, buf.Size );
-            Assert.IsFalse( buf.Put(11) );
-            Assert.AreEqual( 1, buf.Get() );
-            Assert.IsTrue( buf.Put(11) );
-
-            byte[] arr2 = (byte[])arr.Clone();
-            Assert.AreEqual( 9, buf.Get(arr2,1,9) );
-            Assert.IsTrue( Utils.byteArrEqual(arr,arr2) );
-        }
-
-        #endregion
-    }
-
-    [TestFixture]
-    public class ChecksumTests
-    {
-        #region CRC32 Tests
-        [Test]
-        public void CRC32_Null()
-        {
-            CRC32Checksum crc32 = new CRC32Checksum();
-            Assert.AreEqual( 0, crc32.Value );
-
-            crc32 = new CRC32Checksum(1);
-            Assert.AreEqual( 1, crc32.Value );
-
-            crc32 = new CRC32Checksum(556);
-            Assert.AreEqual( 556, crc32.Value );
-        }
-
-        [Test]
-        public void CRC32_Data()
-        {
-            CRC32Checksum crc32 = new CRC32Checksum();
-            byte[] data = { 1,2,3,4,5,6,7 };
-            crc32.Update(data);
-            Assert.AreEqual( 0x70e46888, crc32.Value  );
-
-            crc32 = new CRC32Checksum();
-            crc32.Update("penguin");
-            Assert.AreEqual( 0x0e5c1a120, crc32.Value );
-
-            crc32 = new CRC32Checksum(1);
-            crc32.Update("penguin");
-            Assert.AreEqual(0x43b6aa94, crc32.Value);
-
-        }
-        #endregion
-
-        #region Adler tests
-
-        [Test]
-        public void Adler_Null()
-        {
-            AdlerChecksum adler = new AdlerChecksum();
-            Assert.AreEqual(0, adler.Value);
-
-            adler = new AdlerChecksum(1);
-            Assert.AreEqual( 1, adler.Value );
-
-            adler = new AdlerChecksum(556);
-            Assert.AreEqual( 556, adler.Value );
-        }
-
-        [Test]
-        public void Adler_Data()
-        {
-            AdlerChecksum adler = new AdlerChecksum(1);
-            byte[] data = { 1,2,3,4,5,6,7 };
-            adler.Update(data);
-            Assert.AreEqual( 0x5b001d, adler.Value  );
-
-            adler = new AdlerChecksum();
-            adler.Update("penguin");
-            Assert.AreEqual(0x0bcf02f6, adler.Value );
-
-            adler = new AdlerChecksum(1);
-            adler.Update("penguin");
-            Assert.AreEqual(0x0bd602f7, adler.Value);
-
-        }
-        #endregion
-    }
-
-    [TestFixture]
-    public class InfoTests
-    {
-        #region Info tests
-        [Test]
-        public void Info_Version()
-        {
-            Info info = new Info();
-            Assert.AreEqual("1.2.11", Info.Version);
-            Assert.AreEqual(32, info.SizeOfUInt);
-            Assert.AreEqual(32, info.SizeOfULong);
-            Assert.AreEqual(32, info.SizeOfPointer);
-            Assert.AreEqual(32, info.SizeOfOffset);
-        }
-        #endregion
-    }
-
-    [TestFixture]
-    public class DeflateInflateTests
-    {
-        #region Deflate tests
-        [Test]
-        public void Deflate_Init()
-        {
-            using (Deflater def = new Deflater(CompressLevel.Default))
-            {
-            }
-        }
-
-        private ArrayList compressedData = new ArrayList();
-        private uint adler1;
-
-        private ArrayList uncompressedData = new ArrayList();
-        private uint adler2;
-
-        public void CDataAvail(byte[] data, int startIndex, int count)
-        {
-            for (int i = 0; i < count; ++i)
-                compressedData.Add(data[i+startIndex]);
-        }
-
-        [Test]
-        public void Deflate_Compress()
-        {
-            compressedData.Clear();
-
-            byte[] testData = new byte[35000];
-            for (int i = 0; i < testData.Length; ++i)
-                testData[i] = 5;
-
-            using (Deflater def = new Deflater((CompressLevel)5))
-            {
-                def.DataAvailable += new DataAvailableHandler(CDataAvail);
-                def.Add(testData);
-                def.Finish();
-                adler1 = def.Checksum;
-            }
-        }
-        #endregion
-
-        #region Inflate tests
-        [Test]
-        public void Inflate_Init()
-        {
-            using (Inflater inf = new Inflater())
-            {
-            }
-        }
-
-        private void DDataAvail(byte[] data, int startIndex, int count)
-        {
-            for (int i = 0; i < count; ++i)
-                uncompressedData.Add(data[i+startIndex]);
-        }
-
-        [Test]
-        public void Inflate_Expand()
-        {
-            uncompressedData.Clear();
-
-            using (Inflater inf = new Inflater())
-            {
-                inf.DataAvailable += new DataAvailableHandler(DDataAvail);
-                inf.Add((byte[])compressedData.ToArray(typeof(byte)));
-                inf.Finish();
-                adler2 = inf.Checksum;
-            }
-            Assert.AreEqual( adler1, adler2 );
-        }
-        #endregion
-    }
-
-    [TestFixture]
-    public class GZipStreamTests
-    {
-        #region GZipStream test
-        [Test]
-        public void GZipStream_WriteRead()
-        {
-            using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best))
-            {
-                BinaryWriter writer = new BinaryWriter(gzOut);
-                writer.Write("hi there");
-                writer.Write(Math.PI);
-                writer.Write(42);
-            }
-
-            using (GZipStream gzIn = new GZipStream("gzstream.gz"))
-            {
-                BinaryReader reader = new BinaryReader(gzIn);
-                string s = reader.ReadString();
-                Assert.AreEqual("hi there",s);
-                double d = reader.ReadDouble();
-                Assert.AreEqual(Math.PI, d);
-                int i = reader.ReadInt32();
-                Assert.AreEqual(42,i);
-            }
-
-        }
-        #endregion
-	}
-}
-
-#endif
diff --git a/src/png/zlib/contrib/dotzlib/LICENSE_1_0.txt b/src/png/zlib/contrib/dotzlib/LICENSE_1_0.txt
deleted file mode 100644
index 127a5bc39..000000000
--- a/src/png/zlib/contrib/dotzlib/LICENSE_1_0.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/src/png/zlib/contrib/dotzlib/readme.txt b/src/png/zlib/contrib/dotzlib/readme.txt
deleted file mode 100644
index 4d8c2dd93..000000000
--- a/src/png/zlib/contrib/dotzlib/readme.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-This directory contains a .Net wrapper class library for the ZLib1.dll
-
-The wrapper includes support for inflating/deflating memory buffers,
-.Net streaming wrappers for the gz streams part of zlib, and wrappers
-for the checksum parts of zlib. See DotZLib/UnitTests.cs for examples.
-
-Directory structure:
---------------------
-
-LICENSE_1_0.txt       - License file.
-readme.txt            - This file.
-DotZLib.chm           - Class library documentation
-DotZLib.build         - NAnt build file
-DotZLib.sln           - Microsoft Visual Studio 2003 solution file
-
-DotZLib\*.cs          - Source files for the class library
-
-Unit tests:
------------
-The file DotZLib/UnitTests.cs contains unit tests for use with NUnit 2.1 or higher.
-To include unit tests in the build, define nunit before building.
-
-
-Build instructions:
--------------------
-
-1. Using Visual Studio.Net 2003:
-   Open DotZLib.sln in VS.Net and build from there. Output file (DotZLib.dll)
-   will be found ./DotZLib/bin/release or ./DotZLib/bin/debug, depending on
-   you are building the release or debug version of the library. Check
-   DotZLib/UnitTests.cs for instructions on how to include unit tests in the
-   build.
-
-2. Using NAnt:
-   Open a command prompt with access to the build environment and run nant
-   in the same directory as the DotZLib.build file.
-   You can define 2 properties on the nant command-line to control the build:
-   debug={true|false} to toggle between release/debug builds (default=true).
-   nunit={true|false} to include or esclude unit tests (default=true).
-   Also the target clean will remove binaries.
-   Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release
-   or ./DotZLib/bin/debug, depending on whether you are building the release
-   or debug version of the library.
-
-   Examples:
-     nant -D:debug=false -D:nunit=false
-       will build a release mode version of the library without unit tests.
-     nant
-       will build a debug version of the library with unit tests
-     nant clean
-       will remove all previously built files.
-
-
----------------------------------
-Copyright (c) Henrik Ravn 2004
-
-Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/src/png/zlib/contrib/gcc_gvmat64/gvmat64.S b/src/png/zlib/contrib/gcc_gvmat64/gvmat64.S
deleted file mode 100644
index 23309fa28..000000000
--- a/src/png/zlib/contrib/gcc_gvmat64/gvmat64.S
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
-;uInt longest_match_x64(
-;    deflate_state *s,
-;    IPos cur_match);                             // current match 
-
-; gvmat64.S -- Asm portion of the optimized longest_match for 32 bits x86_64
-;  (AMD64 on Athlon 64, Opteron, Phenom
-;     and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)
-; this file is translation from gvmat64.asm to GCC 4.x (for Linux, Mac XCode)
-; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
-;
-; File written by Gilles Vollant, by converting to assembly the longest_match
-;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
-;  and by taking inspiration on asm686 with masm, optimised assembly code
-;        from Brian Raiter, written 1998
-;
-;  This software is provided 'as-is', without any express or implied
-;  warranty.  In no event will the authors be held liable for any damages
-;  arising from the use of this software.
-;
-;  Permission is granted to anyone to use this software for any purpose,
-;  including commercial applications, and to alter it and redistribute it
-;  freely, subject to the following restrictions:
-;
-;  1. The origin of this software must not be misrepresented; you must not
-;     claim that you wrote the original software. If you use this software
-;     in a product, an acknowledgment in the product documentation would be
-;     appreciated but is not required.
-;  2. Altered source versions must be plainly marked as such, and must not be
-;     misrepresented as being the original software
-;  3. This notice may not be removed or altered from any source distribution.
-;
-;         http://www.zlib.net
-;         http://www.winimage.com/zLibDll
-;         http://www.muppetlabs.com/~breadbox/software/assembly.html
-;
-; to compile this file for zLib, I use option:
-;   gcc -c -arch x86_64 gvmat64.S
-
-
-;uInt longest_match(s, cur_match)
-;    deflate_state *s;
-;    IPos cur_match;                             // current match /
-;
-; with XCode for Mac, I had strange error with some jump on intel syntax
-; this is why BEFORE_JMP and AFTER_JMP are used
- */
-
-
-#define BEFORE_JMP .att_syntax
-#define AFTER_JMP .intel_syntax noprefix
-
-#ifndef NO_UNDERLINE
-#	define	match_init	_match_init
-#	define	longest_match	_longest_match
-#endif
-
-.intel_syntax noprefix
-
-.globl	match_init, longest_match
-.text
-longest_match:
-
-
-
-#define LocalVarsSize 96
-/*
-; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
-; free register :  r14,r15
-; register can be saved : rsp
-*/
-
-#define chainlenwmask     (rsp + 8 - LocalVarsSize)
-#define nicematch         (rsp + 16 - LocalVarsSize)
-
-#define save_rdi        (rsp + 24 - LocalVarsSize)
-#define save_rsi        (rsp + 32 - LocalVarsSize)
-#define save_rbx        (rsp + 40 - LocalVarsSize)
-#define save_rbp        (rsp + 48 - LocalVarsSize)
-#define save_r12        (rsp + 56 - LocalVarsSize)
-#define save_r13        (rsp + 64 - LocalVarsSize)
-#define save_r14        (rsp + 72 - LocalVarsSize)
-#define save_r15        (rsp + 80 - LocalVarsSize)
-
-
-/*
-;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
-;  in the deflate_state structure since the asm code was first written
-;  (if you compile with zlib 1.0.4 or older, remove the +4).
-;  Note : these value are good with a 8 bytes boundary pack structure
-*/
-
-#define    MAX_MATCH              258
-#define    MIN_MATCH              3
-#define    MIN_LOOKAHEAD          (MAX_MATCH+MIN_MATCH+1)
-
-/*
-;;; Offsets for fields in the deflate_state structure. These numbers
-;;; are calculated from the definition of deflate_state, with the
-;;; assumption that the compiler will dword-align the fields. (Thus,
-;;; changing the definition of deflate_state could easily cause this
-;;; program to crash horribly, without so much as a warning at
-;;; compile time. Sigh.)
-
-;  all the +zlib1222add offsets are due to the addition of fields
-;  in zlib in the deflate_state structure since the asm code was first written
-;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
-;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
-;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
-*/
-
-
-
-/* you can check the structure offset by running
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "deflate.h"
-
-void print_depl()
-{
-deflate_state ds;
-deflate_state *s=&ds;
-printf("size pointer=%u\n",(int)sizeof(void*));
-
-printf("#define dsWSize         %u\n",(int)(((char*)&(s->w_size))-((char*)s)));
-printf("#define dsWMask         %u\n",(int)(((char*)&(s->w_mask))-((char*)s)));
-printf("#define dsWindow        %u\n",(int)(((char*)&(s->window))-((char*)s)));
-printf("#define dsPrev          %u\n",(int)(((char*)&(s->prev))-((char*)s)));
-printf("#define dsMatchLen      %u\n",(int)(((char*)&(s->match_length))-((char*)s)));
-printf("#define dsPrevMatch     %u\n",(int)(((char*)&(s->prev_match))-((char*)s)));
-printf("#define dsStrStart      %u\n",(int)(((char*)&(s->strstart))-((char*)s)));
-printf("#define dsMatchStart    %u\n",(int)(((char*)&(s->match_start))-((char*)s)));
-printf("#define dsLookahead     %u\n",(int)(((char*)&(s->lookahead))-((char*)s)));
-printf("#define dsPrevLen       %u\n",(int)(((char*)&(s->prev_length))-((char*)s)));
-printf("#define dsMaxChainLen   %u\n",(int)(((char*)&(s->max_chain_length))-((char*)s)));
-printf("#define dsGoodMatch     %u\n",(int)(((char*)&(s->good_match))-((char*)s)));
-printf("#define dsNiceMatch     %u\n",(int)(((char*)&(s->nice_match))-((char*)s)));
-}
-*/
-
-#define dsWSize          68
-#define dsWMask          76
-#define dsWindow         80
-#define dsPrev           96
-#define dsMatchLen       144
-#define dsPrevMatch      148
-#define dsStrStart       156
-#define dsMatchStart     160
-#define dsLookahead      164
-#define dsPrevLen        168
-#define dsMaxChainLen    172
-#define dsGoodMatch      188
-#define dsNiceMatch      192
-
-#define window_size      [ rcx + dsWSize]
-#define WMask            [ rcx + dsWMask]
-#define window_ad        [ rcx + dsWindow]
-#define prev_ad          [ rcx + dsPrev]
-#define strstart         [ rcx + dsStrStart]
-#define match_start      [ rcx + dsMatchStart]
-#define Lookahead        [ rcx + dsLookahead] //; 0ffffffffh on infozip
-#define prev_length      [ rcx + dsPrevLen]
-#define max_chain_length [ rcx + dsMaxChainLen]
-#define good_match       [ rcx + dsGoodMatch]
-#define nice_match       [ rcx + dsNiceMatch]
-
-/*
-; windows:
-; parameter 1 in rcx(deflate state s), param 2 in rdx (cur match)
-
-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
-;
-; All registers must be preserved across the call, except for
-;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
-
-;
-; gcc on macosx-linux:
-; see http://www.x86-64.org/documentation/abi-0.99.pdf
-; param 1 in rdi, param 2 in rsi
-; rbx, rsp, rbp, r12 to r15 must be preserved
-
-;;; Save registers that the compiler may be using, and adjust esp to
-;;; make room for our stack frame.
-
-
-;;; Retrieve the function arguments. r8d will hold cur_match
-;;; throughout the entire function. edx will hold the pointer to the
-;;; deflate_state structure during the function's setup (before
-;;; entering the main loop.
-
-; ms: parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
-; mac: param 1 in rdi, param 2 rsi
-; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
-*/
-        mov [save_rbx],rbx
-        mov [save_rbp],rbp
-
-
-        mov rcx,rdi
-
-        mov r8d,esi
-
-
-        mov [save_r12],r12
-        mov [save_r13],r13
-        mov [save_r14],r14
-        mov [save_r15],r15
-
-
-//;;; uInt wmask = s->w_mask;
-//;;; unsigned chain_length = s->max_chain_length;
-//;;; if (s->prev_length >= s->good_match) {
-//;;;     chain_length >>= 2;
-//;;; }
-
-
-        mov edi, prev_length
-        mov esi, good_match
-        mov eax, WMask
-        mov ebx, max_chain_length
-        cmp edi, esi
-        jl  LastMatchGood
-        shr ebx, 2
-LastMatchGood:
-
-//;;; chainlen is decremented once beforehand so that the function can
-//;;; use the sign flag instead of the zero flag for the exit test.
-//;;; It is then shifted into the high word, to make room for the wmask
-//;;; value, which it will always accompany.
-
-        dec ebx
-        shl ebx, 16
-        or  ebx, eax
-
-//;;; on zlib only
-//;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-
-
-        mov eax, nice_match
-        mov [chainlenwmask], ebx
-        mov r10d, Lookahead
-        cmp r10d, eax
-        cmovnl r10d, eax
-        mov [nicematch],r10d
-
-
-
-//;;; register Bytef *scan = s->window + s->strstart;
-        mov r10, window_ad
-        mov ebp, strstart
-        lea r13, [r10 + rbp]
-
-//;;; Determine how many bytes the scan ptr is off from being
-//;;; dword-aligned.
-
-         mov r9,r13
-         neg r13
-         and r13,3
-
-//;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-//;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
-
-
-        mov eax, window_size
-        sub eax, MIN_LOOKAHEAD
-
-
-        xor edi,edi
-        sub ebp, eax
-
-        mov r11d, prev_length
-
-        cmovng ebp,edi
-
-//;;; int best_len = s->prev_length;
-
-
-//;;; Store the sum of s->window + best_len in esi locally, and in esi.
-
-       lea  rsi,[r10+r11]
-
-//;;; register ush scan_start = *(ushf*)scan;
-//;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
-//;;; Posf *prev = s->prev;
-
-        movzx r12d,word ptr [r9]
-        movzx ebx, word ptr [r9 + r11 - 1]
-
-        mov rdi, prev_ad
-
-//;;; Jump into the main loop.
-
-        mov edx, [chainlenwmask]
-
-        cmp bx,word ptr [rsi + r8 - 1]
-        jz  LookupLoopIsZero
-				
-						
-						
-LookupLoop1:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-        jbe LeaveNow
-		
-		
-		
-        sub edx, 0x00010000
-		BEFORE_JMP
-        js  LeaveNow
-		AFTER_JMP
-
-LoopEntry1:
-        cmp bx,word ptr [rsi + r8 - 1]
-		BEFORE_JMP
-        jz  LookupLoopIsZero
-		AFTER_JMP
-
-LookupLoop2:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-		BEFORE_JMP
-        jbe LeaveNow
-		AFTER_JMP
-        sub edx, 0x00010000
-		BEFORE_JMP
-        js  LeaveNow
-		AFTER_JMP
-
-LoopEntry2:
-        cmp bx,word ptr [rsi + r8 - 1]
-		BEFORE_JMP
-        jz  LookupLoopIsZero
-		AFTER_JMP
-
-LookupLoop4:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-		BEFORE_JMP
-        jbe LeaveNow
-		AFTER_JMP
-        sub edx, 0x00010000
-		BEFORE_JMP
-        js  LeaveNow
-		AFTER_JMP
-
-LoopEntry4:
-
-        cmp bx,word ptr [rsi + r8 - 1]
-		BEFORE_JMP
-        jnz LookupLoop1
-        jmp LookupLoopIsZero
-		AFTER_JMP
-/*
-;;; do {
-;;;     match = s->window + cur_match;
-;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
-;;;         *(ushf*)match != scan_start) continue;
-;;;     [...]
-;;; } while ((cur_match = prev[cur_match & wmask]) > limit
-;;;          && --chain_length != 0);
-;;;
-;;; Here is the inner loop of the function. The function will spend the
-;;; majority of its time in this loop, and majority of that time will
-;;; be spent in the first ten instructions.
-;;;
-;;; Within this loop:
-;;; ebx = scanend
-;;; r8d = curmatch
-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
-;;; esi = windowbestlen - i.e., (window + bestlen)
-;;; edi = prev
-;;; ebp = limit
-*/
-.balign 16
-LookupLoop:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-		BEFORE_JMP
-        jbe LeaveNow
-		AFTER_JMP
-        sub edx, 0x00010000
-		BEFORE_JMP
-        js  LeaveNow
-		AFTER_JMP
-
-LoopEntry:
-
-        cmp bx,word ptr [rsi + r8 - 1]
-		BEFORE_JMP
-        jnz LookupLoop1
-		AFTER_JMP
-LookupLoopIsZero:
-        cmp     r12w, word ptr [r10 + r8]
-		BEFORE_JMP
-        jnz LookupLoop1
-		AFTER_JMP
-
-
-//;;; Store the current value of chainlen.
-        mov [chainlenwmask], edx
-/*
-;;; Point edi to the string under scrutiny, and esi to the string we
-;;; are hoping to match it up with. In actuality, esi and edi are
-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
-;;; initialized to -(MAX_MATCH_8 - scanalign).
-*/
-        lea rsi,[r8+r10]
-        mov rdx, 0xfffffffffffffef8 //; -(MAX_MATCH_8)
-        lea rsi, [rsi + r13 + 0x0108] //;MAX_MATCH_8]
-        lea rdi, [r9 + r13 + 0x0108] //;MAX_MATCH_8]
-
-        prefetcht1 [rsi+rdx]
-        prefetcht1 [rdi+rdx]
-
-/*
-;;; Test the strings for equality, 8 bytes at a time. At the end,
-;;; adjust rdx so that it is offset to the exact byte that mismatched.
-;;;
-;;; We already know at this point that the first three bytes of the
-;;; strings match each other, and they can be safely passed over before
-;;; starting the compare loop. So what this code does is skip over 0-3
-;;; bytes, as much as necessary in order to dword-align the edi
-;;; pointer. (rsi will still be misaligned three times out of four.)
-;;;
-;;; It should be confessed that this loop usually does not represent
-;;; much of the total running time. Replacing it with a more
-;;; straightforward "rep cmpsb" would not drastically degrade
-;;; performance.
-*/
-
-LoopCmps:
-        mov rax, [rsi + rdx]
-        xor rax, [rdi + rdx]
-        jnz LeaveLoopCmps
-
-        mov rax, [rsi + rdx + 8]
-        xor rax, [rdi + rdx + 8]
-        jnz LeaveLoopCmps8
-
-
-        mov rax, [rsi + rdx + 8+8]
-        xor rax, [rdi + rdx + 8+8]
-        jnz LeaveLoopCmps16
-
-        add rdx,8+8+8
-
-		BEFORE_JMP
-        jnz  LoopCmps
-        jmp  LenMaximum
-		AFTER_JMP
-		
-LeaveLoopCmps16: add rdx,8
-LeaveLoopCmps8: add rdx,8
-LeaveLoopCmps:
-
-        test    eax, 0x0000FFFF
-        jnz LenLower
-
-        test eax,0xffffffff
-
-        jnz LenLower32
-
-        add rdx,4
-        shr rax,32
-        or ax,ax
-		BEFORE_JMP
-        jnz LenLower
-		AFTER_JMP
-
-LenLower32:
-        shr eax,16
-        add rdx,2
-		
-LenLower:		
-        sub al, 1
-        adc rdx, 0
-//;;; Calculate the length of the match. If it is longer than MAX_MATCH,
-//;;; then automatically accept it as the best possible match and leave.
-
-        lea rax, [rdi + rdx]
-        sub rax, r9
-        cmp eax, MAX_MATCH
-		BEFORE_JMP
-        jge LenMaximum
-		AFTER_JMP
-/*
-;;; If the length of the match is not longer than the best match we
-;;; have so far, then forget it and return to the lookup loop.
-;///////////////////////////////////
-*/
-        cmp eax, r11d
-        jg  LongerMatch
-
-        lea rsi,[r10+r11]
-
-        mov rdi, prev_ad
-        mov edx, [chainlenwmask]
-		BEFORE_JMP
-        jmp LookupLoop
-		AFTER_JMP
-/*
-;;;         s->match_start = cur_match;
-;;;         best_len = len;
-;;;         if (len >= nice_match) break;
-;;;         scan_end = *(ushf*)(scan+best_len-1);
-*/
-LongerMatch:
-        mov r11d, eax
-        mov match_start, r8d
-        cmp eax, [nicematch]
-		BEFORE_JMP
-        jge LeaveNow
-		AFTER_JMP
-
-        lea rsi,[r10+rax]
-
-        movzx   ebx, word ptr [r9 + rax - 1]
-        mov rdi, prev_ad
-        mov edx, [chainlenwmask]
-		BEFORE_JMP
-        jmp LookupLoop
-		AFTER_JMP
-
-//;;; Accept the current string, with the maximum possible length.
-
-LenMaximum:
-        mov r11d,MAX_MATCH
-        mov match_start, r8d
-
-//;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-//;;; return s->lookahead;
-
-LeaveNow:
-        mov eax, Lookahead
-        cmp r11d, eax
-        cmovng eax, r11d
-
-
-
-//;;; Restore the stack and return from whence we came.
-
-
-//        mov rsi,[save_rsi]
-//        mov rdi,[save_rdi]
-        mov rbx,[save_rbx]
-        mov rbp,[save_rbp]
-        mov r12,[save_r12]
-        mov r13,[save_r13]
-        mov r14,[save_r14]
-        mov r15,[save_r15]
-
-
-        ret 0
-//; please don't remove this string !
-//; Your can freely use gvmat64 in any free or commercial app
-//; but it is far better don't remove the string in the binary!
- //   db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0
-
-
-match_init:
-  ret 0
-
-
diff --git a/src/png/zlib/contrib/infback9/README b/src/png/zlib/contrib/infback9/README
deleted file mode 100644
index e75ed1329..000000000
--- a/src/png/zlib/contrib/infback9/README
+++ /dev/null
@@ -1 +0,0 @@
-See infback9.h for what this is and how to use it.
diff --git a/src/png/zlib/contrib/infback9/infback9.c b/src/png/zlib/contrib/infback9/infback9.c
deleted file mode 100644
index 05fb3e338..000000000
--- a/src/png/zlib/contrib/infback9/infback9.c
+++ /dev/null
@@ -1,615 +0,0 @@
-/* infback9.c -- inflate deflate64 data using a call-back interface
- * Copyright (C) 1995-2008 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "infback9.h"
-#include "inftree9.h"
-#include "inflate9.h"
-
-#define WSIZE 65536UL
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   Z_NULL to use the library memory allocation functions.
-
-   window is a user-supplied window and output buffer that is 64K bytes.
- */
-int ZEXPORT inflateBack9Init_(strm, window, version, stream_size)
-z_stream FAR *strm;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL || window == Z_NULL)
-        return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-                                               sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (voidpf)state;
-    state->window = window;
-    return Z_OK;
-}
-
-/*
-   Build and output length and distance decoding tables for fixed code
-   decoding.
- */
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-void makefixed9(void)
-{
-    unsigned sym, bits, low, size;
-    code *next, *lenfix, *distfix;
-    struct inflate_state state;
-    code fixed[544];
-
-    /* literal/length table */
-    sym = 0;
-    while (sym < 144) state.lens[sym++] = 8;
-    while (sym < 256) state.lens[sym++] = 9;
-    while (sym < 280) state.lens[sym++] = 7;
-    while (sym < 288) state.lens[sym++] = 8;
-    next = fixed;
-    lenfix = next;
-    bits = 9;
-    inflate_table9(LENS, state.lens, 288, &(next), &(bits), state.work);
-
-    /* distance table */
-    sym = 0;
-    while (sym < 32) state.lens[sym++] = 5;
-    distfix = next;
-    bits = 5;
-    inflate_table9(DISTS, state.lens, 32, &(next), &(bits), state.work);
-
-    /* write tables */
-    puts("    /* inffix9.h -- table for decoding deflate64 fixed codes");
-    puts("     * Generated automatically by makefixed9().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", lenfix[low].op, lenfix[low].bits,
-               lenfix[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 5) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", distfix[low].op, distfix[low].bits,
-               distfix[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/* Macros for inflateBack(): */
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = Z_NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflateBack() with
-   an error. */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n <= 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = window; \
-            left = WSIZE; \
-            wrap = 1; \
-            if (out(out_desc, put, (unsigned)left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise,  inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is Z_NULL or the state was not initialized.
- */
-int ZEXPORT inflateBack9(strm, in, in_desc, out, out_desc)
-z_stream FAR *strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have;              /* available input */
-    unsigned long left;         /* available output */
-    inflate_mode mode;          /* current inflate mode */
-    int lastblock;              /* true if processing last block */
-    int wrap;                   /* true if the window has wrapped */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned extra;             /* extra bits needed */
-    unsigned long length;       /* literal or length of data to copy */
-    unsigned long offset;       /* distance back to copy string from */
-    unsigned long copy;         /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code const FAR *lencode;    /* starting table for length/literal codes */
-    code const FAR *distcode;   /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-#include "inffix9.h"
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* Reset the state */
-    strm->msg = Z_NULL;
-    mode = TYPE;
-    lastblock = 0;
-    wrap = 0;
-    window = state->window;
-    next = strm->next_in;
-    have = next != Z_NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = window;
-    left = WSIZE;
-    lencode = Z_NULL;
-    distcode = Z_NULL;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (lastblock) {
-                BYTEBITS();
-                mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            lastblock = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        lastblock ? " (last)" : ""));
-                mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                lencode = lenfix;
-                lenbits = 9;
-                distcode = distfix;
-                distbits = 5;
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        lastblock ? " (last)" : ""));
-                mode = LEN;                     /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        lastblock ? " (last)" : ""));
-                mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                mode = BAD;
-                break;
-            }
-            length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %lu\n",
-                    length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (length != 0) {
-                copy = length;
-                PULL();
-                ROOM();
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-            if (state->nlen > 286) {
-                strm->msg = (char *)"too many length symbols";
-                mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-
-            /* get code length code lengths (not a typo) */
-            state->have = 0;
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            lencode = (code const FAR *)(state->next);
-            lenbits = 7;
-            ret = inflate_table9(CODES, state->lens, 19, &(state->next),
-                                &(lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-
-            /* get length and distance code code lengths */
-            state->have = 0;
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = lencode[BITS(lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    NEEDBITS(here.bits);
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            mode = BAD;
-                            break;
-                        }
-                        len = (unsigned)(state->lens[state->have - 1]);
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftree9.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            lencode = (code const FAR *)(state->next);
-            lenbits = 9;
-            ret = inflate_table9(LENS, state->lens, state->nlen,
-                            &(state->next), &(lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                mode = BAD;
-                break;
-            }
-            distcode = (code const FAR *)(state->next);
-            distbits = 6;
-            ret = inflate_table9(DISTS, state->lens + state->nlen,
-                            state->ndist, &(state->next), &(distbits),
-                            state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            mode = LEN;
-
-        case LEN:
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = lencode[BITS(lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            length = (unsigned)here.val;
-
-            /* process literal */
-            if (here.op == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                ROOM();
-                *put++ = (unsigned char)(length);
-                left--;
-                mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                mode = BAD;
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            extra = (unsigned)(here.op) & 31;
-            if (extra != 0) {
-                NEEDBITS(extra);
-                length += BITS(extra);
-                DROPBITS(extra);
-            }
-            Tracevv((stderr, "inflate:         length %lu\n", length));
-
-            /* get distance code */
-            for (;;) {
-                here = distcode[BITS(distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                mode = BAD;
-                break;
-            }
-            offset = (unsigned)here.val;
-
-            /* get distance extra bits, if any */
-            extra = (unsigned)(here.op) & 15;
-            if (extra != 0) {
-                NEEDBITS(extra);
-                offset += BITS(extra);
-                DROPBITS(extra);
-            }
-            if (offset > WSIZE - (wrap ? 0: left)) {
-                strm->msg = (char *)"invalid distance too far back";
-                mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %lu\n", offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = WSIZE - offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                }
-                else {
-                    from = put - offset;
-                    copy = left;
-                }
-                if (copy > length) copy = length;
-                length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < WSIZE) {
-                if (out(out_desc, window, (unsigned)(WSIZE - left)))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int ZEXPORT inflateBack9End(strm)
-z_stream FAR *strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
diff --git a/src/png/zlib/contrib/infback9/infback9.h b/src/png/zlib/contrib/infback9/infback9.h
deleted file mode 100644
index 1073c0a38..000000000
--- a/src/png/zlib/contrib/infback9/infback9.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* infback9.h -- header for using inflateBack9 functions
- * Copyright (C) 2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * This header file and associated patches provide a decoder for PKWare's
- * undocumented deflate64 compression method (method 9).  Use with infback9.c,
- * inftree9.h, inftree9.c, and inffix9.h.  These patches are not supported.
- * This should be compiled with zlib, since it uses zutil.h and zutil.o.
- * This code has not yet been tested on 16-bit architectures.  See the
- * comments in zlib.h for inflateBack() usage.  These functions are used
- * identically, except that there is no windowBits parameter, and a 64K
- * window must be provided.  Also if int's are 16 bits, then a zero for
- * the third parameter of the "out" function actually means 65536UL.
- * zlib.h must be included before this header file.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-ZEXTERN int ZEXPORT inflateBack9End OF((z_stream FAR *strm));
-ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define inflateBack9Init(strm, window) \
-        inflateBack9Init_((strm), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/png/zlib/contrib/infback9/inffix9.h b/src/png/zlib/contrib/infback9/inffix9.h
deleted file mode 100644
index ee5671d2d..000000000
--- a/src/png/zlib/contrib/infback9/inffix9.h
+++ /dev/null
@@ -1,107 +0,0 @@
-    /* inffix9.h -- table for decoding deflate64 fixed codes
-     * Generated automatically by makefixed9().
-     */
-
-    /* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
-
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{132,8,115},{130,7,31},{0,8,112},
-        {0,8,48},{0,9,192},{128,7,10},{0,8,96},{0,8,32},{0,9,160},
-        {0,8,0},{0,8,128},{0,8,64},{0,9,224},{128,7,6},{0,8,88},
-        {0,8,24},{0,9,144},{131,7,59},{0,8,120},{0,8,56},{0,9,208},
-        {129,7,17},{0,8,104},{0,8,40},{0,9,176},{0,8,8},{0,8,136},
-        {0,8,72},{0,9,240},{128,7,4},{0,8,84},{0,8,20},{133,8,227},
-        {131,7,43},{0,8,116},{0,8,52},{0,9,200},{129,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},
-        {128,7,8},{0,8,92},{0,8,28},{0,9,152},{132,7,83},{0,8,124},
-        {0,8,60},{0,9,216},{130,7,23},{0,8,108},{0,8,44},{0,9,184},
-        {0,8,12},{0,8,140},{0,8,76},{0,9,248},{128,7,3},{0,8,82},
-        {0,8,18},{133,8,163},{131,7,35},{0,8,114},{0,8,50},{0,9,196},
-        {129,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},{0,8,130},
-        {0,8,66},{0,9,228},{128,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {132,7,67},{0,8,122},{0,8,58},{0,9,212},{130,7,19},{0,8,106},
-        {0,8,42},{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},
-        {128,7,5},{0,8,86},{0,8,22},{65,8,0},{131,7,51},{0,8,118},
-        {0,8,54},{0,9,204},{129,7,15},{0,8,102},{0,8,38},{0,9,172},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,236},{128,7,9},{0,8,94},
-        {0,8,30},{0,9,156},{132,7,99},{0,8,126},{0,8,62},{0,9,220},
-        {130,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{133,8,131},
-        {130,7,31},{0,8,113},{0,8,49},{0,9,194},{128,7,10},{0,8,97},
-        {0,8,33},{0,9,162},{0,8,1},{0,8,129},{0,8,65},{0,9,226},
-        {128,7,6},{0,8,89},{0,8,25},{0,9,146},{131,7,59},{0,8,121},
-        {0,8,57},{0,9,210},{129,7,17},{0,8,105},{0,8,41},{0,9,178},
-        {0,8,9},{0,8,137},{0,8,73},{0,9,242},{128,7,4},{0,8,85},
-        {0,8,21},{144,8,3},{131,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {129,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},
-        {0,8,69},{0,9,234},{128,7,8},{0,8,93},{0,8,29},{0,9,154},
-        {132,7,83},{0,8,125},{0,8,61},{0,9,218},{130,7,23},{0,8,109},
-        {0,8,45},{0,9,186},{0,8,13},{0,8,141},{0,8,77},{0,9,250},
-        {128,7,3},{0,8,83},{0,8,19},{133,8,195},{131,7,35},{0,8,115},
-        {0,8,51},{0,9,198},{129,7,11},{0,8,99},{0,8,35},{0,9,166},
-        {0,8,3},{0,8,131},{0,8,67},{0,9,230},{128,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{132,7,67},{0,8,123},{0,8,59},{0,9,214},
-        {130,7,19},{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},
-        {0,8,75},{0,9,246},{128,7,5},{0,8,87},{0,8,23},{77,8,0},
-        {131,7,51},{0,8,119},{0,8,55},{0,9,206},{129,7,15},{0,8,103},
-        {0,8,39},{0,9,174},{0,8,7},{0,8,135},{0,8,71},{0,9,238},
-        {128,7,9},{0,8,95},{0,8,31},{0,9,158},{132,7,99},{0,8,127},
-        {0,8,63},{0,9,222},{130,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},
-        {0,8,16},{132,8,115},{130,7,31},{0,8,112},{0,8,48},{0,9,193},
-        {128,7,10},{0,8,96},{0,8,32},{0,9,161},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,225},{128,7,6},{0,8,88},{0,8,24},{0,9,145},
-        {131,7,59},{0,8,120},{0,8,56},{0,9,209},{129,7,17},{0,8,104},
-        {0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},{0,9,241},
-        {128,7,4},{0,8,84},{0,8,20},{133,8,227},{131,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{129,7,13},{0,8,100},{0,8,36},{0,9,169},
-        {0,8,4},{0,8,132},{0,8,68},{0,9,233},{128,7,8},{0,8,92},
-        {0,8,28},{0,9,153},{132,7,83},{0,8,124},{0,8,60},{0,9,217},
-        {130,7,23},{0,8,108},{0,8,44},{0,9,185},{0,8,12},{0,8,140},
-        {0,8,76},{0,9,249},{128,7,3},{0,8,82},{0,8,18},{133,8,163},
-        {131,7,35},{0,8,114},{0,8,50},{0,9,197},{129,7,11},{0,8,98},
-        {0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {128,7,7},{0,8,90},{0,8,26},{0,9,149},{132,7,67},{0,8,122},
-        {0,8,58},{0,9,213},{130,7,19},{0,8,106},{0,8,42},{0,9,181},
-        {0,8,10},{0,8,138},{0,8,74},{0,9,245},{128,7,5},{0,8,86},
-        {0,8,22},{65,8,0},{131,7,51},{0,8,118},{0,8,54},{0,9,205},
-        {129,7,15},{0,8,102},{0,8,38},{0,9,173},{0,8,6},{0,8,134},
-        {0,8,70},{0,9,237},{128,7,9},{0,8,94},{0,8,30},{0,9,157},
-        {132,7,99},{0,8,126},{0,8,62},{0,9,221},{130,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},
-        {96,7,0},{0,8,81},{0,8,17},{133,8,131},{130,7,31},{0,8,113},
-        {0,8,49},{0,9,195},{128,7,10},{0,8,97},{0,8,33},{0,9,163},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,227},{128,7,6},{0,8,89},
-        {0,8,25},{0,9,147},{131,7,59},{0,8,121},{0,8,57},{0,9,211},
-        {129,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},{0,8,137},
-        {0,8,73},{0,9,243},{128,7,4},{0,8,85},{0,8,21},{144,8,3},
-        {131,7,43},{0,8,117},{0,8,53},{0,9,203},{129,7,13},{0,8,101},
-        {0,8,37},{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},
-        {128,7,8},{0,8,93},{0,8,29},{0,9,155},{132,7,83},{0,8,125},
-        {0,8,61},{0,9,219},{130,7,23},{0,8,109},{0,8,45},{0,9,187},
-        {0,8,13},{0,8,141},{0,8,77},{0,9,251},{128,7,3},{0,8,83},
-        {0,8,19},{133,8,195},{131,7,35},{0,8,115},{0,8,51},{0,9,199},
-        {129,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{128,7,7},{0,8,91},{0,8,27},{0,9,151},
-        {132,7,67},{0,8,123},{0,8,59},{0,9,215},{130,7,19},{0,8,107},
-        {0,8,43},{0,9,183},{0,8,11},{0,8,139},{0,8,75},{0,9,247},
-        {128,7,5},{0,8,87},{0,8,23},{77,8,0},{131,7,51},{0,8,119},
-        {0,8,55},{0,9,207},{129,7,15},{0,8,103},{0,8,39},{0,9,175},
-        {0,8,7},{0,8,135},{0,8,71},{0,9,239},{128,7,9},{0,8,95},
-        {0,8,31},{0,9,159},{132,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {130,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},
-        {0,8,79},{0,9,255}
-    };
-
-    static const code distfix[32] = {
-        {128,5,1},{135,5,257},{131,5,17},{139,5,4097},{129,5,5},
-        {137,5,1025},{133,5,65},{141,5,16385},{128,5,3},{136,5,513},
-        {132,5,33},{140,5,8193},{130,5,9},{138,5,2049},{134,5,129},
-        {142,5,32769},{128,5,2},{135,5,385},{131,5,25},{139,5,6145},
-        {129,5,7},{137,5,1537},{133,5,97},{141,5,24577},{128,5,4},
-        {136,5,769},{132,5,49},{140,5,12289},{130,5,13},{138,5,3073},
-        {134,5,193},{142,5,49153}
-    };
diff --git a/src/png/zlib/contrib/infback9/inflate9.h b/src/png/zlib/contrib/infback9/inflate9.h
deleted file mode 100644
index ee9a79394..000000000
--- a/src/png/zlib/contrib/infback9/inflate9.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* inflate9.h -- internal inflate state definition
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-            LEN,        /* i: waiting for length/lit code */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD         /* got a data error -- remain here until reset */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to the BAD mode -- not shown for clarity)
-
-    Read deflate blocks:
-            TYPE -> STORED or TABLE or LEN or DONE
-            STORED -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN
-    Read deflate codes:
-                LEN -> LEN or TYPE
- */
-
-/* state maintained between inflate() calls.  Approximately 7K bytes. */
-struct inflate_state {
-        /* sliding window */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    unsigned have;              /* number of code lengths in lens[] */
-    code FAR *next;             /* next available space in codes[] */
-    unsigned short lens[320];   /* temporary storage for code lengths */
-    unsigned short work[288];   /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-};
diff --git a/src/png/zlib/contrib/infback9/inftree9.c b/src/png/zlib/contrib/infback9/inftree9.c
deleted file mode 100644
index 5f4a76798..000000000
--- a/src/png/zlib/contrib/infback9/inftree9.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftree9.h"
-
-#define MAXBITS 15
-
-const char inflate9_copyright[] =
-   " inflate9 1.2.11 Copyright 1995-2017 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int inflate_table9(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code this;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17,
-        19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
-        131, 163, 195, 227, 3, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
-        130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 77, 202};
-    static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
-        65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
-        4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
-    static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
-        128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132,
-        133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138,
-        139, 139, 140, 140, 141, 141, 142, 142};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) return -1;            /* no codes! */
-    for (min = 1; min <= MAXBITS; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftree9.h
-       for more information.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        end = 19;
-        break;
-    case LENS:
-        base = lbase;
-        base -= 257;
-        extra = lext;
-        extra -= 257;
-        end = 256;
-        break;
-    default:            /* DISTS */
-        base = dbase;
-        extra = dext;
-        end = -1;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if ((type == LENS && used >= ENOUGH_LENS) ||
-        (type == DISTS && used >= ENOUGH_DISTS))
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        this.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
-            this.op = (unsigned char)0;
-            this.val = work[sym];
-        }
-        else if ((int)(work[sym]) > end) {
-            this.op = (unsigned char)(extra[work[sym]]);
-            this.val = base[work[sym]];
-        }
-        else {
-            this.op = (unsigned char)(32 + 64);         /* end of block */
-            this.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = this;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += 1U << curr;
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if ((type == LENS && used >= ENOUGH_LENS) ||
-                (type == DISTS && used >= ENOUGH_DISTS))
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    this.op = (unsigned char)64;                /* invalid code marker */
-    this.bits = (unsigned char)(len - drop);
-    this.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            curr = root;
-            this.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = this;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}
diff --git a/src/png/zlib/contrib/infback9/inftree9.h b/src/png/zlib/contrib/infback9/inftree9.h
deleted file mode 100644
index 5ab21f0c6..000000000
--- a/src/png/zlib/contrib/infback9/inftree9.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* inftree9.h -- header to use inftree9.c
- * Copyright (C) 1995-2008 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    100eeeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1446, which is the sum of 852 for literal/length codes and 594 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 32 6 15" for distance codes returns 594.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in infback9.c.  If the root table size is changed,
-   then these maximum sizes would be need to be recalculated and updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 594
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-
-/* Type of code to build for inflate_table9() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-extern int inflate_table9 OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/src/png/zlib/contrib/inflate86/inffas86.c b/src/png/zlib/contrib/inflate86/inffas86.c
deleted file mode 100644
index 7292f67b7..000000000
--- a/src/png/zlib/contrib/inflate86/inffas86.c
+++ /dev/null
@@ -1,1157 +0,0 @@
-/* inffas86.c is a hand tuned assembler version of
- *
- * inffast.c -- fast decoding
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Copyright (C) 2003 Chris Anderson <christop@charm.net>
- * Please use the copyright conditions above.
- *
- * Dec-29-2003 -- I added AMD64 inflate asm support.  This version is also
- * slightly quicker on x86 systems because, instead of using rep movsb to copy
- * data, it uses rep movsw, which moves data in 2-byte chunks instead of single
- * bytes.  I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates
- * from http://fedora.linux.duke.edu/fc1_x86_64
- * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with
- * 1GB ram.  The 64-bit version is about 4% faster than the 32-bit version,
- * when decompressing mozilla-source-1.3.tar.gz.
- *
- * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
- * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
- * the moment.  I have successfully compiled and tested this code with gcc2.96,
- * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
- * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
- * enabled.  I will attempt to merge the MMX code into this version.  Newer
- * versions of this and inffast.S can be found at
- * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* Mark Adler's comments from inffast.c: */
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    struct inffast_ar {
-/* 64   32                               x86  x86_64 */
-/* ar offset                              register */
-/*  0    0 */ void *esp;                /* esp save */
-/*  8    4 */ void *ebp;                /* ebp save */
-/* 16    8 */ unsigned char FAR *in;    /* esi rsi  local strm->next_in */
-/* 24   12 */ unsigned char FAR *last;  /*     r9   while in < last */
-/* 32   16 */ unsigned char FAR *out;   /* edi rdi  local strm->next_out */
-/* 40   20 */ unsigned char FAR *beg;   /*          inflate()'s init next_out */
-/* 48   24 */ unsigned char FAR *end;   /*     r10  while out < end */
-/* 56   28 */ unsigned char FAR *window;/*          size of window, wsize!=0 */
-/* 64   32 */ code const FAR *lcode;    /* ebp rbp  local strm->lencode */
-/* 72   36 */ code const FAR *dcode;    /*     r11  local strm->distcode */
-/* 80   40 */ unsigned long hold;       /* edx rdx  local strm->hold */
-/* 88   44 */ unsigned bits;            /* ebx rbx  local strm->bits */
-/* 92   48 */ unsigned wsize;           /*          window size */
-/* 96   52 */ unsigned write;           /*          window write index */
-/*100   56 */ unsigned lmask;           /*     r12  mask for lcode */
-/*104   60 */ unsigned dmask;           /*     r13  mask for dcode */
-/*108   64 */ unsigned len;             /*     r14  match length */
-/*112   68 */ unsigned dist;            /*     r15  match distance */
-/*116   72 */ unsigned status;          /*          set when state chng*/
-    } ar;
-
-#if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )
-#define PAD_AVAIL_IN 6
-#define PAD_AVAIL_OUT 258
-#else
-#define PAD_AVAIL_IN 5
-#define PAD_AVAIL_OUT 257
-#endif
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    ar.in = strm->next_in;
-    ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);
-    ar.out = strm->next_out;
-    ar.beg = ar.out - (start - strm->avail_out);
-    ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);
-    ar.wsize = state->wsize;
-    ar.write = state->wnext;
-    ar.window = state->window;
-    ar.hold = state->hold;
-    ar.bits = state->bits;
-    ar.lcode = state->lencode;
-    ar.dcode = state->distcode;
-    ar.lmask = (1U << state->lenbits) - 1;
-    ar.dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-
-    /* align in on 1/2 hold size boundary */
-    while (((unsigned long)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {
-        ar.hold += (unsigned long)*ar.in++ << ar.bits;
-        ar.bits += 8;
-    }
-
-#if defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )
-    __asm__ __volatile__ (
-"        leaq    %0, %%rax\n"
-"        movq    %%rbp, 8(%%rax)\n"       /* save regs rbp and rsp */
-"        movq    %%rsp, (%%rax)\n"
-"        movq    %%rax, %%rsp\n"          /* make rsp point to &ar */
-"        movq    16(%%rsp), %%rsi\n"      /* rsi  = in */
-"        movq    32(%%rsp), %%rdi\n"      /* rdi  = out */
-"        movq    24(%%rsp), %%r9\n"       /* r9   = last */
-"        movq    48(%%rsp), %%r10\n"      /* r10  = end */
-"        movq    64(%%rsp), %%rbp\n"      /* rbp  = lcode */
-"        movq    72(%%rsp), %%r11\n"      /* r11  = dcode */
-"        movq    80(%%rsp), %%rdx\n"      /* rdx  = hold */
-"        movl    88(%%rsp), %%ebx\n"      /* ebx  = bits */
-"        movl    100(%%rsp), %%r12d\n"    /* r12d = lmask */
-"        movl    104(%%rsp), %%r13d\n"    /* r13d = dmask */
-                                          /* r14d = len */
-                                          /* r15d = dist */
-"        cld\n"
-"        cmpq    %%rdi, %%r10\n"
-"        je      .L_one_time\n"           /* if only one decode left */
-"        cmpq    %%rsi, %%r9\n"
-"        je      .L_one_time\n"
-"        jmp     .L_do_loop\n"
-
-".L_one_time:\n"
-"        movq    %%r12, %%r8\n"           /* r8 = lmask */
-"        cmpb    $32, %%bl\n"
-"        ja      .L_get_length_code_one_time\n"
-
-"        lodsl\n"                         /* eax = *(uint *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $32, %%bl\n"             /* bits += 32 */
-"        shlq    %%cl, %%rax\n"
-"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
-"        jmp     .L_get_length_code_one_time\n"
-
-".align 32,0x90\n"
-".L_while_test:\n"
-"        cmpq    %%rdi, %%r10\n"
-"        jbe     .L_break_loop\n"
-"        cmpq    %%rsi, %%r9\n"
-"        jbe     .L_break_loop\n"
-
-".L_do_loop:\n"
-"        movq    %%r12, %%r8\n"           /* r8 = lmask */
-"        cmpb    $32, %%bl\n"
-"        ja      .L_get_length_code\n"    /* if (32 < bits) */
-
-"        lodsl\n"                         /* eax = *(uint *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $32, %%bl\n"             /* bits += 32 */
-"        shlq    %%cl, %%rax\n"
-"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
-
-".L_get_length_code:\n"
-"        andq    %%rdx, %%r8\n"            /* r8 &= hold */
-"        movl    (%%rbp,%%r8,4), %%eax\n"  /* eax = lcode[hold & lmask] */
-
-"        movb    %%ah, %%cl\n"            /* cl = this.bits */
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
-
-"        testb   %%al, %%al\n"
-"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
-
-"        movq    %%r12, %%r8\n"            /* r8 = lmask */
-"        shrl    $16, %%eax\n"            /* output this.val char */
-"        stosb\n"
-
-".L_get_length_code_one_time:\n"
-"        andq    %%rdx, %%r8\n"            /* r8 &= hold */
-"        movl    (%%rbp,%%r8,4), %%eax\n" /* eax = lcode[hold & lmask] */
-
-".L_dolen:\n"
-"        movb    %%ah, %%cl\n"            /* cl = this.bits */
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
-
-"        testb   %%al, %%al\n"
-"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
-
-"        shrl    $16, %%eax\n"            /* output this.val char */
-"        stosb\n"
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_length_base:\n"
-"        movl    %%eax, %%r14d\n"         /* len = this */
-"        shrl    $16, %%r14d\n"           /* len = this.val */
-"        movb    %%al, %%cl\n"
-
-"        testb   $16, %%al\n"
-"        jz      .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_decode_distance\n"    /* if (!op) */
-
-".L_add_bits_to_len:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrq    %%cl, %%rdx\n"
-"        addl    %%eax, %%r14d\n"         /* len += hold & mask[op] */
-
-".L_decode_distance:\n"
-"        movq    %%r13, %%r8\n"           /* r8 = dmask */
-"        cmpb    $32, %%bl\n"
-"        ja      .L_get_distance_code\n"  /* if (32 < bits) */
-
-"        lodsl\n"                         /* eax = *(uint *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $32, %%bl\n"             /* bits += 32 */
-"        shlq    %%cl, %%rax\n"
-"        orq     %%rax, %%rdx\n"          /* hold |= *((uint *)in)++ << bits */
-
-".L_get_distance_code:\n"
-"        andq    %%rdx, %%r8\n"           /* r8 &= hold */
-"        movl    (%%r11,%%r8,4), %%eax\n" /* eax = dcode[hold & dmask] */
-
-".L_dodist:\n"
-"        movl    %%eax, %%r15d\n"         /* dist = this */
-"        shrl    $16, %%r15d\n"           /* dist = this.val */
-"        movb    %%ah, %%cl\n"
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrq    %%cl, %%rdx\n"           /* hold >>= this.bits */
-"        movb    %%al, %%cl\n"            /* cl = this.op */
-
-"        testb   $16, %%al\n"             /* if ((op & 16) == 0) */
-"        jz      .L_test_for_second_level_dist\n"
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_check_dist_one\n"
-
-".L_add_bits_to_dist:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"                 /* (1 << op) - 1 */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrq    %%cl, %%rdx\n"
-"        addl    %%eax, %%r15d\n"         /* dist += hold & ((1 << op) - 1) */
-
-".L_check_window:\n"
-"        movq    %%rsi, %%r8\n"           /* save in so from can use it's reg */
-"        movq    %%rdi, %%rax\n"
-"        subq    40(%%rsp), %%rax\n"      /* nbytes = out - beg */
-
-"        cmpl    %%r15d, %%eax\n"
-"        jb      .L_clip_window\n"        /* if (dist > nbytes) 4.2% */
-
-"        movl    %%r14d, %%ecx\n"         /* ecx = len */
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"          /* from = out - dist */
-
-"        sarl    %%ecx\n"
-"        jnc     .L_copy_two\n"           /* if len % 2 == 0 */
-
-"        rep     movsw\n"
-"        movb    (%%rsi), %%al\n"
-"        movb    %%al, (%%rdi)\n"
-"        incq    %%rdi\n"
-
-"        movq    %%r8, %%rsi\n"           /* move in back to %rsi, toss from */
-"        jmp     .L_while_test\n"
-
-".L_copy_two:\n"
-"        rep     movsw\n"
-"        movq    %%r8, %%rsi\n"           /* move in back to %rsi, toss from */
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_check_dist_one:\n"
-"        cmpl    $1, %%r15d\n"            /* if dist 1, is a memset */
-"        jne     .L_check_window\n"
-"        cmpq    %%rdi, 40(%%rsp)\n"      /* if out == beg, outside window */
-"        je      .L_check_window\n"
-
-"        movl    %%r14d, %%ecx\n"         /* ecx = len */
-"        movb    -1(%%rdi), %%al\n"
-"        movb    %%al, %%ah\n"
-
-"        sarl    %%ecx\n"
-"        jnc     .L_set_two\n"
-"        movb    %%al, (%%rdi)\n"
-"        incq    %%rdi\n"
-
-".L_set_two:\n"
-"        rep     stosw\n"
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_length:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    %%r14d, %%eax\n"        /* eax += len */
-"        movl    (%%rbp,%%rax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/
-"        jmp     .L_dolen\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_dist:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_invalid_distance_code\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    %%r15d, %%eax\n"        /* eax += dist */
-"        movl    (%%r11,%%rax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/
-"        jmp     .L_dodist\n"
-
-".align 32,0x90\n"
-".L_clip_window:\n"
-"        movl    %%eax, %%ecx\n"         /* ecx = nbytes */
-"        movl    92(%%rsp), %%eax\n"     /* eax = wsize, prepare for dist cmp */
-"        negl    %%ecx\n"                /* nbytes = -nbytes */
-
-"        cmpl    %%r15d, %%eax\n"
-"        jb      .L_invalid_distance_too_far\n" /* if (dist > wsize) */
-
-"        addl    %%r15d, %%ecx\n"         /* nbytes = dist - nbytes */
-"        cmpl    $0, 96(%%rsp)\n"
-"        jne     .L_wrap_around_window\n" /* if (write != 0) */
-
-"        movq    56(%%rsp), %%rsi\n"     /* from  = window */
-"        subl    %%ecx, %%eax\n"         /* eax  -= nbytes */
-"        addq    %%rax, %%rsi\n"         /* from += wsize - nbytes */
-
-"        movl    %%r14d, %%eax\n"        /* eax = len */
-"        cmpl    %%ecx, %%r14d\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* eax -= nbytes */
-"        rep     movsb\n"
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"         /* from = &out[ -dist ] */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_wrap_around_window:\n"
-"        movl    96(%%rsp), %%eax\n"     /* eax = write */
-"        cmpl    %%eax, %%ecx\n"
-"        jbe     .L_contiguous_in_window\n" /* if (write >= nbytes) */
-
-"        movl    92(%%rsp), %%esi\n"     /* from  = wsize */
-"        addq    56(%%rsp), %%rsi\n"     /* from += window */
-"        addq    %%rax, %%rsi\n"         /* from += write */
-"        subq    %%rcx, %%rsi\n"         /* from -= nbytes */
-"        subl    %%eax, %%ecx\n"         /* nbytes -= write */
-
-"        movl    %%r14d, %%eax\n"        /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movq    56(%%rsp), %%rsi\n"     /* from = window */
-"        movl    96(%%rsp), %%ecx\n"     /* nbytes = write */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_contiguous_in_window:\n"
-"        movq    56(%%rsp), %%rsi\n"     /* rsi = window */
-"        addq    %%rax, %%rsi\n"
-"        subq    %%rcx, %%rsi\n"         /* from += write - nbytes */
-
-"        movl    %%r14d, %%eax\n"        /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movq    %%rdi, %%rsi\n"
-"        subq    %%r15, %%rsi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"           /* if (nbytes >= len) */
-
-".align 32,0x90\n"
-".L_do_copy:\n"
-"        movl    %%eax, %%ecx\n"         /* ecx = len */
-"        rep     movsb\n"
-
-"        movq    %%r8, %%rsi\n"          /* move in back to %esi, toss from */
-"        jmp     .L_while_test\n"
-
-".L_test_for_end_of_block:\n"
-"        testb   $32, %%al\n"
-"        jz      .L_invalid_literal_length_code\n"
-"        movl    $1, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_literal_length_code:\n"
-"        movl    $2, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_code:\n"
-"        movl    $3, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_too_far:\n"
-"        movl    $4, 116(%%rsp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_break_loop:\n"
-"        movl    $0, 116(%%rsp)\n"
-
-".L_break_loop_with_status:\n"
-/* put in, out, bits, and hold back into ar and pop esp */
-"        movq    %%rsi, 16(%%rsp)\n"     /* in */
-"        movq    %%rdi, 32(%%rsp)\n"     /* out */
-"        movl    %%ebx, 88(%%rsp)\n"     /* bits */
-"        movq    %%rdx, 80(%%rsp)\n"     /* hold */
-"        movq    (%%rsp), %%rax\n"       /* restore rbp and rsp */
-"        movq    8(%%rsp), %%rbp\n"
-"        movq    %%rax, %%rsp\n"
-          :
-          : "m" (ar)
-          : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
-            "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
-    );
-#elif ( defined( __GNUC__ ) || defined( __ICC ) ) && defined( __i386 )
-    __asm__ __volatile__ (
-"        leal    %0, %%eax\n"
-"        movl    %%esp, (%%eax)\n"        /* save esp, ebp */
-"        movl    %%ebp, 4(%%eax)\n"
-"        movl    %%eax, %%esp\n"
-"        movl    8(%%esp), %%esi\n"       /* esi = in */
-"        movl    16(%%esp), %%edi\n"      /* edi = out */
-"        movl    40(%%esp), %%edx\n"      /* edx = hold */
-"        movl    44(%%esp), %%ebx\n"      /* ebx = bits */
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-
-"        cld\n"
-"        jmp     .L_do_loop\n"
-
-".align 32,0x90\n"
-".L_while_test:\n"
-"        cmpl    %%edi, 24(%%esp)\n"      /* out < end */
-"        jbe     .L_break_loop\n"
-"        cmpl    %%esi, 12(%%esp)\n"      /* in < last */
-"        jbe     .L_break_loop\n"
-
-".L_do_loop:\n"
-"        cmpb    $15, %%bl\n"
-"        ja      .L_get_length_code\n"    /* if (15 < bits) */
-
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"        /* hold |= *((ushort *)in)++ << bits */
-
-".L_get_length_code:\n"
-"        movl    56(%%esp), %%eax\n"      /* eax = lmask */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        movl    (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[hold & lmask] */
-
-".L_dolen:\n"
-"        movb    %%ah, %%cl\n"            /* cl = this.bits */
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrl    %%cl, %%edx\n"           /* hold >>= this.bits */
-
-"        testb   %%al, %%al\n"
-"        jnz     .L_test_for_length_base\n" /* if (op != 0) 45.7% */
-
-"        shrl    $16, %%eax\n"            /* output this.val char */
-"        stosb\n"
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_length_base:\n"
-"        movl    %%eax, %%ecx\n"          /* len = this */
-"        shrl    $16, %%ecx\n"            /* len = this.val */
-"        movl    %%ecx, 64(%%esp)\n"      /* save len */
-"        movb    %%al, %%cl\n"
-
-"        testb   $16, %%al\n"
-"        jz      .L_test_for_second_level_length\n" /* if ((op & 16) == 0) 8% */
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_decode_distance\n"    /* if (!op) */
-"        cmpb    %%cl, %%bl\n"
-"        jae     .L_add_bits_to_len\n"    /* if (op <= bits) */
-
-"        movb    %%cl, %%ch\n"            /* stash op in ch, freeing cl */
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"         /* hold |= *((ushort *)in)++ << bits */
-"        movb    %%ch, %%cl\n"            /* move op back to ecx */
-
-".L_add_bits_to_len:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrl    %%cl, %%edx\n"
-"        addl    %%eax, 64(%%esp)\n"      /* len += hold & mask[op] */
-
-".L_decode_distance:\n"
-"        cmpb    $15, %%bl\n"
-"        ja      .L_get_distance_code\n"  /* if (15 < bits) */
-
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"         /* hold |= *((ushort *)in)++ << bits */
-
-".L_get_distance_code:\n"
-"        movl    60(%%esp), %%eax\n"      /* eax = dmask */
-"        movl    36(%%esp), %%ecx\n"      /* ecx = dcode */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        movl    (%%ecx,%%eax,4), %%eax\n"/* eax = dcode[hold & dmask] */
-
-".L_dodist:\n"
-"        movl    %%eax, %%ebp\n"          /* dist = this */
-"        shrl    $16, %%ebp\n"            /* dist = this.val */
-"        movb    %%ah, %%cl\n"
-"        subb    %%ah, %%bl\n"            /* bits -= this.bits */
-"        shrl    %%cl, %%edx\n"           /* hold >>= this.bits */
-"        movb    %%al, %%cl\n"            /* cl = this.op */
-
-"        testb   $16, %%al\n"             /* if ((op & 16) == 0) */
-"        jz      .L_test_for_second_level_dist\n"
-"        andb    $15, %%cl\n"             /* op &= 15 */
-"        jz      .L_check_dist_one\n"
-"        cmpb    %%cl, %%bl\n"
-"        jae     .L_add_bits_to_dist\n"   /* if (op <= bits) 97.6% */
-
-"        movb    %%cl, %%ch\n"            /* stash op in ch, freeing cl */
-"        xorl    %%eax, %%eax\n"
-"        lodsw\n"                         /* al = *(ushort *)in++ */
-"        movb    %%bl, %%cl\n"            /* cl = bits, needs it for shifting */
-"        addb    $16, %%bl\n"             /* bits += 16 */
-"        shll    %%cl, %%eax\n"
-"        orl     %%eax, %%edx\n"        /* hold |= *((ushort *)in)++ << bits */
-"        movb    %%ch, %%cl\n"            /* move op back to ecx */
-
-".L_add_bits_to_dist:\n"
-"        subb    %%cl, %%bl\n"
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"                 /* (1 << op) - 1 */
-"        andl    %%edx, %%eax\n"          /* eax &= hold */
-"        shrl    %%cl, %%edx\n"
-"        addl    %%eax, %%ebp\n"          /* dist += hold & ((1 << op) - 1) */
-
-".L_check_window:\n"
-"        movl    %%esi, 8(%%esp)\n"       /* save in so from can use it's reg */
-"        movl    %%edi, %%eax\n"
-"        subl    20(%%esp), %%eax\n"      /* nbytes = out - beg */
-
-"        cmpl    %%ebp, %%eax\n"
-"        jb      .L_clip_window\n"        /* if (dist > nbytes) 4.2% */
-
-"        movl    64(%%esp), %%ecx\n"      /* ecx = len */
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"          /* from = out - dist */
-
-"        sarl    %%ecx\n"
-"        jnc     .L_copy_two\n"           /* if len % 2 == 0 */
-
-"        rep     movsw\n"
-"        movb    (%%esi), %%al\n"
-"        movb    %%al, (%%edi)\n"
-"        incl    %%edi\n"
-
-"        movl    8(%%esp), %%esi\n"       /* move in back to %esi, toss from */
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".L_copy_two:\n"
-"        rep     movsw\n"
-"        movl    8(%%esp), %%esi\n"       /* move in back to %esi, toss from */
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_check_dist_one:\n"
-"        cmpl    $1, %%ebp\n"            /* if dist 1, is a memset */
-"        jne     .L_check_window\n"
-"        cmpl    %%edi, 20(%%esp)\n"
-"        je      .L_check_window\n"      /* out == beg, if outside window */
-
-"        movl    64(%%esp), %%ecx\n"      /* ecx = len */
-"        movb    -1(%%edi), %%al\n"
-"        movb    %%al, %%ah\n"
-
-"        sarl    %%ecx\n"
-"        jnc     .L_set_two\n"
-"        movb    %%al, (%%edi)\n"
-"        incl    %%edi\n"
-
-".L_set_two:\n"
-"        rep     stosw\n"
-"        movl    32(%%esp), %%ebp\n"      /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_length:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_test_for_end_of_block\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    64(%%esp), %%eax\n"     /* eax += len */
-"        movl    (%%ebp,%%eax,4), %%eax\n" /* eax = lcode[val+(hold&mask[op])]*/
-"        jmp     .L_dolen\n"
-
-".align 32,0x90\n"
-".L_test_for_second_level_dist:\n"
-"        testb   $64, %%al\n"
-"        jnz     .L_invalid_distance_code\n" /* if ((op & 64) != 0) */
-
-"        xorl    %%eax, %%eax\n"
-"        incl    %%eax\n"
-"        shll    %%cl, %%eax\n"
-"        decl    %%eax\n"
-"        andl    %%edx, %%eax\n"         /* eax &= hold */
-"        addl    %%ebp, %%eax\n"         /* eax += dist */
-"        movl    36(%%esp), %%ecx\n"     /* ecx = dcode */
-"        movl    (%%ecx,%%eax,4), %%eax\n" /* eax = dcode[val+(hold&mask[op])]*/
-"        jmp     .L_dodist\n"
-
-".align 32,0x90\n"
-".L_clip_window:\n"
-"        movl    %%eax, %%ecx\n"
-"        movl    48(%%esp), %%eax\n"     /* eax = wsize */
-"        negl    %%ecx\n"                /* nbytes = -nbytes */
-"        movl    28(%%esp), %%esi\n"     /* from = window */
-
-"        cmpl    %%ebp, %%eax\n"
-"        jb      .L_invalid_distance_too_far\n" /* if (dist > wsize) */
-
-"        addl    %%ebp, %%ecx\n"         /* nbytes = dist - nbytes */
-"        cmpl    $0, 52(%%esp)\n"
-"        jne     .L_wrap_around_window\n" /* if (write != 0) */
-
-"        subl    %%ecx, %%eax\n"
-"        addl    %%eax, %%esi\n"         /* from += wsize - nbytes */
-
-"        movl    64(%%esp), %%eax\n"     /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_wrap_around_window:\n"
-"        movl    52(%%esp), %%eax\n"     /* eax = write */
-"        cmpl    %%eax, %%ecx\n"
-"        jbe     .L_contiguous_in_window\n" /* if (write >= nbytes) */
-
-"        addl    48(%%esp), %%esi\n"     /* from += wsize */
-"        addl    %%eax, %%esi\n"         /* from += write */
-"        subl    %%ecx, %%esi\n"         /* from -= nbytes */
-"        subl    %%eax, %%ecx\n"         /* nbytes -= write */
-
-"        movl    64(%%esp), %%eax\n"     /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    28(%%esp), %%esi\n"     /* from = window */
-"        movl    52(%%esp), %%ecx\n"     /* nbytes = write */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"
-
-".align 32,0x90\n"
-".L_contiguous_in_window:\n"
-"        addl    %%eax, %%esi\n"
-"        subl    %%ecx, %%esi\n"         /* from += write - nbytes */
-
-"        movl    64(%%esp), %%eax\n"     /* eax = len */
-"        cmpl    %%ecx, %%eax\n"
-"        jbe     .L_do_copy\n"           /* if (nbytes >= len) */
-
-"        subl    %%ecx, %%eax\n"         /* len -= nbytes */
-"        rep     movsb\n"
-"        movl    %%edi, %%esi\n"
-"        subl    %%ebp, %%esi\n"         /* from = out - dist */
-"        jmp     .L_do_copy\n"           /* if (nbytes >= len) */
-
-".align 32,0x90\n"
-".L_do_copy:\n"
-"        movl    %%eax, %%ecx\n"
-"        rep     movsb\n"
-
-"        movl    8(%%esp), %%esi\n"      /* move in back to %esi, toss from */
-"        movl    32(%%esp), %%ebp\n"     /* ebp = lcode */
-"        jmp     .L_while_test\n"
-
-".L_test_for_end_of_block:\n"
-"        testb   $32, %%al\n"
-"        jz      .L_invalid_literal_length_code\n"
-"        movl    $1, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_literal_length_code:\n"
-"        movl    $2, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_code:\n"
-"        movl    $3, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_invalid_distance_too_far:\n"
-"        movl    8(%%esp), %%esi\n"
-"        movl    $4, 72(%%esp)\n"
-"        jmp     .L_break_loop_with_status\n"
-
-".L_break_loop:\n"
-"        movl    $0, 72(%%esp)\n"
-
-".L_break_loop_with_status:\n"
-/* put in, out, bits, and hold back into ar and pop esp */
-"        movl    %%esi, 8(%%esp)\n"      /* save in */
-"        movl    %%edi, 16(%%esp)\n"     /* save out */
-"        movl    %%ebx, 44(%%esp)\n"     /* save bits */
-"        movl    %%edx, 40(%%esp)\n"     /* save hold */
-"        movl    4(%%esp), %%ebp\n"      /* restore esp, ebp */
-"        movl    (%%esp), %%esp\n"
-          :
-          : "m" (ar)
-          : "memory", "%eax", "%ebx", "%ecx", "%edx", "%esi", "%edi"
-    );
-#elif defined( _MSC_VER ) && ! defined( _M_AMD64 )
-    __asm {
-	lea	eax, ar
-	mov	[eax], esp         /* save esp, ebp */
-	mov	[eax+4], ebp
-	mov	esp, eax
-	mov	esi, [esp+8]       /* esi = in */
-	mov	edi, [esp+16]      /* edi = out */
-	mov	edx, [esp+40]      /* edx = hold */
-	mov	ebx, [esp+44]      /* ebx = bits */
-	mov	ebp, [esp+32]      /* ebp = lcode */
-
-	cld
-	jmp	L_do_loop
-
-ALIGN 4
-L_while_test:
-	cmp	[esp+24], edi
-	jbe	L_break_loop
-	cmp	[esp+12], esi
-	jbe	L_break_loop
-
-L_do_loop:
-	cmp	bl, 15
-	ja	L_get_length_code    /* if (15 < bits) */
-
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax        /* hold |= *((ushort *)in)++ << bits */
-
-L_get_length_code:
-	mov	eax, [esp+56]      /* eax = lmask */
-	and	eax, edx          /* eax &= hold */
-	mov	eax, [ebp+eax*4] /* eax = lcode[hold & lmask] */
-
-L_dolen:
-	mov	cl, ah            /* cl = this.bits */
-	sub	bl, ah            /* bits -= this.bits */
-	shr	edx, cl           /* hold >>= this.bits */
-
-	test	al, al
-	jnz	L_test_for_length_base /* if (op != 0) 45.7% */
-
-	shr	eax, 16            /* output this.val char */
-	stosb
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_length_base:
-	mov	ecx, eax          /* len = this */
-	shr	ecx, 16            /* len = this.val */
-	mov	[esp+64], ecx      /* save len */
-	mov	cl, al
-
-	test	al, 16
-	jz	L_test_for_second_level_length /* if ((op & 16) == 0) 8% */
-	and	cl, 15             /* op &= 15 */
-	jz	L_decode_distance    /* if (!op) */
-	cmp	bl, cl
-	jae	L_add_bits_to_len    /* if (op <= bits) */
-
-	mov	ch, cl            /* stash op in ch, freeing cl */
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax         /* hold |= *((ushort *)in)++ << bits */
-	mov	cl, ch            /* move op back to ecx */
-
-L_add_bits_to_len:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx          /* eax &= hold */
-	shr	edx, cl
-	add	[esp+64], eax      /* len += hold & mask[op] */
-
-L_decode_distance:
-	cmp	bl, 15
-	ja	L_get_distance_code  /* if (15 < bits) */
-
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax         /* hold |= *((ushort *)in)++ << bits */
-
-L_get_distance_code:
-	mov	eax, [esp+60]      /* eax = dmask */
-	mov	ecx, [esp+36]      /* ecx = dcode */
-	and	eax, edx          /* eax &= hold */
-	mov	eax, [ecx+eax*4]/* eax = dcode[hold & dmask] */
-
-L_dodist:
-	mov	ebp, eax          /* dist = this */
-	shr	ebp, 16            /* dist = this.val */
-	mov	cl, ah
-	sub	bl, ah            /* bits -= this.bits */
-	shr	edx, cl           /* hold >>= this.bits */
-	mov	cl, al            /* cl = this.op */
-
-	test	al, 16             /* if ((op & 16) == 0) */
-	jz	L_test_for_second_level_dist
-	and	cl, 15             /* op &= 15 */
-	jz	L_check_dist_one
-	cmp	bl, cl
-	jae	L_add_bits_to_dist   /* if (op <= bits) 97.6% */
-
-	mov	ch, cl            /* stash op in ch, freeing cl */
-	xor	eax, eax
-	lodsw                         /* al = *(ushort *)in++ */
-	mov	cl, bl            /* cl = bits, needs it for shifting */
-	add	bl, 16             /* bits += 16 */
-	shl	eax, cl
-	or	edx, eax        /* hold |= *((ushort *)in)++ << bits */
-	mov	cl, ch            /* move op back to ecx */
-
-L_add_bits_to_dist:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax                 /* (1 << op) - 1 */
-	and	eax, edx          /* eax &= hold */
-	shr	edx, cl
-	add	ebp, eax          /* dist += hold & ((1 << op) - 1) */
-
-L_check_window:
-	mov	[esp+8], esi       /* save in so from can use it's reg */
-	mov	eax, edi
-	sub	eax, [esp+20]      /* nbytes = out - beg */
-
-	cmp	eax, ebp
-	jb	L_clip_window        /* if (dist > nbytes) 4.2% */
-
-	mov	ecx, [esp+64]      /* ecx = len */
-	mov	esi, edi
-	sub	esi, ebp          /* from = out - dist */
-
-	sar	ecx, 1
-	jnc	L_copy_two
-
-	rep     movsw
-	mov	al, [esi]
-	mov	[edi], al
-	inc	edi
-
-	mov	esi, [esp+8]      /* move in back to %esi, toss from */
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-L_copy_two:
-	rep     movsw
-	mov	esi, [esp+8]      /* move in back to %esi, toss from */
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-ALIGN 4
-L_check_dist_one:
-	cmp	ebp, 1            /* if dist 1, is a memset */
-	jne	L_check_window
-	cmp	[esp+20], edi
-	je	L_check_window    /* out == beg, if outside window */
-
-	mov	ecx, [esp+64]     /* ecx = len */
-	mov	al, [edi-1]
-	mov	ah, al
-
-	sar	ecx, 1
-	jnc	L_set_two
-	mov	[edi], al         /* memset out with from[-1] */
-	inc	edi
-
-L_set_two:
-	rep     stosw
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_second_level_length:
-	test	al, 64
-	jnz	L_test_for_end_of_block /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx         /* eax &= hold */
-	add	eax, [esp+64]     /* eax += len */
-	mov	eax, [ebp+eax*4] /* eax = lcode[val+(hold&mask[op])]*/
-	jmp	L_dolen
-
-ALIGN 4
-L_test_for_second_level_dist:
-	test	al, 64
-	jnz	L_invalid_distance_code /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx         /* eax &= hold */
-	add	eax, ebp         /* eax += dist */
-	mov	ecx, [esp+36]     /* ecx = dcode */
-	mov	eax, [ecx+eax*4] /* eax = dcode[val+(hold&mask[op])]*/
-	jmp	L_dodist
-
-ALIGN 4
-L_clip_window:
-	mov	ecx, eax
-	mov	eax, [esp+48]     /* eax = wsize */
-	neg	ecx                /* nbytes = -nbytes */
-	mov	esi, [esp+28]     /* from = window */
-
-	cmp	eax, ebp
-	jb	L_invalid_distance_too_far /* if (dist > wsize) */
-
-	add	ecx, ebp         /* nbytes = dist - nbytes */
-	cmp	dword ptr [esp+52], 0
-	jne	L_wrap_around_window /* if (write != 0) */
-
-	sub	eax, ecx
-	add	esi, eax         /* from += wsize - nbytes */
-
-	mov	eax, [esp+64]    /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, edi
-	sub	esi, ebp         /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_wrap_around_window:
-	mov	eax, [esp+52]    /* eax = write */
-	cmp	ecx, eax
-	jbe	L_contiguous_in_window /* if (write >= nbytes) */
-
-	add	esi, [esp+48]    /* from += wsize */
-	add	esi, eax         /* from += write */
-	sub	esi, ecx         /* from -= nbytes */
-	sub	ecx, eax         /* nbytes -= write */
-
-	mov	eax, [esp+64]    /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, [esp+28]     /* from = window */
-	mov	ecx, [esp+52]     /* nbytes = write */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, edi
-	sub	esi, ebp         /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_contiguous_in_window:
-	add	esi, eax
-	sub	esi, ecx         /* from += write - nbytes */
-
-	mov	eax, [esp+64]    /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy          /* if (nbytes >= len) */
-
-	sub	eax, ecx         /* len -= nbytes */
-	rep     movsb
-	mov	esi, edi
-	sub	esi, ebp         /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_do_copy:
-	mov	ecx, eax
-	rep     movsb
-
-	mov	esi, [esp+8]      /* move in back to %esi, toss from */
-	mov	ebp, [esp+32]     /* ebp = lcode */
-	jmp	L_while_test
-
-L_test_for_end_of_block:
-	test	al, 32
-	jz	L_invalid_literal_length_code
-	mov	dword ptr [esp+72], 1
-	jmp	L_break_loop_with_status
-
-L_invalid_literal_length_code:
-	mov	dword ptr [esp+72], 2
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_code:
-	mov	dword ptr [esp+72], 3
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_too_far:
-	mov	esi, [esp+4]
-	mov	dword ptr [esp+72], 4
-	jmp	L_break_loop_with_status
-
-L_break_loop:
-	mov	dword ptr [esp+72], 0
-
-L_break_loop_with_status:
-/* put in, out, bits, and hold back into ar and pop esp */
-	mov	[esp+8], esi     /* save in */
-	mov	[esp+16], edi    /* save out */
-	mov	[esp+44], ebx    /* save bits */
-	mov	[esp+40], edx    /* save hold */
-	mov	ebp, [esp+4]     /* restore esp, ebp */
-	mov	esp, [esp]
-    }
-#else
-#error "x86 architecture not defined"
-#endif
-
-    if (ar.status > 1) {
-        if (ar.status == 2)
-            strm->msg = "invalid literal/length code";
-        else if (ar.status == 3)
-            strm->msg = "invalid distance code";
-        else
-            strm->msg = "invalid distance too far back";
-        state->mode = BAD;
-    }
-    else if ( ar.status == 1 ) {
-        state->mode = TYPE;
-    }
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    ar.len = ar.bits >> 3;
-    ar.in -= ar.len;
-    ar.bits -= ar.len << 3;
-    ar.hold &= (1U << ar.bits) - 1;
-
-    /* update state and return */
-    strm->next_in = ar.in;
-    strm->next_out = ar.out;
-    strm->avail_in = (unsigned)(ar.in < ar.last ?
-                                PAD_AVAIL_IN + (ar.last - ar.in) :
-                                PAD_AVAIL_IN - (ar.in - ar.last));
-    strm->avail_out = (unsigned)(ar.out < ar.end ?
-                                 PAD_AVAIL_OUT + (ar.end - ar.out) :
-                                 PAD_AVAIL_OUT - (ar.out - ar.end));
-    state->hold = ar.hold;
-    state->bits = ar.bits;
-    return;
-}
-
diff --git a/src/png/zlib/contrib/inflate86/inffast.S b/src/png/zlib/contrib/inflate86/inffast.S
deleted file mode 100644
index 2245a2905..000000000
--- a/src/png/zlib/contrib/inflate86/inffast.S
+++ /dev/null
@@ -1,1368 +0,0 @@
-/*
- * inffast.S is a hand tuned assembler version of:
- *
- * inffast.c -- fast decoding
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Copyright (C) 2003 Chris Anderson <christop@charm.net>
- * Please use the copyright conditions above.
- *
- * This version (Jan-23-2003) of inflate_fast was coded and tested under
- * GNU/Linux on a pentium 3, using the gcc-3.2 compiler distribution.  On that
- * machine, I found that gzip style archives decompressed about 20% faster than
- * the gcc-3.2 -O3 -fomit-frame-pointer compiled version.  Your results will
- * depend on how large of a buffer is used for z_stream.next_in & next_out
- * (8K-32K worked best for my 256K cpu cache) and how much overhead there is in
- * stream processing I/O and crc32/addler32.  In my case, this routine used
- * 70% of the cpu time and crc32 used 20%.
- *
- * I am confident that this version will work in the general case, but I have
- * not tested a wide variety of datasets or a wide variety of platforms.
- *
- * Jan-24-2003 -- Added -DUSE_MMX define for slightly faster inflating.
- * It should be a runtime flag instead of compile time flag...
- *
- * Jan-26-2003 -- Added runtime check for MMX support with cpuid instruction.
- * With -DUSE_MMX, only MMX code is compiled.  With -DNO_MMX, only non-MMX code
- * is compiled.  Without either option, runtime detection is enabled.  Runtime
- * detection should work on all modern cpus and the recomended algorithm (flip
- * ID bit on eflags and then use the cpuid instruction) is used in many
- * multimedia applications.  Tested under win2k with gcc-2.95 and gas-2.12
- * distributed with cygwin3.  Compiling with gcc-2.95 -c inffast.S -o
- * inffast.obj generates a COFF object which can then be linked with MSVC++
- * compiled code.  Tested under FreeBSD 4.7 with gcc-2.95.
- *
- * Jan-28-2003 -- Tested Athlon XP... MMX mode is slower than no MMX (and
- * slower than compiler generated code).  Adjusted cpuid check to use the MMX
- * code only for Pentiums < P4 until I have more data on the P4.  Speed
- * improvment is only about 15% on the Athlon when compared with code generated
- * with MSVC++.  Not sure yet, but I think the P4 will also be slower using the
- * MMX mode because many of it's x86 ALU instructions execute in .5 cycles and
- * have less latency than MMX ops.  Added code to buffer the last 11 bytes of
- * the input stream since the MMX code grabs bits in chunks of 32, which
- * differs from the inffast.c algorithm.  I don't think there would have been
- * read overruns where a page boundary was crossed (a segfault), but there
- * could have been overruns when next_in ends on unaligned memory (unintialized
- * memory read).
- *
- * Mar-13-2003 -- P4 MMX is slightly slower than P4 NO_MMX.  I created a C
- * version of the non-MMX code so that it doesn't depend on zstrm and zstate
- * structure offsets which are hard coded in this file.  This was last tested
- * with zlib-1.2.0 which is currently in beta testing, newer versions of this
- * and inffas86.c can be found at http://www.eetbeetee.com/zlib/ and
- * http://www.charm.net/~christop/zlib/
- */
-
-
-/*
- * if you have underscore linking problems (_inflate_fast undefined), try
- * using -DGAS_COFF
- */
-#if ! defined( GAS_COFF ) && ! defined( GAS_ELF )
-
-#if defined( WIN32 ) || defined( __CYGWIN__ )
-#define GAS_COFF /* windows object format */
-#else
-#define GAS_ELF
-#endif
-
-#endif /* ! GAS_COFF && ! GAS_ELF */
-
-
-#if defined( GAS_COFF )
-
-/* coff externals have underscores */
-#define inflate_fast _inflate_fast
-#define inflate_fast_use_mmx _inflate_fast_use_mmx
-
-#endif /* GAS_COFF */
-
-
-.file "inffast.S"
-
-.globl inflate_fast
-
-.text
-.align 4,0
-.L_invalid_literal_length_code_msg:
-.string "invalid literal/length code"
-
-.align 4,0
-.L_invalid_distance_code_msg:
-.string "invalid distance code"
-
-.align 4,0
-.L_invalid_distance_too_far_msg:
-.string "invalid distance too far back"
-
-#if ! defined( NO_MMX )
-.align 4,0
-.L_mask: /* mask[N] = ( 1 << N ) - 1 */
-.long 0
-.long 1
-.long 3
-.long 7
-.long 15
-.long 31
-.long 63
-.long 127
-.long 255
-.long 511
-.long 1023
-.long 2047
-.long 4095
-.long 8191
-.long 16383
-.long 32767
-.long 65535
-.long 131071
-.long 262143
-.long 524287
-.long 1048575
-.long 2097151
-.long 4194303
-.long 8388607
-.long 16777215
-.long 33554431
-.long 67108863
-.long 134217727
-.long 268435455
-.long 536870911
-.long 1073741823
-.long 2147483647
-.long 4294967295
-#endif /* NO_MMX */
-
-.text
-
-/*
- * struct z_stream offsets, in zlib.h
- */
-#define next_in_strm   0   /* strm->next_in */
-#define avail_in_strm  4   /* strm->avail_in */
-#define next_out_strm  12  /* strm->next_out */
-#define avail_out_strm 16  /* strm->avail_out */
-#define msg_strm       24  /* strm->msg */
-#define state_strm     28  /* strm->state */
-
-/*
- * struct inflate_state offsets, in inflate.h
- */
-#define mode_state     0   /* state->mode */
-#define wsize_state    32  /* state->wsize */
-#define write_state    40  /* state->write */
-#define window_state   44  /* state->window */
-#define hold_state     48  /* state->hold */
-#define bits_state     52  /* state->bits */
-#define lencode_state  68  /* state->lencode */
-#define distcode_state 72  /* state->distcode */
-#define lenbits_state  76  /* state->lenbits */
-#define distbits_state 80  /* state->distbits */
-
-/*
- * inflate_fast's activation record
- */
-#define local_var_size 64 /* how much local space for vars */
-#define strm_sp        88 /* first arg: z_stream * (local_var_size + 24) */
-#define start_sp       92 /* second arg: unsigned int (local_var_size + 28) */
-
-/*
- * offsets for local vars on stack
- */
-#define out            60  /* unsigned char* */
-#define window         56  /* unsigned char* */
-#define wsize          52  /* unsigned int */
-#define write          48  /* unsigned int */
-#define in             44  /* unsigned char* */
-#define beg            40  /* unsigned char* */
-#define buf            28  /* char[ 12 ] */
-#define len            24  /* unsigned int */
-#define last           20  /* unsigned char* */
-#define end            16  /* unsigned char* */
-#define dcode          12  /* code* */
-#define lcode           8  /* code* */
-#define dmask           4  /* unsigned int */
-#define lmask           0  /* unsigned int */
-
-/*
- * typedef enum inflate_mode consts, in inflate.h
- */
-#define INFLATE_MODE_TYPE 11  /* state->mode flags enum-ed in inflate.h */
-#define INFLATE_MODE_BAD  26
-
-
-#if ! defined( USE_MMX ) && ! defined( NO_MMX )
-
-#define RUN_TIME_MMX
-
-#define CHECK_MMX    1
-#define DO_USE_MMX   2
-#define DONT_USE_MMX 3
-
-.globl inflate_fast_use_mmx
-
-.data
-
-.align 4,0
-inflate_fast_use_mmx: /* integer flag for run time control 1=check,2=mmx,3=no */
-.long CHECK_MMX
-
-#if defined( GAS_ELF )
-/* elf info */
-.type   inflate_fast_use_mmx,@object
-.size   inflate_fast_use_mmx,4
-#endif
-
-#endif /* RUN_TIME_MMX */
-
-#if defined( GAS_COFF )
-/* coff info: scl 2 = extern, type 32 = function */
-.def inflate_fast; .scl 2; .type 32; .endef
-#endif
-
-.text
-
-.align 32,0x90
-inflate_fast:
-        pushl   %edi
-        pushl   %esi
-        pushl   %ebp
-        pushl   %ebx
-        pushf   /* save eflags (strm_sp, state_sp assumes this is 32 bits) */
-        subl    $local_var_size, %esp
-        cld
-
-#define strm_r  %esi
-#define state_r %edi
-
-        movl    strm_sp(%esp), strm_r
-        movl    state_strm(strm_r), state_r
-
-        /* in = strm->next_in;
-         * out = strm->next_out;
-         * last = in + strm->avail_in - 11;
-         * beg = out - (start - strm->avail_out);
-         * end = out + (strm->avail_out - 257);
-         */
-        movl    avail_in_strm(strm_r), %edx
-        movl    next_in_strm(strm_r), %eax
-
-        addl    %eax, %edx      /* avail_in += next_in */
-        subl    $11, %edx       /* avail_in -= 11 */
-
-        movl    %eax, in(%esp)
-        movl    %edx, last(%esp)
-
-        movl    start_sp(%esp), %ebp
-        movl    avail_out_strm(strm_r), %ecx
-        movl    next_out_strm(strm_r), %ebx
-
-        subl    %ecx, %ebp      /* start -= avail_out */
-        negl    %ebp            /* start = -start */
-        addl    %ebx, %ebp      /* start += next_out */
-
-        subl    $257, %ecx      /* avail_out -= 257 */
-        addl    %ebx, %ecx      /* avail_out += out */
-
-        movl    %ebx, out(%esp)
-        movl    %ebp, beg(%esp)
-        movl    %ecx, end(%esp)
-
-        /* wsize = state->wsize;
-         * write = state->write;
-         * window = state->window;
-         * hold = state->hold;
-         * bits = state->bits;
-         * lcode = state->lencode;
-         * dcode = state->distcode;
-         * lmask = ( 1 << state->lenbits ) - 1;
-         * dmask = ( 1 << state->distbits ) - 1;
-         */
-
-        movl    lencode_state(state_r), %eax
-        movl    distcode_state(state_r), %ecx
-
-        movl    %eax, lcode(%esp)
-        movl    %ecx, dcode(%esp)
-
-        movl    $1, %eax
-        movl    lenbits_state(state_r), %ecx
-        shll    %cl, %eax
-        decl    %eax
-        movl    %eax, lmask(%esp)
-
-        movl    $1, %eax
-        movl    distbits_state(state_r), %ecx
-        shll    %cl, %eax
-        decl    %eax
-        movl    %eax, dmask(%esp)
-
-        movl    wsize_state(state_r), %eax
-        movl    write_state(state_r), %ecx
-        movl    window_state(state_r), %edx
-
-        movl    %eax, wsize(%esp)
-        movl    %ecx, write(%esp)
-        movl    %edx, window(%esp)
-
-        movl    hold_state(state_r), %ebp
-        movl    bits_state(state_r), %ebx
-
-#undef strm_r
-#undef state_r
-
-#define in_r       %esi
-#define from_r     %esi
-#define out_r      %edi
-
-        movl    in(%esp), in_r
-        movl    last(%esp), %ecx
-        cmpl    in_r, %ecx
-        ja      .L_align_long           /* if in < last */
-
-        addl    $11, %ecx               /* ecx = &in[ avail_in ] */
-        subl    in_r, %ecx              /* ecx = avail_in */
-        movl    $12, %eax
-        subl    %ecx, %eax              /* eax = 12 - avail_in */
-        leal    buf(%esp), %edi
-        rep     movsb                   /* memcpy( buf, in, avail_in ) */
-        movl    %eax, %ecx
-        xorl    %eax, %eax
-        rep     stosb         /* memset( &buf[ avail_in ], 0, 12 - avail_in ) */
-        leal    buf(%esp), in_r         /* in = buf */
-        movl    in_r, last(%esp)        /* last = in, do just one iteration */
-        jmp     .L_is_aligned
-
-        /* align in_r on long boundary */
-.L_align_long:
-        testl   $3, in_r
-        jz      .L_is_aligned
-        xorl    %eax, %eax
-        movb    (in_r), %al
-        incl    in_r
-        movl    %ebx, %ecx
-        addl    $8, %ebx
-        shll    %cl, %eax
-        orl     %eax, %ebp
-        jmp     .L_align_long
-
-.L_is_aligned:
-        movl    out(%esp), out_r
-
-#if defined( NO_MMX )
-        jmp     .L_do_loop
-#endif
-
-#if defined( USE_MMX )
-        jmp     .L_init_mmx
-#endif
-
-/*** Runtime MMX check ***/
-
-#if defined( RUN_TIME_MMX )
-.L_check_mmx:
-        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
-        je      .L_init_mmx
-        ja      .L_do_loop /* > 2 */
-
-        pushl   %eax
-        pushl   %ebx
-        pushl   %ecx
-        pushl   %edx
-        pushf
-        movl    (%esp), %eax      /* copy eflags to eax */
-        xorl    $0x200000, (%esp) /* try toggling ID bit of eflags (bit 21)
-                                   * to see if cpu supports cpuid...
-                                   * ID bit method not supported by NexGen but
-                                   * bios may load a cpuid instruction and
-                                   * cpuid may be disabled on Cyrix 5-6x86 */
-        popf
-        pushf
-        popl    %edx              /* copy new eflags to edx */
-        xorl    %eax, %edx        /* test if ID bit is flipped */
-        jz      .L_dont_use_mmx   /* not flipped if zero */
-        xorl    %eax, %eax
-        cpuid
-        cmpl    $0x756e6547, %ebx /* check for GenuineIntel in ebx,ecx,edx */
-        jne     .L_dont_use_mmx
-        cmpl    $0x6c65746e, %ecx
-        jne     .L_dont_use_mmx
-        cmpl    $0x49656e69, %edx
-        jne     .L_dont_use_mmx
-        movl    $1, %eax
-        cpuid                     /* get cpu features */
-        shrl    $8, %eax
-        andl    $15, %eax
-        cmpl    $6, %eax          /* check for Pentium family, is 0xf for P4 */
-        jne     .L_dont_use_mmx
-        testl   $0x800000, %edx   /* test if MMX feature is set (bit 23) */
-        jnz     .L_use_mmx
-        jmp     .L_dont_use_mmx
-.L_use_mmx:
-        movl    $DO_USE_MMX, inflate_fast_use_mmx
-        jmp     .L_check_mmx_pop
-.L_dont_use_mmx:
-        movl    $DONT_USE_MMX, inflate_fast_use_mmx
-.L_check_mmx_pop:
-        popl    %edx
-        popl    %ecx
-        popl    %ebx
-        popl    %eax
-        jmp     .L_check_mmx
-#endif
-
-
-/*** Non-MMX code ***/
-
-#if defined ( NO_MMX ) || defined( RUN_TIME_MMX )
-
-#define hold_r     %ebp
-#define bits_r     %bl
-#define bitslong_r %ebx
-
-.align 32,0x90
-.L_while_test:
-        /* while (in < last && out < end)
-         */
-        cmpl    out_r, end(%esp)
-        jbe     .L_break_loop           /* if (out >= end) */
-
-        cmpl    in_r, last(%esp)
-        jbe     .L_break_loop
-
-.L_do_loop:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out
-         *
-         * do {
-         *   if (bits < 15) {
-         *     hold |= *((unsigned short *)in)++ << bits;
-         *     bits += 16
-         *   }
-         *   this = lcode[hold & lmask]
-         */
-        cmpb    $15, bits_r
-        ja      .L_get_length_code      /* if (15 < bits) */
-
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-
-.L_get_length_code:
-        movl    lmask(%esp), %edx       /* edx = lmask */
-        movl    lcode(%esp), %ecx       /* ecx = lcode */
-        andl    hold_r, %edx            /* edx &= hold */
-        movl    (%ecx,%edx,4), %eax     /* eax = lcode[hold & lmask] */
-
-.L_dolen:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out
-         *
-         * dolen:
-         *    bits -= this.bits;
-         *    hold >>= this.bits
-         */
-        movb    %ah, %cl                /* cl = this.bits */
-        subb    %ah, bits_r             /* bits -= this.bits */
-        shrl    %cl, hold_r             /* hold >>= this.bits */
-
-        /* check if op is a literal
-         * if (op == 0) {
-         *    PUP(out) = this.val;
-         *  }
-         */
-        testb   %al, %al
-        jnz     .L_test_for_length_base /* if (op != 0) 45.7% */
-
-        shrl    $16, %eax               /* output this.val char */
-        stosb
-        jmp     .L_while_test
-
-.L_test_for_length_base:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = len
-         *
-         * else if (op & 16) {
-         *   len = this.val
-         *   op &= 15
-         *   if (op) {
-         *     if (op > bits) {
-         *       hold |= *((unsigned short *)in)++ << bits;
-         *       bits += 16
-         *     }
-         *     len += hold & mask[op];
-         *     bits -= op;
-         *     hold >>= op;
-         *   }
-         */
-#define len_r %edx
-        movl    %eax, len_r             /* len = this */
-        shrl    $16, len_r              /* len = this.val */
-        movb    %al, %cl
-
-        testb   $16, %al
-        jz      .L_test_for_second_level_length /* if ((op & 16) == 0) 8% */
-        andb    $15, %cl                /* op &= 15 */
-        jz      .L_save_len             /* if (!op) */
-        cmpb    %cl, bits_r
-        jae     .L_add_bits_to_len      /* if (op <= bits) */
-
-        movb    %cl, %ch                /* stash op in ch, freeing cl */
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-        movb    %ch, %cl                /* move op back to ecx */
-
-.L_add_bits_to_len:
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax
-        subb    %cl, bits_r
-        andl    hold_r, %eax            /* eax &= hold */
-        shrl    %cl, hold_r
-        addl    %eax, len_r             /* len += hold & mask[op] */
-
-.L_save_len:
-        movl    len_r, len(%esp)        /* save len */
-#undef  len_r
-
-.L_decode_distance:
-        /* regs: %esi = in, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *
-         *   if (bits < 15) {
-         *     hold |= *((unsigned short *)in)++ << bits;
-         *     bits += 16
-         *   }
-         *   this = dcode[hold & dmask];
-         * dodist:
-         *   bits -= this.bits;
-         *   hold >>= this.bits;
-         *   op = this.op;
-         */
-
-        cmpb    $15, bits_r
-        ja      .L_get_distance_code    /* if (15 < bits) */
-
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-
-.L_get_distance_code:
-        movl    dmask(%esp), %edx       /* edx = dmask */
-        movl    dcode(%esp), %ecx       /* ecx = dcode */
-        andl    hold_r, %edx            /* edx &= hold */
-        movl    (%ecx,%edx,4), %eax     /* eax = dcode[hold & dmask] */
-
-#define dist_r %edx
-.L_dodist:
-        movl    %eax, dist_r            /* dist = this */
-        shrl    $16, dist_r             /* dist = this.val */
-        movb    %ah, %cl
-        subb    %ah, bits_r             /* bits -= this.bits */
-        shrl    %cl, hold_r             /* hold >>= this.bits */
-
-        /* if (op & 16) {
-         *   dist = this.val
-         *   op &= 15
-         *   if (op > bits) {
-         *     hold |= *((unsigned short *)in)++ << bits;
-         *     bits += 16
-         *   }
-         *   dist += hold & mask[op];
-         *   bits -= op;
-         *   hold >>= op;
-         */
-        movb    %al, %cl                /* cl = this.op */
-
-        testb   $16, %al                /* if ((op & 16) == 0) */
-        jz      .L_test_for_second_level_dist
-        andb    $15, %cl                /* op &= 15 */
-        jz      .L_check_dist_one
-        cmpb    %cl, bits_r
-        jae     .L_add_bits_to_dist     /* if (op <= bits) 97.6% */
-
-        movb    %cl, %ch                /* stash op in ch, freeing cl */
-        xorl    %eax, %eax
-        lodsw                           /* al = *(ushort *)in++ */
-        movb    bits_r, %cl             /* cl = bits, needs it for shifting */
-        addb    $16, bits_r             /* bits += 16 */
-        shll    %cl, %eax
-        orl     %eax, hold_r            /* hold |= *((ushort *)in)++ << bits */
-        movb    %ch, %cl                /* move op back to ecx */
-
-.L_add_bits_to_dist:
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax                    /* (1 << op) - 1 */
-        subb    %cl, bits_r
-        andl    hold_r, %eax            /* eax &= hold */
-        shrl    %cl, hold_r
-        addl    %eax, dist_r            /* dist += hold & ((1 << op) - 1) */
-        jmp     .L_check_window
-
-.L_check_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes
-         *
-         * nbytes = out - beg;
-         * if (dist <= nbytes) {
-         *   from = out - dist;
-         *   do {
-         *     PUP(out) = PUP(from);
-         *   } while (--len > 0) {
-         * }
-         */
-
-        movl    in_r, in(%esp)          /* save in so from can use it's reg */
-        movl    out_r, %eax
-        subl    beg(%esp), %eax         /* nbytes = out - beg */
-
-        cmpl    dist_r, %eax
-        jb      .L_clip_window          /* if (dist > nbytes) 4.2% */
-
-        movl    len(%esp), %ecx
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-        subl    $3, %ecx
-        movb    (from_r), %al
-        movb    %al, (out_r)
-        movb    1(from_r), %al
-        movb    2(from_r), %dl
-        addl    $3, from_r
-        movb    %al, 1(out_r)
-        movb    %dl, 2(out_r)
-        addl    $3, out_r
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        jmp     .L_while_test
-
-.align 16,0x90
-.L_check_dist_one:
-        cmpl    $1, dist_r
-        jne     .L_check_window
-        cmpl    out_r, beg(%esp)
-        je      .L_check_window
-
-        decl    out_r
-        movl    len(%esp), %ecx
-        movb    (out_r), %al
-        subl    $3, %ecx
-
-        movb    %al, 1(out_r)
-        movb    %al, 2(out_r)
-        movb    %al, 3(out_r)
-        addl    $4, out_r
-        rep     stosb
-
-        jmp     .L_while_test
-
-.align 16,0x90
-.L_test_for_second_level_length:
-        /* else if ((op & 64) == 0) {
-         *   this = lcode[this.val + (hold & mask[op])];
-         * }
-         */
-        testb   $64, %al
-        jnz     .L_test_for_end_of_block  /* if ((op & 64) != 0) */
-
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax
-        andl    hold_r, %eax            /* eax &= hold */
-        addl    %edx, %eax              /* eax += this.val */
-        movl    lcode(%esp), %edx       /* edx = lcode */
-        movl    (%edx,%eax,4), %eax     /* eax = lcode[val + (hold&mask[op])] */
-        jmp     .L_dolen
-
-.align 16,0x90
-.L_test_for_second_level_dist:
-        /* else if ((op & 64) == 0) {
-         *   this = dcode[this.val + (hold & mask[op])];
-         * }
-         */
-        testb   $64, %al
-        jnz     .L_invalid_distance_code  /* if ((op & 64) != 0) */
-
-        movl    $1, %eax
-        shll    %cl, %eax
-        decl    %eax
-        andl    hold_r, %eax            /* eax &= hold */
-        addl    %edx, %eax              /* eax += this.val */
-        movl    dcode(%esp), %edx       /* edx = dcode */
-        movl    (%edx,%eax,4), %eax     /* eax = dcode[val + (hold&mask[op])] */
-        jmp     .L_dodist
-
-.align 16,0x90
-.L_clip_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes
-         *
-         * else {
-         *   if (dist > wsize) {
-         *     invalid distance
-         *   }
-         *   from = window;
-         *   nbytes = dist - nbytes;
-         *   if (write == 0) {
-         *     from += wsize - nbytes;
-         */
-#define nbytes_r %ecx
-        movl    %eax, nbytes_r
-        movl    wsize(%esp), %eax       /* prepare for dist compare */
-        negl    nbytes_r                /* nbytes = -nbytes */
-        movl    window(%esp), from_r    /* from = window */
-
-        cmpl    dist_r, %eax
-        jb      .L_invalid_distance_too_far /* if (dist > wsize) */
-
-        addl    dist_r, nbytes_r        /* nbytes = dist - nbytes */
-        cmpl    $0, write(%esp)
-        jne     .L_wrap_around_window   /* if (write != 0) */
-
-        subl    nbytes_r, %eax
-        addl    %eax, from_r            /* from += wsize - nbytes */
-
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes, %eax = len
-         *
-         *     if (nbytes < len) {
-         *       len -= nbytes;
-         *       do {
-         *         PUP(out) = PUP(from);
-         *       } while (--nbytes);
-         *       from = out - dist;
-         *     }
-         *   }
-         */
-#define len_r %eax
-        movl    len(%esp), len_r
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1
-
-.L_wrap_around_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes, %eax = write, %eax = len
-         *
-         *   else if (write < nbytes) {
-         *     from += wsize + write - nbytes;
-         *     nbytes -= write;
-         *     if (nbytes < len) {
-         *       len -= nbytes;
-         *       do {
-         *         PUP(out) = PUP(from);
-         *       } while (--nbytes);
-         *       from = window;
-         *       nbytes = write;
-         *       if (nbytes < len) {
-         *         len -= nbytes;
-         *         do {
-         *           PUP(out) = PUP(from);
-         *         } while(--nbytes);
-         *         from = out - dist;
-         *       }
-         *     }
-         *   }
-         */
-#define write_r %eax
-        movl    write(%esp), write_r
-        cmpl    write_r, nbytes_r
-        jbe     .L_contiguous_in_window /* if (write >= nbytes) */
-
-        addl    wsize(%esp), from_r
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += wsize + write - nbytes */
-        subl    write_r, nbytes_r       /* nbytes -= write */
-#undef write_r
-
-        movl    len(%esp), len_r
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    window(%esp), from_r    /* from = window */
-        movl    write(%esp), nbytes_r   /* nbytes = write */
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1
-
-.L_contiguous_in_window:
-        /* regs: %esi = from, %ebp = hold, %bl = bits, %edi = out, %edx = dist
-         *       %ecx = nbytes, %eax = write, %eax = len
-         *
-         *   else {
-         *     from += write - nbytes;
-         *     if (nbytes < len) {
-         *       len -= nbytes;
-         *       do {
-         *         PUP(out) = PUP(from);
-         *       } while (--nbytes);
-         *       from = out - dist;
-         *     }
-         *   }
-         */
-#define write_r %eax
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += write - nbytes */
-#undef write_r
-
-        movl    len(%esp), len_r
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1             /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-.L_do_copy1:
-        /* regs: %esi = from, %esi = in, %ebp = hold, %bl = bits, %edi = out
-         *       %eax = len
-         *
-         *     while (len > 0) {
-         *       PUP(out) = PUP(from);
-         *       len--;
-         *     }
-         *   }
-         * } while (in < last && out < end);
-         */
-#undef nbytes_r
-#define in_r %esi
-        movl    len_r, %ecx
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        jmp     .L_while_test
-
-#undef len_r
-#undef dist_r
-
-#endif /* NO_MMX || RUN_TIME_MMX */
-
-
-/*** MMX code ***/
-
-#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
-
-.align 32,0x90
-.L_init_mmx:
-        emms
-
-#undef  bits_r
-#undef  bitslong_r
-#define bitslong_r %ebp
-#define hold_mm    %mm0
-        movd    %ebp, hold_mm
-        movl    %ebx, bitslong_r
-
-#define used_mm   %mm1
-#define dmask2_mm %mm2
-#define lmask2_mm %mm3
-#define lmask_mm  %mm4
-#define dmask_mm  %mm5
-#define tmp_mm    %mm6
-
-        movd    lmask(%esp), lmask_mm
-        movq    lmask_mm, lmask2_mm
-        movd    dmask(%esp), dmask_mm
-        movq    dmask_mm, dmask2_mm
-        pxor    used_mm, used_mm
-        movl    lcode(%esp), %ebx       /* ebx = lcode */
-        jmp     .L_do_loop_mmx
-
-.align 32,0x90
-.L_while_test_mmx:
-        /* while (in < last && out < end)
-         */
-        cmpl    out_r, end(%esp)
-        jbe     .L_break_loop           /* if (out >= end) */
-
-        cmpl    in_r, last(%esp)
-        jbe     .L_break_loop
-
-.L_do_loop_mmx:
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-
-        cmpl    $32, bitslong_r
-        ja      .L_get_length_code_mmx  /* if (32 < bits) */
-
-        movd    bitslong_r, tmp_mm
-        movd    (in_r), %mm7
-        addl    $4, in_r
-        psllq   tmp_mm, %mm7
-        addl    $32, bitslong_r
-        por     %mm7, hold_mm           /* hold_mm |= *((uint *)in)++ << bits */
-
-.L_get_length_code_mmx:
-        pand    hold_mm, lmask_mm
-        movd    lmask_mm, %eax
-        movq    lmask2_mm, lmask_mm
-        movl    (%ebx,%eax,4), %eax     /* eax = lcode[hold & lmask] */
-
-.L_dolen_mmx:
-        movzbl  %ah, %ecx               /* ecx = this.bits */
-        movd    %ecx, used_mm
-        subl    %ecx, bitslong_r        /* bits -= this.bits */
-
-        testb   %al, %al
-        jnz     .L_test_for_length_base_mmx /* if (op != 0) 45.7% */
-
-        shrl    $16, %eax               /* output this.val char */
-        stosb
-        jmp     .L_while_test_mmx
-
-.L_test_for_length_base_mmx:
-#define len_r  %edx
-        movl    %eax, len_r             /* len = this */
-        shrl    $16, len_r              /* len = this.val */
-
-        testb   $16, %al
-        jz      .L_test_for_second_level_length_mmx /* if ((op & 16) == 0) 8% */
-        andl    $15, %eax               /* op &= 15 */
-        jz      .L_decode_distance_mmx  /* if (!op) */
-
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    %eax, used_mm
-        movd    hold_mm, %ecx
-        subl    %eax, bitslong_r
-        andl    .L_mask(,%eax,4), %ecx
-        addl    %ecx, len_r             /* len += hold & mask[op] */
-
-.L_decode_distance_mmx:
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-
-        cmpl    $32, bitslong_r
-        ja      .L_get_dist_code_mmx    /* if (32 < bits) */
-
-        movd    bitslong_r, tmp_mm
-        movd    (in_r), %mm7
-        addl    $4, in_r
-        psllq   tmp_mm, %mm7
-        addl    $32, bitslong_r
-        por     %mm7, hold_mm           /* hold_mm |= *((uint *)in)++ << bits */
-
-.L_get_dist_code_mmx:
-        movl    dcode(%esp), %ebx       /* ebx = dcode */
-        pand    hold_mm, dmask_mm
-        movd    dmask_mm, %eax
-        movq    dmask2_mm, dmask_mm
-        movl    (%ebx,%eax,4), %eax     /* eax = dcode[hold & lmask] */
-
-.L_dodist_mmx:
-#define dist_r %ebx
-        movzbl  %ah, %ecx               /* ecx = this.bits */
-        movl    %eax, dist_r
-        shrl    $16, dist_r             /* dist  = this.val */
-        subl    %ecx, bitslong_r        /* bits -= this.bits */
-        movd    %ecx, used_mm
-
-        testb   $16, %al                /* if ((op & 16) == 0) */
-        jz      .L_test_for_second_level_dist_mmx
-        andl    $15, %eax               /* op &= 15 */
-        jz      .L_check_dist_one_mmx
-
-.L_add_bits_to_dist_mmx:
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    %eax, used_mm           /* save bit length of current op */
-        movd    hold_mm, %ecx           /* get the next bits on input stream */
-        subl    %eax, bitslong_r        /* bits -= op bits */
-        andl    .L_mask(,%eax,4), %ecx  /* ecx   = hold & mask[op] */
-        addl    %ecx, dist_r            /* dist += hold & mask[op] */
-
-.L_check_window_mmx:
-        movl    in_r, in(%esp)          /* save in so from can use it's reg */
-        movl    out_r, %eax
-        subl    beg(%esp), %eax         /* nbytes = out - beg */
-
-        cmpl    dist_r, %eax
-        jb      .L_clip_window_mmx      /* if (dist > nbytes) 4.2% */
-
-        movl    len_r, %ecx
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-        subl    $3, %ecx
-        movb    (from_r), %al
-        movb    %al, (out_r)
-        movb    1(from_r), %al
-        movb    2(from_r), %dl
-        addl    $3, from_r
-        movb    %al, 1(out_r)
-        movb    %dl, 2(out_r)
-        addl    $3, out_r
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
-        jmp     .L_while_test_mmx
-
-.align 16,0x90
-.L_check_dist_one_mmx:
-        cmpl    $1, dist_r
-        jne     .L_check_window_mmx
-        cmpl    out_r, beg(%esp)
-        je      .L_check_window_mmx
-
-        decl    out_r
-        movl    len_r, %ecx
-        movb    (out_r), %al
-        subl    $3, %ecx
-
-        movb    %al, 1(out_r)
-        movb    %al, 2(out_r)
-        movb    %al, 3(out_r)
-        addl    $4, out_r
-        rep     stosb
-
-        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
-        jmp     .L_while_test_mmx
-
-.align 16,0x90
-.L_test_for_second_level_length_mmx:
-        testb   $64, %al
-        jnz     .L_test_for_end_of_block  /* if ((op & 64) != 0) */
-
-        andl    $15, %eax
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    hold_mm, %ecx
-        andl    .L_mask(,%eax,4), %ecx
-        addl    len_r, %ecx
-        movl    (%ebx,%ecx,4), %eax     /* eax = lcode[hold & lmask] */
-        jmp     .L_dolen_mmx
-
-.align 16,0x90
-.L_test_for_second_level_dist_mmx:
-        testb   $64, %al
-        jnz     .L_invalid_distance_code  /* if ((op & 64) != 0) */
-
-        andl    $15, %eax
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    hold_mm, %ecx
-        andl    .L_mask(,%eax,4), %ecx
-        movl    dcode(%esp), %eax       /* ecx = dcode */
-        addl    dist_r, %ecx
-        movl    (%eax,%ecx,4), %eax     /* eax = lcode[hold & lmask] */
-        jmp     .L_dodist_mmx
-
-.align 16,0x90
-.L_clip_window_mmx:
-#define nbytes_r %ecx
-        movl    %eax, nbytes_r
-        movl    wsize(%esp), %eax       /* prepare for dist compare */
-        negl    nbytes_r                /* nbytes = -nbytes */
-        movl    window(%esp), from_r    /* from = window */
-
-        cmpl    dist_r, %eax
-        jb      .L_invalid_distance_too_far /* if (dist > wsize) */
-
-        addl    dist_r, nbytes_r        /* nbytes = dist - nbytes */
-        cmpl    $0, write(%esp)
-        jne     .L_wrap_around_window_mmx /* if (write != 0) */
-
-        subl    nbytes_r, %eax
-        addl    %eax, from_r            /* from += wsize - nbytes */
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1_mmx
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1_mmx
-
-.L_wrap_around_window_mmx:
-#define write_r %eax
-        movl    write(%esp), write_r
-        cmpl    write_r, nbytes_r
-        jbe     .L_contiguous_in_window_mmx /* if (write >= nbytes) */
-
-        addl    wsize(%esp), from_r
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += wsize + write - nbytes */
-        subl    write_r, nbytes_r       /* nbytes -= write */
-#undef write_r
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    window(%esp), from_r    /* from = window */
-        movl    write(%esp), nbytes_r   /* nbytes = write */
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-        jmp     .L_do_copy1_mmx
-
-.L_contiguous_in_window_mmx:
-#define write_r %eax
-        addl    write_r, from_r
-        subl    nbytes_r, from_r        /* from += write - nbytes */
-#undef write_r
-
-        cmpl    nbytes_r, len_r
-        jbe     .L_do_copy1_mmx         /* if (nbytes >= len) */
-
-        subl    nbytes_r, len_r         /* len -= nbytes */
-        rep     movsb
-        movl    out_r, from_r
-        subl    dist_r, from_r          /* from = out - dist */
-
-.L_do_copy1_mmx:
-#undef nbytes_r
-#define in_r %esi
-        movl    len_r, %ecx
-        rep     movsb
-
-        movl    in(%esp), in_r          /* move in back to %esi, toss from */
-        movl    lcode(%esp), %ebx       /* move lcode back to %ebx, toss dist */
-        jmp     .L_while_test_mmx
-
-#undef hold_r
-#undef bitslong_r
-
-#endif /* USE_MMX || RUN_TIME_MMX */
-
-
-/*** USE_MMX, NO_MMX, and RUNTIME_MMX from here on ***/
-
-.L_invalid_distance_code:
-        /* else {
-         *   strm->msg = "invalid distance code";
-         *   state->mode = BAD;
-         * }
-         */
-        movl    $.L_invalid_distance_code_msg, %ecx
-        movl    $INFLATE_MODE_BAD, %edx
-        jmp     .L_update_stream_state
-
-.L_test_for_end_of_block:
-        /* else if (op & 32) {
-         *   state->mode = TYPE;
-         *   break;
-         * }
-         */
-        testb   $32, %al
-        jz      .L_invalid_literal_length_code  /* if ((op & 32) == 0) */
-
-        movl    $0, %ecx
-        movl    $INFLATE_MODE_TYPE, %edx
-        jmp     .L_update_stream_state
-
-.L_invalid_literal_length_code:
-        /* else {
-         *   strm->msg = "invalid literal/length code";
-         *   state->mode = BAD;
-         * }
-         */
-        movl    $.L_invalid_literal_length_code_msg, %ecx
-        movl    $INFLATE_MODE_BAD, %edx
-        jmp     .L_update_stream_state
-
-.L_invalid_distance_too_far:
-        /* strm->msg = "invalid distance too far back";
-         * state->mode = BAD;
-         */
-        movl    in(%esp), in_r          /* from_r has in's reg, put in back */
-        movl    $.L_invalid_distance_too_far_msg, %ecx
-        movl    $INFLATE_MODE_BAD, %edx
-        jmp     .L_update_stream_state
-
-.L_update_stream_state:
-        /* set strm->msg = %ecx, strm->state->mode = %edx */
-        movl    strm_sp(%esp), %eax
-        testl   %ecx, %ecx              /* if (msg != NULL) */
-        jz      .L_skip_msg
-        movl    %ecx, msg_strm(%eax)    /* strm->msg = msg */
-.L_skip_msg:
-        movl    state_strm(%eax), %eax  /* state = strm->state */
-        movl    %edx, mode_state(%eax)  /* state->mode = edx (BAD | TYPE) */
-        jmp     .L_break_loop
-
-.align 32,0x90
-.L_break_loop:
-
-/*
- * Regs:
- *
- * bits = %ebp when mmx, and in %ebx when non-mmx
- * hold = %hold_mm when mmx, and in %ebp when non-mmx
- * in   = %esi
- * out  = %edi
- */
-
-#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
-
-#if defined( RUN_TIME_MMX )
-
-        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
-        jne     .L_update_next_in
-
-#endif /* RUN_TIME_MMX */
-
-        movl    %ebp, %ebx
-
-.L_update_next_in:
-
-#endif
-
-#define strm_r  %eax
-#define state_r %edx
-
-        /* len = bits >> 3;
-         * in -= len;
-         * bits -= len << 3;
-         * hold &= (1U << bits) - 1;
-         * state->hold = hold;
-         * state->bits = bits;
-         * strm->next_in = in;
-         * strm->next_out = out;
-         */
-        movl    strm_sp(%esp), strm_r
-        movl    %ebx, %ecx
-        movl    state_strm(strm_r), state_r
-        shrl    $3, %ecx
-        subl    %ecx, in_r
-        shll    $3, %ecx
-        subl    %ecx, %ebx
-        movl    out_r, next_out_strm(strm_r)
-        movl    %ebx, bits_state(state_r)
-        movl    %ebx, %ecx
-
-        leal    buf(%esp), %ebx
-        cmpl    %ebx, last(%esp)
-        jne     .L_buf_not_used         /* if buf != last */
-
-        subl    %ebx, in_r              /* in -= buf */
-        movl    next_in_strm(strm_r), %ebx
-        movl    %ebx, last(%esp)        /* last = strm->next_in */
-        addl    %ebx, in_r              /* in += strm->next_in */
-        movl    avail_in_strm(strm_r), %ebx
-        subl    $11, %ebx
-        addl    %ebx, last(%esp)    /* last = &strm->next_in[ avail_in - 11 ] */
-
-.L_buf_not_used:
-        movl    in_r, next_in_strm(strm_r)
-
-        movl    $1, %ebx
-        shll    %cl, %ebx
-        decl    %ebx
-
-#if defined( USE_MMX ) || defined( RUN_TIME_MMX )
-
-#if defined( RUN_TIME_MMX )
-
-        cmpl    $DO_USE_MMX, inflate_fast_use_mmx
-        jne     .L_update_hold
-
-#endif /* RUN_TIME_MMX */
-
-        psrlq   used_mm, hold_mm        /* hold_mm >>= last bit length */
-        movd    hold_mm, %ebp
-
-        emms
-
-.L_update_hold:
-
-#endif /* USE_MMX || RUN_TIME_MMX */
-
-        andl    %ebx, %ebp
-        movl    %ebp, hold_state(state_r)
-
-#define last_r %ebx
-
-        /* strm->avail_in = in < last ? 11 + (last - in) : 11 - (in - last) */
-        movl    last(%esp), last_r
-        cmpl    in_r, last_r
-        jbe     .L_last_is_smaller     /* if (in >= last) */
-
-        subl    in_r, last_r           /* last -= in */
-        addl    $11, last_r            /* last += 11 */
-        movl    last_r, avail_in_strm(strm_r)
-        jmp     .L_fixup_out
-.L_last_is_smaller:
-        subl    last_r, in_r           /* in -= last */
-        negl    in_r                   /* in = -in */
-        addl    $11, in_r              /* in += 11 */
-        movl    in_r, avail_in_strm(strm_r)
-
-#undef last_r
-#define end_r %ebx
-
-.L_fixup_out:
-        /* strm->avail_out = out < end ? 257 + (end - out) : 257 - (out - end)*/
-        movl    end(%esp), end_r
-        cmpl    out_r, end_r
-        jbe     .L_end_is_smaller      /* if (out >= end) */
-
-        subl    out_r, end_r           /* end -= out */
-        addl    $257, end_r            /* end += 257 */
-        movl    end_r, avail_out_strm(strm_r)
-        jmp     .L_done
-.L_end_is_smaller:
-        subl    end_r, out_r           /* out -= end */
-        negl    out_r                  /* out = -out */
-        addl    $257, out_r            /* out += 257 */
-        movl    out_r, avail_out_strm(strm_r)
-
-#undef end_r
-#undef strm_r
-#undef state_r
-
-.L_done:
-        addl    $local_var_size, %esp
-        popf
-        popl    %ebx
-        popl    %ebp
-        popl    %esi
-        popl    %edi
-        ret
-
-#if defined( GAS_ELF )
-/* elf info */
-.type inflate_fast,@function
-.size inflate_fast,.-inflate_fast
-#endif
diff --git a/src/png/zlib/contrib/iostream/test.cpp b/src/png/zlib/contrib/iostream/test.cpp
deleted file mode 100644
index 7d265b3b5..000000000
--- a/src/png/zlib/contrib/iostream/test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "zfstream.h"
-
-int main() {
-
-  // Construct a stream object with this filebuffer.  Anything sent
-  // to this stream will go to standard out.
-  gzofstream os( 1, ios::out );
-
-  // This text is getting compressed and sent to stdout.
-  // To prove this, run 'test | zcat'.
-  os << "Hello, Mommy" << endl;
-
-  os << setcompressionlevel( Z_NO_COMPRESSION );
-  os << "hello, hello, hi, ho!" << endl;
-
-  setcompressionlevel( os, Z_DEFAULT_COMPRESSION )
-    << "I'm compressing again" << endl;
-
-  os.close();
-
-  return 0;
-
-}
diff --git a/src/png/zlib/contrib/iostream/zfstream.cpp b/src/png/zlib/contrib/iostream/zfstream.cpp
deleted file mode 100644
index d0cd85faa..000000000
--- a/src/png/zlib/contrib/iostream/zfstream.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-
-#include "zfstream.h"
-
-gzfilebuf::gzfilebuf() :
-  file(NULL),
-  mode(0),
-  own_file_descriptor(0)
-{ }
-
-gzfilebuf::~gzfilebuf() {
-
-  sync();
-  if ( own_file_descriptor )
-    close();
-
-}
-
-gzfilebuf *gzfilebuf::open( const char *name,
-                            int io_mode ) {
-
-  if ( is_open() )
-    return NULL;
-
-  char char_mode[10];
-  char *p = char_mode;
-
-  if ( io_mode & ios::in ) {
-    mode = ios::in;
-    *p++ = 'r';
-  } else if ( io_mode & ios::app ) {
-    mode = ios::app;
-    *p++ = 'a';
-  } else {
-    mode = ios::out;
-    *p++ = 'w';
-  }
-
-  if ( io_mode & ios::binary ) {
-    mode |= ios::binary;
-    *p++ = 'b';
-  }
-
-  // Hard code the compression level
-  if ( io_mode & (ios::out|ios::app )) {
-    *p++ = '9';
-  }
-
-  // Put the end-of-string indicator
-  *p = '\0';
-
-  if ( (file = gzopen(name, char_mode)) == NULL )
-    return NULL;
-
-  own_file_descriptor = 1;
-
-  return this;
-
-}
-
-gzfilebuf *gzfilebuf::attach( int file_descriptor,
-                              int io_mode ) {
-
-  if ( is_open() )
-    return NULL;
-
-  char char_mode[10];
-  char *p = char_mode;
-
-  if ( io_mode & ios::in ) {
-    mode = ios::in;
-    *p++ = 'r';
-  } else if ( io_mode & ios::app ) {
-    mode = ios::app;
-    *p++ = 'a';
-  } else {
-    mode = ios::out;
-    *p++ = 'w';
-  }
-
-  if ( io_mode & ios::binary ) {
-    mode |= ios::binary;
-    *p++ = 'b';
-  }
-
-  // Hard code the compression level
-  if ( io_mode & (ios::out|ios::app )) {
-    *p++ = '9';
-  }
-
-  // Put the end-of-string indicator
-  *p = '\0';
-
-  if ( (file = gzdopen(file_descriptor, char_mode)) == NULL )
-    return NULL;
-
-  own_file_descriptor = 0;
-
-  return this;
-
-}
-
-gzfilebuf *gzfilebuf::close() {
-
-  if ( is_open() ) {
-
-    sync();
-    gzclose( file );
-    file = NULL;
-
-  }
-
-  return this;
-
-}
-
-int gzfilebuf::setcompressionlevel( int comp_level ) {
-
-  return gzsetparams(file, comp_level, -2);
-
-}
-
-int gzfilebuf::setcompressionstrategy( int comp_strategy ) {
-
-  return gzsetparams(file, -2, comp_strategy);
-
-}
-
-
-streampos gzfilebuf::seekoff( streamoff off, ios::seek_dir dir, int which ) {
-
-  return streampos(EOF);
-
-}
-
-int gzfilebuf::underflow() {
-
-  // If the file hasn't been opened for reading, error.
-  if ( !is_open() || !(mode & ios::in) )
-    return EOF;
-
-  // if a buffer doesn't exists, allocate one.
-  if ( !base() ) {
-
-    if ( (allocate()) == EOF )
-      return EOF;
-    setp(0,0);
-
-  } else {
-
-    if ( in_avail() )
-      return (unsigned char) *gptr();
-
-    if ( out_waiting() ) {
-      if ( flushbuf() == EOF )
-        return EOF;
-    }
-
-  }
-
-  // Attempt to fill the buffer.
-
-  int result = fillbuf();
-  if ( result == EOF ) {
-    // disable get area
-    setg(0,0,0);
-    return EOF;
-  }
-
-  return (unsigned char) *gptr();
-
-}
-
-int gzfilebuf::overflow( int c ) {
-
-  if ( !is_open() || !(mode & ios::out) )
-    return EOF;
-
-  if ( !base() ) {
-    if ( allocate() == EOF )
-      return EOF;
-    setg(0,0,0);
-  } else {
-    if (in_avail()) {
-        return EOF;
-    }
-    if (out_waiting()) {
-      if (flushbuf() == EOF)
-        return EOF;
-    }
-  }
-
-  int bl = blen();
-  setp( base(), base() + bl);
-
-  if ( c != EOF ) {
-
-    *pptr() = c;
-    pbump(1);
-
-  }
-
-  return 0;
-
-}
-
-int gzfilebuf::sync() {
-
-  if ( !is_open() )
-    return EOF;
-
-  if ( out_waiting() )
-    return flushbuf();
-
-  return 0;
-
-}
-
-int gzfilebuf::flushbuf() {
-
-  int n;
-  char *q;
-
-  q = pbase();
-  n = pptr() - q;
-
-  if ( gzwrite( file, q, n) < n )
-    return EOF;
-
-  setp(0,0);
-
-  return 0;
-
-}
-
-int gzfilebuf::fillbuf() {
-
-  int required;
-  char *p;
-
-  p = base();
-
-  required = blen();
-
-  int t = gzread( file, p, required );
-
-  if ( t <= 0) return EOF;
-
-  setg( base(), base(), base()+t);
-
-  return t;
-
-}
-
-gzfilestream_common::gzfilestream_common() :
-  ios( gzfilestream_common::rdbuf() )
-{ }
-
-gzfilestream_common::~gzfilestream_common()
-{ }
-
-void gzfilestream_common::attach( int fd, int io_mode ) {
-
-  if ( !buffer.attach( fd, io_mode) )
-    clear( ios::failbit | ios::badbit );
-  else
-    clear();
-
-}
-
-void gzfilestream_common::open( const char *name, int io_mode ) {
-
-  if ( !buffer.open( name, io_mode ) )
-    clear( ios::failbit | ios::badbit );
-  else
-    clear();
-
-}
-
-void gzfilestream_common::close() {
-
-  if ( !buffer.close() )
-    clear( ios::failbit | ios::badbit );
-
-}
-
-gzfilebuf *gzfilestream_common::rdbuf()
-{
-  return &buffer;
-}
-
-gzifstream::gzifstream() :
-  ios( gzfilestream_common::rdbuf() )
-{
-  clear( ios::badbit );
-}
-
-gzifstream::gzifstream( const char *name, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::open( name, io_mode );
-}
-
-gzifstream::gzifstream( int fd, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::attach( fd, io_mode );
-}
-
-gzifstream::~gzifstream() { }
-
-gzofstream::gzofstream() :
-  ios( gzfilestream_common::rdbuf() )
-{
-  clear( ios::badbit );
-}
-
-gzofstream::gzofstream( const char *name, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::open( name, io_mode );
-}
-
-gzofstream::gzofstream( int fd, int io_mode ) :
-  ios( gzfilestream_common::rdbuf() )
-{
-  gzfilestream_common::attach( fd, io_mode );
-}
-
-gzofstream::~gzofstream() { }
diff --git a/src/png/zlib/contrib/iostream/zfstream.h b/src/png/zlib/contrib/iostream/zfstream.h
deleted file mode 100644
index ed79098a3..000000000
--- a/src/png/zlib/contrib/iostream/zfstream.h
+++ /dev/null
@@ -1,128 +0,0 @@
-
-#ifndef zfstream_h
-#define zfstream_h
-
-#include <fstream.h>
-#include "zlib.h"
-
-class gzfilebuf : public streambuf {
-
-public:
-
-  gzfilebuf( );
-  virtual ~gzfilebuf();
-
-  gzfilebuf *open( const char *name, int io_mode );
-  gzfilebuf *attach( int file_descriptor, int io_mode );
-  gzfilebuf *close();
-
-  int setcompressionlevel( int comp_level );
-  int setcompressionstrategy( int comp_strategy );
-
-  inline int is_open() const { return (file !=NULL); }
-
-  virtual streampos seekoff( streamoff, ios::seek_dir, int );
-
-  virtual int sync();
-
-protected:
-
-  virtual int underflow();
-  virtual int overflow( int = EOF );
-
-private:
-
-  gzFile file;
-  short mode;
-  short own_file_descriptor;
-
-  int flushbuf();
-  int fillbuf();
-
-};
-
-class gzfilestream_common : virtual public ios {
-
-  friend class gzifstream;
-  friend class gzofstream;
-  friend gzofstream &setcompressionlevel( gzofstream &, int );
-  friend gzofstream &setcompressionstrategy( gzofstream &, int );
-
-public:
-  virtual ~gzfilestream_common();
-
-  void attach( int fd, int io_mode );
-  void open( const char *name, int io_mode );
-  void close();
-
-protected:
-  gzfilestream_common();
-
-private:
-  gzfilebuf *rdbuf();
-
-  gzfilebuf buffer;
-
-};
-
-class gzifstream : public gzfilestream_common, public istream {
-
-public:
-
-  gzifstream();
-  gzifstream( const char *name, int io_mode = ios::in );
-  gzifstream( int fd, int io_mode = ios::in );
-
-  virtual ~gzifstream();
-
-};
-
-class gzofstream : public gzfilestream_common, public ostream {
-
-public:
-
-  gzofstream();
-  gzofstream( const char *name, int io_mode = ios::out );
-  gzofstream( int fd, int io_mode = ios::out );
-
-  virtual ~gzofstream();
-
-};
-
-template<class T> class gzomanip {
-  friend gzofstream &operator<<(gzofstream &, const gzomanip<T> &);
-public:
-  gzomanip(gzofstream &(*f)(gzofstream &, T), T v) : func(f), val(v) { }
-private:
-  gzofstream &(*func)(gzofstream &, T);
-  T val;
-};
-
-template<class T> gzofstream &operator<<(gzofstream &s, const gzomanip<T> &m)
-{
-  return (*m.func)(s, m.val);
-}
-
-inline gzofstream &setcompressionlevel( gzofstream &s, int l )
-{
-  (s.rdbuf())->setcompressionlevel(l);
-  return s;
-}
-
-inline gzofstream &setcompressionstrategy( gzofstream &s, int l )
-{
-  (s.rdbuf())->setcompressionstrategy(l);
-  return s;
-}
-
-inline gzomanip<int> setcompressionlevel(int l)
-{
-  return gzomanip<int>(&setcompressionlevel,l);
-}
-
-inline gzomanip<int> setcompressionstrategy(int l)
-{
-  return gzomanip<int>(&setcompressionstrategy,l);
-}
-
-#endif
diff --git a/src/png/zlib/contrib/iostream2/zstream.h b/src/png/zlib/contrib/iostream2/zstream.h
deleted file mode 100644
index 43d2332b7..000000000
--- a/src/png/zlib/contrib/iostream2/zstream.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- *
- * Copyright (c) 1997
- * Christian Michelsen Research AS
- * Advanced Computing
- * Fantoftvegen 38, 5036 BERGEN, Norway
- * http://www.cmr.no
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Christian Michelsen Research AS makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-#ifndef ZSTREAM__H
-#define ZSTREAM__H
-
-/*
- * zstream.h - C++ interface to the 'zlib' general purpose compression library
- * $Id: zstream.h 1.1 1997-06-25 12:00:56+02 tyge Exp tyge $
- */
-
-#include <strstream.h>
-#include <string.h>
-#include <stdio.h>
-#include "zlib.h"
-
-#if defined(_WIN32)
-#   include <fcntl.h>
-#   include <io.h>
-#   define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#   define SET_BINARY_MODE(file)
-#endif
-
-class zstringlen {
-public:
-    zstringlen(class izstream&);
-    zstringlen(class ozstream&, const char*);
-    size_t value() const { return val.word; }
-private:
-    struct Val { unsigned char byte; size_t word; } val;
-};
-
-//  ----------------------------- izstream -----------------------------
-
-class izstream
-{
-    public:
-        izstream() : m_fp(0) {}
-        izstream(FILE* fp) : m_fp(0) { open(fp); }
-        izstream(const char* name) : m_fp(0) { open(name); }
-        ~izstream() { close(); }
-
-        /* Opens a gzip (.gz) file for reading.
-         * open() can be used to read a file which is not in gzip format;
-         * in this case read() will directly read from the file without
-         * decompression. errno can be checked to distinguish two error
-         * cases (if errno is zero, the zlib error is Z_MEM_ERROR).
-         */
-        void open(const char* name) {
-            if (m_fp) close();
-            m_fp = ::gzopen(name, "rb");
-        }
-
-        void open(FILE* fp) {
-            SET_BINARY_MODE(fp);
-            if (m_fp) close();
-            m_fp = ::gzdopen(fileno(fp), "rb");
-        }
-
-        /* Flushes all pending input if necessary, closes the compressed file
-         * and deallocates all the (de)compression state. The return value is
-         * the zlib error number (see function error() below).
-         */
-        int close() {
-            int r = ::gzclose(m_fp);
-            m_fp = 0; return r;
-        }
-
-        /* Binary read the given number of bytes from the compressed file.
-         */
-        int read(void* buf, size_t len) {
-            return ::gzread(m_fp, buf, len);
-        }
-
-        /* Returns the error message for the last error which occurred on the
-         * given compressed file. errnum is set to zlib error number. If an
-         * error occurred in the file system and not in the compression library,
-         * errnum is set to Z_ERRNO and the application may consult errno
-         * to get the exact error code.
-         */
-        const char* error(int* errnum) {
-            return ::gzerror(m_fp, errnum);
-        }
-
-        gzFile fp() { return m_fp; }
-
-    private:
-        gzFile m_fp;
-};
-
-/*
- * Binary read the given (array of) object(s) from the compressed file.
- * If the input file was not in gzip format, read() copies the objects number
- * of bytes into the buffer.
- * returns the number of uncompressed bytes actually read
- * (0 for end of file, -1 for error).
- */
-template <class T, class Items>
-inline int read(izstream& zs, T* x, Items items) {
-    return ::gzread(zs.fp(), x, items*sizeof(T));
-}
-
-/*
- * Binary input with the '>' operator.
- */
-template <class T>
-inline izstream& operator>(izstream& zs, T& x) {
-    ::gzread(zs.fp(), &x, sizeof(T));
-    return zs;
-}
-
-
-inline zstringlen::zstringlen(izstream& zs) {
-    zs > val.byte;
-    if (val.byte == 255) zs > val.word;
-    else val.word = val.byte;
-}
-
-/*
- * Read length of string + the string with the '>' operator.
- */
-inline izstream& operator>(izstream& zs, char* x) {
-    zstringlen len(zs);
-    ::gzread(zs.fp(), x, len.value());
-    x[len.value()] = '\0';
-    return zs;
-}
-
-inline char* read_string(izstream& zs) {
-    zstringlen len(zs);
-    char* x = new char[len.value()+1];
-    ::gzread(zs.fp(), x, len.value());
-    x[len.value()] = '\0';
-    return x;
-}
-
-// ----------------------------- ozstream -----------------------------
-
-class ozstream
-{
-    public:
-        ozstream() : m_fp(0), m_os(0) {
-        }
-        ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION)
-            : m_fp(0), m_os(0) {
-            open(fp, level);
-        }
-        ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION)
-            : m_fp(0), m_os(0) {
-            open(name, level);
-        }
-        ~ozstream() {
-            close();
-        }
-
-        /* Opens a gzip (.gz) file for writing.
-         * The compression level parameter should be in 0..9
-         * errno can be checked to distinguish two error cases
-         * (if errno is zero, the zlib error is Z_MEM_ERROR).
-         */
-        void open(const char* name, int level = Z_DEFAULT_COMPRESSION) {
-            char mode[4] = "wb\0";
-            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
-            if (m_fp) close();
-            m_fp = ::gzopen(name, mode);
-        }
-
-        /* open from a FILE pointer.
-         */
-        void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) {
-            SET_BINARY_MODE(fp);
-            char mode[4] = "wb\0";
-            if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level;
-            if (m_fp) close();
-            m_fp = ::gzdopen(fileno(fp), mode);
-        }
-
-        /* Flushes all pending output if necessary, closes the compressed file
-         * and deallocates all the (de)compression state. The return value is
-         * the zlib error number (see function error() below).
-         */
-        int close() {
-            if (m_os) {
-                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
-                delete[] m_os->str(); delete m_os; m_os = 0;
-            }
-            int r = ::gzclose(m_fp); m_fp = 0; return r;
-        }
-
-        /* Binary write the given number of bytes into the compressed file.
-         */
-        int write(const void* buf, size_t len) {
-            return ::gzwrite(m_fp, (voidp) buf, len);
-        }
-
-        /* Flushes all pending output into the compressed file. The parameter
-         * _flush is as in the deflate() function. The return value is the zlib
-         * error number (see function gzerror below). flush() returns Z_OK if
-         * the flush_ parameter is Z_FINISH and all output could be flushed.
-         * flush() should be called only when strictly necessary because it can
-         * degrade compression.
-         */
-        int flush(int _flush) {
-            os_flush();
-            return ::gzflush(m_fp, _flush);
-        }
-
-        /* Returns the error message for the last error which occurred on the
-         * given compressed file. errnum is set to zlib error number. If an
-         * error occurred in the file system and not in the compression library,
-         * errnum is set to Z_ERRNO and the application may consult errno
-         * to get the exact error code.
-         */
-        const char* error(int* errnum) {
-            return ::gzerror(m_fp, errnum);
-        }
-
-        gzFile fp() { return m_fp; }
-
-        ostream& os() {
-            if (m_os == 0) m_os = new ostrstream;
-            return *m_os;
-        }
-
-        void os_flush() {
-            if (m_os && m_os->pcount()>0) {
-                ostrstream* oss = new ostrstream;
-                oss->fill(m_os->fill());
-                oss->flags(m_os->flags());
-                oss->precision(m_os->precision());
-                oss->width(m_os->width());
-                ::gzwrite(m_fp, m_os->str(), m_os->pcount());
-                delete[] m_os->str(); delete m_os; m_os = oss;
-            }
-        }
-
-    private:
-        gzFile m_fp;
-        ostrstream* m_os;
-};
-
-/*
- * Binary write the given (array of) object(s) into the compressed file.
- * returns the number of uncompressed bytes actually written
- * (0 in case of error).
- */
-template <class T, class Items>
-inline int write(ozstream& zs, const T* x, Items items) {
-    return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T));
-}
-
-/*
- * Binary output with the '<' operator.
- */
-template <class T>
-inline ozstream& operator<(ozstream& zs, const T& x) {
-    ::gzwrite(zs.fp(), (voidp) &x, sizeof(T));
-    return zs;
-}
-
-inline zstringlen::zstringlen(ozstream& zs, const char* x) {
-    val.byte = 255;  val.word = ::strlen(x);
-    if (val.word < 255) zs < (val.byte = val.word);
-    else zs < val;
-}
-
-/*
- * Write length of string + the string with the '<' operator.
- */
-inline ozstream& operator<(ozstream& zs, const char* x) {
-    zstringlen len(zs, x);
-    ::gzwrite(zs.fp(), (voidp) x, len.value());
-    return zs;
-}
-
-#ifdef _MSC_VER
-inline ozstream& operator<(ozstream& zs, char* const& x) {
-    return zs < (const char*) x;
-}
-#endif
-
-/*
- * Ascii write with the << operator;
- */
-template <class T>
-inline ostream& operator<<(ozstream& zs, const T& x) {
-    zs.os_flush();
-    return zs.os() << x;
-}
-
-#endif
diff --git a/src/png/zlib/contrib/iostream2/zstream_test.cpp b/src/png/zlib/contrib/iostream2/zstream_test.cpp
deleted file mode 100644
index 6273f62d6..000000000
--- a/src/png/zlib/contrib/iostream2/zstream_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "zstream.h"
-#include <math.h>
-#include <stdlib.h>
-#include <iomanip.h>
-
-void main() {
-    char h[256] = "Hello";
-    char* g = "Goodbye";
-    ozstream out("temp.gz");
-    out < "This works well" < h < g;
-    out.close();
-
-    izstream in("temp.gz"); // read it back
-    char *x = read_string(in), *y = new char[256], z[256];
-    in > y > z;
-    in.close();
-    cout << x << endl << y << endl << z << endl;
-
-    out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results
-    out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl;
-    out << z << endl << y << endl << x << endl;
-    out << 1.1234567890123456789 << endl;
-
-    delete[] x; delete[] y;
-}
diff --git a/src/png/zlib/contrib/iostream3/README b/src/png/zlib/contrib/iostream3/README
deleted file mode 100644
index f7b319ab9..000000000
--- a/src/png/zlib/contrib/iostream3/README
+++ /dev/null
@@ -1,35 +0,0 @@
-These classes provide a C++ stream interface to the zlib library. It allows you
-to do things like:
-
-  gzofstream outf("blah.gz");
-  outf << "These go into the gzip file " << 123 << endl;
-
-It does this by deriving a specialized stream buffer for gzipped files, which is
-the way Stroustrup would have done it. :->
-
-The gzifstream and gzofstream classes were originally written by Kevin Ruland
-and made available in the zlib contrib/iostream directory. The older version still
-compiles under gcc 2.xx, but not under gcc 3.xx, which sparked the development of
-this version.
-
-The new classes are as standard-compliant as possible, closely following the
-approach of the standard library's fstream classes. It compiles under gcc versions
-3.2 and 3.3, but not under gcc 2.xx. This is mainly due to changes in the standard
-library naming scheme. The new version of gzifstream/gzofstream/gzfilebuf differs
-from the previous one in the following respects:
-- added showmanyc
-- added setbuf, with support for unbuffered output via setbuf(0,0)
-- a few bug fixes of stream behavior
-- gzipped output file opened with default compression level instead of maximum level
-- setcompressionlevel()/strategy() members replaced by single setcompression()
-
-The code is provided "as is", with the permission to use, copy, modify, distribute
-and sell it for any purpose without fee.
-
-Ludwig Schwardt
-<schwardt@sun.ac.za>
-
-DSP Lab
-Electrical & Electronic Engineering Department
-University of Stellenbosch
-South Africa
diff --git a/src/png/zlib/contrib/iostream3/TODO b/src/png/zlib/contrib/iostream3/TODO
deleted file mode 100644
index 7032f97be..000000000
--- a/src/png/zlib/contrib/iostream3/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-Possible upgrades to gzfilebuf:
-
-- The ability to do putback (e.g. putbackfail)
-
-- The ability to seek (zlib supports this, but could be slow/tricky)
-
-- Simultaneous read/write access (does it make sense?)
-
-- Support for ios_base::ate open mode
-
-- Locale support?
-
-- Check public interface to see which calls give problems
-  (due to dependence on library internals)
-
-- Override operator<<(ostream&, gzfilebuf*) to allow direct copying
-  of stream buffer to stream ( i.e. os << is.rdbuf(); )
diff --git a/src/png/zlib/contrib/iostream3/test.cc b/src/png/zlib/contrib/iostream3/test.cc
deleted file mode 100644
index 94235334f..000000000
--- a/src/png/zlib/contrib/iostream3/test.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Test program for gzifstream and gzofstream
- *
- * by Ludwig Schwardt <schwardt@sun.ac.za>
- * original version by Kevin Ruland <kevin@rodin.wustl.edu>
- */
-
-#include "zfstream.h"
-#include <iostream>      // for cout
-
-int main() {
-
-  gzofstream outf;
-  gzifstream inf;
-  char buf[80];
-
-  outf.open("test1.txt.gz");
-  outf << "The quick brown fox sidestepped the lazy canine\n"
-       << 1.3 << "\nPlan " << 9 << std::endl;
-  outf.close();
-  std::cout << "Wrote the following message to 'test1.txt.gz' (check with zcat or zless):\n"
-            << "The quick brown fox sidestepped the lazy canine\n"
-            << 1.3 << "\nPlan " << 9 << std::endl;
-
-  std::cout << "\nReading 'test1.txt.gz' (buffered) produces:\n";
-  inf.open("test1.txt.gz");
-  while (inf.getline(buf,80,'\n')) {
-    std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n";
-  }
-  inf.close();
-
-  outf.rdbuf()->pubsetbuf(0,0);
-  outf.open("test2.txt.gz");
-  outf << setcompression(Z_NO_COMPRESSION)
-       << "The quick brown fox sidestepped the lazy canine\n"
-       << 1.3 << "\nPlan " << 9 << std::endl;
-  outf.close();
-  std::cout << "\nWrote the same message to 'test2.txt.gz' in uncompressed form";
-
-  std::cout << "\nReading 'test2.txt.gz' (unbuffered) produces:\n";
-  inf.rdbuf()->pubsetbuf(0,0);
-  inf.open("test2.txt.gz");
-  while (inf.getline(buf,80,'\n')) {
-    std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n";
-  }
-  inf.close();
-
-  return 0;
-
-}
diff --git a/src/png/zlib/contrib/iostream3/zfstream.cc b/src/png/zlib/contrib/iostream3/zfstream.cc
deleted file mode 100644
index 94eb93344..000000000
--- a/src/png/zlib/contrib/iostream3/zfstream.cc
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * A C++ I/O streams interface to the zlib gz* functions
- *
- * by Ludwig Schwardt <schwardt@sun.ac.za>
- * original version by Kevin Ruland <kevin@rodin.wustl.edu>
- *
- * This version is standard-compliant and compatible with gcc 3.x.
- */
-
-#include "zfstream.h"
-#include <cstring>          // for strcpy, strcat, strlen (mode strings)
-#include <cstdio>           // for BUFSIZ
-
-// Internal buffer sizes (default and "unbuffered" versions)
-#define BIGBUFSIZE BUFSIZ
-#define SMALLBUFSIZE 1
-
-/*****************************************************************************/
-
-// Default constructor
-gzfilebuf::gzfilebuf()
-: file(NULL), io_mode(std::ios_base::openmode(0)), own_fd(false),
-  buffer(NULL), buffer_size(BIGBUFSIZE), own_buffer(true)
-{
-  // No buffers to start with
-  this->disable_buffer();
-}
-
-// Destructor
-gzfilebuf::~gzfilebuf()
-{
-  // Sync output buffer and close only if responsible for file
-  // (i.e. attached streams should be left open at this stage)
-  this->sync();
-  if (own_fd)
-    this->close();
-  // Make sure internal buffer is deallocated
-  this->disable_buffer();
-}
-
-// Set compression level and strategy
-int
-gzfilebuf::setcompression(int comp_level,
-                          int comp_strategy)
-{
-  return gzsetparams(file, comp_level, comp_strategy);
-}
-
-// Open gzipped file
-gzfilebuf*
-gzfilebuf::open(const char *name,
-                std::ios_base::openmode mode)
-{
-  // Fail if file already open
-  if (this->is_open())
-    return NULL;
-  // Don't support simultaneous read/write access (yet)
-  if ((mode & std::ios_base::in) && (mode & std::ios_base::out))
-    return NULL;
-
-  // Build mode string for gzopen and check it [27.8.1.3.2]
-  char char_mode[6] = "\0\0\0\0\0";
-  if (!this->open_mode(mode, char_mode))
-    return NULL;
-
-  // Attempt to open file
-  if ((file = gzopen(name, char_mode)) == NULL)
-    return NULL;
-
-  // On success, allocate internal buffer and set flags
-  this->enable_buffer();
-  io_mode = mode;
-  own_fd = true;
-  return this;
-}
-
-// Attach to gzipped file
-gzfilebuf*
-gzfilebuf::attach(int fd,
-                  std::ios_base::openmode mode)
-{
-  // Fail if file already open
-  if (this->is_open())
-    return NULL;
-  // Don't support simultaneous read/write access (yet)
-  if ((mode & std::ios_base::in) && (mode & std::ios_base::out))
-    return NULL;
-
-  // Build mode string for gzdopen and check it [27.8.1.3.2]
-  char char_mode[6] = "\0\0\0\0\0";
-  if (!this->open_mode(mode, char_mode))
-    return NULL;
-
-  // Attempt to attach to file
-  if ((file = gzdopen(fd, char_mode)) == NULL)
-    return NULL;
-
-  // On success, allocate internal buffer and set flags
-  this->enable_buffer();
-  io_mode = mode;
-  own_fd = false;
-  return this;
-}
-
-// Close gzipped file
-gzfilebuf*
-gzfilebuf::close()
-{
-  // Fail immediately if no file is open
-  if (!this->is_open())
-    return NULL;
-  // Assume success
-  gzfilebuf* retval = this;
-  // Attempt to sync and close gzipped file
-  if (this->sync() == -1)
-    retval = NULL;
-  if (gzclose(file) < 0)
-    retval = NULL;
-  // File is now gone anyway (postcondition [27.8.1.3.8])
-  file = NULL;
-  own_fd = false;
-  // Destroy internal buffer if it exists
-  this->disable_buffer();
-  return retval;
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-// Convert int open mode to mode string
-bool
-gzfilebuf::open_mode(std::ios_base::openmode mode,
-                     char* c_mode) const
-{
-  bool testb = mode & std::ios_base::binary;
-  bool testi = mode & std::ios_base::in;
-  bool testo = mode & std::ios_base::out;
-  bool testt = mode & std::ios_base::trunc;
-  bool testa = mode & std::ios_base::app;
-
-  // Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
-  // Original zfstream hardcoded the compression level to maximum here...
-  // Double the time for less than 1% size improvement seems
-  // excessive though - keeping it at the default level
-  // To change back, just append "9" to the next three mode strings
-  if (!testi && testo && !testt && !testa)
-    strcpy(c_mode, "w");
-  if (!testi && testo && !testt && testa)
-    strcpy(c_mode, "a");
-  if (!testi && testo && testt && !testa)
-    strcpy(c_mode, "w");
-  if (testi && !testo && !testt && !testa)
-    strcpy(c_mode, "r");
-  // No read/write mode yet
-//  if (testi && testo && !testt && !testa)
-//    strcpy(c_mode, "r+");
-//  if (testi && testo && testt && !testa)
-//    strcpy(c_mode, "w+");
-
-  // Mode string should be empty for invalid combination of flags
-  if (strlen(c_mode) == 0)
-    return false;
-  if (testb)
-    strcat(c_mode, "b");
-  return true;
-}
-
-// Determine number of characters in internal get buffer
-std::streamsize
-gzfilebuf::showmanyc()
-{
-  // Calls to underflow will fail if file not opened for reading
-  if (!this->is_open() || !(io_mode & std::ios_base::in))
-    return -1;
-  // Make sure get area is in use
-  if (this->gptr() && (this->gptr() < this->egptr()))
-    return std::streamsize(this->egptr() - this->gptr());
-  else
-    return 0;
-}
-
-// Fill get area from gzipped file
-gzfilebuf::int_type
-gzfilebuf::underflow()
-{
-  // If something is left in the get area by chance, return it
-  // (this shouldn't normally happen, as underflow is only supposed
-  // to be called when gptr >= egptr, but it serves as error check)
-  if (this->gptr() && (this->gptr() < this->egptr()))
-    return traits_type::to_int_type(*(this->gptr()));
-
-  // If the file hasn't been opened for reading, produce error
-  if (!this->is_open() || !(io_mode & std::ios_base::in))
-    return traits_type::eof();
-
-  // Attempt to fill internal buffer from gzipped file
-  // (buffer must be guaranteed to exist...)
-  int bytes_read = gzread(file, buffer, buffer_size);
-  // Indicates error or EOF
-  if (bytes_read <= 0)
-  {
-    // Reset get area
-    this->setg(buffer, buffer, buffer);
-    return traits_type::eof();
-  }
-  // Make all bytes read from file available as get area
-  this->setg(buffer, buffer, buffer + bytes_read);
-
-  // Return next character in get area
-  return traits_type::to_int_type(*(this->gptr()));
-}
-
-// Write put area to gzipped file
-gzfilebuf::int_type
-gzfilebuf::overflow(int_type c)
-{
-  // Determine whether put area is in use
-  if (this->pbase())
-  {
-    // Double-check pointer range
-    if (this->pptr() > this->epptr() || this->pptr() < this->pbase())
-      return traits_type::eof();
-    // Add extra character to buffer if not EOF
-    if (!traits_type::eq_int_type(c, traits_type::eof()))
-    {
-      *(this->pptr()) = traits_type::to_char_type(c);
-      this->pbump(1);
-    }
-    // Number of characters to write to file
-    int bytes_to_write = this->pptr() - this->pbase();
-    // Overflow doesn't fail if nothing is to be written
-    if (bytes_to_write > 0)
-    {
-      // If the file hasn't been opened for writing, produce error
-      if (!this->is_open() || !(io_mode & std::ios_base::out))
-        return traits_type::eof();
-      // If gzipped file won't accept all bytes written to it, fail
-      if (gzwrite(file, this->pbase(), bytes_to_write) != bytes_to_write)
-        return traits_type::eof();
-      // Reset next pointer to point to pbase on success
-      this->pbump(-bytes_to_write);
-    }
-  }
-  // Write extra character to file if not EOF
-  else if (!traits_type::eq_int_type(c, traits_type::eof()))
-  {
-    // If the file hasn't been opened for writing, produce error
-    if (!this->is_open() || !(io_mode & std::ios_base::out))
-      return traits_type::eof();
-    // Impromptu char buffer (allows "unbuffered" output)
-    char_type last_char = traits_type::to_char_type(c);
-    // If gzipped file won't accept this character, fail
-    if (gzwrite(file, &last_char, 1) != 1)
-      return traits_type::eof();
-  }
-
-  // If you got here, you have succeeded (even if c was EOF)
-  // The return value should therefore be non-EOF
-  if (traits_type::eq_int_type(c, traits_type::eof()))
-    return traits_type::not_eof(c);
-  else
-    return c;
-}
-
-// Assign new buffer
-std::streambuf*
-gzfilebuf::setbuf(char_type* p,
-                  std::streamsize n)
-{
-  // First make sure stuff is sync'ed, for safety
-  if (this->sync() == -1)
-    return NULL;
-  // If buffering is turned off on purpose via setbuf(0,0), still allocate one...
-  // "Unbuffered" only really refers to put [27.8.1.4.10], while get needs at
-  // least a buffer of size 1 (very inefficient though, therefore make it bigger?)
-  // This follows from [27.5.2.4.3]/12 (gptr needs to point at something, it seems)
-  if (!p || !n)
-  {
-    // Replace existing buffer (if any) with small internal buffer
-    this->disable_buffer();
-    buffer = NULL;
-    buffer_size = 0;
-    own_buffer = true;
-    this->enable_buffer();
-  }
-  else
-  {
-    // Replace existing buffer (if any) with external buffer
-    this->disable_buffer();
-    buffer = p;
-    buffer_size = n;
-    own_buffer = false;
-    this->enable_buffer();
-  }
-  return this;
-}
-
-// Write put area to gzipped file (i.e. ensures that put area is empty)
-int
-gzfilebuf::sync()
-{
-  return traits_type::eq_int_type(this->overflow(), traits_type::eof()) ? -1 : 0;
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-// Allocate internal buffer
-void
-gzfilebuf::enable_buffer()
-{
-  // If internal buffer required, allocate one
-  if (own_buffer && !buffer)
-  {
-    // Check for buffered vs. "unbuffered"
-    if (buffer_size > 0)
-    {
-      // Allocate internal buffer
-      buffer = new char_type[buffer_size];
-      // Get area starts empty and will be expanded by underflow as need arises
-      this->setg(buffer, buffer, buffer);
-      // Setup entire internal buffer as put area.
-      // The one-past-end pointer actually points to the last element of the buffer,
-      // so that overflow(c) can safely add the extra character c to the sequence.
-      // These pointers remain in place for the duration of the buffer
-      this->setp(buffer, buffer + buffer_size - 1);
-    }
-    else
-    {
-      // Even in "unbuffered" case, (small?) get buffer is still required
-      buffer_size = SMALLBUFSIZE;
-      buffer = new char_type[buffer_size];
-      this->setg(buffer, buffer, buffer);
-      // "Unbuffered" means no put buffer
-      this->setp(0, 0);
-    }
-  }
-  else
-  {
-    // If buffer already allocated, reset buffer pointers just to make sure no
-    // stale chars are lying around
-    this->setg(buffer, buffer, buffer);
-    this->setp(buffer, buffer + buffer_size - 1);
-  }
-}
-
-// Destroy internal buffer
-void
-gzfilebuf::disable_buffer()
-{
-  // If internal buffer exists, deallocate it
-  if (own_buffer && buffer)
-  {
-    // Preserve unbuffered status by zeroing size
-    if (!this->pbase())
-      buffer_size = 0;
-    delete[] buffer;
-    buffer = NULL;
-    this->setg(0, 0, 0);
-    this->setp(0, 0);
-  }
-  else
-  {
-    // Reset buffer pointers to initial state if external buffer exists
-    this->setg(buffer, buffer, buffer);
-    if (buffer)
-      this->setp(buffer, buffer + buffer_size - 1);
-    else
-      this->setp(0, 0);
-  }
-}
-
-/*****************************************************************************/
-
-// Default constructor initializes stream buffer
-gzifstream::gzifstream()
-: std::istream(NULL), sb()
-{ this->init(&sb); }
-
-// Initialize stream buffer and open file
-gzifstream::gzifstream(const char* name,
-                       std::ios_base::openmode mode)
-: std::istream(NULL), sb()
-{
-  this->init(&sb);
-  this->open(name, mode);
-}
-
-// Initialize stream buffer and attach to file
-gzifstream::gzifstream(int fd,
-                       std::ios_base::openmode mode)
-: std::istream(NULL), sb()
-{
-  this->init(&sb);
-  this->attach(fd, mode);
-}
-
-// Open file and go into fail() state if unsuccessful
-void
-gzifstream::open(const char* name,
-                 std::ios_base::openmode mode)
-{
-  if (!sb.open(name, mode | std::ios_base::in))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Attach to file and go into fail() state if unsuccessful
-void
-gzifstream::attach(int fd,
-                   std::ios_base::openmode mode)
-{
-  if (!sb.attach(fd, mode | std::ios_base::in))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Close file
-void
-gzifstream::close()
-{
-  if (!sb.close())
-    this->setstate(std::ios_base::failbit);
-}
-
-/*****************************************************************************/
-
-// Default constructor initializes stream buffer
-gzofstream::gzofstream()
-: std::ostream(NULL), sb()
-{ this->init(&sb); }
-
-// Initialize stream buffer and open file
-gzofstream::gzofstream(const char* name,
-                       std::ios_base::openmode mode)
-: std::ostream(NULL), sb()
-{
-  this->init(&sb);
-  this->open(name, mode);
-}
-
-// Initialize stream buffer and attach to file
-gzofstream::gzofstream(int fd,
-                       std::ios_base::openmode mode)
-: std::ostream(NULL), sb()
-{
-  this->init(&sb);
-  this->attach(fd, mode);
-}
-
-// Open file and go into fail() state if unsuccessful
-void
-gzofstream::open(const char* name,
-                 std::ios_base::openmode mode)
-{
-  if (!sb.open(name, mode | std::ios_base::out))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Attach to file and go into fail() state if unsuccessful
-void
-gzofstream::attach(int fd,
-                   std::ios_base::openmode mode)
-{
-  if (!sb.attach(fd, mode | std::ios_base::out))
-    this->setstate(std::ios_base::failbit);
-  else
-    this->clear();
-}
-
-// Close file
-void
-gzofstream::close()
-{
-  if (!sb.close())
-    this->setstate(std::ios_base::failbit);
-}
diff --git a/src/png/zlib/contrib/iostream3/zfstream.h b/src/png/zlib/contrib/iostream3/zfstream.h
deleted file mode 100644
index 8574479ae..000000000
--- a/src/png/zlib/contrib/iostream3/zfstream.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- * A C++ I/O streams interface to the zlib gz* functions
- *
- * by Ludwig Schwardt <schwardt@sun.ac.za>
- * original version by Kevin Ruland <kevin@rodin.wustl.edu>
- *
- * This version is standard-compliant and compatible with gcc 3.x.
- */
-
-#ifndef ZFSTREAM_H
-#define ZFSTREAM_H
-
-#include <istream>  // not iostream, since we don't need cin/cout
-#include <ostream>
-#include "zlib.h"
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file stream buffer class.
- *
- *  This class implements basic_filebuf for gzipped files. It doesn't yet support
- *  seeking (allowed by zlib but slow/limited), putback and read/write access
- *  (tricky). Otherwise, it attempts to be a drop-in replacement for the standard
- *  file streambuf.
-*/
-class gzfilebuf : public std::streambuf
-{
-public:
-  //  Default constructor.
-  gzfilebuf();
-
-  //  Destructor.
-  virtual
-  ~gzfilebuf();
-
-  /**
-   *  @brief  Set compression level and strategy on the fly.
-   *  @param  comp_level  Compression level (see zlib.h for allowed values)
-   *  @param  comp_strategy  Compression strategy (see zlib.h for allowed values)
-   *  @return  Z_OK on success, Z_STREAM_ERROR otherwise.
-   *
-   *  Unfortunately, these parameters cannot be modified separately, as the
-   *  previous zfstream version assumed. Since the strategy is seldom changed,
-   *  it can default and setcompression(level) then becomes like the old
-   *  setcompressionlevel(level).
-  */
-  int
-  setcompression(int comp_level,
-                 int comp_strategy = Z_DEFAULT_STRATEGY);
-
-  /**
-   *  @brief  Check if file is open.
-   *  @return  True if file is open.
-  */
-  bool
-  is_open() const { return (file != NULL); }
-
-  /**
-   *  @brief  Open gzipped file.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags.
-   *  @return  @c this on success, NULL on failure.
-  */
-  gzfilebuf*
-  open(const char* name,
-       std::ios_base::openmode mode);
-
-  /**
-   *  @brief  Attach to already open gzipped file.
-   *  @param  fd  File descriptor.
-   *  @param  mode  Open mode flags.
-   *  @return  @c this on success, NULL on failure.
-  */
-  gzfilebuf*
-  attach(int fd,
-         std::ios_base::openmode mode);
-
-  /**
-   *  @brief  Close gzipped file.
-   *  @return  @c this on success, NULL on failure.
-  */
-  gzfilebuf*
-  close();
-
-protected:
-  /**
-   *  @brief  Convert ios open mode int to mode string used by zlib.
-   *  @return  True if valid mode flag combination.
-  */
-  bool
-  open_mode(std::ios_base::openmode mode,
-            char* c_mode) const;
-
-  /**
-   *  @brief  Number of characters available in stream buffer.
-   *  @return  Number of characters.
-   *
-   *  This indicates number of characters in get area of stream buffer.
-   *  These characters can be read without accessing the gzipped file.
-  */
-  virtual std::streamsize
-  showmanyc();
-
-  /**
-   *  @brief  Fill get area from gzipped file.
-   *  @return  First character in get area on success, EOF on error.
-   *
-   *  This actually reads characters from gzipped file to stream
-   *  buffer. Always buffered.
-  */
-  virtual int_type
-  underflow();
-
-  /**
-   *  @brief  Write put area to gzipped file.
-   *  @param  c  Extra character to add to buffer contents.
-   *  @return  Non-EOF on success, EOF on error.
-   *
-   *  This actually writes characters in stream buffer to
-   *  gzipped file. With unbuffered output this is done one
-   *  character at a time.
-  */
-  virtual int_type
-  overflow(int_type c = traits_type::eof());
-
-  /**
-   *  @brief  Installs external stream buffer.
-   *  @param  p  Pointer to char buffer.
-   *  @param  n  Size of external buffer.
-   *  @return  @c this on success, NULL on failure.
-   *
-   *  Call setbuf(0,0) to enable unbuffered output.
-  */
-  virtual std::streambuf*
-  setbuf(char_type* p,
-         std::streamsize n);
-
-  /**
-   *  @brief  Flush stream buffer to file.
-   *  @return  0 on success, -1 on error.
-   *
-   *  This calls underflow(EOF) to do the job.
-  */
-  virtual int
-  sync();
-
-//
-// Some future enhancements
-//
-//  virtual int_type uflow();
-//  virtual int_type pbackfail(int_type c = traits_type::eof());
-//  virtual pos_type
-//  seekoff(off_type off,
-//          std::ios_base::seekdir way,
-//          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
-//  virtual pos_type
-//  seekpos(pos_type sp,
-//          std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
-
-private:
-  /**
-   *  @brief  Allocate internal buffer.
-   *
-   *  This function is safe to call multiple times. It will ensure
-   *  that a proper internal buffer exists if it is required. If the
-   *  buffer already exists or is external, the buffer pointers will be
-   *  reset to their original state.
-  */
-  void
-  enable_buffer();
-
-  /**
-   *  @brief  Destroy internal buffer.
-   *
-   *  This function is safe to call multiple times. It will ensure
-   *  that the internal buffer is deallocated if it exists. In any
-   *  case, it will also reset the buffer pointers.
-  */
-  void
-  disable_buffer();
-
-  /**
-   *  Underlying file pointer.
-  */
-  gzFile file;
-
-  /**
-   *  Mode in which file was opened.
-  */
-  std::ios_base::openmode io_mode;
-
-  /**
-   *  @brief  True if this object owns file descriptor.
-   *
-   *  This makes the class responsible for closing the file
-   *  upon destruction.
-  */
-  bool own_fd;
-
-  /**
-   *  @brief  Stream buffer.
-   *
-   *  For simplicity this remains allocated on the free store for the
-   *  entire life span of the gzfilebuf object, unless replaced by setbuf.
-  */
-  char_type* buffer;
-
-  /**
-   *  @brief  Stream buffer size.
-   *
-   *  Defaults to system default buffer size (typically 8192 bytes).
-   *  Modified by setbuf.
-  */
-  std::streamsize buffer_size;
-
-  /**
-   *  @brief  True if this object owns stream buffer.
-   *
-   *  This makes the class responsible for deleting the buffer
-   *  upon destruction.
-  */
-  bool own_buffer;
-};
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file input stream class.
- *
- *  This class implements ifstream for gzipped files. Seeking and putback
- *  is not supported yet.
-*/
-class gzifstream : public std::istream
-{
-public:
-  //  Default constructor
-  gzifstream();
-
-  /**
-   *  @brief  Construct stream on gzipped file to be opened.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-  */
-  explicit
-  gzifstream(const char* name,
-             std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  @brief  Construct stream on already open gzipped file.
-   *  @param  fd    File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-  */
-  explicit
-  gzifstream(int fd,
-             std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  Obtain underlying stream buffer.
-  */
-  gzfilebuf*
-  rdbuf() const
-  { return const_cast<gzfilebuf*>(&sb); }
-
-  /**
-   *  @brief  Check if file is open.
-   *  @return  True if file is open.
-  */
-  bool
-  is_open() { return sb.is_open(); }
-
-  /**
-   *  @brief  Open gzipped file.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-   *
-   *  Stream will be in state good() if file opens successfully;
-   *  otherwise in state fail(). This differs from the behavior of
-   *  ifstream, which never sets the state to good() and therefore
-   *  won't allow you to reuse the stream for a second file unless
-   *  you manually clear() the state. The choice is a matter of
-   *  convenience.
-  */
-  void
-  open(const char* name,
-       std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  @brief  Attach to already open gzipped file.
-   *  @param  fd  File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::in).
-   *
-   *  Stream will be in state good() if attach succeeded; otherwise
-   *  in state fail().
-  */
-  void
-  attach(int fd,
-         std::ios_base::openmode mode = std::ios_base::in);
-
-  /**
-   *  @brief  Close gzipped file.
-   *
-   *  Stream will be in state fail() if close failed.
-  */
-  void
-  close();
-
-private:
-  /**
-   *  Underlying stream buffer.
-  */
-  gzfilebuf sb;
-};
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file output stream class.
- *
- *  This class implements ofstream for gzipped files. Seeking and putback
- *  is not supported yet.
-*/
-class gzofstream : public std::ostream
-{
-public:
-  //  Default constructor
-  gzofstream();
-
-  /**
-   *  @brief  Construct stream on gzipped file to be opened.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-  */
-  explicit
-  gzofstream(const char* name,
-             std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  @brief  Construct stream on already open gzipped file.
-   *  @param  fd    File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-  */
-  explicit
-  gzofstream(int fd,
-             std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  Obtain underlying stream buffer.
-  */
-  gzfilebuf*
-  rdbuf() const
-  { return const_cast<gzfilebuf*>(&sb); }
-
-  /**
-   *  @brief  Check if file is open.
-   *  @return  True if file is open.
-  */
-  bool
-  is_open() { return sb.is_open(); }
-
-  /**
-   *  @brief  Open gzipped file.
-   *  @param  name  File name.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-   *
-   *  Stream will be in state good() if file opens successfully;
-   *  otherwise in state fail(). This differs from the behavior of
-   *  ofstream, which never sets the state to good() and therefore
-   *  won't allow you to reuse the stream for a second file unless
-   *  you manually clear() the state. The choice is a matter of
-   *  convenience.
-  */
-  void
-  open(const char* name,
-       std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  @brief  Attach to already open gzipped file.
-   *  @param  fd  File descriptor.
-   *  @param  mode  Open mode flags (forced to contain ios::out).
-   *
-   *  Stream will be in state good() if attach succeeded; otherwise
-   *  in state fail().
-  */
-  void
-  attach(int fd,
-         std::ios_base::openmode mode = std::ios_base::out);
-
-  /**
-   *  @brief  Close gzipped file.
-   *
-   *  Stream will be in state fail() if close failed.
-  */
-  void
-  close();
-
-private:
-  /**
-   *  Underlying stream buffer.
-  */
-  gzfilebuf sb;
-};
-
-/*****************************************************************************/
-
-/**
- *  @brief  Gzipped file output stream manipulator class.
- *
- *  This class defines a two-argument manipulator for gzofstream. It is used
- *  as base for the setcompression(int,int) manipulator.
-*/
-template<typename T1, typename T2>
-  class gzomanip2
-  {
-  public:
-    // Allows insertor to peek at internals
-    template <typename Ta, typename Tb>
-      friend gzofstream&
-      operator<<(gzofstream&,
-                 const gzomanip2<Ta,Tb>&);
-
-    // Constructor
-    gzomanip2(gzofstream& (*f)(gzofstream&, T1, T2),
-              T1 v1,
-              T2 v2);
-  private:
-    // Underlying manipulator function
-    gzofstream&
-    (*func)(gzofstream&, T1, T2);
-
-    // Arguments for manipulator function
-    T1 val1;
-    T2 val2;
-  };
-
-/*****************************************************************************/
-
-// Manipulator function thunks through to stream buffer
-inline gzofstream&
-setcompression(gzofstream &gzs, int l, int s = Z_DEFAULT_STRATEGY)
-{
-  (gzs.rdbuf())->setcompression(l, s);
-  return gzs;
-}
-
-// Manipulator constructor stores arguments
-template<typename T1, typename T2>
-  inline
-  gzomanip2<T1,T2>::gzomanip2(gzofstream &(*f)(gzofstream &, T1, T2),
-                              T1 v1,
-                              T2 v2)
-  : func(f), val1(v1), val2(v2)
-  { }
-
-// Insertor applies underlying manipulator function to stream
-template<typename T1, typename T2>
-  inline gzofstream&
-  operator<<(gzofstream& s, const gzomanip2<T1,T2>& m)
-  { return (*m.func)(s, m.val1, m.val2); }
-
-// Insert this onto stream to simplify setting of compression level
-inline gzomanip2<int,int>
-setcompression(int l, int s = Z_DEFAULT_STRATEGY)
-{ return gzomanip2<int,int>(&setcompression, l, s); }
-
-#endif // ZFSTREAM_H
diff --git a/src/png/zlib/contrib/masmx64/bld_ml64.bat b/src/png/zlib/contrib/masmx64/bld_ml64.bat
deleted file mode 100644
index f74bcef5b..000000000
--- a/src/png/zlib/contrib/masmx64/bld_ml64.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-ml64.exe /Flinffasx64 /c /Zi inffasx64.asm
-ml64.exe /Flgvmat64   /c /Zi gvmat64.asm
diff --git a/src/png/zlib/contrib/masmx64/gvmat64.asm b/src/png/zlib/contrib/masmx64/gvmat64.asm
deleted file mode 100644
index c1817f1be..000000000
--- a/src/png/zlib/contrib/masmx64/gvmat64.asm
+++ /dev/null
@@ -1,553 +0,0 @@
-;uInt longest_match_x64(
-;    deflate_state *s,
-;    IPos cur_match);                             /* current match */
-
-; gvmat64.asm -- Asm portion of the optimized longest_match for 32 bits x86_64
-;  (AMD64 on Athlon 64, Opteron, Phenom
-;     and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)
-; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
-;
-; File written by Gilles Vollant, by converting to assembly the longest_match
-;  from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
-;
-;  and by taking inspiration on asm686 with masm, optimised assembly code
-;        from Brian Raiter, written 1998
-;
-;  This software is provided 'as-is', without any express or implied
-;  warranty.  In no event will the authors be held liable for any damages
-;  arising from the use of this software.
-;
-;  Permission is granted to anyone to use this software for any purpose,
-;  including commercial applications, and to alter it and redistribute it
-;  freely, subject to the following restrictions:
-;
-;  1. The origin of this software must not be misrepresented; you must not
-;     claim that you wrote the original software. If you use this software
-;     in a product, an acknowledgment in the product documentation would be
-;     appreciated but is not required.
-;  2. Altered source versions must be plainly marked as such, and must not be
-;     misrepresented as being the original software
-;  3. This notice may not be removed or altered from any source distribution.
-;
-;
-;
-;         http://www.zlib.net
-;         http://www.winimage.com/zLibDll
-;         http://www.muppetlabs.com/~breadbox/software/assembly.html
-;
-; to compile this file for infozip Zip, I use option:
-;   ml64.exe /Flgvmat64 /c /Zi /DINFOZIP gvmat64.asm
-;
-; to compile this file for zLib, I use option:
-;   ml64.exe /Flgvmat64 /c /Zi gvmat64.asm
-; Be carrefull to adapt zlib1222add below to your version of zLib
-;   (if you use a version of zLib before 1.0.4 or after 1.2.2.2, change
-;    value of zlib1222add later)
-;
-; This file compile with Microsoft Macro Assembler (x64) for AMD64
-;
-;   ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK
-;
-;   (you can get Windows WDK with ml64 for AMD64 from
-;      http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)
-;
-
-
-;uInt longest_match(s, cur_match)
-;    deflate_state *s;
-;    IPos cur_match;                             /* current match */
-.code
-longest_match PROC
-
-
-;LocalVarsSize   equ 88
- LocalVarsSize   equ 72
-
-; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
-; free register :  r14,r15
-; register can be saved : rsp
-
- chainlenwmask   equ  rsp + 8 - LocalVarsSize    ; high word: current chain len
-                                                 ; low word: s->wmask
-;window          equ  rsp + xx - LocalVarsSize   ; local copy of s->window ; stored in r10
-;windowbestlen   equ  rsp + xx - LocalVarsSize   ; s->window + bestlen , use r10+r11
-;scanstart       equ  rsp + xx - LocalVarsSize   ; first two bytes of string ; stored in r12w
-;scanend         equ  rsp + xx - LocalVarsSize   ; last two bytes of string use ebx
-;scanalign       equ  rsp + xx - LocalVarsSize   ; dword-misalignment of string r13
-;bestlen         equ  rsp + xx - LocalVarsSize   ; size of best match so far -> r11d
-;scan            equ  rsp + xx - LocalVarsSize   ; ptr to string wanting match -> r9
-IFDEF INFOZIP
-ELSE
- nicematch       equ  (rsp + 16 - LocalVarsSize) ; a good enough match size
-ENDIF
-
-save_rdi        equ  rsp + 24 - LocalVarsSize
-save_rsi        equ  rsp + 32 - LocalVarsSize
-save_rbx        equ  rsp + 40 - LocalVarsSize
-save_rbp        equ  rsp + 48 - LocalVarsSize
-save_r12        equ  rsp + 56 - LocalVarsSize
-save_r13        equ  rsp + 64 - LocalVarsSize
-;save_r14        equ  rsp + 72 - LocalVarsSize
-;save_r15        equ  rsp + 80 - LocalVarsSize
-
-
-; summary of register usage
-; scanend     ebx
-; scanendw    bx
-; chainlenwmask   edx
-; curmatch    rsi
-; curmatchd   esi
-; windowbestlen   r8
-; scanalign   r9
-; scanalignd  r9d
-; window      r10
-; bestlen     r11
-; bestlend    r11d
-; scanstart   r12d
-; scanstartw  r12w
-; scan        r13
-; nicematch   r14d
-; limit       r15
-; limitd      r15d
-; prev        rcx
-
-;  all the +4 offsets are due to the addition of pending_buf_size (in zlib
-;  in the deflate_state structure since the asm code was first written
-;  (if you compile with zlib 1.0.4 or older, remove the +4).
-;  Note : these value are good with a 8 bytes boundary pack structure
-
-
-    MAX_MATCH           equ     258
-    MIN_MATCH           equ     3
-    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)
-
-
-;;; Offsets for fields in the deflate_state structure. These numbers
-;;; are calculated from the definition of deflate_state, with the
-;;; assumption that the compiler will dword-align the fields. (Thus,
-;;; changing the definition of deflate_state could easily cause this
-;;; program to crash horribly, without so much as a warning at
-;;; compile time. Sigh.)
-
-;  all the +zlib1222add offsets are due to the addition of fields
-;  in zlib in the deflate_state structure since the asm code was first written
-;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
-;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
-;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
-
-
-IFDEF INFOZIP
-
-_DATA   SEGMENT
-COMM    window_size:DWORD
-; WMask ; 7fff
-COMM    window:BYTE:010040H
-COMM    prev:WORD:08000H
-; MatchLen : unused
-; PrevMatch : unused
-COMM    strstart:DWORD
-COMM    match_start:DWORD
-; Lookahead : ignore
-COMM    prev_length:DWORD ; PrevLen
-COMM    max_chain_length:DWORD
-COMM    good_match:DWORD
-COMM    nice_match:DWORD
-prev_ad equ OFFSET prev
-window_ad equ OFFSET window
-nicematch equ nice_match
-_DATA ENDS
-WMask equ 07fffh
-
-ELSE
-
-  IFNDEF zlib1222add
-    zlib1222add equ 8
-  ENDIF
-dsWSize         equ 56+zlib1222add+(zlib1222add/2)
-dsWMask         equ 64+zlib1222add+(zlib1222add/2)
-dsWindow        equ 72+zlib1222add
-dsPrev          equ 88+zlib1222add
-dsMatchLen      equ 128+zlib1222add
-dsPrevMatch     equ 132+zlib1222add
-dsStrStart      equ 140+zlib1222add
-dsMatchStart    equ 144+zlib1222add
-dsLookahead     equ 148+zlib1222add
-dsPrevLen       equ 152+zlib1222add
-dsMaxChainLen   equ 156+zlib1222add
-dsGoodMatch     equ 172+zlib1222add
-dsNiceMatch     equ 176+zlib1222add
-
-window_size     equ [ rcx + dsWSize]
-WMask           equ [ rcx + dsWMask]
-window_ad       equ [ rcx + dsWindow]
-prev_ad         equ [ rcx + dsPrev]
-strstart        equ [ rcx + dsStrStart]
-match_start     equ [ rcx + dsMatchStart]
-Lookahead       equ [ rcx + dsLookahead] ; 0ffffffffh on infozip
-prev_length     equ [ rcx + dsPrevLen]
-max_chain_length equ [ rcx + dsMaxChainLen]
-good_match      equ [ rcx + dsGoodMatch]
-nice_match      equ [ rcx + dsNiceMatch]
-ENDIF
-
-; parameter 1 in r8(deflate state s), param 2 in rdx (cur match)
-
-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
-;
-; All registers must be preserved across the call, except for
-;   rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
-
-
-
-;;; Save registers that the compiler may be using, and adjust esp to
-;;; make room for our stack frame.
-
-
-;;; Retrieve the function arguments. r8d will hold cur_match
-;;; throughout the entire function. edx will hold the pointer to the
-;;; deflate_state structure during the function's setup (before
-;;; entering the main loop.
-
-; parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
-
-; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
-
-        mov [save_rdi],rdi
-        mov [save_rsi],rsi
-        mov [save_rbx],rbx
-        mov [save_rbp],rbp
-IFDEF INFOZIP
-        mov r8d,ecx
-ELSE
-        mov r8d,edx
-ENDIF
-        mov [save_r12],r12
-        mov [save_r13],r13
-;        mov [save_r14],r14
-;        mov [save_r15],r15
-
-
-;;; uInt wmask = s->w_mask;
-;;; unsigned chain_length = s->max_chain_length;
-;;; if (s->prev_length >= s->good_match) {
-;;;     chain_length >>= 2;
-;;; }
-
-        mov edi, prev_length
-        mov esi, good_match
-        mov eax, WMask
-        mov ebx, max_chain_length
-        cmp edi, esi
-        jl  LastMatchGood
-        shr ebx, 2
-LastMatchGood:
-
-;;; chainlen is decremented once beforehand so that the function can
-;;; use the sign flag instead of the zero flag for the exit test.
-;;; It is then shifted into the high word, to make room for the wmask
-;;; value, which it will always accompany.
-
-        dec ebx
-        shl ebx, 16
-        or  ebx, eax
-
-;;; on zlib only
-;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-IFDEF INFOZIP
-        mov [chainlenwmask], ebx
-; on infozip nice_match = [nice_match]
-ELSE
-        mov eax, nice_match
-        mov [chainlenwmask], ebx
-        mov r10d, Lookahead
-        cmp r10d, eax
-        cmovnl r10d, eax
-        mov [nicematch],r10d
-ENDIF
-
-;;; register Bytef *scan = s->window + s->strstart;
-        mov r10, window_ad
-        mov ebp, strstart
-        lea r13, [r10 + rbp]
-
-;;; Determine how many bytes the scan ptr is off from being
-;;; dword-aligned.
-
-         mov r9,r13
-         neg r13
-         and r13,3
-
-;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
-IFDEF INFOZIP
-        mov eax,07efah ; MAX_DIST = (WSIZE-MIN_LOOKAHEAD) (0x8000-(3+8+1))
-ELSE
-        mov eax, window_size
-        sub eax, MIN_LOOKAHEAD
-ENDIF
-        xor edi,edi
-        sub ebp, eax
-
-        mov r11d, prev_length
-
-        cmovng ebp,edi
-
-;;; int best_len = s->prev_length;
-
-
-;;; Store the sum of s->window + best_len in esi locally, and in esi.
-
-       lea  rsi,[r10+r11]
-
-;;; register ush scan_start = *(ushf*)scan;
-;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
-;;; Posf *prev = s->prev;
-
-        movzx r12d,word ptr [r9]
-        movzx ebx, word ptr [r9 + r11 - 1]
-
-        mov rdi, prev_ad
-
-;;; Jump into the main loop.
-
-        mov edx, [chainlenwmask]
-
-        cmp bx,word ptr [rsi + r8 - 1]
-        jz  LookupLoopIsZero
-
-LookupLoop1:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-        jbe LeaveNow
-        sub edx, 00010000h
-        js  LeaveNow
-
-LoopEntry1:
-        cmp bx,word ptr [rsi + r8 - 1]
-        jz  LookupLoopIsZero
-
-LookupLoop2:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-        jbe LeaveNow
-        sub edx, 00010000h
-        js  LeaveNow
-
-LoopEntry2:
-        cmp bx,word ptr [rsi + r8 - 1]
-        jz  LookupLoopIsZero
-
-LookupLoop4:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-        jbe LeaveNow
-        sub edx, 00010000h
-        js  LeaveNow
-
-LoopEntry4:
-
-        cmp bx,word ptr [rsi + r8 - 1]
-        jnz LookupLoop1
-        jmp LookupLoopIsZero
-
-
-;;; do {
-;;;     match = s->window + cur_match;
-;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
-;;;         *(ushf*)match != scan_start) continue;
-;;;     [...]
-;;; } while ((cur_match = prev[cur_match & wmask]) > limit
-;;;          && --chain_length != 0);
-;;;
-;;; Here is the inner loop of the function. The function will spend the
-;;; majority of its time in this loop, and majority of that time will
-;;; be spent in the first ten instructions.
-;;;
-;;; Within this loop:
-;;; ebx = scanend
-;;; r8d = curmatch
-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
-;;; esi = windowbestlen - i.e., (window + bestlen)
-;;; edi = prev
-;;; ebp = limit
-
-LookupLoop:
-        and r8d, edx
-
-        movzx   r8d, word ptr [rdi + r8*2]
-        cmp r8d, ebp
-        jbe LeaveNow
-        sub edx, 00010000h
-        js  LeaveNow
-
-LoopEntry:
-
-        cmp bx,word ptr [rsi + r8 - 1]
-        jnz LookupLoop1
-LookupLoopIsZero:
-        cmp     r12w, word ptr [r10 + r8]
-        jnz LookupLoop1
-
-
-;;; Store the current value of chainlen.
-        mov [chainlenwmask], edx
-
-;;; Point edi to the string under scrutiny, and esi to the string we
-;;; are hoping to match it up with. In actuality, esi and edi are
-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
-;;; initialized to -(MAX_MATCH_8 - scanalign).
-
-        lea rsi,[r8+r10]
-        mov rdx, 0fffffffffffffef8h; -(MAX_MATCH_8)
-        lea rsi, [rsi + r13 + 0108h] ;MAX_MATCH_8]
-        lea rdi, [r9 + r13 + 0108h] ;MAX_MATCH_8]
-
-        prefetcht1 [rsi+rdx]
-        prefetcht1 [rdi+rdx]
-
-
-;;; Test the strings for equality, 8 bytes at a time. At the end,
-;;; adjust rdx so that it is offset to the exact byte that mismatched.
-;;;
-;;; We already know at this point that the first three bytes of the
-;;; strings match each other, and they can be safely passed over before
-;;; starting the compare loop. So what this code does is skip over 0-3
-;;; bytes, as much as necessary in order to dword-align the edi
-;;; pointer. (rsi will still be misaligned three times out of four.)
-;;;
-;;; It should be confessed that this loop usually does not represent
-;;; much of the total running time. Replacing it with a more
-;;; straightforward "rep cmpsb" would not drastically degrade
-;;; performance.
-
-
-LoopCmps:
-        mov rax, [rsi + rdx]
-        xor rax, [rdi + rdx]
-        jnz LeaveLoopCmps
-
-        mov rax, [rsi + rdx + 8]
-        xor rax, [rdi + rdx + 8]
-        jnz LeaveLoopCmps8
-
-
-        mov rax, [rsi + rdx + 8+8]
-        xor rax, [rdi + rdx + 8+8]
-        jnz LeaveLoopCmps16
-
-        add rdx,8+8+8
-
-        jnz short LoopCmps
-        jmp short LenMaximum
-LeaveLoopCmps16: add rdx,8
-LeaveLoopCmps8: add rdx,8
-LeaveLoopCmps:
-
-        test    eax, 0000FFFFh
-        jnz LenLower
-
-        test eax,0ffffffffh
-
-        jnz LenLower32
-
-        add rdx,4
-        shr rax,32
-        or ax,ax
-        jnz LenLower
-
-LenLower32:
-        shr eax,16
-        add rdx,2
-LenLower:   sub al, 1
-        adc rdx, 0
-;;; Calculate the length of the match. If it is longer than MAX_MATCH,
-;;; then automatically accept it as the best possible match and leave.
-
-        lea rax, [rdi + rdx]
-        sub rax, r9
-        cmp eax, MAX_MATCH
-        jge LenMaximum
-
-;;; If the length of the match is not longer than the best match we
-;;; have so far, then forget it and return to the lookup loop.
-;///////////////////////////////////
-
-        cmp eax, r11d
-        jg  LongerMatch
-
-        lea rsi,[r10+r11]
-
-        mov rdi, prev_ad
-        mov edx, [chainlenwmask]
-        jmp LookupLoop
-
-;;;         s->match_start = cur_match;
-;;;         best_len = len;
-;;;         if (len >= nice_match) break;
-;;;         scan_end = *(ushf*)(scan+best_len-1);
-
-LongerMatch:
-        mov r11d, eax
-        mov match_start, r8d
-        cmp eax, [nicematch]
-        jge LeaveNow
-
-        lea rsi,[r10+rax]
-
-        movzx   ebx, word ptr [r9 + rax - 1]
-        mov rdi, prev_ad
-        mov edx, [chainlenwmask]
-        jmp LookupLoop
-
-;;; Accept the current string, with the maximum possible length.
-
-LenMaximum:
-        mov r11d,MAX_MATCH
-        mov match_start, r8d
-
-;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-;;; return s->lookahead;
-
-LeaveNow:
-IFDEF INFOZIP
-        mov eax,r11d
-ELSE
-        mov eax, Lookahead
-        cmp r11d, eax
-        cmovng eax, r11d
-ENDIF
-
-;;; Restore the stack and return from whence we came.
-
-
-        mov rsi,[save_rsi]
-        mov rdi,[save_rdi]
-        mov rbx,[save_rbx]
-        mov rbp,[save_rbp]
-        mov r12,[save_r12]
-        mov r13,[save_r13]
-;        mov r14,[save_r14]
-;        mov r15,[save_r15]
-
-
-        ret 0
-; please don't remove this string !
-; Your can freely use gvmat64 in any free or commercial app
-; but it is far better don't remove the string in the binary!
-    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0
-longest_match   ENDP
-
-match_init PROC
-  ret 0
-match_init ENDP
-
-
-END
diff --git a/src/png/zlib/contrib/masmx64/inffas8664.c b/src/png/zlib/contrib/masmx64/inffas8664.c
deleted file mode 100644
index aa861a333..000000000
--- a/src/png/zlib/contrib/masmx64/inffas8664.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* inffas8664.c is a hand tuned assembler version of inffast.c - fast decoding
- * version for AMD64 on Windows using Microsoft C compiler
- *
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Copyright (C) 2003 Chris Anderson <christop@charm.net>
- * Please use the copyright conditions above.
- *
- * 2005 - Adaptation to Microsoft C Compiler for AMD64 by Gilles Vollant
- *
- * inffas8664.c call function inffas8664fnc in inffasx64.asm
- *  inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
- *
- * Dec-29-2003 -- I added AMD64 inflate asm support.  This version is also
- * slightly quicker on x86 systems because, instead of using rep movsb to copy
- * data, it uses rep movsw, which moves data in 2-byte chunks instead of single
- * bytes.  I've tested the AMD64 code on a Fedora Core 1 + the x86_64 updates
- * from http://fedora.linux.duke.edu/fc1_x86_64
- * which is running on an Athlon 64 3000+ / Gigabyte GA-K8VT800M system with
- * 1GB ram.  The 64-bit version is about 4% faster than the 32-bit version,
- * when decompressing mozilla-source-1.3.tar.gz.
- *
- * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
- * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
- * the moment.  I have successfully compiled and tested this code with gcc2.96,
- * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
- * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
- * enabled.  I will attempt to merge the MMX code into this version.  Newer
- * versions of this and inffast.S can be found at
- * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
- *
- */
-
-#include <stdio.h>
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* Mark Adler's comments from inffast.c: */
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-
-
-
-    typedef struct inffast_ar {
-/* 64   32                               x86  x86_64 */
-/* ar offset                              register */
-/*  0    0 */ void *esp;                /* esp save */
-/*  8    4 */ void *ebp;                /* ebp save */
-/* 16    8 */ unsigned char FAR *in;    /* esi rsi  local strm->next_in */
-/* 24   12 */ unsigned char FAR *last;  /*     r9   while in < last */
-/* 32   16 */ unsigned char FAR *out;   /* edi rdi  local strm->next_out */
-/* 40   20 */ unsigned char FAR *beg;   /*          inflate()'s init next_out */
-/* 48   24 */ unsigned char FAR *end;   /*     r10  while out < end */
-/* 56   28 */ unsigned char FAR *window;/*          size of window, wsize!=0 */
-/* 64   32 */ code const FAR *lcode;    /* ebp rbp  local strm->lencode */
-/* 72   36 */ code const FAR *dcode;    /*     r11  local strm->distcode */
-/* 80   40 */ size_t /*unsigned long */hold;       /* edx rdx  local strm->hold */
-/* 88   44 */ unsigned bits;            /* ebx rbx  local strm->bits */
-/* 92   48 */ unsigned wsize;           /*          window size */
-/* 96   52 */ unsigned write;           /*          window write index */
-/*100   56 */ unsigned lmask;           /*     r12  mask for lcode */
-/*104   60 */ unsigned dmask;           /*     r13  mask for dcode */
-/*108   64 */ unsigned len;             /*     r14  match length */
-/*112   68 */ unsigned dist;            /*     r15  match distance */
-/*116   72 */ unsigned status;          /*          set when state chng*/
-    } type_ar;
-#ifdef ASMINF
-
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    type_ar ar;
-    void inffas8664fnc(struct inffast_ar * par);
-
-
-
-#if (defined( __GNUC__ ) && defined( __amd64__ ) && ! defined( __i386 )) || (defined(_MSC_VER) && defined(_M_AMD64))
-#define PAD_AVAIL_IN 6
-#define PAD_AVAIL_OUT 258
-#else
-#define PAD_AVAIL_IN 5
-#define PAD_AVAIL_OUT 257
-#endif
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-
-    ar.in = strm->next_in;
-    ar.last = ar.in + (strm->avail_in - PAD_AVAIL_IN);
-    ar.out = strm->next_out;
-    ar.beg = ar.out - (start - strm->avail_out);
-    ar.end = ar.out + (strm->avail_out - PAD_AVAIL_OUT);
-    ar.wsize = state->wsize;
-    ar.write = state->wnext;
-    ar.window = state->window;
-    ar.hold = state->hold;
-    ar.bits = state->bits;
-    ar.lcode = state->lencode;
-    ar.dcode = state->distcode;
-    ar.lmask = (1U << state->lenbits) - 1;
-    ar.dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-
-    /* align in on 1/2 hold size boundary */
-    while (((size_t)(void *)ar.in & (sizeof(ar.hold) / 2 - 1)) != 0) {
-        ar.hold += (unsigned long)*ar.in++ << ar.bits;
-        ar.bits += 8;
-    }
-
-    inffas8664fnc(&ar);
-
-    if (ar.status > 1) {
-        if (ar.status == 2)
-            strm->msg = "invalid literal/length code";
-        else if (ar.status == 3)
-            strm->msg = "invalid distance code";
-        else
-            strm->msg = "invalid distance too far back";
-        state->mode = BAD;
-    }
-    else if ( ar.status == 1 ) {
-        state->mode = TYPE;
-    }
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    ar.len = ar.bits >> 3;
-    ar.in -= ar.len;
-    ar.bits -= ar.len << 3;
-    ar.hold &= (1U << ar.bits) - 1;
-
-    /* update state and return */
-    strm->next_in = ar.in;
-    strm->next_out = ar.out;
-    strm->avail_in = (unsigned)(ar.in < ar.last ?
-                                PAD_AVAIL_IN + (ar.last - ar.in) :
-                                PAD_AVAIL_IN - (ar.in - ar.last));
-    strm->avail_out = (unsigned)(ar.out < ar.end ?
-                                 PAD_AVAIL_OUT + (ar.end - ar.out) :
-                                 PAD_AVAIL_OUT - (ar.out - ar.end));
-    state->hold = (unsigned long)ar.hold;
-    state->bits = ar.bits;
-    return;
-}
-
-#endif
diff --git a/src/png/zlib/contrib/masmx64/inffasx64.asm b/src/png/zlib/contrib/masmx64/inffasx64.asm
deleted file mode 100644
index 41ec82392..000000000
--- a/src/png/zlib/contrib/masmx64/inffasx64.asm
+++ /dev/null
@@ -1,396 +0,0 @@
-; inffasx64.asm is a hand tuned assembler version of inffast.c - fast decoding
-; version for AMD64 on Windows using Microsoft C compiler
-;
-; inffasx64.asm is automatically convert from AMD64 portion of inffas86.c
-; inffasx64.asm is called by inffas8664.c, which contain more info.
-
-
-; to compile this file, I use option
-;   ml64.exe /Flinffasx64 /c /Zi inffasx64.asm
-;   with Microsoft Macro Assembler (x64) for AMD64
-;
-
-; This file compile with Microsoft Macro Assembler (x64) for AMD64
-;
-;   ml64.exe is given with Visual Studio 2005/2008/2010 and Windows WDK
-;
-;   (you can get Windows WDK with ml64 for AMD64 from
-;      http://www.microsoft.com/whdc/Devtools/wdk/default.mspx for low price)
-;
-
-
-.code
-inffas8664fnc PROC
-
-; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
-; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
-;
-; All registers must be preserved across the call, except for
-;   rax, rcx, rdx, r8, r-9, r10, and r11, which are scratch.
-
-
-	mov [rsp-8],rsi
-	mov [rsp-16],rdi
-	mov [rsp-24],r12
-	mov [rsp-32],r13
-	mov [rsp-40],r14
-	mov [rsp-48],r15
-	mov [rsp-56],rbx
-
-	mov rax,rcx
-
-	mov	[rax+8], rbp       ; /* save regs rbp and rsp */
-	mov	[rax], rsp
-
-	mov	rsp, rax          ; /* make rsp point to &ar */
-
-	mov	rsi, [rsp+16]      ; /* rsi  = in */
-	mov	rdi, [rsp+32]      ; /* rdi  = out */
-	mov	r9, [rsp+24]       ; /* r9   = last */
-	mov	r10, [rsp+48]      ; /* r10  = end */
-	mov	rbp, [rsp+64]      ; /* rbp  = lcode */
-	mov	r11, [rsp+72]      ; /* r11  = dcode */
-	mov	rdx, [rsp+80]      ; /* rdx  = hold */
-	mov	ebx, [rsp+88]      ; /* ebx  = bits */
-	mov	r12d, [rsp+100]    ; /* r12d = lmask */
-	mov	r13d, [rsp+104]    ; /* r13d = dmask */
-                                          ; /* r14d = len */
-                                          ; /* r15d = dist */
-
-
-	cld
-	cmp	r10, rdi
-	je	L_one_time           ; /* if only one decode left */
-	cmp	r9, rsi
-
-    jne L_do_loop
-
-
-L_one_time:
-	mov	r8, r12           ; /* r8 = lmask */
-	cmp	bl, 32
-	ja	L_get_length_code_one_time
-
-	lodsd                         ; /* eax = *(uint *)in++ */
-	mov	cl, bl            ; /* cl = bits, needs it for shifting */
-	add	bl, 32             ; /* bits += 32 */
-	shl	rax, cl
-	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
-	jmp	L_get_length_code_one_time
-
-ALIGN 4
-L_while_test:
-	cmp	r10, rdi
-	jbe	L_break_loop
-	cmp	r9, rsi
-	jbe	L_break_loop
-
-L_do_loop:
-	mov	r8, r12           ; /* r8 = lmask */
-	cmp	bl, 32
-	ja	L_get_length_code    ; /* if (32 < bits) */
-
-	lodsd                         ; /* eax = *(uint *)in++ */
-	mov	cl, bl            ; /* cl = bits, needs it for shifting */
-	add	bl, 32             ; /* bits += 32 */
-	shl	rax, cl
-	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
-
-L_get_length_code:
-	and	r8, rdx            ; /* r8 &= hold */
-	mov	eax, [rbp+r8*4]  ; /* eax = lcode[hold & lmask] */
-
-	mov	cl, ah            ; /* cl = this.bits */
-	sub	bl, ah            ; /* bits -= this.bits */
-	shr	rdx, cl           ; /* hold >>= this.bits */
-
-	test	al, al
-	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
-
-	mov	r8, r12            ; /* r8 = lmask */
-	shr	eax, 16            ; /* output this.val char */
-	stosb
-
-L_get_length_code_one_time:
-	and	r8, rdx            ; /* r8 &= hold */
-	mov	eax, [rbp+r8*4] ; /* eax = lcode[hold & lmask] */
-
-L_dolen:
-	mov	cl, ah            ; /* cl = this.bits */
-	sub	bl, ah            ; /* bits -= this.bits */
-	shr	rdx, cl           ; /* hold >>= this.bits */
-
-	test	al, al
-	jnz	L_test_for_length_base ; /* if (op != 0) 45.7% */
-
-	shr	eax, 16            ; /* output this.val char */
-	stosb
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_length_base:
-	mov	r14d, eax         ; /* len = this */
-	shr	r14d, 16           ; /* len = this.val */
-	mov	cl, al
-
-	test	al, 16
-	jz	L_test_for_second_level_length ; /* if ((op & 16) == 0) 8% */
-	and	cl, 15             ; /* op &= 15 */
-	jz	L_decode_distance    ; /* if (!op) */
-
-L_add_bits_to_len:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx          ; /* eax &= hold */
-	shr	rdx, cl
-	add	r14d, eax         ; /* len += hold & mask[op] */
-
-L_decode_distance:
-	mov	r8, r13           ; /* r8 = dmask */
-	cmp	bl, 32
-	ja	L_get_distance_code  ; /* if (32 < bits) */
-
-	lodsd                         ; /* eax = *(uint *)in++ */
-	mov	cl, bl            ; /* cl = bits, needs it for shifting */
-	add	bl, 32             ; /* bits += 32 */
-	shl	rax, cl
-	or	rdx, rax          ; /* hold |= *((uint *)in)++ << bits */
-
-L_get_distance_code:
-	and	r8, rdx           ; /* r8 &= hold */
-	mov	eax, [r11+r8*4] ; /* eax = dcode[hold & dmask] */
-
-L_dodist:
-	mov	r15d, eax         ; /* dist = this */
-	shr	r15d, 16           ; /* dist = this.val */
-	mov	cl, ah
-	sub	bl, ah            ; /* bits -= this.bits */
-	shr	rdx, cl           ; /* hold >>= this.bits */
-	mov	cl, al            ; /* cl = this.op */
-
-	test	al, 16             ; /* if ((op & 16) == 0) */
-	jz	L_test_for_second_level_dist
-	and	cl, 15             ; /* op &= 15 */
-	jz	L_check_dist_one
-
-L_add_bits_to_dist:
-	sub	bl, cl
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax                 ; /* (1 << op) - 1 */
-	and	eax, edx          ; /* eax &= hold */
-	shr	rdx, cl
-	add	r15d, eax         ; /* dist += hold & ((1 << op) - 1) */
-
-L_check_window:
-	mov	r8, rsi           ; /* save in so from can use it's reg */
-	mov	rax, rdi
-	sub	rax, [rsp+40]      ; /* nbytes = out - beg */
-
-	cmp	eax, r15d
-	jb	L_clip_window        ; /* if (dist > nbytes) 4.2% */
-
-	mov	ecx, r14d         ; /* ecx = len */
-	mov	rsi, rdi
-	sub	rsi, r15          ; /* from = out - dist */
-
-	sar	ecx, 1
-	jnc	L_copy_two           ; /* if len % 2 == 0 */
-
-	rep     movsw
-	mov	al, [rsi]
-	mov	[rdi], al
-	inc	rdi
-
-	mov	rsi, r8           ; /* move in back to %rsi, toss from */
-	jmp	L_while_test
-
-L_copy_two:
-	rep     movsw
-	mov	rsi, r8           ; /* move in back to %rsi, toss from */
-	jmp	L_while_test
-
-ALIGN 4
-L_check_dist_one:
-	cmp	r15d, 1            ; /* if dist 1, is a memset */
-	jne	L_check_window
-	cmp	[rsp+40], rdi      ; /* if out == beg, outside window */
-	je	L_check_window
-
-	mov	ecx, r14d         ; /* ecx = len */
-	mov	al, [rdi-1]
-	mov	ah, al
-
-	sar	ecx, 1
-	jnc	L_set_two
-	mov	[rdi], al
-	inc	rdi
-
-L_set_two:
-	rep     stosw
-	jmp	L_while_test
-
-ALIGN 4
-L_test_for_second_level_length:
-	test	al, 64
-	jnz	L_test_for_end_of_block ; /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx         ; /* eax &= hold */
-	add	eax, r14d        ; /* eax += len */
-	mov	eax, [rbp+rax*4] ; /* eax = lcode[val+(hold&mask[op])]*/
-	jmp	L_dolen
-
-ALIGN 4
-L_test_for_second_level_dist:
-	test	al, 64
-	jnz	L_invalid_distance_code ; /* if ((op & 64) != 0) */
-
-	xor	eax, eax
-	inc	eax
-	shl	eax, cl
-	dec	eax
-	and	eax, edx         ; /* eax &= hold */
-	add	eax, r15d        ; /* eax += dist */
-	mov	eax, [r11+rax*4] ; /* eax = dcode[val+(hold&mask[op])]*/
-	jmp	L_dodist
-
-ALIGN 4
-L_clip_window:
-	mov	ecx, eax         ; /* ecx = nbytes */
-	mov	eax, [rsp+92]     ; /* eax = wsize, prepare for dist cmp */
-	neg	ecx                ; /* nbytes = -nbytes */
-
-	cmp	eax, r15d
-	jb	L_invalid_distance_too_far ; /* if (dist > wsize) */
-
-	add	ecx, r15d         ; /* nbytes = dist - nbytes */
-	cmp	dword ptr [rsp+96], 0
-	jne	L_wrap_around_window ; /* if (write != 0) */
-
-	mov	rsi, [rsp+56]     ; /* from  = window */
-	sub	eax, ecx         ; /* eax  -= nbytes */
-	add	rsi, rax         ; /* from += wsize - nbytes */
-
-	mov	eax, r14d        ; /* eax = len */
-	cmp	r14d, ecx
-	jbe	L_do_copy           ; /* if (nbytes >= len) */
-
-	sub	eax, ecx         ; /* eax -= nbytes */
-	rep     movsb
-	mov	rsi, rdi
-	sub	rsi, r15         ; /* from = &out[ -dist ] */
-	jmp	L_do_copy
-
-ALIGN 4
-L_wrap_around_window:
-	mov	eax, [rsp+96]     ; /* eax = write */
-	cmp	ecx, eax
-	jbe	L_contiguous_in_window ; /* if (write >= nbytes) */
-
-	mov	esi, [rsp+92]     ; /* from  = wsize */
-	add	rsi, [rsp+56]     ; /* from += window */
-	add	rsi, rax         ; /* from += write */
-	sub	rsi, rcx         ; /* from -= nbytes */
-	sub	ecx, eax         ; /* nbytes -= write */
-
-	mov	eax, r14d        ; /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy           ; /* if (nbytes >= len) */
-
-	sub	eax, ecx         ; /* len -= nbytes */
-	rep     movsb
-	mov	rsi, [rsp+56]     ; /* from = window */
-	mov	ecx, [rsp+96]     ; /* nbytes = write */
-	cmp	eax, ecx
-	jbe	L_do_copy           ; /* if (nbytes >= len) */
-
-	sub	eax, ecx         ; /* len -= nbytes */
-	rep     movsb
-	mov	rsi, rdi
-	sub	rsi, r15         ; /* from = out - dist */
-	jmp	L_do_copy
-
-ALIGN 4
-L_contiguous_in_window:
-	mov	rsi, [rsp+56]     ; /* rsi = window */
-	add	rsi, rax
-	sub	rsi, rcx         ; /* from += write - nbytes */
-
-	mov	eax, r14d        ; /* eax = len */
-	cmp	eax, ecx
-	jbe	L_do_copy           ; /* if (nbytes >= len) */
-
-	sub	eax, ecx         ; /* len -= nbytes */
-	rep     movsb
-	mov	rsi, rdi
-	sub	rsi, r15         ; /* from = out - dist */
-	jmp	L_do_copy           ; /* if (nbytes >= len) */
-
-ALIGN 4
-L_do_copy:
-	mov	ecx, eax         ; /* ecx = len */
-	rep     movsb
-
-	mov	rsi, r8          ; /* move in back to %esi, toss from */
-	jmp	L_while_test
-
-L_test_for_end_of_block:
-	test	al, 32
-	jz	L_invalid_literal_length_code
-	mov	dword ptr [rsp+116], 1
-	jmp	L_break_loop_with_status
-
-L_invalid_literal_length_code:
-	mov	dword ptr [rsp+116], 2
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_code:
-	mov	dword ptr [rsp+116], 3
-	jmp	L_break_loop_with_status
-
-L_invalid_distance_too_far:
-	mov	dword ptr [rsp+116], 4
-	jmp	L_break_loop_with_status
-
-L_break_loop:
-	mov	dword ptr [rsp+116], 0
-
-L_break_loop_with_status:
-; /* put in, out, bits, and hold back into ar and pop esp */
-	mov	[rsp+16], rsi     ; /* in */
-	mov	[rsp+32], rdi     ; /* out */
-	mov	[rsp+88], ebx     ; /* bits */
-	mov	[rsp+80], rdx     ; /* hold */
-
-	mov	rax, [rsp]       ; /* restore rbp and rsp */
-	mov	rbp, [rsp+8]
-	mov	rsp, rax
-
-
-
-	mov rsi,[rsp-8]
-	mov rdi,[rsp-16]
-	mov r12,[rsp-24]
-	mov r13,[rsp-32]
-	mov r14,[rsp-40]
-	mov r15,[rsp-48]
-	mov rbx,[rsp-56]
-
-    ret 0
-;          :
-;          : "m" (ar)
-;          : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
-;            "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
-;    );
-
-inffas8664fnc 	ENDP
-;_TEXT	ENDS
-END
diff --git a/src/png/zlib/contrib/masmx64/readme.txt b/src/png/zlib/contrib/masmx64/readme.txt
deleted file mode 100644
index 652571c7a..000000000
--- a/src/png/zlib/contrib/masmx64/readme.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Summary
--------
-This directory contains ASM implementations of the functions
-longest_match() and inflate_fast(), for 64 bits x86 (both AMD64 and Intel EM64t),
-for use with Microsoft Macro Assembler (x64) for AMD64 and Microsoft C++ 64 bits.
-
-gvmat64.asm is written by Gilles Vollant (2005), by using Brian Raiter 686/32 bits
-   assembly optimized version from Jean-loup Gailly original longest_match function
-
-inffasx64.asm and inffas8664.c were written by Chris Anderson, by optimizing
-   original function from Mark Adler
-
-Use instructions
-----------------
-Assemble the .asm files using MASM and put the object files into the zlib source
-directory.  You can also get object files here:
-
-     http://www.winimage.com/zLibDll/zlib124_masm_obj.zip
-
-define ASMV and ASMINF in your project. Include inffas8664.c in your source tree,
-and inffasx64.obj and gvmat64.obj as object to link.
-
-
-Build instructions
-------------------
-run bld_64.bat with Microsoft Macro Assembler (x64) for AMD64 (ml64.exe)
-
-ml64.exe is given with Visual Studio 2005, Windows 2003 server DDK
-
-You can get Windows 2003 server DDK with ml64 and cl for AMD64 from
-  http://www.microsoft.com/whdc/devtools/ddk/default.mspx for low price)
diff --git a/src/png/zlib/contrib/masmx86/bld_ml32.bat b/src/png/zlib/contrib/masmx86/bld_ml32.bat
deleted file mode 100644
index fcf5755e4..000000000
--- a/src/png/zlib/contrib/masmx86/bld_ml32.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-ml /coff /Zi /c /Flmatch686.lst match686.asm
-ml /coff /Zi /c /Flinffas32.lst inffas32.asm
diff --git a/src/png/zlib/contrib/masmx86/inffas32.asm b/src/png/zlib/contrib/masmx86/inffas32.asm
deleted file mode 100644
index cb37a81e4..000000000
--- a/src/png/zlib/contrib/masmx86/inffas32.asm
+++ /dev/null
@@ -1,1080 +0,0 @@
-;/* inffas32.asm is a hand tuned assembler version of inffast.c -- fast decoding
-; *
-; * inffas32.asm is derivated from inffas86.c, with translation of assembly code
-; *
-; * Copyright (C) 1995-2003 Mark Adler
-; * For conditions of distribution and use, see copyright notice in zlib.h
-; *
-; * Copyright (C) 2003 Chris Anderson <christop@charm.net>
-; * Please use the copyright conditions above.
-; *
-; * Mar-13-2003 -- Most of this is derived from inffast.S which is derived from
-; * the gcc -S output of zlib-1.2.0/inffast.c.  Zlib-1.2.0 is in beta release at
-; * the moment.  I have successfully compiled and tested this code with gcc2.96,
-; * gcc3.2, icc5.0, msvc6.0.  It is very close to the speed of inffast.S
-; * compiled with gcc -DNO_MMX, but inffast.S is still faster on the P3 with MMX
-; * enabled.  I will attempt to merge the MMX code into this version.  Newer
-; * versions of this and inffast.S can be found at
-; * http://www.eetbeetee.com/zlib/ and http://www.charm.net/~christop/zlib/
-; *
-; * 2005 : modification by Gilles Vollant
-; */
-; For Visual C++ 4.x and higher and ML 6.x and higher
-;   ml.exe is in directory \MASM611C of Win95 DDK
-;   ml.exe is also distributed in http://www.masm32.com/masmdl.htm
-;    and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/
-;
-;
-;   compile with command line option
-;   ml  /coff /Zi /c /Flinffas32.lst inffas32.asm
-
-;   if you define NO_GZIP (see inflate.h), compile with
-;   ml  /coff /Zi /c /Flinffas32.lst /DNO_GUNZIP inffas32.asm
-
-
-; zlib122sup is 0 fort zlib 1.2.2.1 and lower
-; zlib122sup is 8 fort zlib 1.2.2.2 and more (with addition of dmax and head
-;        in inflate_state in inflate.h)
-zlib1222sup      equ    8
-
-
-IFDEF GUNZIP
-  INFLATE_MODE_TYPE    equ 11
-  INFLATE_MODE_BAD     equ 26
-ELSE
-  IFNDEF NO_GUNZIP
-    INFLATE_MODE_TYPE    equ 11
-    INFLATE_MODE_BAD     equ 26
-  ELSE
-    INFLATE_MODE_TYPE    equ 3
-    INFLATE_MODE_BAD     equ 17
-  ENDIF
-ENDIF
-
-
-; 75 "inffast.S"
-;FILE "inffast.S"
-
-;;;GLOBAL _inflate_fast
-
-;;;SECTION .text
-
-
-
-	.586p
-	.mmx
-
-	name	inflate_fast_x86
-	.MODEL	FLAT
-
-_DATA			segment
-inflate_fast_use_mmx:
-	dd	1
-
-
-_TEXT			segment
-
-
-
-ALIGN 4
-	db	'Fast decoding Code from Chris Anderson'
-	db	0
-
-ALIGN 4
-invalid_literal_length_code_msg:
-	db	'invalid literal/length code'
-	db	0
-
-ALIGN 4
-invalid_distance_code_msg:
-	db	'invalid distance code'
-	db	0
-
-ALIGN 4
-invalid_distance_too_far_msg:
-	db	'invalid distance too far back'
-	db	0
-
-
-ALIGN 4
-inflate_fast_mask:
-dd	0
-dd	1
-dd	3
-dd	7
-dd	15
-dd	31
-dd	63
-dd	127
-dd	255
-dd	511
-dd	1023
-dd	2047
-dd	4095
-dd	8191
-dd	16383
-dd	32767
-dd	65535
-dd	131071
-dd	262143
-dd	524287
-dd	1048575
-dd	2097151
-dd	4194303
-dd	8388607
-dd	16777215
-dd	33554431
-dd	67108863
-dd	134217727
-dd	268435455
-dd	536870911
-dd	1073741823
-dd	2147483647
-dd	4294967295
-
-
-mode_state	 equ	0	;/* state->mode	*/
-wsize_state	 equ	(32+zlib1222sup)	;/* state->wsize */
-write_state	 equ	(36+4+zlib1222sup)	;/* state->write */
-window_state	 equ	(40+4+zlib1222sup)	;/* state->window */
-hold_state	 equ	(44+4+zlib1222sup)	;/* state->hold	*/
-bits_state	 equ	(48+4+zlib1222sup)	;/* state->bits	*/
-lencode_state	 equ	(64+4+zlib1222sup)	;/* state->lencode */
-distcode_state	 equ	(68+4+zlib1222sup)	;/* state->distcode */
-lenbits_state	 equ	(72+4+zlib1222sup)	;/* state->lenbits */
-distbits_state	 equ	(76+4+zlib1222sup)	;/* state->distbits */
-
-
-;;SECTION .text
-; 205 "inffast.S"
-;GLOBAL	inflate_fast_use_mmx
-
-;SECTION .data
-
-
-; GLOBAL inflate_fast_use_mmx:object
-;.size inflate_fast_use_mmx, 4
-; 226 "inffast.S"
-;SECTION .text
-
-ALIGN 4
-_inflate_fast proc near
-.FPO (16, 4, 0, 0, 1, 0)
-	push  edi
-	push  esi
-	push  ebp
-	push  ebx
-	pushfd
-	sub  esp,64
-	cld
-
-
-
-
-	mov  esi, [esp+88]
-	mov  edi, [esi+28]
-
-
-
-
-
-
-
-	mov  edx, [esi+4]
-	mov  eax, [esi+0]
-
-	add  edx,eax
-	sub  edx,11
-
-	mov  [esp+44],eax
-	mov  [esp+20],edx
-
-	mov  ebp, [esp+92]
-	mov  ecx, [esi+16]
-	mov  ebx, [esi+12]
-
-	sub  ebp,ecx
-	neg  ebp
-	add  ebp,ebx
-
-	sub  ecx,257
-	add  ecx,ebx
-
-	mov  [esp+60],ebx
-	mov  [esp+40],ebp
-	mov  [esp+16],ecx
-; 285 "inffast.S"
-	mov  eax, [edi+lencode_state]
-	mov  ecx, [edi+distcode_state]
-
-	mov  [esp+8],eax
-	mov  [esp+12],ecx
-
-	mov  eax,1
-	mov  ecx, [edi+lenbits_state]
-	shl  eax,cl
-	dec  eax
-	mov  [esp+0],eax
-
-	mov  eax,1
-	mov  ecx, [edi+distbits_state]
-	shl  eax,cl
-	dec  eax
-	mov  [esp+4],eax
-
-	mov  eax, [edi+wsize_state]
-	mov  ecx, [edi+write_state]
-	mov  edx, [edi+window_state]
-
-	mov  [esp+52],eax
-	mov  [esp+48],ecx
-	mov  [esp+56],edx
-
-	mov  ebp, [edi+hold_state]
-	mov  ebx, [edi+bits_state]
-; 321 "inffast.S"
-	mov  esi, [esp+44]
-	mov  ecx, [esp+20]
-	cmp  ecx,esi
-	ja   L_align_long
-
-	add  ecx,11
-	sub  ecx,esi
-	mov  eax,12
-	sub  eax,ecx
-	lea  edi, [esp+28]
-	rep movsb
-	mov  ecx,eax
-	xor  eax,eax
-	rep stosb
-	lea  esi, [esp+28]
-	mov  [esp+20],esi
-	jmp  L_is_aligned
-
-
-L_align_long:
-	test  esi,3
-	jz   L_is_aligned
-	xor  eax,eax
-	mov  al, [esi]
-	inc  esi
-	mov  ecx,ebx
-	add  ebx,8
-	shl  eax,cl
-	or  ebp,eax
-	jmp L_align_long
-
-L_is_aligned:
-	mov  edi, [esp+60]
-; 366 "inffast.S"
-L_check_mmx:
-	cmp  dword ptr [inflate_fast_use_mmx],2
-	je   L_init_mmx
-	ja   L_do_loop
-
-	push  eax
-	push  ebx
-	push  ecx
-	push  edx
-	pushfd
-	mov  eax, [esp]
-	xor  dword ptr [esp],0200000h
-
-
-
-
-	popfd
-	pushfd
-	pop  edx
-	xor  edx,eax
-	jz   L_dont_use_mmx
-	xor  eax,eax
-	cpuid
-	cmp  ebx,0756e6547h
-	jne  L_dont_use_mmx
-	cmp  ecx,06c65746eh
-	jne  L_dont_use_mmx
-	cmp  edx,049656e69h
-	jne  L_dont_use_mmx
-	mov  eax,1
-	cpuid
-	shr  eax,8
-	and  eax,15
-	cmp  eax,6
-	jne  L_dont_use_mmx
-	test  edx,0800000h
-	jnz  L_use_mmx
-	jmp  L_dont_use_mmx
-L_use_mmx:
-	mov  dword ptr [inflate_fast_use_mmx],2
-	jmp  L_check_mmx_pop
-L_dont_use_mmx:
-	mov  dword ptr [inflate_fast_use_mmx],3
-L_check_mmx_pop:
-	pop  edx
-	pop  ecx
-	pop  ebx
-	pop  eax
-	jmp  L_check_mmx
-; 426 "inffast.S"
-ALIGN 4
-L_do_loop:
-; 437 "inffast.S"
-	cmp  bl,15
-	ja   L_get_length_code
-
-	xor  eax,eax
-	lodsw
-	mov  cl,bl
-	add  bl,16
-	shl  eax,cl
-	or  ebp,eax
-
-L_get_length_code:
-	mov  edx, [esp+0]
-	mov  ecx, [esp+8]
-	and  edx,ebp
-	mov  eax, [ecx+edx*4]
-
-L_dolen:
-
-
-
-
-
-
-	mov  cl,ah
-	sub  bl,ah
-	shr  ebp,cl
-
-
-
-
-
-
-	test  al,al
-	jnz   L_test_for_length_base
-
-	shr  eax,16
-	stosb
-
-L_while_test:
-
-
-	cmp  [esp+16],edi
-	jbe  L_break_loop
-
-	cmp  [esp+20],esi
-	ja   L_do_loop
-	jmp  L_break_loop
-
-L_test_for_length_base:
-; 502 "inffast.S"
-	mov  edx,eax
-	shr  edx,16
-	mov  cl,al
-
-	test  al,16
-	jz   L_test_for_second_level_length
-	and  cl,15
-	jz   L_save_len
-	cmp  bl,cl
-	jae  L_add_bits_to_len
-
-	mov  ch,cl
-	xor  eax,eax
-	lodsw
-	mov  cl,bl
-	add  bl,16
-	shl  eax,cl
-	or  ebp,eax
-	mov  cl,ch
-
-L_add_bits_to_len:
-	mov  eax,1
-	shl  eax,cl
-	dec  eax
-	sub  bl,cl
-	and  eax,ebp
-	shr  ebp,cl
-	add  edx,eax
-
-L_save_len:
-	mov  [esp+24],edx
-
-
-L_decode_distance:
-; 549 "inffast.S"
-	cmp  bl,15
-	ja   L_get_distance_code
-
-	xor  eax,eax
-	lodsw
-	mov  cl,bl
-	add  bl,16
-	shl  eax,cl
-	or  ebp,eax
-
-L_get_distance_code:
-	mov  edx, [esp+4]
-	mov  ecx, [esp+12]
-	and  edx,ebp
-	mov  eax, [ecx+edx*4]
-
-
-L_dodist:
-	mov  edx,eax
-	shr  edx,16
-	mov  cl,ah
-	sub  bl,ah
-	shr  ebp,cl
-; 584 "inffast.S"
-	mov  cl,al
-
-	test  al,16
-	jz  L_test_for_second_level_dist
-	and  cl,15
-	jz  L_check_dist_one
-	cmp  bl,cl
-	jae  L_add_bits_to_dist
-
-	mov  ch,cl
-	xor  eax,eax
-	lodsw
-	mov  cl,bl
-	add  bl,16
-	shl  eax,cl
-	or  ebp,eax
-	mov  cl,ch
-
-L_add_bits_to_dist:
-	mov  eax,1
-	shl  eax,cl
-	dec  eax
-	sub  bl,cl
-	and  eax,ebp
-	shr  ebp,cl
-	add  edx,eax
-	jmp  L_check_window
-
-L_check_window:
-; 625 "inffast.S"
-	mov  [esp+44],esi
-	mov  eax,edi
-	sub  eax, [esp+40]
-
-	cmp  eax,edx
-	jb   L_clip_window
-
-	mov  ecx, [esp+24]
-	mov  esi,edi
-	sub  esi,edx
-
-	sub  ecx,3
-	mov  al, [esi]
-	mov  [edi],al
-	mov  al, [esi+1]
-	mov  dl, [esi+2]
-	add  esi,3
-	mov  [edi+1],al
-	mov  [edi+2],dl
-	add  edi,3
-	rep movsb
-
-	mov  esi, [esp+44]
-	jmp  L_while_test
-
-ALIGN 4
-L_check_dist_one:
-	cmp  edx,1
-	jne  L_check_window
-	cmp  [esp+40],edi
-	je  L_check_window
-
-	dec  edi
-	mov  ecx, [esp+24]
-	mov  al, [edi]
-	sub  ecx,3
-
-	mov  [edi+1],al
-	mov  [edi+2],al
-	mov  [edi+3],al
-	add  edi,4
-	rep stosb
-
-	jmp  L_while_test
-
-ALIGN 4
-L_test_for_second_level_length:
-
-
-
-
-	test  al,64
-	jnz   L_test_for_end_of_block
-
-	mov  eax,1
-	shl  eax,cl
-	dec  eax
-	and  eax,ebp
-	add  eax,edx
-	mov  edx, [esp+8]
-	mov  eax, [edx+eax*4]
-	jmp  L_dolen
-
-ALIGN 4
-L_test_for_second_level_dist:
-
-
-
-
-	test  al,64
-	jnz   L_invalid_distance_code
-
-	mov  eax,1
-	shl  eax,cl
-	dec  eax
-	and  eax,ebp
-	add  eax,edx
-	mov  edx, [esp+12]
-	mov  eax, [edx+eax*4]
-	jmp  L_dodist
-
-ALIGN 4
-L_clip_window:
-; 721 "inffast.S"
-	mov  ecx,eax
-	mov  eax, [esp+52]
-	neg  ecx
-	mov  esi, [esp+56]
-
-	cmp  eax,edx
-	jb   L_invalid_distance_too_far
-
-	add  ecx,edx
-	cmp  dword ptr [esp+48],0
-	jne  L_wrap_around_window
-
-	sub  eax,ecx
-	add  esi,eax
-; 749 "inffast.S"
-	mov  eax, [esp+24]
-	cmp  eax,ecx
-	jbe  L_do_copy1
-
-	sub  eax,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,edx
-	jmp  L_do_copy1
-
-	cmp  eax,ecx
-	jbe  L_do_copy1
-
-	sub  eax,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,edx
-	jmp  L_do_copy1
-
-L_wrap_around_window:
-; 793 "inffast.S"
-	mov  eax, [esp+48]
-	cmp  ecx,eax
-	jbe  L_contiguous_in_window
-
-	add  esi, [esp+52]
-	add  esi,eax
-	sub  esi,ecx
-	sub  ecx,eax
-
-
-	mov  eax, [esp+24]
-	cmp  eax,ecx
-	jbe  L_do_copy1
-
-	sub  eax,ecx
-	rep movsb
-	mov  esi, [esp+56]
-	mov  ecx, [esp+48]
-	cmp  eax,ecx
-	jbe  L_do_copy1
-
-	sub  eax,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,edx
-	jmp  L_do_copy1
-
-L_contiguous_in_window:
-; 836 "inffast.S"
-	add  esi,eax
-	sub  esi,ecx
-
-
-	mov  eax, [esp+24]
-	cmp  eax,ecx
-	jbe  L_do_copy1
-
-	sub  eax,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,edx
-
-L_do_copy1:
-; 862 "inffast.S"
-	mov  ecx,eax
-	rep movsb
-
-	mov  esi, [esp+44]
-	jmp  L_while_test
-; 878 "inffast.S"
-ALIGN 4
-L_init_mmx:
-	emms
-
-
-
-
-
-	movd mm0,ebp
-	mov  ebp,ebx
-; 896 "inffast.S"
-	movd mm4,dword ptr [esp+0]
-	movq mm3,mm4
-	movd mm5,dword ptr [esp+4]
-	movq mm2,mm5
-	pxor mm1,mm1
-	mov  ebx, [esp+8]
-	jmp  L_do_loop_mmx
-
-ALIGN 4
-L_do_loop_mmx:
-	psrlq mm0,mm1
-
-	cmp  ebp,32
-	ja  L_get_length_code_mmx
-
-	movd mm6,ebp
-	movd mm7,dword ptr [esi]
-	add  esi,4
-	psllq mm7,mm6
-	add  ebp,32
-	por mm0,mm7
-
-L_get_length_code_mmx:
-	pand mm4,mm0
-	movd eax,mm4
-	movq mm4,mm3
-	mov  eax, [ebx+eax*4]
-
-L_dolen_mmx:
-	movzx  ecx,ah
-	movd mm1,ecx
-	sub  ebp,ecx
-
-	test  al,al
-	jnz L_test_for_length_base_mmx
-
-	shr  eax,16
-	stosb
-
-L_while_test_mmx:
-
-
-	cmp  [esp+16],edi
-	jbe L_break_loop
-
-	cmp  [esp+20],esi
-	ja L_do_loop_mmx
-	jmp L_break_loop
-
-L_test_for_length_base_mmx:
-
-	mov  edx,eax
-	shr  edx,16
-
-	test  al,16
-	jz  L_test_for_second_level_length_mmx
-	and  eax,15
-	jz L_decode_distance_mmx
-
-	psrlq mm0,mm1
-	movd mm1,eax
-	movd ecx,mm0
-	sub  ebp,eax
-	and  ecx, [inflate_fast_mask+eax*4]
-	add  edx,ecx
-
-L_decode_distance_mmx:
-	psrlq mm0,mm1
-
-	cmp  ebp,32
-	ja L_get_dist_code_mmx
-
-	movd mm6,ebp
-	movd mm7,dword ptr [esi]
-	add  esi,4
-	psllq mm7,mm6
-	add  ebp,32
-	por mm0,mm7
-
-L_get_dist_code_mmx:
-	mov  ebx, [esp+12]
-	pand mm5,mm0
-	movd eax,mm5
-	movq mm5,mm2
-	mov  eax, [ebx+eax*4]
-
-L_dodist_mmx:
-
-	movzx  ecx,ah
-	mov  ebx,eax
-	shr  ebx,16
-	sub  ebp,ecx
-	movd mm1,ecx
-
-	test  al,16
-	jz L_test_for_second_level_dist_mmx
-	and  eax,15
-	jz L_check_dist_one_mmx
-
-L_add_bits_to_dist_mmx:
-	psrlq mm0,mm1
-	movd mm1,eax
-	movd ecx,mm0
-	sub  ebp,eax
-	and  ecx, [inflate_fast_mask+eax*4]
-	add  ebx,ecx
-
-L_check_window_mmx:
-	mov  [esp+44],esi
-	mov  eax,edi
-	sub  eax, [esp+40]
-
-	cmp  eax,ebx
-	jb L_clip_window_mmx
-
-	mov  ecx,edx
-	mov  esi,edi
-	sub  esi,ebx
-
-	sub  ecx,3
-	mov  al, [esi]
-	mov  [edi],al
-	mov  al, [esi+1]
-	mov  dl, [esi+2]
-	add  esi,3
-	mov  [edi+1],al
-	mov  [edi+2],dl
-	add  edi,3
-	rep movsb
-
-	mov  esi, [esp+44]
-	mov  ebx, [esp+8]
-	jmp  L_while_test_mmx
-
-ALIGN 4
-L_check_dist_one_mmx:
-	cmp  ebx,1
-	jne  L_check_window_mmx
-	cmp  [esp+40],edi
-	je   L_check_window_mmx
-
-	dec  edi
-	mov  ecx,edx
-	mov  al, [edi]
-	sub  ecx,3
-
-	mov  [edi+1],al
-	mov  [edi+2],al
-	mov  [edi+3],al
-	add  edi,4
-	rep stosb
-
-	mov  ebx, [esp+8]
-	jmp  L_while_test_mmx
-
-ALIGN 4
-L_test_for_second_level_length_mmx:
-	test  al,64
-	jnz L_test_for_end_of_block
-
-	and  eax,15
-	psrlq mm0,mm1
-	movd ecx,mm0
-	and  ecx, [inflate_fast_mask+eax*4]
-	add  ecx,edx
-	mov  eax, [ebx+ecx*4]
-	jmp L_dolen_mmx
-
-ALIGN 4
-L_test_for_second_level_dist_mmx:
-	test  al,64
-	jnz L_invalid_distance_code
-
-	and  eax,15
-	psrlq mm0,mm1
-	movd ecx,mm0
-	and  ecx, [inflate_fast_mask+eax*4]
-	mov  eax, [esp+12]
-	add  ecx,ebx
-	mov  eax, [eax+ecx*4]
-	jmp  L_dodist_mmx
-
-ALIGN 4
-L_clip_window_mmx:
-
-	mov  ecx,eax
-	mov  eax, [esp+52]
-	neg  ecx
-	mov  esi, [esp+56]
-
-	cmp  eax,ebx
-	jb  L_invalid_distance_too_far
-
-	add  ecx,ebx
-	cmp  dword ptr [esp+48],0
-	jne  L_wrap_around_window_mmx
-
-	sub  eax,ecx
-	add  esi,eax
-
-	cmp  edx,ecx
-	jbe  L_do_copy1_mmx
-
-	sub  edx,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,ebx
-	jmp  L_do_copy1_mmx
-
-	cmp  edx,ecx
-	jbe  L_do_copy1_mmx
-
-	sub  edx,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,ebx
-	jmp  L_do_copy1_mmx
-
-L_wrap_around_window_mmx:
-
-	mov  eax, [esp+48]
-	cmp  ecx,eax
-	jbe  L_contiguous_in_window_mmx
-
-	add  esi, [esp+52]
-	add  esi,eax
-	sub  esi,ecx
-	sub  ecx,eax
-
-
-	cmp  edx,ecx
-	jbe  L_do_copy1_mmx
-
-	sub  edx,ecx
-	rep movsb
-	mov  esi, [esp+56]
-	mov  ecx, [esp+48]
-	cmp  edx,ecx
-	jbe  L_do_copy1_mmx
-
-	sub  edx,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,ebx
-	jmp  L_do_copy1_mmx
-
-L_contiguous_in_window_mmx:
-
-	add  esi,eax
-	sub  esi,ecx
-
-
-	cmp  edx,ecx
-	jbe  L_do_copy1_mmx
-
-	sub  edx,ecx
-	rep movsb
-	mov  esi,edi
-	sub  esi,ebx
-
-L_do_copy1_mmx:
-
-
-	mov  ecx,edx
-	rep movsb
-
-	mov  esi, [esp+44]
-	mov  ebx, [esp+8]
-	jmp  L_while_test_mmx
-; 1174 "inffast.S"
-L_invalid_distance_code:
-
-
-
-
-
-	mov  ecx, invalid_distance_code_msg
-	mov  edx,INFLATE_MODE_BAD
-	jmp  L_update_stream_state
-
-L_test_for_end_of_block:
-
-
-
-
-
-	test  al,32
-	jz  L_invalid_literal_length_code
-
-	mov  ecx,0
-	mov  edx,INFLATE_MODE_TYPE
-	jmp  L_update_stream_state
-
-L_invalid_literal_length_code:
-
-
-
-
-
-	mov  ecx, invalid_literal_length_code_msg
-	mov  edx,INFLATE_MODE_BAD
-	jmp  L_update_stream_state
-
-L_invalid_distance_too_far:
-
-
-
-	mov  esi, [esp+44]
-	mov  ecx, invalid_distance_too_far_msg
-	mov  edx,INFLATE_MODE_BAD
-	jmp  L_update_stream_state
-
-L_update_stream_state:
-
-	mov  eax, [esp+88]
-	test  ecx,ecx
-	jz  L_skip_msg
-	mov  [eax+24],ecx
-L_skip_msg:
-	mov  eax, [eax+28]
-	mov  [eax+mode_state],edx
-	jmp  L_break_loop
-
-ALIGN 4
-L_break_loop:
-; 1243 "inffast.S"
-	cmp  dword ptr [inflate_fast_use_mmx],2
-	jne  L_update_next_in
-
-
-
-	mov  ebx,ebp
-
-L_update_next_in:
-; 1266 "inffast.S"
-	mov  eax, [esp+88]
-	mov  ecx,ebx
-	mov  edx, [eax+28]
-	shr  ecx,3
-	sub  esi,ecx
-	shl  ecx,3
-	sub  ebx,ecx
-	mov  [eax+12],edi
-	mov  [edx+bits_state],ebx
-	mov  ecx,ebx
-
-	lea  ebx, [esp+28]
-	cmp  [esp+20],ebx
-	jne  L_buf_not_used
-
-	sub  esi,ebx
-	mov  ebx, [eax+0]
-	mov  [esp+20],ebx
-	add  esi,ebx
-	mov  ebx, [eax+4]
-	sub  ebx,11
-	add  [esp+20],ebx
-
-L_buf_not_used:
-	mov  [eax+0],esi
-
-	mov  ebx,1
-	shl  ebx,cl
-	dec  ebx
-
-
-
-
-
-	cmp  dword ptr [inflate_fast_use_mmx],2
-	jne  L_update_hold
-
-
-
-	psrlq mm0,mm1
-	movd ebp,mm0
-
-	emms
-
-L_update_hold:
-
-
-
-	and  ebp,ebx
-	mov  [edx+hold_state],ebp
-
-
-
-
-	mov  ebx, [esp+20]
-	cmp  ebx,esi
-	jbe  L_last_is_smaller
-
-	sub  ebx,esi
-	add  ebx,11
-	mov  [eax+4],ebx
-	jmp  L_fixup_out
-L_last_is_smaller:
-	sub  esi,ebx
-	neg  esi
-	add  esi,11
-	mov  [eax+4],esi
-
-
-
-
-L_fixup_out:
-
-	mov  ebx, [esp+16]
-	cmp  ebx,edi
-	jbe  L_end_is_smaller
-
-	sub  ebx,edi
-	add  ebx,257
-	mov  [eax+16],ebx
-	jmp  L_done
-L_end_is_smaller:
-	sub  edi,ebx
-	neg  edi
-	add  edi,257
-	mov  [eax+16],edi
-
-
-
-
-
-L_done:
-	add  esp,64
-	popfd
-	pop  ebx
-	pop  ebp
-	pop  esi
-	pop  edi
-	ret
-_inflate_fast endp
-
-_TEXT	ends
-end
diff --git a/src/png/zlib/contrib/masmx86/match686.asm b/src/png/zlib/contrib/masmx86/match686.asm
deleted file mode 100644
index 69e0eed01..000000000
--- a/src/png/zlib/contrib/masmx86/match686.asm
+++ /dev/null
@@ -1,479 +0,0 @@
-; match686.asm -- Asm portion of the optimized longest_match for 32 bits x86
-; Copyright (C) 1995-1996 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
-; File written by Gilles Vollant, by converting match686.S from Brian Raiter
-; for MASM. This is as assembly version of longest_match
-;  from Jean-loup Gailly in deflate.c
-;
-;         http://www.zlib.net
-;         http://www.winimage.com/zLibDll
-;         http://www.muppetlabs.com/~breadbox/software/assembly.html
-;
-; For Visual C++ 4.x and higher and ML 6.x and higher
-;   ml.exe is distributed in
-;  http://www.microsoft.com/downloads/details.aspx?FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64
-;
-; this file contain two implementation of longest_match
-;
-;  this longest_match was written by Brian raiter (1998), optimized for Pentium Pro
-;   (and the faster known version of match_init on modern Core 2 Duo and AMD Phenom)
-;
-;  for using an assembly version of longest_match, you need define ASMV in project
-;
-;    compile the asm file running
-;           ml /coff /Zi /c /Flmatch686.lst match686.asm
-;    and do not include match686.obj in your project
-;
-; note: contrib of zLib 1.2.3 and earlier contained both a deprecated version for
-;  Pentium (prior Pentium Pro) and this version for Pentium Pro and modern processor
-;  with autoselect (with cpu detection code)
-;  if you want support the old pentium optimization, you can still use these version
-;
-; this file is not optimized for old pentium, but it compatible with all x86 32 bits
-; processor (starting 80386)
-;
-;
-; see below : zlib1222add must be adjuster if you use a zlib version < 1.2.2.2
-
-;uInt longest_match(s, cur_match)
-;    deflate_state *s;
-;    IPos cur_match;                             /* current match */
-
-    NbStack         equ     76
-    cur_match       equ     dword ptr[esp+NbStack-0]
-    str_s           equ     dword ptr[esp+NbStack-4]
-; 5 dword on top (ret,ebp,esi,edi,ebx)
-    adrret          equ     dword ptr[esp+NbStack-8]
-    pushebp         equ     dword ptr[esp+NbStack-12]
-    pushedi         equ     dword ptr[esp+NbStack-16]
-    pushesi         equ     dword ptr[esp+NbStack-20]
-    pushebx         equ     dword ptr[esp+NbStack-24]
-
-    chain_length    equ     dword ptr [esp+NbStack-28]
-    limit           equ     dword ptr [esp+NbStack-32]
-    best_len        equ     dword ptr [esp+NbStack-36]
-    window          equ     dword ptr [esp+NbStack-40]
-    prev            equ     dword ptr [esp+NbStack-44]
-    scan_start      equ      word ptr [esp+NbStack-48]
-    wmask           equ     dword ptr [esp+NbStack-52]
-    match_start_ptr equ     dword ptr [esp+NbStack-56]
-    nice_match      equ     dword ptr [esp+NbStack-60]
-    scan            equ     dword ptr [esp+NbStack-64]
-
-    windowlen       equ     dword ptr [esp+NbStack-68]
-    match_start     equ     dword ptr [esp+NbStack-72]
-    strend          equ     dword ptr [esp+NbStack-76]
-    NbStackAdd      equ     (NbStack-24)
-
-    .386p
-
-    name    gvmatch
-    .MODEL  FLAT
-
-
-
-;  all the +zlib1222add offsets are due to the addition of fields
-;  in zlib in the deflate_state structure since the asm code was first written
-;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
-;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
-;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
-
-    zlib1222add         equ     8
-
-;  Note : these value are good with a 8 bytes boundary pack structure
-    dep_chain_length    equ     74h+zlib1222add
-    dep_window          equ     30h+zlib1222add
-    dep_strstart        equ     64h+zlib1222add
-    dep_prev_length     equ     70h+zlib1222add
-    dep_nice_match      equ     88h+zlib1222add
-    dep_w_size          equ     24h+zlib1222add
-    dep_prev            equ     38h+zlib1222add
-    dep_w_mask          equ     2ch+zlib1222add
-    dep_good_match      equ     84h+zlib1222add
-    dep_match_start     equ     68h+zlib1222add
-    dep_lookahead       equ     6ch+zlib1222add
-
-
-_TEXT                   segment
-
-IFDEF NOUNDERLINE
-            public  longest_match
-            public  match_init
-ELSE
-            public  _longest_match
-            public  _match_init
-ENDIF
-
-    MAX_MATCH           equ     258
-    MIN_MATCH           equ     3
-    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)
-
-
-
-MAX_MATCH       equ     258
-MIN_MATCH       equ     3
-MIN_LOOKAHEAD   equ     (MAX_MATCH + MIN_MATCH + 1)
-MAX_MATCH_8_     equ     ((MAX_MATCH + 7) AND 0FFF0h)
-
-
-;;; stack frame offsets
-
-chainlenwmask   equ  esp + 0    ; high word: current chain len
-                    ; low word: s->wmask
-window      equ  esp + 4    ; local copy of s->window
-windowbestlen   equ  esp + 8    ; s->window + bestlen
-scanstart   equ  esp + 16   ; first two bytes of string
-scanend     equ  esp + 12   ; last two bytes of string
-scanalign   equ  esp + 20   ; dword-misalignment of string
-nicematch   equ  esp + 24   ; a good enough match size
-bestlen     equ  esp + 28   ; size of best match so far
-scan        equ  esp + 32   ; ptr to string wanting match
-
-LocalVarsSize   equ 36
-;   saved ebx   byte esp + 36
-;   saved edi   byte esp + 40
-;   saved esi   byte esp + 44
-;   saved ebp   byte esp + 48
-;   return address  byte esp + 52
-deflatestate    equ  esp + 56   ; the function arguments
-curmatch    equ  esp + 60
-
-;;; Offsets for fields in the deflate_state structure. These numbers
-;;; are calculated from the definition of deflate_state, with the
-;;; assumption that the compiler will dword-align the fields. (Thus,
-;;; changing the definition of deflate_state could easily cause this
-;;; program to crash horribly, without so much as a warning at
-;;; compile time. Sigh.)
-
-dsWSize     equ 36+zlib1222add
-dsWMask     equ 44+zlib1222add
-dsWindow    equ 48+zlib1222add
-dsPrev      equ 56+zlib1222add
-dsMatchLen  equ 88+zlib1222add
-dsPrevMatch equ 92+zlib1222add
-dsStrStart  equ 100+zlib1222add
-dsMatchStart    equ 104+zlib1222add
-dsLookahead equ 108+zlib1222add
-dsPrevLen   equ 112+zlib1222add
-dsMaxChainLen   equ 116+zlib1222add
-dsGoodMatch equ 132+zlib1222add
-dsNiceMatch equ 136+zlib1222add
-
-
-;;; match686.asm -- Pentium-Pro-optimized version of longest_match()
-;;; Written for zlib 1.1.2
-;;; Copyright (C) 1998 Brian Raiter <breadbox@muppetlabs.com>
-;;; You can look at http://www.muppetlabs.com/~breadbox/software/assembly.html
-;;;
-;;
-;;  This software is provided 'as-is', without any express or implied
-;;  warranty.  In no event will the authors be held liable for any damages
-;;  arising from the use of this software.
-;;
-;;  Permission is granted to anyone to use this software for any purpose,
-;;  including commercial applications, and to alter it and redistribute it
-;;  freely, subject to the following restrictions:
-;;
-;;  1. The origin of this software must not be misrepresented; you must not
-;;     claim that you wrote the original software. If you use this software
-;;     in a product, an acknowledgment in the product documentation would be
-;;     appreciated but is not required.
-;;  2. Altered source versions must be plainly marked as such, and must not be
-;;     misrepresented as being the original software
-;;  3. This notice may not be removed or altered from any source distribution.
-;;
-
-;GLOBAL _longest_match, _match_init
-
-
-;SECTION    .text
-
-;;; uInt longest_match(deflate_state *deflatestate, IPos curmatch)
-
-;_longest_match:
-    IFDEF NOUNDERLINE
-    longest_match       proc near
-    ELSE
-    _longest_match      proc near
-    ENDIF
-.FPO (9, 4, 0, 0, 1, 0)
-
-;;; Save registers that the compiler may be using, and adjust esp to
-;;; make room for our stack frame.
-
-        push    ebp
-        push    edi
-        push    esi
-        push    ebx
-        sub esp, LocalVarsSize
-
-;;; Retrieve the function arguments. ecx will hold cur_match
-;;; throughout the entire function. edx will hold the pointer to the
-;;; deflate_state structure during the function's setup (before
-;;; entering the main loop.
-
-        mov edx, [deflatestate]
-        mov ecx, [curmatch]
-
-;;; uInt wmask = s->w_mask;
-;;; unsigned chain_length = s->max_chain_length;
-;;; if (s->prev_length >= s->good_match) {
-;;;     chain_length >>= 2;
-;;; }
-
-        mov eax, [edx + dsPrevLen]
-        mov ebx, [edx + dsGoodMatch]
-        cmp eax, ebx
-        mov eax, [edx + dsWMask]
-        mov ebx, [edx + dsMaxChainLen]
-        jl  LastMatchGood
-        shr ebx, 2
-LastMatchGood:
-
-;;; chainlen is decremented once beforehand so that the function can
-;;; use the sign flag instead of the zero flag for the exit test.
-;;; It is then shifted into the high word, to make room for the wmask
-;;; value, which it will always accompany.
-
-        dec ebx
-        shl ebx, 16
-        or  ebx, eax
-        mov [chainlenwmask], ebx
-
-;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-        mov eax, [edx + dsNiceMatch]
-        mov ebx, [edx + dsLookahead]
-        cmp ebx, eax
-        jl  LookaheadLess
-        mov ebx, eax
-LookaheadLess:  mov [nicematch], ebx
-
-;;; register Bytef *scan = s->window + s->strstart;
-
-        mov esi, [edx + dsWindow]
-        mov [window], esi
-        mov ebp, [edx + dsStrStart]
-        lea edi, [esi + ebp]
-        mov [scan], edi
-
-;;; Determine how many bytes the scan ptr is off from being
-;;; dword-aligned.
-
-        mov eax, edi
-        neg eax
-        and eax, 3
-        mov [scanalign], eax
-
-;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-;;;     s->strstart - (IPos)MAX_DIST(s) : NIL;
-
-        mov eax, [edx + dsWSize]
-        sub eax, MIN_LOOKAHEAD
-        sub ebp, eax
-        jg  LimitPositive
-        xor ebp, ebp
-LimitPositive:
-
-;;; int best_len = s->prev_length;
-
-        mov eax, [edx + dsPrevLen]
-        mov [bestlen], eax
-
-;;; Store the sum of s->window + best_len in esi locally, and in esi.
-
-        add esi, eax
-        mov [windowbestlen], esi
-
-;;; register ush scan_start = *(ushf*)scan;
-;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
-;;; Posf *prev = s->prev;
-
-        movzx   ebx, word ptr [edi]
-        mov [scanstart], ebx
-        movzx   ebx, word ptr [edi + eax - 1]
-        mov [scanend], ebx
-        mov edi, [edx + dsPrev]
-
-;;; Jump into the main loop.
-
-        mov edx, [chainlenwmask]
-        jmp short LoopEntry
-
-align 4
-
-;;; do {
-;;;     match = s->window + cur_match;
-;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
-;;;         *(ushf*)match != scan_start) continue;
-;;;     [...]
-;;; } while ((cur_match = prev[cur_match & wmask]) > limit
-;;;          && --chain_length != 0);
-;;;
-;;; Here is the inner loop of the function. The function will spend the
-;;; majority of its time in this loop, and majority of that time will
-;;; be spent in the first ten instructions.
-;;;
-;;; Within this loop:
-;;; ebx = scanend
-;;; ecx = curmatch
-;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
-;;; esi = windowbestlen - i.e., (window + bestlen)
-;;; edi = prev
-;;; ebp = limit
-
-LookupLoop:
-        and ecx, edx
-        movzx   ecx, word ptr [edi + ecx*2]
-        cmp ecx, ebp
-        jbe LeaveNow
-        sub edx, 00010000h
-        js  LeaveNow
-LoopEntry:  movzx   eax, word ptr [esi + ecx - 1]
-        cmp eax, ebx
-        jnz LookupLoop
-        mov eax, [window]
-        movzx   eax, word ptr [eax + ecx]
-        cmp eax, [scanstart]
-        jnz LookupLoop
-
-;;; Store the current value of chainlen.
-
-        mov [chainlenwmask], edx
-
-;;; Point edi to the string under scrutiny, and esi to the string we
-;;; are hoping to match it up with. In actuality, esi and edi are
-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
-;;; initialized to -(MAX_MATCH_8 - scanalign).
-
-        mov esi, [window]
-        mov edi, [scan]
-        add esi, ecx
-        mov eax, [scanalign]
-        mov edx, 0fffffef8h; -(MAX_MATCH_8)
-        lea edi, [edi + eax + 0108h] ;MAX_MATCH_8]
-        lea esi, [esi + eax + 0108h] ;MAX_MATCH_8]
-
-;;; Test the strings for equality, 8 bytes at a time. At the end,
-;;; adjust edx so that it is offset to the exact byte that mismatched.
-;;;
-;;; We already know at this point that the first three bytes of the
-;;; strings match each other, and they can be safely passed over before
-;;; starting the compare loop. So what this code does is skip over 0-3
-;;; bytes, as much as necessary in order to dword-align the edi
-;;; pointer. (esi will still be misaligned three times out of four.)
-;;;
-;;; It should be confessed that this loop usually does not represent
-;;; much of the total running time. Replacing it with a more
-;;; straightforward "rep cmpsb" would not drastically degrade
-;;; performance.
-
-LoopCmps:
-        mov eax, [esi + edx]
-        xor eax, [edi + edx]
-        jnz LeaveLoopCmps
-        mov eax, [esi + edx + 4]
-        xor eax, [edi + edx + 4]
-        jnz LeaveLoopCmps4
-        add edx, 8
-        jnz LoopCmps
-        jmp short LenMaximum
-LeaveLoopCmps4: add edx, 4
-LeaveLoopCmps:  test    eax, 0000FFFFh
-        jnz LenLower
-        add edx,  2
-        shr eax, 16
-LenLower:   sub al, 1
-        adc edx, 0
-
-;;; Calculate the length of the match. If it is longer than MAX_MATCH,
-;;; then automatically accept it as the best possible match and leave.
-
-        lea eax, [edi + edx]
-        mov edi, [scan]
-        sub eax, edi
-        cmp eax, MAX_MATCH
-        jge LenMaximum
-
-;;; If the length of the match is not longer than the best match we
-;;; have so far, then forget it and return to the lookup loop.
-
-        mov edx, [deflatestate]
-        mov ebx, [bestlen]
-        cmp eax, ebx
-        jg  LongerMatch
-        mov esi, [windowbestlen]
-        mov edi, [edx + dsPrev]
-        mov ebx, [scanend]
-        mov edx, [chainlenwmask]
-        jmp LookupLoop
-
-;;;         s->match_start = cur_match;
-;;;         best_len = len;
-;;;         if (len >= nice_match) break;
-;;;         scan_end = *(ushf*)(scan+best_len-1);
-
-LongerMatch:    mov ebx, [nicematch]
-        mov [bestlen], eax
-        mov [edx + dsMatchStart], ecx
-        cmp eax, ebx
-        jge LeaveNow
-        mov esi, [window]
-        add esi, eax
-        mov [windowbestlen], esi
-        movzx   ebx, word ptr [edi + eax - 1]
-        mov edi, [edx + dsPrev]
-        mov [scanend], ebx
-        mov edx, [chainlenwmask]
-        jmp LookupLoop
-
-;;; Accept the current string, with the maximum possible length.
-
-LenMaximum: mov edx, [deflatestate]
-        mov dword ptr [bestlen], MAX_MATCH
-        mov [edx + dsMatchStart], ecx
-
-;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-;;; return s->lookahead;
-
-LeaveNow:
-        mov edx, [deflatestate]
-        mov ebx, [bestlen]
-        mov eax, [edx + dsLookahead]
-        cmp ebx, eax
-        jg  LookaheadRet
-        mov eax, ebx
-LookaheadRet:
-
-;;; Restore the stack and return from whence we came.
-
-        add esp, LocalVarsSize
-        pop ebx
-        pop esi
-        pop edi
-        pop ebp
-
-        ret
-; please don't remove this string !
-; Your can freely use match686 in any free or commercial app if you don't remove the string in the binary!
-    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998",0dh,0ah
-
-
-    IFDEF NOUNDERLINE
-    longest_match       endp
-    ELSE
-    _longest_match      endp
-    ENDIF
-
-    IFDEF NOUNDERLINE
-    match_init      proc near
-                    ret
-    match_init      endp
-    ELSE
-    _match_init     proc near
-                    ret
-    _match_init     endp
-    ENDIF
-
-
-_TEXT   ends
-end
diff --git a/src/png/zlib/contrib/masmx86/readme.txt b/src/png/zlib/contrib/masmx86/readme.txt
deleted file mode 100644
index 3f8888679..000000000
--- a/src/png/zlib/contrib/masmx86/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-Summary
--------
-This directory contains ASM implementations of the functions
-longest_match() and inflate_fast().
-
-
-Use instructions
-----------------
-Assemble using MASM, and copy the object files into the zlib source
-directory, then run the appropriate makefile, as suggested below.  You can
-donwload MASM from here:
-
-    http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=7a1c9da0-0510-44a2-b042-7ef370530c64
-
-You can also get objects files here:
-
-    http://www.winimage.com/zLibDll/zlib124_masm_obj.zip
-
-Build instructions
-------------------
-* With Microsoft C and MASM:
-nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" OBJA="match686.obj inffas32.obj"
-
-* With Borland C and TASM:
-make -f win32/Makefile.bor LOCAL_ZLIB="-DASMV -DASMINF" OBJA="match686.obj inffas32.obj" OBJPA="+match686c.obj+match686.obj+inffas32.obj"
-
diff --git a/src/png/zlib/contrib/minizip/Makefile b/src/png/zlib/contrib/minizip/Makefile
deleted file mode 100644
index 84eaad20d..000000000
--- a/src/png/zlib/contrib/minizip/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-CC=cc
-CFLAGS=-O -I../..
-
-UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
-ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a
-
-.c.o:
-	$(CC) -c $(CFLAGS) $*.c
-
-all: miniunz minizip
-
-miniunz:  $(UNZ_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
-
-minizip:  $(ZIP_OBJS)
-	$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
-
-test:	miniunz minizip
-	./minizip test readme.txt
-	./miniunz -l test.zip
-	mv readme.txt readme.old
-	./miniunz test.zip
-
-clean:
-	/bin/rm -f *.o *~ minizip miniunz
diff --git a/src/png/zlib/contrib/minizip/Makefile.am b/src/png/zlib/contrib/minizip/Makefile.am
deleted file mode 100644
index d343011eb..000000000
--- a/src/png/zlib/contrib/minizip/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-lib_LTLIBRARIES = libminizip.la
-
-if COND_DEMOS
-bin_PROGRAMS = miniunzip minizip
-endif
-
-zlib_top_srcdir = $(top_srcdir)/../..
-zlib_top_builddir = $(top_builddir)/../..
-
-AM_CPPFLAGS = -I$(zlib_top_srcdir)
-AM_LDFLAGS = -L$(zlib_top_builddir)
-
-if WIN32
-iowin32_src = iowin32.c
-iowin32_h = iowin32.h
-endif
-
-libminizip_la_SOURCES = \
-	ioapi.c \
-	mztools.c \
-	unzip.c \
-	zip.c \
-	${iowin32_src}
-
-libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
-
-minizip_includedir = $(includedir)/minizip
-minizip_include_HEADERS = \
-	crypt.h \
-	ioapi.h \
-	mztools.h \
-	unzip.h \
-	zip.h \
-	${iowin32_h}
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = minizip.pc
-
-EXTRA_PROGRAMS = miniunzip minizip
-
-miniunzip_SOURCES = miniunz.c
-miniunzip_LDADD = libminizip.la
-
-minizip_SOURCES = minizip.c
-minizip_LDADD = libminizip.la -lz
diff --git a/src/png/zlib/contrib/minizip/MiniZip64_Changes.txt b/src/png/zlib/contrib/minizip/MiniZip64_Changes.txt
deleted file mode 100644
index 13a1bd91a..000000000
--- a/src/png/zlib/contrib/minizip/MiniZip64_Changes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-MiniZip 1.1 was derrived from MiniZip at version 1.01f
-
-Change in 1.0 (Okt 2009)
- - **TODO - Add history**
-
diff --git a/src/png/zlib/contrib/minizip/MiniZip64_info.txt b/src/png/zlib/contrib/minizip/MiniZip64_info.txt
deleted file mode 100644
index 57d715242..000000000
--- a/src/png/zlib/contrib/minizip/MiniZip64_info.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
-
-Introduction
----------------------
-MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
-
-When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0.
-All possible work was done for compatibility.
-
-
-Background
----------------------
-When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64 
-support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ )
-
-That was used as a starting point. And after that ZIP64 support was added to zip.c
-some refactoring and code cleanup was also done.
-
-
-Changed from MiniZip 1.0 to MiniZip 1.1
----------------------------------------
-* Added ZIP64 support for unzip ( by Even Rouault )
-* Added ZIP64 support for zip ( by Mathias Svensson )
-* Reverted some changed that Even Rouault did.
-* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users.
-* Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
-* Added BZIP Compress method for zip
-* Did some refactoring and code cleanup
-
-
-Credits
-
- Gilles Vollant    - Original MiniZip author
- Even Rouault      - ZIP64 unzip Support
- Daniel Borca      - BZip Compression method support in unzip
- Mathias Svensson  - ZIP64 zip support
- Mathias Svensson  - BZip Compression method support in zip
-
- Resources
-
- ZipLayout   http://result42.com/projects/ZipFileLayout
-             Command line tool for Windows that shows the layout and information of the headers in a zip archive.
-             Used when debugging and validating the creation of zip files using MiniZip64
-
-
- ZIP App Note  http://www.pkware.com/documents/casestudies/APPNOTE.TXT
-               Zip File specification
-
-
-Notes.
- * To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined.
-
-License
-----------------------------------------------------------
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-----------------------------------------------------------
-
diff --git a/src/png/zlib/contrib/minizip/configure.ac b/src/png/zlib/contrib/minizip/configure.ac
deleted file mode 100644
index 5b1197097..000000000
--- a/src/png/zlib/contrib/minizip/configure.ac
+++ /dev/null
@@ -1,32 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com])
-AC_CONFIG_SRCDIR([minizip.c])
-AM_INIT_AUTOMAKE([foreign])
-LT_INIT
-
-AC_MSG_CHECKING([whether to build example programs])
-AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs]))
-AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes])
-if test "$enable_demos" = yes
-then
-	AC_MSG_RESULT([yes])
-else
-	AC_MSG_RESULT([no])
-fi
-
-case "${host}" in
-	*-mingw* | mingw*)
-		WIN32="yes"
-		;;
-	*)
-		;;
-esac
-AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
-
-
-AC_SUBST([HAVE_UNISTD_H], [0])
-AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
-AC_CONFIG_FILES([Makefile minizip.pc])
-AC_OUTPUT
diff --git a/src/png/zlib/contrib/minizip/crypt.h b/src/png/zlib/contrib/minizip/crypt.h
deleted file mode 100644
index 1e9e8200b..000000000
--- a/src/png/zlib/contrib/minizip/crypt.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This code is a modified version of crypting code in Infozip distribution
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-
-   This code support the "Traditional PKWARE Encryption".
-
-   The new AES encryption added on Zip format by Winzip (see the page
-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
-   Encryption is not supported.
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
-{
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
-
-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
-{
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-      register int keyshift = (int)((*(pkeys+1)) >> 24);
-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
-{
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != '\0') {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
-#  endif
-
-static int crypthead(const char* passwd,      /* password string */
-                     unsigned char* buf,      /* where to write header */
-                     int bufSize,
-                     unsigned long* pkeys,
-                     const z_crc_t* pcrc_32_tab,
-                     unsigned long crcForCrypting)
-{
-    int n;                       /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
-    static unsigned calls = 0;   /* ensure different random header each time */
-
-    if (bufSize<RAND_HEAD_LEN)
-      return 0;
-
-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
-     * output of rand() to get less predictability, since rand() is
-     * often poorly implemented.
-     */
-    if (++calls == 1)
-    {
-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
-    }
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
-}
-
-#endif
diff --git a/src/png/zlib/contrib/minizip/ioapi.c b/src/png/zlib/contrib/minizip/ioapi.c
deleted file mode 100644
index 7f5c191b2..000000000
--- a/src/png/zlib/contrib/minizip/ioapi.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-*/
-
-#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
-        #define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#if defined(__APPLE__) || defined(IOAPI_NO_64)
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-#include "ioapi.h"
-
-voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
-{
-    if (pfilefunc->zfile_func64.zopen64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
-    else
-    {
-        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
-    }
-}
-
-long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
-{
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
-    else
-    {
-        uLong offsetTruncated = (uLong)offset;
-        if (offsetTruncated != offset)
-            return -1;
-        else
-            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
-    }
-}
-
-ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
-{
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
-    else
-    {
-        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
-        if ((tell_uLong) == MAXU32)
-            return (ZPOS64_T)-1;
-        else
-            return tell_uLong;
-    }
-}
-
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
-{
-    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
-    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
-    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
-    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
-    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
-    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
-    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
-    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
-    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
-    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
-}
-
-
-
-static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
-static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
-static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
-static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
-static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
-
-static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = fopen(filename, mode_fopen);
-    return file;
-}
-
-static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = FOPEN_FUNC((const char*)filename, mode_fopen);
-    return file;
-}
-
-
-static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
-{
-    uLong ret;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
-{
-    uLong ret;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
-{
-    long ret;
-    ret = ftell((FILE *)stream);
-    return ret;
-}
-
-
-static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
-{
-    ZPOS64_T ret;
-    ret = FTELLO_FUNC((FILE *)stream);
-    return ret;
-}
-
-static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
-{
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
-        ret = -1;
-    return ret;
-}
-
-static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
-{
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-
-    if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
-                        ret = -1;
-
-    return ret;
-}
-
-
-static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
-{
-    int ret;
-    ret = fclose((FILE *)stream);
-    return ret;
-}
-
-static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
-{
-    int ret;
-    ret = ferror((FILE *)stream);
-    return ret;
-}
-
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
-{
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
-    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
diff --git a/src/png/zlib/contrib/minizip/ioapi.h b/src/png/zlib/contrib/minizip/ioapi.h
deleted file mode 100644
index 8dcbdb06e..000000000
--- a/src/png/zlib/contrib/minizip/ioapi.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         Changes
-
-    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
-    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
-               More if/def section may be needed to support other platforms
-    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
-                          (but you should use iowin32.c for windows instead)
-
-*/
-
-#ifndef _ZLIBIOAPI64_H
-#define _ZLIBIOAPI64_H
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-
-  // Linux needs this to support file operation on files larger then 4+GB
-  // But might need better if/def to select just the platforms that needs them.
-
-        #ifndef __USE_FILE_OFFSET64
-                #define __USE_FILE_OFFSET64
-        #endif
-        #ifndef __USE_LARGEFILE64
-                #define __USE_LARGEFILE64
-        #endif
-        #ifndef _LARGEFILE64_SOURCE
-                #define _LARGEFILE64_SOURCE
-        #endif
-        #ifndef _FILE_OFFSET_BIT
-                #define _FILE_OFFSET_BIT 64
-        #endif
-
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "zlib.h"
-
-#if defined(USE_FILE32API)
-#define fopen64 fopen
-#define ftello64 ftell
-#define fseeko64 fseek
-#else
-#ifdef __FreeBSD__
-#define fopen64 fopen
-#define ftello64 ftello
-#define fseeko64 fseeko
-#endif
-#ifdef _MSC_VER
- #define fopen64 fopen
- #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
-  #define ftello64 _ftelli64
-  #define fseeko64 _fseeki64
- #else // old MSC
-  #define ftello64 ftell
-  #define fseeko64 fseek
- #endif
-#endif
-#endif
-
-/*
-#ifndef ZPOS64_T
-  #ifdef _WIN32
-                #define ZPOS64_T fpos_t
-  #else
-    #include <stdint.h>
-    #define ZPOS64_T uint64_t
-  #endif
-#endif
-*/
-
-#ifdef HAVE_MINIZIP64_CONF_H
-#include "mz64conf.h"
-#endif
-
-/* a type choosen by DEFINE */
-#ifdef HAVE_64BIT_INT_CUSTOM
-typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
-#else
-#ifdef HAS_STDINT_H
-#include "stdint.h"
-typedef uint64_t ZPOS64_T;
-#else
-
-/* Maximum unsigned 32-bit value used as placeholder for zip64 */
-#define MAXU32 0xffffffff
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef unsigned __int64 ZPOS64_T;
-#else
-typedef unsigned long long int ZPOS64_T;
-#endif
-#endif
-#endif
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
- #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-   #define ZCALLBACK CALLBACK
- #else
-   #define ZCALLBACK
- #endif
-#endif
-
-
-
-
-typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
-typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
-typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-
-
-/* here is the "old" 32 bits structure structure */
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
-
-typedef struct zlib_filefunc64_def_s
-{
-    open64_file_func    zopen64_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell64_file_func    ztell64_file;
-    seek64_file_func    zseek64_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc64_def;
-
-void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-/* now internal definition, only for zip.c and unzip.h */
-typedef struct zlib_filefunc64_32_def_s
-{
-    zlib_filefunc64_def zfile_func64;
-    open_file_func      zopen32_file;
-    tell_file_func      ztell32_file;
-    seek_file_func      zseek32_file;
-} zlib_filefunc64_32_def;
-
-
-#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
-#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
-//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
-//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
-#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
-
-voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
-long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
-ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
-
-void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
-
-#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
-#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
-#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/png/zlib/contrib/minizip/iowin32.c b/src/png/zlib/contrib/minizip/iowin32.c
deleted file mode 100644
index 274f39eb1..000000000
--- a/src/png/zlib/contrib/minizip/iowin32.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/* iowin32.c -- IO base function header for compress/uncompress .zip
-     Version 1.1, February 14h, 2010
-     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-     For more info read MiniZip_info.txt
-
-*/
-
-#include <stdlib.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-#include "iowin32.h"
-
-#ifndef INVALID_HANDLE_VALUE
-#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
-#endif
-
-#ifndef INVALID_SET_FILE_POINTER
-#define INVALID_SET_FILE_POINTER ((DWORD)-1)
-#endif
-
-
-// see Include/shared/winapifamily.h in the Windows Kit
-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
-#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
-#define IOWIN32_USING_WINRT_API 1
-#endif
-#endif
-
-voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
-uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
-long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
-int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
-
-typedef struct
-{
-    HANDLE hf;
-    int error;
-} WIN32FILE_IOWIN;
-
-
-static void win32_translate_open_mode(int mode,
-                                      DWORD* lpdwDesiredAccess,
-                                      DWORD* lpdwCreationDisposition,
-                                      DWORD* lpdwShareMode,
-                                      DWORD* lpdwFlagsAndAttributes)
-{
-    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
-
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-    {
-        *lpdwDesiredAccess = GENERIC_READ;
-        *lpdwCreationDisposition = OPEN_EXISTING;
-        *lpdwShareMode = FILE_SHARE_READ;
-    }
-    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-    {
-        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        *lpdwCreationDisposition = OPEN_EXISTING;
-    }
-    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-    {
-        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        *lpdwCreationDisposition = CREATE_ALWAYS;
-    }
-}
-
-static voidpf win32_build_iowin(HANDLE hFile)
-{
-    voidpf ret=NULL;
-
-    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
-    {
-        WIN32FILE_IOWIN w32fiow;
-        w32fiow.hf = hFile;
-        w32fiow.error = 0;
-        ret = malloc(sizeof(WIN32FILE_IOWIN));
-
-        if (ret==NULL)
-            CloseHandle(hFile);
-        else
-            *((WIN32FILE_IOWIN*)ret) = w32fiow;
-    }
-    return ret;
-}
-
-voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-#ifdef UNICODE
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-    {
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-    }
-#endif
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-    {
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-    }
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL);
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = NULL;
-
-    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
-
-#ifdef IOWIN32_USING_WINRT_API
-#ifdef UNICODE
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-    {
-        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
-        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
-        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
-    }
-#endif
-#else
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
-#endif
-
-    return win32_build_iowin(hFile);
-}
-
-
-uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
-{
-    uLong ret=0;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-
-    if (hFile != NULL)
-    {
-        if (!ReadFile(hFile, buf, size, &ret, NULL))
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-    }
-
-    return ret;
-}
-
-
-uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
-{
-    uLong ret=0;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-
-    if (hFile != NULL)
-    {
-        if (!WriteFile(hFile, buf, size, &ret, NULL))
-        {
-            DWORD dwErr = GetLastError();
-            if (dwErr == ERROR_HANDLE_EOF)
-                dwErr = 0;
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-        }
-    }
-
-    return ret;
-}
-
-static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos,  DWORD dwMoveMethod)
-{
-#ifdef IOWIN32_USING_WINRT_API
-    return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
-#else
-    LONG lHigh = pos.HighPart;
-    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, dwMoveMethod);
-    BOOL fOk = TRUE;
-    if (dwNewPos == 0xFFFFFFFF)
-        if (GetLastError() != NO_ERROR)
-            fOk = FALSE;
-    if ((newPos != NULL) && (fOk))
-    {
-        newPos->LowPart = dwNewPos;
-        newPos->HighPart = lHigh;
-    }
-    return fOk;
-#endif
-}
-
-long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
-{
-    long ret=-1;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile != NULL)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = 0;
-
-        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=(long)pos.LowPart;
-    }
-    return ret;
-}
-
-ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
-{
-    ZPOS64_T ret= (ZPOS64_T)-1;
-    HANDLE hFile = NULL;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
-
-    if (hFile)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = 0;
-
-        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = (ZPOS64_T)-1;
-        }
-        else
-            ret=pos.QuadPart;
-    }
-    return ret;
-}
-
-
-long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
-{
-    DWORD dwMoveMethod=0xFFFFFFFF;
-    HANDLE hFile = NULL;
-
-    long ret=-1;
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        dwMoveMethod = FILE_CURRENT;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        dwMoveMethod = FILE_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        dwMoveMethod = FILE_BEGIN;
-        break;
-    default: return -1;
-    }
-
-    if (hFile != NULL)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = offset;
-        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=0;
-    }
-    return ret;
-}
-
-long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
-{
-    DWORD dwMoveMethod=0xFFFFFFFF;
-    HANDLE hFile = NULL;
-    long ret=-1;
-
-    if (stream!=NULL)
-        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
-
-    switch (origin)
-    {
-        case ZLIB_FILEFUNC_SEEK_CUR :
-            dwMoveMethod = FILE_CURRENT;
-            break;
-        case ZLIB_FILEFUNC_SEEK_END :
-            dwMoveMethod = FILE_END;
-            break;
-        case ZLIB_FILEFUNC_SEEK_SET :
-            dwMoveMethod = FILE_BEGIN;
-            break;
-        default: return -1;
-    }
-
-    if (hFile)
-    {
-        LARGE_INTEGER pos;
-        pos.QuadPart = offset;
-        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
-        {
-            DWORD dwErr = GetLastError();
-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
-            ret = -1;
-        }
-        else
-            ret=0;
-    }
-    return ret;
-}
-
-int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
-{
-    int ret=-1;
-
-    if (stream!=NULL)
-    {
-        HANDLE hFile;
-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-        if (hFile != NULL)
-        {
-            CloseHandle(hFile);
-            ret=0;
-        }
-        free(stream);
-    }
-    return ret;
-}
-
-int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
-{
-    int ret=-1;
-    if (stream!=NULL)
-    {
-        ret = ((WIN32FILE_IOWIN*)stream) -> error;
-    }
-    return ret;
-}
-
-void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen_file = win32_open_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
-    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-
-void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-
-void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
-    pzlib_filefunc_def->zread_file = win32_read_file_func;
-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
-    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
-    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
-    pzlib_filefunc_def->zclose_file = win32_close_file_func;
-    pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
diff --git a/src/png/zlib/contrib/minizip/iowin32.h b/src/png/zlib/contrib/minizip/iowin32.h
deleted file mode 100644
index 0ca0969a7..000000000
--- a/src/png/zlib/contrib/minizip/iowin32.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* iowin32.h -- IO base function header for compress/uncompress .zip
-     Version 1.1, February 14h, 2010
-     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-*/
-
-#include <windows.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/png/zlib/contrib/minizip/make_vms.com b/src/png/zlib/contrib/minizip/make_vms.com
deleted file mode 100644
index 9ac13a98f..000000000
--- a/src/png/zlib/contrib/minizip/make_vms.com
+++ /dev/null
@@ -1,25 +0,0 @@
-$ if f$search("ioapi.h_orig") .eqs. "" then copy ioapi.h ioapi.h_orig
-$ open/write zdef vmsdefs.h
-$ copy sys$input: zdef
-$ deck
-#define unix
-#define fill_zlib_filefunc64_32_def_from_filefunc32 fillzffunc64from
-#define Write_Zip64EndOfCentralDirectoryLocator Write_Zip64EoDLocator
-#define Write_Zip64EndOfCentralDirectoryRecord Write_Zip64EoDRecord
-#define Write_EndOfCentralDirectoryRecord Write_EoDRecord
-$ eod
-$ close zdef
-$ copy vmsdefs.h,ioapi.h_orig ioapi.h
-$ cc/include=[--]/prefix=all ioapi.c
-$ cc/include=[--]/prefix=all miniunz.c
-$ cc/include=[--]/prefix=all unzip.c
-$ cc/include=[--]/prefix=all minizip.c
-$ cc/include=[--]/prefix=all zip.c
-$ link miniunz,unzip,ioapi,[--]libz.olb/lib
-$ link minizip,zip,ioapi,[--]libz.olb/lib
-$ mcr []minizip test minizip_info.txt
-$ mcr []miniunz -l test.zip
-$ rename minizip_info.txt; minizip_info.txt_old
-$ mcr []miniunz test.zip
-$ delete test.zip;*
-$exit
diff --git a/src/png/zlib/contrib/minizip/miniunz.c b/src/png/zlib/contrib/minizip/miniunz.c
deleted file mode 100644
index 3d65401be..000000000
--- a/src/png/zlib/contrib/minizip/miniunz.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
-   miniunz.c
-   Version 1.1, February 14h, 2010
-   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-*/
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-        #ifndef __USE_FILE_OFFSET64
-                #define __USE_FILE_OFFSET64
-        #endif
-        #ifndef __USE_LARGEFILE64
-                #define __USE_LARGEFILE64
-        #endif
-        #ifndef _LARGEFILE64_SOURCE
-                #define _LARGEFILE64_SOURCE
-        #endif
-        #ifndef _FILE_OFFSET_BIT
-                #define _FILE_OFFSET_BIT 64
-        #endif
-#endif
-
-#ifdef __APPLE__
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#ifdef _WIN32
-# include <direct.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <utime.h>
-#endif
-
-
-#include "unzip.h"
-
-#define CASESENSITIVITY (0)
-#define WRITEBUFFERSIZE (8192)
-#define MAXFILENAME (256)
-
-#ifdef _WIN32
-#define USEWIN32IOAPI
-#include "iowin32.h"
-#endif
-/*
-  mini unzip, demo of unzip package
-
-  usage :
-  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]
-
-  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
-    if it exists
-*/
-
-
-/* change_file_date : change the date/time of a file
-    filename : the filename of the file where date/time must be modified
-    dosdate : the new date at the MSDos format (4 bytes)
-    tmu_date : the SAME new date at the tm_unz format */
-void change_file_date(filename,dosdate,tmu_date)
-    const char *filename;
-    uLong dosdate;
-    tm_unz tmu_date;
-{
-#ifdef _WIN32
-  HANDLE hFile;
-  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
-
-  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
-                      0,NULL,OPEN_EXISTING,0,NULL);
-  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
-  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
-  LocalFileTimeToFileTime(&ftLocal,&ftm);
-  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
-  CloseHandle(hFile);
-#else
-#ifdef unix || __APPLE__
-  struct utimbuf ut;
-  struct tm newdate;
-  newdate.tm_sec = tmu_date.tm_sec;
-  newdate.tm_min=tmu_date.tm_min;
-  newdate.tm_hour=tmu_date.tm_hour;
-  newdate.tm_mday=tmu_date.tm_mday;
-  newdate.tm_mon=tmu_date.tm_mon;
-  if (tmu_date.tm_year > 1900)
-      newdate.tm_year=tmu_date.tm_year - 1900;
-  else
-      newdate.tm_year=tmu_date.tm_year ;
-  newdate.tm_isdst=-1;
-
-  ut.actime=ut.modtime=mktime(&newdate);
-  utime(filename,&ut);
-#endif
-#endif
-}
-
-
-/* mymkdir and change_file_date are not 100 % portable
-   As I don't know well Unix, I wait feedback for the unix portion */
-
-int mymkdir(dirname)
-    const char* dirname;
-{
-    int ret=0;
-#ifdef _WIN32
-    ret = _mkdir(dirname);
-#elif unix
-    ret = mkdir (dirname,0775);
-#elif __APPLE__
-    ret = mkdir (dirname,0775);
-#endif
-    return ret;
-}
-
-int makedir (newdir)
-    char *newdir;
-{
-  char *buffer ;
-  char *p;
-  int  len = (int)strlen(newdir);
-
-  if (len <= 0)
-    return 0;
-
-  buffer = (char*)malloc(len+1);
-        if (buffer==NULL)
-        {
-                printf("Error allocating memory\n");
-                return UNZ_INTERNALERROR;
-        }
-  strcpy(buffer,newdir);
-
-  if (buffer[len-1] == '/') {
-    buffer[len-1] = '\0';
-  }
-  if (mymkdir(buffer) == 0)
-    {
-      free(buffer);
-      return 1;
-    }
-
-  p = buffer+1;
-  while (1)
-    {
-      char hold;
-
-      while(*p && *p != '\\' && *p != '/')
-        p++;
-      hold = *p;
-      *p = 0;
-      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
-        {
-          printf("couldn't create directory %s\n",buffer);
-          free(buffer);
-          return 0;
-        }
-      if (hold == 0)
-        break;
-      *p++ = hold;
-    }
-  free(buffer);
-  return 1;
-}
-
-void do_banner()
-{
-    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
-    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
-}
-
-void do_help()
-{
-    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
-           "  -e  Extract without pathname (junk paths)\n" \
-           "  -x  Extract with pathname\n" \
-           "  -v  list files\n" \
-           "  -l  list files\n" \
-           "  -d  directory to extract into\n" \
-           "  -o  overwrite files without prompting\n" \
-           "  -p  extract crypted file using password\n\n");
-}
-
-void Display64BitsSize(ZPOS64_T n, int size_char)
-{
-  /* to avoid compatibility problem , we do here the conversion */
-  char number[21];
-  int offset=19;
-  int pos_string = 19;
-  number[20]=0;
-  for (;;) {
-      number[offset]=(char)((n%10)+'0');
-      if (number[offset] != '0')
-          pos_string=offset;
-      n/=10;
-      if (offset==0)
-          break;
-      offset--;
-  }
-  {
-      int size_display_string = 19-pos_string;
-      while (size_char > size_display_string)
-      {
-          size_char--;
-          printf(" ");
-      }
-  }
-
-  printf("%s",&number[pos_string]);
-}
-
-int do_list(uf)
-    unzFile uf;
-{
-    uLong i;
-    unz_global_info64 gi;
-    int err;
-
-    err = unzGetGlobalInfo64(uf,&gi);
-    if (err!=UNZ_OK)
-        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
-    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
-    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
-    for (i=0;i<gi.number_entry;i++)
-    {
-        char filename_inzip[256];
-        unz_file_info64 file_info;
-        uLong ratio=0;
-        const char *string_method;
-        char charCrypt=' ';
-        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
-        if (err!=UNZ_OK)
-        {
-            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
-            break;
-        }
-        if (file_info.uncompressed_size>0)
-            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
-
-        /* display a '*' if the file is crypted */
-        if ((file_info.flag & 1) != 0)
-            charCrypt='*';
-
-        if (file_info.compression_method==0)
-            string_method="Stored";
-        else
-        if (file_info.compression_method==Z_DEFLATED)
-        {
-            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
-            if (iLevel==0)
-              string_method="Defl:N";
-            else if (iLevel==1)
-              string_method="Defl:X";
-            else if ((iLevel==2) || (iLevel==3))
-              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
-        }
-        else
-        if (file_info.compression_method==Z_BZIP2ED)
-        {
-              string_method="BZip2 ";
-        }
-        else
-            string_method="Unkn. ";
-
-        Display64BitsSize(file_info.uncompressed_size,7);
-        printf("  %6s%c",string_method,charCrypt);
-        Display64BitsSize(file_info.compressed_size,7);
-        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
-                ratio,
-                (uLong)file_info.tmu_date.tm_mon + 1,
-                (uLong)file_info.tmu_date.tm_mday,
-                (uLong)file_info.tmu_date.tm_year % 100,
-                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
-                (uLong)file_info.crc,filename_inzip);
-        if ((i+1)<gi.number_entry)
-        {
-            err = unzGoToNextFile(uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzGoToNextFile\n",err);
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
-    unzFile uf;
-    const int* popt_extract_without_path;
-    int* popt_overwrite;
-    const char* password;
-{
-    char filename_inzip[256];
-    char* filename_withoutpath;
-    char* p;
-    int err=UNZ_OK;
-    FILE *fout=NULL;
-    void* buf;
-    uInt size_buf;
-
-    unz_file_info64 file_info;
-    uLong ratio=0;
-    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
-
-    if (err!=UNZ_OK)
-    {
-        printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
-        return err;
-    }
-
-    size_buf = WRITEBUFFERSIZE;
-    buf = (void*)malloc(size_buf);
-    if (buf==NULL)
-    {
-        printf("Error allocating memory\n");
-        return UNZ_INTERNALERROR;
-    }
-
-    p = filename_withoutpath = filename_inzip;
-    while ((*p) != '\0')
-    {
-        if (((*p)=='/') || ((*p)=='\\'))
-            filename_withoutpath = p+1;
-        p++;
-    }
-
-    if ((*filename_withoutpath)=='\0')
-    {
-        if ((*popt_extract_without_path)==0)
-        {
-            printf("creating directory: %s\n",filename_inzip);
-            mymkdir(filename_inzip);
-        }
-    }
-    else
-    {
-        const char* write_filename;
-        int skip=0;
-
-        if ((*popt_extract_without_path)==0)
-            write_filename = filename_inzip;
-        else
-            write_filename = filename_withoutpath;
-
-        err = unzOpenCurrentFilePassword(uf,password);
-        if (err!=UNZ_OK)
-        {
-            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
-        }
-
-        if (((*popt_overwrite)==0) && (err==UNZ_OK))
-        {
-            char rep=0;
-            FILE* ftestexist;
-            ftestexist = FOPEN_FUNC(write_filename,"rb");
-            if (ftestexist!=NULL)
-            {
-                fclose(ftestexist);
-                do
-                {
-                    char answer[128];
-                    int ret;
-
-                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
-                    ret = scanf("%1s",answer);
-                    if (ret != 1)
-                    {
-                       exit(EXIT_FAILURE);
-                    }
-                    rep = answer[0] ;
-                    if ((rep>='a') && (rep<='z'))
-                        rep -= 0x20;
-                }
-                while ((rep!='Y') && (rep!='N') && (rep!='A'));
-            }
-
-            if (rep == 'N')
-                skip = 1;
-
-            if (rep == 'A')
-                *popt_overwrite=1;
-        }
-
-        if ((skip==0) && (err==UNZ_OK))
-        {
-            fout=FOPEN_FUNC(write_filename,"wb");
-            /* some zipfile don't contain directory alone before file */
-            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
-                                (filename_withoutpath!=(char*)filename_inzip))
-            {
-                char c=*(filename_withoutpath-1);
-                *(filename_withoutpath-1)='\0';
-                makedir(write_filename);
-                *(filename_withoutpath-1)=c;
-                fout=FOPEN_FUNC(write_filename,"wb");
-            }
-
-            if (fout==NULL)
-            {
-                printf("error opening %s\n",write_filename);
-            }
-        }
-
-        if (fout!=NULL)
-        {
-            printf(" extracting: %s\n",write_filename);
-
-            do
-            {
-                err = unzReadCurrentFile(uf,buf,size_buf);
-                if (err<0)
-                {
-                    printf("error %d with zipfile in unzReadCurrentFile\n",err);
-                    break;
-                }
-                if (err>0)
-                    if (fwrite(buf,err,1,fout)!=1)
-                    {
-                        printf("error in writing extracted file\n");
-                        err=UNZ_ERRNO;
-                        break;
-                    }
-            }
-            while (err>0);
-            if (fout)
-                    fclose(fout);
-
-            if (err==0)
-                change_file_date(write_filename,file_info.dosDate,
-                                 file_info.tmu_date);
-        }
-
-        if (err==UNZ_OK)
-        {
-            err = unzCloseCurrentFile (uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzCloseCurrentFile\n",err);
-            }
-        }
-        else
-            unzCloseCurrentFile(uf); /* don't lose the error */
-    }
-
-    free(buf);
-    return err;
-}
-
-
-int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
-    unzFile uf;
-    int opt_extract_without_path;
-    int opt_overwrite;
-    const char* password;
-{
-    uLong i;
-    unz_global_info64 gi;
-    int err;
-    FILE* fout=NULL;
-
-    err = unzGetGlobalInfo64(uf,&gi);
-    if (err!=UNZ_OK)
-        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
-
-    for (i=0;i<gi.number_entry;i++)
-    {
-        if (do_extract_currentfile(uf,&opt_extract_without_path,
-                                      &opt_overwrite,
-                                      password) != UNZ_OK)
-            break;
-
-        if ((i+1)<gi.number_entry)
-        {
-            err = unzGoToNextFile(uf);
-            if (err!=UNZ_OK)
-            {
-                printf("error %d with zipfile in unzGoToNextFile\n",err);
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
-    unzFile uf;
-    const char* filename;
-    int opt_extract_without_path;
-    int opt_overwrite;
-    const char* password;
-{
-    int err = UNZ_OK;
-    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
-    {
-        printf("file %s not found in the zipfile\n",filename);
-        return 2;
-    }
-
-    if (do_extract_currentfile(uf,&opt_extract_without_path,
-                                      &opt_overwrite,
-                                      password) == UNZ_OK)
-        return 0;
-    else
-        return 1;
-}
-
-
-int main(argc,argv)
-    int argc;
-    char *argv[];
-{
-    const char *zipfilename=NULL;
-    const char *filename_to_extract=NULL;
-    const char *password=NULL;
-    char filename_try[MAXFILENAME+16] = "";
-    int i;
-    int ret_value=0;
-    int opt_do_list=0;
-    int opt_do_extract=1;
-    int opt_do_extract_withoutpath=0;
-    int opt_overwrite=0;
-    int opt_extractdir=0;
-    const char *dirname=NULL;
-    unzFile uf=NULL;
-
-    do_banner();
-    if (argc==1)
-    {
-        do_help();
-        return 0;
-    }
-    else
-    {
-        for (i=1;i<argc;i++)
-        {
-            if ((*argv[i])=='-')
-            {
-                const char *p=argv[i]+1;
-
-                while ((*p)!='\0')
-                {
-                    char c=*(p++);;
-                    if ((c=='l') || (c=='L'))
-                        opt_do_list = 1;
-                    if ((c=='v') || (c=='V'))
-                        opt_do_list = 1;
-                    if ((c=='x') || (c=='X'))
-                        opt_do_extract = 1;
-                    if ((c=='e') || (c=='E'))
-                        opt_do_extract = opt_do_extract_withoutpath = 1;
-                    if ((c=='o') || (c=='O'))
-                        opt_overwrite=1;
-                    if ((c=='d') || (c=='D'))
-                    {
-                        opt_extractdir=1;
-                        dirname=argv[i+1];
-                    }
-
-                    if (((c=='p') || (c=='P')) && (i+1<argc))
-                    {
-                        password=argv[i+1];
-                        i++;
-                    }
-                }
-            }
-            else
-            {
-                if (zipfilename == NULL)
-                    zipfilename = argv[i];
-                else if ((filename_to_extract==NULL) && (!opt_extractdir))
-                        filename_to_extract = argv[i] ;
-            }
-        }
-    }
-
-    if (zipfilename!=NULL)
-    {
-
-#        ifdef USEWIN32IOAPI
-        zlib_filefunc64_def ffunc;
-#        endif
-
-        strncpy(filename_try, zipfilename,MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
-        filename_try[ MAXFILENAME ] = '\0';
-
-#        ifdef USEWIN32IOAPI
-        fill_win32_filefunc64A(&ffunc);
-        uf = unzOpen2_64(zipfilename,&ffunc);
-#        else
-        uf = unzOpen64(zipfilename);
-#        endif
-        if (uf==NULL)
-        {
-            strcat(filename_try,".zip");
-#            ifdef USEWIN32IOAPI
-            uf = unzOpen2_64(filename_try,&ffunc);
-#            else
-            uf = unzOpen64(filename_try);
-#            endif
-        }
-    }
-
-    if (uf==NULL)
-    {
-        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
-        return 1;
-    }
-    printf("%s opened\n",filename_try);
-
-    if (opt_do_list==1)
-        ret_value = do_list(uf);
-    else if (opt_do_extract==1)
-    {
-#ifdef _WIN32
-        if (opt_extractdir && _chdir(dirname))
-#else
-        if (opt_extractdir && chdir(dirname))
-#endif
-        {
-          printf("Error changing into %s, aborting\n", dirname);
-          exit(-1);
-        }
-
-        if (filename_to_extract == NULL)
-            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
-        else
-            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
-    }
-
-    unzClose(uf);
-
-    return ret_value;
-}
diff --git a/src/png/zlib/contrib/minizip/miniunzip.1 b/src/png/zlib/contrib/minizip/miniunzip.1
deleted file mode 100644
index 111ac6919..000000000
--- a/src/png/zlib/contrib/minizip/miniunzip.1
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.TH miniunzip 1 "Nov 7, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-miniunzip - uncompress and examine ZIP archives
-.SH SYNOPSIS
-.B miniunzip
-.RI [ -exvlo ]
-zipfile [ files_to_extract ] [-d tempdir]
-.SH DESCRIPTION
-.B minizip
-is a simple tool which allows the extraction of compressed file
-archives in the ZIP format used by the MS-DOS utility PKZIP.  It was
-written as a demonstration of the
-.IR zlib (3)
-library and therefore lack many of the features of the
-.IR unzip (1)
-program.
-.SH OPTIONS
-A number of options are supported.  With the exception of
-.BI \-d\  tempdir
-these must be supplied before any
-other arguments and are:
-.TP
-.BI \-l\ ,\ \-\-v
-List the files in the archive without extracting them.
-.TP
-.B \-o
-Overwrite files without prompting for confirmation.
-.TP
-.B \-x
-Extract files (default).
-.PP
-The
-.I zipfile
-argument is the name of the archive to process. The next argument can be used
-to specify a single file to extract from the archive.
-
-Lastly, the following option can be specified at the end of the command-line:
-.TP
-.BI \-d\  tempdir
-Extract the archive in the directory
-.I tempdir
-rather than the current directory.
-.SH SEE ALSO
-.BR minizip (1),
-.BR zlib (3),
-.BR unzip (1).
-.SH AUTHOR
-This program was written by Gilles Vollant.  This manual page was
-written by Mark Brown <broonie@sirena.org.uk>. The -d tempdir option
-was added by Dirk Eddelbuettel <edd@debian.org>.
diff --git a/src/png/zlib/contrib/minizip/minizip.1 b/src/png/zlib/contrib/minizip/minizip.1
deleted file mode 100644
index 1154484c1..000000000
--- a/src/png/zlib/contrib/minizip/minizip.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.TH minizip 1 "May 2, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-minizip - create ZIP archives
-.SH SYNOPSIS
-.B minizip
-.RI [ -o ]
-zipfile [ " files" ... ]
-.SH DESCRIPTION
-.B minizip
-is a simple tool which allows the creation of compressed file archives
-in the ZIP format used by the MS-DOS utility PKZIP.  It was written as
-a demonstration of the
-.IR zlib (3)
-library and therefore lack many of the features of the
-.IR zip (1)
-program.
-.SH OPTIONS
-The first argument supplied is the name of the ZIP archive to create or
-.RI -o
-in which case it is ignored and the second argument treated as the
-name of the ZIP file.  If the ZIP file already exists it will be
-overwritten.
-.PP
-Subsequent arguments specify a list of files to place in the ZIP
-archive.  If none are specified then an empty archive will be created.
-.SH SEE ALSO
-.BR miniunzip (1),
-.BR zlib (3),
-.BR zip (1).
-.SH AUTHOR
-This program was written by Gilles Vollant.  This manual page was
-written by Mark Brown <broonie@sirena.org.uk>.
-
diff --git a/src/png/zlib/contrib/minizip/minizip.c b/src/png/zlib/contrib/minizip/minizip.c
deleted file mode 100644
index 4288962ec..000000000
--- a/src/png/zlib/contrib/minizip/minizip.c
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
-   minizip.c
-   Version 1.1, February 14h, 2010
-   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-*/
-
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-        #ifndef __USE_FILE_OFFSET64
-                #define __USE_FILE_OFFSET64
-        #endif
-        #ifndef __USE_LARGEFILE64
-                #define __USE_LARGEFILE64
-        #endif
-        #ifndef _LARGEFILE64_SOURCE
-                #define _LARGEFILE64_SOURCE
-        #endif
-        #ifndef _FILE_OFFSET_BIT
-                #define _FILE_OFFSET_BIT 64
-        #endif
-#endif
-
-#ifdef __APPLE__
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#ifdef _WIN32
-# include <direct.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <utime.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-#endif
-
-#include "zip.h"
-
-#ifdef _WIN32
-        #define USEWIN32IOAPI
-        #include "iowin32.h"
-#endif
-
-
-
-#define WRITEBUFFERSIZE (16384)
-#define MAXFILENAME (256)
-
-#ifdef _WIN32
-uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
-    tm_zip *tmzip;             /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-  int ret = 0;
-  {
-      FILETIME ftLocal;
-      HANDLE hFind;
-      WIN32_FIND_DATAA ff32;
-
-      hFind = FindFirstFileA(f,&ff32);
-      if (hFind != INVALID_HANDLE_VALUE)
-      {
-        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
-        FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
-        FindClose(hFind);
-        ret = 1;
-      }
-  }
-  return ret;
-}
-#else
-#ifdef unix || __APPLE__
-uLong filetime(f, tmzip, dt)
-    char *f;               /* name of file to get info on */
-    tm_zip *tmzip;         /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-  int ret=0;
-  struct stat s;        /* results of stat() */
-  struct tm* filedate;
-  time_t tm_t=0;
-
-  if (strcmp(f,"-")!=0)
-  {
-    char name[MAXFILENAME+1];
-    int len = strlen(f);
-    if (len > MAXFILENAME)
-      len = MAXFILENAME;
-
-    strncpy(name, f,MAXFILENAME-1);
-    /* strncpy doesnt append the trailing NULL, of the string is too long. */
-    name[ MAXFILENAME ] = '\0';
-
-    if (name[len - 1] == '/')
-      name[len - 1] = '\0';
-    /* not all systems allow stat'ing a file with / appended */
-    if (stat(name,&s)==0)
-    {
-      tm_t = s.st_mtime;
-      ret = 1;
-    }
-  }
-  filedate = localtime(&tm_t);
-
-  tmzip->tm_sec  = filedate->tm_sec;
-  tmzip->tm_min  = filedate->tm_min;
-  tmzip->tm_hour = filedate->tm_hour;
-  tmzip->tm_mday = filedate->tm_mday;
-  tmzip->tm_mon  = filedate->tm_mon ;
-  tmzip->tm_year = filedate->tm_year;
-
-  return ret;
-}
-#else
-uLong filetime(f, tmzip, dt)
-    char *f;                /* name of file to get info on */
-    tm_zip *tmzip;             /* return value: access, modific. and creation times */
-    uLong *dt;             /* dostime */
-{
-    return 0;
-}
-#endif
-#endif
-
-
-
-
-int check_exist_file(filename)
-    const char* filename;
-{
-    FILE* ftestexist;
-    int ret = 1;
-    ftestexist = FOPEN_FUNC(filename,"rb");
-    if (ftestexist==NULL)
-        ret = 0;
-    else
-        fclose(ftestexist);
-    return ret;
-}
-
-void do_banner()
-{
-    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
-    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
-}
-
-void do_help()
-{
-    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
-           "  -o  Overwrite existing file.zip\n" \
-           "  -a  Append to existing file.zip\n" \
-           "  -0  Store only\n" \
-           "  -1  Compress faster\n" \
-           "  -9  Compress better\n\n" \
-           "  -j  exclude path. store only the file name.\n\n");
-}
-
-/* calculate the CRC32 of a file,
-   because to encrypt a file, we need known the CRC32 of the file before */
-int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
-{
-   unsigned long calculate_crc=0;
-   int err=ZIP_OK;
-   FILE * fin = FOPEN_FUNC(filenameinzip,"rb");
-
-   unsigned long size_read = 0;
-   unsigned long total_read = 0;
-   if (fin==NULL)
-   {
-       err = ZIP_ERRNO;
-   }
-
-    if (err == ZIP_OK)
-        do
-        {
-            err = ZIP_OK;
-            size_read = (int)fread(buf,1,size_buf,fin);
-            if (size_read < size_buf)
-                if (feof(fin)==0)
-            {
-                printf("error in reading %s\n",filenameinzip);
-                err = ZIP_ERRNO;
-            }
-
-            if (size_read>0)
-                calculate_crc = crc32(calculate_crc,buf,size_read);
-            total_read += size_read;
-
-        } while ((err == ZIP_OK) && (size_read>0));
-
-    if (fin)
-        fclose(fin);
-
-    *result_crc=calculate_crc;
-    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
-    return err;
-}
-
-int isLargeFile(const char* filename)
-{
-  int largeFile = 0;
-  ZPOS64_T pos = 0;
-  FILE* pFile = FOPEN_FUNC(filename, "rb");
-
-  if(pFile != NULL)
-  {
-    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
-    pos = FTELLO_FUNC(pFile);
-
-                printf("File : %s is %lld bytes\n", filename, pos);
-
-    if(pos >= 0xffffffff)
-     largeFile = 1;
-
-                fclose(pFile);
-  }
-
- return largeFile;
-}
-
-int main(argc,argv)
-    int argc;
-    char *argv[];
-{
-    int i;
-    int opt_overwrite=0;
-    int opt_compress_level=Z_DEFAULT_COMPRESSION;
-    int opt_exclude_path=0;
-    int zipfilenamearg = 0;
-    char filename_try[MAXFILENAME+16];
-    int zipok;
-    int err=0;
-    int size_buf=0;
-    void* buf=NULL;
-    const char* password=NULL;
-
-
-    do_banner();
-    if (argc==1)
-    {
-        do_help();
-        return 0;
-    }
-    else
-    {
-        for (i=1;i<argc;i++)
-        {
-            if ((*argv[i])=='-')
-            {
-                const char *p=argv[i]+1;
-
-                while ((*p)!='\0')
-                {
-                    char c=*(p++);;
-                    if ((c=='o') || (c=='O'))
-                        opt_overwrite = 1;
-                    if ((c=='a') || (c=='A'))
-                        opt_overwrite = 2;
-                    if ((c>='0') && (c<='9'))
-                        opt_compress_level = c-'0';
-                    if ((c=='j') || (c=='J'))
-                        opt_exclude_path = 1;
-
-                    if (((c=='p') || (c=='P')) && (i+1<argc))
-                    {
-                        password=argv[i+1];
-                        i++;
-                    }
-                }
-            }
-            else
-            {
-                if (zipfilenamearg == 0)
-                {
-                    zipfilenamearg = i ;
-                }
-            }
-        }
-    }
-
-    size_buf = WRITEBUFFERSIZE;
-    buf = (void*)malloc(size_buf);
-    if (buf==NULL)
-    {
-        printf("Error allocating memory\n");
-        return ZIP_INTERNALERROR;
-    }
-
-    if (zipfilenamearg==0)
-    {
-        zipok=0;
-    }
-    else
-    {
-        int i,len;
-        int dot_found=0;
-
-        zipok = 1 ;
-        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
-        /* strncpy doesnt append the trailing NULL, of the string is too long. */
-        filename_try[ MAXFILENAME ] = '\0';
-
-        len=(int)strlen(filename_try);
-        for (i=0;i<len;i++)
-            if (filename_try[i]=='.')
-                dot_found=1;
-
-        if (dot_found==0)
-            strcat(filename_try,".zip");
-
-        if (opt_overwrite==2)
-        {
-            /* if the file don't exist, we not append file */
-            if (check_exist_file(filename_try)==0)
-                opt_overwrite=1;
-        }
-        else
-        if (opt_overwrite==0)
-            if (check_exist_file(filename_try)!=0)
-            {
-                char rep=0;
-                do
-                {
-                    char answer[128];
-                    int ret;
-                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
-                    ret = scanf("%1s",answer);
-                    if (ret != 1)
-                    {
-                       exit(EXIT_FAILURE);
-                    }
-                    rep = answer[0] ;
-                    if ((rep>='a') && (rep<='z'))
-                        rep -= 0x20;
-                }
-                while ((rep!='Y') && (rep!='N') && (rep!='A'));
-                if (rep=='N')
-                    zipok = 0;
-                if (rep=='A')
-                    opt_overwrite = 2;
-            }
-    }
-
-    if (zipok==1)
-    {
-        zipFile zf;
-        int errclose;
-#        ifdef USEWIN32IOAPI
-        zlib_filefunc64_def ffunc;
-        fill_win32_filefunc64A(&ffunc);
-        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
-#        else
-        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
-#        endif
-
-        if (zf == NULL)
-        {
-            printf("error opening %s\n",filename_try);
-            err= ZIP_ERRNO;
-        }
-        else
-            printf("creating %s\n",filename_try);
-
-        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
-        {
-            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
-                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
-                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
-                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
-                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
-                  (strlen(argv[i]) == 2)))
-            {
-                FILE * fin;
-                int size_read;
-                const char* filenameinzip = argv[i];
-                const char *savefilenameinzip;
-                zip_fileinfo zi;
-                unsigned long crcFile=0;
-                int zip64 = 0;
-
-                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
-                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
-                zi.dosDate = 0;
-                zi.internal_fa = 0;
-                zi.external_fa = 0;
-                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
-
-/*
-                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
-                                 NULL,0,NULL,0,NULL / * comment * /,
-                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
-                                 opt_compress_level);
-*/
-                if ((password != NULL) && (err==ZIP_OK))
-                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
-
-                zip64 = isLargeFile(filenameinzip);
-
-                                                         /* The path name saved, should not include a leading slash. */
-               /*if it did, windows/xp and dynazip couldn't read the zip file. */
-                 savefilenameinzip = filenameinzip;
-                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
-                 {
-                     savefilenameinzip++;
-                 }
-
-                 /*should the zip file contain any path at all?*/
-                 if( opt_exclude_path )
-                 {
-                     const char *tmpptr;
-                     const char *lastslash = 0;
-                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
-                     {
-                         if( *tmpptr == '\\' || *tmpptr == '/')
-                         {
-                             lastslash = tmpptr;
-                         }
-                     }
-                     if( lastslash != NULL )
-                     {
-                         savefilenameinzip = lastslash+1; // base filename follows last slash.
-                     }
-                 }
-
-                 /**/
-                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
-                                 NULL,0,NULL,0,NULL /* comment*/,
-                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
-                                 opt_compress_level,0,
-                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 password,crcFile, zip64);
-
-                if (err != ZIP_OK)
-                    printf("error in opening %s in zipfile\n",filenameinzip);
-                else
-                {
-                    fin = FOPEN_FUNC(filenameinzip,"rb");
-                    if (fin==NULL)
-                    {
-                        err=ZIP_ERRNO;
-                        printf("error in opening %s for reading\n",filenameinzip);
-                    }
-                }
-
-                if (err == ZIP_OK)
-                    do
-                    {
-                        err = ZIP_OK;
-                        size_read = (int)fread(buf,1,size_buf,fin);
-                        if (size_read < size_buf)
-                            if (feof(fin)==0)
-                        {
-                            printf("error in reading %s\n",filenameinzip);
-                            err = ZIP_ERRNO;
-                        }
-
-                        if (size_read>0)
-                        {
-                            err = zipWriteInFileInZip (zf,buf,size_read);
-                            if (err<0)
-                            {
-                                printf("error in writing %s in the zipfile\n",
-                                                 filenameinzip);
-                            }
-
-                        }
-                    } while ((err == ZIP_OK) && (size_read>0));
-
-                if (fin)
-                    fclose(fin);
-
-                if (err<0)
-                    err=ZIP_ERRNO;
-                else
-                {
-                    err = zipCloseFileInZip(zf);
-                    if (err!=ZIP_OK)
-                        printf("error in closing %s in the zipfile\n",
-                                    filenameinzip);
-                }
-            }
-        }
-        errclose = zipClose(zf,NULL);
-        if (errclose != ZIP_OK)
-            printf("error in closing %s\n",filename_try);
-    }
-    else
-    {
-       do_help();
-    }
-
-    free(buf);
-    return 0;
-}
diff --git a/src/png/zlib/contrib/minizip/minizip.pc.in b/src/png/zlib/contrib/minizip/minizip.pc.in
deleted file mode 100644
index 69b5b7fdc..000000000
--- a/src/png/zlib/contrib/minizip/minizip.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/minizip
-
-Name: minizip
-Description: Minizip zip file manipulation library
-Requires:
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lminizip
-Libs.private: -lz
-Cflags: -I${includedir}
diff --git a/src/png/zlib/contrib/minizip/mztools.c b/src/png/zlib/contrib/minizip/mztools.c
deleted file mode 100644
index 96891c2e0..000000000
--- a/src/png/zlib/contrib/minizip/mztools.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-/* Code */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "unzip.h"
-
-#define READ_8(adr)  ((unsigned char)*(adr))
-#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
-#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
-
-#define WRITE_8(buff, n) do { \
-  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
-} while(0)
-#define WRITE_16(buff, n) do { \
-  WRITE_8((unsigned char*)(buff), n); \
-  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
-} while(0)
-#define WRITE_32(buff, n) do { \
-  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
-  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
-} while(0)
-
-extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
-const char* file;
-const char* fileOut;
-const char* fileOutTmp;
-uLong* nRecovered;
-uLong* bytesRecovered;
-{
-  int err = Z_OK;
-  FILE* fpZip = fopen(file, "rb");
-  FILE* fpOut = fopen(fileOut, "wb");
-  FILE* fpOutCD = fopen(fileOutTmp, "wb");
-  if (fpZip != NULL &&  fpOut != NULL) {
-    int entries = 0;
-    uLong totalBytes = 0;
-    char header[30];
-    char filename[1024];
-    char extra[1024];
-    int offset = 0;
-    int offsetCD = 0;
-    while ( fread(header, 1, 30, fpZip) == 30 ) {
-      int currentOffset = offset;
-
-      /* File entry */
-      if (READ_32(header) == 0x04034b50) {
-        unsigned int version = READ_16(header + 4);
-        unsigned int gpflag = READ_16(header + 6);
-        unsigned int method = READ_16(header + 8);
-        unsigned int filetime = READ_16(header + 10);
-        unsigned int filedate = READ_16(header + 12);
-        unsigned int crc = READ_32(header + 14); /* crc */
-        unsigned int cpsize = READ_32(header + 18); /* compressed size */
-        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
-        unsigned int fnsize = READ_16(header + 26); /* file name length */
-        unsigned int extsize = READ_16(header + 28); /* extra field length */
-        filename[0] = extra[0] = '\0';
-
-        /* Header */
-        if (fwrite(header, 1, 30, fpOut) == 30) {
-          offset += 30;
-        } else {
-          err = Z_ERRNO;
-          break;
-        }
-
-        /* Filename */
-        if (fnsize > 0) {
-          if (fnsize < sizeof(filename)) {
-            if (fread(filename, 1, fnsize, fpZip) == fnsize) {
-                if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
-                offset += fnsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            } else {
-              err = Z_ERRNO;
-              break;
-            }
-          } else {
-            err = Z_ERRNO;
-            break;
-          }
-        } else {
-          err = Z_STREAM_ERROR;
-          break;
-        }
-
-        /* Extra field */
-        if (extsize > 0) {
-          if (extsize < sizeof(extra)) {
-            if (fread(extra, 1, extsize, fpZip) == extsize) {
-              if (fwrite(extra, 1, extsize, fpOut) == extsize) {
-                offset += extsize;
-                } else {
-                err = Z_ERRNO;
-                break;
-              }
-            } else {
-              err = Z_ERRNO;
-              break;
-            }
-          } else {
-            err = Z_ERRNO;
-            break;
-          }
-        }
-
-        /* Data */
-        {
-          int dataSize = cpsize;
-          if (dataSize == 0) {
-            dataSize = uncpsize;
-          }
-          if (dataSize > 0) {
-            char* data = malloc(dataSize);
-            if (data != NULL) {
-              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
-                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
-                  offset += dataSize;
-                  totalBytes += dataSize;
-                } else {
-                  err = Z_ERRNO;
-                }
-              } else {
-                err = Z_ERRNO;
-              }
-              free(data);
-              if (err != Z_OK) {
-                break;
-              }
-            } else {
-              err = Z_MEM_ERROR;
-              break;
-            }
-          }
-        }
-
-        /* Central directory entry */
-        {
-          char header[46];
-          char* comment = "";
-          int comsize = (int) strlen(comment);
-          WRITE_32(header, 0x02014b50);
-          WRITE_16(header + 4, version);
-          WRITE_16(header + 6, version);
-          WRITE_16(header + 8, gpflag);
-          WRITE_16(header + 10, method);
-          WRITE_16(header + 12, filetime);
-          WRITE_16(header + 14, filedate);
-          WRITE_32(header + 16, crc);
-          WRITE_32(header + 20, cpsize);
-          WRITE_32(header + 24, uncpsize);
-          WRITE_16(header + 28, fnsize);
-          WRITE_16(header + 30, extsize);
-          WRITE_16(header + 32, comsize);
-          WRITE_16(header + 34, 0);     /* disk # */
-          WRITE_16(header + 36, 0);     /* int attrb */
-          WRITE_32(header + 38, 0);     /* ext attrb */
-          WRITE_32(header + 42, currentOffset);
-          /* Header */
-          if (fwrite(header, 1, 46, fpOutCD) == 46) {
-            offsetCD += 46;
-
-            /* Filename */
-            if (fnsize > 0) {
-              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
-                offsetCD += fnsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            } else {
-              err = Z_STREAM_ERROR;
-              break;
-            }
-
-            /* Extra field */
-            if (extsize > 0) {
-              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
-                offsetCD += extsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            }
-
-            /* Comment field */
-            if (comsize > 0) {
-              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
-                offsetCD += comsize;
-              } else {
-                err = Z_ERRNO;
-                break;
-              }
-            }
-
-
-          } else {
-            err = Z_ERRNO;
-            break;
-          }
-        }
-
-        /* Success */
-        entries++;
-
-      } else {
-        break;
-      }
-    }
-
-    /* Final central directory  */
-    {
-      int entriesZip = entries;
-      char header[22];
-      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
-      int comsize = (int) strlen(comment);
-      if (entriesZip > 0xffff) {
-        entriesZip = 0xffff;
-      }
-      WRITE_32(header, 0x06054b50);
-      WRITE_16(header + 4, 0);    /* disk # */
-      WRITE_16(header + 6, 0);    /* disk # */
-      WRITE_16(header + 8, entriesZip);   /* hack */
-      WRITE_16(header + 10, entriesZip);  /* hack */
-      WRITE_32(header + 12, offsetCD);    /* size of CD */
-      WRITE_32(header + 16, offset);      /* offset to CD */
-      WRITE_16(header + 20, comsize);     /* comment */
-
-      /* Header */
-      if (fwrite(header, 1, 22, fpOutCD) == 22) {
-
-        /* Comment field */
-        if (comsize > 0) {
-          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
-            err = Z_ERRNO;
-          }
-        }
-
-      } else {
-        err = Z_ERRNO;
-      }
-    }
-
-    /* Final merge (file + central directory) */
-    fclose(fpOutCD);
-    if (err == Z_OK) {
-      fpOutCD = fopen(fileOutTmp, "rb");
-      if (fpOutCD != NULL) {
-        int nRead;
-        char buffer[8192];
-        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
-          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
-            err = Z_ERRNO;
-            break;
-          }
-        }
-        fclose(fpOutCD);
-      }
-    }
-
-    /* Close */
-    fclose(fpZip);
-    fclose(fpOut);
-
-    /* Wipe temporary file */
-    (void)remove(fileOutTmp);
-
-    /* Number of recovered entries */
-    if (err == Z_OK) {
-      if (nRecovered != NULL) {
-        *nRecovered = entries;
-      }
-      if (bytesRecovered != NULL) {
-        *bytesRecovered = totalBytes;
-      }
-    }
-  } else {
-    err = Z_STREAM_ERROR;
-  }
-  return err;
-}
diff --git a/src/png/zlib/contrib/minizip/mztools.h b/src/png/zlib/contrib/minizip/mztools.h
deleted file mode 100644
index a49a426ec..000000000
--- a/src/png/zlib/contrib/minizip/mztools.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-#ifndef _zip_tools_H
-#define _zip_tools_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#include "unzip.h"
-
-/* Repair a ZIP file (missing central directory)
-   file: file to recover
-   fileOut: output file after recovery
-   fileOutTmp: temporary file name used for recovery
-*/
-extern int ZEXPORT unzRepair(const char* file,
-                             const char* fileOut,
-                             const char* fileOutTmp,
-                             uLong* nRecovered,
-                             uLong* bytesRecovered);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/src/png/zlib/contrib/minizip/unzip.c b/src/png/zlib/contrib/minizip/unzip.c
deleted file mode 100644
index bcfb9416e..000000000
--- a/src/png/zlib/contrib/minizip/unzip.c
+++ /dev/null
@@ -1,2125 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-
-  ------------------------------------------------------------------------------------
-  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-  compatibility with older software. The following is from the original crypt.c.
-  Code woven in by Terry Thorsen 1/2003.
-
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-  See the accompanying file LICENSE, version 2000-Apr-09 or later
-  (the contents of which are also included in zip.h) for terms of use.
-  If, for some reason, all these files are missing, the Info-ZIP license
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-
-        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-  The encryption/decryption parts of this source code (as opposed to the
-  non-echoing password parts) were originally written in Europe.  The
-  whole source package can be freely distributed, including from the USA.
-  (Prior to January 2000, re-export from the US was a violation of US law.)
-
-        This encryption code is a direct transcription of the algorithm from
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-  file (appnote.txt) is distributed with the PKZIP program (even in the
-  version without encryption capabilities).
-
-        ------------------------------------------------------------------------------------
-
-        Changes in unzip.c
-
-        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
-  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
-  2007-2008 - Even Rouault - Remove old C style function prototypes
-  2007-2008 - Even Rouault - Add unzip support for ZIP64
-
-        Copyright (C) 2007-2008 Even Rouault
-
-
-        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
-  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
-                                should only read the compressed/uncompressed size from the Zip64 format if
-                                the size from normal header was 0xFFFFFFFF
-  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
-        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
-                                Patch created by Daniel Borca
-
-  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef NOUNCRYPT
-        #define NOUNCRYPT
-#endif
-
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-#    define CASESENSITIVITYDEFAULT_NO
-#  endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-const char unz_copyright[] =
-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info64_internal_s
-{
-    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
-} unz_file_info64_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-#ifdef HAVE_BZIP2
-    bz_stream bstream;          /* bzLib stream structure for bziped */
-#endif
-
-    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
-    ZPOS64_T total_out_64;
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
-    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc64_32_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
-} file_in_zip64_read_info_s;
-
-
-/* unz64_s contain internal information about the zipfile
-*/
-typedef struct
-{
-    zlib_filefunc64_32_def z_filefunc;
-    int is64bitOpenFunction;
-    voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info64 gi;       /* public global information */
-    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
-    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
-    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
-    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
-
-    ZPOS64_T size_central_dir;     /* size of the central directory  */
-    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
-                                   respect to the starting disk number */
-
-    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
-    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
-                                        file if we are decompressing it */
-    int encrypted;
-
-    int isZip64;
-
-#    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const z_crc_t* pcrc_32_tab;
-#    endif
-} unz64_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been successfully opened for reading.
-*/
-
-
-local int unz64local_getByte OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
-{
-    unsigned char c;
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return UNZ_OK;
-    }
-    else
-    {
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unz64local_getShort OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                             voidpf filestream,
-                             uLong *pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unz64local_getLong OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                            voidpf filestream,
-                            uLong *pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unz64local_getLong64 OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream,
-    ZPOS64_T *pX));
-
-
-local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                            voidpf filestream,
-                            ZPOS64_T *pX)
-{
-    ZPOS64_T x ;
-    int i = 0;
-    int err;
-
-    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (ZPOS64_T)i;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<24;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<32;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<40;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<48;
-
-    if (err==UNZ_OK)
-        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x |= ((ZPOS64_T)i)<<56;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
-{
-    for (;;)
-    {
-        char c1=*(fileName1++);
-        char c2=*(fileName2++);
-        if ((c1>='a') && (c1<='z'))
-            c1 -= 0x20;
-        if ((c2>='a') && (c2<='z'))
-            c2 -= 0x20;
-        if (c1=='\0')
-            return ((c2=='\0') ? 0 : -1);
-        if (c2=='\0')
-            return 1;
-        if (c1<c2)
-            return -1;
-        if (c1>c2)
-            return 1;
-    }
-}
-
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
-                                                 const char*  fileName2,
-                                                 int iCaseSensitivity)
-
-{
-    if (iCaseSensitivity==0)
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
-    if (iCaseSensitivity==1)
-        return strcmp(fileName1,fileName2);
-
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
-    unsigned char* buf;
-    ZPOS64_T uSizeFile;
-    ZPOS64_T uBackRead;
-    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=0;
-
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize;
-        ZPOS64_T uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
-}
-
-
-/*
-  Locate the Central directory 64 of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir64 OF((
-    const zlib_filefunc64_32_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
-                                      voidpf filestream)
-{
-    unsigned char* buf;
-    ZPOS64_T uSizeFile;
-    ZPOS64_T uBackRead;
-    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-    ZPOS64_T uPosFound=0;
-    uLong uL;
-                ZPOS64_T relativeOffset;
-
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize;
-        ZPOS64_T uReadPos;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    if (uPosFound == 0)
-        return 0;
-
-    /* Zip64 end of central directory locator */
-    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return 0;
-
-    /* the signature, already checked */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-
-    /* number of the disk with the start of the zip64 end of  central directory */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-    if (uL != 0)
-        return 0;
-
-    /* relative offset of the zip64 end of central directory record */
-    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
-        return 0;
-
-    /* total number of disks */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-    if (uL != 1)
-        return 0;
-
-    /* Goto end of central directory record */
-    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return 0;
-
-     /* the signature */
-    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
-        return 0;
-
-    if (uL != 0x06064b50)
-        return 0;
-
-    return relativeOffset;
-}
-
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
-     "zlib/zlib114.zip".
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-local unzFile unzOpenInternal (const void *path,
-                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
-                               int is64bitOpenFunction)
-{
-    unz64_s us;
-    unz64_s *s;
-    ZPOS64_T central_pos;
-    uLong   uL;
-
-    uLong number_disk;          /* number of the current dist, used for
-                                   spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spaning ZIP, unsupported, always 0*/
-    ZPOS64_T number_entry_CD;      /* total number of entries in
-                                   the central dir
-                                   (same than number_entry on nospan) */
-
-    int err=UNZ_OK;
-
-    if (unz_copyright[0]!=' ')
-        return NULL;
-
-    us.z_filefunc.zseek32_file = NULL;
-    us.z_filefunc.ztell32_file = NULL;
-    if (pzlib_filefunc64_32_def==NULL)
-        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
-    else
-        us.z_filefunc = *pzlib_filefunc64_32_def;
-    us.is64bitOpenFunction = is64bitOpenFunction;
-
-
-
-    us.filestream = ZOPEN64(us.z_filefunc,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
-        return NULL;
-
-    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
-    if (central_pos)
-    {
-        uLong uS;
-        ZPOS64_T uL64;
-
-        us.isZip64 = 1;
-
-        if (ZSEEK64(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-        /* the signature, already checked */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* size of zip64 end of central directory record */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* version made by */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* version needed to extract */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of this disk */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central directory on this disk */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central directory */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        if ((number_entry_CD!=us.gi.number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=UNZ_BADZIPFILE;
-
-        /* size of the central directory */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* offset of start of central directory with respect to the
-          starting disk number */
-        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        us.gi.size_comment = 0;
-    }
-    else
-    {
-        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
-        if (central_pos==0)
-            err=UNZ_ERRNO;
-
-        us.isZip64 = 0;
-
-        if (ZSEEK64(us.z_filefunc, us.filestream,
-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err=UNZ_ERRNO;
-
-        /* the signature, already checked */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of this disk */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-            err=UNZ_ERRNO;
-
-        /* total number of entries in the central dir on this disk */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.gi.number_entry = uL;
-
-        /* total number of entries in the central dir */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        number_entry_CD = uL;
-
-        if ((number_entry_CD!=us.gi.number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=UNZ_BADZIPFILE;
-
-        /* size of the central directory */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.size_central_dir = uL;
-
-        /* offset of start of central directory with respect to the
-            starting disk number */
-        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-            err=UNZ_ERRNO;
-        us.offset_central_dir = uL;
-
-        /* zipfile comment length */
-        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-            err=UNZ_ERRNO;
-    }
-
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
-        (err==UNZ_OK))
-        err=UNZ_BADZIPFILE;
-
-    if (err!=UNZ_OK)
-    {
-        ZCLOSE64(us.z_filefunc, us.filestream);
-        return NULL;
-    }
-
-    us.byte_before_the_zipfile = central_pos -
-                            (us.offset_central_dir+us.size_central_dir);
-    us.central_pos = central_pos;
-    us.pfile_in_zip_read = NULL;
-    us.encrypted = 0;
-
-
-    s=(unz64_s*)ALLOC(sizeof(unz64_s));
-    if( s != NULL)
-    {
-        *s=us;
-        unzGoToFirstFile((unzFile)s);
-    }
-    return (unzFile)s;
-}
-
-
-extern unzFile ZEXPORT unzOpen2 (const char *path,
-                                        zlib_filefunc_def* pzlib_filefunc32_def)
-{
-    if (pzlib_filefunc32_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
-        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
-    }
-    else
-        return unzOpenInternal(path, NULL, 0);
-}
-
-extern unzFile ZEXPORT unzOpen2_64 (const void *path,
-                                     zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    if (pzlib_filefunc_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
-        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
-        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
-        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
-    }
-    else
-        return unzOpenInternal(path, NULL, 1);
-}
-
-extern unzFile ZEXPORT unzOpen (const char *path)
-{
-    return unzOpenInternal(path, NULL, 0);
-}
-
-extern unzFile ZEXPORT unzOpen64 (const void *path)
-{
-    return unzOpenInternal(path, NULL, 1);
-}
-
-/*
-  Close a ZipFile opened with unzOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzCloseCurrentFile before call unzClose.
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (unzFile file)
-{
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    if (s->pfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
-
-    ZCLOSE64(s->z_filefunc, s->filestream);
-    TRYFREE(s);
-    return UNZ_OK;
-}
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
-{
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
-{
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    /* to do : check if number_entry is not truncated */
-    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
-    pglobal_info32->size_comment = s->gi.size_comment;
-    return UNZ_OK;
-}
-/*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
-{
-    ZPOS64_T uDate;
-    uDate = (ZPOS64_T)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info64 *pfile_info,
-                                                  unz_file_info64_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize));
-
-local int unz64local_GetCurrentFileInfoInternal (unzFile file,
-                                                  unz_file_info64 *pfile_info,
-                                                  unz_file_info64_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize)
-{
-    unz64_s* s;
-    unz_file_info64 file_info;
-    unz_file_info64_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-    uLong uL;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (ZSEEK64(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK)
-    {
-        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x02014b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info.compressed_size = uL;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info.uncompressed_size = uL;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-                // relative offset of local header
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-        err=UNZ_ERRNO;
-    file_info_internal.offset_curfile = uL;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename<fileNameBufferSize)
-        {
-            *(szFileName+file_info.size_filename)='\0';
-            uSizeRead = file_info.size_filename;
-        }
-        else
-            uSizeRead = fileNameBufferSize;
-
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-    // Read extrafield
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        ZPOS64_T uSizeRead ;
-        if (file_info.size_file_extra<extraFieldBufferSize)
-            uSizeRead = file_info.size_file_extra;
-        else
-            uSizeRead = extraFieldBufferSize;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-
-        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
-    }
-    else
-        lSeek += file_info.size_file_extra;
-
-
-    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
-    {
-                                uLong acc = 0;
-
-        // since lSeek now points to after the extra field we need to move back
-        lSeek -= file_info.size_file_extra;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        while(acc < file_info.size_file_extra)
-        {
-            uLong headerId;
-                                                uLong dataSize;
-
-            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
-                err=UNZ_ERRNO;
-
-            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
-                err=UNZ_ERRNO;
-
-            /* ZIP64 extra fields */
-            if (headerId == 0x0001)
-            {
-                                                        uLong uL;
-
-                                                                if(file_info.uncompressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-                                                                                        err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.compressed_size == MAXU32)
-                                                                {
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-                                                                                  err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info_internal.offset_curfile == MAXU32)
-                                                                {
-                                                                        /* Relative Header offset */
-                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
-
-                                                                if(file_info.disk_num_start == MAXU32)
-                                                                {
-                                                                        /* Disk Start Number */
-                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
-                                                                                err=UNZ_ERRNO;
-                                                                }
-
-            }
-            else
-            {
-                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
-                    err=UNZ_ERRNO;
-            }
-
-            acc += 2 + 2 + dataSize;
-        }
-    }
-
-    if ((err==UNZ_OK) && (szComment!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_comment<commentBufferSize)
-        {
-            *(szComment+file_info.size_file_comment)='\0';
-            uSizeRead = file_info.size_file_comment;
-        }
-        else
-            uSizeRead = commentBufferSize;
-
-        if (lSeek!=0)
-        {
-            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        }
-
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek+=file_info.size_file_comment - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_comment;
-
-
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
-
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
-
-    return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
-                                          unz_file_info64 * pfile_info,
-                                          char * szFileName, uLong fileNameBufferSize,
-                                          void *extraField, uLong extraFieldBufferSize,
-                                          char* szComment,  uLong commentBufferSize)
-{
-    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-}
-
-extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
-                                          unz_file_info * pfile_info,
-                                          char * szFileName, uLong fileNameBufferSize,
-                                          void *extraField, uLong extraFieldBufferSize,
-                                          char* szComment,  uLong commentBufferSize)
-{
-    int err;
-    unz_file_info64 file_info64;
-    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-    if ((err==UNZ_OK) && (pfile_info != NULL))
-    {
-        pfile_info->version = file_info64.version;
-        pfile_info->version_needed = file_info64.version_needed;
-        pfile_info->flag = file_info64.flag;
-        pfile_info->compression_method = file_info64.compression_method;
-        pfile_info->dosDate = file_info64.dosDate;
-        pfile_info->crc = file_info64.crc;
-
-        pfile_info->size_filename = file_info64.size_filename;
-        pfile_info->size_file_extra = file_info64.size_file_extra;
-        pfile_info->size_file_comment = file_info64.size_file_comment;
-
-        pfile_info->disk_num_start = file_info64.disk_num_start;
-        pfile_info->internal_fa = file_info64.internal_fa;
-        pfile_info->external_fa = file_info64.external_fa;
-
-        pfile_info->tmu_date = file_info64.tmu_date,
-
-
-        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
-        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
-
-    }
-    return err;
-}
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (unzFile file)
-{
-    int err=UNZ_OK;
-    unz64_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (unzFile  file)
-{
-    unz64_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
-{
-    unz64_s* s;
-    int err;
-
-    /* We remember the 'current' position in the file so that we can jump
-     * back there if we fail.
-     */
-    unz_file_info64 cur_file_infoSaved;
-    unz_file_info64_internal cur_file_info_internalSaved;
-    ZPOS64_T num_fileSaved;
-    ZPOS64_T pos_in_central_dirSaved;
-
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    /* Save the current state */
-    num_fileSaved = s->num_file;
-    pos_in_central_dirSaved = s->pos_in_central_dir;
-    cur_file_infoSaved = s->cur_file_info;
-    cur_file_info_internalSaved = s->cur_file_info_internal;
-
-    err = unzGoToFirstFile(file);
-
-    while (err == UNZ_OK)
-    {
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo64(file,NULL,
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
-                                    NULL,0,NULL,0);
-        if (err == UNZ_OK)
-        {
-            if (unzStringFileNameCompare(szCurrentFileName,
-                                            szFileName,iCaseSensitivity)==0)
-                return UNZ_OK;
-            err = unzGoToNextFile(file);
-        }
-    }
-
-    /* We failed, so restore the state of the 'current file' to where we
-     * were.
-     */
-    s->num_file = num_fileSaved ;
-    s->pos_in_central_dir = pos_in_central_dirSaved ;
-    s->cur_file_info = cur_file_infoSaved;
-    s->cur_file_info_internal = cur_file_info_internalSaved;
-    return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
-    ZPOS64_T pos_in_zip_directory;   // offset in file
-    ZPOS64_T num_of_file;            // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
-{
-    unz64_s* s;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
-    file_pos->num_of_file           = s->num_file;
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos)
-{
-    unz64_file_pos file_pos64;
-    int err = unzGetFilePos64(file,&file_pos64);
-    if (err==UNZ_OK)
-    {
-        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
-        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
-    }
-    return err;
-}
-
-extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
-{
-    unz64_s* s;
-    int err;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    /* jump to the right spot */
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
-    s->num_file           = file_pos->num_of_file;
-
-    /* set the current file */
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    /* return results */
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos)
-{
-    unz64_file_pos file_pos64;
-    if (file_pos == NULL)
-        return UNZ_PARAMERROR;
-
-    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
-    file_pos64.num_of_file = file_pos->num_of_file;
-    return unzGoToFilePos64(file,&file_pos64);
-}
-
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
-                                                    ZPOS64_T * poffset_local_extrafield,
-                                                    uInt  * psize_local_extrafield)
-{
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
-
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
-
-    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-
-    if (err==UNZ_OK)
-    {
-        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
-    }
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
-
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
-                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
-
-    *piSizeVar += (uInt)size_filename;
-
-    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
-
-    *piSizeVar += (uInt)size_extra_field;
-
-    return err;
-}
-
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
-                                            int* level, int raw, const char* password)
-{
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
-#    ifndef NOUNCRYPT
-    char source[12];
-#    else
-    if (password != NULL)
-        return UNZ_PARAMERROR;
-#    endif
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_INTERNALERROR;
-
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
-
-    if (pfile_in_zip_read_info->read_buffer==NULL)
-    {
-        TRYFREE(pfile_in_zip_read_info);
-        return UNZ_INTERNALERROR;
-    }
-
-    pfile_in_zip_read_info->stream_initialised=0;
-
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
-
-    if (level!=NULL)
-    {
-        *level = 6;
-        switch (s->cur_file_info.flag & 0x06)
-        {
-          case 6 : *level = 1; break;
-          case 4 : *level = 2; break;
-          case 2 : *level = 9; break;
-        }
-    }
-
-    if ((s->cur_file_info.compression_method!=0) &&
-/* #ifdef HAVE_BZIP2 */
-        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-
-        err=UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->total_out_64=0;
-    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
-    {
-#ifdef HAVE_BZIP2
-      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
-      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
-      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->bstream.state = (voidpf)0;
-
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-#else
-      pfile_in_zip_read_info->raw=1;
-#endif
-    }
-    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
-    {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = 0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
-    }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
-
-
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
-
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-    s->pfile_in_zip_read = pfile_in_zip_read_info;
-                s->encrypted = 0;
-
-#    ifndef NOUNCRYPT
-    if (password != NULL)
-    {
-        int i;
-        s->pcrc_32_tab = get_crc_table();
-        init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK64(s->z_filefunc, s->filestream,
-                  s->pfile_in_zip_read->pos_in_zipfile +
-                     s->pfile_in_zip_read->byte_before_the_zipfile,
-                  SEEK_SET)!=0)
-            return UNZ_INTERNALERROR;
-        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
-            return UNZ_INTERNALERROR;
-
-        for (i = 0; i<12; i++)
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);
-
-        s->pfile_in_zip_read->pos_in_zipfile+=12;
-        s->encrypted=1;
-    }
-#    endif
-
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzOpenCurrentFile (unzFile file)
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
-{
-    return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    s=(unz64_s*)file;
-    if (file==NULL)
-        return 0; //UNZ_PARAMERROR;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-    if (pfile_in_zip_read_info==NULL)
-        return 0; //UNZ_PARAMERROR;
-    return pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile;
-}
-
-/** Addition for GDAL : END */
-
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
-{
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if (pfile_in_zip_read_info->read_buffer == NULL)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
-        return 0;
-
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
-    {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-        {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
-
-
-#            ifndef NOUNCRYPT
-            if(s->encrypted)
-            {
-                uInt i;
-                for(i=0;i<uReadThis;i++)
-                  pfile_in_zip_read_info->read_buffer[i] =
-                      zdecode(s->keys,s->pcrc_32_tab,
-                              pfile_in_zip_read_info->read_buffer[i]);
-            }
-#            endif
-
-
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-        }
-
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
-        {
-            uInt uDoCopy,i ;
-
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : iRead;
-
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-            else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
-            for (i=0;i<uDoCopy;i++)
-                *(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
-        }
-        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
-        {
-#ifdef HAVE_BZIP2
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-
-            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
-            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
-            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
-            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
-            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
-            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
-            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
-            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
-
-            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
-            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
-
-            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
-
-            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
-            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
-            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
-            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
-            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
-            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
-            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
-
-            if (err==BZ_STREAM_END)
-              return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=BZ_OK)
-              break;
-#endif
-        } // end Z_BZIP2ED
-        else
-        {
-            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            ZPOS64_T uOutThis;
-            int flush=Z_SYNC_FLUSH;
-
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-            /*
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-                     pfile_in_zip_read_info->stream.avail_out) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                flush = Z_FINISH;
-            */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
-
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=Z_OK)
-                break;
-        }
-    }
-
-    if (err==Z_OK)
-        return iRead;
-    return err;
-}
-
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (unzFile file)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
-{
-
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return (ZPOS64_T)-1;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return (ZPOS64_T)-1;
-
-    return pfile_in_zip_read_info->total_out_64;
-}
-
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (unzFile file)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
-}
-
-
-
-/*
-Read extra field from the current file (opened by unzOpenCurrentFile)
-This is the local-header version of the extra field (sometimes, there is
-more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
-{
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    uInt read_now;
-    ZPOS64_T size_to_read;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
-                pfile_in_zip_read_info->pos_local_extrafield);
-
-    if (buf==NULL)
-        return (int)size_to_read;
-
-    if (len>size_to_read)
-        read_now = (uInt)size_to_read;
-    else
-        read_now = (uInt)len ;
-
-    if (read_now==0)
-        return 0;
-
-    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              pfile_in_zip_read_info->offset_local_extrafield +
-              pfile_in_zip_read_info->pos_local_extrafield,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              buf,read_now)!=read_now)
-        return UNZ_ERRNO;
-
-    return (int)read_now;
-}
-
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (unzFile file)
-{
-    int err=UNZ_OK;
-
-    unz64_s* s;
-    file_in_zip64_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
-    {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
-
-
-    TRYFREE(pfile_in_zip_read_info->read_buffer);
-    pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
-        inflateEnd(&pfile_in_zip_read_info->stream);
-#ifdef HAVE_BZIP2
-    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
-        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
-#endif
-
-
-    pfile_in_zip_read_info->stream_initialised = 0;
-    TRYFREE(pfile_in_zip_read_info);
-
-    s->pfile_in_zip_read=NULL;
-
-    return err;
-}
-
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
-{
-    unz64_s* s;
-    uLong uReadThis ;
-    if (file==NULL)
-        return (int)UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    uReadThis = uSizeBuf;
-    if (uReadThis>s->gi.size_comment)
-        uReadThis = s->gi.size_comment;
-
-    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (uReadThis>0)
-    {
-      *szComment='\0';
-      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
-        return UNZ_ERRNO;
-    }
-
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-        *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
-}
-
-/* Additions by RX '2004 */
-extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
-{
-    unz64_s* s;
-
-    if (file==NULL)
-          return 0; //UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-    if (!s->current_file_ok)
-      return 0;
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
-      if (s->num_file==s->gi.number_entry)
-         return 0;
-    return s->pos_in_central_dir;
-}
-
-extern uLong ZEXPORT unzGetOffset (unzFile file)
-{
-    ZPOS64_T offset64;
-
-    if (file==NULL)
-          return 0; //UNZ_PARAMERROR;
-    offset64 = unzGetOffset64(file);
-    return (uLong)offset64;
-}
-
-extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
-{
-    unz64_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz64_s*)file;
-
-    s->pos_in_central_dir = pos;
-    s->num_file = s->gi.number_entry;      /* hack */
-    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                              &s->cur_file_info_internal,
-                                              NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
-{
-    return unzSetOffset64(file,pos);
-}
diff --git a/src/png/zlib/contrib/minizip/unzip.h b/src/png/zlib/contrib/minizip/unzip.h
deleted file mode 100644
index 2104e3915..000000000
--- a/src/png/zlib/contrib/minizip/unzip.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications of Unzip for Zip64
-         Copyright (C) 2007-2008 Even Rouault
-
-         Modifications for Zip64 support on both zip and unzip
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         ---------------------------------------------------------------------------------
-
-        Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  ---------------------------------------------------------------------------------
-
-        Changes
-
-        See header of unzip64.c
-
-*/
-
-#ifndef _unz64_H
-#define _unz64_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef  _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info64_s
-{
-    ZPOS64_T number_entry;         /* total number of entries in
-                                     the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info64;
-
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in
-                                     the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info64_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
-    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info64;
-
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-extern unzFile ZEXPORT unzOpen64 OF((const void *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-     the "64" function take a const void* pointer, because the path is just the
-       value passed to the open64_file_func callback.
-     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
-       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
-       does not describe the reality
-*/
-
-
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
-                                    zlib_filefunc64_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unz64Open, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzCloseCurrentFile before call unzClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
-
-extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
-                                        unz_global_info64 *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-typedef struct unz64_file_pos_s
-{
-    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
-    ZPOS64_T num_of_file;            /* # of file */
-} unz64_file_pos;
-
-extern int ZEXPORT unzGetFilePos64(
-    unzFile file,
-    unz64_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos64(
-    unzFile file,
-    const unz64_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
-                         unz_file_info64 *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
-
-/** Addition for GDAL : END */
-
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-
-extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz64_H */
diff --git a/src/png/zlib/contrib/minizip/zip.c b/src/png/zlib/contrib/minizip/zip.c
deleted file mode 100644
index 44e88a9cb..000000000
--- a/src/png/zlib/contrib/minizip/zip.c
+++ /dev/null
@@ -1,2007 +0,0 @@
-/* zip.c -- IO on .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         Changes
-   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
-   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
-   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
-   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
-                                 It is used when recreting zip archive with RAW when deleting items from a zip.
-                                 ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
-   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
-   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include "zlib.h"
-#include "zip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-#ifndef VERSIONMADEBY
-# define VERSIONMADEBY   (0x0) /* platform depedent */
-#endif
-
-#ifndef Z_BUFSIZE
-#define Z_BUFSIZE (64*1024) //(16384)
-#endif
-
-#ifndef Z_MAXFILENAMEINZIP
-#define Z_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-/*
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-*/
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-
-// NOT sure that this work on ALL platform
-#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-#endif
-const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-
-#define SIZEDATA_INDATABLOCK (4096-(4*4))
-
-#define LOCALHEADERMAGIC    (0x04034b50)
-#define CENTRALHEADERMAGIC  (0x02014b50)
-#define ENDHEADERMAGIC      (0x06054b50)
-#define ZIP64ENDHEADERMAGIC      (0x6064b50)
-#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
-
-#define FLAG_LOCALHEADER_OFFSET (0x06)
-#define CRC_LOCALHEADER_OFFSET  (0x0e)
-
-#define SIZECENTRALHEADER (0x2e) /* 46 */
-
-typedef struct linkedlist_datablock_internal_s
-{
-  struct linkedlist_datablock_internal_s* next_datablock;
-  uLong  avail_in_this_block;
-  uLong  filled_in_this_block;
-  uLong  unused; /* for future use and alignment */
-  unsigned char data[SIZEDATA_INDATABLOCK];
-} linkedlist_datablock_internal;
-
-typedef struct linkedlist_data_s
-{
-    linkedlist_datablock_internal* first_block;
-    linkedlist_datablock_internal* last_block;
-} linkedlist_data;
-
-
-typedef struct
-{
-    z_stream stream;            /* zLib stream structure for inflate */
-#ifdef HAVE_BZIP2
-    bz_stream bstream;          /* bzLib stream structure for bziped */
-#endif
-
-    int  stream_initialised;    /* 1 is stream is initialised */
-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
-
-    ZPOS64_T pos_local_header;     /* offset of the local header of the file
-                                     currenty writing */
-    char* central_header;       /* central header data for the current file */
-    uLong size_centralExtra;
-    uLong size_centralheader;   /* size of the central header for cur file */
-    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
-    uLong flag;                 /* flag of the file currently writing */
-
-    int  method;                /* compression method of file currenty wr.*/
-    int  raw;                   /* 1 for directly writing raw data */
-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
-    uLong dosDate;
-    uLong crc32;
-    int  encrypt;
-    int  zip64;               /* Add ZIP64 extened information in the extra field */
-    ZPOS64_T pos_zip64extrainfo;
-    ZPOS64_T totalCompressedData;
-    ZPOS64_T totalUncompressedData;
-#ifndef NOCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const z_crc_t* pcrc_32_tab;
-    int crypt_header_size;
-#endif
-} curfile64_info;
-
-typedef struct
-{
-    zlib_filefunc64_32_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    linkedlist_data central_dir;/* datablock with central dir in construction*/
-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
-    curfile64_info ci;            /* info on the file curretly writing */
-
-    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
-    ZPOS64_T add_position_when_writing_offset;
-    ZPOS64_T number_entry;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    char *globalcomment;
-#endif
-
-} zip64_internal;
-
-
-#ifndef NOCRYPT
-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-#include "crypt.h"
-#endif
-
-local linkedlist_datablock_internal* allocate_new_datablock()
-{
-    linkedlist_datablock_internal* ldi;
-    ldi = (linkedlist_datablock_internal*)
-                 ALLOC(sizeof(linkedlist_datablock_internal));
-    if (ldi!=NULL)
-    {
-        ldi->next_datablock = NULL ;
-        ldi->filled_in_this_block = 0 ;
-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
-    }
-    return ldi;
-}
-
-local void free_datablock(linkedlist_datablock_internal* ldi)
-{
-    while (ldi!=NULL)
-    {
-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
-        TRYFREE(ldi);
-        ldi = ldinext;
-    }
-}
-
-local void init_linkedlist(linkedlist_data* ll)
-{
-    ll->first_block = ll->last_block = NULL;
-}
-
-local void free_linkedlist(linkedlist_data* ll)
-{
-    free_datablock(ll->first_block);
-    ll->first_block = ll->last_block = NULL;
-}
-
-
-local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
-{
-    linkedlist_datablock_internal* ldi;
-    const unsigned char* from_copy;
-
-    if (ll==NULL)
-        return ZIP_INTERNALERROR;
-
-    if (ll->last_block == NULL)
-    {
-        ll->first_block = ll->last_block = allocate_new_datablock();
-        if (ll->first_block == NULL)
-            return ZIP_INTERNALERROR;
-    }
-
-    ldi = ll->last_block;
-    from_copy = (unsigned char*)buf;
-
-    while (len>0)
-    {
-        uInt copy_this;
-        uInt i;
-        unsigned char* to_copy;
-
-        if (ldi->avail_in_this_block==0)
-        {
-            ldi->next_datablock = allocate_new_datablock();
-            if (ldi->next_datablock == NULL)
-                return ZIP_INTERNALERROR;
-            ldi = ldi->next_datablock ;
-            ll->last_block = ldi;
-        }
-
-        if (ldi->avail_in_this_block < len)
-            copy_this = (uInt)ldi->avail_in_this_block;
-        else
-            copy_this = (uInt)len;
-
-        to_copy = &(ldi->data[ldi->filled_in_this_block]);
-
-        for (i=0;i<copy_this;i++)
-            *(to_copy+i)=*(from_copy+i);
-
-        ldi->filled_in_this_block += copy_this;
-        ldi->avail_in_this_block -= copy_this;
-        from_copy += copy_this ;
-        len -= copy_this;
-    }
-    return ZIP_OK;
-}
-
-
-
-/****************************************************************************/
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-/* ===========================================================================
-   Inputs a long in LSB order to the given file
-   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
-*/
-
-local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
-local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
-{
-    unsigned char buf[8];
-    int n;
-    for (n = 0; n < nbByte; n++)
-    {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-    if (x != 0)
-      {     /* data overflow - hack for ZIP64 (X Roche) */
-      for (n = 0; n < nbByte; n++)
-        {
-          buf[n] = 0xff;
-        }
-      }
-
-    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
-        return ZIP_ERRNO;
-    else
-        return ZIP_OK;
-}
-
-local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
-local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
-{
-    unsigned char* buf=(unsigned char*)dest;
-    int n;
-    for (n = 0; n < nbByte; n++) {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-
-    if (x != 0)
-    {     /* data overflow - hack for ZIP64 */
-       for (n = 0; n < nbByte; n++)
-       {
-          buf[n] = 0xff;
-       }
-    }
-}
-
-/****************************************************************************/
-
-
-local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
-{
-    uLong year = (uLong)ptm->tm_year;
-    if (year>=1980)
-        year-=1980;
-    else if (year>=80)
-        year-=80;
-    return
-      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
-        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
-}
-
-
-/****************************************************************************/
-
-local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
-
-local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
-{
-    unsigned char c;
-    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return ZIP_OK;
-    }
-    else
-    {
-        if (ZERROR64(*pzlib_filefunc_def,filestream))
-            return ZIP_ERRNO;
-        else
-            return ZIP_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
-    uLong x ;
-    int i = 0;
-    int err;
-
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==ZIP_OK)
-        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==ZIP_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
-
-
-local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
-{
-  ZPOS64_T x;
-  int i = 0;
-  int err;
-
-  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x = (ZPOS64_T)i;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<8;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<16;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<24;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<32;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<40;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<48;
-
-  if (err==ZIP_OK)
-    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
-  x += ((ZPOS64_T)i)<<56;
-
-  if (err==ZIP_OK)
-    *pX = x;
-  else
-    *pX = 0;
-
-  return err;
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
-  unsigned char* buf;
-  ZPOS64_T uSizeFile;
-  ZPOS64_T uBackRead;
-  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-  ZPOS64_T uPosFound=0;
-
-  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-    return 0;
-
-
-  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-  if (uMaxBack>uSizeFile)
-    uMaxBack = uSizeFile;
-
-  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-  if (buf==NULL)
-    return 0;
-
-  uBackRead = 4;
-  while (uBackRead<uMaxBack)
-  {
-    uLong uReadSize;
-    ZPOS64_T uReadPos ;
-    int i;
-    if (uBackRead+BUFREADCOMMENT>uMaxBack)
-      uBackRead = uMaxBack;
-    else
-      uBackRead+=BUFREADCOMMENT;
-    uReadPos = uSizeFile-uBackRead ;
-
-    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      break;
-
-    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-      break;
-
-    for (i=(int)uReadSize-3; (i--)>0;)
-      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-      {
-        uPosFound = uReadPos+i;
-        break;
-      }
-
-      if (uPosFound!=0)
-        break;
-  }
-  TRYFREE(buf);
-  return uPosFound;
-}
-
-/*
-Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
-the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
-  unsigned char* buf;
-  ZPOS64_T uSizeFile;
-  ZPOS64_T uBackRead;
-  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
-  ZPOS64_T uPosFound=0;
-  uLong uL;
-  ZPOS64_T relativeOffset;
-
-  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-    return 0;
-
-  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
-  if (uMaxBack>uSizeFile)
-    uMaxBack = uSizeFile;
-
-  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-  if (buf==NULL)
-    return 0;
-
-  uBackRead = 4;
-  while (uBackRead<uMaxBack)
-  {
-    uLong uReadSize;
-    ZPOS64_T uReadPos;
-    int i;
-    if (uBackRead+BUFREADCOMMENT>uMaxBack)
-      uBackRead = uMaxBack;
-    else
-      uBackRead+=BUFREADCOMMENT;
-    uReadPos = uSizeFile-uBackRead ;
-
-    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
-    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      break;
-
-    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-      break;
-
-    for (i=(int)uReadSize-3; (i--)>0;)
-    {
-      // Signature "0x07064b50" Zip64 end of central directory locater
-      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
-      {
-        uPosFound = uReadPos+i;
-        break;
-      }
-    }
-
-      if (uPosFound!=0)
-        break;
-  }
-
-  TRYFREE(buf);
-  if (uPosFound == 0)
-    return 0;
-
-  /* Zip64 end of central directory locator */
-  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
-    return 0;
-
-  /* the signature, already checked */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-
-  /* number of the disk with the start of the zip64 end of  central directory */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-  if (uL != 0)
-    return 0;
-
-  /* relative offset of the zip64 end of central directory record */
-  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
-    return 0;
-
-  /* total number of disks */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-  if (uL != 1)
-    return 0;
-
-  /* Goto Zip64 end of central directory record */
-  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
-    return 0;
-
-  /* the signature */
-  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
-    return 0;
-
-  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
-    return 0;
-
-  return relativeOffset;
-}
-
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
-{
-  int err=ZIP_OK;
-  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-
-  ZPOS64_T size_central_dir;     /* size of the central directory  */
-  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
-  ZPOS64_T central_pos;
-  uLong uL;
-
-  uLong number_disk;          /* number of the current dist, used for
-                              spaning ZIP, unsupported, always 0*/
-  uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                              for spaning ZIP, unsupported, always 0*/
-  ZPOS64_T number_entry;
-  ZPOS64_T number_entry_CD;      /* total number of entries in
-                                the central dir
-                                (same than number_entry on nospan) */
-  uLong VersionMadeBy;
-  uLong VersionNeeded;
-  uLong size_comment;
-
-  int hasZIP64Record = 0;
-
-  // check first if we find a ZIP64 record
-  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
-  if(central_pos > 0)
-  {
-    hasZIP64Record = 1;
-  }
-  else if(central_pos == 0)
-  {
-    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
-  }
-
-/* disable to allow appending to empty ZIP archive
-        if (central_pos==0)
-            err=ZIP_ERRNO;
-*/
-
-  if(hasZIP64Record)
-  {
-    ZPOS64_T sizeEndOfCentralDirectory;
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
-      err=ZIP_ERRNO;
-
-    /* the signature, already checked */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* size of zip64 end of central directory record */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* version made by */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* version needed to extract */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of this disk */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central directory on this disk */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central directory */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
-      err=ZIP_BADZIPFILE;
-
-    /* size of the central directory */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* offset of start of central directory with respect to the
-    starting disk number */
-    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    // TODO..
-    // read the comment from the standard central header.
-    size_comment = 0;
-  }
-  else
-  {
-    // Read End of central Directory info
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-      err=ZIP_ERRNO;
-
-    /* the signature, already checked */
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of this disk */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
-      err=ZIP_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    number_entry = 0;
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      number_entry = uL;
-
-    /* total number of entries in the central dir */
-    number_entry_CD = 0;
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      number_entry_CD = uL;
-
-    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
-      err=ZIP_BADZIPFILE;
-
-    /* size of the central directory */
-    size_central_dir = 0;
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      size_central_dir = uL;
-
-    /* offset of start of central directory with respect to the starting disk number */
-    offset_central_dir = 0;
-    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
-      err=ZIP_ERRNO;
-    else
-      offset_central_dir = uL;
-
-
-    /* zipfile global comment length */
-    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
-      err=ZIP_ERRNO;
-  }
-
-  if ((central_pos<offset_central_dir+size_central_dir) &&
-    (err==ZIP_OK))
-    err=ZIP_BADZIPFILE;
-
-  if (err!=ZIP_OK)
-  {
-    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
-    return ZIP_ERRNO;
-  }
-
-  if (size_comment>0)
-  {
-    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
-    if (pziinit->globalcomment)
-    {
-      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
-      pziinit->globalcomment[size_comment]=0;
-    }
-  }
-
-  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
-  pziinit->add_position_when_writing_offset = byte_before_the_zipfile;
-
-  {
-    ZPOS64_T size_central_dir_to_read = size_central_dir;
-    size_t buf_size = SIZEDATA_INDATABLOCK;
-    void* buf_read = (void*)ALLOC(buf_size);
-    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
-      err=ZIP_ERRNO;
-
-    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
-    {
-      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
-      if (read_this > size_central_dir_to_read)
-        read_this = size_central_dir_to_read;
-
-      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
-        err=ZIP_ERRNO;
-
-      if (err==ZIP_OK)
-        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
-
-      size_central_dir_to_read-=read_this;
-    }
-    TRYFREE(buf_read);
-  }
-  pziinit->begin_pos = byte_before_the_zipfile;
-  pziinit->number_entry = number_entry_CD;
-
-  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
-    err=ZIP_ERRNO;
-
-  return err;
-}
-
-
-#endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-
-/************************************************************/
-extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
-{
-    zip64_internal ziinit;
-    zip64_internal* zi;
-    int err=ZIP_OK;
-
-    ziinit.z_filefunc.zseek32_file = NULL;
-    ziinit.z_filefunc.ztell32_file = NULL;
-    if (pzlib_filefunc64_32_def==NULL)
-        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
-    else
-        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
-
-    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
-                  pathname,
-                  (append == APPEND_STATUS_CREATE) ?
-                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
-                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
-
-    if (ziinit.filestream == NULL)
-        return NULL;
-
-    if (append == APPEND_STATUS_CREATEAFTER)
-        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
-
-    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
-    ziinit.in_opened_file_inzip = 0;
-    ziinit.ci.stream_initialised = 0;
-    ziinit.number_entry = 0;
-    ziinit.add_position_when_writing_offset = 0;
-    init_linkedlist(&(ziinit.central_dir));
-
-
-
-    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
-    if (zi==NULL)
-    {
-        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
-        return NULL;
-    }
-
-    /* now we add file in a zipfile */
-#    ifndef NO_ADDFILEINEXISTINGZIP
-    ziinit.globalcomment = NULL;
-    if (append == APPEND_STATUS_ADDINZIP)
-    {
-      // Read and Cache Central Directory Records
-      err = LoadCentralDirectoryRecord(&ziinit);
-    }
-
-    if (globalcomment)
-    {
-      *globalcomment = ziinit.globalcomment;
-    }
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-    if (err != ZIP_OK)
-    {
-#    ifndef NO_ADDFILEINEXISTINGZIP
-        TRYFREE(ziinit.globalcomment);
-#    endif /* !NO_ADDFILEINEXISTINGZIP*/
-        TRYFREE(zi);
-        return NULL;
-    }
-    else
-    {
-        *zi = ziinit;
-        return (zipFile)zi;
-    }
-}
-
-extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
-{
-    if (pzlib_filefunc32_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
-        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
-    }
-    else
-        return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    if (pzlib_filefunc_def != NULL)
-    {
-        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
-        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
-        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
-        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
-        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
-    }
-    else
-        return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-
-
-extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
-{
-    return zipOpen3((const void*)pathname,append,NULL,NULL);
-}
-
-extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
-{
-    return zipOpen3(pathname,append,NULL,NULL);
-}
-
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
-{
-  /* write the local header */
-  int err;
-  uInt size_filename = (uInt)strlen(filename);
-  uInt size_extrafield = size_extrafield_local;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
-
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
-
-  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
-  }
-  if (err==ZIP_OK)
-  {
-    if(zi->ci.zip64)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
-
-  if(zi->ci.zip64)
-  {
-    size_extrafield += 20;
-  }
-
-  if (err==ZIP_OK)
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
-
-  if ((err==ZIP_OK) && (size_filename > 0))
-  {
-    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
-      err = ZIP_ERRNO;
-  }
-
-  if ((err==ZIP_OK) && (size_extrafield_local > 0))
-  {
-    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
-      err = ZIP_ERRNO;
-  }
-
-
-  if ((err==ZIP_OK) && (zi->ci.zip64))
-  {
-      // write the Zip64 extended info
-      short HeaderID = 1;
-      short DataSize = 16;
-      ZPOS64_T CompressedSize = 0;
-      ZPOS64_T UncompressedSize = 0;
-
-      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
-      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
-
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
-
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
-      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
-  }
-
-  return err;
-}
-
-/*
- NOTE.
- When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
- before calling this function it can be done with zipRemoveExtraInfoBlock
-
- It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
- unnecessary allocations.
- */
-extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting,
-                                         uLong versionMadeBy, uLong flagBase, int zip64)
-{
-    zip64_internal* zi;
-    uInt size_filename;
-    uInt size_comment;
-    uInt i;
-    int err = ZIP_OK;
-
-#    ifdef NOCRYPT
-    (crcForCrypting);
-    if (password != NULL)
-        return ZIP_PARAMERROR;
-#    endif
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-
-#ifdef HAVE_BZIP2
-    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
-      return ZIP_PARAMERROR;
-#else
-    if ((method!=0) && (method!=Z_DEFLATED))
-      return ZIP_PARAMERROR;
-#endif
-
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-        if (err != ZIP_OK)
-            return err;
-    }
-
-    if (filename==NULL)
-        filename="-";
-
-    if (comment==NULL)
-        size_comment = 0;
-    else
-        size_comment = (uInt)strlen(comment);
-
-    size_filename = (uInt)strlen(filename);
-
-    if (zipfi == NULL)
-        zi->ci.dosDate = 0;
-    else
-    {
-        if (zipfi->dosDate != 0)
-            zi->ci.dosDate = zipfi->dosDate;
-        else
-          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
-    }
-
-    zi->ci.flag = flagBase;
-    if ((level==8) || (level==9))
-      zi->ci.flag |= 2;
-    if (level==2)
-      zi->ci.flag |= 4;
-    if (level==1)
-      zi->ci.flag |= 6;
-    if (password != NULL)
-      zi->ci.flag |= 1;
-
-    zi->ci.crc32 = 0;
-    zi->ci.method = method;
-    zi->ci.encrypt = 0;
-    zi->ci.stream_initialised = 0;
-    zi->ci.pos_in_buffered_data = 0;
-    zi->ci.raw = raw;
-    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
-
-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
-    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
-
-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
-
-    zi->ci.size_centralExtra = size_extrafield_global;
-    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
-    /* version info */
-    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
-    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
-    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
-    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
-    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
-    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
-
-    if (zipfi==NULL)
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
-    else
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
-
-    if (zipfi==NULL)
-        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
-    else
-        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
-
-    if(zi->ci.pos_local_header >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writing_offset,4);
-
-    for (i=0;i<size_filename;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
-
-    for (i=0;i<size_extrafield_global;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
-              *(((const char*)extrafield_global)+i);
-
-    for (i=0;i<size_comment;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
-              size_extrafield_global+i) = *(comment+i);
-    if (zi->ci.central_header == NULL)
-        return ZIP_INTERNALERROR;
-
-    zi->ci.zip64 = zip64;
-    zi->ci.totalCompressedData = 0;
-    zi->ci.totalUncompressedData = 0;
-    zi->ci.pos_zip64extrainfo = 0;
-
-    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
-
-#ifdef HAVE_BZIP2
-    zi->ci.bstream.avail_in = (uInt)0;
-    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-    zi->ci.bstream.total_in_hi32 = 0;
-    zi->ci.bstream.total_in_lo32 = 0;
-    zi->ci.bstream.total_out_hi32 = 0;
-    zi->ci.bstream.total_out_lo32 = 0;
-#endif
-
-    zi->ci.stream.avail_in = (uInt)0;
-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.stream.next_out = zi->ci.buffered_data;
-    zi->ci.stream.total_in = 0;
-    zi->ci.stream.total_out = 0;
-    zi->ci.stream.data_type = Z_BINARY;
-
-#ifdef HAVE_BZIP2
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-#else
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-#endif
-    {
-        if(zi->ci.method == Z_DEFLATED)
-        {
-          zi->ci.stream.zalloc = (alloc_func)0;
-          zi->ci.stream.zfree = (free_func)0;
-          zi->ci.stream.opaque = (voidpf)0;
-
-          if (windowBits>0)
-              windowBits = -windowBits;
-
-          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
-
-          if (err==Z_OK)
-              zi->ci.stream_initialised = Z_DEFLATED;
-        }
-        else if(zi->ci.method == Z_BZIP2ED)
-        {
-#ifdef HAVE_BZIP2
-            // Init BZip stuff here
-          zi->ci.bstream.bzalloc = 0;
-          zi->ci.bstream.bzfree = 0;
-          zi->ci.bstream.opaque = (voidpf)0;
-
-          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
-          if(err == BZ_OK)
-            zi->ci.stream_initialised = Z_BZIP2ED;
-#endif
-        }
-
-    }
-
-#    ifndef NOCRYPT
-    zi->ci.crypt_header_size = 0;
-    if ((err==Z_OK) && (password != NULL))
-    {
-        unsigned char bufHead[RAND_HEAD_LEN];
-        unsigned int sizeHead;
-        zi->ci.encrypt = 1;
-        zi->ci.pcrc_32_tab = get_crc_table();
-        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
-
-        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
-        zi->ci.crypt_header_size = sizeHead;
-
-        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
-                err = ZIP_ERRNO;
-    }
-#    endif
-
-    if (err==Z_OK)
-        zi->in_opened_file_inzip = 1;
-    return err;
-}
-
-extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting,
-                                         uLong versionMadeBy, uLong flagBase)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 windowBits, memLevel, strategy,
-                                 password, crcForCrypting, versionMadeBy, flagBase, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 windowBits, memLevel, strategy,
-                                 password, crcForCrypting, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                         const void* extrafield_local, uInt size_extrafield_local,
-                                         const void* extrafield_global, uInt size_extrafield_global,
-                                         const char* comment, int method, int level, int raw,
-                                         int windowBits,int memLevel, int strategy,
-                                         const char* password, uLong crcForCrypting, int zip64)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 windowBits, memLevel, strategy,
-                                 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int raw)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int raw, int zip64)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, raw,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void*extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level, int zip64)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, 0,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void*extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level)
-{
-    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
-                                 extrafield_local, size_extrafield_local,
-                                 extrafield_global, size_extrafield_global,
-                                 comment, method, level, 0,
-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-local int zip64FlushWriteBuffer(zip64_internal* zi)
-{
-    int err=ZIP_OK;
-
-    if (zi->ci.encrypt != 0)
-    {
-#ifndef NOCRYPT
-        uInt i;
-        int t;
-        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
-#endif
-    }
-
-    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
-      err = ZIP_ERRNO;
-
-    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
-
-#ifdef HAVE_BZIP2
-    if(zi->ci.method == Z_BZIP2ED)
-    {
-      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
-      zi->ci.bstream.total_in_lo32 = 0;
-      zi->ci.bstream.total_in_hi32 = 0;
-    }
-    else
-#endif
-    {
-      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
-      zi->ci.stream.total_in = 0;
-    }
-
-
-    zi->ci.pos_in_buffered_data = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
-{
-    zip64_internal* zi;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
-
-#ifdef HAVE_BZIP2
-    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
-    {
-      zi->ci.bstream.next_in = (void*)buf;
-      zi->ci.bstream.avail_in = len;
-      err = BZ_RUN_OK;
-
-      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
-      {
-        if (zi->ci.bstream.avail_out == 0)
-        {
-          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-            err = ZIP_ERRNO;
-          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-        }
-
-
-        if(err != BZ_RUN_OK)
-          break;
-
-        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-        {
-          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
-//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
-          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
-
-          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
-        }
-      }
-
-      if(err == BZ_RUN_OK)
-        err = ZIP_OK;
-    }
-    else
-#endif
-    {
-      zi->ci.stream.next_in = (Bytef*)buf;
-      zi->ci.stream.avail_in = len;
-
-      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
-      {
-          if (zi->ci.stream.avail_out == 0)
-          {
-              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-                  err = ZIP_ERRNO;
-              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-              zi->ci.stream.next_out = zi->ci.buffered_data;
-          }
-
-
-          if(err != ZIP_OK)
-              break;
-
-          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-          {
-              uLong uTotalOutBefore = zi->ci.stream.total_out;
-              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
-              if(uTotalOutBefore > zi->ci.stream.total_out)
-              {
-                int bBreak = 0;
-                bBreak++;
-              }
-
-              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-          }
-          else
-          {
-              uInt copy_this,i;
-              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
-                  copy_this = zi->ci.stream.avail_in;
-              else
-                  copy_this = zi->ci.stream.avail_out;
-
-              for (i = 0; i < copy_this; i++)
-                  *(((char*)zi->ci.stream.next_out)+i) =
-                      *(((const char*)zi->ci.stream.next_in)+i);
-              {
-                  zi->ci.stream.avail_in -= copy_this;
-                  zi->ci.stream.avail_out-= copy_this;
-                  zi->ci.stream.next_in+= copy_this;
-                  zi->ci.stream.next_out+= copy_this;
-                  zi->ci.stream.total_in+= copy_this;
-                  zi->ci.stream.total_out+= copy_this;
-                  zi->ci.pos_in_buffered_data += copy_this;
-              }
-          }
-      }// while(...)
-    }
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
-{
-    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
-{
-    zip64_internal* zi;
-    ZPOS64_T compressed_size;
-    uLong invalidValue = 0xffffffff;
-    short datasize = 0;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-    zi->ci.stream.avail_in = 0;
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-                {
-                        while (err==ZIP_OK)
-                        {
-                                uLong uTotalOutBefore;
-                                if (zi->ci.stream.avail_out == 0)
-                                {
-                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-                                                err = ZIP_ERRNO;
-                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-                                        zi->ci.stream.next_out = zi->ci.buffered_data;
-                                }
-                                uTotalOutBefore = zi->ci.stream.total_out;
-                                err=deflate(&zi->ci.stream,  Z_FINISH);
-                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-                        }
-                }
-    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-    {
-#ifdef HAVE_BZIP2
-      err = BZ_FINISH_OK;
-      while (err==BZ_FINISH_OK)
-      {
-        uLong uTotalOutBefore;
-        if (zi->ci.bstream.avail_out == 0)
-        {
-          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
-            err = ZIP_ERRNO;
-          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
-          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
-        }
-        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
-        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
-        if(err == BZ_STREAM_END)
-          err = Z_STREAM_END;
-
-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
-      }
-
-      if(err == BZ_FINISH_OK)
-        err = ZIP_OK;
-#endif
-    }
-
-    if (err==Z_STREAM_END)
-        err=ZIP_OK; /* this is normal */
-
-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
-                {
-        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
-            err = ZIP_ERRNO;
-                }
-
-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-    {
-        int tmp_err = deflateEnd(&zi->ci.stream);
-        if (err == ZIP_OK)
-            err = tmp_err;
-        zi->ci.stream_initialised = 0;
-    }
-#ifdef HAVE_BZIP2
-    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-    {
-      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
-                        if (err==ZIP_OK)
-                                err = tmperr;
-                        zi->ci.stream_initialised = 0;
-    }
-#endif
-
-    if (!zi->ci.raw)
-    {
-        crc32 = (uLong)zi->ci.crc32;
-        uncompressed_size = zi->ci.totalUncompressedData;
-    }
-    compressed_size = zi->ci.totalCompressedData;
-
-#    ifndef NOCRYPT
-    compressed_size += zi->ci.crypt_header_size;
-#    endif
-
-    // update Current Item crc and sizes,
-    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
-    {
-      /*version Made by*/
-      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
-      /*version needed*/
-      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
-
-    }
-
-    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
-
-
-    if(compressed_size >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
-
-    /// set internal file attributes field
-    if (zi->ci.stream.data_type == Z_ASCII)
-        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
-
-    if(uncompressed_size >= 0xffffffff)
-      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
-    else
-      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
-
-    // Add ZIP64 extra info field for uncompressed size
-    if(uncompressed_size >= 0xffffffff)
-      datasize += 8;
-
-    // Add ZIP64 extra info field for compressed size
-    if(compressed_size >= 0xffffffff)
-      datasize += 8;
-
-    // Add ZIP64 extra info field for relative offset to local file header of current file
-    if(zi->ci.pos_local_header >= 0xffffffff)
-      datasize += 8;
-
-    if(datasize > 0)
-    {
-      char* p = NULL;
-
-      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
-      {
-        // we can not write more data to the buffer that we have room for.
-        return ZIP_BADZIPFILE;
-      }
-
-      p = zi->ci.central_header + zi->ci.size_centralheader;
-
-      // Add Extra Information Header for 'ZIP64 information'
-      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
-      p += 2;
-      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
-      p += 2;
-
-      if(uncompressed_size >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, uncompressed_size, 8);
-        p += 8;
-      }
-
-      if(compressed_size >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, compressed_size, 8);
-        p += 8;
-      }
-
-      if(zi->ci.pos_local_header >= 0xffffffff)
-      {
-        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
-        p += 8;
-      }
-
-      // Update how much extra free space we got in the memory buffer
-      // and increase the centralheader size so the new ZIP64 fields are included
-      // ( 4 below is the size of HeaderID and DataSize field )
-      zi->ci.size_centralExtraFree -= datasize + 4;
-      zi->ci.size_centralheader += datasize + 4;
-
-      // Update the extra info size field
-      zi->ci.size_centralExtra += datasize + 4;
-      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
-    }
-
-    if (err==ZIP_OK)
-        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
-
-    free(zi->ci.central_header);
-
-    if (err==ZIP_OK)
-    {
-        // Update the LocalFileHeader with the new values.
-
-        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
-        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-
-        if (err==ZIP_OK)
-            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
-
-        if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
-        {
-          if(zi->ci.pos_zip64extrainfo > 0)
-          {
-            // Update the size in the ZIP64 extended field.
-            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
-              err = ZIP_ERRNO;
-
-            if (err==ZIP_OK) /* compressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
-
-            if (err==ZIP_OK) /* uncompressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
-          }
-          else
-              err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
-        }
-        else
-        {
-          if (err==ZIP_OK) /* compressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
-
-          if (err==ZIP_OK) /* uncompressed size, unknown */
-              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
-        }
-
-        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err = ZIP_ERRNO;
-    }
-
-    zi->number_entry ++;
-    zi->in_opened_file_inzip = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipCloseFileInZip (zipFile file)
-{
-    return zipCloseFileInZipRaw (file,0,0);
-}
-
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
-{
-  int err = ZIP_OK;
-  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
-
-  /*num disks*/
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  /*relative offset*/
-    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
-
-  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
-
-    return err;
-}
-
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
-  int err = ZIP_OK;
-
-  uLong Zip64DataSize = 44;
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
-
-  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
-
-  if (err==ZIP_OK) /* version made by */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
-  if (err==ZIP_OK) /* version needed */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
-  if (err==ZIP_OK) /* number of this disk */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir */
-    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
-  if (err==ZIP_OK) /* size of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
-
-  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
-  {
-    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
-  }
-  return err;
-}
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
-  int err = ZIP_OK;
-
-  /*signature*/
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
-
-  if (err==ZIP_OK) /* number of this disk */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
-  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-  {
-    {
-      if(zi->number_entry >= 0xFFFF)
-        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
-      else
-        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-    }
-  }
-
-  if (err==ZIP_OK) /* total number of entries in the central dir */
-  {
-    if(zi->number_entry >= 0xFFFF)
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-  }
-
-  if (err==ZIP_OK) /* size of the central directory */
-    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
-
-  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
-  {
-    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff)
-    {
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
-    }
-    else
-      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
-  }
-
-   return err;
-}
-
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
-{
-  int err = ZIP_OK;
-  uInt size_global_comment = 0;
-
-  if(global_comment != NULL)
-    size_global_comment = (uInt)strlen(global_comment);
-
-  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
-
-  if (err == ZIP_OK && size_global_comment > 0)
-  {
-    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
-      err = ZIP_ERRNO;
-  }
-  return err;
-}
-
-extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
-{
-    zip64_internal* zi;
-    int err = 0;
-    uLong size_centraldir = 0;
-    ZPOS64_T centraldir_pos_inzip;
-    ZPOS64_T pos;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-
-    zi = (zip64_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-    }
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    if (global_comment==NULL)
-        global_comment = zi->globalcomment;
-#endif
-
-    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
-    if (err==ZIP_OK)
-    {
-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
-        while (ldi!=NULL)
-        {
-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
-            {
-                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
-                    err = ZIP_ERRNO;
-            }
-
-            size_centraldir += ldi->filled_in_this_block;
-            ldi = ldi->next_datablock;
-        }
-    }
-    free_linkedlist(&(zi->central_dir));
-
-    pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
-    if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
-    {
-      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
-      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
-      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
-    }
-
-    if (err==ZIP_OK)
-      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
-    if(err == ZIP_OK)
-      err = Write_GlobalComment(zi, global_comment);
-
-    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
-        if (err == ZIP_OK)
-            err = ZIP_ERRNO;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-    TRYFREE(zi->globalcomment);
-#endif
-    TRYFREE(zi);
-
-    return err;
-}
-
-extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
-{
-  char* p = pData;
-  int size = 0;
-  char* pNewHeader;
-  char* pTmp;
-  short header;
-  short dataSize;
-
-  int retVal = ZIP_OK;
-
-  if(pData == NULL || *dataLen < 4)
-    return ZIP_PARAMERROR;
-
-  pNewHeader = (char*)ALLOC(*dataLen);
-  pTmp = pNewHeader;
-
-  while(p < (pData + *dataLen))
-  {
-    header = *(short*)p;
-    dataSize = *(((short*)p)+1);
-
-    if( header == sHeader ) // Header found.
-    {
-      p += dataSize + 4; // skip it. do not copy to temp buffer
-    }
-    else
-    {
-      // Extra Info block should not be removed, So copy it to the temp buffer.
-      memcpy(pTmp, p, dataSize + 4);
-      p += dataSize + 4;
-      size += dataSize + 4;
-    }
-
-  }
-
-  if(size < *dataLen)
-  {
-    // clean old extra info block.
-    memset(pData,0, *dataLen);
-
-    // copy the new extra info block over the old
-    if(size > 0)
-      memcpy(pData, pNewHeader, size);
-
-    // set the new extra info size
-    *dataLen = size;
-
-    retVal = ZIP_OK;
-  }
-  else
-    retVal = ZIP_ERRNO;
-
-  TRYFREE(pNewHeader);
-
-  return retVal;
-}
diff --git a/src/png/zlib/contrib/minizip/zip.h b/src/png/zlib/contrib/minizip/zip.h
deleted file mode 100644
index 8aaebb623..000000000
--- a/src/png/zlib/contrib/minizip/zip.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/* zip.h -- IO on .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
-         Modifications for Zip64 support
-         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
-         For more info read MiniZip_info.txt
-
-         ---------------------------------------------------------------------------
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-        ---------------------------------------------------------------------------
-
-        Changes
-
-        See header of zip.h
-
-*/
-
-#ifndef _zip12_H
-#define _zip12_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#define HAVE_BZIP2
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagzipFile__ { int unused; } zipFile__;
-typedef zipFile__ *zipFile;
-#else
-typedef voidp zipFile;
-#endif
-
-#define ZIP_OK                          (0)
-#define ZIP_EOF                         (0)
-#define ZIP_ERRNO                       (Z_ERRNO)
-#define ZIP_PARAMERROR                  (-102)
-#define ZIP_BADZIPFILE                  (-103)
-#define ZIP_INTERNALERROR               (-104)
-
-#ifndef DEF_MEM_LEVEL
-#  if MAX_MEM_LEVEL >= 8
-#    define DEF_MEM_LEVEL 8
-#  else
-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#  endif
-#endif
-/* default memLevel */
-
-/* tm_zip contain date/time info */
-typedef struct tm_zip_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_zip;
-
-typedef struct
-{
-    tm_zip      tmz_date;       /* date in understandable format           */
-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
-
-    uLong       internal_fa;    /* internal file attributes        2 bytes */
-    uLong       external_fa;    /* external file attributes        4 bytes */
-} zip_fileinfo;
-
-typedef const char* zipcharpc;
-
-
-#define APPEND_STATUS_CREATE        (0)
-#define APPEND_STATUS_CREATEAFTER   (1)
-#define APPEND_STATUS_ADDINZIP      (2)
-
-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
-extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
-/*
-  Create a zipfile.
-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
-       an Unix computer "zlib/zlib113.zip".
-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
-       will be created at the end of the file.
-         (useful if the file contain a self extractor code)
-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
-       add files in existing zip (be sure you don't add file that doesn't exist)
-     If the zipfile cannot be opened, the return value is NULL.
-     Else, the return value is a zipFile Handle, usable with other function
-       of this zip package.
-*/
-
-/* Note : there is no delete function into a zipfile.
-   If you want delete file into a zipfile, you must open a zipfile, and create another
-   Of couse, you can use RAW reading and writing to copy the file you did not want delte
-*/
-
-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
-                                   int append,
-                                   zipcharpc* globalcomment,
-                                   zlib_filefunc_def* pzlib_filefunc_def));
-
-extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
-                                   int append,
-                                   zipcharpc* globalcomment,
-                                   zlib_filefunc64_def* pzlib_filefunc_def));
-
-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
-                       const char* filename,
-                       const zip_fileinfo* zipfi,
-                       const void* extrafield_local,
-                       uInt size_extrafield_local,
-                       const void* extrafield_global,
-                       uInt size_extrafield_global,
-                       const char* comment,
-                       int method,
-                       int level));
-
-extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
-                       const char* filename,
-                       const zip_fileinfo* zipfi,
-                       const void* extrafield_local,
-                       uInt size_extrafield_local,
-                       const void* extrafield_global,
-                       uInt size_extrafield_global,
-                       const char* comment,
-                       int method,
-                       int level,
-                       int zip64));
-
-/*
-  Open a file in the ZIP for writing.
-  filename : the filename in zip (if NULL, '-' without quote will be used
-  *zipfi contain supplemental information
-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data the the local header
-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data the the local header
-  if comment != NULL, comment contain the comment string
-  method contain the compression method (0 for store, Z_DEFLATED for deflate)
-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
-  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
-                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
-
-*/
-
-
-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw));
-
-
-extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int zip64));
-/*
-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
- */
-
-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting));
-
-extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting,
-                                            int zip64
-                                            ));
-
-/*
-  Same than zipOpenNewFileInZip2, except
-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
-    password : crypting password (NULL for no crypting)
-    crcForCrypting : crc of file to compress (needed for crypting)
- */
-
-extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting,
-                                            uLong versionMadeBy,
-                                            uLong flagBase
-                                            ));
-
-
-extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCrypting,
-                                            uLong versionMadeBy,
-                                            uLong flagBase,
-                                            int zip64
-                                            ));
-/*
-  Same than zipOpenNewFileInZip4, except
-    versionMadeBy : value for Version made by field
-    flag : value for flag field (compression level info will be added)
- */
-
-
-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
-                       const void* buf,
-                       unsigned len));
-/*
-  Write data in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
-/*
-  Close the current file in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
-                                            uLong uncompressed_size,
-                                            uLong crc32));
-
-extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
-                                            ZPOS64_T uncompressed_size,
-                                            uLong crc32));
-
-/*
-  Close the current file in the zipfile, for file opened with
-    parameter raw=1 in zipOpenNewFileInZip2
-  uncompressed_size and crc32 are value for the uncompressed size
-*/
-
-extern int ZEXPORT zipClose OF((zipFile file,
-                const char* global_comment));
-/*
-  Close the zipfile
-*/
-
-
-extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
-/*
-  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
-
-  Remove extra information block from a extra information data for the local file header or central directory header
-
-  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
-
-  0x0001 is the signature header for the ZIP64 extra information blocks
-
-  usage.
-                        Remove ZIP64 Extra information from a central director extra field data
-              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
-
-                        Remove ZIP64 Extra information from a Local File Header extra field data
-        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _zip64_H */
diff --git a/src/png/zlib/contrib/pascal/example.pas b/src/png/zlib/contrib/pascal/example.pas
deleted file mode 100644
index 5518b36a7..000000000
--- a/src/png/zlib/contrib/pascal/example.pas
+++ /dev/null
@@ -1,599 +0,0 @@
-(* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2003 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Pascal translation
- * Copyright (C) 1998 by Jacques Nomssi Nzali.
- * For conditions of distribution and use, see copyright notice in readme.txt
- *
- * Adaptation to the zlibpas interface
- * Copyright (C) 2003 by Cosmin Truta.
- * For conditions of distribution and use, see copyright notice in readme.txt
- *)
-
-program example;
-
-{$DEFINE TEST_COMPRESS}
-{DO NOT $DEFINE TEST_GZIO}
-{$DEFINE TEST_DEFLATE}
-{$DEFINE TEST_INFLATE}
-{$DEFINE TEST_FLUSH}
-{$DEFINE TEST_SYNC}
-{$DEFINE TEST_DICT}
-
-uses SysUtils, zlibpas;
-
-const TESTFILE = 'foo.gz';
-
-(* "hello world" would be more standard, but the repeated "hello"
- * stresses the compression code better, sorry...
- *)
-const hello: PChar = 'hello, hello!';
-
-const dictionary: PChar = 'hello';
-
-var dictId: LongInt; (* Adler32 value of the dictionary *)
-
-procedure CHECK_ERR(err: Integer; msg: String);
-begin
-  if err <> Z_OK then
-  begin
-    WriteLn(msg, ' error: ', err);
-    Halt(1);
-  end;
-end;
-
-procedure EXIT_ERR(const msg: String);
-begin
-  WriteLn('Error: ', msg);
-  Halt(1);
-end;
-
-(* ===========================================================================
- * Test compress and uncompress
- *)
-{$IFDEF TEST_COMPRESS}
-procedure test_compress(compr: Pointer; comprLen: LongInt;
-                        uncompr: Pointer; uncomprLen: LongInt);
-var err: Integer;
-    len: LongInt;
-begin
-  len := StrLen(hello)+1;
-
-  err := compress(compr, comprLen, hello, len);
-  CHECK_ERR(err, 'compress');
-
-  StrCopy(PChar(uncompr), 'garbage');
-
-  err := uncompress(uncompr, uncomprLen, compr, comprLen);
-  CHECK_ERR(err, 'uncompress');
-
-  if StrComp(PChar(uncompr), hello) <> 0 then
-    EXIT_ERR('bad uncompress')
-  else
-    WriteLn('uncompress(): ', PChar(uncompr));
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test read/write of .gz files
- *)
-{$IFDEF TEST_GZIO}
-procedure test_gzio(const fname: PChar; (* compressed file name *)
-                    uncompr: Pointer;
-                    uncomprLen: LongInt);
-var err: Integer;
-    len: Integer;
-    zfile: gzFile;
-    pos: LongInt;
-begin
-  len := StrLen(hello)+1;
-
-  zfile := gzopen(fname, 'wb');
-  if zfile = NIL then
-  begin
-    WriteLn('gzopen error');
-    Halt(1);
-  end;
-  gzputc(zfile, 'h');
-  if gzputs(zfile, 'ello') <> 4 then
-  begin
-    WriteLn('gzputs err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  {$IFDEF GZ_FORMAT_STRING}
-  if gzprintf(zfile, ', %s!', 'hello') <> 8 then
-  begin
-    WriteLn('gzprintf err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  {$ELSE}
-  if gzputs(zfile, ', hello!') <> 8 then
-  begin
-    WriteLn('gzputs err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  {$ENDIF}
-  gzseek(zfile, 1, SEEK_CUR); (* add one zero byte *)
-  gzclose(zfile);
-
-  zfile := gzopen(fname, 'rb');
-  if zfile = NIL then
-  begin
-    WriteLn('gzopen error');
-    Halt(1);
-  end;
-
-  StrCopy(PChar(uncompr), 'garbage');
-
-  if gzread(zfile, uncompr, uncomprLen) <> len then
-  begin
-    WriteLn('gzread err: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  if StrComp(PChar(uncompr), hello) <> 0 then
-  begin
-    WriteLn('bad gzread: ', PChar(uncompr));
-    Halt(1);
-  end
-  else
-    WriteLn('gzread(): ', PChar(uncompr));
-
-  pos := gzseek(zfile, -8, SEEK_CUR);
-  if (pos <> 6) or (gztell(zfile) <> pos) then
-  begin
-    WriteLn('gzseek error, pos=', pos, ', gztell=', gztell(zfile));
-    Halt(1);
-  end;
-
-  if gzgetc(zfile) <> ' ' then
-  begin
-    WriteLn('gzgetc error');
-    Halt(1);
-  end;
-
-  if gzungetc(' ', zfile) <> ' ' then
-  begin
-    WriteLn('gzungetc error');
-    Halt(1);
-  end;
-
-  gzgets(zfile, PChar(uncompr), uncomprLen);
-  uncomprLen := StrLen(PChar(uncompr));
-  if uncomprLen <> 7 then (* " hello!" *)
-  begin
-    WriteLn('gzgets err after gzseek: ', gzerror(zfile, err));
-    Halt(1);
-  end;
-  if StrComp(PChar(uncompr), hello + 6) <> 0 then
-  begin
-    WriteLn('bad gzgets after gzseek');
-    Halt(1);
-  end
-  else
-    WriteLn('gzgets() after gzseek: ', PChar(uncompr));
-
-  gzclose(zfile);
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with small buffers
- *)
-{$IFDEF TEST_DEFLATE}
-procedure test_deflate(compr: Pointer; comprLen: LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-    len: LongInt;
-begin
-  len := StrLen(hello)+1;
-
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION);
-  CHECK_ERR(err, 'deflateInit');
-
-  c_stream.next_in := hello;
-  c_stream.next_out := compr;
-
-  while (c_stream.total_in <> len) and
-        (c_stream.total_out < comprLen) do
-  begin
-    c_stream.avail_out := 1; { force small buffers }
-    c_stream.avail_in := 1;
-    err := deflate(c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, 'deflate');
-  end;
-
-  (* Finish the stream, still forcing small buffers: *)
-  while TRUE do
-  begin
-    c_stream.avail_out := 1;
-    err := deflate(c_stream, Z_FINISH);
-    if err = Z_STREAM_END then
-      break;
-    CHECK_ERR(err, 'deflate');
-  end;
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflate with small buffers
- *)
-{$IFDEF TEST_INFLATE}
-procedure test_inflate(compr: Pointer; comprLen : LongInt;
-                       uncompr: Pointer; uncomprLen : LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := 0;
-  d_stream.next_out := uncompr;
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  while (d_stream.total_out < uncomprLen) and
-        (d_stream.total_in < comprLen) do
-  begin
-    d_stream.avail_out := 1; (* force small buffers *)
-    d_stream.avail_in := 1;
-    err := inflate(d_stream, Z_NO_FLUSH);
-    if err = Z_STREAM_END then
-      break;
-    CHECK_ERR(err, 'inflate');
-  end;
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  if StrComp(PChar(uncompr), hello) <> 0 then
-    EXIT_ERR('bad inflate')
-  else
-    WriteLn('inflate(): ', PChar(uncompr));
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with large buffers and dynamic change of compression level
- *)
-{$IFDEF TEST_DEFLATE}
-procedure test_large_deflate(compr: Pointer; comprLen: LongInt;
-                             uncompr: Pointer; uncomprLen: LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-begin
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_BEST_SPEED);
-  CHECK_ERR(err, 'deflateInit');
-
-  c_stream.next_out := compr;
-  c_stream.avail_out := Integer(comprLen);
-
-  (* At this point, uncompr is still mostly zeroes, so it should compress
-   * very well:
-   *)
-  c_stream.next_in := uncompr;
-  c_stream.avail_in := Integer(uncomprLen);
-  err := deflate(c_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'deflate');
-  if c_stream.avail_in <> 0 then
-    EXIT_ERR('deflate not greedy');
-
-  (* Feed in already compressed data and switch to no compression: *)
-  deflateParams(c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-  c_stream.next_in := compr;
-  c_stream.avail_in := Integer(comprLen div 2);
-  err := deflate(c_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'deflate');
-
-  (* Switch back to compressing mode: *)
-  deflateParams(c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-  c_stream.next_in := uncompr;
-  c_stream.avail_in := Integer(uncomprLen);
-  err := deflate(c_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'deflate');
-
-  err := deflate(c_stream, Z_FINISH);
-  if err <> Z_STREAM_END then
-    EXIT_ERR('deflate should report Z_STREAM_END');
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflate with large buffers
- *)
-{$IFDEF TEST_INFLATE}
-procedure test_large_inflate(compr: Pointer; comprLen: LongInt;
-                             uncompr: Pointer; uncomprLen: LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := Integer(comprLen);
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  while TRUE do
-  begin
-    d_stream.next_out := uncompr;            (* discard the output *)
-    d_stream.avail_out := Integer(uncomprLen);
-    err := inflate(d_stream, Z_NO_FLUSH);
-    if err = Z_STREAM_END then
-      break;
-    CHECK_ERR(err, 'large inflate');
-  end;
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  if d_stream.total_out <> 2 * uncomprLen + comprLen div 2 then
-  begin
-    WriteLn('bad large inflate: ', d_stream.total_out);
-    Halt(1);
-  end
-  else
-    WriteLn('large_inflate(): OK');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with full flush
- *)
-{$IFDEF TEST_FLUSH}
-procedure test_flush(compr: Pointer; var comprLen : LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-    len: Integer;
-begin
-  len := StrLen(hello)+1;
-
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION);
-  CHECK_ERR(err, 'deflateInit');
-
-  c_stream.next_in := hello;
-  c_stream.next_out := compr;
-  c_stream.avail_in := 3;
-  c_stream.avail_out := Integer(comprLen);
-  err := deflate(c_stream, Z_FULL_FLUSH);
-  CHECK_ERR(err, 'deflate');
-
-  Inc(PByteArray(compr)^[3]); (* force an error in first compressed block *)
-  c_stream.avail_in := len - 3;
-
-  err := deflate(c_stream, Z_FINISH);
-  if err <> Z_STREAM_END then
-    CHECK_ERR(err, 'deflate');
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-
-  comprLen := c_stream.total_out;
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflateSync()
- *)
-{$IFDEF TEST_SYNC}
-procedure test_sync(compr: Pointer; comprLen: LongInt;
-                    uncompr: Pointer; uncomprLen : LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := 2; (* just read the zlib header *)
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  d_stream.next_out := uncompr;
-  d_stream.avail_out := Integer(uncomprLen);
-
-  inflate(d_stream, Z_NO_FLUSH);
-  CHECK_ERR(err, 'inflate');
-
-  d_stream.avail_in := Integer(comprLen-2);   (* read all compressed data *)
-  err := inflateSync(d_stream);               (* but skip the damaged part *)
-  CHECK_ERR(err, 'inflateSync');
-
-  err := inflate(d_stream, Z_FINISH);
-  if err <> Z_DATA_ERROR then
-    EXIT_ERR('inflate should report DATA_ERROR');
-    (* Because of incorrect adler32 *)
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  WriteLn('after inflateSync(): hel', PChar(uncompr));
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test deflate with preset dictionary
- *)
-{$IFDEF TEST_DICT}
-procedure test_dict_deflate(compr: Pointer; comprLen: LongInt);
-var c_stream: z_stream; (* compression stream *)
-    err: Integer;
-begin
-  c_stream.zalloc := NIL;
-  c_stream.zfree := NIL;
-  c_stream.opaque := NIL;
-
-  err := deflateInit(c_stream, Z_BEST_COMPRESSION);
-  CHECK_ERR(err, 'deflateInit');
-
-  err := deflateSetDictionary(c_stream, dictionary, StrLen(dictionary));
-  CHECK_ERR(err, 'deflateSetDictionary');
-
-  dictId := c_stream.adler;
-  c_stream.next_out := compr;
-  c_stream.avail_out := Integer(comprLen);
-
-  c_stream.next_in := hello;
-  c_stream.avail_in := StrLen(hello)+1;
-
-  err := deflate(c_stream, Z_FINISH);
-  if err <> Z_STREAM_END then
-    EXIT_ERR('deflate should report Z_STREAM_END');
-
-  err := deflateEnd(c_stream);
-  CHECK_ERR(err, 'deflateEnd');
-end;
-{$ENDIF}
-
-(* ===========================================================================
- * Test inflate with a preset dictionary
- *)
-{$IFDEF TEST_DICT}
-procedure test_dict_inflate(compr: Pointer; comprLen: LongInt;
-                            uncompr: Pointer; uncomprLen: LongInt);
-var err: Integer;
-    d_stream: z_stream; (* decompression stream *)
-begin
-  StrCopy(PChar(uncompr), 'garbage');
-
-  d_stream.zalloc := NIL;
-  d_stream.zfree := NIL;
-  d_stream.opaque := NIL;
-
-  d_stream.next_in := compr;
-  d_stream.avail_in := Integer(comprLen);
-
-  err := inflateInit(d_stream);
-  CHECK_ERR(err, 'inflateInit');
-
-  d_stream.next_out := uncompr;
-  d_stream.avail_out := Integer(uncomprLen);
-
-  while TRUE do
-  begin
-    err := inflate(d_stream, Z_NO_FLUSH);
-    if err = Z_STREAM_END then
-      break;
-    if err = Z_NEED_DICT then
-    begin
-      if d_stream.adler <> dictId then
-        EXIT_ERR('unexpected dictionary');
-      err := inflateSetDictionary(d_stream, dictionary, StrLen(dictionary));
-    end;
-    CHECK_ERR(err, 'inflate with dict');
-  end;
-
-  err := inflateEnd(d_stream);
-  CHECK_ERR(err, 'inflateEnd');
-
-  if StrComp(PChar(uncompr), hello) <> 0 then
-    EXIT_ERR('bad inflate with dict')
-  else
-    WriteLn('inflate with dictionary: ', PChar(uncompr));
-end;
-{$ENDIF}
-
-var compr, uncompr: Pointer;
-    comprLen, uncomprLen: LongInt;
-
-begin
-  if zlibVersion^ <> ZLIB_VERSION[1] then
-    EXIT_ERR('Incompatible zlib version');
-
-  WriteLn('zlib version: ', zlibVersion);
-  WriteLn('zlib compile flags: ', Format('0x%x', [zlibCompileFlags]));
-
-  comprLen := 10000 * SizeOf(Integer); (* don't overflow on MSDOS *)
-  uncomprLen := comprLen;
-  GetMem(compr, comprLen);
-  GetMem(uncompr, uncomprLen);
-  if (compr = NIL) or (uncompr = NIL) then
-    EXIT_ERR('Out of memory');
-  (* compr and uncompr are cleared to avoid reading uninitialized
-   * data and to ensure that uncompr compresses well.
-   *)
-  FillChar(compr^, comprLen, 0);
-  FillChar(uncompr^, uncomprLen, 0);
-
-  {$IFDEF TEST_COMPRESS}
-  WriteLn('** Testing compress');
-  test_compress(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_GZIO}
-  WriteLn('** Testing gzio');
-  if ParamCount >= 1 then
-    test_gzio(ParamStr(1), uncompr, uncomprLen)
-  else
-    test_gzio(TESTFILE, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_DEFLATE}
-  WriteLn('** Testing deflate with small buffers');
-  test_deflate(compr, comprLen);
-  {$ENDIF}
-  {$IFDEF TEST_INFLATE}
-  WriteLn('** Testing inflate with small buffers');
-  test_inflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_DEFLATE}
-  WriteLn('** Testing deflate with large buffers');
-  test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-  {$IFDEF TEST_INFLATE}
-  WriteLn('** Testing inflate with large buffers');
-  test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  {$IFDEF TEST_FLUSH}
-  WriteLn('** Testing deflate with full flush');
-  test_flush(compr, comprLen);
-  {$ENDIF}
-  {$IFDEF TEST_SYNC}
-  WriteLn('** Testing inflateSync');
-  test_sync(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-  comprLen := uncomprLen;
-
-  {$IFDEF TEST_DICT}
-  WriteLn('** Testing deflate and inflate with preset dictionary');
-  test_dict_deflate(compr, comprLen);
-  test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
-  {$ENDIF}
-
-  FreeMem(compr, comprLen);
-  FreeMem(uncompr, uncomprLen);
-end.
diff --git a/src/png/zlib/contrib/pascal/readme.txt b/src/png/zlib/contrib/pascal/readme.txt
deleted file mode 100644
index 60e87c8a3..000000000
--- a/src/png/zlib/contrib/pascal/readme.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-
-This directory contains a Pascal (Delphi, Kylix) interface to the
-zlib data compression library.
-
-
-Directory listing
-=================
-
-zlibd32.mak     makefile for Borland C++
-example.pas     usage example of zlib
-zlibpas.pas     the Pascal interface to zlib
-readme.txt      this file
-
-
-Compatibility notes
-===================
-
-- Although the name "zlib" would have been more normal for the
-  zlibpas unit, this name is already taken by Borland's ZLib unit.
-  This is somehow unfortunate, because that unit is not a genuine
-  interface to the full-fledged zlib functionality, but a suite of
-  class wrappers around zlib streams.  Other essential features,
-  such as checksums, are missing.
-  It would have been more appropriate for that unit to have a name
-  like "ZStreams", or something similar.
-
-- The C and zlib-supplied types int, uInt, long, uLong, etc. are
-  translated directly into Pascal types of similar sizes (Integer,
-  LongInt, etc.), to avoid namespace pollution.  In particular,
-  there is no conversion of unsigned int into a Pascal unsigned
-  integer.  The Word type is non-portable and has the same size
-  (16 bits) both in a 16-bit and in a 32-bit environment, unlike
-  Integer.  Even if there is a 32-bit Cardinal type, there is no
-  real need for unsigned int in zlib under a 32-bit environment.
-
-- Except for the callbacks, the zlib function interfaces are
-  assuming the calling convention normally used in Pascal
-  (__pascal for DOS and Windows16, __fastcall for Windows32).
-  Since the cdecl keyword is used, the old Turbo Pascal does
-  not work with this interface.
-
-- The gz* function interfaces are not translated, to avoid
-  interfacing problems with the C runtime library.  Besides,
-    gzprintf(gzFile file, const char *format, ...)
-  cannot be translated into Pascal.
-
-
-Legal issues
-============
-
-The zlibpas interface is:
-  Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler.
-  Copyright (C) 1998 by Bob Dellaca.
-  Copyright (C) 2003 by Cosmin Truta.
-
-The example program is:
-  Copyright (C) 1995-2003 by Jean-loup Gailly.
-  Copyright (C) 1998,1999,2000 by Jacques Nomssi Nzali.
-  Copyright (C) 2003 by Cosmin Truta.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
diff --git a/src/png/zlib/contrib/pascal/zlibd32.mak b/src/png/zlib/contrib/pascal/zlibd32.mak
deleted file mode 100644
index 9bb00b7cc..000000000
--- a/src/png/zlib/contrib/pascal/zlibd32.mak
+++ /dev/null
@@ -1,99 +0,0 @@
-# Makefile for zlib
-# For use with Delphi and C++ Builder under Win32
-# Updated for zlib 1.2.x by Cosmin Truta
-
-# ------------ Borland C++ ------------
-
-# This project uses the Delphi (fastcall/register) calling convention:
-LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
-
-CC = bcc32
-LD = bcc32
-AR = tlib
-# do not use "-pr" in CFLAGS
-CFLAGS = -a -d -k- -O2 $(LOC)
-LDFLAGS =
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del *.obj
-	-del *.exe
-	-del *.lib
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz
-
diff --git a/src/png/zlib/contrib/pascal/zlibpas.pas b/src/png/zlib/contrib/pascal/zlibpas.pas
deleted file mode 100644
index a0dff11b5..000000000
--- a/src/png/zlib/contrib/pascal/zlibpas.pas
+++ /dev/null
@@ -1,276 +0,0 @@
-(* zlibpas -- Pascal interface to the zlib data compression library
- *
- * Copyright (C) 2003 Cosmin Truta.
- * Derived from original sources by Bob Dellaca.
- * For conditions of distribution and use, see copyright notice in readme.txt
- *)
-
-unit zlibpas;
-
-interface
-
-const
-  ZLIB_VERSION = '1.2.11';
-  ZLIB_VERNUM  = $12a0;
-
-type
-  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
-                 cdecl;
-  free_func  = procedure(opaque, address: Pointer);
-                 cdecl;
-
-  in_func    = function(opaque: Pointer; var buf: PByte): Integer;
-                 cdecl;
-  out_func   = function(opaque: Pointer; buf: PByte; size: Integer): Integer;
-                 cdecl;
-
-  z_streamp = ^z_stream;
-  z_stream = packed record
-    next_in: PChar;       (* next input byte *)
-    avail_in: Integer;    (* number of bytes available at next_in *)
-    total_in: LongInt;    (* total nb of input bytes read so far *)
-
-    next_out: PChar;      (* next output byte should be put there *)
-    avail_out: Integer;   (* remaining free space at next_out *)
-    total_out: LongInt;   (* total nb of bytes output so far *)
-
-    msg: PChar;           (* last error message, NULL if no error *)
-    state: Pointer;       (* not visible by applications *)
-
-    zalloc: alloc_func;   (* used to allocate the internal state *)
-    zfree: free_func;     (* used to free the internal state *)
-    opaque: Pointer;      (* private data object passed to zalloc and zfree *)
-
-    data_type: Integer;   (* best guess about the data type: ascii or binary *)
-    adler: LongInt;       (* adler32 value of the uncompressed data *)
-    reserved: LongInt;    (* reserved for future use *)
-  end;
-
-  gz_headerp = ^gz_header;
-  gz_header = packed record
-    text: Integer;        (* true if compressed data believed to be text *)
-    time: LongInt;        (* modification time *)
-    xflags: Integer;      (* extra flags (not used when writing a gzip file) *)
-    os: Integer;          (* operating system *)
-    extra: PChar;         (* pointer to extra field or Z_NULL if none *)
-    extra_len: Integer;   (* extra field length (valid if extra != Z_NULL) *)
-    extra_max: Integer;   (* space at extra (only when reading header) *)
-    name: PChar;          (* pointer to zero-terminated file name or Z_NULL *)
-    name_max: Integer;    (* space at name (only when reading header) *)
-    comment: PChar;       (* pointer to zero-terminated comment or Z_NULL *)
-    comm_max: Integer;    (* space at comment (only when reading header) *)
-    hcrc: Integer;        (* true if there was or will be a header crc *)
-    done: Integer;        (* true when done reading gzip header *)
-  end;
-
-(* constants *)
-const
-  Z_NO_FLUSH      = 0;
-  Z_PARTIAL_FLUSH = 1;
-  Z_SYNC_FLUSH    = 2;
-  Z_FULL_FLUSH    = 3;
-  Z_FINISH        = 4;
-  Z_BLOCK         = 5;
-  Z_TREES         = 6;
-
-  Z_OK            =  0;
-  Z_STREAM_END    =  1;
-  Z_NEED_DICT     =  2;
-  Z_ERRNO         = -1;
-  Z_STREAM_ERROR  = -2;
-  Z_DATA_ERROR    = -3;
-  Z_MEM_ERROR     = -4;
-  Z_BUF_ERROR     = -5;
-  Z_VERSION_ERROR = -6;
-
-  Z_NO_COMPRESSION       =  0;
-  Z_BEST_SPEED           =  1;
-  Z_BEST_COMPRESSION     =  9;
-  Z_DEFAULT_COMPRESSION  = -1;
-
-  Z_FILTERED            = 1;
-  Z_HUFFMAN_ONLY        = 2;
-  Z_RLE                 = 3;
-  Z_FIXED               = 4;
-  Z_DEFAULT_STRATEGY    = 0;
-
-  Z_BINARY   = 0;
-  Z_TEXT     = 1;
-  Z_ASCII    = 1;
-  Z_UNKNOWN  = 2;
-
-  Z_DEFLATED = 8;
-
-(* basic functions *)
-function zlibVersion: PChar;
-function deflateInit(var strm: z_stream; level: Integer): Integer;
-function deflate(var strm: z_stream; flush: Integer): Integer;
-function deflateEnd(var strm: z_stream): Integer;
-function inflateInit(var strm: z_stream): Integer;
-function inflate(var strm: z_stream; flush: Integer): Integer;
-function inflateEnd(var strm: z_stream): Integer;
-
-(* advanced functions *)
-function deflateInit2(var strm: z_stream; level, method, windowBits,
-                      memLevel, strategy: Integer): Integer;
-function deflateSetDictionary(var strm: z_stream; const dictionary: PChar;
-                              dictLength: Integer): Integer;
-function deflateCopy(var dest, source: z_stream): Integer;
-function deflateReset(var strm: z_stream): Integer;
-function deflateParams(var strm: z_stream; level, strategy: Integer): Integer;
-function deflateTune(var strm: z_stream; good_length, max_lazy, nice_length, max_chain: Integer): Integer;
-function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt;
-function deflatePending(var strm: z_stream; var pending: Integer; var bits: Integer): Integer;
-function deflatePrime(var strm: z_stream; bits, value: Integer): Integer;
-function deflateSetHeader(var strm: z_stream; head: gz_header): Integer;
-function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
-function inflateSetDictionary(var strm: z_stream; const dictionary: PChar;
-                              dictLength: Integer): Integer;
-function inflateSync(var strm: z_stream): Integer;
-function inflateCopy(var dest, source: z_stream): Integer;
-function inflateReset(var strm: z_stream): Integer;
-function inflateReset2(var strm: z_stream; windowBits: Integer): Integer;
-function inflatePrime(var strm: z_stream; bits, value: Integer): Integer;
-function inflateMark(var strm: z_stream): LongInt;
-function inflateGetHeader(var strm: z_stream; var head: gz_header): Integer;
-function inflateBackInit(var strm: z_stream;
-                         windowBits: Integer; window: PChar): Integer;
-function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer;
-                     out_fn: out_func; out_desc: Pointer): Integer;
-function inflateBackEnd(var strm: z_stream): Integer;
-function zlibCompileFlags: LongInt;
-
-(* utility functions *)
-function compress(dest: PChar; var destLen: LongInt;
-                  const source: PChar; sourceLen: LongInt): Integer;
-function compress2(dest: PChar; var destLen: LongInt;
-                  const source: PChar; sourceLen: LongInt;
-                  level: Integer): Integer;
-function compressBound(sourceLen: LongInt): LongInt;
-function uncompress(dest: PChar; var destLen: LongInt;
-                    const source: PChar; sourceLen: LongInt): Integer;
-
-(* checksum functions *)
-function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt;
-function adler32_combine(adler1, adler2, len2: LongInt): LongInt;
-function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt;
-function crc32_combine(crc1, crc2, len2: LongInt): LongInt;
-
-(* various hacks, don't look :) *)
-function deflateInit_(var strm: z_stream; level: Integer;
-                      const version: PChar; stream_size: Integer): Integer;
-function inflateInit_(var strm: z_stream; const version: PChar;
-                      stream_size: Integer): Integer;
-function deflateInit2_(var strm: z_stream;
-                       level, method, windowBits, memLevel, strategy: Integer;
-                       const version: PChar; stream_size: Integer): Integer;
-function inflateInit2_(var strm: z_stream; windowBits: Integer;
-                       const version: PChar; stream_size: Integer): Integer;
-function inflateBackInit_(var strm: z_stream;
-                          windowBits: Integer; window: PChar;
-                          const version: PChar; stream_size: Integer): Integer;
-
-
-implementation
-
-{$L adler32.obj}
-{$L compress.obj}
-{$L crc32.obj}
-{$L deflate.obj}
-{$L infback.obj}
-{$L inffast.obj}
-{$L inflate.obj}
-{$L inftrees.obj}
-{$L trees.obj}
-{$L uncompr.obj}
-{$L zutil.obj}
-
-function adler32; external;
-function adler32_combine; external;
-function compress; external;
-function compress2; external;
-function compressBound; external;
-function crc32; external;
-function crc32_combine; external;
-function deflate; external;
-function deflateBound; external;
-function deflateCopy; external;
-function deflateEnd; external;
-function deflateInit_; external;
-function deflateInit2_; external;
-function deflateParams; external;
-function deflatePending; external;
-function deflatePrime; external;
-function deflateReset; external;
-function deflateSetDictionary; external;
-function deflateSetHeader; external;
-function deflateTune; external;
-function inflate; external;
-function inflateBack; external;
-function inflateBackEnd; external;
-function inflateBackInit_; external;
-function inflateCopy; external;
-function inflateEnd; external;
-function inflateGetHeader; external;
-function inflateInit_; external;
-function inflateInit2_; external;
-function inflateMark; external;
-function inflatePrime; external;
-function inflateReset; external;
-function inflateReset2; external;
-function inflateSetDictionary; external;
-function inflateSync; external;
-function uncompress; external;
-function zlibCompileFlags; external;
-function zlibVersion; external;
-
-function deflateInit(var strm: z_stream; level: Integer): Integer;
-begin
-  Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function deflateInit2(var strm: z_stream; level, method, windowBits, memLevel,
-                      strategy: Integer): Integer;
-begin
-  Result := deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                          ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateInit(var strm: z_stream): Integer;
-begin
-  Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
-begin
-  Result := inflateInit2_(strm, windowBits, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateBackInit(var strm: z_stream;
-                         windowBits: Integer; window: PChar): Integer;
-begin
-  Result := inflateBackInit_(strm, windowBits, window,
-                             ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function _malloc(Size: Integer): Pointer; cdecl;
-begin
-  GetMem(Result, Size);
-end;
-
-procedure _free(Block: Pointer); cdecl;
-begin
-  FreeMem(Block);
-end;
-
-procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
-begin
-  FillChar(P^, count, B);
-end;
-
-procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
-begin
-  Move(source^, dest^, count);
-end;
-
-end.
diff --git a/src/png/zlib/contrib/puff/Makefile b/src/png/zlib/contrib/puff/Makefile
deleted file mode 100644
index 0e2594c80..000000000
--- a/src/png/zlib/contrib/puff/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-CFLAGS=-O
-
-puff: puff.o pufftest.o
-
-puff.o: puff.h
-
-pufftest.o: puff.h
-
-test: puff
-	puff zeros.raw
-
-puft: puff.c puff.h pufftest.o
-	cc -fprofile-arcs -ftest-coverage -o puft puff.c pufftest.o
-
-# puff full coverage test (should say 100%)
-cov: puft
-	@rm -f *.gcov *.gcda
-	@puft -w zeros.raw 2>&1 | cat > /dev/null
-	@echo '04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '00 00 00 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 254
-	@echo '00 01 00 fe ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '01 01 00 fe ff 0a' | xxd -r -p | puft -f 2>&1 | cat > /dev/null
-	@echo '02 7e ff ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
-	@echo '02' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
-	@echo '04 80 49 92 24 49 92 24 71 ff ff 93 11 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 249
-	@echo '04 c0 81 08 00 00 00 00 20 7f eb 0b 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
-	@echo '0b 00 00' | xxd -r -p | puft -f 2>&1 | cat > /dev/null
-	@echo '1a 07' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
-	@echo '0c c0 81 00 00 00 00 00 90 ff 6b 04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 245
-	@puft -f zeros.raw 2>&1 | cat > /dev/null
-	@echo 'fc 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 253
-	@echo '04 00 fe ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 252
-	@echo '04 00 24 49' | xxd -r -p | puft 2> /dev/null || test $$? -eq 251
-	@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 84' | xxd -r -p | puft 2> /dev/null || test $$? -eq 248
-	@echo '04 00 24 e9 ff ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 250
-	@echo '04 00 24 e9 ff 6d' | xxd -r -p | puft 2> /dev/null || test $$? -eq 247
-	@gcov -n puff.c
-
-clean:
-	rm -f puff puft *.o *.gc*
diff --git a/src/png/zlib/contrib/puff/README b/src/png/zlib/contrib/puff/README
deleted file mode 100644
index bbc4cb595..000000000
--- a/src/png/zlib/contrib/puff/README
+++ /dev/null
@@ -1,63 +0,0 @@
-Puff -- A Simple Inflate
-3 Mar 2003
-Mark Adler
-madler@alumni.caltech.edu
-
-What this is --
-
-puff.c provides the routine puff() to decompress the deflate data format.  It
-does so more slowly than zlib, but the code is about one-fifth the size of the
-inflate code in zlib, and written to be very easy to read.
-
-Why I wrote this --
-
-puff.c was written to document the deflate format unambiguously, by virtue of
-being working C code.  It is meant to supplement RFC 1951, which formally
-describes the deflate format.  I have received many questions on details of the
-deflate format, and I hope that reading this code will answer those questions.
-puff.c is heavily commented with details of the deflate format, especially
-those little nooks and cranies of the format that might not be obvious from a
-specification.
-
-puff.c may also be useful in applications where code size or memory usage is a
-very limited resource, and speed is not as important.
-
-How to use it --
-
-Well, most likely you should just be reading puff.c and using zlib for actual
-applications, but if you must ...
-
-Include puff.h in your code, which provides this prototype:
-
-int puff(unsigned char *dest,           /* pointer to destination pointer */
-         unsigned long *destlen,        /* amount of output space */
-         unsigned char *source,         /* pointer to source data pointer */
-         unsigned long *sourcelen);     /* amount of input available */
-
-Then you can call puff() to decompress a deflate stream that is in memory in
-its entirety at source, to a sufficiently sized block of memory for the
-decompressed data at dest.  puff() is the only external symbol in puff.c  The
-only C library functions that puff.c needs are setjmp() and longjmp(), which
-are used to simplify error checking in the code to improve readabilty.  puff.c
-does no memory allocation, and uses less than 2K bytes off of the stack.
-
-If destlen is not enough space for the uncompressed data, then inflate will
-return an error without writing more than destlen bytes.  Note that this means
-that in order to decompress the deflate data successfully, you need to know
-the size of the uncompressed data ahead of time.
-
-If needed, puff() can determine the size of the uncompressed data with no
-output space.  This is done by passing dest equal to (unsigned char *)0.  Then
-the initial value of *destlen is ignored and *destlen is set to the length of
-the uncompressed data.  So if the size of the uncompressed data is not known,
-then two passes of puff() can be used--first to determine the size, and second
-to do the actual inflation after allocating the appropriate memory.  Not
-pretty, but it works.  (This is one of the reasons you should be using zlib.)
-
-The deflate format is self-terminating.  If the deflate stream does not end
-in *sourcelen bytes, puff() will return an error without reading at or past
-endsource.
-
-On return, *sourcelen is updated to the amount of input data consumed, and
-*destlen is updated to the size of the uncompressed data.  See the comments
-in puff.c for the possible return codes for puff().
diff --git a/src/png/zlib/contrib/puff/puff.c b/src/png/zlib/contrib/puff/puff.c
deleted file mode 100644
index c6c90d714..000000000
--- a/src/png/zlib/contrib/puff/puff.c
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * puff.c
- * Copyright (C) 2002-2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in puff.h
- * version 2.3, 21 Jan 2013
- *
- * puff.c is a simple inflate written to be an unambiguous way to specify the
- * deflate format.  It is not written for speed but rather simplicity.  As a
- * side benefit, this code might actually be useful when small code is more
- * important than speed, such as bootstrap applications.  For typical deflate
- * data, zlib's inflate() is about four times as fast as puff().  zlib's
- * inflate compiles to around 20K on my machine, whereas puff.c compiles to
- * around 4K on my machine (a PowerPC using GNU cc).  If the faster decode()
- * function here is used, then puff() is only twice as slow as zlib's
- * inflate().
- *
- * All dynamically allocated memory comes from the stack.  The stack required
- * is less than 2K bytes.  This code is compatible with 16-bit int's and
- * assumes that long's are at least 32 bits.  puff.c uses the short data type,
- * assumed to be 16 bits, for arrays in order to conserve memory.  The code
- * works whether integers are stored big endian or little endian.
- *
- * In the comments below are "Format notes" that describe the inflate process
- * and document some of the less obvious aspects of the format.  This source
- * code is meant to supplement RFC 1951, which formally describes the deflate
- * format:
- *
- *    http://www.zlib.org/rfc-deflate.html
- */
-
-/*
- * Change history:
- *
- * 1.0  10 Feb 2002     - First version
- * 1.1  17 Feb 2002     - Clarifications of some comments and notes
- *                      - Update puff() dest and source pointers on negative
- *                        errors to facilitate debugging deflators
- *                      - Remove longest from struct huffman -- not needed
- *                      - Simplify offs[] index in construct()
- *                      - Add input size and checking, using longjmp() to
- *                        maintain easy readability
- *                      - Use short data type for large arrays
- *                      - Use pointers instead of long to specify source and
- *                        destination sizes to avoid arbitrary 4 GB limits
- * 1.2  17 Mar 2002     - Add faster version of decode(), doubles speed (!),
- *                        but leave simple version for readabilty
- *                      - Make sure invalid distances detected if pointers
- *                        are 16 bits
- *                      - Fix fixed codes table error
- *                      - Provide a scanning mode for determining size of
- *                        uncompressed data
- * 1.3  20 Mar 2002     - Go back to lengths for puff() parameters [Gailly]
- *                      - Add a puff.h file for the interface
- *                      - Add braces in puff() for else do [Gailly]
- *                      - Use indexes instead of pointers for readability
- * 1.4  31 Mar 2002     - Simplify construct() code set check
- *                      - Fix some comments
- *                      - Add FIXLCODES #define
- * 1.5   6 Apr 2002     - Minor comment fixes
- * 1.6   7 Aug 2002     - Minor format changes
- * 1.7   3 Mar 2003     - Added test code for distribution
- *                      - Added zlib-like license
- * 1.8   9 Jan 2004     - Added some comments on no distance codes case
- * 1.9  21 Feb 2008     - Fix bug on 16-bit integer architectures [Pohland]
- *                      - Catch missing end-of-block symbol error
- * 2.0  25 Jul 2008     - Add #define to permit distance too far back
- *                      - Add option in TEST code for puff to write the data
- *                      - Add option in TEST code to skip input bytes
- *                      - Allow TEST code to read from piped stdin
- * 2.1   4 Apr 2010     - Avoid variable initialization for happier compilers
- *                      - Avoid unsigned comparisons for even happier compilers
- * 2.2  25 Apr 2010     - Fix bug in variable initializations [Oberhumer]
- *                      - Add const where appropriate [Oberhumer]
- *                      - Split if's and ?'s for coverage testing
- *                      - Break out test code to separate file
- *                      - Move NIL to puff.h
- *                      - Allow incomplete code only if single code length is 1
- *                      - Add full code coverage test to Makefile
- * 2.3  21 Jan 2013     - Check for invalid code length codes in dynamic blocks
- */
-
-#include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
-#include "puff.h"               /* prototype for puff() */
-
-#define local static            /* for local function definitions */
-
-/*
- * Maximums for allocations and loops.  It is not useful to change these --
- * they are fixed by the deflate format.
- */
-#define MAXBITS 15              /* maximum bits in a code */
-#define MAXLCODES 286           /* maximum number of literal/length codes */
-#define MAXDCODES 30            /* maximum number of distance codes */
-#define MAXCODES (MAXLCODES+MAXDCODES)  /* maximum codes lengths to read */
-#define FIXLCODES 288           /* number of fixed literal/length codes */
-
-/* input and output state */
-struct state {
-    /* output state */
-    unsigned char *out;         /* output buffer */
-    unsigned long outlen;       /* available space at out */
-    unsigned long outcnt;       /* bytes written to out so far */
-
-    /* input state */
-    const unsigned char *in;    /* input buffer */
-    unsigned long inlen;        /* available input at in */
-    unsigned long incnt;        /* bytes read so far */
-    int bitbuf;                 /* bit buffer */
-    int bitcnt;                 /* number of bits in bit buffer */
-
-    /* input limit error return state for bits() and decode() */
-    jmp_buf env;
-};
-
-/*
- * Return need bits from the input stream.  This always leaves less than
- * eight bits in the buffer.  bits() works properly for need == 0.
- *
- * Format notes:
- *
- * - Bits are stored in bytes from the least significant bit to the most
- *   significant bit.  Therefore bits are dropped from the bottom of the bit
- *   buffer, using shift right, and new bytes are appended to the top of the
- *   bit buffer, using shift left.
- */
-local int bits(struct state *s, int need)
-{
-    long val;           /* bit accumulator (can use up to 20 bits) */
-
-    /* load at least need bits into val */
-    val = s->bitbuf;
-    while (s->bitcnt < need) {
-        if (s->incnt == s->inlen)
-            longjmp(s->env, 1);         /* out of input */
-        val |= (long)(s->in[s->incnt++]) << s->bitcnt;  /* load eight bits */
-        s->bitcnt += 8;
-    }
-
-    /* drop need bits and update buffer, always zero to seven bits left */
-    s->bitbuf = (int)(val >> need);
-    s->bitcnt -= need;
-
-    /* return need bits, zeroing the bits above that */
-    return (int)(val & ((1L << need) - 1));
-}
-
-/*
- * Process a stored block.
- *
- * Format notes:
- *
- * - After the two-bit stored block type (00), the stored block length and
- *   stored bytes are byte-aligned for fast copying.  Therefore any leftover
- *   bits in the byte that has the last bit of the type, as many as seven, are
- *   discarded.  The value of the discarded bits are not defined and should not
- *   be checked against any expectation.
- *
- * - The second inverted copy of the stored block length does not have to be
- *   checked, but it's probably a good idea to do so anyway.
- *
- * - A stored block can have zero length.  This is sometimes used to byte-align
- *   subsets of the compressed data for random access or partial recovery.
- */
-local int stored(struct state *s)
-{
-    unsigned len;       /* length of stored block */
-
-    /* discard leftover bits from current byte (assumes s->bitcnt < 8) */
-    s->bitbuf = 0;
-    s->bitcnt = 0;
-
-    /* get length and check against its one's complement */
-    if (s->incnt + 4 > s->inlen)
-        return 2;                               /* not enough input */
-    len = s->in[s->incnt++];
-    len |= s->in[s->incnt++] << 8;
-    if (s->in[s->incnt++] != (~len & 0xff) ||
-        s->in[s->incnt++] != ((~len >> 8) & 0xff))
-        return -2;                              /* didn't match complement! */
-
-    /* copy len bytes from in to out */
-    if (s->incnt + len > s->inlen)
-        return 2;                               /* not enough input */
-    if (s->out != NIL) {
-        if (s->outcnt + len > s->outlen)
-            return 1;                           /* not enough output space */
-        while (len--)
-            s->out[s->outcnt++] = s->in[s->incnt++];
-    }
-    else {                                      /* just scanning */
-        s->outcnt += len;
-        s->incnt += len;
-    }
-
-    /* done with a valid stored block */
-    return 0;
-}
-
-/*
- * Huffman code decoding tables.  count[1..MAXBITS] is the number of symbols of
- * each length, which for a canonical code are stepped through in order.
- * symbol[] are the symbol values in canonical order, where the number of
- * entries is the sum of the counts in count[].  The decoding process can be
- * seen in the function decode() below.
- */
-struct huffman {
-    short *count;       /* number of symbols of each length */
-    short *symbol;      /* canonically ordered symbols */
-};
-
-/*
- * Decode a code from the stream s using huffman table h.  Return the symbol or
- * a negative value if there is an error.  If all of the lengths are zero, i.e.
- * an empty code, or if the code is incomplete and an invalid code is received,
- * then -10 is returned after reading MAXBITS bits.
- *
- * Format notes:
- *
- * - The codes as stored in the compressed data are bit-reversed relative to
- *   a simple integer ordering of codes of the same lengths.  Hence below the
- *   bits are pulled from the compressed data one at a time and used to
- *   build the code value reversed from what is in the stream in order to
- *   permit simple integer comparisons for decoding.  A table-based decoding
- *   scheme (as used in zlib) does not need to do this reversal.
- *
- * - The first code for the shortest length is all zeros.  Subsequent codes of
- *   the same length are simply integer increments of the previous code.  When
- *   moving up a length, a zero bit is appended to the code.  For a complete
- *   code, the last code of the longest length will be all ones.
- *
- * - Incomplete codes are handled by this decoder, since they are permitted
- *   in the deflate format.  See the format notes for fixed() and dynamic().
- */
-#ifdef SLOW
-local int decode(struct state *s, const struct huffman *h)
-{
-    int len;            /* current number of bits in code */
-    int code;           /* len bits being decoded */
-    int first;          /* first code of length len */
-    int count;          /* number of codes of length len */
-    int index;          /* index of first code of length len in symbol table */
-
-    code = first = index = 0;
-    for (len = 1; len <= MAXBITS; len++) {
-        code |= bits(s, 1);             /* get next bit */
-        count = h->count[len];
-        if (code - count < first)       /* if length len, return symbol */
-            return h->symbol[index + (code - first)];
-        index += count;                 /* else update for next length */
-        first += count;
-        first <<= 1;
-        code <<= 1;
-    }
-    return -10;                         /* ran out of codes */
-}
-
-/*
- * A faster version of decode() for real applications of this code.   It's not
- * as readable, but it makes puff() twice as fast.  And it only makes the code
- * a few percent larger.
- */
-#else /* !SLOW */
-local int decode(struct state *s, const struct huffman *h)
-{
-    int len;            /* current number of bits in code */
-    int code;           /* len bits being decoded */
-    int first;          /* first code of length len */
-    int count;          /* number of codes of length len */
-    int index;          /* index of first code of length len in symbol table */
-    int bitbuf;         /* bits from stream */
-    int left;           /* bits left in next or left to process */
-    short *next;        /* next number of codes */
-
-    bitbuf = s->bitbuf;
-    left = s->bitcnt;
-    code = first = index = 0;
-    len = 1;
-    next = h->count + 1;
-    while (1) {
-        while (left--) {
-            code |= bitbuf & 1;
-            bitbuf >>= 1;
-            count = *next++;
-            if (code - count < first) { /* if length len, return symbol */
-                s->bitbuf = bitbuf;
-                s->bitcnt = (s->bitcnt - len) & 7;
-                return h->symbol[index + (code - first)];
-            }
-            index += count;             /* else update for next length */
-            first += count;
-            first <<= 1;
-            code <<= 1;
-            len++;
-        }
-        left = (MAXBITS+1) - len;
-        if (left == 0)
-            break;
-        if (s->incnt == s->inlen)
-            longjmp(s->env, 1);         /* out of input */
-        bitbuf = s->in[s->incnt++];
-        if (left > 8)
-            left = 8;
-    }
-    return -10;                         /* ran out of codes */
-}
-#endif /* SLOW */
-
-/*
- * Given the list of code lengths length[0..n-1] representing a canonical
- * Huffman code for n symbols, construct the tables required to decode those
- * codes.  Those tables are the number of codes of each length, and the symbols
- * sorted by length, retaining their original order within each length.  The
- * return value is zero for a complete code set, negative for an over-
- * subscribed code set, and positive for an incomplete code set.  The tables
- * can be used if the return value is zero or positive, but they cannot be used
- * if the return value is negative.  If the return value is zero, it is not
- * possible for decode() using that table to return an error--any stream of
- * enough bits will resolve to a symbol.  If the return value is positive, then
- * it is possible for decode() using that table to return an error for received
- * codes past the end of the incomplete lengths.
- *
- * Not used by decode(), but used for error checking, h->count[0] is the number
- * of the n symbols not in the code.  So n - h->count[0] is the number of
- * codes.  This is useful for checking for incomplete codes that have more than
- * one symbol, which is an error in a dynamic block.
- *
- * Assumption: for all i in 0..n-1, 0 <= length[i] <= MAXBITS
- * This is assured by the construction of the length arrays in dynamic() and
- * fixed() and is not verified by construct().
- *
- * Format notes:
- *
- * - Permitted and expected examples of incomplete codes are one of the fixed
- *   codes and any code with a single symbol which in deflate is coded as one
- *   bit instead of zero bits.  See the format notes for fixed() and dynamic().
- *
- * - Within a given code length, the symbols are kept in ascending order for
- *   the code bits definition.
- */
-local int construct(struct huffman *h, const short *length, int n)
-{
-    int symbol;         /* current symbol when stepping through length[] */
-    int len;            /* current length when stepping through h->count[] */
-    int left;           /* number of possible codes left of current length */
-    short offs[MAXBITS+1];      /* offsets in symbol table for each length */
-
-    /* count number of codes of each length */
-    for (len = 0; len <= MAXBITS; len++)
-        h->count[len] = 0;
-    for (symbol = 0; symbol < n; symbol++)
-        (h->count[length[symbol]])++;   /* assumes lengths are within bounds */
-    if (h->count[0] == n)               /* no codes! */
-        return 0;                       /* complete, but decode() will fail */
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;                           /* one possible code of zero length */
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;                     /* one more bit, double codes left */
-        left -= h->count[len];          /* deduct count from possible codes */
-        if (left < 0)
-            return left;                /* over-subscribed--return negative */
-    }                                   /* left > 0 means incomplete */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + h->count[len];
-
-    /*
-     * put symbols in table sorted by length, by symbol order within each
-     * length
-     */
-    for (symbol = 0; symbol < n; symbol++)
-        if (length[symbol] != 0)
-            h->symbol[offs[length[symbol]]++] = symbol;
-
-    /* return zero for complete set, positive for incomplete set */
-    return left;
-}
-
-/*
- * Decode literal/length and distance codes until an end-of-block code.
- *
- * Format notes:
- *
- * - Compressed data that is after the block type if fixed or after the code
- *   description if dynamic is a combination of literals and length/distance
- *   pairs terminated by and end-of-block code.  Literals are simply Huffman
- *   coded bytes.  A length/distance pair is a coded length followed by a
- *   coded distance to represent a string that occurs earlier in the
- *   uncompressed data that occurs again at the current location.
- *
- * - Literals, lengths, and the end-of-block code are combined into a single
- *   code of up to 286 symbols.  They are 256 literals (0..255), 29 length
- *   symbols (257..285), and the end-of-block symbol (256).
- *
- * - There are 256 possible lengths (3..258), and so 29 symbols are not enough
- *   to represent all of those.  Lengths 3..10 and 258 are in fact represented
- *   by just a length symbol.  Lengths 11..257 are represented as a symbol and
- *   some number of extra bits that are added as an integer to the base length
- *   of the length symbol.  The number of extra bits is determined by the base
- *   length symbol.  These are in the static arrays below, lens[] for the base
- *   lengths and lext[] for the corresponding number of extra bits.
- *
- * - The reason that 258 gets its own symbol is that the longest length is used
- *   often in highly redundant files.  Note that 258 can also be coded as the
- *   base value 227 plus the maximum extra value of 31.  While a good deflate
- *   should never do this, it is not an error, and should be decoded properly.
- *
- * - If a length is decoded, including its extra bits if any, then it is
- *   followed a distance code.  There are up to 30 distance symbols.  Again
- *   there are many more possible distances (1..32768), so extra bits are added
- *   to a base value represented by the symbol.  The distances 1..4 get their
- *   own symbol, but the rest require extra bits.  The base distances and
- *   corresponding number of extra bits are below in the static arrays dist[]
- *   and dext[].
- *
- * - Literal bytes are simply written to the output.  A length/distance pair is
- *   an instruction to copy previously uncompressed bytes to the output.  The
- *   copy is from distance bytes back in the output stream, copying for length
- *   bytes.
- *
- * - Distances pointing before the beginning of the output data are not
- *   permitted.
- *
- * - Overlapped copies, where the length is greater than the distance, are
- *   allowed and common.  For example, a distance of one and a length of 258
- *   simply copies the last byte 258 times.  A distance of four and a length of
- *   twelve copies the last four bytes three times.  A simple forward copy
- *   ignoring whether the length is greater than the distance or not implements
- *   this correctly.  You should not use memcpy() since its behavior is not
- *   defined for overlapped arrays.  You should not use memmove() or bcopy()
- *   since though their behavior -is- defined for overlapping arrays, it is
- *   defined to do the wrong thing in this case.
- */
-local int codes(struct state *s,
-                const struct huffman *lencode,
-                const struct huffman *distcode)
-{
-    int symbol;         /* decoded symbol */
-    int len;            /* length for copy */
-    unsigned dist;      /* distance for copy */
-    static const short lens[29] = { /* Size base for length codes 257..285 */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258};
-    static const short lext[29] = { /* Extra bits for length codes 257..285 */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0};
-    static const short dists[30] = { /* Offset base for distance codes 0..29 */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577};
-    static const short dext[30] = { /* Extra bits for distance codes 0..29 */
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13};
-
-    /* decode literals and length/distance pairs */
-    do {
-        symbol = decode(s, lencode);
-        if (symbol < 0)
-            return symbol;              /* invalid symbol */
-        if (symbol < 256) {             /* literal: symbol is the byte */
-            /* write out the literal */
-            if (s->out != NIL) {
-                if (s->outcnt == s->outlen)
-                    return 1;
-                s->out[s->outcnt] = symbol;
-            }
-            s->outcnt++;
-        }
-        else if (symbol > 256) {        /* length */
-            /* get and compute length */
-            symbol -= 257;
-            if (symbol >= 29)
-                return -10;             /* invalid fixed code */
-            len = lens[symbol] + bits(s, lext[symbol]);
-
-            /* get and check distance */
-            symbol = decode(s, distcode);
-            if (symbol < 0)
-                return symbol;          /* invalid symbol */
-            dist = dists[symbol] + bits(s, dext[symbol]);
-#ifndef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-            if (dist > s->outcnt)
-                return -11;     /* distance too far back */
-#endif
-
-            /* copy length bytes from distance bytes back */
-            if (s->out != NIL) {
-                if (s->outcnt + len > s->outlen)
-                    return 1;
-                while (len--) {
-                    s->out[s->outcnt] =
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        dist > s->outcnt ?
-                            0 :
-#endif
-                            s->out[s->outcnt - dist];
-                    s->outcnt++;
-                }
-            }
-            else
-                s->outcnt += len;
-        }
-    } while (symbol != 256);            /* end of block symbol */
-
-    /* done with a valid fixed or dynamic block */
-    return 0;
-}
-
-/*
- * Process a fixed codes block.
- *
- * Format notes:
- *
- * - This block type can be useful for compressing small amounts of data for
- *   which the size of the code descriptions in a dynamic block exceeds the
- *   benefit of custom codes for that block.  For fixed codes, no bits are
- *   spent on code descriptions.  Instead the code lengths for literal/length
- *   codes and distance codes are fixed.  The specific lengths for each symbol
- *   can be seen in the "for" loops below.
- *
- * - The literal/length code is complete, but has two symbols that are invalid
- *   and should result in an error if received.  This cannot be implemented
- *   simply as an incomplete code since those two symbols are in the "middle"
- *   of the code.  They are eight bits long and the longest literal/length\
- *   code is nine bits.  Therefore the code must be constructed with those
- *   symbols, and the invalid symbols must be detected after decoding.
- *
- * - The fixed distance codes also have two invalid symbols that should result
- *   in an error if received.  Since all of the distance codes are the same
- *   length, this can be implemented as an incomplete code.  Then the invalid
- *   codes are detected while decoding.
- */
-local int fixed(struct state *s)
-{
-    static int virgin = 1;
-    static short lencnt[MAXBITS+1], lensym[FIXLCODES];
-    static short distcnt[MAXBITS+1], distsym[MAXDCODES];
-    static struct huffman lencode, distcode;
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        int symbol;
-        short lengths[FIXLCODES];
-
-        /* construct lencode and distcode */
-        lencode.count = lencnt;
-        lencode.symbol = lensym;
-        distcode.count = distcnt;
-        distcode.symbol = distsym;
-
-        /* literal/length table */
-        for (symbol = 0; symbol < 144; symbol++)
-            lengths[symbol] = 8;
-        for (; symbol < 256; symbol++)
-            lengths[symbol] = 9;
-        for (; symbol < 280; symbol++)
-            lengths[symbol] = 7;
-        for (; symbol < FIXLCODES; symbol++)
-            lengths[symbol] = 8;
-        construct(&lencode, lengths, FIXLCODES);
-
-        /* distance table */
-        for (symbol = 0; symbol < MAXDCODES; symbol++)
-            lengths[symbol] = 5;
-        construct(&distcode, lengths, MAXDCODES);
-
-        /* do this just once */
-        virgin = 0;
-    }
-
-    /* decode data until end-of-block code */
-    return codes(s, &lencode, &distcode);
-}
-
-/*
- * Process a dynamic codes block.
- *
- * Format notes:
- *
- * - A dynamic block starts with a description of the literal/length and
- *   distance codes for that block.  New dynamic blocks allow the compressor to
- *   rapidly adapt to changing data with new codes optimized for that data.
- *
- * - The codes used by the deflate format are "canonical", which means that
- *   the actual bits of the codes are generated in an unambiguous way simply
- *   from the number of bits in each code.  Therefore the code descriptions
- *   are simply a list of code lengths for each symbol.
- *
- * - The code lengths are stored in order for the symbols, so lengths are
- *   provided for each of the literal/length symbols, and for each of the
- *   distance symbols.
- *
- * - If a symbol is not used in the block, this is represented by a zero as
- *   as the code length.  This does not mean a zero-length code, but rather
- *   that no code should be created for this symbol.  There is no way in the
- *   deflate format to represent a zero-length code.
- *
- * - The maximum number of bits in a code is 15, so the possible lengths for
- *   any code are 1..15.
- *
- * - The fact that a length of zero is not permitted for a code has an
- *   interesting consequence.  Normally if only one symbol is used for a given
- *   code, then in fact that code could be represented with zero bits.  However
- *   in deflate, that code has to be at least one bit.  So for example, if
- *   only a single distance base symbol appears in a block, then it will be
- *   represented by a single code of length one, in particular one 0 bit.  This
- *   is an incomplete code, since if a 1 bit is received, it has no meaning,
- *   and should result in an error.  So incomplete distance codes of one symbol
- *   should be permitted, and the receipt of invalid codes should be handled.
- *
- * - It is also possible to have a single literal/length code, but that code
- *   must be the end-of-block code, since every dynamic block has one.  This
- *   is not the most efficient way to create an empty block (an empty fixed
- *   block is fewer bits), but it is allowed by the format.  So incomplete
- *   literal/length codes of one symbol should also be permitted.
- *
- * - If there are only literal codes and no lengths, then there are no distance
- *   codes.  This is represented by one distance code with zero bits.
- *
- * - The list of up to 286 length/literal lengths and up to 30 distance lengths
- *   are themselves compressed using Huffman codes and run-length encoding.  In
- *   the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
- *   that length, and the symbols 16, 17, and 18 are run-length instructions.
- *   Each of 16, 17, and 18 are follwed by extra bits to define the length of
- *   the run.  16 copies the last length 3 to 6 times.  17 represents 3 to 10
- *   zero lengths, and 18 represents 11 to 138 zero lengths.  Unused symbols
- *   are common, hence the special coding for zero lengths.
- *
- * - The symbols for 0..18 are Huffman coded, and so that code must be
- *   described first.  This is simply a sequence of up to 19 three-bit values
- *   representing no code (0) or the code length for that symbol (1..7).
- *
- * - A dynamic block starts with three fixed-size counts from which is computed
- *   the number of literal/length code lengths, the number of distance code
- *   lengths, and the number of code length code lengths (ok, you come up with
- *   a better name!) in the code descriptions.  For the literal/length and
- *   distance codes, lengths after those provided are considered zero, i.e. no
- *   code.  The code length code lengths are received in a permuted order (see
- *   the order[] array below) to make a short code length code length list more
- *   likely.  As it turns out, very short and very long codes are less likely
- *   to be seen in a dynamic code description, hence what may appear initially
- *   to be a peculiar ordering.
- *
- * - Given the number of literal/length code lengths (nlen) and distance code
- *   lengths (ndist), then they are treated as one long list of nlen + ndist
- *   code lengths.  Therefore run-length coding can and often does cross the
- *   boundary between the two sets of lengths.
- *
- * - So to summarize, the code description at the start of a dynamic block is
- *   three counts for the number of code lengths for the literal/length codes,
- *   the distance codes, and the code length codes.  This is followed by the
- *   code length code lengths, three bits each.  This is used to construct the
- *   code length code which is used to read the remainder of the lengths.  Then
- *   the literal/length code lengths and distance lengths are read as a single
- *   set of lengths using the code length codes.  Codes are constructed from
- *   the resulting two sets of lengths, and then finally you can start
- *   decoding actual compressed data in the block.
- *
- * - For reference, a "typical" size for the code description in a dynamic
- *   block is around 80 bytes.
- */
-local int dynamic(struct state *s)
-{
-    int nlen, ndist, ncode;             /* number of lengths in descriptor */
-    int index;                          /* index of lengths[] */
-    int err;                            /* construct() return value */
-    short lengths[MAXCODES];            /* descriptor code lengths */
-    short lencnt[MAXBITS+1], lensym[MAXLCODES];         /* lencode memory */
-    short distcnt[MAXBITS+1], distsym[MAXDCODES];       /* distcode memory */
-    struct huffman lencode, distcode;   /* length and distance codes */
-    static const short order[19] =      /* permutation of code length codes */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* construct lencode and distcode */
-    lencode.count = lencnt;
-    lencode.symbol = lensym;
-    distcode.count = distcnt;
-    distcode.symbol = distsym;
-
-    /* get number of lengths in each table, check lengths */
-    nlen = bits(s, 5) + 257;
-    ndist = bits(s, 5) + 1;
-    ncode = bits(s, 4) + 4;
-    if (nlen > MAXLCODES || ndist > MAXDCODES)
-        return -3;                      /* bad counts */
-
-    /* read code length code lengths (really), missing lengths are zero */
-    for (index = 0; index < ncode; index++)
-        lengths[order[index]] = bits(s, 3);
-    for (; index < 19; index++)
-        lengths[order[index]] = 0;
-
-    /* build huffman table for code lengths codes (use lencode temporarily) */
-    err = construct(&lencode, lengths, 19);
-    if (err != 0)               /* require complete code set here */
-        return -4;
-
-    /* read length/literal and distance code length tables */
-    index = 0;
-    while (index < nlen + ndist) {
-        int symbol;             /* decoded value */
-        int len;                /* last length to repeat */
-
-        symbol = decode(s, &lencode);
-        if (symbol < 0)
-            return symbol;          /* invalid symbol */
-        if (symbol < 16)                /* length in 0..15 */
-            lengths[index++] = symbol;
-        else {                          /* repeat instruction */
-            len = 0;                    /* assume repeating zeros */
-            if (symbol == 16) {         /* repeat last length 3..6 times */
-                if (index == 0)
-                    return -5;          /* no last length! */
-                len = lengths[index - 1];       /* last length */
-                symbol = 3 + bits(s, 2);
-            }
-            else if (symbol == 17)      /* repeat zero 3..10 times */
-                symbol = 3 + bits(s, 3);
-            else                        /* == 18, repeat zero 11..138 times */
-                symbol = 11 + bits(s, 7);
-            if (index + symbol > nlen + ndist)
-                return -6;              /* too many lengths! */
-            while (symbol--)            /* repeat last or zero symbol times */
-                lengths[index++] = len;
-        }
-    }
-
-    /* check for end-of-block code -- there better be one! */
-    if (lengths[256] == 0)
-        return -9;
-
-    /* build huffman table for literal/length codes */
-    err = construct(&lencode, lengths, nlen);
-    if (err && (err < 0 || nlen != lencode.count[0] + lencode.count[1]))
-        return -7;      /* incomplete code ok only for single length 1 code */
-
-    /* build huffman table for distance codes */
-    err = construct(&distcode, lengths + nlen, ndist);
-    if (err && (err < 0 || ndist != distcode.count[0] + distcode.count[1]))
-        return -8;      /* incomplete code ok only for single length 1 code */
-
-    /* decode data until end-of-block code */
-    return codes(s, &lencode, &distcode);
-}
-
-/*
- * Inflate source to dest.  On return, destlen and sourcelen are updated to the
- * size of the uncompressed data and the size of the deflate data respectively.
- * On success, the return value of puff() is zero.  If there is an error in the
- * source data, i.e. it is not in the deflate format, then a negative value is
- * returned.  If there is not enough input available or there is not enough
- * output space, then a positive error is returned.  In that case, destlen and
- * sourcelen are not updated to facilitate retrying from the beginning with the
- * provision of more input data or more output space.  In the case of invalid
- * inflate data (a negative error), the dest and source pointers are updated to
- * facilitate the debugging of deflators.
- *
- * puff() also has a mode to determine the size of the uncompressed output with
- * no output written.  For this dest must be (unsigned char *)0.  In this case,
- * the input value of *destlen is ignored, and on return *destlen is set to the
- * size of the uncompressed output.
- *
- * The return codes are:
- *
- *   2:  available inflate data did not terminate
- *   1:  output space exhausted before completing inflate
- *   0:  successful inflate
- *  -1:  invalid block type (type == 3)
- *  -2:  stored block length did not match one's complement
- *  -3:  dynamic block code description: too many length or distance codes
- *  -4:  dynamic block code description: code lengths codes incomplete
- *  -5:  dynamic block code description: repeat lengths with no first length
- *  -6:  dynamic block code description: repeat more than specified lengths
- *  -7:  dynamic block code description: invalid literal/length code lengths
- *  -8:  dynamic block code description: invalid distance code lengths
- *  -9:  dynamic block code description: missing end-of-block code
- * -10:  invalid literal/length or distance code in fixed or dynamic block
- * -11:  distance is too far back in fixed or dynamic block
- *
- * Format notes:
- *
- * - Three bits are read for each block to determine the kind of block and
- *   whether or not it is the last block.  Then the block is decoded and the
- *   process repeated if it was not the last block.
- *
- * - The leftover bits in the last byte of the deflate data after the last
- *   block (if it was a fixed or dynamic block) are undefined and have no
- *   expected values to check.
- */
-int puff(unsigned char *dest,           /* pointer to destination pointer */
-         unsigned long *destlen,        /* amount of output space */
-         const unsigned char *source,   /* pointer to source data pointer */
-         unsigned long *sourcelen)      /* amount of input available */
-{
-    struct state s;             /* input/output state */
-    int last, type;             /* block information */
-    int err;                    /* return value */
-
-    /* initialize output state */
-    s.out = dest;
-    s.outlen = *destlen;                /* ignored if dest is NIL */
-    s.outcnt = 0;
-
-    /* initialize input state */
-    s.in = source;
-    s.inlen = *sourcelen;
-    s.incnt = 0;
-    s.bitbuf = 0;
-    s.bitcnt = 0;
-
-    /* return if bits() or decode() tries to read past available input */
-    if (setjmp(s.env) != 0)             /* if came back here via longjmp() */
-        err = 2;                        /* then skip do-loop, return error */
-    else {
-        /* process blocks until last block or error */
-        do {
-            last = bits(&s, 1);         /* one if last block */
-            type = bits(&s, 2);         /* block type 0..3 */
-            err = type == 0 ?
-                    stored(&s) :
-                    (type == 1 ?
-                        fixed(&s) :
-                        (type == 2 ?
-                            dynamic(&s) :
-                            -1));       /* type == 3, invalid */
-            if (err != 0)
-                break;                  /* return with error */
-        } while (!last);
-    }
-
-    /* update the lengths and return */
-    if (err <= 0) {
-        *destlen = s.outcnt;
-        *sourcelen = s.incnt;
-    }
-    return err;
-}
diff --git a/src/png/zlib/contrib/puff/puff.h b/src/png/zlib/contrib/puff/puff.h
deleted file mode 100644
index e23a24543..000000000
--- a/src/png/zlib/contrib/puff/puff.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* puff.h
-  Copyright (C) 2002-2013 Mark Adler, all rights reserved
-  version 2.3, 21 Jan 2013
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the author be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Mark Adler    madler@alumni.caltech.edu
- */
-
-
-/*
- * See puff.c for purpose and usage.
- */
-#ifndef NIL
-#  define NIL ((unsigned char *)0)      /* for no output option */
-#endif
-
-int puff(unsigned char *dest,           /* pointer to destination pointer */
-         unsigned long *destlen,        /* amount of output space */
-         const unsigned char *source,   /* pointer to source data pointer */
-         unsigned long *sourcelen);     /* amount of input available */
diff --git a/src/png/zlib/contrib/puff/pufftest.c b/src/png/zlib/contrib/puff/pufftest.c
deleted file mode 100644
index 776481488..000000000
--- a/src/png/zlib/contrib/puff/pufftest.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * pufftest.c
- * Copyright (C) 2002-2013 Mark Adler
- * For conditions of distribution and use, see copyright notice in puff.h
- * version 2.3, 21 Jan 2013
- */
-
-/* Example of how to use puff().
-
-   Usage: puff [-w] [-f] [-nnn] file
-          ... | puff [-w] [-f] [-nnn]
-
-   where file is the input file with deflate data, nnn is the number of bytes
-   of input to skip before inflating (e.g. to skip a zlib or gzip header), and
-   -w is used to write the decompressed data to stdout.  -f is for coverage
-   testing, and causes pufftest to fail with not enough output space (-f does
-   a write like -w, so -w is not required). */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "puff.h"
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#define local static
-
-/* Return size times approximately the cube root of 2, keeping the result as 1,
-   3, or 5 times a power of 2 -- the result is always > size, until the result
-   is the maximum value of an unsigned long, where it remains.  This is useful
-   to keep reallocations less than ~33% over the actual data. */
-local size_t bythirds(size_t size)
-{
-    int n;
-    size_t m;
-
-    m = size;
-    for (n = 0; m; n++)
-        m >>= 1;
-    if (n < 3)
-        return size + 1;
-    n -= 3;
-    m = size >> n;
-    m += m == 6 ? 2 : 1;
-    m <<= n;
-    return m > size ? m : (size_t)(-1);
-}
-
-/* Read the input file *name, or stdin if name is NULL, into allocated memory.
-   Reallocate to larger buffers until the entire file is read in.  Return a
-   pointer to the allocated data, or NULL if there was a memory allocation
-   failure.  *len is the number of bytes of data read from the input file (even
-   if load() returns NULL).  If the input file was empty or could not be opened
-   or read, *len is zero. */
-local void *load(const char *name, size_t *len)
-{
-    size_t size;
-    void *buf, *swap;
-    FILE *in;
-
-    *len = 0;
-    buf = malloc(size = 4096);
-    if (buf == NULL)
-        return NULL;
-    in = name == NULL ? stdin : fopen(name, "rb");
-    if (in != NULL) {
-        for (;;) {
-            *len += fread((char *)buf + *len, 1, size - *len, in);
-            if (*len < size) break;
-            size = bythirds(size);
-            if (size == *len || (swap = realloc(buf, size)) == NULL) {
-                free(buf);
-                buf = NULL;
-                break;
-            }
-            buf = swap;
-        }
-        fclose(in);
-    }
-    return buf;
-}
-
-int main(int argc, char **argv)
-{
-    int ret, put = 0, fail = 0;
-    unsigned skip = 0;
-    char *arg, *name = NULL;
-    unsigned char *source = NULL, *dest;
-    size_t len = 0;
-    unsigned long sourcelen, destlen;
-
-    /* process arguments */
-    while (arg = *++argv, --argc)
-        if (arg[0] == '-') {
-            if (arg[1] == 'w' && arg[2] == 0)
-                put = 1;
-            else if (arg[1] == 'f' && arg[2] == 0)
-                fail = 1, put = 1;
-            else if (arg[1] >= '0' && arg[1] <= '9')
-                skip = (unsigned)atoi(arg + 1);
-            else {
-                fprintf(stderr, "invalid option %s\n", arg);
-                return 3;
-            }
-        }
-        else if (name != NULL) {
-            fprintf(stderr, "only one file name allowed\n");
-            return 3;
-        }
-        else
-            name = arg;
-    source = load(name, &len);
-    if (source == NULL) {
-        fprintf(stderr, "memory allocation failure\n");
-        return 4;
-    }
-    if (len == 0) {
-        fprintf(stderr, "could not read %s, or it was empty\n",
-                name == NULL ? "<stdin>" : name);
-        free(source);
-        return 3;
-    }
-    if (skip >= len) {
-        fprintf(stderr, "skip request of %d leaves no input\n", skip);
-        free(source);
-        return 3;
-    }
-
-    /* test inflate data with offset skip */
-    len -= skip;
-    sourcelen = (unsigned long)len;
-    ret = puff(NIL, &destlen, source + skip, &sourcelen);
-    if (ret)
-        fprintf(stderr, "puff() failed with return code %d\n", ret);
-    else {
-        fprintf(stderr, "puff() succeeded uncompressing %lu bytes\n", destlen);
-        if (sourcelen < len) fprintf(stderr, "%lu compressed bytes unused\n",
-                                     len - sourcelen);
-    }
-
-    /* if requested, inflate again and write decompressd data to stdout */
-    if (put && ret == 0) {
-        if (fail)
-            destlen >>= 1;
-        dest = malloc(destlen);
-        if (dest == NULL) {
-            fprintf(stderr, "memory allocation failure\n");
-            free(source);
-            return 4;
-        }
-        puff(dest, &destlen, source + skip, &sourcelen);
-        SET_BINARY_MODE(stdout);
-        fwrite(dest, 1, destlen, stdout);
-        free(dest);
-    }
-
-    /* clean up */
-    free(source);
-    return ret;
-}
diff --git a/src/png/zlib/contrib/puff/zeros.raw b/src/png/zlib/contrib/puff/zeros.raw
deleted file mode 100644
index 0a90e76b3..000000000
Binary files a/src/png/zlib/contrib/puff/zeros.raw and /dev/null differ
diff --git a/src/png/zlib/contrib/testzlib/testzlib.c b/src/png/zlib/contrib/testzlib/testzlib.c
deleted file mode 100644
index 8626c92ad..000000000
--- a/src/png/zlib/contrib/testzlib/testzlib.c
+++ /dev/null
@@ -1,275 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <windows.h>
-
-#include "zlib.h"
-
-
-void MyDoMinus64(LARGE_INTEGER *R,LARGE_INTEGER A,LARGE_INTEGER B)
-{
-    R->HighPart = A.HighPart - B.HighPart;
-    if (A.LowPart >= B.LowPart)
-        R->LowPart = A.LowPart - B.LowPart;
-    else
-    {
-        R->LowPart = A.LowPart - B.LowPart;
-        R->HighPart --;
-    }
-}
-
-#ifdef _M_X64
-// see http://msdn2.microsoft.com/library/twchhe95(en-us,vs.80).aspx for __rdtsc
-unsigned __int64 __rdtsc(void);
-void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
-{
- //   printf("rdtsc = %I64x\n",__rdtsc());
-   pbeginTime64->QuadPart=__rdtsc();
-}
-
-LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-{
-    LARGE_INTEGER LIres;
-    unsigned _int64 res=__rdtsc()-((unsigned _int64)(beginTime64.QuadPart));
-    LIres.QuadPart=res;
-   // printf("rdtsc = %I64x\n",__rdtsc());
-    return LIres;
-}
-#else
-#ifdef _M_IX86
-void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
-{
-    DWORD dwEdx,dwEax;
-    _asm
-    {
-        rdtsc
-        mov dwEax,eax
-        mov dwEdx,edx
-    }
-    pbeginTime64->LowPart=dwEax;
-    pbeginTime64->HighPart=dwEdx;
-}
-
-void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
-{
-    myGetRDTSC32(pbeginTime64);
-}
-
-LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-{
-    LARGE_INTEGER LIres,endTime64;
-    myGetRDTSC32(&endTime64);
-
-    LIres.LowPart=LIres.HighPart=0;
-    MyDoMinus64(&LIres,endTime64,beginTime64);
-    return LIres;
-}
-#else
-void myGetRDTSC32(LARGE_INTEGER * pbeginTime64)
-{
-}
-
-void BeginCountRdtsc(LARGE_INTEGER * pbeginTime64)
-{
-}
-
-LARGE_INTEGER GetResRdtsc(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-{
-    LARGE_INTEGER lr;
-    lr.QuadPart=0;
-    return lr;
-}
-#endif
-#endif
-
-void BeginCountPerfCounter(LARGE_INTEGER * pbeginTime64,BOOL fComputeTimeQueryPerf)
-{
-    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(pbeginTime64)))
-    {
-        pbeginTime64->LowPart = GetTickCount();
-        pbeginTime64->HighPart = 0;
-    }
-}
-
-DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPerf)
-{
-    LARGE_INTEGER endTime64,ticksPerSecond,ticks;
-    DWORDLONG ticksShifted,tickSecShifted;
-    DWORD dwLog=16+0;
-    DWORD dwRet;
-    if ((!fComputeTimeQueryPerf) || (!QueryPerformanceCounter(&endTime64)))
-        dwRet = (GetTickCount() - beginTime64.LowPart)*1;
-    else
-    {
-        MyDoMinus64(&ticks,endTime64,beginTime64);
-        QueryPerformanceFrequency(&ticksPerSecond);
-
-
-        {
-            ticksShifted = Int64ShrlMod32(*(DWORDLONG*)&ticks,dwLog);
-            tickSecShifted = Int64ShrlMod32(*(DWORDLONG*)&ticksPerSecond,dwLog);
-
-        }
-
-        dwRet = (DWORD)((((DWORD)ticksShifted)*1000)/(DWORD)(tickSecShifted));
-        dwRet *=1;
-    }
-    return dwRet;
-}
-
-int ReadFileMemory(const char* filename,long* plFileSize,unsigned char** pFilePtr)
-{
-    FILE* stream;
-    unsigned char* ptr;
-    int retVal=1;
-    stream=fopen(filename, "rb");
-    if (stream==NULL)
-        return 0;
-
-    fseek(stream,0,SEEK_END);
-
-    *plFileSize=ftell(stream);
-    fseek(stream,0,SEEK_SET);
-    ptr=malloc((*plFileSize)+1);
-    if (ptr==NULL)
-        retVal=0;
-    else
-    {
-        if (fread(ptr, 1, *plFileSize,stream) != (*plFileSize))
-            retVal=0;
-    }
-    fclose(stream);
-    *pFilePtr=ptr;
-    return retVal;
-}
-
-int main(int argc, char *argv[])
-{
-    int BlockSizeCompress=0x8000;
-    int BlockSizeUncompress=0x8000;
-    int cprLevel=Z_DEFAULT_COMPRESSION ;
-    long lFileSize;
-    unsigned char* FilePtr;
-    long lBufferSizeCpr;
-    long lBufferSizeUncpr;
-    long lCompressedSize=0;
-    unsigned char* CprPtr;
-    unsigned char* UncprPtr;
-    long lSizeCpr,lSizeUncpr;
-    DWORD dwGetTick,dwMsecQP;
-    LARGE_INTEGER li_qp,li_rdtsc,dwResRdtsc;
-
-    if (argc<=1)
-    {
-        printf("run TestZlib <File> [BlockSizeCompress] [BlockSizeUncompress] [compres. level]\n");
-        return 0;
-    }
-
-    if (ReadFileMemory(argv[1],&lFileSize,&FilePtr)==0)
-    {
-        printf("error reading %s\n",argv[1]);
-        return 1;
-    }
-    else printf("file %s read, %u bytes\n",argv[1],lFileSize);
-
-    if (argc>=3)
-        BlockSizeCompress=atol(argv[2]);
-
-    if (argc>=4)
-        BlockSizeUncompress=atol(argv[3]);
-
-    if (argc>=5)
-        cprLevel=(int)atol(argv[4]);
-
-    lBufferSizeCpr = lFileSize + (lFileSize/0x10) + 0x200;
-    lBufferSizeUncpr = lBufferSizeCpr;
-
-    CprPtr=(unsigned char*)malloc(lBufferSizeCpr + BlockSizeCompress);
-
-    BeginCountPerfCounter(&li_qp,TRUE);
-    dwGetTick=GetTickCount();
-    BeginCountRdtsc(&li_rdtsc);
-    {
-        z_stream zcpr;
-        int ret=Z_OK;
-        long lOrigToDo = lFileSize;
-        long lOrigDone = 0;
-        int step=0;
-        memset(&zcpr,0,sizeof(z_stream));
-        deflateInit(&zcpr,cprLevel);
-
-        zcpr.next_in = FilePtr;
-        zcpr.next_out = CprPtr;
-
-
-        do
-        {
-            long all_read_before = zcpr.total_in;
-            zcpr.avail_in = min(lOrigToDo,BlockSizeCompress);
-            zcpr.avail_out = BlockSizeCompress;
-            ret=deflate(&zcpr,(zcpr.avail_in==lOrigToDo) ? Z_FINISH : Z_SYNC_FLUSH);
-            lOrigDone += (zcpr.total_in-all_read_before);
-            lOrigToDo -= (zcpr.total_in-all_read_before);
-            step++;
-        } while (ret==Z_OK);
-
-        lSizeCpr=zcpr.total_out;
-        deflateEnd(&zcpr);
-        dwGetTick=GetTickCount()-dwGetTick;
-        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);
-        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);
-        printf("total compress size = %u, in %u step\n",lSizeCpr,step);
-        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);
-        printf("defcpr time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);
-        printf("defcpr result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);
-    }
-
-    CprPtr=(unsigned char*)realloc(CprPtr,lSizeCpr);
-    UncprPtr=(unsigned char*)malloc(lBufferSizeUncpr + BlockSizeUncompress);
-
-    BeginCountPerfCounter(&li_qp,TRUE);
-    dwGetTick=GetTickCount();
-    BeginCountRdtsc(&li_rdtsc);
-    {
-        z_stream zcpr;
-        int ret=Z_OK;
-        long lOrigToDo = lSizeCpr;
-        long lOrigDone = 0;
-        int step=0;
-        memset(&zcpr,0,sizeof(z_stream));
-        inflateInit(&zcpr);
-
-        zcpr.next_in = CprPtr;
-        zcpr.next_out = UncprPtr;
-
-
-        do
-        {
-            long all_read_before = zcpr.total_in;
-            zcpr.avail_in = min(lOrigToDo,BlockSizeUncompress);
-            zcpr.avail_out = BlockSizeUncompress;
-            ret=inflate(&zcpr,Z_SYNC_FLUSH);
-            lOrigDone += (zcpr.total_in-all_read_before);
-            lOrigToDo -= (zcpr.total_in-all_read_before);
-            step++;
-        } while (ret==Z_OK);
-
-        lSizeUncpr=zcpr.total_out;
-        inflateEnd(&zcpr);
-        dwGetTick=GetTickCount()-dwGetTick;
-        dwMsecQP=GetMsecSincePerfCounter(li_qp,TRUE);
-        dwResRdtsc=GetResRdtsc(li_rdtsc,TRUE);
-        printf("total uncompress size = %u, in %u step\n",lSizeUncpr,step);
-        printf("time = %u msec = %f sec\n",dwGetTick,dwGetTick/(double)1000.);
-        printf("uncpr  time QP = %u msec = %f sec\n",dwMsecQP,dwMsecQP/(double)1000.);
-        printf("uncpr  result rdtsc = %I64x\n\n",dwResRdtsc.QuadPart);
-    }
-
-    if (lSizeUncpr==lFileSize)
-    {
-        if (memcmp(FilePtr,UncprPtr,lFileSize)==0)
-            printf("compare ok\n");
-
-    }
-
-    return 0;
-}
diff --git a/src/png/zlib/contrib/testzlib/testzlib.txt b/src/png/zlib/contrib/testzlib/testzlib.txt
deleted file mode 100644
index e508bb22f..000000000
--- a/src/png/zlib/contrib/testzlib/testzlib.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-To build testzLib with Visual Studio 2005:
-
-copy to a directory file from :
-- root of zLib tree
-- contrib/testzlib
-- contrib/masmx86
-- contrib/masmx64
-- contrib/vstudio/vc7
-
-and open testzlib8.sln
\ No newline at end of file
diff --git a/src/png/zlib/contrib/untgz/Makefile b/src/png/zlib/contrib/untgz/Makefile
deleted file mode 100644
index b54266fba..000000000
--- a/src/png/zlib/contrib/untgz/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-CC=cc
-CFLAGS=-g
-
-untgz: untgz.o ../../libz.a
-	$(CC) $(CFLAGS) -o untgz untgz.o -L../.. -lz
-
-untgz.o: untgz.c ../../zlib.h
-	$(CC) $(CFLAGS) -c -I../.. untgz.c
-
-../../libz.a:
-	cd ../..; ./configure; make
-
-clean:
-	rm -f untgz untgz.o *~
diff --git a/src/png/zlib/contrib/untgz/Makefile.msc b/src/png/zlib/contrib/untgz/Makefile.msc
deleted file mode 100644
index 77b860221..000000000
--- a/src/png/zlib/contrib/untgz/Makefile.msc
+++ /dev/null
@@ -1,17 +0,0 @@
-CC=cl
-CFLAGS=-MD
-
-untgz.exe: untgz.obj ..\..\zlib.lib
-	$(CC) $(CFLAGS) untgz.obj ..\..\zlib.lib
-
-untgz.obj: untgz.c ..\..\zlib.h
-	$(CC) $(CFLAGS) -c -I..\.. untgz.c
-
-..\..\zlib.lib:
-	cd ..\..
-	$(MAKE) -f win32\makefile.msc
-	cd contrib\untgz
-
-clean:
-	-del untgz.obj
-	-del untgz.exe
diff --git a/src/png/zlib/contrib/untgz/untgz.c b/src/png/zlib/contrib/untgz/untgz.c
deleted file mode 100644
index 2c391e598..000000000
--- a/src/png/zlib/contrib/untgz/untgz.c
+++ /dev/null
@@ -1,674 +0,0 @@
-/*
- * untgz.c -- Display contents and extract files from a gzip'd TAR file
- *
- * written by Pedro A. Aranda Gutierrez <paag@tid.es>
- * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
- * various fixes by Cosmin Truta <cosmint@cs.ubbcluj.ro>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include "zlib.h"
-
-#ifdef unix
-#  include <unistd.h>
-#else
-#  include <direct.h>
-#  include <io.h>
-#endif
-
-#ifdef WIN32
-#include <windows.h>
-#  ifndef F_OK
-#    define F_OK  0
-#  endif
-#  define mkdir(dirname,mode)   _mkdir(dirname)
-#  ifdef _MSC_VER
-#    define access(path,mode)   _access(path,mode)
-#    define chmod(path,mode)    _chmod(path,mode)
-#    define strdup(str)         _strdup(str)
-#  endif
-#else
-#  include <utime.h>
-#endif
-
-
-/* values used in typeflag field */
-
-#define REGTYPE  '0'            /* regular file */
-#define AREGTYPE '\0'           /* regular file */
-#define LNKTYPE  '1'            /* link */
-#define SYMTYPE  '2'            /* reserved */
-#define CHRTYPE  '3'            /* character special */
-#define BLKTYPE  '4'            /* block special */
-#define DIRTYPE  '5'            /* directory */
-#define FIFOTYPE '6'            /* FIFO special */
-#define CONTTYPE '7'            /* reserved */
-
-/* GNU tar extensions */
-
-#define GNUTYPE_DUMPDIR  'D'    /* file names from dumped directory */
-#define GNUTYPE_LONGLINK 'K'    /* long link name */
-#define GNUTYPE_LONGNAME 'L'    /* long file name */
-#define GNUTYPE_MULTIVOL 'M'    /* continuation of file from another volume */
-#define GNUTYPE_NAMES    'N'    /* file name that does not fit into main hdr */
-#define GNUTYPE_SPARSE   'S'    /* sparse file */
-#define GNUTYPE_VOLHDR   'V'    /* tape/volume header */
-
-
-/* tar header */
-
-#define BLOCKSIZE     512
-#define SHORTNAMESIZE 100
-
-struct tar_header
-{                               /* byte offset */
-  char name[100];               /*   0 */
-  char mode[8];                 /* 100 */
-  char uid[8];                  /* 108 */
-  char gid[8];                  /* 116 */
-  char size[12];                /* 124 */
-  char mtime[12];               /* 136 */
-  char chksum[8];               /* 148 */
-  char typeflag;                /* 156 */
-  char linkname[100];           /* 157 */
-  char magic[6];                /* 257 */
-  char version[2];              /* 263 */
-  char uname[32];               /* 265 */
-  char gname[32];               /* 297 */
-  char devmajor[8];             /* 329 */
-  char devminor[8];             /* 337 */
-  char prefix[155];             /* 345 */
-                                /* 500 */
-};
-
-union tar_buffer
-{
-  char               buffer[BLOCKSIZE];
-  struct tar_header  header;
-};
-
-struct attr_item
-{
-  struct attr_item  *next;
-  char              *fname;
-  int                mode;
-  time_t             time;
-};
-
-enum { TGZ_EXTRACT, TGZ_LIST, TGZ_INVALID };
-
-char *TGZfname          OF((const char *));
-void TGZnotfound        OF((const char *));
-
-int getoct              OF((char *, int));
-char *strtime           OF((time_t *));
-int setfiletime         OF((char *, time_t));
-void push_attr          OF((struct attr_item **, char *, int, time_t));
-void restore_attr       OF((struct attr_item **));
-
-int ExprMatch           OF((char *, char *));
-
-int makedir             OF((char *));
-int matchname           OF((int, int, char **, char *));
-
-void error              OF((const char *));
-int tar                 OF((gzFile, int, int, int, char **));
-
-void help               OF((int));
-int main                OF((int, char **));
-
-char *prog;
-
-const char *TGZsuffix[] = { "\0", ".tar", ".tar.gz", ".taz", ".tgz", NULL };
-
-/* return the file name of the TGZ archive */
-/* or NULL if it does not exist */
-
-char *TGZfname (const char *arcname)
-{
-  static char buffer[1024];
-  int origlen,i;
-
-  strcpy(buffer,arcname);
-  origlen = strlen(buffer);
-
-  for (i=0; TGZsuffix[i]; i++)
-    {
-       strcpy(buffer+origlen,TGZsuffix[i]);
-       if (access(buffer,F_OK) == 0)
-         return buffer;
-    }
-  return NULL;
-}
-
-
-/* error message for the filename */
-
-void TGZnotfound (const char *arcname)
-{
-  int i;
-
-  fprintf(stderr,"%s: Couldn't find ",prog);
-  for (i=0;TGZsuffix[i];i++)
-    fprintf(stderr,(TGZsuffix[i+1]) ? "%s%s, " : "or %s%s\n",
-            arcname,
-            TGZsuffix[i]);
-  exit(1);
-}
-
-
-/* convert octal digits to int */
-/* on error return -1 */
-
-int getoct (char *p,int width)
-{
-  int result = 0;
-  char c;
-
-  while (width--)
-    {
-      c = *p++;
-      if (c == 0)
-        break;
-      if (c == ' ')
-        continue;
-      if (c < '0' || c > '7')
-        return -1;
-      result = result * 8 + (c - '0');
-    }
-  return result;
-}
-
-
-/* convert time_t to string */
-/* use the "YYYY/MM/DD hh:mm:ss" format */
-
-char *strtime (time_t *t)
-{
-  struct tm   *local;
-  static char result[32];
-
-  local = localtime(t);
-  sprintf(result,"%4d/%02d/%02d %02d:%02d:%02d",
-          local->tm_year+1900, local->tm_mon+1, local->tm_mday,
-          local->tm_hour, local->tm_min, local->tm_sec);
-  return result;
-}
-
-
-/* set file time */
-
-int setfiletime (char *fname,time_t ftime)
-{
-#ifdef WIN32
-  static int isWinNT = -1;
-  SYSTEMTIME st;
-  FILETIME locft, modft;
-  struct tm *loctm;
-  HANDLE hFile;
-  int result;
-
-  loctm = localtime(&ftime);
-  if (loctm == NULL)
-    return -1;
-
-  st.wYear         = (WORD)loctm->tm_year + 1900;
-  st.wMonth        = (WORD)loctm->tm_mon + 1;
-  st.wDayOfWeek    = (WORD)loctm->tm_wday;
-  st.wDay          = (WORD)loctm->tm_mday;
-  st.wHour         = (WORD)loctm->tm_hour;
-  st.wMinute       = (WORD)loctm->tm_min;
-  st.wSecond       = (WORD)loctm->tm_sec;
-  st.wMilliseconds = 0;
-  if (!SystemTimeToFileTime(&st, &locft) ||
-      !LocalFileTimeToFileTime(&locft, &modft))
-    return -1;
-
-  if (isWinNT < 0)
-    isWinNT = (GetVersion() < 0x80000000) ? 1 : 0;
-  hFile = CreateFile(fname, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
-                     (isWinNT ? FILE_FLAG_BACKUP_SEMANTICS : 0),
-                     NULL);
-  if (hFile == INVALID_HANDLE_VALUE)
-    return -1;
-  result = SetFileTime(hFile, NULL, NULL, &modft) ? 0 : -1;
-  CloseHandle(hFile);
-  return result;
-#else
-  struct utimbuf settime;
-
-  settime.actime = settime.modtime = ftime;
-  return utime(fname,&settime);
-#endif
-}
-
-
-/* push file attributes */
-
-void push_attr(struct attr_item **list,char *fname,int mode,time_t time)
-{
-  struct attr_item *item;
-
-  item = (struct attr_item *)malloc(sizeof(struct attr_item));
-  if (item == NULL)
-    error("Out of memory");
-  item->fname = strdup(fname);
-  item->mode  = mode;
-  item->time  = time;
-  item->next  = *list;
-  *list       = item;
-}
-
-
-/* restore file attributes */
-
-void restore_attr(struct attr_item **list)
-{
-  struct attr_item *item, *prev;
-
-  for (item = *list; item != NULL; )
-    {
-      setfiletime(item->fname,item->time);
-      chmod(item->fname,item->mode);
-      prev = item;
-      item = item->next;
-      free(prev);
-    }
-  *list = NULL;
-}
-
-
-/* match regular expression */
-
-#define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
-
-int ExprMatch (char *string,char *expr)
-{
-  while (1)
-    {
-      if (ISSPECIAL(*expr))
-        {
-          if (*expr == '/')
-            {
-              if (*string != '\\' && *string != '/')
-                return 0;
-              string ++; expr++;
-            }
-          else if (*expr == '*')
-            {
-              if (*expr ++ == 0)
-                return 1;
-              while (*++string != *expr)
-                if (*string == 0)
-                  return 0;
-            }
-        }
-      else
-        {
-          if (*string != *expr)
-            return 0;
-          if (*expr++ == 0)
-            return 1;
-          string++;
-        }
-    }
-}
-
-
-/* recursive mkdir */
-/* abort on ENOENT; ignore other errors like "directory already exists" */
-/* return 1 if OK */
-/*        0 on error */
-
-int makedir (char *newdir)
-{
-  char *buffer = strdup(newdir);
-  char *p;
-  int  len = strlen(buffer);
-
-  if (len <= 0) {
-    free(buffer);
-    return 0;
-  }
-  if (buffer[len-1] == '/') {
-    buffer[len-1] = '\0';
-  }
-  if (mkdir(buffer, 0755) == 0)
-    {
-      free(buffer);
-      return 1;
-    }
-
-  p = buffer+1;
-  while (1)
-    {
-      char hold;
-
-      while(*p && *p != '\\' && *p != '/')
-        p++;
-      hold = *p;
-      *p = 0;
-      if ((mkdir(buffer, 0755) == -1) && (errno == ENOENT))
-        {
-          fprintf(stderr,"%s: Couldn't create directory %s\n",prog,buffer);
-          free(buffer);
-          return 0;
-        }
-      if (hold == 0)
-        break;
-      *p++ = hold;
-    }
-  free(buffer);
-  return 1;
-}
-
-
-int matchname (int arg,int argc,char **argv,char *fname)
-{
-  if (arg == argc)      /* no arguments given (untgz tgzarchive) */
-    return 1;
-
-  while (arg < argc)
-    if (ExprMatch(fname,argv[arg++]))
-      return 1;
-
-  return 0; /* ignore this for the moment being */
-}
-
-
-/* tar file list or extract */
-
-int tar (gzFile in,int action,int arg,int argc,char **argv)
-{
-  union  tar_buffer buffer;
-  int    len;
-  int    err;
-  int    getheader = 1;
-  int    remaining = 0;
-  FILE   *outfile = NULL;
-  char   fname[BLOCKSIZE];
-  int    tarmode;
-  time_t tartime;
-  struct attr_item *attributes = NULL;
-
-  if (action == TGZ_LIST)
-    printf("    date      time     size                       file\n"
-           " ---------- -------- --------- -------------------------------------\n");
-  while (1)
-    {
-      len = gzread(in, &buffer, BLOCKSIZE);
-      if (len < 0)
-        error(gzerror(in, &err));
-      /*
-       * Always expect complete blocks to process
-       * the tar information.
-       */
-      if (len != BLOCKSIZE)
-        {
-          action = TGZ_INVALID; /* force error exit */
-          remaining = 0;        /* force I/O cleanup */
-        }
-
-      /*
-       * If we have to get a tar header
-       */
-      if (getheader >= 1)
-        {
-          /*
-           * if we met the end of the tar
-           * or the end-of-tar block,
-           * we are done
-           */
-          if (len == 0 || buffer.header.name[0] == 0)
-            break;
-
-          tarmode = getoct(buffer.header.mode,8);
-          tartime = (time_t)getoct(buffer.header.mtime,12);
-          if (tarmode == -1 || tartime == (time_t)-1)
-            {
-              buffer.header.name[0] = 0;
-              action = TGZ_INVALID;
-            }
-
-          if (getheader == 1)
-            {
-              strncpy(fname,buffer.header.name,SHORTNAMESIZE);
-              if (fname[SHORTNAMESIZE-1] != 0)
-                  fname[SHORTNAMESIZE] = 0;
-            }
-          else
-            {
-              /*
-               * The file name is longer than SHORTNAMESIZE
-               */
-              if (strncmp(fname,buffer.header.name,SHORTNAMESIZE-1) != 0)
-                  error("bad long name");
-              getheader = 1;
-            }
-
-          /*
-           * Act according to the type flag
-           */
-          switch (buffer.header.typeflag)
-            {
-            case DIRTYPE:
-              if (action == TGZ_LIST)
-                printf(" %s     <dir> %s\n",strtime(&tartime),fname);
-              if (action == TGZ_EXTRACT)
-                {
-                  makedir(fname);
-                  push_attr(&attributes,fname,tarmode,tartime);
-                }
-              break;
-            case REGTYPE:
-            case AREGTYPE:
-              remaining = getoct(buffer.header.size,12);
-              if (remaining == -1)
-                {
-                  action = TGZ_INVALID;
-                  break;
-                }
-              if (action == TGZ_LIST)
-                printf(" %s %9d %s\n",strtime(&tartime),remaining,fname);
-              else if (action == TGZ_EXTRACT)
-                {
-                  if (matchname(arg,argc,argv,fname))
-                    {
-                      outfile = fopen(fname,"wb");
-                      if (outfile == NULL) {
-                        /* try creating directory */
-                        char *p = strrchr(fname, '/');
-                        if (p != NULL) {
-                          *p = '\0';
-                          makedir(fname);
-                          *p = '/';
-                          outfile = fopen(fname,"wb");
-                        }
-                      }
-                      if (outfile != NULL)
-                        printf("Extracting %s\n",fname);
-                      else
-                        fprintf(stderr, "%s: Couldn't create %s",prog,fname);
-                    }
-                  else
-                    outfile = NULL;
-                }
-              getheader = 0;
-              break;
-            case GNUTYPE_LONGLINK:
-            case GNUTYPE_LONGNAME:
-              remaining = getoct(buffer.header.size,12);
-              if (remaining < 0 || remaining >= BLOCKSIZE)
-                {
-                  action = TGZ_INVALID;
-                  break;
-                }
-              len = gzread(in, fname, BLOCKSIZE);
-              if (len < 0)
-                error(gzerror(in, &err));
-              if (fname[BLOCKSIZE-1] != 0 || (int)strlen(fname) > remaining)
-                {
-                  action = TGZ_INVALID;
-                  break;
-                }
-              getheader = 2;
-              break;
-            default:
-              if (action == TGZ_LIST)
-                printf(" %s     <---> %s\n",strtime(&tartime),fname);
-              break;
-            }
-        }
-      else
-        {
-          unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
-
-          if (outfile != NULL)
-            {
-              if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes)
-                {
-                  fprintf(stderr,
-                    "%s: Error writing %s -- skipping\n",prog,fname);
-                  fclose(outfile);
-                  outfile = NULL;
-                  remove(fname);
-                }
-            }
-          remaining -= bytes;
-        }
-
-      if (remaining == 0)
-        {
-          getheader = 1;
-          if (outfile != NULL)
-            {
-              fclose(outfile);
-              outfile = NULL;
-              if (action != TGZ_INVALID)
-                push_attr(&attributes,fname,tarmode,tartime);
-            }
-        }
-
-      /*
-       * Abandon if errors are found
-       */
-      if (action == TGZ_INVALID)
-        {
-          error("broken archive");
-          break;
-        }
-    }
-
-  /*
-   * Restore file modes and time stamps
-   */
-  restore_attr(&attributes);
-
-  if (gzclose(in) != Z_OK)
-    error("failed gzclose");
-
-  return 0;
-}
-
-
-/* ============================================================ */
-
-void help(int exitval)
-{
-  printf("untgz version 0.2.1\n"
-         "  using zlib version %s\n\n",
-         zlibVersion());
-  printf("Usage: untgz file.tgz            extract all files\n"
-         "       untgz file.tgz fname ...  extract selected files\n"
-         "       untgz -l file.tgz         list archive contents\n"
-         "       untgz -h                  display this help\n");
-  exit(exitval);
-}
-
-void error(const char *msg)
-{
-  fprintf(stderr, "%s: %s\n", prog, msg);
-  exit(1);
-}
-
-
-/* ============================================================ */
-
-#if defined(WIN32) && defined(__GNUC__)
-int _CRT_glob = 0;      /* disable argument globbing in MinGW */
-#endif
-
-int main(int argc,char **argv)
-{
-    int         action = TGZ_EXTRACT;
-    int         arg = 1;
-    char        *TGZfile;
-    gzFile      *f;
-
-    prog = strrchr(argv[0],'\\');
-    if (prog == NULL)
-      {
-        prog = strrchr(argv[0],'/');
-        if (prog == NULL)
-          {
-            prog = strrchr(argv[0],':');
-            if (prog == NULL)
-              prog = argv[0];
-            else
-              prog++;
-          }
-        else
-          prog++;
-      }
-    else
-      prog++;
-
-    if (argc == 1)
-      help(0);
-
-    if (strcmp(argv[arg],"-l") == 0)
-      {
-        action = TGZ_LIST;
-        if (argc == ++arg)
-          help(0);
-      }
-    else if (strcmp(argv[arg],"-h") == 0)
-      {
-        help(0);
-      }
-
-    if ((TGZfile = TGZfname(argv[arg])) == NULL)
-      TGZnotfound(argv[arg]);
-
-    ++arg;
-    if ((action == TGZ_LIST) && (arg != argc))
-      help(1);
-
-/*
- *  Process the TGZ file
- */
-    switch(action)
-      {
-      case TGZ_LIST:
-      case TGZ_EXTRACT:
-        f = gzopen(TGZfile,"rb");
-        if (f == NULL)
-          {
-            fprintf(stderr,"%s: Couldn't gzopen %s\n",prog,TGZfile);
-            return 1;
-          }
-        exit(tar(f, action, arg, argc, argv));
-      break;
-
-      default:
-        error("Unknown option");
-        exit(1);
-      }
-
-    return 0;
-}
diff --git a/src/png/zlib/contrib/vstudio/readme.txt b/src/png/zlib/contrib/vstudio/readme.txt
deleted file mode 100644
index 48cccc0d2..000000000
--- a/src/png/zlib/contrib/vstudio/readme.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-Building instructions for the DLL versions of Zlib 1.2.11
-========================================================
-
-This directory contains projects that build zlib and minizip using
-Microsoft Visual C++ 9.0/10.0.
-
-You don't need to build these projects yourself. You can download the
-binaries from:
-  http://www.winimage.com/zLibDll
-
-More information can be found at this site.
-
-
-
-
-
-Build instructions for Visual Studio 2008 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Compile assembly code (with Visual Studio Command Prompt) by running:
-   bld_ml64.bat (in contrib\masmx64)
-   bld_ml32.bat (in contrib\masmx86)
-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
-- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
-
-Build instructions for Visual Studio 2010 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
-
-Build instructions for Visual Studio 2012 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
-
-Build instructions for Visual Studio 2013 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
-
-Build instructions for Visual Studio 2015 (32 bits or 64 bits)
---------------------------------------------------------------
-- Decompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
-
-
-Important
----------
-- To use zlibwapi.dll in your application, you must define the
-  macro ZLIB_WINAPI when compiling your application's source files.
-
-
-Additional notes
-----------------
-- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
-  by Gilles Vollant from the zlib 1.1.x sources, and distributed at
-    http://www.winimage.com/zLibDll
-  It uses the WINAPI calling convention for the exported functions, and
-  includes the minizip functionality. If your application needs that
-  particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
-
-- The new DLL was renamed because there exist several incompatible
-  versions of zlib.dll on the Internet.
-
-- There is also an official DLL build of zlib, named zlib1.dll. This one
-  is exporting the functions using the CDECL convention. See the file
-  win32\DLL_FAQ.txt found in this zlib distribution.
-
-- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
-  has a slightly different effect. To avoid compatibility problems, do
-  not define it here.
-
-
-Gilles Vollant
-info@winimage.com
-
-Visual Studio 2013 and 2015 Projects from Sean Hunt
-seandhunt_7@yahoo.com
diff --git a/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj
deleted file mode 100644
index 1b3624215..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
deleted file mode 100644
index 0bd12210c..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{0844199a-966b-4f19-81db-1e0125e141b9}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj
deleted file mode 100644
index ccd3651df..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
deleted file mode 100644
index 7076d76ff..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{f46ab6a6-548f-43cb-ae96-681abb5bd5db}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj
deleted file mode 100644
index 476b8ea45..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
deleted file mode 100644
index 327649103..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{c274fe07-05f2-461c-964b-f6341e4e7eb5}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\testzlib\testzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
deleted file mode 100644
index 8e38876fa..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
deleted file mode 100644
index ab87f09f4..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{e573e075-00bd-4a7d-bd67-a8cc9bfc5aca}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/zlib.rc b/src/png/zlib/contrib/vstudio/vc10/zlib.rc
deleted file mode 100644
index c4e4b016e..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
deleted file mode 100644
index 45389a352..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
+++ /dev/null
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
deleted file mode 100644
index 0c8b2501c..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{174213f6-7f66-4ae8-a3a8-a1e0a1e6ffdd}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzclose.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\ioapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/zlibvc.def b/src/png/zlib/contrib/vstudio/vc10/zlibvc.def
deleted file mode 100644
index f876c3bca..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/src/png/zlib/contrib/vstudio/vc10/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc10/zlibvc.sln
deleted file mode 100644
index 649f40c7e..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/zlibvc.sln
+++ /dev/null
@@ -1,135 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
deleted file mode 100644
index 7d7c49a6d..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapid</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapid</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
deleted file mode 100644
index 22786824f..000000000
--- a/src/png/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{07934a85-8b61-443d-a0ee-b2eedb74f3cd}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{1d99675b-433d-4a21-9e50-ed4ab8b19762}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{431c0958-fa71-44d0-9084-2d19d100c0cc}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzclose.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzlib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\gzwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\ioapi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\iowin32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\infblock.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\infcodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\inffast.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\inftrees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\infutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zconf.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\zutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj
deleted file mode 100644
index 99be63d69..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/miniunz.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc11/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc11/minizip.vcxproj
deleted file mode 100644
index d6e98f4d5..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/minizip.vcxproj
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj
deleted file mode 100644
index 0115dd17b..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/testzlib.vcxproj
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj
deleted file mode 100644
index 9d36336eb..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc11/zlib.rc b/src/png/zlib/contrib/vstudio/vc11/zlib.rc
deleted file mode 100644
index c4e4b016e..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/src/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
deleted file mode 100644
index 64b4d869d..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc11/zlibvc.def b/src/png/zlib/contrib/vstudio/vc11/zlibvc.def
deleted file mode 100644
index f876c3bca..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/src/png/zlib/contrib/vstudio/vc11/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc11/zlibvc.sln
deleted file mode 100644
index b7e381266..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/zlibvc.sln
+++ /dev/null
@@ -1,117 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
deleted file mode 100644
index c4cffccf1..000000000
--- a/src/png/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
+++ /dev/null
@@ -1,688 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj
deleted file mode 100644
index d88ac7fc7..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/miniunz.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc12/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc12/minizip.vcxproj
deleted file mode 100644
index f1f239c9e..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/minizip.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj
deleted file mode 100644
index 64b2cbe34..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/testzlib.vcxproj
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj
deleted file mode 100644
index c66573a8b..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc12/zlib.rc b/src/png/zlib/contrib/vstudio/vc12/zlib.rc
deleted file mode 100644
index c4e4b016e..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/src/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
deleted file mode 100644
index 3fdee7c50..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc12/zlibvc.def b/src/png/zlib/contrib/vstudio/vc12/zlibvc.def
deleted file mode 100644
index f876c3bca..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/src/png/zlib/contrib/vstudio/vc12/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc12/zlibvc.sln
deleted file mode 100644
index dcda22984..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/zlibvc.sln
+++ /dev/null
@@ -1,119 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
deleted file mode 100644
index ab2b6c360..000000000
--- a/src/png/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
+++ /dev/null
@@ -1,692 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj b/src/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj
deleted file mode 100644
index 9b5c07587..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/miniunz.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\miniunz.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc14/minizip.vcxproj b/src/png/zlib/contrib/vstudio/vc14/minizip.vcxproj
deleted file mode 100644
index 968a410a1..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/minizip.vcxproj
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)minizip.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\minizip\minizip.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj b/src/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj
deleted file mode 100644
index 2c371252a..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/testzlib.vcxproj
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid>
-    <RootNamespace>testzlib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj b/src/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj
deleted file mode 100644
index d87474dec..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\testzlib\testzlib.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="zlibvc.vcxproj">
-      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc14/zlib.rc b/src/png/zlib/contrib/vstudio/vc14/zlib.rc
deleted file mode 100644
index c4e4b016e..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/src/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj b/src/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
deleted file mode 100644
index 3e4b98639..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c" />
-    <ClCompile Include="..\..\minizip\zip.c" />
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc14/zlibvc.def b/src/png/zlib/contrib/vstudio/vc14/zlibvc.def
deleted file mode 100644
index f876c3bca..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/src/png/zlib/contrib/vstudio/vc14/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc14/zlibvc.sln
deleted file mode 100644
index 6f4a1076a..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/zlibvc.sln
+++ /dev/null
@@ -1,119 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/src/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
deleted file mode 100644
index f8f673cb0..000000000
--- a/src/png/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
+++ /dev/null
@@ -1,692 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Itanium">
-      <Configuration>Debug</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
-      <Configuration>ReleaseWithoutAsm</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Itanium">
-      <Configuration>Release</Configuration>
-      <Platform>Itanium</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Itanium</TargetEnvironment>
-      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
-    </Midl>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
-      <BrowseInformation>
-      </BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
-      <TargetMachine>MachineIA64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\adler32.c" />
-    <ClCompile Include="..\..\..\compress.c" />
-    <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\gzclose.c" />
-    <ClCompile Include="..\..\..\gzlib.c" />
-    <ClCompile Include="..\..\..\gzread.c" />
-    <ClCompile Include="..\..\..\gzwrite.c" />
-    <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\inffast.c" />
-    <ClCompile Include="..\..\..\inflate.c" />
-    <ClCompile Include="..\..\..\inftrees.c" />
-    <ClCompile Include="..\..\minizip\ioapi.c" />
-    <ClCompile Include="..\..\minizip\iowin32.c" />
-    <ClCompile Include="..\..\..\trees.c" />
-    <ClCompile Include="..\..\..\uncompr.c" />
-    <ClCompile Include="..\..\minizip\unzip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\minizip\zip.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\..\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="zlibvc.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\deflate.h" />
-    <ClInclude Include="..\..\..\infblock.h" />
-    <ClInclude Include="..\..\..\infcodes.h" />
-    <ClInclude Include="..\..\..\inffast.h" />
-    <ClInclude Include="..\..\..\inftrees.h" />
-    <ClInclude Include="..\..\..\infutil.h" />
-    <ClInclude Include="..\..\..\zconf.h" />
-    <ClInclude Include="..\..\..\zlib.h" />
-    <ClInclude Include="..\..\..\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/png/zlib/contrib/vstudio/vc9/miniunz.vcproj b/src/png/zlib/contrib/vstudio/vc9/miniunz.vcproj
deleted file mode 100644
index 038a9e5fa..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/miniunz.vcproj
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="miniunz"
-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/miniunz.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\minizip\miniunz.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/png/zlib/contrib/vstudio/vc9/minizip.vcproj b/src/png/zlib/contrib/vstudio/vc9/minizip.vcproj
deleted file mode 100644
index ad4023991..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/minizip.vcproj
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="minizip"
-	ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\MiniZip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\MiniZip$(ConfigurationName)"
-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\$(ConfigurationName)"
-			IntermediateDirectory="x64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\$(ConfigurationName)"
-			IntermediateDirectory="ia64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\$(ConfigurationName)"
-			IntermediateDirectory="x64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\$(ConfigurationName)"
-			IntermediateDirectory="ia64\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/minizip.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\minizip\minizip.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/png/zlib/contrib/vstudio/vc9/testzlib.vcproj b/src/png/zlib/contrib/vstudio/vc9/testzlib.vcproj
deleted file mode 100644
index c9f19d24e..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/testzlib.vcproj
+++ /dev/null
@@ -1,852 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="testzlib"
-	ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-	RootNamespace="testzlib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="4"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				AssemblerListingLocation="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
-				GenerateManifest="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="4"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Win32"
-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|x64"
-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				AssemblerListingLocation="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				GenerateManifest="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Itanium"
-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				AssemblerListingLocation="$(IntDir)\"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
-				GenerateManifest="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\.."
-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\..\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\testzlib\testzlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj b/src/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
deleted file mode 100644
index d7530fd7d..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="TestZlibDll"
-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="2"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
-				SubSystem="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="1"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
-				StringPooling="true"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="$(IntDir)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
-				OutputFile="$(OutDir)/testzlib.exe"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath="..\..\testzlib\testzlib.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/png/zlib/contrib/vstudio/vc9/zlib.rc b/src/png/zlib/contrib/vstudio/vc9/zlib.rc
deleted file mode 100644
index c4e4b016e..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/zlib.rc
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION	 1, 2, 11, 0
-  PRODUCTVERSION 1, 2, 11, 0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",	"1.2.11\0"
-      VALUE "InternalName",	"zlib\0"
-      VALUE "OriginalFilename",	"zlibwapi.dll\0"
-      VALUE "ProductName",	"ZLib.DLL\0"
-      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
-      VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/src/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj b/src/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj
deleted file mode 100644
index d4ffb46b2..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/zlibstat.vcproj
+++ /dev/null
@@ -1,835 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="zlibstat"
-	ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				ExceptionHandling="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Win32"
-			OutputDirectory="x86\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|x64"
-			OutputDirectory="x64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Itanium"
-			OutputDirectory="ia64\ZlibStat$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp"
-			ConfigurationType="4"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="2"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibstat.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB"
-				OutputFile="$(OutDir)\zlibstat.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			>
-			<File
-				RelativePath="..\..\..\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzclose.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzguts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzwrite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\ioapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\unzip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\zip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\zlib.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\zlibvc.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/png/zlib/contrib/vstudio/vc9/zlibvc.def b/src/png/zlib/contrib/vstudio/vc9/zlibvc.def
deleted file mode 100644
index f876c3bca..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/zlibvc.def
+++ /dev/null
@@ -1,153 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.2
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        inflateResetKeep                        @163
-        deflateResetKeep                        @164
-
-; zlib1 v1.2.7 added:
-        gzopen_w                                @165
-
-; zlib1 v1.2.8 added:
-        inflateGetDictionary                    @166
-        gzvprintf                               @167
-
-; zlib1 v1.2.9 added:
-        inflateCodesUsed                        @168
-        inflateValidate                         @169
-        uncompress2                             @170
-        gzfread                                 @171
-        gzfwrite                                @172
-        deflateGetDictionary                    @173
-        adler32_z                               @174
-        crc32_z                                 @175
diff --git a/src/png/zlib/contrib/vstudio/vc9/zlibvc.sln b/src/png/zlib/contrib/vstudio/vc9/zlibvc.sln
deleted file mode 100644
index 75c64c3f4..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/zlibvc.sln
+++ /dev/null
@@ -1,144 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestZlibDll", "testzlibdll.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D} = {8FD826F8-3739-44E6-8CC8-997122E53B8D}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj b/src/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj
deleted file mode 100644
index 95bb241f3..000000000
--- a/src/png/zlib/contrib/vstudio/vc9/zlibvc.vcproj
+++ /dev/null
@@ -1,1156 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="zlibvc"
-	ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
-	RootNamespace="zlibvc"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-		<Platform
-			Name="Itanium"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
-				ExceptionHandling="0"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Itanium"
-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="2"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				ExceptionHandling="0"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="false"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Win32"
-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|x64"
-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseWithoutAsm|Itanium"
-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="2"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="x86\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="x64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Itanium"
-			OutputDirectory="ia64\ZlibDll$(ConfigurationName)"
-			IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp"
-			ConfigurationType="2"
-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="2"
-				TypeLibraryName="$(OutDir)/zlibvc.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="$(IntDir)/zlibvc.pch"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(OutDir)\"
-				BrowseInformation="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\zlibwapi.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="false"
-				ModuleDefinitionFile=".\zlibvc.def"
-				ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb"
-				GenerateMapFile="true"
-				MapFileName="$(OutDir)/zlibwapi.map"
-				SubSystem="2"
-				OptimizeForWindows98="1"
-				ImportLibrary="$(OutDir)/zlibwapi.lib"
-				TargetMachine="5"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath="..\..\..\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzclose.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzguts.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzlib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gzwrite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\masmx64\inffas8664.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseWithoutAsm|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\ioapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\iowin32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\minizip\unzip.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\minizip\zip.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Itanium"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="ZLIB_INTERNAL"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\zlib.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\zlibvc.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="..\..\..\deflate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infblock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infcodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inffast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\inftrees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\infutil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\zutil.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/png/zlib/crc32.c b/src/png/zlib/crc32.c
deleted file mode 100644
index 9580440c0..000000000
--- a/src/png/zlib/crc32.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-  protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-  first call get_crc_table() to initialize the tables before allowing more than
-  one thread to use crc32().
-
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
- */
-
-#ifdef MAKECRCH
-#  include <stdio.h>
-#  ifndef DYNAMIC_CRC_TABLE
-#    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#if !defined(NOBYFOUR) && defined(Z_U4)
-#  define BYFOUR
-#endif
-#ifdef BYFOUR
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, z_size_t));
-#  define TBLS 8
-#else
-#  define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
-
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
-#endif /* MAKECRCH */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    z_crc_t c;
-    int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
-            }
-        }
-#endif /* BYFOUR */
-
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
-    }
-
-#ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
-    {
-        FILE *out;
-
-        out = fopen("crc32.h", "w");
-        if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
-        }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
-        fclose(out);
-    }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const z_crc_t FAR *table;
-{
-    int n;
-
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
-                (unsigned long)(table[n]),
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const z_crc_t FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-    return (const z_crc_t FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32_z(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
-
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
-    }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
-    }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    uInt len;
-{
-    return crc32_z(crc, buf, len);
-}
-
-#ifdef BYFOUR
-
-/*
-   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
-   integer pointer type. This violates the strict aliasing rule, where a
-   compiler can assume, for optimization purposes, that two pointers to
-   fundamentally different types won't ever point to the same memory. This can
-   manifest as a problem only if one of the pointers is written to. This code
-   only reads from those pointers. So long as this code remains isolated in
-   this compilation unit, there won't be a problem. For this reason, this code
-   should not be copied and pasted into a compilation unit in which other code
-   writes to the buffer that is passed to these routines.
- */
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = (z_crc_t)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *buf4++; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    z_size_t len;
-{
-    register z_crc_t c;
-    register const z_crc_t FAR *buf4;
-
-    c = ZSWAP32((z_crc_t)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
-    }
-
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(ZSWAP32(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
-
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off64_t len2;
-{
-    return crc32_combine_(crc1, crc2, len2);
-}
diff --git a/src/png/zlib/crc32.h b/src/png/zlib/crc32.h
deleted file mode 100644
index 9e0c77810..000000000
--- a/src/png/zlib/crc32.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const z_crc_t FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};
diff --git a/src/png/zlib/deflate.c b/src/png/zlib/deflate.c
deleted file mode 100644
index 1ec761448..000000000
--- a/src/png/zlib/deflate.c
+++ /dev/null
@@ -1,2163 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://tools.ietf.org/html/rfc1951
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local int deflateStateCheck      OF((z_streamp strm));
-local void slide_hash     OF((deflate_state *s));
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle    OF((deflate_state *s, int flush));
-local block_state deflate_huff   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef ZLIB_DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
- *    characters, so that a running hash key can be computed from the previous
- *    key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to INSERT_STRING are made with consecutive input
- *    characters and the first MIN_MATCH bytes of str are valid (except for
- *    the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ===========================================================================
- * Slide the hash table when sliding the window down (could be avoided with 32
- * bit values at the expense of memory usage). We slide even when level == 0 to
- * keep the hash table consistent if we switch back to level > 0 later.
- */
-local void slide_hash(s)
-    deflate_state *s;
-{
-    unsigned n, m;
-    Posf *p;
-    uInt wsize = s->w_size;
-
-    n = s->hash_size;
-    p = &s->head[n];
-    do {
-        m = *--p;
-        *p = (Pos)(m >= wsize ? m - wsize : NIL);
-    } while (--n);
-    n = wsize;
-#ifndef FASTEST
-    p = &s->prev[n];
-    do {
-        m = *--p;
-        *p = (Pos)(m >= wsize ? m - wsize : NIL);
-        /* If n is not on any hash chain, prev[n] is garbage but
-         * its value will never be used.
-         */
-    } while (--n);
-#endif
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-                         Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-#ifdef GZIP
-    else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-    }
-#endif
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-    s->status = INIT_STATE;     /* to pass state test in deflateReset() */
-
-    s->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = (uInt)windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = (uInt)memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->high_water = 0;      /* nothing written to s->window yet */
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* =========================================================================
- * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
- */
-local int deflateStateCheck (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-    if (strm == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
-        return 1;
-    s = strm->state;
-    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
-#ifdef GZIP
-                                           s->status != GZIP_STATE &&
-#endif
-                                           s->status != EXTRA_STATE &&
-                                           s->status != NAME_STATE &&
-                                           s->status != COMMENT_STATE &&
-                                           s->status != HCRC_STATE &&
-                                           s->status != BUSY_STATE &&
-                                           s->status != FINISH_STATE))
-        return 1;
-    return 0;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt str, n;
-    int wrap;
-    unsigned avail;
-    z_const unsigned char *next;
-
-    if (deflateStateCheck(strm) || dictionary == Z_NULL)
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    wrap = s->wrap;
-    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
-        return Z_STREAM_ERROR;
-
-    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
-    if (wrap == 1)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
-    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
-
-    /* if dictionary would fill window, just replace the history */
-    if (dictLength >= s->w_size) {
-        if (wrap == 0) {            /* already empty otherwise */
-            CLEAR_HASH(s);
-            s->strstart = 0;
-            s->block_start = 0L;
-            s->insert = 0;
-        }
-        dictionary += dictLength - s->w_size;  /* use the tail */
-        dictLength = s->w_size;
-    }
-
-    /* insert dictionary into window and hash */
-    avail = strm->avail_in;
-    next = strm->next_in;
-    strm->avail_in = dictLength;
-    strm->next_in = (z_const Bytef *)dictionary;
-    fill_window(s);
-    while (s->lookahead >= MIN_MATCH) {
-        str = s->strstart;
-        n = s->lookahead - (MIN_MATCH-1);
-        do {
-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-            s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-            s->head[s->ins_h] = (Pos)str;
-            str++;
-        } while (--n);
-        s->strstart = str;
-        s->lookahead = MIN_MATCH-1;
-        fill_window(s);
-    }
-    s->strstart += s->lookahead;
-    s->block_start = (long)s->strstart;
-    s->insert = s->lookahead;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    strm->next_in = next;
-    strm->avail_in = avail;
-    s->wrap = wrap;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    Bytef *dictionary;
-    uInt  *dictLength;
-{
-    deflate_state *s;
-    uInt len;
-
-    if (deflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    s = strm->state;
-    len = s->strstart + s->lookahead;
-    if (len > s->w_size)
-        len = s->w_size;
-    if (dictionary != Z_NULL && len)
-        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
-    if (dictLength != Z_NULL)
-        *dictLength = len;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (deflateStateCheck(strm)) {
-        return Z_STREAM_ERROR;
-    }
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0) {
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-    }
-    s->status =
-#ifdef GZIP
-        s->wrap == 2 ? GZIP_STATE :
-#endif
-        s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    int ret;
-
-    ret = deflateResetKeep(strm);
-    if (ret == Z_OK)
-        lm_init(strm->state);
-    return ret;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
-    if (deflateStateCheck(strm) || strm->state->wrap != 2)
-        return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
-    unsigned *pending;
-    int *bits;
-    z_streamp strm;
-{
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    if (pending != Z_NULL)
-        *pending = strm->state->pending;
-    if (bits != Z_NULL)
-        *bits = strm->state->bi_valid;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
-    deflate_state *s;
-    int put;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-        return Z_BUF_ERROR;
-    do {
-        put = Buf_size - s->bi_valid;
-        if (put > bits)
-            put = bits;
-        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
-        s->bi_valid += put;
-        _tr_flush_bits(s);
-        value >>= put;
-        bits -= put;
-    } while (bits);
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        s->high_water) {
-        /* Flush the last buffer: */
-        int err = deflate(strm, Z_BLOCK);
-        if (err == Z_STREAM_ERROR)
-            return err;
-        if (strm->avail_out == 0)
-            return Z_BUF_ERROR;
-    }
-    if (s->level != level) {
-        if (s->level == 0 && s->matches != 0) {
-            if (s->matches == 1)
-                slide_hash(s);
-            else
-                CLEAR_HASH(s);
-            s->matches = 0;
-        }
-        s->level = level;
-        s->max_lazy_match   = configuration_table[level].max_lazy;
-        s->good_match       = configuration_table[level].good_length;
-        s->nice_match       = configuration_table[level].nice_length;
-        s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
-    deflate_state *s;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = (uInt)good_length;
-    s->max_lazy_match = (uInt)max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = (uInt)max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel.  But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong complen, wraplen;
-
-    /* conservative upper bound for compressed data */
-    complen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-
-    /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (deflateStateCheck(strm))
-        return complen + 6;
-
-    /* compute wrapper length */
-    s = strm->state;
-    switch (s->wrap) {
-    case 0:                                 /* raw deflate */
-        wraplen = 0;
-        break;
-    case 1:                                 /* zlib wrapper */
-        wraplen = 6 + (s->strstart ? 4 : 0);
-        break;
-#ifdef GZIP
-    case 2:                                 /* gzip wrapper */
-        wraplen = 18;
-        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
-            Bytef *str;
-            if (s->gzhead->extra != Z_NULL)
-                wraplen += 2 + s->gzhead->extra_len;
-            str = s->gzhead->name;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            str = s->gzhead->comment;
-            if (str != Z_NULL)
-                do {
-                    wraplen++;
-                } while (*str++);
-            if (s->gzhead->hcrc)
-                wraplen += 2;
-        }
-        break;
-#endif
-    default:                                /* for compiler happiness */
-        wraplen = 6;
-    }
-
-    /* if not default parameters, return conservative bound */
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return complen + wraplen;
-
-    /* default settings: return tight bound for that case */
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-           (sourceLen >> 25) + 13 - 6 + wraplen;
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output, except for
- * some deflate_stored() output, goes through this function so some
- * applications may wish to modify it to avoid allocating a large
- * strm->next_out buffer and copying into it. (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len;
-    deflate_state *s = strm->state;
-
-    _tr_flush_bits(s);
-    len = s->pending;
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, s->pending_out, len);
-    strm->next_out  += len;
-    s->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out -= len;
-    s->pending      -= len;
-    if (s->pending == 0) {
-        s->pending_out = s->pending_buf;
-    }
-}
-
-/* ===========================================================================
- * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
- */
-#define HCRC_UPDATE(beg) \
-    do { \
-        if (s->gzhead->hcrc && s->pending > (beg)) \
-            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
-                                s->pending - (beg)); \
-    } while (0)
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-        /* zlib header */
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-        uInt level_flags;
-
-        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-            level_flags = 0;
-        else if (s->level < 6)
-            level_flags = 1;
-        else if (s->level == 6)
-            level_flags = 2;
-        else
-            level_flags = 3;
-        header |= (level_flags << 6);
-        if (s->strstart != 0) header |= PRESET_DICT;
-        header += 31 - (header % 31);
-
-        putShortMSB(s, header);
-
-        /* Save the adler32 of the preset dictionary: */
-        if (s->strstart != 0) {
-            putShortMSB(s, (uInt)(strm->adler >> 16));
-            putShortMSB(s, (uInt)(strm->adler & 0xffff));
-        }
-        strm->adler = adler32(0L, Z_NULL, 0);
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        flush_pending(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#ifdef GZIP
-    if (s->status == GZIP_STATE) {
-        /* gzip header */
-        strm->adler = crc32(0L, Z_NULL, 0);
-        put_byte(s, 31);
-        put_byte(s, 139);
-        put_byte(s, 8);
-        if (s->gzhead == Z_NULL) {
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, 0);
-            put_byte(s, s->level == 9 ? 2 :
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                      4 : 0));
-            put_byte(s, OS_CODE);
-            s->status = BUSY_STATE;
-
-            /* Compression must start with an empty pending buffer */
-            flush_pending(strm);
-            if (s->pending != 0) {
-                s->last_flush = -1;
-                return Z_OK;
-            }
-        }
-        else {
-            put_byte(s, (s->gzhead->text ? 1 : 0) +
-                     (s->gzhead->hcrc ? 2 : 0) +
-                     (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                     (s->gzhead->name == Z_NULL ? 0 : 8) +
-                     (s->gzhead->comment == Z_NULL ? 0 : 16)
-                     );
-            put_byte(s, (Byte)(s->gzhead->time & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-            put_byte(s, s->level == 9 ? 2 :
-                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                      4 : 0));
-            put_byte(s, s->gzhead->os & 0xff);
-            if (s->gzhead->extra != Z_NULL) {
-                put_byte(s, s->gzhead->extra_len & 0xff);
-                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-            }
-            if (s->gzhead->hcrc)
-                strm->adler = crc32(strm->adler, s->pending_buf,
-                                    s->pending);
-            s->gzindex = 0;
-            s->status = EXTRA_STATE;
-        }
-    }
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
-            while (s->pending + left > s->pending_buf_size) {
-                uInt copy = s->pending_buf_size - s->pending;
-                zmemcpy(s->pending_buf + s->pending,
-                        s->gzhead->extra + s->gzindex, copy);
-                s->pending = s->pending_buf_size;
-                HCRC_UPDATE(beg);
-                s->gzindex += copy;
-                flush_pending(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-                beg = 0;
-                left -= copy;
-            }
-            zmemcpy(s->pending_buf + s->pending,
-                    s->gzhead->extra + s->gzindex, left);
-            s->pending += left;
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            int val;
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    flush_pending(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-            s->gzindex = 0;
-        }
-        s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != Z_NULL) {
-            ulg beg = s->pending;   /* start of bytes to update crc */
-            int val;
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    HCRC_UPDATE(beg);
-                    flush_pending(strm);
-                    if (s->pending != 0) {
-                        s->last_flush = -1;
-                        return Z_OK;
-                    }
-                    beg = 0;
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            HCRC_UPDATE(beg);
-        }
-        s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size) {
-                flush_pending(strm);
-                if (s->pending != 0) {
-                    s->last_flush = -1;
-                    return Z_OK;
-                }
-            }
-            put_byte(s, (Byte)(strm->adler & 0xff));
-            put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-            strm->adler = crc32(0L, Z_NULL, 0);
-        }
-        s->status = BUSY_STATE;
-
-        /* Compression must start with an empty pending buffer */
-        flush_pending(strm);
-        if (s->pending != 0) {
-            s->last_flush = -1;
-            return Z_OK;
-        }
-    }
-#endif
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = s->level == 0 ? deflate_stored(s, flush) :
-                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                 s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                 (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                    if (s->lookahead == 0) {
-                        s->strstart = 0;
-                        s->block_start = 0L;
-                        s->insert = 0;
-                    }
-                }
-            }
-            flush_pending(strm);
-            if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
-            }
-        }
-    }
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->wrap <= 0) return Z_STREAM_END;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        put_byte(s, (Byte)(strm->adler & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-        put_byte(s, (Byte)(strm->total_in & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
-#endif
-    {
-        putShortMSB(s, (uInt)(strm->adler >> 16));
-        putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    }
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (deflateStateCheck(source) || dest == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local unsigned read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    zmemcpy(buf, strm->next_in, len);
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, buf, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, buf, len);
-    }
-#endif
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->insert = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                      /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = (int)s->prev_length;         /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2.  Note that the checks below
-         * for insufficient lookahead only occur occasionally for performance
-         * reasons.  Therefore uninitialized memory will be accessed, and
-         * conditional jumps will be made that depend on those values.
-         * However the length of the match is limited to the lookahead, so
-         * the output of deflate is not affected by the uninitialized values.
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-#endif /* ASMV */
-
-#else /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for FASTEST only
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#endif /* FASTEST */
-
-#ifdef ZLIB_DEBUG
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
-        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif /* ZLIB_DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    unsigned n;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-            slide_hash(s);
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) break;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
-            s->ins_h = s->window[str];
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
-    /* If the WIN_INIT bytes after the end of the current data have never been
-     * written, then zero those bytes in order to avoid memory check reports of
-     * the use of uninitialized (or uninitialised as Julian writes) bytes by
-     * the longest match routines.  Update the high water mark for the next
-     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
-     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
-     */
-    if (s->high_water < s->window_size) {
-        ulg curr = s->strstart + (ulg)(s->lookahead);
-        ulg init;
-
-        if (s->high_water < curr) {
-            /* Previous high water mark below current data -- zero WIN_INIT
-             * bytes or up to end of window, whichever is less.
-             */
-            init = s->window_size - curr;
-            if (init > WIN_INIT)
-                init = WIN_INIT;
-            zmemzero(s->window + curr, (unsigned)init);
-            s->high_water = curr + init;
-        }
-        else if (s->high_water < (ulg)curr + WIN_INIT) {
-            /* High water mark at or above current data, but below current data
-             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
-             * to end of window, whichever is less.
-             */
-            init = (ulg)curr + WIN_INIT - s->high_water;
-            if (init > s->window_size - s->high_water)
-                init = s->window_size - s->high_water;
-            zmemzero(s->window + s->high_water, (unsigned)init);
-            s->high_water += init;
-        }
-    }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, last) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (last)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, last) { \
-   FLUSH_BLOCK_ONLY(s, last); \
-   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-}
-
-/* Maximum stored block length in deflate format (not including header). */
-#define MAX_STORED 65535
-
-/* Minimum of a and b. */
-#define MIN(a, b) ((a) > (b) ? (b) : (a))
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- *
- * In case deflateParams() is used to later switch to a non-zero compression
- * level, s->matches (otherwise unused when storing) keeps track of the number
- * of hash table slides to perform. If s->matches is 1, then one hash table
- * slide will be done when switching. If s->matches is 2, the maximum value
- * allowed here, then the hash table will be cleared, since two or more slides
- * is the same as a clear.
- *
- * deflate_stored() is written to minimize the number of times an input byte is
- * copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Smallest worthy block size when not flushing or finishing. By default
-     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
-     * large input and output buffers, the stored block size will be larger.
-     */
-    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
-
-    /* Copy as many min_block or larger stored blocks directly to next_out as
-     * possible. If flushing, copy the remaining available input to next_out as
-     * stored blocks, if there is enough space.
-     */
-    unsigned len, left, have, last = 0;
-    unsigned used = s->strm->avail_in;
-    do {
-        /* Set len to the maximum size block that we can copy directly with the
-         * available input data and output space. Set left to how much of that
-         * would be copied from what's left in the window.
-         */
-        len = MAX_STORED;       /* maximum deflate stored block length */
-        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        if (s->strm->avail_out < have)          /* need room for header */
-            break;
-            /* maximum stored block length that will fit in avail_out: */
-        have = s->strm->avail_out - have;
-        left = s->strstart - s->block_start;    /* bytes left in window */
-        if (len > (ulg)left + s->strm->avail_in)
-            len = left + s->strm->avail_in;     /* limit len to the input */
-        if (len > have)
-            len = have;                         /* limit len to the output */
-
-        /* If the stored block would be less than min_block in length, or if
-         * unable to copy all of the available input when flushing, then try
-         * copying to the window and the pending buffer instead. Also don't
-         * write an empty block when flushing -- deflate() does that.
-         */
-        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
-                                flush == Z_NO_FLUSH ||
-                                len != left + s->strm->avail_in))
-            break;
-
-        /* Make a dummy stored block in pending to get the header bytes,
-         * including any pending bits. This also updates the debugging counts.
-         */
-        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
-        _tr_stored_block(s, (char *)0, 0L, last);
-
-        /* Replace the lengths in the dummy stored block with len. */
-        s->pending_buf[s->pending - 4] = len;
-        s->pending_buf[s->pending - 3] = len >> 8;
-        s->pending_buf[s->pending - 2] = ~len;
-        s->pending_buf[s->pending - 1] = ~len >> 8;
-
-        /* Write the stored block header bytes. */
-        flush_pending(s->strm);
-
-#ifdef ZLIB_DEBUG
-        /* Update debugging counts for the data about to be copied. */
-        s->compressed_len += len << 3;
-        s->bits_sent += len << 3;
-#endif
-
-        /* Copy uncompressed bytes from the window to next_out. */
-        if (left) {
-            if (left > len)
-                left = len;
-            zmemcpy(s->strm->next_out, s->window + s->block_start, left);
-            s->strm->next_out += left;
-            s->strm->avail_out -= left;
-            s->strm->total_out += left;
-            s->block_start += left;
-            len -= left;
-        }
-
-        /* Copy uncompressed bytes directly from next_in to next_out, updating
-         * the check value.
-         */
-        if (len) {
-            read_buf(s->strm, s->strm->next_out, len);
-            s->strm->next_out += len;
-            s->strm->avail_out -= len;
-            s->strm->total_out += len;
-        }
-    } while (last == 0);
-
-    /* Update the sliding window with the last s->w_size bytes of the copied
-     * data, or append all of the copied data to the existing window if less
-     * than s->w_size bytes were copied. Also update the number of bytes to
-     * insert in the hash tables, in the event that deflateParams() switches to
-     * a non-zero compression level.
-     */
-    used -= s->strm->avail_in;      /* number of input bytes directly copied */
-    if (used) {
-        /* If any input was used, then no unused input remains in the window,
-         * therefore s->block_start == s->strstart.
-         */
-        if (used >= s->w_size) {    /* supplant the previous history */
-            s->matches = 2;         /* clear hash */
-            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
-            s->strstart = s->w_size;
-        }
-        else {
-            if (s->window_size - s->strstart <= used) {
-                /* Slide the window down. */
-                s->strstart -= s->w_size;
-                zmemcpy(s->window, s->window + s->w_size, s->strstart);
-                if (s->matches < 2)
-                    s->matches++;   /* add a pending slide_hash() */
-            }
-            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
-            s->strstart += used;
-        }
-        s->block_start = s->strstart;
-        s->insert += MIN(used, s->w_size - s->insert);
-    }
-    if (s->high_water < s->strstart)
-        s->high_water = s->strstart;
-
-    /* If the last block was written to next_out, then done. */
-    if (last)
-        return finish_done;
-
-    /* If flushing and all input has been consumed, then done. */
-    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
-        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
-        return block_done;
-
-    /* Fill the window with any remaining input. */
-    have = s->window_size - s->strstart - 1;
-    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
-        /* Slide the window down. */
-        s->block_start -= s->w_size;
-        s->strstart -= s->w_size;
-        zmemcpy(s->window, s->window + s->w_size, s->strstart);
-        if (s->matches < 2)
-            s->matches++;           /* add a pending slide_hash() */
-        have += s->w_size;          /* more space now */
-    }
-    if (have > s->strm->avail_in)
-        have = s->strm->avail_in;
-    if (have) {
-        read_buf(s->strm, s->window + s->strstart, have);
-        s->strstart += have;
-    }
-    if (s->high_water < s->strstart)
-        s->high_water = s->strstart;
-
-    /* There was not enough avail_out to write a complete worthy or flushed
-     * stored block to next_out. Write a stored block to pending instead, if we
-     * have enough input for a worthy block, or if flushing and there is enough
-     * room for the remaining input as a stored block in the pending buffer.
-     */
-    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
-        /* maximum stored block length that will fit in pending: */
-    have = MIN(s->pending_buf_size - have, MAX_STORED);
-    min_block = MIN(have, s->w_size);
-    left = s->strstart - s->block_start;
-    if (left >= min_block ||
-        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
-         s->strm->avail_in == 0 && left <= have)) {
-        len = MIN(left, have);
-        last = flush == Z_FINISH && s->strm->avail_in == 0 &&
-               len == left ? 1 : 0;
-        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
-        s->block_start += len;
-        flush_pending(s->strm);
-    }
-
-    /* We've done all we can with the available input and output. */
-    return last ? finish_started : need_more;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;       /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++;
-            } else
-#endif
-            {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head;          /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        hash_head = NIL;
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            s->match_length = longest_match (s, hash_head);
-            /* longest_match() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
-#endif
-                )) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                           s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-            if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-#endif /* FASTEST */
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-    uInt prev;              /* byte at distance one to match */
-    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest run, plus one for the unrolled loop.
-         */
-        if (s->lookahead <= MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        s->match_length = 0;
-        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
-            scan = s->window + s->strstart - 1;
-            prev = *scan;
-            if (prev == *++scan && prev == *++scan && prev == *++scan) {
-                strend = s->window + s->strstart + MAX_MATCH;
-                do {
-                } while (prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         prev == *++scan && prev == *++scan &&
-                         scan < strend);
-                s->match_length = MAX_MATCH - (uInt)(strend - scan);
-                if (s->match_length > s->lookahead)
-                    s->match_length = s->lookahead;
-            }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
-        }
-
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, s->match_length);
-
-            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-            s->strstart += s->match_length;
-            s->match_length = 0;
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-local block_state deflate_huff(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;             /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we have a literal to write. */
-        if (s->lookahead == 0) {
-            fill_window(s);
-            if (s->lookahead == 0) {
-                if (flush == Z_NO_FLUSH)
-                    return need_more;
-                break;      /* flush the current block */
-            }
-        }
-
-        /* Output a literal byte */
-        s->match_length = 0;
-        Tracevv((stderr,"%c", s->window[s->strstart]));
-        _tr_tally_lit (s, s->window[s->strstart], bflush);
-        s->lookahead--;
-        s->strstart++;
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
-}
diff --git a/src/png/zlib/deflate.h b/src/png/zlib/deflate.h
deleted file mode 100644
index 23ecdd312..000000000
--- a/src/png/zlib/deflate.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2016 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef DEFLATE_H
-#define DEFLATE_H
-
-#include "zutil.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip encoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GZIP
-#endif
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define Buf_size 16
-/* size of bit buffer in bi_buf */
-
-#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
-#ifdef GZIP
-#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
-#endif
-#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
-#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
-#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
-#define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
-#define BUSY_STATE   113    /* deflate -> FINISH_STATE */
-#define FINISH_STATE 666    /* stream complete */
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data *dyn_tree;           /* the dynamic tree */
-    int     max_code;            /* largest code with non zero frequency */
-    const static_tree_desc *stat_desc;  /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state {
-    z_streamp strm;      /* pointer back to this zlib stream */
-    int   status;        /* as the name implies */
-    Bytef *pending_buf;  /* output still pending */
-    ulg   pending_buf_size; /* size of pending_buf */
-    Bytef *pending_out;  /* next pending byte to output to the stream */
-    ulg   pending;       /* nb of bytes in the pending buffer */
-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
-    gz_headerp  gzhead;  /* gzip header information to write */
-    ulg   gzindex;       /* where in extra, name, or comment */
-    Byte  method;        /* can only be DEFLATED */
-    int   last_flush;    /* value of flush param for previous deflate call */
-
-                /* used by deflate.c: */
-
-    uInt  w_size;        /* LZ77 window size (32K by default) */
-    uInt  w_bits;        /* log2(w_size)  (8..16) */
-    uInt  w_mask;        /* w_size - 1 */
-
-    Bytef *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf *head; /* Heads of the hash chains or NIL. */
-
-    uInt  ins_h;          /* hash index of string to be inserted */
-    uInt  hash_size;      /* number of elements in hash table */
-    uInt  hash_bits;      /* log2(hash_size) */
-    uInt  hash_mask;      /* hash_size-1 */
-
-    uInt  hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length;           /* length of best match */
-    IPos prev_match;             /* previous match */
-    int match_available;         /* set if previous match exists */
-    uInt strstart;               /* start of string to insert */
-    uInt match_start;            /* start of matching string */
-    uInt lookahead;              /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to suppress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf *l_buf;          /* buffer for literals or lengths */
-
-    uInt  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len;        /* bit length of current block with optimal trees */
-    ulg static_len;     /* bit length of current block with static trees */
-    uInt matches;       /* number of string matches in current block */
-    uInt insert;        /* bytes at end of window left to insert */
-
-#ifdef ZLIB_DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-    ulg high_water;
-    /* High water mark offset in window for initialized bytes -- bytes above
-     * this are set to zero in order to avoid memory check warnings when
-     * longest match routines access bytes past the input.  This is then
-     * updated to the new high water mark.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-#define WIN_INIT MAX_MATCH
-/* Number of bytes after end of data in window to initialize in order to avoid
-   memory checker errors from longest match routines */
-
-        /* in trees.c */
-void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
-int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
-void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
-void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
-                        ulg stored_len, int last));
-
-#define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef ZLIB_DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch ZLIB_INTERNAL _length_code[];
-  extern uch ZLIB_INTERNAL _dist_code[];
-#else
-  extern const uch ZLIB_INTERNAL _length_code[];
-  extern const uch ZLIB_INTERNAL _dist_code[];
-#endif
-
-# define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (uch)(length); \
-    ush dist = (ush)(distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#else
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-# define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length)
-#endif
-
-#endif /* DEFLATE_H */
diff --git a/src/png/zlib/gzclose.c b/src/png/zlib/gzclose.c
deleted file mode 100644
index caeb99a31..000000000
--- a/src/png/zlib/gzclose.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* gzclose.c -- zlib gzclose() function
- * Copyright (C) 2004, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* gzclose() is in a separate file so that it is linked in only if it is used.
-   That way the other gzclose functions can be used instead to avoid linking in
-   unneeded compression or decompression routines. */
-int ZEXPORT gzclose(file)
-    gzFile file;
-{
-#ifndef NO_GZCOMPRESS
-    gz_statep state;
-
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
-#else
-    return gzclose_r(file);
-#endif
-}
diff --git a/src/png/zlib/gzguts.h b/src/png/zlib/gzguts.h
deleted file mode 100644
index 990a4d251..000000000
--- a/src/png/zlib/gzguts.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef _LARGEFILE64_SOURCE
-#  ifndef _LARGEFILE_SOURCE
-#    define _LARGEFILE_SOURCE 1
-#  endif
-#  ifdef _FILE_OFFSET_BITS
-#    undef _FILE_OFFSET_BITS
-#  endif
-#endif
-
-#ifdef HAVE_HIDDEN
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
-#include <stdio.h>
-#include "zlib.h"
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#  include <limits.h>
-#endif
-
-#ifndef _POSIX_SOURCE
-#  define _POSIX_SOURCE
-#endif
-#include <fcntl.h>
-
-#ifdef _WIN32
-#  include <stddef.h>
-#endif
-
-#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
-#  include <io.h>
-#endif
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  define WIDECHAR
-#endif
-
-#ifdef WINAPI_FAMILY
-#  define open _open
-#  define read _read
-#  define write _write
-#  define close _close
-#endif
-
-#ifdef NO_DEFLATE       /* for compatibility with old definition */
-#  define NO_GZCOMPRESS
-#endif
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-   but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         define vsnprintf _vsnprintf
-#      endif
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#  ifdef VMS
-#    define NO_vsnprintf
-#  endif
-#  ifdef __OS400__
-#    define NO_vsnprintf
-#  endif
-#  ifdef __MVS__
-#    define NO_vsnprintf
-#  endif
-#endif
-
-/* unlike snprintf (which is required in C99), _snprintf does not guarantee
-   null termination of the result -- however this is only used in gzlib.c where
-   the result is assured to fit in the space provided */
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#  define snprintf _snprintf
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* since "static" is used to mean two completely different things in C, we
-   define "local" for the non-static meaning of "static", for readability
-   (compile with -Dlocal if your debugger can't find static symbols) */
-
-/* gz* functions always use library allocation functions */
-#ifndef STDC
-  extern voidp  malloc OF((uInt size));
-  extern void   free   OF((voidpf ptr));
-#endif
-
-/* get errno and strerror definition */
-#if defined UNDER_CE
-#  include <windows.h>
-#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
-#else
-#  ifndef NO_STRERROR
-#    include <errno.h>
-#    define zstrerror() strerror(errno)
-#  else
-#    define zstrerror() "stdio error (consult errno)"
-#  endif
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
-    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-#endif
-
-/* default memLevel */
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-
-/* default i/o buffer size -- double this for output when reading (this and
-   twice this must be able to fit in an unsigned type) */
-#define GZBUFSIZE 8192
-
-/* gzip modes, also provide a little integrity check on the passed structure */
-#define GZ_NONE 0
-#define GZ_READ 7247
-#define GZ_WRITE 31153
-#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
-
-/* values for gz_state how */
-#define LOOK 0      /* look for a gzip header */
-#define COPY 1      /* copy input directly */
-#define GZIP 2      /* decompress a gzip stream */
-
-/* internal gzip file state data structure */
-typedef struct {
-        /* exposed contents for gzgetc() macro */
-    struct gzFile_s x;      /* "x" for exposed */
-                            /* x.have: number of bytes available at x.next */
-                            /* x.next: next output data to deliver or write */
-                            /* x.pos: current position in uncompressed data */
-        /* used for both reading and writing */
-    int mode;               /* see gzip modes above */
-    int fd;                 /* file descriptor */
-    char *path;             /* path or fd for error messages */
-    unsigned size;          /* buffer size, zero if not allocated yet */
-    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
-    unsigned char *in;      /* input buffer (double-sized when writing) */
-    unsigned char *out;     /* output buffer (double-sized when reading) */
-    int direct;             /* 0 if processing gzip, 1 if transparent */
-        /* just for reading */
-    int how;                /* 0: get header, 1: copy, 2: decompress */
-    z_off64_t start;        /* where the gzip data started, for rewinding */
-    int eof;                /* true if end of input file reached */
-    int past;               /* true if read requested past end */
-        /* just for writing */
-    int level;              /* compression level */
-    int strategy;           /* compression strategy */
-        /* seek request */
-    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
-    int seek;               /* true if seek request pending */
-        /* error information */
-    int err;                /* error code */
-    char *msg;              /* error message */
-        /* zlib inflate or deflate stream */
-    z_stream strm;          /* stream structure in-place (not a pointer) */
-} gz_state;
-typedef gz_state FAR *gz_statep;
-
-/* shared functions */
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
-#if defined UNDER_CE
-char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
-#endif
-
-/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
-   value -- needed when comparing unsigned to z_off64_t, which is signed
-   (possible z_off64_t types off_t, off64_t, and long are all signed) */
-#ifdef INT_MAX
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-#else
-unsigned ZLIB_INTERNAL gz_intmax OF((void));
-#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-#endif
diff --git a/src/png/zlib/gzlib.c b/src/png/zlib/gzlib.c
deleted file mode 100644
index 4105e6aff..000000000
--- a/src/png/zlib/gzlib.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
-#  define LSEEK _lseeki64
-#else
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-#  define LSEEK lseek64
-#else
-#  define LSEEK lseek
-#endif
-#endif
-
-/* Local functions */
-local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const void *, int, const char *));
-
-#if defined UNDER_CE
-
-/* Map the Windows error number in ERROR to a locale-dependent error message
-   string and return a pointer to it.  Typically, the values for ERROR come
-   from GetLastError.
-
-   The string pointed to shall not be modified by the application, but may be
-   overwritten by a subsequent call to gz_strwinerror
-
-   The gz_strwinerror function does not change the current setting of
-   GetLastError. */
-char ZLIB_INTERNAL *gz_strwinerror (error)
-     DWORD error;
-{
-    static char buf[1024];
-
-    wchar_t *msgbuf;
-    DWORD lasterr = GetLastError();
-    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
-        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-        NULL,
-        error,
-        0, /* Default language */
-        (LPVOID)&msgbuf,
-        0,
-        NULL);
-    if (chars != 0) {
-        /* If there is an \r\n appended, zap it.  */
-        if (chars >= 2
-            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
-            chars -= 2;
-            msgbuf[chars] = 0;
-        }
-
-        if (chars > sizeof (buf) - 1) {
-            chars = sizeof (buf) - 1;
-            msgbuf[chars] = 0;
-        }
-
-        wcstombs(buf, msgbuf, chars + 1);
-        LocalFree(msgbuf);
-    }
-    else {
-        sprintf(buf, "unknown win32 error (%ld)", error);
-    }
-
-    SetLastError(lasterr);
-    return buf;
-}
-
-#endif /* UNDER_CE */
-
-/* Reset gzip file state */
-local void gz_reset(state)
-    gz_statep state;
-{
-    state->x.have = 0;              /* no output data available */
-    if (state->mode == GZ_READ) {   /* for reading ... */
-        state->eof = 0;             /* not at end of file */
-        state->past = 0;            /* have not read past end yet */
-        state->how = LOOK;          /* look for gzip header */
-    }
-    state->seek = 0;                /* no seek request pending */
-    gz_error(state, Z_OK, NULL);    /* clear error */
-    state->x.pos = 0;               /* no uncompressed data yet */
-    state->strm.avail_in = 0;       /* no input data yet */
-}
-
-/* Open a gzip file either by name or file descriptor. */
-local gzFile gz_open(path, fd, mode)
-    const void *path;
-    int fd;
-    const char *mode;
-{
-    gz_statep state;
-    z_size_t len;
-    int oflag;
-#ifdef O_CLOEXEC
-    int cloexec = 0;
-#endif
-#ifdef O_EXCL
-    int exclusive = 0;
-#endif
-
-    /* check input */
-    if (path == NULL)
-        return NULL;
-
-    /* allocate gzFile structure to return */
-    state = (gz_statep)malloc(sizeof(gz_state));
-    if (state == NULL)
-        return NULL;
-    state->size = 0;            /* no buffers allocated yet */
-    state->want = GZBUFSIZE;    /* requested buffer size */
-    state->msg = NULL;          /* no error message yet */
-
-    /* interpret mode */
-    state->mode = GZ_NONE;
-    state->level = Z_DEFAULT_COMPRESSION;
-    state->strategy = Z_DEFAULT_STRATEGY;
-    state->direct = 0;
-    while (*mode) {
-        if (*mode >= '0' && *mode <= '9')
-            state->level = *mode - '0';
-        else
-            switch (*mode) {
-            case 'r':
-                state->mode = GZ_READ;
-                break;
-#ifndef NO_GZCOMPRESS
-            case 'w':
-                state->mode = GZ_WRITE;
-                break;
-            case 'a':
-                state->mode = GZ_APPEND;
-                break;
-#endif
-            case '+':       /* can't read and write at the same time */
-                free(state);
-                return NULL;
-            case 'b':       /* ignore -- will request binary anyway */
-                break;
-#ifdef O_CLOEXEC
-            case 'e':
-                cloexec = 1;
-                break;
-#endif
-#ifdef O_EXCL
-            case 'x':
-                exclusive = 1;
-                break;
-#endif
-            case 'f':
-                state->strategy = Z_FILTERED;
-                break;
-            case 'h':
-                state->strategy = Z_HUFFMAN_ONLY;
-                break;
-            case 'R':
-                state->strategy = Z_RLE;
-                break;
-            case 'F':
-                state->strategy = Z_FIXED;
-                break;
-            case 'T':
-                state->direct = 1;
-                break;
-            default:        /* could consider as an error, but just ignore */
-                ;
-            }
-        mode++;
-    }
-
-    /* must provide an "r", "w", or "a" */
-    if (state->mode == GZ_NONE) {
-        free(state);
-        return NULL;
-    }
-
-    /* can't force transparent read */
-    if (state->mode == GZ_READ) {
-        if (state->direct) {
-            free(state);
-            return NULL;
-        }
-        state->direct = 1;      /* for empty file */
-    }
-
-    /* save the path name for error messages */
-#ifdef WIDECHAR
-    if (fd == -2) {
-        len = wcstombs(NULL, path, 0);
-        if (len == (z_size_t)-1)
-            len = 0;
-    }
-    else
-#endif
-        len = strlen((const char *)path);
-    state->path = (char *)malloc(len + 1);
-    if (state->path == NULL) {
-        free(state);
-        return NULL;
-    }
-#ifdef WIDECHAR
-    if (fd == -2)
-        if (len)
-            wcstombs(state->path, path, len + 1);
-        else
-            *(state->path) = 0;
-    else
-#endif
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-        (void)snprintf(state->path, len + 1, "%s", (const char *)path);
-#else
-        strcpy(state->path, path);
-#endif
-
-    /* compute the flags for open() */
-    oflag =
-#ifdef O_LARGEFILE
-        O_LARGEFILE |
-#endif
-#ifdef O_BINARY
-        O_BINARY |
-#endif
-#ifdef O_CLOEXEC
-        (cloexec ? O_CLOEXEC : 0) |
-#endif
-        (state->mode == GZ_READ ?
-         O_RDONLY :
-         (O_WRONLY | O_CREAT |
-#ifdef O_EXCL
-          (exclusive ? O_EXCL : 0) |
-#endif
-          (state->mode == GZ_WRITE ?
-           O_TRUNC :
-           O_APPEND)));
-
-    /* open the file with the appropriate flags (or just use fd) */
-    state->fd = fd > -1 ? fd : (
-#ifdef WIDECHAR
-        fd == -2 ? _wopen(path, oflag, 0666) :
-#endif
-        open((const char *)path, oflag, 0666));
-    if (state->fd == -1) {
-        free(state->path);
-        free(state);
-        return NULL;
-    }
-    if (state->mode == GZ_APPEND) {
-        LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
-        state->mode = GZ_WRITE;         /* simplify later checks */
-    }
-
-    /* save the current position for rewinding (only if reading) */
-    if (state->mode == GZ_READ) {
-        state->start = LSEEK(state->fd, 0, SEEK_CUR);
-        if (state->start == -1) state->start = 0;
-    }
-
-    /* initialize stream */
-    gz_reset(state);
-
-    /* return stream */
-    return (gzFile)state;
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzopen(path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open(path, -1, mode);
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzopen64(path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open(path, -1, mode);
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzdopen(fd, mode)
-    int fd;
-    const char *mode;
-{
-    char *path;         /* identifier for error messages */
-    gzFile gz;
-
-    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
-        return NULL;
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
-#else
-    sprintf(path, "<fd:%d>", fd);   /* for debugging */
-#endif
-    gz = gz_open(path, fd, mode);
-    free(path);
-    return gz;
-}
-
-/* -- see zlib.h -- */
-#ifdef WIDECHAR
-gzFile ZEXPORT gzopen_w(path, mode)
-    const wchar_t *path;
-    const char *mode;
-{
-    return gz_open(path, -2, mode);
-}
-#endif
-
-/* -- see zlib.h -- */
-int ZEXPORT gzbuffer(file, size)
-    gzFile file;
-    unsigned size;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* make sure we haven't already allocated memory */
-    if (state->size != 0)
-        return -1;
-
-    /* check and set requested size */
-    if ((size << 1) < size)
-        return -1;              /* need to be able to double it */
-    if (size < 2)
-        size = 2;               /* need two bytes to check magic header */
-    state->want = size;
-    return 0;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzrewind(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* back up and start over */
-    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
-        return -1;
-    gz_reset(state);
-    return 0;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gzseek64(file, offset, whence)
-    gzFile file;
-    z_off64_t offset;
-    int whence;
-{
-    unsigned n;
-    z_off64_t ret;
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* check that there's no error */
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-
-    /* can only seek from start or relative to current position */
-    if (whence != SEEK_SET && whence != SEEK_CUR)
-        return -1;
-
-    /* normalize offset to a SEEK_CUR specification */
-    if (whence == SEEK_SET)
-        offset -= state->x.pos;
-    else if (state->seek)
-        offset += state->skip;
-    state->seek = 0;
-
-    /* if within raw area while reading, just go there */
-    if (state->mode == GZ_READ && state->how == COPY &&
-            state->x.pos + offset >= 0) {
-        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
-        if (ret == -1)
-            return -1;
-        state->x.have = 0;
-        state->eof = 0;
-        state->past = 0;
-        state->seek = 0;
-        gz_error(state, Z_OK, NULL);
-        state->strm.avail_in = 0;
-        state->x.pos += offset;
-        return state->x.pos;
-    }
-
-    /* calculate skip amount, rewinding if needed for back seek when reading */
-    if (offset < 0) {
-        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
-            return -1;
-        offset += state->x.pos;
-        if (offset < 0)                     /* before start of file! */
-            return -1;
-        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
-            return -1;
-    }
-
-    /* if reading, skip what's in output buffer (one less gzgetc() check) */
-    if (state->mode == GZ_READ) {
-        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
-            (unsigned)offset : state->x.have;
-        state->x.have -= n;
-        state->x.next += n;
-        state->x.pos += n;
-        offset -= n;
-    }
-
-    /* request skip (if not zero) */
-    if (offset) {
-        state->seek = 1;
-        state->skip = offset;
-    }
-    return state->x.pos + offset;
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gzseek(file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
-    z_off64_t ret;
-
-    ret = gzseek64(file, (z_off64_t)offset, whence);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gztell64(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* return position */
-    return state->x.pos + (state->seek ? state->skip : 0);
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gztell(file)
-    gzFile file;
-{
-    z_off64_t ret;
-
-    ret = gztell64(file);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gzoffset64(file)
-    gzFile file;
-{
-    z_off64_t offset;
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return -1;
-
-    /* compute and return effective offset in file */
-    offset = LSEEK(state->fd, 0, SEEK_CUR);
-    if (offset == -1)
-        return -1;
-    if (state->mode == GZ_READ)             /* reading */
-        offset -= state->strm.avail_in;     /* don't count buffered input */
-    return offset;
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gzoffset(file)
-    gzFile file;
-{
-    z_off64_t ret;
-
-    ret = gzoffset64(file);
-    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzeof(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return 0;
-
-    /* return end-of-file state */
-    return state->mode == GZ_READ ? state->past : 0;
-}
-
-/* -- see zlib.h -- */
-const char * ZEXPORT gzerror(file, errnum)
-    gzFile file;
-    int *errnum;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return NULL;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return NULL;
-
-    /* return error information */
-    if (errnum != NULL)
-        *errnum = state->err;
-    return state->err == Z_MEM_ERROR ? "out of memory" :
-                                       (state->msg == NULL ? "" : state->msg);
-}
-
-/* -- see zlib.h -- */
-void ZEXPORT gzclearerr(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure and check integrity */
-    if (file == NULL)
-        return;
-    state = (gz_statep)file;
-    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
-        return;
-
-    /* clear error and end-of-file */
-    if (state->mode == GZ_READ) {
-        state->eof = 0;
-        state->past = 0;
-    }
-    gz_error(state, Z_OK, NULL);
-}
-
-/* Create an error message in allocated memory and set state->err and
-   state->msg accordingly.  Free any previous error message already there.  Do
-   not try to free or allocate space if the error is Z_MEM_ERROR (out of
-   memory).  Simply save the error message as a static string.  If there is an
-   allocation failure constructing the error message, then convert the error to
-   out of memory. */
-void ZLIB_INTERNAL gz_error(state, err, msg)
-    gz_statep state;
-    int err;
-    const char *msg;
-{
-    /* free previously allocated message and clear */
-    if (state->msg != NULL) {
-        if (state->err != Z_MEM_ERROR)
-            free(state->msg);
-        state->msg = NULL;
-    }
-
-    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
-    if (err != Z_OK && err != Z_BUF_ERROR)
-        state->x.have = 0;
-
-    /* set error code, and if no message, then done */
-    state->err = err;
-    if (msg == NULL)
-        return;
-
-    /* for an out of memory error, return literal string when requested */
-    if (err == Z_MEM_ERROR)
-        return;
-
-    /* construct error message with path */
-    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
-            NULL) {
-        state->err = Z_MEM_ERROR;
-        return;
-    }
-#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-    (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
-                   "%s%s%s", state->path, ": ", msg);
-#else
-    strcpy(state->msg, state->path);
-    strcat(state->msg, ": ");
-    strcat(state->msg, msg);
-#endif
-}
-
-#ifndef INT_MAX
-/* portably return maximum value for an int (when limits.h presumed not
-   available) -- we need to do this to cover cases where 2's complement not
-   used, since C standard permits 1's complement and sign-bit representations,
-   otherwise we could just use ((unsigned)-1) >> 1 */
-unsigned ZLIB_INTERNAL gz_intmax()
-{
-    unsigned p, q;
-
-    p = 1;
-    do {
-        q = p;
-        p <<= 1;
-        p++;
-    } while (p > q);
-    return q >> 1;
-}
-#endif
diff --git a/src/png/zlib/gzread.c b/src/png/zlib/gzread.c
deleted file mode 100644
index 956b91ea7..000000000
--- a/src/png/zlib/gzread.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* Local functions */
-local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
-local int gz_avail OF((gz_statep));
-local int gz_look OF((gz_statep));
-local int gz_decomp OF((gz_statep));
-local int gz_fetch OF((gz_statep));
-local int gz_skip OF((gz_statep, z_off64_t));
-local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
-
-/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
-   state->fd, and update state->eof, state->err, and state->msg as appropriate.
-   This function needs to loop on read(), since read() is not guaranteed to
-   read the number of bytes requested, depending on the type of descriptor. */
-local int gz_load(state, buf, len, have)
-    gz_statep state;
-    unsigned char *buf;
-    unsigned len;
-    unsigned *have;
-{
-    int ret;
-    unsigned get, max = ((unsigned)-1 >> 2) + 1;
-
-    *have = 0;
-    do {
-        get = len - *have;
-        if (get > max)
-            get = max;
-        ret = read(state->fd, buf + *have, get);
-        if (ret <= 0)
-            break;
-        *have += (unsigned)ret;
-    } while (*have < len);
-    if (ret < 0) {
-        gz_error(state, Z_ERRNO, zstrerror());
-        return -1;
-    }
-    if (ret == 0)
-        state->eof = 1;
-    return 0;
-}
-
-/* Load up input buffer and set eof flag if last data loaded -- return -1 on
-   error, 0 otherwise.  Note that the eof flag is set when the end of the input
-   file is reached, even though there may be unused data in the buffer.  Once
-   that data has been used, no more attempts will be made to read the file.
-   If strm->avail_in != 0, then the current data is moved to the beginning of
-   the input buffer, and then the remainder of the buffer is loaded with the
-   available data from the input file. */
-local int gz_avail(state)
-    gz_statep state;
-{
-    unsigned got;
-    z_streamp strm = &(state->strm);
-
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-    if (state->eof == 0) {
-        if (strm->avail_in) {       /* copy what's there to the start */
-            unsigned char *p = state->in;
-            unsigned const char *q = strm->next_in;
-            unsigned n = strm->avail_in;
-            do {
-                *p++ = *q++;
-            } while (--n);
-        }
-        if (gz_load(state, state->in + strm->avail_in,
-                    state->size - strm->avail_in, &got) == -1)
-            return -1;
-        strm->avail_in += got;
-        strm->next_in = state->in;
-    }
-    return 0;
-}
-
-/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
-   If this is the first time in, allocate required memory.  state->how will be
-   left unchanged if there is no more input data available, will be set to COPY
-   if there is no gzip header and direct copying will be performed, or it will
-   be set to GZIP for decompression.  If direct copying, then leftover input
-   data from the input buffer will be copied to the output buffer.  In that
-   case, all further file reads will be directly to either the output buffer or
-   a user buffer.  If decompressing, the inflate state will be initialized.
-   gz_look() will return 0 on success or -1 on failure. */
-local int gz_look(state)
-    gz_statep state;
-{
-    z_streamp strm = &(state->strm);
-
-    /* allocate read buffers and inflate memory */
-    if (state->size == 0) {
-        /* allocate buffers */
-        state->in = (unsigned char *)malloc(state->want);
-        state->out = (unsigned char *)malloc(state->want << 1);
-        if (state->in == NULL || state->out == NULL) {
-            free(state->out);
-            free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        state->size = state->want;
-
-        /* allocate inflate memory */
-        state->strm.zalloc = Z_NULL;
-        state->strm.zfree = Z_NULL;
-        state->strm.opaque = Z_NULL;
-        state->strm.avail_in = 0;
-        state->strm.next_in = Z_NULL;
-        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
-            free(state->out);
-            free(state->in);
-            state->size = 0;
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-    }
-
-    /* get at least the magic bytes in the input buffer */
-    if (strm->avail_in < 2) {
-        if (gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in == 0)
-            return 0;
-    }
-
-    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
-       a logical dilemma here when considering the case of a partially written
-       gzip file, to wit, if a single 31 byte is written, then we cannot tell
-       whether this is a single-byte file, or just a partially written gzip
-       file -- for here we assume that if a gzip file is being written, then
-       the header will be written in a single operation, so that reading a
-       single byte is sufficient indication that it is not a gzip file) */
-    if (strm->avail_in > 1 &&
-            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
-        inflateReset(strm);
-        state->how = GZIP;
-        state->direct = 0;
-        return 0;
-    }
-
-    /* no gzip header -- if we were decoding gzip before, then this is trailing
-       garbage.  Ignore the trailing garbage and finish. */
-    if (state->direct == 0) {
-        strm->avail_in = 0;
-        state->eof = 1;
-        state->x.have = 0;
-        return 0;
-    }
-
-    /* doing raw i/o, copy any leftover input to output -- this assumes that
-       the output buffer is larger than the input buffer, which also assures
-       space for gzungetc() */
-    state->x.next = state->out;
-    if (strm->avail_in) {
-        memcpy(state->x.next, strm->next_in, strm->avail_in);
-        state->x.have = strm->avail_in;
-        strm->avail_in = 0;
-    }
-    state->how = COPY;
-    state->direct = 1;
-    return 0;
-}
-
-/* Decompress from input to the provided next_out and avail_out in the state.
-   On return, state->x.have and state->x.next point to the just decompressed
-   data.  If the gzip stream completes, state->how is reset to LOOK to look for
-   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
-   on success, -1 on failure. */
-local int gz_decomp(state)
-    gz_statep state;
-{
-    int ret = Z_OK;
-    unsigned had;
-    z_streamp strm = &(state->strm);
-
-    /* fill output buffer up to end of deflate stream */
-    had = strm->avail_out;
-    do {
-        /* get more input for inflate() */
-        if (strm->avail_in == 0 && gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in == 0) {
-            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
-            break;
-        }
-
-        /* decompress and handle errors */
-        ret = inflate(strm, Z_NO_FLUSH);
-        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
-            gz_error(state, Z_STREAM_ERROR,
-                     "internal error: inflate stream corrupt");
-            return -1;
-        }
-        if (ret == Z_MEM_ERROR) {
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
-            gz_error(state, Z_DATA_ERROR,
-                     strm->msg == NULL ? "compressed data error" : strm->msg);
-            return -1;
-        }
-    } while (strm->avail_out && ret != Z_STREAM_END);
-
-    /* update available output */
-    state->x.have = had - strm->avail_out;
-    state->x.next = strm->next_out - state->x.have;
-
-    /* if the gzip stream completed successfully, look for another */
-    if (ret == Z_STREAM_END)
-        state->how = LOOK;
-
-    /* good decompression */
-    return 0;
-}
-
-/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
-   Data is either copied from the input file or decompressed from the input
-   file depending on state->how.  If state->how is LOOK, then a gzip header is
-   looked for to determine whether to copy or decompress.  Returns -1 on error,
-   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
-   end of the input file has been reached and all data has been processed.  */
-local int gz_fetch(state)
-    gz_statep state;
-{
-    z_streamp strm = &(state->strm);
-
-    do {
-        switch(state->how) {
-        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
-            if (gz_look(state) == -1)
-                return -1;
-            if (state->how == LOOK)
-                return 0;
-            break;
-        case COPY:      /* -> COPY */
-            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
-                    == -1)
-                return -1;
-            state->x.next = state->out;
-            return 0;
-        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
-            strm->avail_out = state->size << 1;
-            strm->next_out = state->out;
-            if (gz_decomp(state) == -1)
-                return -1;
-        }
-    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
-    return 0;
-}
-
-/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
-local int gz_skip(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
-    unsigned n;
-
-    /* skip over len bytes or reach end-of-file, whichever comes first */
-    while (len)
-        /* skip over whatever is in output buffer */
-        if (state->x.have) {
-            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
-                (unsigned)len : state->x.have;
-            state->x.have -= n;
-            state->x.next += n;
-            state->x.pos += n;
-            len -= n;
-        }
-
-        /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && state->strm.avail_in == 0)
-            break;
-
-        /* need more data to skip -- load up output buffer */
-        else {
-            /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return -1;
-        }
-    return 0;
-}
-
-/* Read len bytes into buf from file, or less than len up to the end of the
-   input.  Return the number of bytes read.  If zero is returned, either the
-   end of file was reached, or there was an error.  state->err must be
-   consulted in that case to determine which. */
-local z_size_t gz_read(state, buf, len)
-    gz_statep state;
-    voidp buf;
-    z_size_t len;
-{
-    z_size_t got;
-    unsigned n;
-
-    /* if len is zero, avoid unnecessary operations */
-    if (len == 0)
-        return 0;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return 0;
-    }
-
-    /* get len bytes to buf, or less than len if at the end */
-    got = 0;
-    do {
-        /* set n to the maximum amount of len that fits in an unsigned int */
-        n = -1;
-        if (n > len)
-            n = len;
-
-        /* first just try copying data from the output buffer */
-        if (state->x.have) {
-            if (state->x.have < n)
-                n = state->x.have;
-            memcpy(buf, state->x.next, n);
-            state->x.next += n;
-            state->x.have -= n;
-        }
-
-        /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && state->strm.avail_in == 0) {
-            state->past = 1;        /* tried to read past end */
-            break;
-        }
-
-        /* need output data -- for small len or new stream load up our output
-           buffer */
-        else if (state->how == LOOK || n < (state->size << 1)) {
-            /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
-                return 0;
-            continue;       /* no progress yet -- go back to copy above */
-            /* the copy above assures that we will leave with space in the
-               output buffer, allowing at least one gzungetc() to succeed */
-        }
-
-        /* large len -- read directly into user buffer */
-        else if (state->how == COPY) {      /* read directly */
-            if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
-                return 0;
-        }
-
-        /* large len -- decompress directly into user buffer */
-        else {  /* state->how == GZIP */
-            state->strm.avail_out = n;
-            state->strm.next_out = (unsigned char *)buf;
-            if (gz_decomp(state) == -1)
-                return 0;
-            n = state->x.have;
-            state->x.have = 0;
-        }
-
-        /* update progress */
-        len -= n;
-        buf = (char *)buf + n;
-        got += n;
-        state->x.pos += n;
-    } while (len);
-
-    /* return number of bytes read into user buffer */
-    return got;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzread(file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* since an int is returned, make sure len fits in one, otherwise return
-       with an error (this avoids a flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
-        return -1;
-    }
-
-    /* read len or fewer bytes to buf */
-    len = gz_read(state, buf, len);
-
-    /* check for an error */
-    if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
-        return -1;
-
-    /* return the number of bytes read (this is assured to fit in an int) */
-    return (int)len;
-}
-
-/* -- see zlib.h -- */
-z_size_t ZEXPORT gzfread(buf, size, nitems, file)
-    voidp buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
-    z_size_t len;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return 0;
-
-    /* compute bytes to read -- error on overflow */
-    len = nitems * size;
-    if (size && len / size != nitems) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
-        return 0;
-    }
-
-    /* read len or fewer bytes to buf, return the number of full items read */
-    return len ? gz_read(state, buf, len) / size : 0;
-}
-
-/* -- see zlib.h -- */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#else
-#  undef gzgetc
-#endif
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    int ret;
-    unsigned char buf[1];
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* try output buffer (no need to check for skip request) */
-    if (state->x.have) {
-        state->x.have--;
-        state->x.pos++;
-        return *(state->x.next)++;
-    }
-
-    /* nothing there -- try gz_read() */
-    ret = gz_read(state, buf, 1);
-    return ret < 1 ? -1 : buf[0];
-}
-
-int ZEXPORT gzgetc_(file)
-gzFile file;
-{
-    return gzgetc(file);
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzungetc(c, file)
-    int c;
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return -1;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return -1;
-    }
-
-    /* can't push EOF */
-    if (c < 0)
-        return -1;
-
-    /* if output buffer empty, put byte at end (allows more pushing) */
-    if (state->x.have == 0) {
-        state->x.have = 1;
-        state->x.next = state->out + (state->size << 1) - 1;
-        state->x.next[0] = (unsigned char)c;
-        state->x.pos--;
-        state->past = 0;
-        return c;
-    }
-
-    /* if no room, give up (must have already done a gzungetc()) */
-    if (state->x.have == (state->size << 1)) {
-        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
-        return -1;
-    }
-
-    /* slide output data if needed and insert byte before existing data */
-    if (state->x.next == state->out) {
-        unsigned char *src = state->out + state->x.have;
-        unsigned char *dest = state->out + (state->size << 1);
-        while (src > state->out)
-            *--dest = *--src;
-        state->x.next = dest;
-    }
-    state->x.have++;
-    state->x.next--;
-    state->x.next[0] = (unsigned char)c;
-    state->x.pos--;
-    state->past = 0;
-    return c;
-}
-
-/* -- see zlib.h -- */
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
-    unsigned left, n;
-    char *str;
-    unsigned char *eol;
-    gz_statep state;
-
-    /* check parameters and get internal structure */
-    if (file == NULL || buf == NULL || len < 1)
-        return NULL;
-    state = (gz_statep)file;
-
-    /* check that we're reading and that there's no (serious) error */
-    if (state->mode != GZ_READ ||
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
-        return NULL;
-
-    /* process a skip request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_skip(state, state->skip) == -1)
-            return NULL;
-    }
-
-    /* copy output bytes up to new line or len - 1, whichever comes first --
-       append a terminating zero to the string (we don't check for a zero in
-       the contents, let the user worry about that) */
-    str = buf;
-    left = (unsigned)len - 1;
-    if (left) do {
-        /* assure that something is in the output buffer */
-        if (state->x.have == 0 && gz_fetch(state) == -1)
-            return NULL;                /* error */
-        if (state->x.have == 0) {       /* end of file */
-            state->past = 1;            /* read past end */
-            break;                      /* return what we have */
-        }
-
-        /* look for end-of-line in current output buffer */
-        n = state->x.have > left ? left : state->x.have;
-        eol = (unsigned char *)memchr(state->x.next, '\n', n);
-        if (eol != NULL)
-            n = (unsigned)(eol - state->x.next) + 1;
-
-        /* copy through end-of-line, or remainder if not found */
-        memcpy(buf, state->x.next, n);
-        state->x.have -= n;
-        state->x.next += n;
-        state->x.pos += n;
-        left -= n;
-        buf += n;
-    } while (left && eol == NULL);
-
-    /* return terminated string, or if nothing, end of file */
-    if (buf == str)
-        return NULL;
-    buf[0] = 0;
-    return str;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzdirect(file)
-    gzFile file;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* if the state is not known, but we can find out, then do so (this is
-       mainly for right after a gzopen() or gzdopen()) */
-    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
-        (void)gz_look(state);
-
-    /* return 1 if transparent, 0 if processing a gzip stream */
-    return state->direct;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzclose_r(file)
-    gzFile file;
-{
-    int ret, err;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    /* check that we're reading */
-    if (state->mode != GZ_READ)
-        return Z_STREAM_ERROR;
-
-    /* free memory and close file */
-    if (state->size) {
-        inflateEnd(&(state->strm));
-        free(state->out);
-        free(state->in);
-    }
-    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
-    gz_error(state, Z_OK, NULL);
-    free(state->path);
-    ret = close(state->fd);
-    free(state);
-    return ret ? Z_ERRNO : err;
-}
diff --git a/src/png/zlib/gzwrite.c b/src/png/zlib/gzwrite.c
deleted file mode 100644
index c7b5651d7..000000000
--- a/src/png/zlib/gzwrite.c
+++ /dev/null
@@ -1,665 +0,0 @@
-/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* Local functions */
-local int gz_init OF((gz_statep));
-local int gz_comp OF((gz_statep, int));
-local int gz_zero OF((gz_statep, z_off64_t));
-local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
-
-/* Initialize state for writing a gzip file.  Mark initialization by setting
-   state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
-   success. */
-local int gz_init(state)
-    gz_statep state;
-{
-    int ret;
-    z_streamp strm = &(state->strm);
-
-    /* allocate input buffer (double size for gzprintf) */
-    state->in = (unsigned char *)malloc(state->want << 1);
-    if (state->in == NULL) {
-        gz_error(state, Z_MEM_ERROR, "out of memory");
-        return -1;
-    }
-
-    /* only need output buffer and deflate state if compressing */
-    if (!state->direct) {
-        /* allocate output buffer */
-        state->out = (unsigned char *)malloc(state->want);
-        if (state->out == NULL) {
-            free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-
-        /* allocate deflate memory, set up for gzip compression */
-        strm->zalloc = Z_NULL;
-        strm->zfree = Z_NULL;
-        strm->opaque = Z_NULL;
-        ret = deflateInit2(strm, state->level, Z_DEFLATED,
-                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
-        if (ret != Z_OK) {
-            free(state->out);
-            free(state->in);
-            gz_error(state, Z_MEM_ERROR, "out of memory");
-            return -1;
-        }
-        strm->next_in = NULL;
-    }
-
-    /* mark state as initialized */
-    state->size = state->want;
-
-    /* initialize write buffer if compressing */
-    if (!state->direct) {
-        strm->avail_out = state->size;
-        strm->next_out = state->out;
-        state->x.next = strm->next_out;
-    }
-    return 0;
-}
-
-/* Compress whatever is at avail_in and next_in and write to the output file.
-   Return -1 if there is an error writing to the output file or if gz_init()
-   fails to allocate memory, otherwise 0.  flush is assumed to be a valid
-   deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
-   reset to start a new gzip stream.  If gz->direct is true, then simply write
-   to the output file without compressing, and ignore flush. */
-local int gz_comp(state, flush)
-    gz_statep state;
-    int flush;
-{
-    int ret, writ;
-    unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
-    z_streamp strm = &(state->strm);
-
-    /* allocate memory if this is the first time through */
-    if (state->size == 0 && gz_init(state) == -1)
-        return -1;
-
-    /* write directly if requested */
-    if (state->direct) {
-        while (strm->avail_in) {
-            put = strm->avail_in > max ? max : strm->avail_in;
-            writ = write(state->fd, strm->next_in, put);
-            if (writ < 0) {
-                gz_error(state, Z_ERRNO, zstrerror());
-                return -1;
-            }
-            strm->avail_in -= (unsigned)writ;
-            strm->next_in += writ;
-        }
-        return 0;
-    }
-
-    /* run deflate() on provided input until it produces no more output */
-    ret = Z_OK;
-    do {
-        /* write out current buffer contents if full, or if flushing, but if
-           doing Z_FINISH then don't write until we get to Z_STREAM_END */
-        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
-            (flush != Z_FINISH || ret == Z_STREAM_END))) {
-            while (strm->next_out > state->x.next) {
-                put = strm->next_out - state->x.next > (int)max ? max :
-                      (unsigned)(strm->next_out - state->x.next);
-                writ = write(state->fd, state->x.next, put);
-                if (writ < 0) {
-                    gz_error(state, Z_ERRNO, zstrerror());
-                    return -1;
-                }
-                state->x.next += writ;
-            }
-            if (strm->avail_out == 0) {
-                strm->avail_out = state->size;
-                strm->next_out = state->out;
-                state->x.next = state->out;
-            }
-        }
-
-        /* compress */
-        have = strm->avail_out;
-        ret = deflate(strm, flush);
-        if (ret == Z_STREAM_ERROR) {
-            gz_error(state, Z_STREAM_ERROR,
-                      "internal error: deflate stream corrupt");
-            return -1;
-        }
-        have -= strm->avail_out;
-    } while (have);
-
-    /* if that completed a deflate stream, allow another to start */
-    if (flush == Z_FINISH)
-        deflateReset(strm);
-
-    /* all done, no errors */
-    return 0;
-}
-
-/* Compress len zeros to output.  Return -1 on a write error or memory
-   allocation failure by gz_comp(), or 0 on success. */
-local int gz_zero(state, len)
-    gz_statep state;
-    z_off64_t len;
-{
-    int first;
-    unsigned n;
-    z_streamp strm = &(state->strm);
-
-    /* consume whatever's left in the input buffer */
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-        return -1;
-
-    /* compress len zeros (len guaranteed > 0) */
-    first = 1;
-    while (len) {
-        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
-            (unsigned)len : state->size;
-        if (first) {
-            memset(state->in, 0, n);
-            first = 0;
-        }
-        strm->avail_in = n;
-        strm->next_in = state->in;
-        state->x.pos += n;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return -1;
-        len -= n;
-    }
-    return 0;
-}
-
-/* Write len bytes from buf to file.  Return the number of bytes written.  If
-   the returned value is less than len, then there was an error. */
-local z_size_t gz_write(state, buf, len)
-    gz_statep state;
-    voidpc buf;
-    z_size_t len;
-{
-    z_size_t put = len;
-
-    /* if len is zero, avoid unnecessary operations */
-    if (len == 0)
-        return 0;
-
-    /* allocate memory if this is the first time through */
-    if (state->size == 0 && gz_init(state) == -1)
-        return 0;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return 0;
-    }
-
-    /* for small len, copy to input buffer, otherwise compress directly */
-    if (len < state->size) {
-        /* copy to input buffer, compress when full */
-        do {
-            unsigned have, copy;
-
-            if (state->strm.avail_in == 0)
-                state->strm.next_in = state->in;
-            have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
-                              state->in);
-            copy = state->size - have;
-            if (copy > len)
-                copy = len;
-            memcpy(state->in + have, buf, copy);
-            state->strm.avail_in += copy;
-            state->x.pos += copy;
-            buf = (const char *)buf + copy;
-            len -= copy;
-            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
-        } while (len);
-    }
-    else {
-        /* consume whatever's left in the input buffer */
-        if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
-            return 0;
-
-        /* directly compress user buffer to file */
-        state->strm.next_in = (z_const Bytef *)buf;
-        do {
-            unsigned n = (unsigned)-1;
-            if (n > len)
-                n = len;
-            state->strm.avail_in = n;
-            state->x.pos += n;
-            if (gz_comp(state, Z_NO_FLUSH) == -1)
-                return 0;
-            len -= n;
-        } while (len);
-    }
-
-    /* input was all buffered or compressed */
-    return put;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzwrite(file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
-
-    /* since an int is returned, make sure len fits in one, otherwise return
-       with an error (this avoids a flaw in the interface) */
-    if ((int)len < 0) {
-        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
-        return 0;
-    }
-
-    /* write len bytes from buf (the return value will fit in an int) */
-    return (int)gz_write(state, buf, len);
-}
-
-/* -- see zlib.h -- */
-z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
-    voidpc buf;
-    z_size_t size;
-    z_size_t nitems;
-    gzFile file;
-{
-    z_size_t len;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return 0;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
-
-    /* compute bytes to read -- error on overflow */
-    len = nitems * size;
-    if (size && len / size != nitems) {
-        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
-        return 0;
-    }
-
-    /* write len bytes to buf, return the number of full items written */
-    return len ? gz_write(state, buf, len) / size : 0;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
-    unsigned have;
-    unsigned char buf[1];
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return -1;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return -1;
-    }
-
-    /* try writing to input buffer for speed (state->size == 0 if buffer not
-       initialized) */
-    if (state->size) {
-        if (strm->avail_in == 0)
-            strm->next_in = state->in;
-        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
-        if (have < state->size) {
-            state->in[have] = (unsigned char)c;
-            strm->avail_in++;
-            state->x.pos++;
-            return c & 0xff;
-        }
-    }
-
-    /* no room in buffer or not initialized, use gz_write() */
-    buf[0] = (unsigned char)c;
-    if (gz_write(state, buf, 1) != 1)
-        return -1;
-    return c & 0xff;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzputs(file, str)
-    gzFile file;
-    const char *str;
-{
-    int ret;
-    z_size_t len;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return -1;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return -1;
-
-    /* write string */
-    len = strlen(str);
-    ret = gz_write(state, str, len);
-    return ret == 0 && len != 0 ? -1 : ret;
-}
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#include <stdarg.h>
-
-/* -- see zlib.h -- */
-int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
-{
-    int len;
-    unsigned left;
-    char *next;
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* make sure we have some buffer space */
-    if (state->size == 0 && gz_init(state) == -1)
-        return state->err;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* do the printf() into the input buffer, put length in len -- the input
-       buffer is double-sized just for this function, so there is guaranteed to
-       be state->size bytes available after the current contents */
-    if (strm->avail_in == 0)
-        strm->next_in = state->in;
-    next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
-    next[state->size - 1] = 0;
-#ifdef NO_vsnprintf
-#  ifdef HAS_vsprintf_void
-    (void)vsprintf(next, format, va);
-    for (len = 0; len < state->size; len++)
-        if (next[len] == 0) break;
-#  else
-    len = vsprintf(next, format, va);
-#  endif
-#else
-#  ifdef HAS_vsnprintf_void
-    (void)vsnprintf(next, state->size, format, va);
-    len = strlen(next);
-#  else
-    len = vsnprintf(next, state->size, format, va);
-#  endif
-#endif
-
-    /* check that printf() results fit in buffer */
-    if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
-        return 0;
-
-    /* update buffer and position, compress first half if past that */
-    strm->avail_in += (unsigned)len;
-    state->x.pos += len;
-    if (strm->avail_in >= state->size) {
-        left = strm->avail_in - state->size;
-        strm->avail_in = state->size;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return state->err;
-        memcpy(state->in, state->in + state->size, left);
-        strm->next_in = state->in;
-        strm->avail_in = left;
-    }
-    return len;
-}
-
-int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
-{
-    va_list va;
-    int ret;
-
-    va_start(va, format);
-    ret = gzvprintf(file, format, va);
-    va_end(va);
-    return ret;
-}
-
-#else /* !STDC && !Z_HAVE_STDARG_H */
-
-/* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
-    unsigned len, left;
-    char *next;
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that can really pass pointer in ints */
-    if (sizeof(int) != sizeof(void *))
-        return Z_STREAM_ERROR;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* make sure we have some buffer space */
-    if (state->size == 0 && gz_init(state) == -1)
-        return state->error;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->error;
-    }
-
-    /* do the printf() into the input buffer, put length in len -- the input
-       buffer is double-sized just for this function, so there is guaranteed to
-       be state->size bytes available after the current contents */
-    if (strm->avail_in == 0)
-        strm->next_in = state->in;
-    next = (char *)(strm->next_in + strm->avail_in);
-    next[state->size - 1] = 0;
-#ifdef NO_snprintf
-#  ifdef HAS_sprintf_void
-    sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
-            a13, a14, a15, a16, a17, a18, a19, a20);
-    for (len = 0; len < size; len++)
-        if (next[len] == 0)
-            break;
-#  else
-    len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
-                  a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#else
-#  ifdef HAS_snprintf_void
-    snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
-             a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen(next);
-#  else
-    len = snprintf(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                   a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#endif
-
-    /* check that printf() results fit in buffer */
-    if (len == 0 || len >= state->size || next[state->size - 1] != 0)
-        return 0;
-
-    /* update buffer and position, compress first half if past that */
-    strm->avail_in += len;
-    state->x.pos += len;
-    if (strm->avail_in >= state->size) {
-        left = strm->avail_in - state->size;
-        strm->avail_in = state->size;
-        if (gz_comp(state, Z_NO_FLUSH) == -1)
-            return state->err;
-        memcpy(state->in, state->in + state->size, left);
-        strm->next_in = state->in;
-        strm->avail_in = left;
-    }
-    return (int)len;
-}
-
-#endif
-
-/* -- see zlib.h -- */
-int ZEXPORT gzflush(file, flush)
-    gzFile file;
-    int flush;
-{
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* check flush parameter */
-    if (flush < 0 || flush > Z_FINISH)
-        return Z_STREAM_ERROR;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* compress remaining data with requested flush */
-    (void)gz_comp(state, flush);
-    return state->err;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzsetparams(file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
-    gz_statep state;
-    z_streamp strm;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-    strm = &(state->strm);
-
-    /* check that we're writing and that there's no error */
-    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return Z_STREAM_ERROR;
-
-    /* if no change is requested, then do nothing */
-    if (level == state->level && strategy == state->strategy)
-        return Z_OK;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            return state->err;
-    }
-
-    /* change compression parameters for subsequent input */
-    if (state->size) {
-        /* flush previous input with previous parameters before changing */
-        if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
-            return state->err;
-        deflateParams(strm, level, strategy);
-    }
-    state->level = level;
-    state->strategy = strategy;
-    return Z_OK;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzclose_w(file)
-    gzFile file;
-{
-    int ret = Z_OK;
-    gz_statep state;
-
-    /* get internal structure */
-    if (file == NULL)
-        return Z_STREAM_ERROR;
-    state = (gz_statep)file;
-
-    /* check that we're writing */
-    if (state->mode != GZ_WRITE)
-        return Z_STREAM_ERROR;
-
-    /* check for seek request */
-    if (state->seek) {
-        state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
-            ret = state->err;
-    }
-
-    /* flush, free memory, and close file */
-    if (gz_comp(state, Z_FINISH) == -1)
-        ret = state->err;
-    if (state->size) {
-        if (!state->direct) {
-            (void)deflateEnd(&(state->strm));
-            free(state->out);
-        }
-        free(state->in);
-    }
-    gz_error(state, Z_OK, NULL);
-    free(state->path);
-    if (close(state->fd) == -1)
-        ret = Z_ERRNO;
-    free(state);
-    return ret;
-}
diff --git a/src/png/zlib/infback.c b/src/png/zlib/infback.c
deleted file mode 100644
index 59679ecbf..000000000
--- a/src/png/zlib/infback.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
-   This code is largely copied from inflate.c.  Normally either infback.o or
-   inflate.o would be linked into an application--not both.  The interface
-   with inffast.c is retained so that optimized assembler-coded versions of
-   inflate_fast() can be used with either inflate.c or infback.c.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   Z_NULL to use the library memory allocation functions.
-
-   windowBits is in the range 8..15, and window is a user-supplied
-   window and output buffer that is 2**windowBits bytes.
- */
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-z_streamp strm;
-int windowBits;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL || window == Z_NULL ||
-        windowBits < 8 || windowBits > 15)
-        return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-    strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-                                               sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->dmax = 32768U;
-    state->wbits = (uInt)windowBits;
-    state->wsize = 1U << windowBits;
-    state->window = window;
-    state->wnext = 0;
-    state->whave = 0;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-/* Macros for inflateBack(): */
-
-/* Load returned state from inflate_fast() */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Set state from registers for inflate_fast() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = Z_NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflateBack() with
-   an error. */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = state->window; \
-            left = state->wsize; \
-            state->whave = left; \
-            if (out(out_desc, put, left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise,  inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is Z_NULL or the state was not initialized.
- */
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-z_streamp strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* Reset the state */
-    strm->msg = Z_NULL;
-    state->mode = TYPE;
-    state->last = 0;
-    state->whave = 0;
-    next = strm->next_in;
-    have = next != Z_NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = state->window;
-    left = state->wsize;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (state->mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (state->last) {
-                BYTEBITS();
-                state->mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (state->length != 0) {
-                copy = state->length;
-                PULL();
-                ROOM();
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-
-            /* get code length code lengths (not a typo) */
-            state->have = 0;
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-
-            /* get length and distance code code lengths */
-            state->have = 0;
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = (unsigned)(state->lens[state->have - 1]);
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-
-        case LEN:
-            /* use inflate_fast() if we have enough input and output */
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                if (state->whave < state->wsize)
-                    state->whave = state->wsize - left;
-                inflate_fast(strm, state->wsize);
-                LOAD();
-                break;
-            }
-
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            state->length = (unsigned)here.val;
-
-            /* process literal */
-            if (here.op == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                ROOM();
-                *put++ = (unsigned char)(state->length);
-                left--;
-                state->mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-
-            /* get distance code */
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(here.bits);
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-
-            /* get distance extra bits, if any */
-            state->extra = (unsigned)(here.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            if (state->offset > state->wsize - (state->whave < state->wsize ?
-                                                left : 0)) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = state->wsize - state->offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                }
-                else {
-                    from = put - state->offset;
-                    copy = left;
-                }
-                if (copy > state->length) copy = state->length;
-                state->length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (state->length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int ZEXPORT inflateBackEnd(strm)
-z_streamp strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
diff --git a/src/png/zlib/inffast.c b/src/png/zlib/inffast.c
deleted file mode 100644
index 0dbd1dbc0..000000000
--- a/src/png/zlib/inffast.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef ASMINF
-#  pragma message("Assembler code may have bugs -- use at your own risk")
-#else
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void ZLIB_INTERNAL inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *in;      /* local strm->next_in */
-    z_const unsigned char FAR *last;    /* have enough input while in < last */
-    unsigned char FAR *out;     /* local strm->next_out */
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
-    unsigned char FAR *end;     /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const FAR *lcode;      /* local strm->lencode */
-    code const FAR *dcode;      /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    code here;                  /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char FAR *from;    /* where to copy match from */
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    wnext = state->wnext;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold += (unsigned long)(*in++) << bits;
-            bits += 8;
-            hold += (unsigned long)(*in++) << bits;
-            bits += 8;
-        }
-        here = lcode[hold & lmask];
-      dolen:
-        op = (unsigned)(here.bits);
-        hold >>= op;
-        bits -= op;
-        op = (unsigned)(here.op);
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", here.val));
-            *out++ = (unsigned char)(here.val);
-        }
-        else if (op & 16) {                     /* length base */
-            len = (unsigned)(here.val);
-            op &= 15;                           /* number of extra bits */
-            if (op) {
-                if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
-                    bits += 8;
-                }
-                len += (unsigned)hold & ((1U << op) - 1);
-                hold >>= op;
-                bits -= op;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold += (unsigned long)(*in++) << bits;
-                bits += 8;
-                hold += (unsigned long)(*in++) << bits;
-                bits += 8;
-            }
-            here = dcode[hold & dmask];
-          dodist:
-            op = (unsigned)(here.bits);
-            hold >>= op;
-            bits -= op;
-            op = (unsigned)(here.op);
-            if (op & 16) {                      /* distance base */
-                dist = (unsigned)(here.val);
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold += (unsigned long)(*in++) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(*in++) << bits;
-                        bits += 8;
-                    }
-                }
-                dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
-                    state->mode = BAD;
-                    break;
-                }
-#endif
-                hold >>= op;
-                bits -= op;
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        if (state->sane) {
-                            strm->msg =
-                                (char *)"invalid distance too far back";
-                            state->mode = BAD;
-                            break;
-                        }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                        if (len <= op - whave) {
-                            do {
-                                *out++ = 0;
-                            } while (--len);
-                            continue;
-                        }
-                        len -= op - whave;
-                        do {
-                            *out++ = 0;
-                        } while (--op > whave);
-                        if (op == 0) {
-                            from = out - dist;
-                            do {
-                                *out++ = *from++;
-                            } while (--len);
-                            continue;
-                        }
-#endif
-                    }
-                    from = window;
-                    if (wnext == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    else if (wnext < op) {      /* wrap around window */
-                        from += wsize + wnext - op;
-                        op -= wnext;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = window;
-                            if (wnext < len) {  /* some from start of window */
-                                op = wnext;
-                                len -= op;
-                                do {
-                                    *out++ = *from++;
-                                } while (--op);
-                                from = out - dist;      /* rest from output */
-                            }
-                        }
-                    }
-                    else {                      /* contiguous in window */
-                        from += wnext - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                *out++ = *from++;
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        len -= 3;
-                    }
-                    if (len) {
-                        *out++ = *from++;
-                        if (len > 1)
-                            *out++ = *from++;
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        *out++ = *from++;
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        *out++ = *from++;
-                        if (len > 1)
-                            *out++ = *from++;
-                    }
-                }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
-                here = dcode[here.val + (hold & ((1U << op) - 1))];
-                goto dodist;
-            }
-            else {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
-            here = lcode[here.val + (hold & ((1U << op) - 1))];
-            goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        }
-        else {
-            strm->msg = (char *)"invalid literal/length code";
-            state->mode = BAD;
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (1U << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in;
-    strm->next_out = out;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-    strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
-    state->hold = hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and wnext == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */
diff --git a/src/png/zlib/inffast.h b/src/png/zlib/inffast.h
deleted file mode 100644
index e5c1aa4ca..000000000
--- a/src/png/zlib/inffast.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/src/png/zlib/inffixed.h b/src/png/zlib/inffixed.h
deleted file mode 100644
index d62832776..000000000
--- a/src/png/zlib/inffixed.h
+++ /dev/null
@@ -1,94 +0,0 @@
-    /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
-
-    /* WARNING: this file should *not* be used by applications.
-       It is part of the implementation of this library and is
-       subject to change. Applications should only use zlib.h.
-     */
-
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-        {0,9,255}
-    };
-
-    static const code distfix[32] = {
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-        {22,5,193},{64,5,0}
-    };
diff --git a/src/png/zlib/inflate.c b/src/png/zlib/inflate.c
deleted file mode 100644
index ac333e8c2..000000000
--- a/src/png/zlib/inflate.c
+++ /dev/null
@@ -1,1561 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0    24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- *   creation of window when not needed, minimize use of window when it is
- *   needed, make inffast.c even faster, implement gzip decoding, and to
- *   improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1    25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2    4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
- *   to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3    22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4    1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common wnext == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- *   source file infback.c to provide a call-back interface to inflate for
- *   programs like gzip and unzip -- uses window as output buffer to avoid
- *   window copying
- *
- * 1.2.beta5    1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- *   input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6    4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- *   make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7    27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0        9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- *   for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- *   and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
-/* function prototypes */
-local int inflateStateCheck OF((z_streamp strm));
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
-                           unsigned copy));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
-                              unsigned len));
-
-local int inflateStateCheck(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (strm == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
-        return 1;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state == Z_NULL || state->strm != strm ||
-        state->mode < HEAD || state->mode > SYNC)
-        return 1;
-    return 0;
-}
-
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = Z_NULL;
-    if (state->wrap)        /* to support ill-conceived Java test suite */
-        strm->adler = state->wrap & 1;
-    state->mode = HEAD;
-    state->last = 0;
-    state->havedict = 0;
-    state->dmax = 32768U;
-    state->head = Z_NULL;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    state->sane = 1;
-    state->back = -1;
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
-    return inflateResetKeep(strm);
-}
-
-int ZEXPORT inflateReset2(strm, windowBits)
-z_streamp strm;
-int windowBits;
-{
-    int wrap;
-    struct inflate_state FAR *state;
-
-    /* get the state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* extract wrap request from windowBits parameter */
-    if (windowBits < 0) {
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        wrap = (windowBits >> 4) + 5;
-#ifdef GUNZIP
-        if (windowBits < 48)
-            windowBits &= 15;
-#endif
-    }
-
-    /* set number of window bits, free window if different */
-    if (windowBits && (windowBits < 8 || windowBits > 15))
-        return Z_STREAM_ERROR;
-    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
-        ZFREE(strm, state->window);
-        state->window = Z_NULL;
-    }
-
-    /* update state and reset the rest of it */
-    state->wrap = wrap;
-    state->wbits = (unsigned)windowBits;
-    return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
-    int ret;
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-#endif
-    }
-    if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
-    state = (struct inflate_state FAR *)
-            ZALLOC(strm, 1, sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->strm = strm;
-    state->window = Z_NULL;
-    state->mode = HEAD;     /* to pass state test in inflateReset2() */
-    ret = inflateReset2(strm, windowBits);
-    if (ret != Z_OK) {
-        ZFREE(strm, state);
-        strm->state = Z_NULL;
-    }
-    return ret;
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits < 0) {
-        state->hold = 0;
-        state->bits = 0;
-        return Z_OK;
-    }
-    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += (unsigned)value << state->bits;
-    state->bits += (uInt)bits;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed()
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
-               state.lencode[low].bits, state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, end, copy)
-z_streamp strm;
-const Bytef *end;
-unsigned copy;
-{
-    struct inflate_state FAR *state;
-    unsigned dist;
-
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == Z_NULL) {
-        state->window = (unsigned char FAR *)
-                        ZALLOC(strm, 1U << state->wbits,
-                               sizeof(unsigned char));
-        if (state->window == Z_NULL) return 1;
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->wnext = 0;
-        state->whave = 0;
-    }
-
-    /* copy state->wsize or less output bytes into the circular window */
-    if (copy >= state->wsize) {
-        zmemcpy(state->window, end - state->wsize, state->wsize);
-        state->wnext = 0;
-        state->whave = state->wsize;
-    }
-    else {
-        dist = state->wsize - state->wnext;
-        if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->wnext, end - copy, dist);
-        copy -= dist;
-        if (copy) {
-            zmemcpy(state->window, end - copy, copy);
-            state->wnext = copy;
-            state->whave = state->wsize;
-        }
-        else {
-            state->wnext += dist;
-            if (state->wnext == state->wsize) state->wnext = 0;
-            if (state->whave < state->wsize) state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = crc32(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = crc32(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
-   if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
-    struct inflate_state FAR *state;
-    z_const unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code here;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                if (state->wbits == 0)
-                    state->wbits = 15;
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (state->wbits == 0)
-                state->wbits = len;
-            if (len > 15 || len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if ((state->flags & 0x0200) && (state->wrap & 4))
-                CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (unsigned)(hold);
-                if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if ((state->flags & 0x0200) && (state->wrap & 4))
-                        state->check = crc32(state->check, next, copy);
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = (Bytef)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = (Bytef)len;
-                } while (len && copy < have);
-                if ((state->flags & 0x0200) && (state->wrap & 4))
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = ZSWAP32(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN_;             /* decode codes */
-                if (flush == Z_TREES) {
-                    DROPBITS(2);
-                    goto inf_leave;
-                }
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY_;
-            if (flush == Z_TREES) goto inf_leave;
-        case COPY_:
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    here = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (here.val < 16) {
-                    DROPBITS(here.bits);
-                    state->lens[state->have++] = here.val;
-                }
-                else {
-                    if (here.val == 16) {
-                        NEEDBITS(here.bits + 2);
-                        DROPBITS(here.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (here.val == 17) {
-                        NEEDBITS(here.bits + 3);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(here.bits + 7);
-                        DROPBITS(here.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* check for end-of-block code (better have one) */
-            if (state->lens[256] == 0) {
-                strm->msg = (char *)"invalid code -- missing end-of-block";
-                state->mode = BAD;
-                break;
-            }
-
-            /* build code tables -- note: do not change the lenbits or distbits
-               values here (9 and 6) without reading the comments in inftrees.h
-               concerning the ENOUGH constants, which depend on those values */
-            state->next = state->codes;
-            state->lencode = (const code FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (const code FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN_;
-            if (flush == Z_TREES) goto inf_leave;
-        case LEN_:
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                if (state->mode == TYPE)
-                    state->back = -1;
-                break;
-            }
-            state->back = 0;
-            for (;;) {
-                here = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (here.op && (here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            state->length = (unsigned)here.val;
-            if ((int)(here.op) == 0) {
-                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", here.val));
-                state->mode = LIT;
-                break;
-            }
-            if (here.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->back = -1;
-                state->mode = TYPE;
-                break;
-            }
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->was = state->length;
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                here = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(here.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((here.op & 0xf0) == 0) {
-                last = here;
-                for (;;) {
-                    here = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + here.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-                state->back += last.bits;
-            }
-            DROPBITS(here.bits);
-            state->back += here.bits;
-            if (here.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)here.val;
-            state->extra = (unsigned)(here.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-                state->back += state->extra;
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->whave) {
-                    if (state->sane) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-                    Trace((stderr, "inflate.c too far\n"));
-                    copy -= state->whave;
-                    if (copy > state->length) copy = state->length;
-                    if (copy > left) copy = left;
-                    left -= copy;
-                    state->length -= copy;
-                    do {
-                        *put++ = 0;
-                    } while (--copy);
-                    if (state->length == 0) state->mode = LEN;
-                    break;
-#endif
-                }
-                if (copy > state->wnext) {
-                    copy -= state->wnext;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->wnext - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if ((state->wrap & 4) && out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((state->wrap & 4) && (
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     ZSWAP32(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
-            (state->mode < CHECK || flush != Z_FINISH)))
-        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-    if ((state->wrap & 4) && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0) +
-                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (inflateStateCheck(strm))
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-Bytef *dictionary;
-uInt *dictLength;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* copy dictionary */
-    if (state->whave && dictionary != Z_NULL) {
-        zmemcpy(dictionary, state->window + state->wnext,
-                state->whave - state->wnext);
-        zmemcpy(dictionary + state->whave - state->wnext,
-                state->window, state->wnext);
-    }
-    if (dictLength != Z_NULL)
-        *dictLength = state->whave;
-    return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
-    struct inflate_state FAR *state;
-    unsigned long dictid;
-    int ret;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary identifier */
-    if (state->mode == DICT) {
-        dictid = adler32(0L, Z_NULL, 0);
-        dictid = adler32(dictid, dictionary, dictLength);
-        if (dictid != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window using updatewindow(), which will amend the
-       existing dictionary if appropriate */
-    ret = updatewindow(strm, dictionary + dictLength, dictLength);
-    if (ret) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-const unsigned char FAR *buf;
-unsigned len;
-{
-    unsigned got;
-    unsigned next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
-    unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state FAR *state;
-
-    /* check parameters */
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
-    struct inflate_state FAR *state;
-    struct inflate_state FAR *copy;
-    unsigned char FAR *window;
-    unsigned wsize;
-
-    /* check input */
-    if (inflateStateCheck(source) || dest == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
-
-    /* allocate space */
-    copy = (struct inflate_state FAR *)
-           ZALLOC(source, 1, sizeof(struct inflate_state));
-    if (copy == Z_NULL) return Z_MEM_ERROR;
-    window = Z_NULL;
-    if (state->window != Z_NULL) {
-        window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-        if (window == Z_NULL) {
-            ZFREE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
-    copy->strm = dest;
-    if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state FAR *)copy;
-    return Z_OK;
-}
-
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-    state->sane = !subvert;
-    return Z_OK;
-#else
-    (void)subvert;
-    state->sane = 1;
-    return Z_DATA_ERROR;
-#endif
-}
-
-int ZEXPORT inflateValidate(strm, check)
-z_streamp strm;
-int check;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (check)
-        state->wrap |= 4;
-    else
-        state->wrap &= ~4;
-    return Z_OK;
-}
-
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (inflateStateCheck(strm))
-        return -(1L << 16);
-    state = (struct inflate_state FAR *)strm->state;
-    return (long)(((unsigned long)((long)state->back)) << 16) +
-        (state->mode == COPY ? state->length :
-            (state->mode == MATCH ? state->was - state->length : 0));
-}
-
-unsigned long ZEXPORT inflateCodesUsed(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (inflateStateCheck(strm)) return (unsigned long)-1;
-    state = (struct inflate_state FAR *)strm->state;
-    return (unsigned long)(state->next - state->codes);
-}
diff --git a/src/png/zlib/inflate.h b/src/png/zlib/inflate.h
deleted file mode 100644
index a46cce6b6..000000000
--- a/src/png/zlib/inflate.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2016 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip decoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-    HEAD = 16180,   /* i: waiting for magic header */
-    FLAGS,      /* i: waiting for method and flags (gzip) */
-    TIME,       /* i: waiting for modification time (gzip) */
-    OS,         /* i: waiting for extra flags and operating system (gzip) */
-    EXLEN,      /* i: waiting for extra length (gzip) */
-    EXTRA,      /* i: waiting for extra bytes (gzip) */
-    NAME,       /* i: waiting for end of file name (gzip) */
-    COMMENT,    /* i: waiting for end of comment (gzip) */
-    HCRC,       /* i: waiting for header crc (gzip) */
-    DICTID,     /* i: waiting for dictionary check value */
-    DICT,       /* waiting for inflateSetDictionary() call */
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        COPY_,      /* i/o: same as COPY below, but only first time in */
-        COPY,       /* i/o: waiting for input or output to copy stored block */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-        LENLENS,    /* i: waiting for code length code lengths */
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN_,       /* i: same as LEN below, but only first time in */
-            LEN,        /* i: waiting for length/lit/eob code */
-            LENEXT,     /* i: waiting for length extra bits */
-            DIST,       /* i: waiting for distance code */
-            DISTEXT,    /* i: waiting for distance extra bits */
-            MATCH,      /* o: waiting for output space to copy string */
-            LIT,        /* o: waiting for output space to write literal */
-    CHECK,      /* i: waiting for 32-bit check value */
-    LENGTH,     /* i: waiting for 32-bit length (gzip) */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD,        /* got a data error -- remain here until reset */
-    MEM,        /* got an inflate() memory error -- remain here until reset */
-    SYNC        /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to BAD or MEM on error -- not shown for clarity)
-
-    Process header:
-        HEAD -> (gzip) or (zlib) or (raw)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
-                  HCRC -> TYPE
-        (zlib) -> DICTID or TYPE
-        DICTID -> DICT -> TYPE
-        (raw) -> TYPEDO
-    Read deflate blocks:
-            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
-            STORED -> COPY_ -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN_
-            LEN_ -> LEN
-    Read deflate codes in fixed or dynamic block:
-                LEN -> LENEXT or LIT or TYPE
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-                LIT -> LEN
-    Process trailer:
-        CHECK -> LENGTH -> DONE
- */
-
-/* State maintained between inflate() calls -- approximately 7K bytes, not
-   including the allocated sliding window, which is up to 32K bytes. */
-struct inflate_state {
-    z_streamp strm;             /* pointer back to this zlib stream */
-    inflate_mode mode;          /* current inflate mode */
-    int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
-                                   bit 2 true to validate check value */
-    int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check;        /* protected copy of check value */
-    unsigned long total;        /* protected copy of output count */
-    gz_headerp head;            /* where to save gzip header information */
-        /* sliding window */
-    unsigned wbits;             /* log base 2 of requested window size */
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned wnext;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* bit accumulator */
-    unsigned long hold;         /* input bit accumulator */
-    unsigned bits;              /* number of bits in "in" */
-        /* for string and stored block copying */
-    unsigned length;            /* literal or length of data to copy */
-    unsigned offset;            /* distance back to copy string from */
-        /* for table and code decoding */
-    unsigned extra;             /* extra bits needed */
-        /* fixed and dynamic code tables */
-    code const FAR *lencode;    /* starting table for length/literal codes */
-    code const FAR *distcode;   /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    unsigned have;              /* number of code lengths in lens[] */
-    code FAR *next;             /* next available space in codes[] */
-    unsigned short lens[320];   /* temporary storage for code lengths */
-    unsigned short work[288];   /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-    int sane;                   /* if false, allow invalid distance too far */
-    int back;                   /* bits back of last unprocessed length/lit */
-    unsigned was;               /* initial length of match */
-};
diff --git a/src/png/zlib/inftrees.c b/src/png/zlib/inftrees.c
deleted file mode 100644
index 2ea08fc13..000000000
--- a/src/png/zlib/inftrees.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2017 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright[] =
-   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code here;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    unsigned match;             /* use base and extra for symbol >= match */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) {                     /* no symbols to code at all */
-        here.op = (unsigned char)64;    /* invalid code marker */
-        here.bits = (unsigned char)1;
-        here.val = (unsigned short)0;
-        *(*table)++ = here;             /* make a table to force an error */
-        *(*table)++ = here;
-        *bits = 1;
-        return 0;     /* no symbols, but wait for decoding to report error */
-    }
-    for (min = 1; min < max; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked for LENS and DIST tables against
-       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
-       the initial root table size constants.  See the comments in inftrees.h
-       for more information.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        match = 20;
-        break;
-    case LENS:
-        base = lbase;
-        extra = lext;
-        match = 257;
-        break;
-    default:    /* DISTS */
-        base = dbase;
-        extra = dext;
-        match = 0;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if ((type == LENS && used > ENOUGH_LENS) ||
-        (type == DISTS && used > ENOUGH_DISTS))
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        here.bits = (unsigned char)(len - drop);
-        if (work[sym] + 1U < match) {
-            here.op = (unsigned char)0;
-            here.val = work[sym];
-        }
-        else if (work[sym] >= match) {
-            here.op = (unsigned char)(extra[work[sym] - match]);
-            here.val = base[work[sym] - match];
-        }
-        else {
-            here.op = (unsigned char)(32 + 64);         /* end of block */
-            here.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        min = fill;                 /* save offset to next table */
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = here;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += min;            /* here min is 1 << curr */
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if ((type == LENS && used > ENOUGH_LENS) ||
-                (type == DISTS && used > ENOUGH_DISTS))
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /* fill in remaining table entry if code is incomplete (guaranteed to have
-       at most one remaining entry, since if the code is incomplete, the
-       maximum code length that was allowed to get this far is one bit) */
-    if (huff != 0) {
-        here.op = (unsigned char)64;            /* invalid code marker */
-        here.bits = (unsigned char)(len - drop);
-        here.val = (unsigned short)0;
-        next[huff] = here;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}
diff --git a/src/png/zlib/inftrees.h b/src/png/zlib/inftrees.h
deleted file mode 100644
index baa53a0b1..000000000
--- a/src/png/zlib/inftrees.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005, 2010 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of the dynamic table.  The maximum number of code structures is
-   1444, which is the sum of 852 for literal/length codes and 592 for distance
-   codes.  These values were found by exhaustive searches using the program
-   examples/enough.c found in the zlib distribtution.  The arguments to that
-   program are the number of symbols, the initial root table size, and the
-   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
-   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
-   The initial root table size (9 or 6) is found in the fifth argument of the
-   inflate_table() calls in inflate.c and infback.c.  If the root table size is
-   changed, then these maximum sizes would be need to be recalculated and
-   updated. */
-#define ENOUGH_LENS 852
-#define ENOUGH_DISTS 592
-#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
-
-/* Type of code to build for inflate_table() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/src/png/zlib/make_vms.com b/src/png/zlib/make_vms.com
deleted file mode 100644
index 65e9d0cbc..000000000
--- a/src/png/zlib/make_vms.com
+++ /dev/null
@@ -1,867 +0,0 @@
-$! make libz under VMS written by
-$! Martin P.J. Zinser
-$!
-$! In case of problems with the install you might contact me at
-$! zinser@zinser.no-ip.info(preferred) or
-$! martin.zinser@eurexchange.com (work)
-$!
-$! Make procedure history for Zlib
-$!
-$!------------------------------------------------------------------------------
-$! Version history
-$! 0.01 20060120 First version to receive a number
-$! 0.02 20061008 Adapt to new Makefile.in
-$! 0.03 20091224 Add support for large file check
-$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
-$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
-$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples
-$!               subdir path, update module search in makefile.in
-$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned
-$!               shared image creation
-$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
-$!               image
-$! 0.09 20120305 SMS.  P1 sets builder ("MMK", "MMS", " " (built-in)).
-$!               "" -> automatic, preference: MMK, MMS, built-in.
-$!
-$ on error then goto err_exit
-$!
-$ true  = 1
-$ false = 0
-$ tmpnam = "temp_" + f$getjpi("","pid")
-$ tt = tmpnam + ".txt"
-$ tc = tmpnam + ".c"
-$ th = tmpnam + ".h"
-$ define/nolog tconfig 'th'
-$ its_decc = false
-$ its_vaxc = false
-$ its_gnuc = false
-$ s_case   = False
-$!
-$! Setup variables holding "config" information
-$!
-$ Make    = "''p1'"
-$ name     = "Zlib"
-$ version  = "?.?.?"
-$ v_string = "ZLIB_VERSION"
-$ v_file   = "zlib.h"
-$ ccopt   = "/include = []"
-$ lopts   = ""
-$ dnsrl   = ""
-$ aconf_in_file = "zconf.h.in#zconf.h_in#zconf_h.in"
-$ conf_check_string = ""
-$ linkonly = false
-$ optfile  = name + ".opt"
-$ mapfile  = name + ".map"
-$ libdefs  = ""
-$ vax      = f$getsyi("HW_MODEL").lt.1024
-$ axp      = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
-$ ia64     = f$getsyi("HW_MODEL").ge.4096
-$!
-$! 2012-03-05 SMS.
-$! Why is this needed?  And if it is needed, why not simply ".not. vax"?
-$!
-$!!! if axp .or. ia64 then  set proc/parse=extended
-$!
-$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL")
-$ mydef  = F$parse(whoami,,,"DEVICE")
-$ mydir  = f$parse(whoami,,,"DIRECTORY") - "]["
-$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
-$!
-$! Check for MMK/MMS
-$!
-$ if (Make .eqs. "")
-$ then
-$   If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
-$   If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
-$ else
-$   Make = f$edit( Make, "trim")
-$ endif
-$!
-$ gosub find_version
-$!
-$  open/write topt tmp.opt
-$  open/write optf 'optfile'
-$!
-$ gosub check_opts
-$!
-$! Look for the compiler used
-$!
-$ gosub check_compiler
-$ close topt
-$ close optf
-$!
-$ if its_decc
-$ then
-$   ccopt = "/prefix=all" + ccopt
-$   if f$trnlnm("SYS") .eqs. ""
-$   then
-$     if axp
-$     then
-$       define sys sys$library:
-$     else
-$       ccopt = "/decc" + ccopt
-$       define sys decc$library_include:
-$     endif
-$   endif
-$!
-$! 2012-03-05 SMS.
-$! Why /NAMES = AS_IS?  Why not simply ".not. vax"?  And why not on VAX?
-$!
-$   if axp .or. ia64
-$   then
-$       ccopt = ccopt + "/name=as_is/opt=(inline=speed)"
-$       s_case = true
-$   endif
-$ endif
-$ if its_vaxc .or. its_gnuc
-$ then
-$    if f$trnlnm("SYS").eqs."" then define sys sys$library:
-$ endif
-$!
-$! Build a fake configure input header
-$!
-$ open/write conf_hin config.hin
-$ write conf_hin "#undef _LARGEFILE64_SOURCE"
-$ close conf_hin
-$!
-$!
-$ i = 0
-$FIND_ACONF:
-$ fname = f$element(i,"#",aconf_in_file)
-$ if fname .eqs. "#" then goto AMISS_ERR
-$ if f$search(fname) .eqs. ""
-$ then
-$   i = i + 1
-$   goto find_aconf
-$ endif
-$ open/read/err=aconf_err aconf_in 'fname'
-$ open/write aconf zconf.h
-$ACONF_LOOP:
-$ read/end_of_file=aconf_exit aconf_in line
-$ work = f$edit(line, "compress,trim")
-$ if f$extract(0,6,work) .nes. "#undef"
-$ then
-$   if f$extract(0,12,work) .nes. "#cmakedefine"
-$   then
-$       write aconf line
-$   endif
-$ else
-$   cdef = f$element(1," ",work)
-$   gosub check_config
-$ endif
-$ goto aconf_loop
-$ACONF_EXIT:
-$ write aconf ""
-$ write aconf "/* VMS specifics added by make_vms.com: */"
-$ write aconf "#define VMS 1"
-$ write aconf "#include <unistd.h>"
-$ write aconf "#include <unixio.h>"
-$ write aconf "#ifdef _LARGEFILE"
-$ write aconf "# define off64_t __off64_t"
-$ write aconf "# define fopen64 fopen"
-$ write aconf "# define fseeko64 fseeko"
-$ write aconf "# define lseek64 lseek"
-$ write aconf "# define ftello64 ftell"
-$ write aconf "#endif"
-$ write aconf "#if !defined( __VAX) && (__CRTL_VER >= 70312000)"
-$ write aconf "# define HAVE_VSNPRINTF"
-$ write aconf "#endif"
-$ close aconf_in
-$ close aconf
-$ if f$search("''th'") .nes. "" then delete 'th';*
-$! Build the thing plain or with mms
-$!
-$ write sys$output "Compiling Zlib sources ..."
-$ if make.eqs.""
-$ then
-$   if (f$search( "example.obj;*") .nes. "") then delete example.obj;*
-$   if (f$search( "minigzip.obj;*") .nes. "") then delete minigzip.obj;*
-$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
-                adler32.c zlib.h zconf.h
-$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
-                compress.c zlib.h zconf.h
-$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
-                crc32.c zlib.h zconf.h
-$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
-                deflate.c deflate.h zutil.h zlib.h zconf.h
-$   CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" -
-                gzclose.c zutil.h zlib.h zconf.h
-$   CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" -
-                gzlib.c zutil.h zlib.h zconf.h
-$   CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" -
-                gzread.c zutil.h zlib.h zconf.h
-$   CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" -
-                gzwrite.c zutil.h zlib.h zconf.h
-$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
-                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
-$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
-                inffast.c zutil.h zlib.h zconf.h inffast.h
-$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
-                inflate.c zutil.h zlib.h zconf.h infblock.h
-$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
-                inftrees.c zutil.h zlib.h zconf.h inftrees.h
-$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
-                trees.c deflate.h zutil.h zlib.h zconf.h
-$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
-                uncompr.c zlib.h zconf.h
-$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
-                zutil.c zutil.h zlib.h zconf.h
-$   write sys$output "Building Zlib ..."
-$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
-$   write sys$output "Building example..."
-$   CALL MAKE example.OBJ "CC ''CCOPT' [.test]example" -
-                [.test]example.c zlib.h zconf.h
-$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
-$   write sys$output "Building minigzip..."
-$   CALL MAKE minigzip.OBJ "CC ''CCOPT' [.test]minigzip" -
-              [.test]minigzip.c zlib.h zconf.h
-$   call make minigzip.exe -
-              "LINK minigzip,libz.olb/lib" -
-              minigzip.obj libz.olb
-$ else
-$   gosub crea_mms
-$   write sys$output "Make ''name' ''version' with ''Make' "
-$   'make'
-$ endif
-$!
-$! Create shareable image
-$!
-$ gosub crea_olist
-$ write sys$output "Creating libzshr.exe"
-$ call map_2_shopt 'mapfile' 'optfile'
-$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,'optfile'/opt
-$ write sys$output "Zlib build completed"
-$ delete/nolog tmp.opt;*
-$ exit
-$AMISS_ERR:
-$ write sys$output "No source for config.hin found."
-$ write sys$output "Tried any of ''aconf_in_file'"
-$ goto err_exit
-$CC_ERR:
-$ write sys$output "C compiler required to build ''name'"
-$ goto err_exit
-$ERR_EXIT:
-$ set message/facil/ident/sever/text
-$ close/nolog optf
-$ close/nolog topt
-$ close/nolog aconf_in
-$ close/nolog aconf
-$ close/nolog out
-$ close/nolog min
-$ close/nolog mod
-$ close/nolog h_in
-$ write sys$output "Exiting..."
-$ exit 2
-$!
-$!
-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 - P8  What it depends on
-$
-$ If F$Search(P1) .Eqs. "" Then Goto Makeit
-$ Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$       Argument = P'arg
-$       If Argument .Eqs. "" Then Goto Exit
-$       El=0
-$Loop2:
-$       File = F$Element(El," ",Argument)
-$       If File .Eqs. " " Then Goto Endl
-$       AFile = ""
-$Loop3:
-$       OFile = AFile
-$       AFile = F$Search(File)
-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$       Goto Loop3
-$NextEL:
-$       El = El + 1
-$       Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(0)
-$ write sys$output P2
-$ 'P2
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
-$!------------------------------------------------------------------------------
-$!
-$! Check command line options and set symbols accordingly
-$!
-$!------------------------------------------------------------------------------
-$! Version history
-$! 0.01 20041206 First version to receive a number
-$! 0.02 20060126 Add new "HELP" target
-$ CHECK_OPTS:
-$ i = 1
-$ OPT_LOOP:
-$ if i .lt. 9
-$ then
-$   cparm = f$edit(p'i',"upcase")
-$!
-$! Check if parameter actually contains something
-$!
-$   if f$edit(cparm,"trim") .nes. ""
-$   then
-$     if cparm .eqs. "DEBUG"
-$     then
-$       ccopt = ccopt + "/noopt/deb"
-$       lopts = lopts + "/deb"
-$     endif
-$     if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
-$     then
-$       start = f$locate("=",cparm) + 1
-$       len   = f$length(cparm) - start
-$       ccopt = ccopt + f$extract(start,len,cparm)
-$       if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
-          then s_case = true
-$     endif
-$     if cparm .eqs. "LINK" then linkonly = true
-$     if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
-$     then
-$       start = f$locate("=",cparm) + 1
-$       len   = f$length(cparm) - start
-$       lopts = lopts + f$extract(start,len,cparm)
-$     endif
-$     if f$locate("CC=",cparm) .lt. f$length(cparm)
-$     then
-$       start  = f$locate("=",cparm) + 1
-$       len    = f$length(cparm) - start
-$       cc_com = f$extract(start,len,cparm)
-        if (cc_com .nes. "DECC") .and. -
-           (cc_com .nes. "VAXC") .and. -
-           (cc_com .nes. "GNUC")
-$       then
-$         write sys$output "Unsupported compiler choice ''cc_com' ignored"
-$         write sys$output "Use DECC, VAXC, or GNUC instead"
-$       else
-$         if cc_com .eqs. "DECC" then its_decc = true
-$         if cc_com .eqs. "VAXC" then its_vaxc = true
-$         if cc_com .eqs. "GNUC" then its_gnuc = true
-$       endif
-$     endif
-$     if f$locate("MAKE=",cparm) .lt. f$length(cparm)
-$     then
-$       start  = f$locate("=",cparm) + 1
-$       len    = f$length(cparm) - start
-$       mmks = f$extract(start,len,cparm)
-$       if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
-$       then
-$         make = mmks
-$       else
-$         write sys$output "Unsupported make choice ''mmks' ignored"
-$         write sys$output "Use MMK or MMS instead"
-$       endif
-$     endif
-$     if cparm .eqs. "HELP" then gosub bhelp
-$   endif
-$   i = i + 1
-$   goto opt_loop
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Look for the compiler used
-$!
-$! Version history
-$! 0.01 20040223 First version to receive a number
-$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists
-$! 0.03 20060202 Extend handling of GNU C
-$! 0.04 20090402 Compaq -> hp
-$CHECK_COMPILER:
-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
-$ then
-$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
-$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
-$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
-$ endif
-$!
-$! Exit if no compiler available
-$!
-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
-$ then goto CC_ERR
-$ else
-$   if its_decc
-$   then
-$     write sys$output "CC compiler check ... hp C"
-$     if f$trnlnm("decc$no_rooted_search_lists") .nes. ""
-$     then
-$       dnrsl = f$trnlnm("decc$no_rooted_search_lists")
-$     endif
-$     define/nolog decc$no_rooted_search_lists 1
-$   else
-$     if its_vaxc then write sys$output "CC compiler check ... VAX C"
-$     if its_gnuc
-$     then
-$         write sys$output "CC compiler check ... GNU C"
-$         if f$trnlnm(topt) then write topt "gnu_cc:[000000]gcclib.olb/lib"
-$         if f$trnlnm(optf) then write optf "gnu_cc:[000000]gcclib.olb/lib"
-$         cc = "gcc"
-$     endif
-$     if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share"
-$     if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share"
-$   endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! If MMS/MMK are available dump out the descrip.mms if required
-$!
-$CREA_MMS:
-$ write sys$output "Creating descrip.mms..."
-$ create descrip.mms
-$ open/append out descrip.mms
-$ copy sys$input: out
-$ deck
-# descrip.mms: MMS description file for building zlib on VMS
-# written by Martin P.J. Zinser
-# <zinser@zinser.no-ip.info or martin.zinser@eurexchange.com>
-
-OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
-       gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\
-       deflate.obj, trees.obj, zutil.obj, inflate.obj, \
-       inftrees.obj, inffast.obj
-
-$ eod
-$ write out "CFLAGS=", ccopt
-$ write out "LOPTS=", lopts
-$ write out "all : example.exe minigzip.exe libz.olb"
-$ copy sys$input: out
-$ deck
-        @ write sys$output " Example applications available"
-
-libz.olb : libz.olb($(OBJS))
-	@ write sys$output " libz available"
-
-example.exe : example.obj libz.olb
-              link $(LOPTS) example,libz.olb/lib
-
-minigzip.exe : minigzip.obj libz.olb
-              link $(LOPTS) minigzip,libz.olb/lib
-
-clean :
-	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
-
-
-# Other dependencies.
-adler32.obj  : adler32.c zutil.h zlib.h zconf.h
-compress.obj : compress.c zlib.h zconf.h
-crc32.obj    : crc32.c zutil.h zlib.h zconf.h
-deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h
-example.obj  : [.test]example.c zlib.h zconf.h
-gzclose.obj  : gzclose.c zutil.h zlib.h zconf.h
-gzlib.obj    : gzlib.c zutil.h zlib.h zconf.h
-gzread.obj   : gzread.c zutil.h zlib.h zconf.h
-gzwrite.obj  : gzwrite.c zutil.h zlib.h zconf.h
-inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
-inflate.obj  : inflate.c zutil.h zlib.h zconf.h
-inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
-minigzip.obj : [.test]minigzip.c zlib.h zconf.h
-trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h
-uncompr.obj  : uncompr.c zlib.h zconf.h
-zutil.obj    : zutil.c zutil.h zlib.h zconf.h
-infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
-$ eod
-$ close out
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Read list of core library sources from makefile.in and create options
-$! needed to build shareable image
-$!
-$CREA_OLIST:
-$ open/read min makefile.in
-$ open/write mod modules.opt
-$ src_check_list = "OBJZ =#OBJG ="
-$MRLOOP:
-$ read/end=mrdone min rec
-$ i = 0
-$SRC_CHECK_LOOP:
-$ src_check = f$element(i, "#", src_check_list)
-$ i = i+1
-$ if src_check .eqs. "#" then goto mrloop
-$ if (f$extract(0,6,rec) .nes. src_check) then goto src_check_loop
-$ rec = rec - src_check
-$ gosub extra_filnam
-$ if (f$element(1,"\",rec) .eqs. "\") then goto mrloop
-$MRSLOOP:
-$ read/end=mrdone min rec
-$ gosub extra_filnam
-$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
-$MRDONE:
-$ close min
-$ close mod
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Take record extracted in crea_olist and split it into single filenames
-$!
-$EXTRA_FILNAM:
-$ myrec = f$edit(rec - "\", "trim,compress")
-$ i = 0
-$FELOOP:
-$ srcfil = f$element(i," ", myrec)
-$ if (srcfil .nes. " ")
-$ then
-$   write mod f$parse(srcfil,,,"NAME"), ".obj"
-$   i = i + 1
-$   goto feloop
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Find current Zlib version number
-$!
-$FIND_VERSION:
-$ open/read h_in 'v_file'
-$hloop:
-$ read/end=hdone h_in rec
-$ rec = f$edit(rec,"TRIM")
-$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
-$ rec = f$edit(rec - "#", "TRIM")
-$ if f$element(0," ",rec) .nes. "define" then goto hloop
-$ if f$element(1," ",rec) .eqs. v_string
-$ then
-$   version = 'f$element(2," ",rec)'
-$   goto hdone
-$ endif
-$ goto hloop
-$hdone:
-$ close h_in
-$ return
-$!------------------------------------------------------------------------------
-$!
-$CHECK_CONFIG:
-$!
-$ in_ldef = f$locate(cdef,libdefs)
-$ if (in_ldef .lt. f$length(libdefs))
-$ then
-$   write aconf "#define ''cdef' 1"
-$   libdefs = f$extract(0,in_ldef,libdefs) + -
-              f$extract(in_ldef + f$length(cdef) + 1, -
-                        f$length(libdefs) - in_ldef - f$length(cdef) - 1, -
-                        libdefs)
-$ else
-$   if (f$type('cdef') .eqs. "INTEGER")
-$   then
-$     write aconf "#define ''cdef' ", 'cdef'
-$   else
-$     if (f$type('cdef') .eqs. "STRING")
-$     then
-$       write aconf "#define ''cdef' ", """", '''cdef'', """"
-$     else
-$       gosub check_cc_def
-$     endif
-$   endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check if this is a define relating to the properties of the C/C++
-$! compiler
-$!
-$ CHECK_CC_DEF:
-$ if (cdef .eqs. "_LARGEFILE64_SOURCE")
-$ then
-$   copy sys$input: 'tc'
-$   deck
-#include "tconfig"
-#define _LARGEFILE
-#include <stdio.h>
-
-int main(){
-FILE *fp;
-  fp = fopen("temp.txt","r");
-  fseeko(fp,1,SEEK_SET);
-  fclose(fp);
-}
-
-$   eod
-$   test_inv = false
-$   comm_h = false
-$   gosub cc_prop_check
-$   return
-$ endif
-$ write aconf "/* ", line, " */"
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check for properties of C/C++ compiler
-$!
-$! Version history
-$! 0.01 20031020 First version to receive a number
-$! 0.02 20031022 Added logic for defines with value
-$! 0.03 20040309 Make sure local config file gets not deleted
-$! 0.04 20041230 Also write include for configure run
-$! 0.05 20050103 Add processing of "comment defines"
-$CC_PROP_CHECK:
-$ cc_prop = true
-$ is_need = false
-$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true)
-$ if f$search(th) .eqs. "" then create 'th'
-$ set message/nofac/noident/nosever/notext
-$ on error then continue
-$ cc 'tmpnam'
-$ if .not. ($status)  then cc_prop = false
-$ on error then continue
-$! The headers might lie about the capabilities of the RTL
-$ link 'tmpnam',tmp.opt/opt
-$ if .not. ($status)  then cc_prop = false
-$ set message/fac/ident/sever/text
-$ on error then goto err_exit
-$ delete/nolog 'tmpnam'.*;*/exclude='th'
-$ if (cc_prop .and. .not. is_need) .or. -
-     (.not. cc_prop .and. is_need)
-$ then
-$   write sys$output "Checking for ''cdef'... yes"
-$   if f$type('cdef_val'_yes) .nes. ""
-$   then
-$     if f$type('cdef_val'_yes) .eqs. "INTEGER" -
-         then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes)
-$     if f$type('cdef_val'_yes) .eqs. "STRING" -
-         then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes)
-$   else
-$     call write_config f$fao("#define !AS 1",cdef)
-$   endif
-$   if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. -
-       (cdef .eqs. "_LARGEFILE64_SOURCE") then -
-      call write_config f$string("#define _LARGEFILE 1")
-$ else
-$   write sys$output "Checking for ''cdef'... no"
-$   if (comm_h)
-$   then
-      call write_config f$fao("/* !AS */",line)
-$   else
-$     if f$type('cdef_val'_no) .nes. ""
-$     then
-$       if f$type('cdef_val'_no) .eqs. "INTEGER" -
-           then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no)
-$       if f$type('cdef_val'_no) .eqs. "STRING" -
-           then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no)
-$     else
-$       call write_config f$fao("#undef !AS",cdef)
-$     endif
-$   endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check for properties of C/C++ compiler with multiple result values
-$!
-$! Version history
-$! 0.01 20040127 First version
-$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05
-$CC_MPROP_CHECK:
-$ cc_prop = true
-$ i    = 1
-$ idel = 1
-$ MT_LOOP:
-$ if f$type(result_'i') .eqs. "STRING"
-$ then
-$   set message/nofac/noident/nosever/notext
-$   on error then continue
-$   cc 'tmpnam'_'i'
-$   if .not. ($status)  then cc_prop = false
-$   on error then continue
-$! The headers might lie about the capabilities of the RTL
-$   link 'tmpnam'_'i',tmp.opt/opt
-$   if .not. ($status)  then cc_prop = false
-$   set message/fac/ident/sever/text
-$   on error then goto err_exit
-$   delete/nolog 'tmpnam'_'i'.*;*
-$   if (cc_prop)
-$   then
-$     write sys$output "Checking for ''cdef'... ", mdef_'i'
-$     if f$type(mdef_'i') .eqs. "INTEGER" -
-         then call write_config f$fao("#define !AS !UL",cdef,mdef_'i')
-$     if f$type('cdef_val'_yes) .eqs. "STRING" -
-         then call write_config f$fao("#define !AS !AS",cdef,mdef_'i')
-$     goto msym_clean
-$   else
-$     i = i + 1
-$     goto mt_loop
-$   endif
-$ endif
-$ write sys$output "Checking for ''cdef'... no"
-$ call write_config f$fao("#undef !AS",cdef)
-$ MSYM_CLEAN:
-$ if (idel .le. msym_max)
-$ then
-$   delete/sym mdef_'idel'
-$   idel = idel + 1
-$   goto msym_clean
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Write configuration to both permanent and temporary config file
-$!
-$! Version history
-$! 0.01 20031029 First version to receive a number
-$!
-$WRITE_CONFIG: SUBROUTINE
-$  write aconf 'p1'
-$  open/append confh 'th'
-$  write confh 'p1'
-$  close confh
-$ENDSUBROUTINE
-$!------------------------------------------------------------------------------
-$!
-$! Analyze the project map file and create the symbol vector for a shareable
-$! image from it
-$!
-$! Version history
-$! 0.01 20120128 First version
-$! 0.02 20120226 Add pre-load logic
-$!
-$ MAP_2_SHOPT: Subroutine
-$!
-$ SAY := "WRITE_ SYS$OUTPUT"
-$!
-$ IF F$SEARCH("''P1'") .EQS. ""
-$ THEN
-$    SAY "MAP_2_SHOPT-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
-$    goto exit_m2s
-$ ENDIF
-$ IF "''P2'" .EQS. ""
-$ THEN
-$    SAY "MAP_2_SHOPT:  Error, no output file provided"
-$    goto exit_m2s
-$ ENDIF
-$!
-$ module1 = "deflate#deflateEnd#deflateInit_#deflateParams#deflateSetDictionary"
-$ module2 = "gzclose#gzerror#gzgetc#gzgets#gzopen#gzprintf#gzputc#gzputs#gzread"
-$ module3 = "gzseek#gztell#inflate#inflateEnd#inflateInit_#inflateSetDictionary"
-$ module4 = "inflateSync#uncompress#zlibVersion#compress"
-$ open/read map 'p1
-$ if axp .or. ia64
-$ then
-$     open/write aopt a.opt
-$     open/write bopt b.opt
-$     write aopt " CASE_SENSITIVE=YES"
-$     write bopt "SYMBOL_VECTOR= (-"
-$     mod_sym_num = 1
-$ MOD_SYM_LOOP:
-$     if f$type(module'mod_sym_num') .nes. ""
-$     then
-$         mod_in = 0
-$ MOD_SYM_IN:
-$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
-$         if shared_proc .nes. "#"
-$         then
-$             write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
-        		       f$edit(shared_proc,"upcase"),shared_proc)
-$             write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
-$             mod_in = mod_in + 1
-$             goto mod_sym_in
-$         endif
-$         mod_sym_num = mod_sym_num + 1
-$         goto mod_sym_loop
-$     endif
-$MAP_LOOP:
-$     read/end=map_end map line
-$     if (f$locate("{",line).lt. f$length(line)) .or. -
-         (f$locate("global:", line) .lt. f$length(line))
-$     then
-$         proc = true
-$         goto map_loop
-$     endif
-$     if f$locate("}",line).lt. f$length(line) then proc = false
-$     if f$locate("local:", line) .lt. f$length(line) then proc = false
-$     if proc
-$     then
-$         shared_proc = f$edit(line,"collapse")
-$         chop_semi = f$locate(";", shared_proc)
-$         if chop_semi .lt. f$length(shared_proc) then -
-              shared_proc = f$extract(0, chop_semi, shared_proc)
-$         write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
-        			 f$edit(shared_proc,"upcase"),shared_proc)
-$         write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
-$     endif
-$     goto map_loop
-$MAP_END:
-$     close/nolog aopt
-$     close/nolog bopt
-$     open/append libopt 'p2'
-$     open/read aopt a.opt
-$     open/read bopt b.opt
-$ALOOP:
-$     read/end=aloop_end aopt line
-$     write libopt line
-$     goto aloop
-$ALOOP_END:
-$     close/nolog aopt
-$     sv = ""
-$BLOOP:
-$     read/end=bloop_end bopt svn
-$     if (svn.nes."")
-$     then
-$        if (sv.nes."") then write libopt sv
-$        sv = svn
-$     endif
-$     goto bloop
-$BLOOP_END:
-$     write libopt f$extract(0,f$length(sv)-2,sv), "-"
-$     write libopt ")"
-$     close/nolog bopt
-$     delete/nolog/noconf a.opt;*,b.opt;*
-$ else
-$     if vax
-$     then
-$     open/append libopt 'p2'
-$     mod_sym_num = 1
-$ VMOD_SYM_LOOP:
-$     if f$type(module'mod_sym_num') .nes. ""
-$     then
-$         mod_in = 0
-$ VMOD_SYM_IN:
-$         shared_proc = f$element(mod_in, "#", module'mod_sym_num')
-$         if shared_proc .nes. "#"
-$         then
-$     	      write libopt f$fao("UNIVERSAL=!AS",-
-      	  			     f$edit(shared_proc,"upcase"))
-$             mod_in = mod_in + 1
-$             goto vmod_sym_in
-$         endif
-$         mod_sym_num = mod_sym_num + 1
-$         goto vmod_sym_loop
-$     endif
-$VMAP_LOOP:
-$     	  read/end=vmap_end map line
-$     	  if (f$locate("{",line).lt. f$length(line)) .or. -
-   	      (f$locate("global:", line) .lt. f$length(line))
-$     	  then
-$     	      proc = true
-$     	      goto vmap_loop
-$     	  endif
-$     	  if f$locate("}",line).lt. f$length(line) then proc = false
-$     	  if f$locate("local:", line) .lt. f$length(line) then proc = false
-$     	  if proc
-$     	  then
-$     	      shared_proc = f$edit(line,"collapse")
-$     	      chop_semi = f$locate(";", shared_proc)
-$     	      if chop_semi .lt. f$length(shared_proc) then -
-      	  	  shared_proc = f$extract(0, chop_semi, shared_proc)
-$     	      write libopt f$fao("UNIVERSAL=!AS",-
-      	  			     f$edit(shared_proc,"upcase"))
-$     	  endif
-$     	  goto vmap_loop
-$VMAP_END:
-$     else
-$         write sys$output "Unknown Architecture (Not VAX, AXP, or IA64)"
-$         write sys$output "No options file created"
-$     endif
-$ endif
-$ EXIT_M2S:
-$ close/nolog map
-$ close/nolog libopt
-$ endsubroutine
diff --git a/src/png/zlib/msdos/Makefile.bor b/src/png/zlib/msdos/Makefile.bor
deleted file mode 100644
index 3d12a2c25..000000000
--- a/src/png/zlib/msdos/Makefile.bor
+++ /dev/null
@@ -1,115 +0,0 @@
-# Makefile for zlib
-# Borland C++
-# Last updated: 15-Mar-2003
-
-# To use, do "make -fmakefile.bor"
-# To compile in small model, set below: MODEL=s
-
-# WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. For example:
-#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
-# If you wish to reduce the memory requirements (default 256K for big
-# objects plus a few K), you can add to the LOC macro below:
-#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# See zconf.h for details about the memory requirements.
-
-# ------------ Turbo C++, Borland C++ ------------
-
-#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
-#    to the declaration of LOC here:
-LOC = $(LOCAL_ZLIB)
-
-# type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
-CPU_TYP = 0
-
-# memory model: one of s, m, c, l (small, medium, compact, large)
-MODEL=l
-
-# replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version
-CC=bcc
-LD=bcc
-AR=tlib
-
-# compiler flags
-# replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0
-CFLAGS=-O2 -Z -m$(MODEL) $(LOC)
-
-LDFLAGS=-m$(MODEL) -f-
-
-
-# variables
-ZLIB_LIB = zlib_$(MODEL).lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-clean:
-	-del *.obj
-	-del *.lib
-	-del *.exe
-	-del zlib_*.bak
-	-del foo.gz
diff --git a/src/png/zlib/msdos/Makefile.dj2 b/src/png/zlib/msdos/Makefile.dj2
deleted file mode 100644
index 59d2037d6..000000000
--- a/src/png/zlib/msdos/Makefile.dj2
+++ /dev/null
@@ -1,104 +0,0 @@
-# Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
-# Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type:
-#
-#   make -fmakefile.dj2;  make test -fmakefile.dj2
-#
-# To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
-#
-#    make install -fmakefile.dj2
-#
-# after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as
-# in the sample below if the pattern of the DJGPP distribution is to
-# be followed.  Remember that, while <sp>'es around <=> are ignored in
-# makefiles, they are *not* in batch files or in djgpp.env.
-# - - - - -
-# [make]
-# INCLUDE_PATH=%\>;INCLUDE_PATH%%\DJDIR%\include
-# LIBRARY_PATH=%\>;LIBRARY_PATH%%\DJDIR%\lib
-# BUTT=-m486
-# - - - - -
-# Alternately, these variables may be defined below, overriding the values
-# in djgpp.env, as
-# INCLUDE_PATH=c:\usr\include
-# LIBRARY_PATH=c:\usr\lib
-
-CC=gcc
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DZLIB_DEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lz
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=libz.a
-
-AR=ar rcs
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-OBJA =
-# to use the asm code: make OBJA=match.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-check: test
-test: all
-	./example
-	echo hello world | .\minigzip | .\minigzip -d
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-libz.a: $(OBJS) $(OBJA)
-	$(AR) $@ $(OBJS) $(OBJA)
-
-%.exe : %.o $(LIBS)
-	$(LD) $@ $< $(LDLIBS)
-
-# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
-
-.PHONY : uninstall clean
-
-install: $(INCL) $(LIBS)
-	-@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
-	-@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
-	$(INSTALL) zlib.h $(INCLUDE_PATH)
-	$(INSTALL) zconf.h $(INCLUDE_PATH)
-	$(INSTALL) libz.a $(LIBRARY_PATH)
-
-uninstall:
-	$(RM) $(INCLUDE_PATH)\zlib.h
-	$(RM) $(INCLUDE_PATH)\zconf.h
-	$(RM) $(LIBRARY_PATH)\libz.a
-
-clean:
-	$(RM) *.d
-	$(RM) *.o
-	$(RM) *.exe
-	$(RM) libz.a
-	$(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif
diff --git a/src/png/zlib/msdos/Makefile.emx b/src/png/zlib/msdos/Makefile.emx
deleted file mode 100644
index e30f67bed..000000000
--- a/src/png/zlib/msdos/Makefile.emx
+++ /dev/null
@@ -1,69 +0,0 @@
-# Makefile for zlib.  Modified for emx 0.9c by Chr. Spieler, 6/17/98.
-# Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type:
-#
-#   make -fmakefile.emx;  make test -fmakefile.emx
-#
-
-CC=gcc
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DZLIB_DEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lzlib
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=zlib.a
-
-AR=ar rcs
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
-       uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-test: all
-	./example
-	echo hello world | .\minigzip | .\minigzip -d
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-zlib.a: $(OBJS)
-	$(AR) $@ $(OBJS)
-
-%.exe : %.o $(LIBS)
-	$(LD) $@ $< $(LDLIBS)
-
-
-.PHONY : clean
-
-clean:
-	$(RM) *.d
-	$(RM) *.o
-	$(RM) *.exe
-	$(RM) zlib.a
-	$(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif
diff --git a/src/png/zlib/msdos/Makefile.msc b/src/png/zlib/msdos/Makefile.msc
deleted file mode 100644
index ae8378615..000000000
--- a/src/png/zlib/msdos/Makefile.msc
+++ /dev/null
@@ -1,112 +0,0 @@
-# Makefile for zlib
-# Microsoft C 5.1 or later
-# Last updated: 19-Mar-2003
-
-# To use, do "make makefile.msc"
-# To compile in small model, set below: MODEL=S
-
-# If you wish to reduce the memory requirements (default 256K for big
-# objects plus a few K), you can add to the LOC macro below:
-#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# See zconf.h for details about the memory requirements.
-
-# ------------- Microsoft C 5.1 and later -------------
-
-#    Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-#    should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added
-#    to the declaration of LOC here:
-LOC = $(LOCAL_ZLIB)
-
-# Type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
-CPU_TYP = 0
-
-# Memory model: one of S, M, C, L (small, medium, compact, large)
-MODEL=L
-
-CC=cl
-CFLAGS=-nologo -A$(MODEL) -G$(CPU_TYP) -W3 -Oait -Gs $(LOC)
-#-Ox generates bad code with MSC 5.1
-LIB_CFLAGS=-Zl $(CFLAGS)
-
-LD=link
-LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode
-# "/farcall/packcode" are only useful for `large code' memory models
-# but should be a "no-op" for small code models.
-
-
-# variables
-ZLIB_LIB = zlib_$(MODEL).lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-
-
-# targets
-all:  $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(LIB_CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-	$(CC) -c $(CFLAGS) $*.c
-
-
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	if exist $(ZLIB_LIB) del $(ZLIB_LIB)
-	lib $(ZLIB_LIB) $(OBJ1);
-	lib $(ZLIB_LIB) $(OBJ2);
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj,,,$(ZLIB_LIB);
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj,,,$(ZLIB_LIB);
-
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-clean:
-	-del *.obj
-	-del *.lib
-	-del *.exe
-	-del *.map
-	-del zlib_*.bak
-	-del foo.gz
diff --git a/src/png/zlib/msdos/Makefile.tc b/src/png/zlib/msdos/Makefile.tc
deleted file mode 100644
index 5aec82a9d..000000000
--- a/src/png/zlib/msdos/Makefile.tc
+++ /dev/null
@@ -1,100 +0,0 @@
-# Makefile for zlib
-# Turbo C 2.01, Turbo C++ 1.01
-# Last updated: 15-Mar-2003
-
-# To use, do "make -fmakefile.tc"
-# To compile in small model, set below: MODEL=s
-
-# WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. For example:
-#    -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-# If you wish to reduce the memory requirements (default 256K for big
-# objects plus a few K), you can add to CFLAGS below:
-#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
-# See zconf.h for details about the memory requirements.
-
-# ------------ Turbo C 2.01, Turbo C++ 1.01 ------------
-MODEL=l
-CC=tcc
-LD=tcc
-AR=tlib
-# CFLAGS=-O2 -G -Z -m$(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-CFLAGS=-O2 -G -Z -m$(MODEL)
-LDFLAGS=-m$(MODEL) -f-
-
-
-# variables
-ZLIB_LIB = zlib_$(MODEL).lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-clean:
-	-del *.obj
-	-del *.lib
-	-del *.exe
-	-del zlib_*.bak
-	-del foo.gz
diff --git a/src/png/zlib/nintendods/Makefile b/src/png/zlib/nintendods/Makefile
deleted file mode 100644
index 21337d01a..000000000
--- a/src/png/zlib/nintendods/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-#---------------------------------------------------------------------------------
-.SUFFIXES:
-#---------------------------------------------------------------------------------
-
-ifeq ($(strip $(DEVKITARM)),)
-$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
-endif
-
-include $(DEVKITARM)/ds_rules
-
-#---------------------------------------------------------------------------------
-# TARGET is the name of the output
-# BUILD is the directory where object files & intermediate files will be placed
-# SOURCES is a list of directories containing source code
-# DATA is a list of directories containing data files
-# INCLUDES is a list of directories containing header files
-#---------------------------------------------------------------------------------
-TARGET		:=	$(shell basename $(CURDIR))
-BUILD		:=	build
-SOURCES		:=	../../
-DATA		:=	data
-INCLUDES	:=	include
-
-#---------------------------------------------------------------------------------
-# options for code generation
-#---------------------------------------------------------------------------------
-ARCH	:=	-mthumb -mthumb-interwork
-
-CFLAGS	:=	-Wall -O2\
-		-march=armv5te -mtune=arm946e-s \
-		-fomit-frame-pointer -ffast-math \
-		$(ARCH)
-
-CFLAGS	+=	$(INCLUDE) -DARM9
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions
-
-ASFLAGS	:=	$(ARCH) -march=armv5te -mtune=arm946e-s
-LDFLAGS	=	-specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-#---------------------------------------------------------------------------------
-# list of directories containing libraries, this must be the top level containing
-# include and lib
-#---------------------------------------------------------------------------------
-LIBDIRS	:=	$(LIBNDS)
-
-#---------------------------------------------------------------------------------
-# no real need to edit anything past this point unless you need to add additional
-# rules for different file extensions
-#---------------------------------------------------------------------------------
-ifneq ($(BUILD),$(notdir $(CURDIR)))
-#---------------------------------------------------------------------------------
-
-export OUTPUT	:=	$(CURDIR)/lib/libz.a
-
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
-
-export DEPSDIR	:=	$(CURDIR)/$(BUILD)
-
-CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
-
-#---------------------------------------------------------------------------------
-# use CXX for linking C++ projects, CC for standard C
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(CPPFILES)),)
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CC)
-#---------------------------------------------------------------------------------
-else
-#---------------------------------------------------------------------------------
-	export LD	:=	$(CXX)
-#---------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------
-
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-			$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
-
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
-			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I$(CURDIR)/$(BUILD)
-
-.PHONY: $(BUILD) clean all
-
-#---------------------------------------------------------------------------------
-all: $(BUILD)
-	@[ -d $@ ] || mkdir -p include
-	@cp ../../*.h include
-
-lib:
-	@[ -d $@ ] || mkdir -p $@
-	
-$(BUILD): lib
-	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) lib
-
-#---------------------------------------------------------------------------------
-else
-
-DEPENDS	:=	$(OFILES:.o=.d)
-
-#---------------------------------------------------------------------------------
-# main targets
-#---------------------------------------------------------------------------------
-$(OUTPUT)	:	$(OFILES)
-
-#---------------------------------------------------------------------------------
-%.bin.o	:	%.bin
-#---------------------------------------------------------------------------------
-	@echo $(notdir $<)
-	@$(bin2o)
-
-
--include $(DEPENDS)
-
-#---------------------------------------------------------------------------------------
-endif
-#---------------------------------------------------------------------------------------
diff --git a/src/png/zlib/nintendods/README b/src/png/zlib/nintendods/README
deleted file mode 100644
index ba7a37dbe..000000000
--- a/src/png/zlib/nintendods/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This Makefile requires devkitARM (http://www.devkitpro.org/category/devkitarm/) and works inside "contrib/nds". It is based on a devkitARM template.
-
-Eduardo Costa <eduardo.m.costa@gmail.com>
-January 3, 2009
-
diff --git a/src/png/zlib/old/Makefile.emx b/src/png/zlib/old/Makefile.emx
deleted file mode 100644
index 612b03791..000000000
--- a/src/png/zlib/old/Makefile.emx
+++ /dev/null
@@ -1,69 +0,0 @@
-# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/98.
-# Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type:
-#
-#   make -fmakefile.emx;  make test -fmakefile.emx
-#
-
-CC=gcc -Zwin32
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DZLIB_DEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lzlib
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=zlib.a
-
-AR=ar rcs
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
-       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-test: all
-	./example
-	echo hello world | .\minigzip | .\minigzip -d
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-zlib.a: $(OBJS)
-	$(AR) $@ $(OBJS)
-
-%.exe : %.o $(LIBS)
-	$(LD) $@ $< $(LDLIBS)
-
-
-.PHONY : clean
-
-clean:
-	$(RM) *.d
-	$(RM) *.o
-	$(RM) *.exe
-	$(RM) zlib.a
-	$(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif
diff --git a/src/png/zlib/old/Makefile.riscos b/src/png/zlib/old/Makefile.riscos
deleted file mode 100644
index 57e29d3fb..000000000
--- a/src/png/zlib/old/Makefile.riscos
+++ /dev/null
@@ -1,151 +0,0 @@
-# Project:   zlib_1_03
-# Patched for zlib 1.1.2 rw@shadow.org.uk 19980430
-# test works out-of-the-box, installs `somewhere' on demand
-
-# Toolflags:
-CCflags = -c -depend !Depend -IC: -g -throwback  -DRISCOS  -fah
-C++flags = -c -depend !Depend -IC: -throwback
-Linkflags = -aif -c++ -o $@
-ObjAsmflags = -throwback -NoCache -depend !Depend
-CMHGflags =
-LibFileflags = -c -l -o $@
-Squeezeflags = -o $@
-
-# change the line below to where _you_ want the library installed.
-libdest = lib:zlib
-
-# Final targets:
-@.lib:   @.o.adler32 @.o.compress @.o.crc32 @.o.deflate @.o.gzio \
-        @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil @.o.trees \
-        @.o.uncompr @.o.zutil
-        LibFile $(LibFileflags) @.o.adler32 @.o.compress @.o.crc32 @.o.deflate \
-        @.o.gzio @.o.infblock @.o.infcodes @.o.inffast @.o.inflate @.o.inftrees @.o.infutil \
-        @.o.trees @.o.uncompr @.o.zutil
-test:   @.minigzip @.example @.lib
-	@copy @.lib @.libc  A~C~DF~L~N~P~Q~RS~TV
-	@echo running tests: hang on.
-	@/@.minigzip -f -9 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -f -1 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -h -9 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -h -1 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -9 libc
-	@/@.minigzip -d libc-gz
-	@/@.minigzip -1 libc
-	@/@.minigzip -d libc-gz
-	@diff @.lib @.libc
-	@echo that should have reported '@.lib and @.libc identical' if you have diff.
-	@/@.example @.fred @.fred
-	@echo that will have given lots of hello!'s.
-
-@.minigzip:   @.o.minigzip @.lib C:o.Stubs
-        Link $(Linkflags) @.o.minigzip @.lib C:o.Stubs
-@.example:   @.o.example @.lib C:o.Stubs
-        Link $(Linkflags) @.o.example @.lib C:o.Stubs
-
-install: @.lib
-	cdir $(libdest)
-	cdir $(libdest).h
-	@copy @.h.zlib $(libdest).h.zlib A~C~DF~L~N~P~Q~RS~TV
-	@copy @.h.zconf $(libdest).h.zconf A~C~DF~L~N~P~Q~RS~TV
-	@copy @.lib $(libdest).lib  A~C~DF~L~N~P~Q~RS~TV
-	@echo okay, installed zlib in $(libdest)
-
-clean:; remove @.minigzip
-	remove @.example
-	remove @.libc
-	-wipe @.o.* F~r~cV
-	remove @.fred
-
-# User-editable dependencies:
-.c.o:
-        cc $(ccflags) -o $@ $<
-
-# Static dependencies:
-
-# Dynamic dependencies:
-o.example:	c.example
-o.example:	h.zlib
-o.example:	h.zconf
-o.minigzip:	c.minigzip
-o.minigzip:	h.zlib
-o.minigzip:	h.zconf
-o.adler32:	c.adler32
-o.adler32:	h.zlib
-o.adler32:	h.zconf
-o.compress:	c.compress
-o.compress:	h.zlib
-o.compress:	h.zconf
-o.crc32:	c.crc32
-o.crc32:	h.zlib
-o.crc32:	h.zconf
-o.deflate:	c.deflate
-o.deflate:	h.deflate
-o.deflate:	h.zutil
-o.deflate:	h.zlib
-o.deflate:	h.zconf
-o.gzio:	c.gzio
-o.gzio:	h.zutil
-o.gzio:	h.zlib
-o.gzio:	h.zconf
-o.infblock:	c.infblock
-o.infblock:	h.zutil
-o.infblock:	h.zlib
-o.infblock:	h.zconf
-o.infblock:	h.infblock
-o.infblock:	h.inftrees
-o.infblock:	h.infcodes
-o.infblock:	h.infutil
-o.infcodes:	c.infcodes
-o.infcodes:	h.zutil
-o.infcodes:	h.zlib
-o.infcodes:	h.zconf
-o.infcodes:	h.inftrees
-o.infcodes:	h.infblock
-o.infcodes:	h.infcodes
-o.infcodes:	h.infutil
-o.infcodes:	h.inffast
-o.inffast:	c.inffast
-o.inffast:	h.zutil
-o.inffast:	h.zlib
-o.inffast:	h.zconf
-o.inffast:	h.inftrees
-o.inffast:	h.infblock
-o.inffast:	h.infcodes
-o.inffast:	h.infutil
-o.inffast:	h.inffast
-o.inflate:	c.inflate
-o.inflate:	h.zutil
-o.inflate:	h.zlib
-o.inflate:	h.zconf
-o.inflate:	h.infblock
-o.inftrees:	c.inftrees
-o.inftrees:	h.zutil
-o.inftrees:	h.zlib
-o.inftrees:	h.zconf
-o.inftrees:	h.inftrees
-o.inftrees:	h.inffixed
-o.infutil:	c.infutil
-o.infutil:	h.zutil
-o.infutil:	h.zlib
-o.infutil:	h.zconf
-o.infutil:	h.infblock
-o.infutil:	h.inftrees
-o.infutil:	h.infcodes
-o.infutil:	h.infutil
-o.trees:	c.trees
-o.trees:	h.deflate
-o.trees:	h.zutil
-o.trees:	h.zlib
-o.trees:	h.zconf
-o.trees:	h.trees
-o.uncompr:	c.uncompr
-o.uncompr:	h.zlib
-o.uncompr:	h.zconf
-o.zutil:	c.zutil
-o.zutil:	h.zutil
-o.zutil:	h.zlib
-o.zutil:	h.zconf
diff --git a/src/png/zlib/old/README b/src/png/zlib/old/README
deleted file mode 100644
index 800bf0798..000000000
--- a/src/png/zlib/old/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains files that have not been updated for zlib 1.2.x
-
-(Volunteers are encouraged to help clean this up.  Thanks.)
diff --git a/src/png/zlib/old/descrip.mms b/src/png/zlib/old/descrip.mms
deleted file mode 100644
index 7066da5b5..000000000
--- a/src/png/zlib/old/descrip.mms
+++ /dev/null
@@ -1,48 +0,0 @@
-# descrip.mms: MMS description file for building zlib on VMS
-# written by Martin P.J. Zinser <m.zinser@gsi.de>
-
-cc_defs =
-c_deb =
-
-.ifdef __DECC__
-pref = /prefix=all
-.endif
-
-OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj,\
-       deflate.obj, trees.obj, zutil.obj, inflate.obj, infblock.obj,\
-       inftrees.obj, infcodes.obj, infutil.obj, inffast.obj
-
-CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
-
-all : example.exe minigzip.exe
-        @ write sys$output " Example applications available"
-libz.olb : libz.olb($(OBJS))
-	@ write sys$output " libz available"
-
-example.exe : example.obj libz.olb
-              link example,libz.olb/lib
-
-minigzip.exe : minigzip.obj libz.olb
-              link minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
-
-clean :
-	delete *.obj;*,libz.olb;*
-
-
-# Other dependencies.
-adler32.obj : zutil.h zlib.h zconf.h
-compress.obj : zlib.h zconf.h
-crc32.obj : zutil.h zlib.h zconf.h
-deflate.obj : deflate.h zutil.h zlib.h zconf.h
-example.obj : zlib.h zconf.h
-gzio.obj : zutil.h zlib.h zconf.h
-infblock.obj : zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-infcodes.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
-inffast.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-inflate.obj : zutil.h zlib.h zconf.h infblock.h
-inftrees.obj : zutil.h zlib.h zconf.h inftrees.h
-infutil.obj : zutil.h zlib.h zconf.h inftrees.h infutil.h
-minigzip.obj : zlib.h zconf.h
-trees.obj : deflate.h zutil.h zlib.h zconf.h
-uncompr.obj : zlib.h zconf.h
-zutil.obj : zutil.h zlib.h zconf.h
diff --git a/src/png/zlib/old/os2/Makefile.os2 b/src/png/zlib/old/os2/Makefile.os2
deleted file mode 100644
index bb426c0d8..000000000
--- a/src/png/zlib/old/os2/Makefile.os2
+++ /dev/null
@@ -1,136 +0,0 @@
-# Makefile for zlib under OS/2 using GCC (PGCC)
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-#   cp Makefile.os2 ..
-#   cd ..
-#   make -f Makefile.os2 test
-
-# This makefile will build a static library z.lib, a shared library
-# z.dll and a import library zdll.lib. You can use either z.lib or
-# zdll.lib by specifying either -lz or -lzdll on gcc's command line
-
-CC=gcc -Zomf -s
-
-CFLAGS=-O6 -Wall
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DZLIB_DEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-#################### BUG WARNING: #####################
-## infcodes.c hits a bug in pgcc-1.0, so you have to use either
-## -O# where # <= 4 or one of (-fno-ommit-frame-pointer or -fno-force-mem)
-## This bug is reportedly fixed in pgcc >1.0, but this was not tested
-CFLAGS+=-fno-force-mem
-
-LDFLAGS=-s -L. -lzdll -Zcrtdll
-LDSHARED=$(CC) -s -Zomf -Zdll -Zcrtdll
-
-VER=1.1.0
-ZLIB=z.lib
-SHAREDLIB=z.dll
-SHAREDLIBIMP=zdll.lib
-LIBS=$(ZLIB) $(SHAREDLIB) $(SHAREDLIBIMP)
-
-AR=emxomfar cr
-IMPLIB=emximp
-RANLIB=echo
-TAR=tar
-SHELL=bash
-
-prefix=/usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
-
-TEST_OBJS = example.o minigzip.o
-
-DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] *.[ch] descrip.mms \
-  algorithm.txt zlib.3 msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \
-  nt/Makefile.nt nt/zlib.dnt  contrib/README.contrib contrib/*.txt \
-  contrib/asm386/*.asm contrib/asm386/*.c \
-  contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/iostream/*.cpp \
-  contrib/iostream/*.h  contrib/iostream2/*.h contrib/iostream2/*.cpp \
-  contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32
-
-all: example.exe minigzip.exe
-
-test: all
-	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	echo hello world | ./minigzip | ./minigzip -d || \
-	  echo '		*** minigzip test FAILED ***' ; \
-	if ./example; then \
-	  echo '		*** zlib test OK ***'; \
-	else \
-	  echo '		*** zlib test FAILED ***'; \
-	fi
-
-$(ZLIB): $(OBJS)
-	$(AR) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-$(SHAREDLIB): $(OBJS) os2/z.def
-	$(LDSHARED) -o $@ $^
-
-$(SHAREDLIBIMP): os2/z.def
-	$(IMPLIB) -o $@ $^
-
-example.exe: example.o $(LIBS)
-	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
-
-minigzip.exe: minigzip.o $(LIBS)
-	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-
-clean:
-	rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
-
-distclean:	clean
-
-zip:
-	mv Makefile Makefile~; cp -p Makefile.in Makefile
-	rm -f test.c ztest*.c
-	v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
-	zip -ul9 zlib$$v $(DISTFILES)
-	mv Makefile~ Makefile
-
-dist:
-	mv Makefile Makefile~; cp -p Makefile.in Makefile
-	rm -f test.c ztest*.c
-	d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
-	rm -f $$d.tar.gz; \
-	if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
-	files=""; \
-	for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
-	cd ..; \
-	GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
-	if test ! -d $$d; then rm -f $$d; fi
-	mv Makefile~ Makefile
-
-tags:
-	etags *.[ch]
-
-depend:
-	makedepend -- $(CFLAGS) -- *.[ch]
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-example.o: zlib.h zconf.h
-gzio.o: zutil.h zlib.h zconf.h
-infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
-infcodes.o: zutil.h zlib.h zconf.h
-infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h
-inffast.o: infblock.h infcodes.h infutil.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h infblock.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-minigzip.o: zlib.h zconf.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/png/zlib/old/os2/zlib.def b/src/png/zlib/old/os2/zlib.def
deleted file mode 100644
index 4c753f1a3..000000000
--- a/src/png/zlib/old/os2/zlib.def
+++ /dev/null
@@ -1,51 +0,0 @@
-;
-; Slightly modified version of ../nt/zlib.dnt :-)
-;
-
-LIBRARY		Z
-DESCRIPTION	"Zlib compression library for OS/2"
-CODE		PRELOAD MOVEABLE DISCARDABLE
-DATA		PRELOAD MOVEABLE MULTIPLE
-
-EXPORTS
-    adler32
-    compress
-    crc32
-    deflate
-    deflateCopy
-    deflateEnd
-    deflateInit2_
-    deflateInit_
-    deflateParams
-    deflateReset
-    deflateSetDictionary
-    gzclose
-    gzdopen
-    gzerror
-    gzflush
-    gzopen
-    gzread
-    gzwrite
-    inflate
-    inflateEnd
-    inflateInit2_
-    inflateInit_
-    inflateReset
-    inflateSetDictionary
-    inflateSync
-    uncompress
-    zlibVersion
-    gzprintf
-    gzputc
-    gzgetc
-    gzseek
-    gzrewind
-    gztell
-    gzeof
-    gzsetparams
-    zError
-    inflateSyncPoint
-    get_crc_table
-    compress2
-    gzputs
-    gzgets
diff --git a/src/png/zlib/old/visual-basic.txt b/src/png/zlib/old/visual-basic.txt
deleted file mode 100644
index 57efe5812..000000000
--- a/src/png/zlib/old/visual-basic.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-See below some functions declarations for Visual Basic.
-
-Frequently Asked Question:
-
-Q: Each time I use the compress function I get the -5 error (not enough
-   room in the output buffer).
-
-A: Make sure that the length of the compressed buffer is passed by
-   reference ("as any"), not by value ("as long"). Also check that
-   before the call of compress this length is equal to the total size of
-   the compressed buffer and not zero.
-
-
-From: "Jon Caruana" <jon-net@usa.net>
-Subject: Re: How to port zlib declares to vb?
-Date: Mon, 28 Oct 1996 18:33:03 -0600
-
-Got the answer! (I haven't had time to check this but it's what I got, and
-looks correct):
-
-He has the following routines working:
-        compress
-        uncompress
-        gzopen
-        gzwrite
-        gzread
-        gzclose
-
-Declares follow: (Quoted from Carlos Rios <c_rios@sonda.cl>, in Vb4 form)
-
-#If Win16 Then   'Use Win16 calls.
-Declare Function compress Lib "ZLIB.DLL" (ByVal compr As
-        String, comprLen As Any, ByVal buf As String, ByVal buflen
-        As Long) As Integer
-Declare Function uncompress Lib "ZLIB.DLL" (ByVal uncompr
-        As String, uncomprLen As Any, ByVal compr As String, ByVal
-        lcompr As Long) As Integer
-Declare Function gzopen Lib "ZLIB.DLL" (ByVal filePath As
-        String, ByVal mode As String) As Long
-Declare Function gzread Lib "ZLIB.DLL" (ByVal file As
-        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
-        As Integer
-Declare Function gzwrite Lib "ZLIB.DLL" (ByVal file As
-        Long, ByVal uncompr As String, ByVal uncomprLen As Integer)
-        As Integer
-Declare Function gzclose Lib "ZLIB.DLL" (ByVal file As
-        Long) As Integer
-#Else
-Declare Function compress Lib "ZLIB32.DLL"
-        (ByVal compr As String, comprLen As Any, ByVal buf As
-        String, ByVal buflen As Long) As Integer
-Declare Function uncompress Lib "ZLIB32.DLL"
-        (ByVal uncompr As String, uncomprLen As Any, ByVal compr As
-        String, ByVal lcompr As Long) As Long
-Declare Function gzopen Lib "ZLIB32.DLL"
-        (ByVal file As String, ByVal mode As String) As Long
-Declare Function gzread Lib "ZLIB32.DLL"
-        (ByVal file As Long, ByVal uncompr As String, ByVal
-        uncomprLen As Long) As Long
-Declare Function gzwrite Lib "ZLIB32.DLL"
-        (ByVal file As Long, ByVal uncompr As String, ByVal
-        uncomprLen As Long) As Long
-Declare Function gzclose Lib "ZLIB32.DLL"
-        (ByVal file As Long) As Long
-#End If
-
--Jon Caruana
-jon-net@usa.net
-Microsoft Sitebuilder Network Level 1 Member - HTML Writer's Guild Member
-
-
-Here is another example from Michael <michael_borgsys@hotmail.com> that he
-says conforms to the VB guidelines, and that solves the problem of not
-knowing the uncompressed size by storing it at the end of the file:
-
-'Calling the functions:
-'bracket meaning: <parameter> [optional] {Range of possible values}
-'Call subCompressFile(<path with filename to compress> [, <path with
-filename to write to>, [level of compression {1..9}]])
-'Call subUncompressFile(<path with filename to compress>)
-
-Option Explicit
-Private lngpvtPcnSml As Long 'Stores value for 'lngPercentSmaller'
-Private Const SUCCESS As Long = 0
-Private Const strFilExt As String = ".cpr"
-Private Declare Function lngfncCpr Lib "zlib.dll" Alias "compress2" (ByRef
-dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long,
-ByVal level As Integer) As Long
-Private Declare Function lngfncUcp Lib "zlib.dll" Alias "uncompress" (ByRef
-dest As Any, ByRef destLen As Any, ByRef src As Any, ByVal srcLen As Long)
-As Long
-
-Public Sub subCompressFile(ByVal strargOriFilPth As String, Optional ByVal
-strargCprFilPth As String, Optional ByVal intLvl As Integer = 9)
-    Dim strCprPth As String
-    Dim lngOriSiz As Long
-    Dim lngCprSiz As Long
-    Dim bytaryOri() As Byte
-    Dim bytaryCpr() As Byte
-    lngOriSiz = FileLen(strargOriFilPth)
-    ReDim bytaryOri(lngOriSiz - 1)
-    Open strargOriFilPth For Binary Access Read As #1
-        Get #1, , bytaryOri()
-    Close #1
-    strCprPth = IIf(strargCprFilPth = "", strargOriFilPth, strargCprFilPth)
-'Select file path and name
-    strCprPth = strCprPth & IIf(Right(strCprPth, Len(strFilExt)) =
-strFilExt, "", strFilExt) 'Add file extension if not exists
-    lngCprSiz = (lngOriSiz * 1.01) + 12 'Compression needs temporary a bit
-more space then original file size
-    ReDim bytaryCpr(lngCprSiz - 1)
-    If lngfncCpr(bytaryCpr(0), lngCprSiz, bytaryOri(0), lngOriSiz, intLvl) =
-SUCCESS Then
-        lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100
-        ReDim Preserve bytaryCpr(lngCprSiz - 1)
-        Open strCprPth For Binary Access Write As #1
-            Put #1, , bytaryCpr()
-            Put #1, , lngOriSiz 'Add the the original size value to the end
-(last 4 bytes)
-        Close #1
-    Else
-        MsgBox "Compression error"
-    End If
-    Erase bytaryCpr
-    Erase bytaryOri
-End Sub
-
-Public Sub subUncompressFile(ByVal strargFilPth As String)
-    Dim bytaryCpr() As Byte
-    Dim bytaryOri() As Byte
-    Dim lngOriSiz As Long
-    Dim lngCprSiz As Long
-    Dim strOriPth As String
-    lngCprSiz = FileLen(strargFilPth)
-    ReDim bytaryCpr(lngCprSiz - 1)
-    Open strargFilPth For Binary Access Read As #1
-        Get #1, , bytaryCpr()
-    Close #1
-    'Read the original file size value:
-    lngOriSiz = bytaryCpr(lngCprSiz - 1) * (2 ^ 24) _
-              + bytaryCpr(lngCprSiz - 2) * (2 ^ 16) _
-              + bytaryCpr(lngCprSiz - 3) * (2 ^ 8) _
-              + bytaryCpr(lngCprSiz - 4)
-    ReDim Preserve bytaryCpr(lngCprSiz - 5) 'Cut of the original size value
-    ReDim bytaryOri(lngOriSiz - 1)
-    If lngfncUcp(bytaryOri(0), lngOriSiz, bytaryCpr(0), lngCprSiz) = SUCCESS
-Then
-        strOriPth = Left(strargFilPth, Len(strargFilPth) - Len(strFilExt))
-        Open strOriPth For Binary Access Write As #1
-            Put #1, , bytaryOri()
-        Close #1
-    Else
-        MsgBox "Uncompression error"
-    End If
-    Erase bytaryCpr
-    Erase bytaryOri
-End Sub
-Public Property Get lngPercentSmaller() As Long
-    lngPercentSmaller = lngpvtPcnSml
-End Property
diff --git a/src/png/zlib/os400/README400 b/src/png/zlib/os400/README400
deleted file mode 100644
index 4f98334f5..000000000
--- a/src/png/zlib/os400/README400
+++ /dev/null
@@ -1,48 +0,0 @@
-        ZLIB version 1.2.11 for OS/400 installation instructions
-
-1) Download and unpack the zlib tarball to some IFS directory.
-   (i.e.: /path/to/the/zlib/ifs/source/directory)
-
-   If the installed IFS command suppors gzip format, this is straightforward,
-else you have to unpack first to some directory on a system supporting it,
-then move the whole directory to the IFS via the network (via SMB or FTP).
-
-2) Edit the configuration parameters in the compilation script.
-
-        EDTF STMF('/path/to/the/zlib/ifs/source/directory/os400/make.sh')
-
-Tune the parameters according to your needs if not matching the defaults.
-Save the file and exit after edition.
-
-3) Enter qshell, then work in the zlib OS/400 specific directory.
-
-        QSH
-        cd /path/to/the/zlib/ifs/source/directory/os400
-
-4) Compile and install
-
-        sh make.sh
-
-The script will:
-- create the libraries, objects and IFS directories for the zlib environment,
-- compile all modules,
-- create a service program,
-- create a static and a dynamic binding directory,
-- install header files for C/C++ and for ILE/RPG, both for compilation in
-  DB2 and IFS environments.
-
-That's all. 
-
-
-Notes:  For OS/400 ILE RPG programmers, a /copy member defining the ZLIB
-                API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
-                In the ILE environment, the same definitions are available from
-                file zlib.inc located in the same IFS include directory as the
-                C/C++ header files.
-                Please read comments in this member for more information.
-
-        Remember that most foreign textual data are ASCII coded: this
-                implementation does not handle conversion from/to ASCII, so
-                text data code conversions must be done explicitely.
-
-        Mainly for the reason above, always open zipped files in binary mode.
diff --git a/src/png/zlib/os400/bndsrc b/src/png/zlib/os400/bndsrc
deleted file mode 100644
index 5e6e0a2f0..000000000
--- a/src/png/zlib/os400/bndsrc
+++ /dev/null
@@ -1,119 +0,0 @@
-STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.1.3 entry points.                                    */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("adler32")
-  EXPORT SYMBOL("compress")
-  EXPORT SYMBOL("compress2")
-  EXPORT SYMBOL("crc32")
-  EXPORT SYMBOL("get_crc_table")
-  EXPORT SYMBOL("deflate")
-  EXPORT SYMBOL("deflateEnd")
-  EXPORT SYMBOL("deflateSetDictionary")
-  EXPORT SYMBOL("deflateCopy")
-  EXPORT SYMBOL("deflateReset")
-  EXPORT SYMBOL("deflateParams")
-  EXPORT SYMBOL("deflatePrime")
-  EXPORT SYMBOL("deflateInit_")
-  EXPORT SYMBOL("deflateInit2_")
-  EXPORT SYMBOL("gzopen")
-  EXPORT SYMBOL("gzdopen")
-  EXPORT SYMBOL("gzsetparams")
-  EXPORT SYMBOL("gzread")
-  EXPORT SYMBOL("gzwrite")
-  EXPORT SYMBOL("gzprintf")
-  EXPORT SYMBOL("gzputs")
-  EXPORT SYMBOL("gzgets")
-  EXPORT SYMBOL("gzputc")
-  EXPORT SYMBOL("gzgetc")
-  EXPORT SYMBOL("gzflush")
-  EXPORT SYMBOL("gzseek")
-  EXPORT SYMBOL("gzrewind")
-  EXPORT SYMBOL("gztell")
-  EXPORT SYMBOL("gzeof")
-  EXPORT SYMBOL("gzclose")
-  EXPORT SYMBOL("gzerror")
-  EXPORT SYMBOL("inflate")
-  EXPORT SYMBOL("inflateEnd")
-  EXPORT SYMBOL("inflateSetDictionary")
-  EXPORT SYMBOL("inflateSync")
-  EXPORT SYMBOL("inflateReset")
-  EXPORT SYMBOL("inflateInit_")
-  EXPORT SYMBOL("inflateInit2_")
-  EXPORT SYMBOL("inflateSyncPoint")
-  EXPORT SYMBOL("uncompress")
-  EXPORT SYMBOL("zlibVersion")
-  EXPORT SYMBOL("zError")
-  EXPORT SYMBOL("z_errmsg")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.1 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("compressBound")
-  EXPORT SYMBOL("deflateBound")
-  EXPORT SYMBOL("deflatePending")
-  EXPORT SYMBOL("gzungetc")
-  EXPORT SYMBOL("gzclearerr")
-  EXPORT SYMBOL("inflateBack")
-  EXPORT SYMBOL("inflateBackEnd")
-  EXPORT SYMBOL("inflateBackInit_")
-  EXPORT SYMBOL("inflateCopy")
-  EXPORT SYMBOL("zlibCompileFlags")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.4 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("adler32_combine")
-  EXPORT SYMBOL("adler32_combine64")
-  EXPORT SYMBOL("crc32_combine")
-  EXPORT SYMBOL("crc32_combine64")
-  EXPORT SYMBOL("deflateSetHeader")
-  EXPORT SYMBOL("deflateTune")
-  EXPORT SYMBOL("gzbuffer")
-  EXPORT SYMBOL("gzclose_r")
-  EXPORT SYMBOL("gzclose_w")
-  EXPORT SYMBOL("gzdirect")
-  EXPORT SYMBOL("gzoffset")
-  EXPORT SYMBOL("gzoffset64")
-  EXPORT SYMBOL("gzopen64")
-  EXPORT SYMBOL("gzseek64")
-  EXPORT SYMBOL("gztell64")
-  EXPORT SYMBOL("inflateGetHeader")
-  EXPORT SYMBOL("inflateMark")
-  EXPORT SYMBOL("inflatePrime")
-  EXPORT SYMBOL("inflateReset2")
-  EXPORT SYMBOL("inflateUndermine")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.6 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("deflateResetKeep")
-  EXPORT SYMBOL("gzgetc_")
-  EXPORT SYMBOL("inflateResetKeep")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.8 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("gzvprintf")
-  EXPORT SYMBOL("inflateGetDictionary")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.9 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-  EXPORT SYMBOL("adler32_z")
-  EXPORT SYMBOL("crc32_z")
-  EXPORT SYMBOL("deflateGetDictionary")
-  EXPORT SYMBOL("gzfread")
-  EXPORT SYMBOL("gzfwrite")
-  EXPORT SYMBOL("inflateCodesUsed")
-  EXPORT SYMBOL("inflateValidate")
-  EXPORT SYMBOL("uncompress2")
-
-ENDPGMEXP
diff --git a/src/png/zlib/os400/make.sh b/src/png/zlib/os400/make.sh
deleted file mode 100644
index 19eec117a..000000000
--- a/src/png/zlib/os400/make.sh
+++ /dev/null
@@ -1,366 +0,0 @@
-#!/bin/sh
-#
-#       ZLIB compilation script for the OS/400.
-#
-#
-#       This is a shell script since make is not a standard component of OS/400.
-
-
-################################################################################
-#
-#                       Tunable configuration parameters.
-#
-################################################################################
-
-TARGETLIB='ZLIB'                # Target OS/400 program library
-STATBNDDIR='ZLIB_A'             # Static binding directory.
-DYNBNDDIR='ZLIB'                # Dynamic binding directory.
-SRVPGM="ZLIB"                   # Service program.
-IFSDIR='/zlib'                  # IFS support base directory.
-TGTCCSID='500'                  # Target CCSID of objects
-DEBUG='*NONE'                   # Debug level
-OPTIMIZE='40'                   # Optimisation level
-OUTPUT='*NONE'                  # Compilation output option.
-TGTRLS='V6R1M0'                 # Target OS release
-
-export TARGETLIB STATBNDDIR DYNBNDDIR SRVPGM IFSDIR
-export TGTCCSID DEBUG OPTIMIZE OUTPUT TGTRLS
-
-
-################################################################################
-#
-#                       OS/400 specific definitions.
-#
-################################################################################
-
-LIBIFSNAME="/QSYS.LIB/${TARGETLIB}.LIB"
-
-
-################################################################################
-#
-#                               Procedures.
-#
-################################################################################
-
-#       action_needed dest [src]
-#
-#       dest is an object to build
-#       if specified, src is an object on which dest depends.
-#
-#       exit 0 (succeeds) if some action has to be taken, else 1.
-
-action_needed()
-
-{
-        [ ! -e "${1}" ] && return 0
-        [ "${2}" ] || return 1
-        [ "${1}" -ot "${2}" ] && return 0
-        return 1
-}
-
-
-#       make_module module_name source_name [additional_definitions]
-#
-#       Compile source name into module if needed.
-#       As side effect, append the module name to variable MODULES.
-#       Set LINK to "YES" if the module has been compiled.
-
-make_module()
-
-{
-    MODULES="${MODULES} ${1}"
-    MODIFSNAME="${LIBIFSNAME}/${1}.MODULE"
-    CSRC="`basename \"${2}\"`"
-
-    if action_needed "${MODIFSNAME}" "${2}"
-    then    :
-    elif [ ! "`sed -e \"/<source name=\\\"${CSRC}\\\">/,/<\\\\/source>/!d\" \
-      -e '/<depend /!d'                                                 \
-      -e 's/.* name=\"\\([^\"]*\\)\".*/\\1/' < \"${TOPDIR}/treebuild.xml\" |
-        while read HDR
-        do      if action_needed \"${MODIFSNAME}\" \"${IFSDIR}/include/${HDR}\"
-                then    echo recompile
-                        break
-                fi
-        done`" ]
-    then    return 0
-    fi
-
-    CMD="CRTCMOD MODULE(${TARGETLIB}/${1}) SRCSTMF('${2}')"
-    CMD="${CMD} SYSIFCOPT(*IFS64IO) OPTION(*INCDIRFIRST)"
-    CMD="${CMD} LOCALETYPE(*LOCALE) FLAG(10)"
-    CMD="${CMD} INCDIR('${IFSDIR}/include' ${INCLUDES})"
-    CMD="${CMD} TGTCCSID(${TGTCCSID}) TGTRLS(${TGTRLS})"
-    CMD="${CMD} OUTPUT(${OUTPUT})"
-    CMD="${CMD} OPTIMIZE(${OPTIMIZE})"
-    CMD="${CMD} DBGVIEW(${DEBUG})"
-    system "${CMD}"
-    LINK=YES
-}
-
-
-#       Determine DB2 object name from IFS name.
-
-db2_name()
-
-{
-        basename "${1}"                                                 |
-        tr 'a-z-' 'A-Z_'                                                |
-        sed -e 's/\..*//'                                               \
-            -e 's/^\(.\).*\(.........\)$/\1\2/'
-}
-
-
-#       Force enumeration types to be the same size as integers.
-
-copy_hfile()
-
-{
-        sed -e '1i\
-#pragma enum(int)\
-' "${@}" -e '$a\
-#pragma enum(pop)\
-'
-}
-
-
-################################################################################
-#
-#                             Script initialization.
-#
-################################################################################
-
-SCRIPTDIR=`dirname "${0}"`
-
-case "${SCRIPTDIR}" in
-/*)     ;;
-*)      SCRIPTDIR="`pwd`/${SCRIPTDIR}"
-esac
-
-while true
-do      case "${SCRIPTDIR}" in
-        */.)    SCRIPTDIR="${SCRIPTDIR%/.}";;
-        *)      break;;
-        esac
-done
-
-#  The script directory is supposed to be in ${TOPDIR}/os400.
-
-TOPDIR=`dirname "${SCRIPTDIR}"`
-export SCRIPTDIR TOPDIR
-cd "${TOPDIR}"
-
-
-#  Extract the version from the master compilation XML file.
-
-VERSION=`sed -e '/^<package /!d'                                        \
-            -e 's/^.* version="\([0-9.]*\)".*$/\1/' -e 'q'              \
-            < treebuild.xml`
-export VERSION
-
-################################################################################
-
-
-#       Create the OS/400 library if it does not exist.
-
-if action_needed "${LIBIFSNAME}"
-then    CMD="CRTLIB LIB(${TARGETLIB}) TEXT('ZLIB: Data compression API')"
-        system "${CMD}"
-fi
-
-
-#       Create the DOCS source file if it does not exist.
-
-if action_needed "${LIBIFSNAME}/DOCS.FILE"
-then    CMD="CRTSRCPF FILE(${TARGETLIB}/DOCS) RCDLEN(112)"
-        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('Documentation texts')"
-        system "${CMD}"
-fi
-
-#       Copy some documentation files if needed.
-
-for TEXT in "${TOPDIR}/ChangeLog" "${TOPDIR}/FAQ"                       \
-    "${TOPDIR}/README" "${SCRIPTDIR}/README400"
-do      MEMBER="${LIBIFSNAME}/DOCS.FILE/`db2_name \"${TEXT}\"`.MBR"
-
-        if action_needed "${MEMBER}" "${TEXT}"
-        then    CMD="CPY OBJ('${TEXT}') TOOBJ('${MEMBER}') TOCCSID(${TGTCCSID})"
-                CMD="${CMD} DTAFMT(*TEXT) REPLACE(*YES)"
-                system "${CMD}"
-        fi
-done
-
-
-#       Create the OS/400 source program file for the C header files.
-
-SRCPF="${LIBIFSNAME}/H.FILE"
-
-if action_needed "${SRCPF}"
-then    CMD="CRTSRCPF FILE(${TARGETLIB}/H) RCDLEN(112)"
-        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: C/C++ header files')"
-        system "${CMD}"
-fi
-
-
-#       Create the IFS directory for the C header files.
-
-if action_needed "${IFSDIR}/include"
-then    mkdir -p "${IFSDIR}/include"
-fi
-
-#       Copy the header files to DB2 library. Link from IFS include directory.
-
-for HFILE in "${TOPDIR}/"*.h
-do      DEST="${SRCPF}/`db2_name \"${HFILE}\"`.MBR"
-
-        if action_needed "${DEST}" "${HFILE}"
-        then    copy_hfile < "${HFILE}" > tmphdrfile
-
-                #       Need to translate to target CCSID.
-
-                CMD="CPY OBJ('`pwd`/tmphdrfile') TOOBJ('${DEST}')"
-                CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
-                system "${CMD}"
-                # touch -r "${HFILE}" "${DEST}"
-                rm -f tmphdrfile
-        fi
-
-        IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
-
-        if action_needed "${IFSFILE}" "${DEST}"
-        then    rm -f "${IFSFILE}"
-                ln -s "${DEST}" "${IFSFILE}"
-        fi
-done
-
-
-#       Install the ILE/RPG header file.
-
-
-HFILE="${SCRIPTDIR}/zlib.inc"
-DEST="${SRCPF}/ZLIB.INC.MBR"
-
-if action_needed "${DEST}" "${HFILE}"
-then    CMD="CPY OBJ('${HFILE}') TOOBJ('${DEST}')"
-        CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
-        system "${CMD}"
-        # touch -r "${HFILE}" "${DEST}"
-fi
-
-IFSFILE="${IFSDIR}/include/`basename \"${HFILE}\"`"
-
-if action_needed "${IFSFILE}" "${DEST}"
-then    rm -f "${IFSFILE}"
-        ln -s "${DEST}" "${IFSFILE}"
-fi
-
-
-#      Create and compile the identification source file.
-
-echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
-echo '#pragma comment(user, __DATE__)' >> os400.c
-echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
-make_module     OS400           os400.c
-LINK=                           # No need to rebuild service program yet.
-MODULES=
-
-
-#       Get source list.
-
-CSOURCES=`sed -e '/<source name="/!d'                                   \
-    -e 's/.* name="\([^"]*\)".*/\1/' < treebuild.xml`
-
-#       Compile the sources into modules.
-
-for SRC in ${CSOURCES}
-do      MODULE=`db2_name "${SRC}"`
-        make_module "${MODULE}" "${SRC}"
-done
-
-
-#       If needed, (re)create the static binding directory.
-
-if action_needed "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
-then    LINK=YES
-fi
-
-if [ "${LINK}" ]
-then    rm -rf "${LIBIFSNAME}/${STATBNDDIR}.BNDDIR"
-        CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${STATBNDDIR})"
-        CMD="${CMD} TEXT('ZLIB static binding directory')"
-        system "${CMD}"
-
-        for MODULE in ${MODULES}
-        do      CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${STATBNDDIR})"
-                CMD="${CMD} OBJ((${TARGETLIB}/${MODULE} *MODULE))"
-                system "${CMD}"
-        done
-fi
-
-
-#       The exportation file for service program creation must be in a DB2
-#               source file, so make sure it exists.
-
-if action_needed "${LIBIFSNAME}/TOOLS.FILE"
-then    CMD="CRTSRCPF FILE(${TARGETLIB}/TOOLS) RCDLEN(112)"
-        CMD="${CMD} CCSID(${TGTCCSID}) TEXT('ZLIB: build tools')"
-        system "${CMD}"
-fi
-
-
-DEST="${LIBIFSNAME}/TOOLS.FILE/BNDSRC.MBR"
-
-if action_needed "${SCRIPTDIR}/bndsrc" "${DEST}"
-then    CMD="CPY OBJ('${SCRIPTDIR}/bndsrc') TOOBJ('${DEST}')"
-        CMD="${CMD} TOCCSID(${TGTCCSID}) DTAFMT(*TEXT) REPLACE(*YES)"
-        system "${CMD}"
-        # touch -r "${SCRIPTDIR}/bndsrc" "${DEST}"
-        LINK=YES
-fi
-
-
-#       Build the service program if needed.
-
-if action_needed "${LIBIFSNAME}/${SRVPGM}.SRVPGM"
-then    LINK=YES
-fi
-
-if [ "${LINK}" ]
-then    CMD="CRTSRVPGM SRVPGM(${TARGETLIB}/${SRVPGM})"
-        CMD="${CMD} SRCFILE(${TARGETLIB}/TOOLS) SRCMBR(BNDSRC)"
-        CMD="${CMD} MODULE(${TARGETLIB}/OS400)"
-        CMD="${CMD} BNDDIR(${TARGETLIB}/${STATBNDDIR})"
-        CMD="${CMD} TEXT('ZLIB ${VERSION} dynamic library')"
-        CMD="${CMD} TGTRLS(${TGTRLS})"
-        system "${CMD}"
-        LINK=YES
-
-        #       Duplicate the service program for a versioned backup.
-
-        BACKUP=`echo "${SRVPGM}${VERSION}"                              |
-                sed -e 's/.*\(..........\)$/\1/' -e 's/\./_/g'`
-        BACKUP="`db2_name \"${BACKUP}\"`"
-        BKUPIFSNAME="${LIBIFSNAME}/${BACKUP}.SRVPGM"
-        rm -f "${BKUPIFSNAME}"
-        CMD="CRTDUPOBJ OBJ(${SRVPGM}) FROMLIB(${TARGETLIB})"
-        CMD="${CMD} OBJTYPE(*SRVPGM) NEWOBJ(${BACKUP})"
-        system "${CMD}"
-fi
-
-
-#       If needed, (re)create the dynamic binding directory.
-
-if action_needed "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
-then    LINK=YES
-fi
-
-if [ "${LINK}" ]
-then    rm -rf "${LIBIFSNAME}/${DYNBNDDIR}.BNDDIR"
-        CMD="CRTBNDDIR BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
-        CMD="${CMD} TEXT('ZLIB dynamic binding directory')"
-        system "${CMD}"
-        CMD="ADDBNDDIRE BNDDIR(${TARGETLIB}/${DYNBNDDIR})"
-        CMD="${CMD} OBJ((*LIBL/${SRVPGM} *SRVPGM))"
-        system "${CMD}"
-fi
diff --git a/src/png/zlib/os400/zlib.inc b/src/png/zlib/os400/zlib.inc
deleted file mode 100644
index c6aca2cbd..000000000
--- a/src/png/zlib/os400/zlib.inc
+++ /dev/null
@@ -1,527 +0,0 @@
-      *  ZLIB.INC - Interface to the general purpose compression library
-      *
-      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.11
-      *
-      *
-      *  WARNING:
-      *     Procedures inflateInit(), inflateInit2(), deflateInit(),
-      *         deflateInit2() and inflateBackInit() need to be called with
-      *         two additional arguments:
-      *         the package version string and the stream control structure.
-      *         size. This is needed because RPG lacks some macro feature.
-      *         Call these procedures as:
-      *             inflateInit(...: ZLIB_VERSION: %size(z_stream))
-      *
-      /if not defined(ZLIB_H_)
-      /define ZLIB_H_
-      *
-      **************************************************************************
-      *                               Constants
-      **************************************************************************
-      *
-      *  Versioning information.
-      *
-     D ZLIB_VERSION    C                   '1.2.11'
-     D ZLIB_VERNUM     C                   X'12a0'
-     D ZLIB_VER_MAJOR  C                   1
-     D ZLIB_VER_MINOR  C                   2
-     D ZLIB_VER_REVISION...
-     D                 C                   11
-     D ZLIB_VER_SUBREVISION...
-     D                 C                   0
-      *
-      *  Other equates.
-      *
-     D Z_NO_FLUSH      C                   0
-     D Z_PARTIAL_FLUSH...
-     D                 C                   1
-     D Z_SYNC_FLUSH    C                   2
-     D Z_FULL_FLUSH    C                   3
-     D Z_FINISH        C                   4
-     D Z_BLOCK         C                   5
-     D Z_TREES         C                   6
-      *
-     D Z_OK            C                   0
-     D Z_STREAM_END    C                   1
-     D Z_NEED_DICT     C                   2
-     D Z_ERRNO         C                   -1
-     D Z_STREAM_ERROR  C                   -2
-     D Z_DATA_ERROR    C                   -3
-     D Z_MEM_ERROR     C                   -4
-     D Z_BUF_ERROR     C                   -5
-     D Z_VERSION_ERROR C                   -6
-      *
-     D Z_NO_COMPRESSION...
-     D                 C                   0
-     D Z_BEST_SPEED    C                   1
-     D Z_BEST_COMPRESSION...
-     D                 C                   9
-     D Z_DEFAULT_COMPRESSION...
-     D                 C                   -1
-      *
-     D Z_FILTERED      C                   1
-     D Z_HUFFMAN_ONLY  C                   2
-     D Z_RLE           C                   3
-     D Z_DEFAULT_STRATEGY...
-     D                 C                   0
-      *
-     D Z_BINARY        C                   0
-     D Z_ASCII         C                   1
-     D Z_UNKNOWN       C                   2
-      *
-     D Z_DEFLATED      C                   8
-      *
-     D Z_NULL          C                   0
-      *
-      **************************************************************************
-      *                                 Types
-      **************************************************************************
-      *
-     D z_streamp       S               *                                        Stream struct ptr
-     D gzFile          S               *                                        File pointer
-     D gz_headerp      S               *
-     D z_off_t         S             10i 0                                      Stream offsets
-     D z_off64_t       S             20i 0                                      Stream offsets
-      *
-      **************************************************************************
-      *                               Structures
-      **************************************************************************
-      *
-      *  The GZIP encode/decode stream support structure.
-      *
-     D z_stream        DS                  align based(z_streamp)
-     D  zs_next_in                     *                                        Next input byte
-     D  zs_avail_in                  10U 0                                      Byte cnt at next_in
-     D  zs_total_in                  10U 0                                      Total bytes read
-     D  zs_next_out                    *                                        Output buffer ptr
-     D  zs_avail_out                 10U 0                                      Room left @ next_out
-     D  zs_total_out                 10U 0                                      Total bytes written
-     D  zs_msg                         *                                        Last errmsg or null
-     D  zs_state                       *                                        Internal state
-     D  zs_zalloc                      *   procptr                              Int. state allocator
-     D  zs_free                        *   procptr                              Int. state dealloc.
-     D  zs_opaque                      *                                        Private alloc. data
-     D  zs_data_type                 10i 0                                      ASC/BIN best guess
-     D  zs_adler                     10u 0                                      Uncompr. adler32 val
-     D                               10U 0                                      Reserved
-     D                               10U 0                                      Ptr. alignment
-      *
-      **************************************************************************
-      *                     Utility function prototypes
-      **************************************************************************
-      *
-     D compress        PR            10I 0 extproc('compress')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10u 0 value                                Source length
-      *
-     D compress2       PR            10I 0 extproc('compress2')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0 value                                Source length
-     D  level                        10I 0 value                                Compression level
-      *
-     D compressBound   PR            10U 0 extproc('compressBound')
-     D  sourceLen                    10U 0 value
-      *
-     D uncompress      PR            10I 0 extproc('uncompress')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0 value                                Source length
-      *
-     D uncompress2     PR            10I 0 extproc('uncompress2')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0                                      Source length
-      *
-      /if not defined(LARGE_FILES)
-     D gzopen          PR                  extproc('gzopen')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      /else
-     D gzopen          PR                  extproc('gzopen64')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      *
-     D gzopen64        PR                  extproc('gzopen64')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      /endif
-      *
-     D gzdopen         PR                  extproc('gzdopen')
-     D                                     like(gzFile)
-     D  fd                           10I 0 value                                File descriptor
-     D  mode                           *   value options(*string)               Open mode
-      *
-     D gzbuffer        PR            10I 0 extproc('gzbuffer')
-     D  file                               value like(gzFile)                   File pointer
-     D  size                         10U 0 value
-      *
-     D gzsetparams     PR            10I 0 extproc('gzsetparams')
-     D  file                               value like(gzFile)                   File pointer
-     D  level                        10I 0 value
-     D  strategy                     10I 0 value
-      *
-     D gzread          PR            10I 0 extproc('gzread')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    options(*varsize)                    Buffer
-     D  len                          10u 0 value                                Buffer length
-      *
-     D gzfread          PR           20I 0 extproc('gzfread')
-     D  buf                       65535    options(*varsize)                    Buffer
-     D  size                         20u 0 value                                Buffer length
-     D  nitems                       20u 0 value                                Buffer length
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzwrite         PR            10I 0 extproc('gzwrite')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    const options(*varsize)              Buffer
-     D  len                          10u 0 value                                Buffer length
-      *
-     D gzfwrite         PR           20I 0 extproc('gzfwrite')
-     D  buf                       65535    options(*varsize)                    Buffer
-     D  size                         20u 0 value                                Buffer length
-     D  nitems                       20u 0 value                                Buffer length
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzputs          PR            10I 0 extproc('gzputs')
-     D  file                               value like(gzFile)                   File pointer
-     D  s                              *   value options(*string)               String to output
-      *
-     D gzgets          PR              *   extproc('gzgets')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    options(*varsize)                    Read buffer
-     D  len                          10i 0 value                                Buffer length
-      *
-     D gzputc          PR            10i 0 extproc('gzputc')
-     D  file                               value like(gzFile)                   File pointer
-     D  c                            10I 0 value                                Character to write
-      *
-     D gzgetc          PR            10i 0 extproc('gzgetc')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzgetc_         PR            10i 0 extproc('gzgetc_')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzungetc        PR            10i 0 extproc('gzungetc')
-     D  c                            10I 0 value                                Character to push
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzflush         PR            10i 0 extproc('gzflush')
-     D  file                               value like(gzFile)                   File pointer
-     D  flush                        10I 0 value                                Type of flush
-      *
-      /if not defined(LARGE_FILES)
-     D gzseek          PR                  extproc('gzseek')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off_t)                  Offset
-     D  whence                       10i 0 value                                Origin
-      /else
-     D gzseek          PR                  extproc('gzseek64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off_t)                  Offset
-     D  whence                       10i 0 value                                Origin
-      *
-     D gzseek64        PR                  extproc('gzseek64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off64_t)                Offset
-     D  whence                       10i 0 value                                Origin
-      /endif
-      *
-     D gzrewind        PR            10i 0 extproc('gzrewind')
-     D  file                               value like(gzFile)                   File pointer
-      *
-      /if not defined(LARGE_FILES)
-     D gztell          PR                  extproc('gztell')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      /else
-     D gztell          PR                  extproc('gztell64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gztell64        PR                  extproc('gztell64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-      /endif
-      *
-      /if not defined(LARGE_FILES)
-     D gzoffset        PR                  extproc('gzoffset')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      /else
-     D gzoffset        PR                  extproc('gzoffset64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzoffset64      PR                  extproc('gzoffset64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-      /endif
-      *
-     D gzeof           PR            10i 0 extproc('gzeof')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzdirect        PR            10i 0 extproc('gzdirect')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose_r       PR            10i 0 extproc('gzclose_r')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose_w       PR            10i 0 extproc('gzclose_w')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose         PR            10i 0 extproc('gzclose')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzerror         PR              *   extproc('gzerror')                   Error string
-     D  file                               value like(gzFile)                   File pointer
-     D  errnum                       10I 0                                      Error code
-      *
-     D gzclearerr      PR                  extproc('gzclearerr')
-     D  file                               value like(gzFile)                   File pointer
-      *
-      **************************************************************************
-      *                        Basic function prototypes
-      **************************************************************************
-      *
-     D zlibVersion     PR              *   extproc('zlibVersion')               Version string
-      *
-     D deflateInit     PR            10I 0 extproc('deflateInit_')              Init. compression
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D deflate         PR            10I 0 extproc('deflate')                   Compress data
-     D  strm                               like(z_stream)                       Compression stream
-     D  flush                        10I 0 value                                Flush type required
-      *
-     D deflateEnd      PR            10I 0 extproc('deflateEnd')                Termin. compression
-     D  strm                               like(z_stream)                       Compression stream
-      *
-     D inflateInit     PR            10I 0 extproc('inflateInit_')              Init. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflate         PR            10I 0 extproc('inflate')                   Expand data
-     D  strm                               like(z_stream)                       Expansion stream
-     D  flush                        10I 0 value                                Flush type required
-      *
-     D inflateEnd      PR            10I 0 extproc('inflateEnd')                Termin. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-      **************************************************************************
-      *                        Advanced function prototypes
-      **************************************************************************
-      *
-     D deflateInit2    PR            10I 0 extproc('deflateInit2_')             Init. compression
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  method                       10I 0 value                                Compression method
-     D  windowBits                   10I 0 value                                log2(window size)
-     D  memLevel                     10I 0 value                                Mem/cmpress tradeoff
-     D  strategy                     10I 0 value                                Compression strategy
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D deflateSetDictionary...
-     D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary
-     D  strm                               like(z_stream)                       Compression stream
-     D  dictionary                65535    const options(*varsize)              Dictionary bytes
-     D  dictLength                   10U 0 value                                Dictionary length
-      *
-     D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm
-     D  dest                               like(z_stream)                       Destination stream
-     D  source                             like(z_stream)                       Source stream
-      *
-     D deflateReset    PR            10I 0 extproc('deflateReset')              End and init. stream
-     D  strm                               like(z_stream)                       Compression stream
-      *
-     D deflateParams   PR            10I 0 extproc('deflateParams')             Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  strategy                     10I 0 value                                Compression strategy
-      *
-     D deflateTune     PR            10I 0 extproc('deflateTune')
-     D  strm                               like(z_stream)                       Compression stream
-     D  good                         10I 0 value
-     D  lazy                         10I 0 value
-     D  nice                         10I 0 value
-     D  chain                        10I 0 value
-      *
-     D deflateBound    PR            10U 0 extproc('deflateBound')              Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  sourcelen                    10U 0 value                                Compression level
-      *
-     D deflatePending  PR            10I 0 extproc('deflatePending')            Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  pending                      10U 0                                      Pending bytes
-     D  bits                         10I 0                                      Pending bits
-      *
-     D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  bits                         10I 0 value                                # of bits to insert
-     D  value                        10I 0 value                                Bits to insert
-      *
-     D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                log2(window size)
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflateSetDictionary...
-     D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary
-     D  strm                               like(z_stream)                       Expansion stream
-     D  dictionary                65535    const options(*varsize)              Dictionary bytes
-     D  dictLength                   10U 0 value                                Dictionary length
-      *
-     D inflateGetDictionary...
-     D                 PR            10I 0 extproc('inflateGetDictionary')      Get dictionary
-     D  strm                               like(z_stream)                       Expansion stream
-     D  dictionary                65535    options(*varsize)                    Dictionary bytes
-     D  dictLength                   10U 0                                      Dictionary length
-      *
-     D deflateGetDictionary...
-     D                 PR            10I 0 extproc('deflateGetDictionary')      Get dictionary
-     D  strm                               like(z_stream)                       Expansion stream
-     D  dictionary                65535    options(*varsize)                    Dictionary bytes
-     D  dictLength                   10U 0                                      Dictionary length
-      *
-     D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateCopy     PR            10I 0 extproc('inflateCopy')
-     D  dest                               like(z_stream)                       Destination stream
-     D  source                             like(z_stream)                       Source stream
-      *
-     D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateReset2   PR            10I 0 extproc('inflateReset2')             End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                Log2(buffer size)
-      *
-     D inflatePrime    PR            10I 0 extproc('inflatePrime')              Insert bits
-     D  strm                               like(z_stream)                       Expansion stream
-     D  bits                         10I 0 value                                Bit count
-     D  value                        10I 0 value                                Bits to insert
-      *
-     D inflateMark     PR            10I 0 extproc('inflateMark')               Get inflate info
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateCodesUsed...
-                       PR            20U 0 extproc('inflateCodesUsed')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateValidate...
-                       PR            20U 0 extproc('inflateValidate')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  check                        10I 0 value
-      *
-     D inflateGetHeader...
-                       PR            10U 0 extproc('inflateGetHeader')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  head                               like(gz_headerp)
-      *
-     D deflateSetHeader...
-                       PR            10U 0 extproc('deflateSetHeader')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  head                               like(gz_headerp)
-      *
-     D inflateBackInit...
-     D                 PR            10I 0 extproc('inflateBackInit_')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                Log2(buffer size)
-     D  window                    65535    options(*varsize)                    Buffer
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflateBack     PR            10I 0 extproc('inflateBack')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  in                             *   value procptr                        Input function
-     D  in_desc                        *   value                                Input descriptor
-     D  out                            *   value procptr                        Output function
-     D  out_desc                       *   value                                Output descriptor
-      *
-     D inflateBackEnd  PR            10I 0 extproc('inflateBackEnd')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D zlibCompileFlags...
-     D                 PR            10U 0 extproc('zlibCompileFlags')
-      *
-      **************************************************************************
-      *                        Checksum function prototypes
-      **************************************************************************
-      *
-     D adler32         PR            10U 0 extproc('adler32')                   New checksum
-     D  adler                        10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          10U 0 value                                Buffer length
-      *
-     D adler32_combine...
-                       PR            10U 0 extproc('adler32_combine')           New checksum
-     D  adler1                       10U 0 value                                Old checksum
-     D  adler2                       10U 0 value                                Old checksum
-     D  len2                         20U 0 value                                Buffer length
-      *
-     D adler32_z       PR            10U 0 extproc('adler32_z')                 New checksum
-     D  adler                        10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          20U 0 value                                Buffer length
-      *
-     D crc32           PR            10U 0 extproc('crc32')                     New checksum
-     D  crc                          10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          10U 0 value                                Buffer length
-      *
-     D crc32_combine...
-                       PR            10U 0 extproc('crc32_combine')             New checksum
-     D  crc1                         10U 0 value                                Old checksum
-     D  crc2                         10U 0 value                                Old checksum
-     D  len2                         20U 0 value                                Buffer length
-      *
-     D crc32_z         PR            10U 0 extproc('crc32_z')                   New checksum
-     D  crc                          10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          20U 0 value                                Buffer length
-      *
-      **************************************************************************
-      *                     Miscellaneous function prototypes
-      **************************************************************************
-      *
-     D zError          PR              *   extproc('zError')                    Error string
-     D  err                          10I 0 value                                Error code
-      *
-     D inflateSyncPoint...
-     D                 PR            10I 0 extproc('inflateSyncPoint')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs
-      *
-     D inflateUndermine...
-     D                 PR            10I 0 extproc('inflateUndermine')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  arg                          10I 0 value                                Error code
-      *
-     D inflateResetKeep...
-     D                 PR            10I 0 extproc('inflateResetKeep')          End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D deflateResetKeep...
-     D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-      /endif
diff --git a/src/png/zlib/qnx/package.qpg b/src/png/zlib/qnx/package.qpg
deleted file mode 100644
index 31e8e90db..000000000
--- a/src/png/zlib/qnx/package.qpg
+++ /dev/null
@@ -1,141 +0,0 @@
-<QPG:Generation>
-   <QPG:Options>
-      <QPG:User unattended="no" verbosity="2" listfiles="yes"/>
-      <QPG:Defaults type="qnx_package"/>
-      <QPG:Source></QPG:Source>
-      <QPG:Release number="+"/>
-      <QPG:Build></QPG:Build>
-      <QPG:FileSorting strip="yes"/>
-      <QPG:Package targets="combine"/>
-      <QPG:Repository generate="yes"/>
-      <QPG:FinalDir></QPG:FinalDir>
-      <QPG:Cleanup></QPG:Cleanup>
-   </QPG:Options>
-
-   <QPG:Responsible>
-      <QPG:Company></QPG:Company>
-      <QPG:Department></QPG:Department>
-      <QPG:Group></QPG:Group>
-      <QPG:Team></QPG:Team>
-      <QPG:Employee></QPG:Employee>
-      <QPG:EmailAddress></QPG:EmailAddress>
-   </QPG:Responsible>
-
-   <QPG:Values>
-      <QPG:Files>
-         <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
-         <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" user="root:bin" permission="644"/>
-         <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.11"/>
-         <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.11"/>
-         <QPG:Add file="../libz.so.1.2.11" install="/opt/lib/" component="slib"/>
-      </QPG:Files>
-
-      <QPG:PackageFilter>
-         <QPM:PackageManifest>
-            <QPM:PackageDescription>
-               <QPM:PackageType>Library</QPM:PackageType>
-               <QPM:PackageReleaseNotes></QPM:PackageReleaseNotes>
-               <QPM:PackageReleaseUrgency>Medium</QPM:PackageReleaseUrgency>
-               <QPM:PackageRepository></QPM:PackageRepository>
-               <QPM:FileVersion>2.0</QPM:FileVersion>
-            </QPM:PackageDescription>
-
-            <QPM:ProductDescription>
-               <QPM:ProductName>zlib</QPM:ProductName>
-               <QPM:ProductIdentifier>zlib</QPM:ProductIdentifier>
-               <QPM:ProductEmail>alain.bonnefoy@icbt.com</QPM:ProductEmail>
-               <QPM:VendorName>Public</QPM:VendorName>
-               <QPM:VendorInstallName>public</QPM:VendorInstallName>
-               <QPM:VendorURL>www.gzip.org/zlib</QPM:VendorURL>
-               <QPM:VendorEmbedURL></QPM:VendorEmbedURL>
-               <QPM:VendorEmail></QPM:VendorEmail>
-               <QPM:AuthorName>Jean-Loup Gailly,Mark Adler</QPM:AuthorName>
-               <QPM:AuthorURL>www.gzip.org/zlib</QPM:AuthorURL>
-               <QPM:AuthorEmbedURL></QPM:AuthorEmbedURL>
-               <QPM:AuthorEmail>zlib@gzip.org</QPM:AuthorEmail>
-               <QPM:ProductIconSmall></QPM:ProductIconSmall>
-               <QPM:ProductIconLarge></QPM:ProductIconLarge>
-               <QPM:ProductDescriptionShort>A massively spiffy yet delicately unobtrusive compression library.</QPM:ProductDescriptionShort>
-               <QPM:ProductDescriptionLong>zlib is designed to be a free, general-purpose, legally unencumbered, lossless data compression library for use on virtually any computer hardware and operating system.</QPM:ProductDescriptionLong>
-               <QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
-               <QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
-            </QPM:ProductDescription>
-
-            <QPM:ReleaseDescription>
-               <QPM:ReleaseVersion>1.2.11</QPM:ReleaseVersion>
-               <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
-               <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
-               <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
-               <QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
-               <QPM:ExcludeCountries>
-                  <QPM:Country></QPM:Country>
-               </QPM:ExcludeCountries>
-
-               <QPM:ReleaseCopyright>No License</QPM:ReleaseCopyright>
-            </QPM:ReleaseDescription>
-
-            <QPM:ContentDescription>
-               <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
-               <QPM:ContentKeyword>zlib,compression</QPM:ContentKeyword>
-               <QPM:TargetOS>qnx6</QPM:TargetOS>
-               <QPM:HostOS>qnx6</QPM:HostOS>
-               <QPM:DisplayEnvironment xmlmultiple="true">None</QPM:DisplayEnvironment>
-               <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
-            </QPM:ContentDescription>
-         </QPM:PackageManifest>
-      </QPG:PackageFilter>
-
-      <QPG:PackageFilter proc="none" target="none">
-         <QPM:PackageManifest>
-            <QPM:ProductInstallationDependencies>
-               <QPM:ProductRequirements></QPM:ProductRequirements>
-            </QPM:ProductInstallationDependencies>
-
-            <QPM:ProductInstallationProcedure>
-               <QPM:Script xmlmultiple="true">
-                  <QPM:ScriptName></QPM:ScriptName>
-                  <QPM:ScriptType>Install</QPM:ScriptType>
-                  <QPM:ScriptTiming>Post</QPM:ScriptTiming>
-                  <QPM:ScriptBlocking>No</QPM:ScriptBlocking>
-                  <QPM:ScriptResult>Ignore</QPM:ScriptResult>
-                  <QPM:ShortDescription></QPM:ShortDescription>
-                  <QPM:UseBinaries>No</QPM:UseBinaries>
-                  <QPM:Priority>Optional</QPM:Priority>
-               </QPM:Script>
-            </QPM:ProductInstallationProcedure>
-         </QPM:PackageManifest>
-
-         <QPM:Launch>
-         </QPM:Launch>
-      </QPG:PackageFilter>
-
-      <QPG:PackageFilter type="core" component="none">
-         <QPM:PackageManifest>
-            <QPM:ProductInstallationProcedure>
-	       <QPM:OrderDependency xmlmultiple="true">
-	          <QPM:Order>InstallOver</QPM:Order>
-	          <QPM:Product>zlib</QPM:Product>
-	       </QPM:OrderDependency>
-            </QPM:ProductInstallationProcedure>
-         </QPM:PackageManifest>
-
-         <QPM:Launch>
-         </QPM:Launch>
-      </QPG:PackageFilter>
-
-      <QPG:PackageFilter type="core" component="dev">
-         <QPM:PackageManifest>
-            <QPM:ProductInstallationProcedure>
-	       <QPM:OrderDependency xmlmultiple="true">
-	          <QPM:Order>InstallOver</QPM:Order>
-	          <QPM:Product>zlib-dev</QPM:Product>
-	       </QPM:OrderDependency>
-            </QPM:ProductInstallationProcedure>
-         </QPM:PackageManifest>
-
-         <QPM:Launch>
-         </QPM:Launch>
-      </QPG:PackageFilter>
-   </QPG:Values>
-</QPG:Generation>
diff --git a/src/png/zlib/treebuild.xml b/src/png/zlib/treebuild.xml
deleted file mode 100644
index fd75525f9..000000000
--- a/src/png/zlib/treebuild.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" ?>
-<package name="zlib" version="1.2.11">
-    <library name="zlib" dlversion="1.2.11" dlname="z">
-	<property name="description"> zip compression library </property>
-	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
-
-	<!-- fixme: not implemented yet -->
-	<property name="compiler/c/inline" value="yes" />
-
-	<include-file name="zlib.h" scope="public" mode="644" />
-	<include-file name="zconf.h" scope="public" mode="644" />
-
-	<source name="adler32.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	</source>
-	<source name="compress.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	</source>
-	<source name="crc32.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="crc32.h" />
-	</source>
-	<source name="gzclose.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="gzlib.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="gzread.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="gzwrite.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="gzguts.h" />
-	</source>
-	<source name="uncompr.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	</source>
-	<source name="deflate.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="deflate.h" />
-	</source>
-	<source name="trees.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="deflate.h" />
-	    <depend name="trees.h" />
-	</source>
-	<source name="zutil.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	</source>
-	<source name="inflate.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	    <depend name="inflate.h" />
-	    <depend name="inffast.h" />
-	</source>
-	<source name="infback.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	    <depend name="inflate.h" />
-	    <depend name="inffast.h" />
-	</source>
-	<source name="inftrees.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	</source>
-	<source name="inffast.c">
-	    <depend name="zlib.h" />
-	    <depend name="zconf.h" />
-	    <depend name="zutil.h" />
-	    <depend name="inftrees.h" />
-	    <depend name="inflate.h" />
-	    <depend name="inffast.h" />
-	</source>
-    </library>
-</package>
-
-<!--
-CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DZLIB_DEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
-# OBJA =
-# to use the asm code: make OBJA=match.o
-#
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
--->
diff --git a/src/png/zlib/trees.c b/src/png/zlib/trees.c
deleted file mode 100644
index 50cf4b457..000000000
--- a/src/png/zlib/trees.c
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * detect_data_type() function provided freely by Cosmin Truta, 2006
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef ZLIB_DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local const static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local const static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local const static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, const ct_data *ltree,
-                              const ct_data *dtree));
-local int  detect_data_type OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef ZLIB_DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* !ZLIB_DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef ZLIB_DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= (ush)value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !ZLIB_DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = (int)value;\
-    s->bi_buf |= (ush)val << s->bi_valid;\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (ush)(value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* ZLIB_DEBUG */
-
-
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-#ifdef NO_INIT_GLOBAL_POINTERS
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-#endif
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef ZLIB_DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-            "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-        fprintf(header, "%2u%s", _dist_code[i],
-                SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header,
-        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-        fprintf(header, "%2u%s", _length_code[i],
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-        fprintf(header, "%1u%s", base_length[i],
-                SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "%5u%s", base_dist[i],
-                SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void ZLIB_INTERNAL _tr_init(s)
-    deflate_state *s;
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
-        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Tracev((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    unsigned code = 0;         /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        code = (code + bl_count[bits-1]) << 1;
-        next_code[bits] = (ush)code;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-                                s->depth[n] : s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
-    bi_windup(s);        /* align on byte boundary */
-    put_short(s, (ush)stored_len);
-    put_short(s, (ush)~stored_len);
-    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
-    s->pending += stored_len;
-#ifdef ZLIB_DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-    s->bits_sent += 2*16;
-    s->bits_sent += stored_len<<3;
-#endif
-}
-
-/* ===========================================================================
- * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
- */
-void ZLIB_INTERNAL _tr_flush_bits(s)
-    deflate_state *s;
-{
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- */
-void ZLIB_INTERNAL _tr_align(s)
-    deflate_state *s;
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef ZLIB_DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and write out the encoded block.
- */
-void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int last;         /* one if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-        /* Check if the file is binary or text */
-        if (s->strm->data_type == Z_UNKNOWN)
-            s->strm->data_type = detect_data_type(s);
-
-        /* Construct the literal and distance trees */
-        build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-
-        build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = build_bl_tree(s);
-
-        /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
-
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
-
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, last);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+last, 3);
-        compress_block(s, (const ct_data *)static_ltree,
-                       (const ct_data *)static_dtree);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+last, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (const ct_data *)s->dyn_ltree,
-                       (const ct_data *)s->dyn_dtree);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (last) {
-        bi_windup(s);
-#ifdef ZLIB_DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*last));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    const ct_data *ltree; /* literal tree */
-    const ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= (unsigned)base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-}
-
-/* ===========================================================================
- * Check if the data type is TEXT or BINARY, using the following algorithm:
- * - TEXT if the two conditions below are satisfied:
- *    a) There are no non-portable control characters belonging to the
- *       "black list" (0..6, 14..25, 28..31).
- *    b) There is at least one printable character belonging to the
- *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
- * - BINARY otherwise.
- * - The following partially-portable control characters form a
- *   "gray list" that is ignored in this detection algorithm:
- *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local int detect_data_type(s)
-    deflate_state *s;
-{
-    /* black_mask is the bit mask of black-listed bytes
-     * set bits 0..6, 14..25, and 28..31
-     * 0xf3ffc07f = binary 11110011111111111100000001111111
-     */
-    unsigned long black_mask = 0xf3ffc07fUL;
-    int n;
-
-    /* Check for non-textual ("black-listed") bytes. */
-    for (n = 0; n <= 31; n++, black_mask >>= 1)
-        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
-            return Z_BINARY;
-
-    /* Check for textual ("white-listed") bytes. */
-    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
-            || s->dyn_ltree[13].Freq != 0)
-        return Z_TEXT;
-    for (n = 32; n < LITERALS; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            return Z_TEXT;
-
-    /* There are no "black-listed" or "white-listed" bytes:
-     * this stream either is empty or has tolerated ("gray-listed") bytes only.
-     */
-    return Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef ZLIB_DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
diff --git a/src/png/zlib/trees.h b/src/png/zlib/trees.h
deleted file mode 100644
index d35639d82..000000000
--- a/src/png/zlib/trees.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
-};
-
-local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-};
-
-const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-local const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-
diff --git a/src/png/zlib/uncompr.c b/src/png/zlib/uncompr.c
deleted file mode 100644
index f03a1a865..000000000
--- a/src/png/zlib/uncompr.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  *sourceLen is
-   the byte length of the source buffer. Upon entry, *destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data. (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit,
-   *destLen is the size of the decompressed data and *sourceLen is the number
-   of source bytes consumed. Upon return, source + *sourceLen points to the
-   first unused input byte.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
-   Z_DATA_ERROR if the input data was corrupted, including if the input data is
-   an incomplete zlib stream.
-*/
-int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong *sourceLen;
-{
-    z_stream stream;
-    int err;
-    const uInt max = (uInt)-1;
-    uLong len, left;
-    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
-
-    len = *sourceLen;
-    if (*destLen) {
-        left = *destLen;
-        *destLen = 0;
-    }
-    else {
-        left = 1;
-        dest = buf;
-    }
-
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = 0;
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    stream.next_out = dest;
-    stream.avail_out = 0;
-
-    do {
-        if (stream.avail_out == 0) {
-            stream.avail_out = left > (uLong)max ? max : (uInt)left;
-            left -= stream.avail_out;
-        }
-        if (stream.avail_in == 0) {
-            stream.avail_in = len > (uLong)max ? max : (uInt)len;
-            len -= stream.avail_in;
-        }
-        err = inflate(&stream, Z_NO_FLUSH);
-    } while (err == Z_OK);
-
-    *sourceLen -= len + stream.avail_in;
-    if (dest != buf)
-        *destLen = stream.total_out;
-    else if (stream.total_out && err == Z_BUF_ERROR)
-        left = 1;
-
-    inflateEnd(&stream);
-    return err == Z_STREAM_END ? Z_OK :
-           err == Z_NEED_DICT ? Z_DATA_ERROR  :
-           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
-           err;
-}
-
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return uncompress2(dest, destLen, source, &sourceLen);
-}
diff --git a/src/png/zlib/watcom/watcom_f.mak b/src/png/zlib/watcom/watcom_f.mak
deleted file mode 100644
index 37f4d74c1..000000000
--- a/src/png/zlib/watcom/watcom_f.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for zlib
-# OpenWatcom flat model
-# Last updated: 28-Dec-2005
-
-# To use, do "wmake -f watcom_f.mak"
-
-C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
-	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
-            infback.c  inffast.c  inflate.c inftrees.c   &
-            trees.c    uncompr.c  zutil.c
-
-OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
-	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
-            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
-            trees.obj    uncompr.obj  zutil.obj
-
-CC       = wcc386
-LINKER   = wcl386
-CFLAGS   = -zq -mf -3r -fp3 -s -bt=dos -oilrtfm -fr=nul -wx
-ZLIB_LIB = zlib_f.lib
-
-.C.OBJ:
-        $(CC) $(CFLAGS) $[@
-
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-$(ZLIB_LIB): $(OBJS)
-	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
-	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
-        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
-        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
-        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
-
-example.exe: $(ZLIB_LIB) example.obj
-	$(LINKER) -ldos32a -fe=example.exe example.obj $(ZLIB_LIB)
-
-minigzip.exe: $(ZLIB_LIB) minigzip.obj
-	$(LINKER) -ldos32a -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
-
-clean: .SYMBOLIC
-          del *.obj
-          del $(ZLIB_LIB)
-          @echo Cleaning done
diff --git a/src/png/zlib/watcom/watcom_l.mak b/src/png/zlib/watcom/watcom_l.mak
deleted file mode 100644
index 193eed7b3..000000000
--- a/src/png/zlib/watcom/watcom_l.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for zlib
-# OpenWatcom large model
-# Last updated: 28-Dec-2005
-
-# To use, do "wmake -f watcom_l.mak"
-
-C_SOURCE =  adler32.c  compress.c crc32.c   deflate.c    &
-	    gzclose.c  gzlib.c    gzread.c  gzwrite.c    &
-            infback.c  inffast.c  inflate.c inftrees.c   &
-            trees.c    uncompr.c  zutil.c
-
-OBJS =      adler32.obj  compress.obj crc32.obj   deflate.obj    &
-	    gzclose.obj  gzlib.obj    gzread.obj  gzwrite.obj    &
-            infback.obj  inffast.obj  inflate.obj inftrees.obj   &
-            trees.obj    uncompr.obj  zutil.obj
-
-CC       = wcc
-LINKER   = wcl
-CFLAGS   = -zq -ml -s -bt=dos -oilrtfm -fr=nul -wx
-ZLIB_LIB = zlib_l.lib
-
-.C.OBJ:
-        $(CC) $(CFLAGS) $[@
-
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-$(ZLIB_LIB): $(OBJS)
-	wlib -b -c $(ZLIB_LIB) -+adler32.obj  -+compress.obj -+crc32.obj
-	wlib -b -c $(ZLIB_LIB) -+gzclose.obj  -+gzlib.obj    -+gzread.obj   -+gzwrite.obj
-        wlib -b -c $(ZLIB_LIB) -+deflate.obj  -+infback.obj
-        wlib -b -c $(ZLIB_LIB) -+inffast.obj  -+inflate.obj  -+inftrees.obj
-        wlib -b -c $(ZLIB_LIB) -+trees.obj    -+uncompr.obj  -+zutil.obj
-
-example.exe: $(ZLIB_LIB) example.obj
-	$(LINKER) -fe=example.exe example.obj $(ZLIB_LIB)
-
-minigzip.exe: $(ZLIB_LIB) minigzip.obj
-	$(LINKER) -fe=minigzip.exe minigzip.obj $(ZLIB_LIB)
-
-clean: .SYMBOLIC
-          del *.obj
-          del $(ZLIB_LIB)
-          @echo Cleaning done
diff --git a/src/png/zlib/win32/DLL_FAQ.txt b/src/png/zlib/win32/DLL_FAQ.txt
deleted file mode 100644
index 12c009018..000000000
--- a/src/png/zlib/win32/DLL_FAQ.txt
+++ /dev/null
@@ -1,397 +0,0 @@
-
-            Frequently Asked Questions about ZLIB1.DLL
-
-
-This document describes the design, the rationale, and the usage
-of the official DLL build of zlib, named ZLIB1.DLL.  If you have
-general questions about zlib, you should see the file "FAQ" found
-in the zlib distribution, or at the following location:
-  http://www.gzip.org/zlib/zlib_faq.html
-
-
- 1. What is ZLIB1.DLL, and how can I get it?
-
-  - ZLIB1.DLL is the official build of zlib as a DLL.
-    (Please remark the character '1' in the name.)
-
-    Pointers to a precompiled ZLIB1.DLL can be found in the zlib
-    web site at:
-      http://www.zlib.net/
-
-    Applications that link to ZLIB1.DLL can rely on the following
-    specification:
-
-    * The exported symbols are exclusively defined in the source
-      files "zlib.h" and "zlib.def", found in an official zlib
-      source distribution.
-    * The symbols are exported by name, not by ordinal.
-    * The exported names are undecorated.
-    * The calling convention of functions is "C" (CDECL).
-    * The ZLIB1.DLL binary is linked to MSVCRT.DLL.
-
-    The archive in which ZLIB1.DLL is bundled contains compiled
-    test programs that must run with a valid build of ZLIB1.DLL.
-    It is recommended to download the prebuilt DLL from the zlib
-    web site, instead of building it yourself, to avoid potential
-    incompatibilities that could be introduced by your compiler
-    and build settings.  If you do build the DLL yourself, please
-    make sure that it complies with all the above requirements,
-    and it runs with the precompiled test programs, bundled with
-    the original ZLIB1.DLL distribution.
-
-    If, for any reason, you need to build an incompatible DLL,
-    please use a different file name.
-
-
- 2. Why did you change the name of the DLL to ZLIB1.DLL?
-    What happened to the old ZLIB.DLL?
-
-  - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required
-    compilation settings that were incompatible to those used by
-    a static build.  The DLL settings were supposed to be enabled
-    by defining the macro ZLIB_DLL, before including "zlib.h".
-    Incorrect handling of this macro was silently accepted at
-    build time, resulting in two major problems:
-
-    * ZLIB_DLL was missing from the old makefile.  When building
-      the DLL, not all people added it to the build options.  In
-      consequence, incompatible incarnations of ZLIB.DLL started
-      to circulate around the net.
-
-    * When switching from using the static library to using the
-      DLL, applications had to define the ZLIB_DLL macro and
-      to recompile all the sources that contained calls to zlib
-      functions.  Failure to do so resulted in creating binaries
-      that were unable to run with the official ZLIB.DLL build.
-
-    The only possible solution that we could foresee was to make
-    a binary-incompatible change in the DLL interface, in order to
-    remove the dependency on the ZLIB_DLL macro, and to release
-    the new DLL under a different name.
-
-    We chose the name ZLIB1.DLL, where '1' indicates the major
-    zlib version number.  We hope that we will not have to break
-    the binary compatibility again, at least not as long as the
-    zlib-1.x series will last.
-
-    There is still a ZLIB_DLL macro, that can trigger a more
-    efficient build and use of the DLL, but compatibility no
-    longer dependents on it.
-
-
- 3. Can I build ZLIB.DLL from the new zlib sources, and replace
-    an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier?
-
-  - In principle, you can do it by assigning calling convention
-    keywords to the macros ZEXPORT and ZEXPORTVA.  In practice,
-    it depends on what you mean by "an old ZLIB.DLL", because the
-    old DLL exists in several mutually-incompatible versions.
-    You have to find out first what kind of calling convention is
-    being used in your particular ZLIB.DLL build, and to use the
-    same one in the new build.  If you don't know what this is all
-    about, you might be better off if you would just leave the old
-    DLL intact.
-
-
- 4. Can I compile my application using the new zlib interface, and
-    link it to an old ZLIB.DLL, that was built from zlib-1.1.4 or
-    earlier?
-
-  - The official answer is "no"; the real answer depends again on
-    what kind of ZLIB.DLL you have.  Even if you are lucky, this
-    course of action is unreliable.
-
-    If you rebuild your application and you intend to use a newer
-    version of zlib (post- 1.1.4), it is strongly recommended to
-    link it to the new ZLIB1.DLL.
-
-
- 5. Why are the zlib symbols exported by name, and not by ordinal?
-
-  - Although exporting symbols by ordinal is a little faster, it
-    is risky.  Any single glitch in the maintenance or use of the
-    DEF file that contains the ordinals can result in incompatible
-    builds and frustrating crashes.  Simply put, the benefits of
-    exporting symbols by ordinal do not justify the risks.
-
-    Technically, it should be possible to maintain ordinals in
-    the DEF file, and still export the symbols by name.  Ordinals
-    exist in every DLL, and even if the dynamic linking performed
-    at the DLL startup is searching for names, ordinals serve as
-    hints, for a faster name lookup.  However, if the DEF file
-    contains ordinals, the Microsoft linker automatically builds
-    an implib that will cause the executables linked to it to use
-    those ordinals, and not the names.  It is interesting to
-    notice that the GNU linker for Win32 does not suffer from this
-    problem.
-
-    It is possible to avoid the DEF file if the exported symbols
-    are accompanied by a "__declspec(dllexport)" attribute in the
-    source files.  You can do this in zlib by predefining the
-    ZLIB_DLL macro.
-
-
- 6. I see that the ZLIB1.DLL functions use the "C" (CDECL) calling
-    convention.  Why not use the STDCALL convention?
-    STDCALL is the standard convention in Win32, and I need it in
-    my Visual Basic project!
-
-    (For readability, we use CDECL to refer to the convention
-     triggered by the "__cdecl" keyword, STDCALL to refer to
-     the convention triggered by "__stdcall", and FASTCALL to
-     refer to the convention triggered by "__fastcall".)
-
-  - Most of the native Windows API functions (without varargs) use
-    indeed the WINAPI convention (which translates to STDCALL in
-    Win32), but the standard C functions use CDECL.  If a user
-    application is intrinsically tied to the Windows API (e.g.
-    it calls native Windows API functions such as CreateFile()),
-    sometimes it makes sense to decorate its own functions with
-    WINAPI.  But if ANSI C or POSIX portability is a goal (e.g.
-    it calls standard C functions such as fopen()), it is not a
-    sound decision to request the inclusion of <windows.h>, or to
-    use non-ANSI constructs, for the sole purpose to make the user
-    functions STDCALL-able.
-
-    The functionality offered by zlib is not in the category of
-    "Windows functionality", but is more like "C functionality".
-
-    Technically, STDCALL is not bad; in fact, it is slightly
-    faster than CDECL, and it works with variable-argument
-    functions, just like CDECL.  It is unfortunate that, in spite
-    of using STDCALL in the Windows API, it is not the default
-    convention used by the C compilers that run under Windows.
-    The roots of the problem reside deep inside the unsafety of
-    the K&R-style function prototypes, where the argument types
-    are not specified; but that is another story for another day.
-
-    The remaining fact is that CDECL is the default convention.
-    Even if an explicit convention is hard-coded into the function
-    prototypes inside C headers, problems may appear.  The
-    necessity to expose the convention in users' callbacks is one
-    of these problems.
-
-    The calling convention issues are also important when using
-    zlib in other programming languages.  Some of them, like Ada
-    (GNAT) and Fortran (GNU G77), have C bindings implemented
-    initially on Unix, and relying on the C calling convention.
-    On the other hand, the pre- .NET versions of Microsoft Visual
-    Basic require STDCALL, while Borland Delphi prefers, although
-    it does not require, FASTCALL.
-
-    In fairness to all possible uses of zlib outside the C
-    programming language, we choose the default "C" convention.
-    Anyone interested in different bindings or conventions is
-    encouraged to maintain specialized projects.  The "contrib/"
-    directory from the zlib distribution already holds a couple
-    of foreign bindings, such as Ada, C++, and Delphi.
-
-
- 7. I need a DLL for my Visual Basic project.  What can I do?
-
-  - Define the ZLIB_WINAPI macro before including "zlib.h", when
-    building both the DLL and the user application (except that
-    you don't need to define anything when using the DLL in Visual
-    Basic).  The ZLIB_WINAPI macro will switch on the WINAPI
-    (STDCALL) convention.  The name of this DLL must be different
-    than the official ZLIB1.DLL.
-
-    Gilles Vollant has contributed a build named ZLIBWAPI.DLL,
-    with the ZLIB_WINAPI macro turned on, and with the minizip
-    functionality built in.  For more information, please read
-    the notes inside "contrib/vstudio/readme.txt", found in the
-    zlib distribution.
-
-
- 8. I need to use zlib in my Microsoft .NET project.  What can I
-    do?
-
-  - Henrik Ravn has contributed a .NET wrapper around zlib.  Look
-    into contrib/dotzlib/, inside the zlib distribution.
-
-
- 9. If my application uses ZLIB1.DLL, should I link it to
-    MSVCRT.DLL?  Why?
-
-  - It is not required, but it is recommended to link your
-    application to MSVCRT.DLL, if it uses ZLIB1.DLL.
-
-    The executables (.EXE, .DLL, etc.) that are involved in the
-    same process and are using the C run-time library (i.e. they
-    are calling standard C functions), must link to the same
-    library.  There are several libraries in the Win32 system:
-    CRTDLL.DLL, MSVCRT.DLL, the static C libraries, etc.
-    Since ZLIB1.DLL is linked to MSVCRT.DLL, the executables that
-    depend on it should also be linked to MSVCRT.DLL.
-
-
-10. Why are you saying that ZLIB1.DLL and my application should
-    be linked to the same C run-time (CRT) library?  I linked my
-    application and my DLLs to different C libraries (e.g. my
-    application to a static library, and my DLLs to MSVCRT.DLL),
-    and everything works fine.
-
-  - If a user library invokes only pure Win32 API (accessible via
-    <windows.h> and the related headers), its DLL build will work
-    in any context.  But if this library invokes standard C API,
-    things get more complicated.
-
-    There is a single Win32 library in a Win32 system.  Every
-    function in this library resides in a single DLL module, that
-    is safe to call from anywhere.  On the other hand, there are
-    multiple versions of the C library, and each of them has its
-    own separate internal state.  Standalone executables and user
-    DLLs that call standard C functions must link to a C run-time
-    (CRT) library, be it static or shared (DLL).  Intermixing
-    occurs when an executable (not necessarily standalone) and a
-    DLL are linked to different CRTs, and both are running in the
-    same process.
-
-    Intermixing multiple CRTs is possible, as long as their
-    internal states are kept intact.  The Microsoft Knowledge Base
-    articles KB94248 "HOWTO: Use the C Run-Time" and KB140584
-    "HOWTO: Link with the Correct C Run-Time (CRT) Library"
-    mention the potential problems raised by intermixing.
-
-    If intermixing works for you, it's because your application
-    and DLLs are avoiding the corruption of each of the CRTs'
-    internal states, maybe by careful design, or maybe by fortune.
-
-    Also note that linking ZLIB1.DLL to non-Microsoft CRTs, such
-    as those provided by Borland, raises similar problems.
-
-
-11. Why are you linking ZLIB1.DLL to MSVCRT.DLL?
-
-  - MSVCRT.DLL exists on every Windows 95 with a new service pack
-    installed, or with Microsoft Internet Explorer 4 or later, and
-    on all other Windows 4.x or later (Windows 98, Windows NT 4,
-    or later).  It is freely distributable; if not present in the
-    system, it can be downloaded from Microsoft or from other
-    software provider for free.
-
-    The fact that MSVCRT.DLL does not exist on a virgin Windows 95
-    is not so problematic.  Windows 95 is scarcely found nowadays,
-    Microsoft ended its support a long time ago, and many recent
-    applications from various vendors, including Microsoft, do not
-    even run on it.  Furthermore, no serious user should run
-    Windows 95 without a proper update installed.
-
-
-12. Why are you not linking ZLIB1.DLL to
-    <<my favorite C run-time library>> ?
-
-  - We considered and abandoned the following alternatives:
-
-    * Linking ZLIB1.DLL to a static C library (LIBC.LIB, or
-      LIBCMT.LIB) is not a good option.  People are using the DLL
-      mainly to save disk space.  If you are linking your program
-      to a static C library, you may as well consider linking zlib
-      in statically, too.
-
-    * Linking ZLIB1.DLL to CRTDLL.DLL looks appealing, because
-      CRTDLL.DLL is present on every Win32 installation.
-      Unfortunately, it has a series of problems: it does not
-      work properly with Microsoft's C++ libraries, it does not
-      provide support for 64-bit file offsets, (and so on...),
-      and Microsoft discontinued its support a long time ago.
-
-    * Linking ZLIB1.DLL to MSVCR70.DLL or MSVCR71.DLL, supplied
-      with the Microsoft .NET platform, and Visual C++ 7.0/7.1,
-      raises problems related to the status of ZLIB1.DLL as a
-      system component.  According to the Microsoft Knowledge Base
-      article KB326922 "INFO: Redistribution of the Shared C
-      Runtime Component in Visual C++ .NET", MSVCR70.DLL and
-      MSVCR71.DLL are not supposed to function as system DLLs,
-      because they may clash with MSVCRT.DLL.  Instead, the
-      application's installer is supposed to put these DLLs
-      (if needed) in the application's private directory.
-      If ZLIB1.DLL depends on a non-system runtime, it cannot
-      function as a redistributable system component.
-
-    * Linking ZLIB1.DLL to non-Microsoft runtimes, such as
-      Borland's, or Cygwin's, raises problems related to the
-      reliable presence of these runtimes on Win32 systems.
-      It's easier to let the DLL build of zlib up to the people
-      who distribute these runtimes, and who may proceed as
-      explained in the answer to Question 14.
-
-
-13. If ZLIB1.DLL cannot be linked to MSVCR70.DLL or MSVCR71.DLL,
-    how can I build/use ZLIB1.DLL in Microsoft Visual C++ 7.0
-    (Visual Studio .NET) or newer?
-
-  - Due to the problems explained in the Microsoft Knowledge Base
-    article KB326922 (see the previous answer), the C runtime that
-    comes with the VC7 environment is no longer considered a
-    system component.  That is, it should not be assumed that this
-    runtime exists, or may be installed in a system directory.
-    Since ZLIB1.DLL is supposed to be a system component, it may
-    not depend on a non-system component.
-
-    In order to link ZLIB1.DLL and your application to MSVCRT.DLL
-    in VC7, you need the library of Visual C++ 6.0 or older.  If
-    you don't have this library at hand, it's probably best not to
-    use ZLIB1.DLL.
-
-    We are hoping that, in the future, Microsoft will provide a
-    way to build applications linked to a proper system runtime,
-    from the Visual C++ environment.  Until then, you have a
-    couple of alternatives, such as linking zlib in statically.
-    If your application requires dynamic linking, you may proceed
-    as explained in the answer to Question 14.
-
-
-14. I need to link my own DLL build to a CRT different than
-    MSVCRT.DLL.  What can I do?
-
-  - Feel free to rebuild the DLL from the zlib sources, and link
-    it the way you want.  You should, however, clearly state that
-    your build is unofficial.  You should give it a different file
-    name, and/or install it in a private directory that can be
-    accessed by your application only, and is not visible to the
-    others (i.e. it's neither in the PATH, nor in the SYSTEM or
-    SYSTEM32 directories).  Otherwise, your build may clash with
-    applications that link to the official build.
-
-    For example, in Cygwin, zlib is linked to the Cygwin runtime
-    CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL.
-
-
-15. May I include additional pieces of code that I find useful,
-    link them in ZLIB1.DLL, and export them?
-
-  - No.  A legitimate build of ZLIB1.DLL must not include code
-    that does not originate from the official zlib source code.
-    But you can make your own private DLL build, under a different
-    file name, as suggested in the previous answer.
-
-    For example, zlib is a part of the VCL library, distributed
-    with Borland Delphi and C++ Builder.  The DLL build of VCL
-    is a redistributable file, named VCLxx.DLL.
-
-
-16. May I remove some functionality out of ZLIB1.DLL, by enabling
-    macros like NO_GZCOMPRESS or NO_GZIP at compile time?
-
-  - No.  A legitimate build of ZLIB1.DLL must provide the complete
-    zlib functionality, as implemented in the official zlib source
-    code.  But you can make your own private DLL build, under a
-    different file name, as suggested in the previous answer.
-
-
-17. I made my own ZLIB1.DLL build.  Can I test it for compliance?
-
-  - We prefer that you download the official DLL from the zlib
-    web site.  If you need something peculiar from this DLL, you
-    can send your suggestion to the zlib mailing list.
-
-    However, in case you do rebuild the DLL yourself, you can run
-    it with the test programs found in the DLL distribution.
-    Running these test programs is not a guarantee of compliance,
-    but a failure can imply a detected problem.
-
-**
-
-This document is written and maintained by
-Cosmin Truta <cosmint@cs.ubbcluj.ro>
diff --git a/src/png/zlib/win32/Makefile.bor b/src/png/zlib/win32/Makefile.bor
deleted file mode 100644
index d152bbb7f..000000000
--- a/src/png/zlib/win32/Makefile.bor
+++ /dev/null
@@ -1,110 +0,0 @@
-# Makefile for zlib
-# Borland C++ for Win32
-#
-# Usage:
-#  make -f win32/Makefile.bor
-#  make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj
-
-# ------------ Borland C++ ------------
-
-# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)
-# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or
-# added to the declaration of LOC here:
-LOC = $(LOCAL_ZLIB)
-
-CC = bcc32
-AS = bcc32
-LD = bcc32
-AR = tlib
-CFLAGS  = -a -d -k- -O2 $(LOC)
-ASFLAGS = $(LOC)
-LDFLAGS = $(LOC)
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-#OBJA =
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-#OBJPA=
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $<
-
-.asm.obj:
-	$(AS) -c $(ASFLAGS) $<
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-	$(AR) $(ZLIB_LIB) $(OBJPA)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del $(ZLIB_LIB)
-	-del *.obj
-	-del *.exe
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz
diff --git a/src/png/zlib/win32/Makefile.gcc b/src/png/zlib/win32/Makefile.gcc
deleted file mode 100644
index 305be50af..000000000
--- a/src/png/zlib/win32/Makefile.gcc
+++ /dev/null
@@ -1,182 +0,0 @@
-# Makefile for zlib, derived from Makefile.dj2.
-# Modified for mingw32 by C. Spieler, 6/16/98.
-# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
-# Last updated: Mar 2012.
-# Tested under Cygwin and MinGW.
-
-# Copyright (C) 1995-2003 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type from the top level zlib directory:
-#
-#   make -fwin32/Makefile.gcc;  make test testdll -fwin32/Makefile.gcc
-#
-# To use the asm code, type:
-#   cp contrib/asm?86/match.S ./match.S
-#   make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc
-#
-# To install libz.a, zconf.h and zlib.h in the system directories, type:
-#
-#   make install -fwin32/Makefile.gcc
-#
-# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
-#
-# To install the shared lib, append SHARED_MODE=1 to the make command :
-#
-#   make install -fwin32/Makefile.gcc SHARED_MODE=1
-
-# Note:
-# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
-# the DLL name should be changed from "zlib1.dll".
-
-STATICLIB = libz.a
-SHAREDLIB = zlib1.dll
-IMPLIB    = libz.dll.a
-
-#
-# Set to 1 if shared object needs to be installed
-#
-SHARED_MODE=0
-
-#LOC = -DASMV
-#LOC = -DZLIB_DEBUG -g
-
-PREFIX =
-CC = $(PREFIX)gcc
-CFLAGS = $(LOC) -O3 -Wall
-
-AS = $(CC)
-ASFLAGS = $(LOC) -Wall
-
-LD = $(CC)
-LDFLAGS = $(LOC)
-
-AR = $(PREFIX)ar
-ARFLAGS = rcs
-
-RC = $(PREFIX)windres
-RCFLAGS = --define GCC_WINDRES
-
-STRIP = $(PREFIX)strip
-
-CP = cp -fp
-# If GNU install is available, replace $(CP) with install.
-INSTALL = $(CP)
-RM = rm -f
-
-prefix ?= /usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
-       gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-OBJA =
-
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-test: example.exe minigzip.exe
-	./example
-	echo hello world | ./minigzip | ./minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	./example_d
-	echo hello world | ./minigzip_d | ./minigzip_d -d
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-.S.o:
-	$(AS) $(ASFLAGS) -c -o $@ $<
-
-$(STATICLIB): $(OBJS) $(OBJA)
-	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
-	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-	$(STRIP) $@
-
-example.exe: example.o $(STATICLIB)
-	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
-	$(STRIP) $@
-
-minigzip.exe: minigzip.o $(STATICLIB)
-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
-	$(STRIP) $@
-
-example_d.exe: example.o $(IMPLIB)
-	$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
-	$(STRIP) $@
-
-minigzip_d.exe: minigzip.o $(IMPLIB)
-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
-	$(STRIP) $@
-
-example.o: test/example.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c
-
-minigzip.o: test/minigzip.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
-
-zlibrc.o: win32/zlib1.rc
-	$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
-
-.PHONY: install uninstall clean
-
-install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
-	@if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
-		echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
-		exit 1; \
-	fi
-	-@mkdir -p '$(DESTDIR)$(INCLUDE_PATH)'
-	-@mkdir -p '$(DESTDIR)$(LIBRARY_PATH)' '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig
-	-if [ "$(SHARED_MODE)" = "1" ]; then \
-		mkdir -p '$(DESTDIR)$(BINARY_PATH)'; \
-		$(INSTALL) $(SHAREDLIB) '$(DESTDIR)$(BINARY_PATH)'; \
-		$(INSTALL) $(IMPLIB) '$(DESTDIR)$(LIBRARY_PATH)'; \
-	fi
-	-$(INSTALL) zlib.h '$(DESTDIR)$(INCLUDE_PATH)'
-	-$(INSTALL) zconf.h '$(DESTDIR)$(INCLUDE_PATH)'
-	-$(INSTALL) $(STATICLIB) '$(DESTDIR)$(LIBRARY_PATH)'
-	sed \
-		-e 's|@prefix@|${prefix}|g' \
-		-e 's|@exec_prefix@|${exec_prefix}|g' \
-		-e 's|@libdir@|$(LIBRARY_PATH)|g' \
-		-e 's|@sharedlibdir@|$(LIBRARY_PATH)|g' \
-		-e 's|@includedir@|$(INCLUDE_PATH)|g' \
-		-e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' zlib.h`'|g' \
-		zlib.pc.in > '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig/zlib.pc
-
-uninstall:
-	-if [ "$(SHARED_MODE)" = "1" ]; then \
-		$(RM) '$(DESTDIR)$(BINARY_PATH)'/$(SHAREDLIB); \
-		$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(IMPLIB); \
-	fi
-	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zlib.h
-	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zconf.h
-	-$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(STATICLIB)
-
-clean:
-	-$(RM) $(STATICLIB)
-	-$(RM) $(SHAREDLIB)
-	-$(RM) $(IMPLIB)
-	-$(RM) *.o
-	-$(RM) *.exe
-	-$(RM) foo.gz
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-gzclose.o: zlib.h zconf.h gzguts.h
-gzlib.o: zlib.h zconf.h gzguts.h
-gzread.o: zlib.h zconf.h gzguts.h
-gzwrite.o: zlib.h zconf.h gzguts.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h
diff --git a/src/png/zlib/win32/Makefile.msc b/src/png/zlib/win32/Makefile.msc
deleted file mode 100644
index 6831882de..000000000
--- a/src/png/zlib/win32/Makefile.msc
+++ /dev/null
@@ -1,163 +0,0 @@
-# Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-#
-# Usage:
-#   nmake -f win32/Makefile.msc                          (standard build)
-#   nmake -f win32/Makefile.msc LOC=-DFOO                (nonstandard build)
-#   nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
-#         OBJA="inffas32.obj match686.obj"               (use ASM code, x86)
-#   nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." \
-#         OBJA="inffasx64.obj gvmat64.obj inffas8664.obj"  (use ASM code, x64)
-
-# The toplevel directory of the source tree.
-#
-TOP = .
-
-# optional build flags
-LOC =
-
-# variables
-STATICLIB = zlib.lib
-SHAREDLIB = zlib1.dll
-IMPLIB    = zdll.lib
-
-CC = cl
-AS = ml
-LD = link
-AR = lib
-RC = rc
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
-WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-ASFLAGS = -coff -Zi $(LOC)
-LDFLAGS = -nologo -debug -incremental:no -opt:ref
-ARFLAGS = -nologo
-RCFLAGS = /dWIN32 /r
-
-OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \
-       gzwrite.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj
-OBJA =
-
-
-# targets
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \
-     example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-$(STATICLIB): $(OBJS) $(OBJA)
-	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(OBJA)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): $(TOP)/win32/zlib.def $(OBJS) $(OBJA) zlib1.res
-	$(LD) $(LDFLAGS) -def:$(TOP)/win32/zlib.def -dll -implib:$(IMPLIB) \
-	  -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;2
-
-example.exe: example.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) example.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip.exe: minigzip.obj $(STATICLIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-example_d.exe: example.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-minigzip_d.exe: minigzip.obj $(IMPLIB)
-	$(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)
-	if exist $@.manifest \
-	  mt -nologo -manifest $@.manifest -outputresource:$@;1
-
-{$(TOP)}.c.obj:
-	$(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/test}.c.obj:
-	$(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/contrib/masmx64}.c.obj:
-	$(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-{$(TOP)/contrib/masmx64}.asm.obj:
-	$(AS) -c $(ASFLAGS) $<
-
-{$(TOP)/contrib/masmx86}.asm.obj:
-	$(AS) -c $(ASFLAGS) $<
-
-adler32.obj: $(TOP)/adler32.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-compress.obj: $(TOP)/compress.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-crc32.obj: $(TOP)/crc32.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/crc32.h
-
-deflate.obj: $(TOP)/deflate.c $(TOP)/deflate.h $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
-
-gzclose.obj: $(TOP)/gzclose.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-gzlib.obj: $(TOP)/gzlib.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-gzread.obj: $(TOP)/gzread.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-gzwrite.obj: $(TOP)/gzwrite.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h
-
-infback.obj: $(TOP)/infback.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
-             $(TOP)/inffast.h $(TOP)/inffixed.h
-
-inffast.obj: $(TOP)/inffast.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
-             $(TOP)/inffast.h
-
-inflate.obj: $(TOP)/inflate.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \
-             $(TOP)/inffast.h $(TOP)/inffixed.h
-
-inftrees.obj: $(TOP)/inftrees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h
-
-trees.obj: $(TOP)/trees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/deflate.h $(TOP)/trees.h
-
-uncompr.obj: $(TOP)/uncompr.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-zutil.obj: $(TOP)/zutil.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h
-
-gvmat64.obj: $(TOP)/contrib\masmx64\gvmat64.asm
-
-inffasx64.obj: $(TOP)/contrib\masmx64\inffasx64.asm
-
-inffas8664.obj: $(TOP)/contrib\masmx64\inffas8664.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h \
-		$(TOP)/inftrees.h $(TOP)/inflate.h $(TOP)/inffast.h
-
-inffas32.obj: $(TOP)/contrib\masmx86\inffas32.asm
-
-match686.obj: $(TOP)/contrib\masmx86\match686.asm
-
-example.obj: $(TOP)/test/example.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zlib.h $(TOP)/zconf.h
-
-zlib1.res: $(TOP)/win32/zlib1.rc
-	$(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/zlib1.rc
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	example_d
-	echo hello world | minigzip_d | minigzip_d -d
-
-
-# cleanup
-clean:
-	-del $(STATICLIB)
-	-del $(SHAREDLIB)
-	-del $(IMPLIB)
-	-del *.obj
-	-del *.res
-	-del *.exp
-	-del *.exe
-	-del *.pdb
-	-del *.manifest
-	-del foo.gz
diff --git a/src/png/zlib/win32/README-WIN32.txt b/src/png/zlib/win32/README-WIN32.txt
deleted file mode 100644
index df7ab7f4b..000000000
--- a/src/png/zlib/win32/README-WIN32.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.11 is a general purpose data compression library.  All the code is
-thread safe.  The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org).  Two compiled
-examples are distributed in this package, example and minigzip.  The example_d
-and minigzip_d flavors validate that the zlib1.dll file is working correctly.
-
-Questions about zlib should be sent to <zlib@gzip.org>.  The zlib home page
-is http://zlib.net/ .  Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
-before asking for help.
-
-
-Manifest:
-
-The package zlib-1.2.11-win32-x86.zip will contain the following files:
-
-  README-WIN32.txt This document
-  ChangeLog        Changes since previous zlib packages
-  DLL_FAQ.txt      Frequently asked questions about zlib1.dll
-  zlib.3.pdf       Documentation of this library in Adobe Acrobat format
-
-  example.exe      A statically-bound example (using zlib.lib, not the dll)
-  example.pdb      Symbolic information for debugging example.exe
-
-  example_d.exe    A zlib1.dll bound example (using zdll.lib)
-  example_d.pdb    Symbolic information for debugging example_d.exe
-
-  minigzip.exe     A statically-bound test program (using zlib.lib, not the dll)
-  minigzip.pdb     Symbolic information for debugging minigzip.exe
-
-  minigzip_d.exe   A zlib1.dll bound test program (using zdll.lib)
-  minigzip_d.pdb   Symbolic information for debugging minigzip_d.exe
-
-  zlib.h           Install these files into the compilers' INCLUDE path to
-  zconf.h          compile programs which use zlib.lib or zdll.lib
-
-  zdll.lib         Install these files into the compilers' LIB path if linking
-  zdll.exp         a compiled program to the zlib1.dll binary
-
-  zlib.lib         Install these files into the compilers' LIB path to link zlib
-  zlib.pdb         into compiled programs, without zlib1.dll runtime dependency
-                   (zlib.pdb provides debugging info to the compile time linker)
-
-  zlib1.dll        Install this binary shared library into the system PATH, or
-                   the program's runtime directory (where the .exe resides)
-  zlib1.pdb        Install in the same directory as zlib1.dll, in order to debug
-                   an application crash using WinDbg or similar tools.
-
-All .pdb files above are entirely optional, but are very useful to a developer
-attempting to diagnose program misbehavior or a crash.  Many additional
-important files for developers can be found in the zlib127.zip source package
-available from http://zlib.net/ - review that package's README file for details.
-
-
-Acknowledgments:
-
-The deflate format used by zlib was defined by Phil Katz.  The deflate and
-zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
-people who reported problems and suggested various improvements in zlib; they
-are too numerous to cite here.
-
-
-Copyright notice:
-
-  (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.
diff --git a/src/png/zlib/win32/VisualC.txt b/src/png/zlib/win32/VisualC.txt
deleted file mode 100644
index 1005b2194..000000000
--- a/src/png/zlib/win32/VisualC.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-To build zlib using the Microsoft Visual C++ environment,
-use the appropriate project from the contrib/vstudio/ directory.
diff --git a/src/png/zlib/win32/zlib.def b/src/png/zlib/win32/zlib.def
deleted file mode 100644
index a2188b000..000000000
--- a/src/png/zlib/win32/zlib.def
+++ /dev/null
@@ -1,94 +0,0 @@
-; zlib data compression library
-EXPORTS
-; basic functions
-    zlibVersion
-    deflate
-    deflateEnd
-    inflate
-    inflateEnd
-; advanced functions
-    deflateSetDictionary
-    deflateGetDictionary
-    deflateCopy
-    deflateReset
-    deflateParams
-    deflateTune
-    deflateBound
-    deflatePending
-    deflatePrime
-    deflateSetHeader
-    inflateSetDictionary
-    inflateGetDictionary
-    inflateSync
-    inflateCopy
-    inflateReset
-    inflateReset2
-    inflatePrime
-    inflateMark
-    inflateGetHeader
-    inflateBack
-    inflateBackEnd
-    zlibCompileFlags
-; utility functions
-    compress
-    compress2
-    compressBound
-    uncompress
-    uncompress2
-    gzopen
-    gzdopen
-    gzbuffer
-    gzsetparams
-    gzread
-    gzfread
-    gzwrite
-    gzfwrite
-    gzprintf
-    gzvprintf
-    gzputs
-    gzgets
-    gzputc
-    gzgetc
-    gzungetc
-    gzflush
-    gzseek
-    gzrewind
-    gztell
-    gzoffset
-    gzeof
-    gzdirect
-    gzclose
-    gzclose_r
-    gzclose_w
-    gzerror
-    gzclearerr
-; large file functions
-    gzopen64
-    gzseek64
-    gztell64
-    gzoffset64
-    adler32_combine64
-    crc32_combine64
-; checksum functions
-    adler32
-    adler32_z
-    crc32
-    crc32_z
-    adler32_combine
-    crc32_combine
-; various hacks, don't look :)
-    deflateInit_
-    deflateInit2_
-    inflateInit_
-    inflateInit2_
-    inflateBackInit_
-    gzgetc_
-    zError
-    inflateSyncPoint
-    get_crc_table
-    inflateUndermine
-    inflateValidate
-    inflateCodesUsed
-    inflateResetKeep
-    deflateResetKeep
-    gzopen_w
diff --git a/src/png/zlib/win32/zlib1.rc b/src/png/zlib/win32/zlib1.rc
deleted file mode 100644
index 234e641c3..000000000
--- a/src/png/zlib/win32/zlib1.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <winver.h>
-#include "../zlib.h"
-
-#ifdef GCC_WINDRES
-VS_VERSION_INFO		VERSIONINFO
-#else
-VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
-#endif
-  FILEVERSION		ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
-  PRODUCTVERSION	ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
-  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-  FILEFLAGS		1
-#else
-  FILEFLAGS		0
-#endif
-  FILEOS		VOS__WINDOWS32
-  FILETYPE		VFT_DLL
-  FILESUBTYPE		0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-    BEGIN
-      VALUE "FileDescription",	"zlib data compression library\0"
-      VALUE "FileVersion",	ZLIB_VERSION "\0"
-      VALUE "InternalName",	"zlib1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
-      VALUE "OriginalFilename",	"zlib1.dll\0"
-      VALUE "ProductName",	"zlib\0"
-      VALUE "ProductVersion",	ZLIB_VERSION "\0"
-      VALUE "Comments",		"For more information visit http://www.zlib.net/\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
diff --git a/src/png/zlib/zconf.h.cmakein b/src/png/zlib/zconf.h.cmakein
deleted file mode 100644
index a7f24cce6..000000000
--- a/src/png/zlib/zconf.h.cmakein
+++ /dev/null
@@ -1,536 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-#cmakedefine Z_PREFIX
-#cmakedefine Z_HAVE_UNISTD_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-#ifdef Z_SOLO
-   typedef unsigned long z_size_t;
-#else
-#  define z_longlong long long
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef unsigned long z_size_t;
-#  endif
-#  undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/src/png/zlib/zconf.h.in b/src/png/zlib/zconf.h.in
deleted file mode 100644
index 5e1d68a00..000000000
--- a/src/png/zlib/zconf.h.in
+++ /dev/null
@@ -1,534 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-#ifdef Z_SOLO
-   typedef unsigned long z_size_t;
-#else
-#  define z_longlong long long
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef unsigned long z_size_t;
-#  endif
-#  undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/src/png/zlib/zconf.h.included b/src/png/zlib/zconf.h.included
deleted file mode 100644
index 5e1d68a00..000000000
--- a/src/png/zlib/zconf.h.included
+++ /dev/null
@@ -1,534 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols and init macros */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  define adler32_z             z_adler32_z
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define crc32_z               z_crc32_z
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateGetDictionary  z_deflateGetDictionary
-#  define deflateInit           z_deflateInit
-#  define deflateInit2          z_deflateInit2
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzfread               z_gzfread
-#    define gzfwrite              z_gzfwrite
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzvprintf             z_gzvprintf
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit       z_inflateBackInit
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCodesUsed      z_inflateCodesUsed
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit           z_inflateInit
-#  define inflateInit2          z_inflateInit2
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateValidate       z_inflateValidate
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#    define uncompress2           z_uncompress2
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-#ifdef Z_SOLO
-   typedef unsigned long z_size_t;
-#else
-#  define z_longlong long long
-#  if defined(NO_SIZE_T)
-     typedef unsigned NO_SIZE_T z_size_t;
-#  elif defined(STDC)
-#    include <stddef.h>
-     typedef size_t z_size_t;
-#  else
-     typedef unsigned long z_size_t;
-#  endif
-#  undef z_longlong
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/src/png/zlib/zlib.3 b/src/png/zlib/zlib.3
deleted file mode 100644
index bda4eb073..000000000
--- a/src/png/zlib/zlib.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.TH ZLIB 3 "15 Jan 2017"
-.SH NAME
-zlib \- compression/decompression library
-.SH SYNOPSIS
-[see
-.I zlib.h
-for full description]
-.SH DESCRIPTION
-The
-.I zlib
-library is a general purpose data compression library.
-The code is thread safe, assuming that the standard library functions
-used are thread safe, such as memory allocation routines.
-It provides in-memory compression and decompression functions,
-including integrity checks of the uncompressed data.
-This version of the library supports only one compression method (deflation)
-but other algorithms may be added later
-with the same stream interface.
-.LP
-Compression can be done in a single step if the buffers are large enough
-or can be done by repeated calls of the compression function.
-In the latter case,
-the application must provide more input and/or consume the output
-(providing more output space) before each call.
-.LP
-The library also supports reading and writing files in
-.IR gzip (1)
-(.gz) format
-with an interface similar to that of stdio.
-.LP
-The library does not install any signal handler.
-The decoder checks the consistency of the compressed data,
-so the library should never crash even in the case of corrupted input.
-.LP
-All functions of the compression library are documented in the file
-.IR zlib.h .
-The distribution source includes examples of use of the library
-in the files
-.I test/example.c
-and
-.IR test/minigzip.c,
-as well as other examples in the
-.IR examples/
-directory.
-.LP
-Changes to this version are documented in the file
-.I ChangeLog
-that accompanies the source.
-.LP
-.I zlib
-is built in to many languages and operating systems, including but not limited to
-Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
-.LP
-An experimental package to read and write files in the .zip format,
-written on top of
-.I zlib
-by Gilles Vollant (info@winimage.com),
-is available at:
-.IP
-http://www.winimage.com/zLibDll/minizip.html
-and also in the
-.I contrib/minizip
-directory of the main
-.I zlib
-source distribution.
-.SH "SEE ALSO"
-The
-.I zlib
-web site can be found at:
-.IP
-http://zlib.net/
-.LP
-The data format used by the
-.I zlib
-library is described by RFC
-(Request for Comments) 1950 to 1952 in the files:
-.IP
-http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
-.br
-http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
-.br
-http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
-.LP
-Mark Nelson wrote an article about
-.I zlib
-for the Jan. 1997 issue of  Dr. Dobb's Journal;
-a copy of the article is available at:
-.IP
-http://marknelson.us/1997/01/01/zlib-engine/
-.SH "REPORTING PROBLEMS"
-Before reporting a problem,
-please check the
-.I zlib
-web site to verify that you have the latest version of
-.IR zlib ;
-otherwise,
-obtain the latest version and see if the problem still exists.
-Please read the
-.I zlib
-FAQ at:
-.IP
-http://zlib.net/zlib_faq.html
-.LP
-before asking for help.
-Send questions and/or comments to zlib@gzip.org,
-or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
-.SH AUTHORS AND LICENSE
-Version 1.2.11
-.LP
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-.LP
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-.LP
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-.LP
-.nr step 1 1
-.IP \n[step]. 3
-The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software
-in a product, an acknowledgment in the product documentation would be
-appreciated but is not required.
-.IP \n+[step].
-Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-.IP \n+[step].
-This notice may not be removed or altered from any source distribution.
-.LP
-Jean-loup Gailly        Mark Adler
-.br
-jloup@gzip.org          madler@alumni.caltech.edu
-.LP
-The deflate format used by
-.I zlib
-was defined by Phil Katz.
-The deflate and
-.I zlib
-specifications were written by L. Peter Deutsch.
-Thanks to all the people who reported problems and suggested various
-improvements in
-.IR zlib ;
-who are too numerous to cite here.
-.LP
-UNIX manual page by R. P. C. Rodgers,
-U.S. National Library of Medicine (rodgers@nlm.nih.gov).
-.\" end of man page
diff --git a/src/png/zlib/zlib.3.pdf b/src/png/zlib/zlib.3.pdf
deleted file mode 100644
index 6fa519c5b..000000000
Binary files a/src/png/zlib/zlib.3.pdf and /dev/null differ
diff --git a/src/png/zlib/zlib.h b/src/png/zlib/zlib.h
deleted file mode 100644
index f09cdaf1e..000000000
--- a/src/png/zlib/zlib.h
+++ /dev/null
@@ -1,1912 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.11, January 15th, 2017
-
-  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.11"
-#define ZLIB_VERNUM 0x12b0
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip and raw deflate streams in
-  memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in the case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte will go here */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text
-                           for deflate, or the decoding state for inflate */
-    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
-   Z_NULL on entry to the initialization function, they are set to internal
-   routines that use the standard library functions malloc() and free().
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use by the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field for deflate() */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary.  Some output may be provided even if
-    flush is zero.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending. See deflatePending(),
-  which can be used if desired to determine whether or not there is more ouput
-  in that case.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed
-  codes block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
-  function must be called again with Z_FINISH and more output space (updated
-  avail_out) but no more input data, until it returns with Z_STREAM_END or an
-  error.  After deflate has returned Z_STREAM_END, the only possible operations
-  on the stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used in the first deflate call after deflateInit if all the
-  compression is to be done in a single step.  In order to complete in one
-  call, avail_out must be at least the value returned by deflateBound (see
-  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
-  output space is provided, deflate will not return Z_STREAM_END, and it must
-  be called again as described above.
-
-    deflate() sets strm->adler to the Adler-32 checksum of all input read
-  so far (that is, total_in bytes).  If a gzip stream is being generated, then
-  strm->adler will be the CRC-32 checksum of the input read so far.  (See
-  deflateInit2 below.)
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
-  considered binary.  This field is only for information purposes and does not
-  affect the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL or the state was inadvertently written over
-  by the application), or Z_BUF_ERROR if no progress is possible (for example
-  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
-  deflate() can be called again with more input and more output space to
-  continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  In the current version of inflate, the provided input is not
-   read or consumed.  The allocation of a sliding window will be deferred to
-   the first call of inflate (if the decompression does not complete on the
-   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
-   them to use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression.
-   Actual decompression will be done by inflate().  So next_in, and avail_in,
-   next_out, and avail_out are unused and unchanged.  The current
-   implementation of inflateInit() does not process any header information --
-   that is deferred until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), then next_in and avail_in are updated
-    accordingly, and processing will resume at this point for the next call of
-    inflate().
-
-  - Generate more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  If the
-  caller of inflate() does not provide both available input and available
-  output space, it is possible that there will be no progress made.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  To assist in this, on return inflate() always sets strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.)  The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed Adler-32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained unless inflateGetHeader() is used.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
-  uncompressed length, modulo 2^32.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value, in which case strm->msg points to a string with a more specific
-  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL, or the state was inadvertently written over
-  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
-  if no progress was possible or if there was not enough room in the output
-  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is to be attempted.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
-   was inconsistent.
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     For the current implementation of deflate(), a windowBits value of 8 (a
-   window size of 256 bytes) is not supported.  As a result, a request for 8
-   will result in 9 (a 512-byte window).  In that case, providing 8 to
-   inflateInit2() will result in an error when the zlib header with 9 is
-   checked against the initialization of inflate().  The remedy is to not use 8
-   with deflateInit2() with this initialization, or at least in that case use 9
-   with inflateInit2().
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute a check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to the appropriate value,
-   if the operating system was determined at compile time.  If a gzip stream is
-   being written, strm->adler is a CRC-32 instead of an Adler-32.
-
-     For raw deflate or gzip encoding, a request for a 256-byte window is
-   rejected as invalid, since only the zlib header provides a means of
-   transmitting the window size to the decompressor.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the Adler-32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The Adler-32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   Adler-32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by deflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If deflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     deflateGetDictionary() may return a length less than the window size, even
-   when more than the window size in input has been provided. It may return up
-   to 258 bytes less in that case, due to how zlib's implementation of deflate
-   manages the sliding window and lookahead for matches, where matches can be
-   up to 258 bytes long. If the application needs the last window-size bytes of
-   input, then that would need to be saved by the application outside of zlib.
-
-     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit, but
-   does not free and reallocate the internal compression state.  The stream
-   will leave the compression level and any other attributes that may have been
-   set unchanged.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2().  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression approach (which is a function of the level) or the
-   strategy is changed, and if any input has been consumed in a previous
-   deflate() call, then the input available so far is compressed with the old
-   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
-   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
-   and strategy will take effect at the next call of deflate().
-
-     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-   not have enough output space to complete, then the parameter change will not
-   take effect.  In this case, deflateParams() can be called again with the
-   same parameters and more output space to try again.
-
-     In order to assure a change in the parameters on the first try, the
-   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
-   request until strm.avail_out is not zero, before calling deflateParams().
-   Then no more input data should be provided before the deflateParams() call.
-   If this is done, the old level and strategy will be applied to the data
-   compressed before deflateParams(), and the new level and strategy will be
-   applied to the the data compressed after deflateParams().
-
-     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
-   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
-   there was not enough output space to complete the compression of the
-   available input data before a change in the strategy or approach.  Note that
-   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
-   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
-   retried with more output space.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
-   below), inflate() will not automatically decode concatenated gzip streams.
-   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
-   would need to be reset to continue decoding a subsequent gzip stream.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the Adler-32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.  If the window size is changed, then the
-   memory allocated for the window is freed, and the window will be reallocated
-   by inflate() if needed.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above, or -65536 if the provided
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the default
-   behavior of inflate(), which expects a zlib header and trailer around the
-   deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero -- buf is ignored in that
-   case -- and inflateBack() will return a buffer error.  inflateBack() will
-   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
-   out() should return zero on success, or non-zero on failure.  If out()
-   returns non-zero, inflateBack() will return with an error.  Neither in() nor
-   out() are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.)  Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: ZLIB_DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.  compress() is equivalent to compress2() with a level
-   parameter of Z_DEFAULT_COMPRESSION.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed data.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed data.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
-                                    const Bytef *source, uLong *sourceLen));
-/*
-     Same as uncompress, except that sourceLen is a pointer, where the
-   length of the source is *sourceLen.  On return, *sourceLen is the number of
-   source bytes consumed.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Three times that size in buffer space is allocated.  A larger buffer
-   size of, for example, 64K or 128K bytes will noticeably increase the speed
-   of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.  Previously provided
-   data is flushed before the parameter change.
-
-     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
-   opened for writing, Z_ERRNO if there is an error writing the flushed data,
-   or Z_MEM_ERROR if there is a memory allocation error.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.  If len is too large to fit in an int,
-   then nothing is read, -1 is returned, and the error state is set to
-   Z_STREAM_ERROR.
-*/
-
-ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
-                                     gzFile file));
-/*
-     Read up to nitems items of size size from file to buf, otherwise operating
-   as gzread() does.  This duplicates the interface of stdio's fread(), with
-   size_t request and return types.  If the library defines size_t, then
-   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
-   integer type that can contain a pointer.
-
-     gzfread() returns the number of full items read of size size, or zero if
-   the end of the file was reached and a full item could not be read, or if
-   there was an error.  gzerror() must be consulted if zero is returned in
-   order to determine if there was an error.  If the multiplication of size and
-   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
-   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
-
-     In the event that the end of file is reached and only a partial item is
-   available at the end, i.e. the remaining uncompressed data length is not a
-   multiple of size, then the final partial item is nevetheless read into buf
-   and the end-of-file flag is set.  The length of the partial item read is not
-   provided, but could be inferred from the result of gztell().  This behavior
-   is the same as the behavior of fread() implementations in common libraries,
-   but it prevents the direct use of gzfread() to read a concurrently written
-   file, reseting and retrying on end-of-file, when size is not 1.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
-ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
-                                      z_size_t nitems, gzFile file));
-/*
-     gzfwrite() writes nitems items of size size from buf to file, duplicating
-   the interface of stdio's fwrite(), with size_t request and return types.  If
-   the library defines size_t, then z_size_t is identical to size_t.  If not,
-   then z_size_t is an unsigned integer type that can contain a pointer.
-
-     gzfwrite() returns the number of full items written of size size, or zero
-   if there was an error.  If the multiplication of size and nitems overflows,
-   i.e. the product does not fit in a z_size_t, then nothing is written, zero
-   is returned, and the error state is set to Z_STREAM_ERROR.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or a negative zlib error code in case
-   of error.  The number of uncompressed bytes written is limited to 8191, or
-   one less than the buffer size given to gzbuffer().  The caller should assure
-   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   return an error (0) with nothing written.  In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-   This can be determined using zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatenated gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
-                                    z_size_t len));
-/*
-     Same as adler32(), but with a size_t length.
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
-                                  z_size_t len));
-/*
-     Same as crc32(), but with a size_t length.
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#ifdef Z_PREFIX_SET
-#  define z_deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define z_inflateInit2(strm, windowBits) \
-          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        (int)sizeof(z_stream))
-#  define z_inflateBackInit(strm, windowBits, window) \
-          inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, (int)sizeof(z_stream))
-#else
-#  define deflateInit(strm, level) \
-          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define inflateInit(strm) \
-          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#  define inflateInit2(strm, windowBits) \
-          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                        (int)sizeof(z_stream))
-#  define inflateBackInit(strm, windowBits, window) \
-          inflateBackInit_((strm), (windowBits), (window), \
-                           ZLIB_VERSION, (int)sizeof(z_stream))
-#endif
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-#    define adler32_combine adler32_combine64
-#    define crc32_combine crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/src/png/zlib/zlib.map b/src/png/zlib/zlib.map
deleted file mode 100644
index 82ce98cf7..000000000
--- a/src/png/zlib/zlib.map
+++ /dev/null
@@ -1,94 +0,0 @@
-ZLIB_1.2.0 {
-  global:
-    compressBound;
-    deflateBound;
-    inflateBack;
-    inflateBackEnd;
-    inflateBackInit_;
-    inflateCopy;
-  local:
-    deflate_copyright;
-    inflate_copyright;
-    inflate_fast;
-    inflate_table;
-    zcalloc;
-    zcfree;
-    z_errmsg;
-    gz_error;
-    gz_intmax;
-    _*;
-};
-
-ZLIB_1.2.0.2 {
-    gzclearerr;
-    gzungetc;
-    zlibCompileFlags;
-} ZLIB_1.2.0;
-
-ZLIB_1.2.0.8 {
-    deflatePrime;
-} ZLIB_1.2.0.2;
-
-ZLIB_1.2.2 {
-    adler32_combine;
-    crc32_combine;
-    deflateSetHeader;
-    inflateGetHeader;
-} ZLIB_1.2.0.8;
-
-ZLIB_1.2.2.3 {
-    deflateTune;
-    gzdirect;
-} ZLIB_1.2.2;
-
-ZLIB_1.2.2.4 {
-    inflatePrime;
-} ZLIB_1.2.2.3;
-
-ZLIB_1.2.3.3 {
-    adler32_combine64;
-    crc32_combine64;
-    gzopen64;
-    gzseek64;
-    gztell64;
-    inflateUndermine;
-} ZLIB_1.2.2.4;
-
-ZLIB_1.2.3.4 {
-    inflateReset2;
-    inflateMark;
-} ZLIB_1.2.3.3;
-
-ZLIB_1.2.3.5 {
-    gzbuffer;
-    gzoffset;
-    gzoffset64;
-    gzclose_r;
-    gzclose_w;
-} ZLIB_1.2.3.4;
-
-ZLIB_1.2.5.1 {
-    deflatePending;
-} ZLIB_1.2.3.5;
-
-ZLIB_1.2.5.2 {
-    deflateResetKeep;
-    gzgetc_;
-    inflateResetKeep;
-} ZLIB_1.2.5.1;
-
-ZLIB_1.2.7.1 {
-    inflateGetDictionary;
-    gzvprintf;
-} ZLIB_1.2.5.2;
-
-ZLIB_1.2.9 {
-    inflateCodesUsed;
-    inflateValidate;
-    uncompress2;
-    gzfread;
-    gzfwrite;
-    deflateGetDictionary;
-    adler32_z;
-    crc32_z;
-} ZLIB_1.2.7.1;
diff --git a/src/png/zlib/zlib.pc.cmakein b/src/png/zlib/zlib.pc.cmakein
deleted file mode 100644
index a5e642938..000000000
--- a/src/png/zlib/zlib.pc.cmakein
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@INSTALL_LIB_DIR@
-sharedlibdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
-
-Name: zlib
-Description: zlib compression library
-Version: @VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}
diff --git a/src/png/zlib/zlib.pc.in b/src/png/zlib/zlib.pc.in
deleted file mode 100644
index 7e5acf9c7..000000000
--- a/src/png/zlib/zlib.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-sharedlibdir=@sharedlibdir@
-includedir=@includedir@
-
-Name: zlib
-Description: zlib compression library
-Version: @VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz
-Cflags: -I${includedir}
diff --git a/src/png/zlib/zlib2ansi b/src/png/zlib/zlib2ansi
deleted file mode 100644
index 15e3e165f..000000000
--- a/src/png/zlib/zlib2ansi
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/perl
-
-# Transform K&R C function definitions into ANSI equivalent.
-#
-# Author: Paul Marquess
-# Version: 1.0
-# Date: 3 October 2006
-
-# TODO
-#
-# Asumes no function pointer parameters. unless they are typedefed.
-# Assumes no literal strings that look like function definitions
-# Assumes functions start at the beginning of a line
-
-use strict;
-use warnings;
-
-local $/;
-$_ = <>;
-
-my $sp = qr{ \s* (?: /\* .*? \*/ )? \s* }x; # assume no nested comments
-
-my $d1    = qr{ $sp (?: [\w\*\s]+ $sp)* $sp \w+ $sp [\[\]\s]* $sp }x ;
-my $decl  = qr{ $sp (?: \w+ $sp )+ $d1 }xo ;
-my $dList = qr{ $sp $decl (?: $sp , $d1 )* $sp ; $sp }xo ;
-
-
-while (s/^
-            (                  # Start $1
-                (              #   Start $2
-                    .*?        #     Minimal eat content
-                    ( ^ \w [\w\s\*]+ )    #     $3 -- function name
-                    \s*        #     optional whitespace
-                )              # $2 - Matched up to before parameter list
-
-                \( \s*         # Literal "(" + optional whitespace
-                ( [^\)]+ )     # $4 - one or more anythings except ")"
-                \s* \)         # optional whitespace surrounding a Literal ")"
-
-                ( (?: $dList )+ ) # $5
-
-                $sp ^ {        # literal "{" at start of line
-            )                  # Remember to $1
-        //xsom
-      )
-{
-    my $all = $1 ;
-    my $prefix = $2;
-    my $param_list = $4 ;
-    my $params = $5;
-
-    StripComments($params);
-    StripComments($param_list);
-    $param_list =~ s/^\s+//;
-    $param_list =~ s/\s+$//;
-
-    my $i = 0 ;
-    my %pList = map { $_ => $i++ }
-                split /\s*,\s*/, $param_list;
-    my $pMatch = '(\b' . join('|', keys %pList) . '\b)\W*$' ;
-
-    my @params = split /\s*;\s*/, $params;
-    my @outParams = ();
-    foreach my $p (@params)
-    {
-        if ($p =~ /,/)
-        {
-            my @bits = split /\s*,\s*/, $p;
-            my $first = shift @bits;
-            $first =~ s/^\s*//;
-            push @outParams, $first;
-            $first =~ /^(\w+\s*)/;
-            my $type = $1 ;
-            push @outParams, map { $type . $_ } @bits;
-        }
-        else
-        {
-            $p =~ s/^\s+//;
-            push @outParams, $p;
-        }
-    }
-
-
-    my %tmp = map { /$pMatch/;  $_ => $pList{$1}  }
-              @outParams ;
-
-    @outParams = map  { "    $_" }
-                 sort { $tmp{$a} <=> $tmp{$b} }
-                 @outParams ;
-
-    print $prefix ;
-    print "(\n" . join(",\n", @outParams) . ")\n";
-    print "{" ;
-
-}
-
-# Output any trailing code.
-print ;
-exit 0;
-
-
-sub StripComments
-{
-
-  no warnings;
-
-  # Strip C & C++ coments
-  # From the perlfaq
-  $_[0] =~
-
-    s{
-       /\*         ##  Start of /* ... */ comment
-       [^*]*\*+    ##  Non-* followed by 1-or-more *'s
-       (
-         [^/*][^*]*\*+
-       )*          ##  0-or-more things which don't start with /
-                   ##    but do end with '*'
-       /           ##  End of /* ... */ comment
-
-     |         ##     OR  C++ Comment
-       //          ## Start of C++ comment //
-       [^\n]*      ## followed by 0-or-more non end of line characters
-
-     |         ##     OR  various things which aren't comments:
-
-       (
-         "           ##  Start of " ... " string
-         (
-           \\.           ##  Escaped char
-         |               ##    OR
-           [^"\\]        ##  Non "\
-         )*
-         "           ##  End of " ... " string
-
-       |         ##     OR
-
-         '           ##  Start of ' ... ' string
-         (
-           \\.           ##  Escaped char
-         |               ##    OR
-           [^'\\]        ##  Non '\
-         )*
-         '           ##  End of ' ... ' string
-
-       |         ##     OR
-
-         .           ##  Anything other char
-         [^/"'\\]*   ##  Chars which doesn't start a comment, string or escape
-       )
-     }{$2}gxs;
-
-}
diff --git a/src/png/zlib/zutil.c b/src/png/zlib/zutil.c
deleted file mode 100644
index a76c6b0c7..000000000
--- a/src/png/zlib/zutil.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2017 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-#ifndef Z_SOLO
-#  include "gzguts.h"
-#endif
-
-z_const char * const z_errmsg[10] = {
-    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
-    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
-    (z_const char *)"",                    /* Z_OK              0  */
-    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
-    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
-    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
-    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
-    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
-    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
-    (z_const char *)""
-};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
-    uLong flags;
-
-    flags = 0;
-    switch ((int)(sizeof(uInt))) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch ((int)(sizeof(uLong))) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch ((int)(sizeof(voidpf))) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch ((int)(sizeof(z_off_t))) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef ZLIB_DEBUG
-    flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
-    flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-#ifdef FASTEST
-    flags += 1L << 21;
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifdef NO_vsnprintf
-    flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#else
-    flags += 1L << 24;
-#  ifdef NO_snprintf
-    flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-    flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-    flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}
-
-#ifdef ZLIB_DEBUG
-#include <stdlib.h>
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int ZLIB_INTERNAL z_verbose = verbose;
-
-void ZLIB_INTERNAL z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
-#ifndef HAVE_MEMCPY
-
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void ZLIB_INTERNAL zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-#ifndef Z_SOLO
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf;
-    ulg bsize = (ulg)items*size;
-
-    (void)opaque;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-
-    (void)opaque;
-
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
-    (void)opaque;
-    return _halloc((long)items, size);
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
-    (void)opaque;
-    _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    (void)opaque;
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
-}
-
-void ZLIB_INTERNAL zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    (void)opaque;
-    free(ptr);
-}
-
-#endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */
diff --git a/src/png/zlib/zutil.h b/src/png/zlib/zutil.h
deleted file mode 100644
index b079ea6a8..000000000
--- a/src/png/zlib/zutil.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#ifdef HAVE_HIDDEN
-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-#  define ZLIB_INTERNAL
-#endif
-
-#include "zlib.h"
-
-#if defined(STDC) && !defined(Z_SOLO)
-#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* since "static" is used to mean two completely different things in C, we
-   define "local" for the non-static meaning of "static", for readability
-   (compile with -Dlocal if your debugger can't find static symbols) */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#  define OS_CODE  0x00
-#  ifndef Z_SOLO
-#    if defined(__TURBOC__) || defined(__BORLANDC__)
-#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-         /* Allow compilation with ANSI keywords only enabled */
-         void _Cdecl farfree( void *block );
-         void *_Cdecl farmalloc( unsigned long nbytes );
-#      else
-#        include <alloc.h>
-#      endif
-#    else /* MSC or DJGPP */
-#      include <malloc.h>
-#    endif
-#  endif
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  1
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  2
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#ifdef __370__
-#  if __TARGET_LIB__ < 0x20000000
-#    define OS_CODE 4
-#  elif __TARGET_LIB__ < 0x40000000
-#    define OS_CODE 11
-#  else
-#    define OS_CODE 8
-#  endif
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  5
-#endif
-
-#ifdef OS2
-#  define OS_CODE  6
-#  if defined(M_I86) && !defined(Z_SOLO)
-#    include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  7
-#  ifndef Z_SOLO
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#      include <unix.h> /* for fdopen */
-#    else
-#      ifndef fdopen
-#        define fdopen(fd,mode) NULL /* No fdopen() */
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __acorn
-#  define OS_CODE 13
-#endif
-
-#if defined(WIN32) && !defined(__CYGWIN__)
-#  define OS_CODE  10
-#endif
-
-#ifdef _BEOS_
-#  define OS_CODE  16
-#endif
-
-#ifdef __TOS_OS400__
-#  define OS_CODE 18
-#endif
-
-#ifdef __APPLE__
-#  define OS_CODE 19
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
-#if defined(__BORLANDC__) && !defined(MSDOS)
-  #pragma warn -8004
-  #pragma warn -8008
-  #pragma warn -8066
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && \
-    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
-    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  3     /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#if defined(pyr) || defined(Z_SOLO)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
-   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
-   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef ZLIB_DEBUG
-#  include <stdio.h>
-   extern int ZLIB_INTERNAL z_verbose;
-   extern void ZLIB_INTERNAL z_error OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-#ifndef Z_SOLO
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                                    unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
-#endif
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-/* Reverse the bytes in a 32-bit value */
-#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-#endif /* ZUTIL_H */
diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt
index e25da35e3..a3e7da126 100644
--- a/src/qhull/CMakeLists.txt
+++ b/src/qhull/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # This CMake file is written specifically to integrate qhull library with Slic3rPE
-# (see https://github.com/prusa3d/Slic3r for more information about the project)
+# (see https://github.com/prusa3d/PrusaSlicer for more information about the project)
 #
 # Only original libraries qhullstatic_r and qhullcpp are included.
 # They are built as a single statically linked library.
diff --git a/src/qhull/README.txt b/src/qhull/README.txt
index f4c7a3b22..c811b9f80 100644
--- a/src/qhull/README.txt
+++ b/src/qhull/README.txt
@@ -1,5 +1,5 @@
 This distribution of qhull library is only meant for interfacing qhull with Slic3rPE
-(https://github.com/prusa3d/Slic3r).
+(https://github.com/prusa3d/PrusaSlicer).
 
 The qhull source file was acquired from https://github.com/qhull/qhull at revision
 f0bd8ceeb84b554d7cdde9bbfae7d3351270478c.
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
index ef60ab3fa..570e23baa 100644
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -30,6 +30,9 @@ set(SLIC3R_GUI_SOURCES
     GUI/GLCanvas3DManager.cpp
     GUI/Selection.hpp
     GUI/Selection.cpp    
+    GUI/Gizmos/GLGizmos.hpp
+    GUI/Gizmos/GLGizmosManager.cpp
+    GUI/Gizmos/GLGizmosManager.hpp
     GUI/Gizmos/GLGizmoBase.cpp
     GUI/Gizmos/GLGizmoBase.hpp
     GUI/Gizmos/GLGizmoMove.cpp
@@ -44,6 +47,8 @@ set(SLIC3R_GUI_SOURCES
     GUI/Gizmos/GLGizmoFlatten.hpp
     GUI/Gizmos/GLGizmoCut.cpp
     GUI/Gizmos/GLGizmoCut.hpp
+    GUI/GLSelectionRectangle.cpp
+    GUI/GLSelectionRectangle.hpp
     GUI/GLTexture.hpp
     GUI/GLTexture.cpp
     GUI/GLToolbar.hpp
@@ -146,12 +151,15 @@ set(SLIC3R_GUI_SOURCES
 )
 
 if (APPLE)
-    list(APPEND SLIC3R_GUI_SOURCES Utils/RetinaHelperImpl.mm)
+    list(APPEND SLIC3R_GUI_SOURCES
+            Utils/RetinaHelperImpl.mm
+            Utils/MacDarkMode.mm
+        )
 endif ()
 
 add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES})
 
-target_link_libraries(libslic3r_gui libslic3r avrdude imgui)
+target_link_libraries(libslic3r_gui libslic3r avrdude imgui ${GLEW_LIBRARIES})
 if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
     add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE)
 endif ()
diff --git a/src/slic3r/Config/Version.cpp b/src/slic3r/Config/Version.cpp
index 70b12f23b..2eda135d6 100644
--- a/src/slic3r/Config/Version.cpp
+++ b/src/slic3r/Config/Version.cpp
@@ -1,5 +1,7 @@
 #include "Version.hpp"
 
+#include <cctype>
+
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/nowide/fstream.hpp>
diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp
index eb55d5fdc..ce2012461 100644
--- a/src/slic3r/GUI/2DBed.cpp
+++ b/src/slic3r/GUI/2DBed.cpp
@@ -18,10 +18,10 @@ wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(25 * wxGetApp().em_unit(), -
 #ifdef __APPLE__
     m_user_drawn_background = false;
 #endif /*__APPLE__*/
-    Bind(wxEVT_PAINT, ([this](wxPaintEvent e) { repaint(); }));
-    Bind(wxEVT_LEFT_DOWN, ([this](wxMouseEvent  event) { mouse_event(event); }));
-    Bind(wxEVT_MOTION, ([this](wxMouseEvent  event) { mouse_event(event); }));
-    Bind(wxEVT_SIZE, ([this](wxSizeEvent e) { Refresh(); }));
+    Bind(wxEVT_PAINT, ([this](wxPaintEvent &/* e */) { repaint(); }));
+    Bind(wxEVT_LEFT_DOWN, ([this](wxMouseEvent &event) { mouse_event(event); }));
+    Bind(wxEVT_MOTION, ([this](wxMouseEvent &event) { mouse_event(event); }));
+    Bind(wxEVT_SIZE, ([this](wxSizeEvent & /* e */) { Refresh(); }));
 }
 void Bed_2D::repaint()
 {
diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp
index 236793814..8392e534a 100644
--- a/src/slic3r/GUI/3DBed.cpp
+++ b/src/slic3r/GUI/3DBed.cpp
@@ -8,6 +8,7 @@
 
 #include "GUI_App.hpp"
 #include "PresetBundle.hpp"
+#include "Gizmos/GLGizmoBase.hpp"
 
 #include <GL/glew.h>
 
@@ -232,7 +233,7 @@ void Bed3D::Axes::render() const
     glsafe(::glEnable(GL_LIGHTING));
 
     // x axis
-    glsafe(::glColor3f(1.0f, 0.0f, 0.0f));
+    glsafe(::glColor3fv(AXES_COLOR[0]));
     glsafe(::glPushMatrix());
     glsafe(::glTranslated(origin(0), origin(1), origin(2)));
     glsafe(::glRotated(90.0, 0.0, 1.0, 0.0));
@@ -240,7 +241,7 @@ void Bed3D::Axes::render() const
     glsafe(::glPopMatrix());
 
     // y axis
-    glsafe(::glColor3f(0.0f, 1.0f, 0.0f));
+    glsafe(::glColor3fv(AXES_COLOR[1]));
     glsafe(::glPushMatrix());
     glsafe(::glTranslated(origin(0), origin(1), origin(2)));
     glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
@@ -248,7 +249,7 @@ void Bed3D::Axes::render() const
     glsafe(::glPopMatrix());
 
     // z axis
-    glsafe(::glColor3f(0.0f, 0.0f, 1.0f));
+    glsafe(::glColor3fv(AXES_COLOR[2]));
     glsafe(::glPushMatrix());
     glsafe(::glTranslated(origin(0), origin(1), origin(2)));
     render_axis(length(2));
@@ -495,11 +496,11 @@ void Bed3D::render_prusa(const std::string &key, bool bottom) const
     // use anisotropic filter if graphic card allows
     GLfloat max_anisotropy = 0.0f;
     if (glewIsSupported("GL_EXT_texture_filter_anisotropic"))
-        ::glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy);
+        glsafe(::glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy));
 
     // use higher resolution images if graphic card allows
     GLint max_tex_size;
-    ::glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_tex_size);
+    glsafe(::glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_tex_size));
 
     // clamp or the texture generation becomes too slow
     max_tex_size = std::min(max_tex_size, 8192);
@@ -621,7 +622,6 @@ void Bed3D::render_prusa_shader(bool transparent) const
         m_shader.stop_using();
     }
 }
-
 #else
 void Bed3D::render_prusa(const std::string &key, float theta, bool useVBOs) const
 {
@@ -629,7 +629,7 @@ void Bed3D::render_prusa(const std::string &key, float theta, bool useVBOs) cons
 
     // use higher resolution images if graphic card allows
     GLint max_tex_size;
-    ::glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_tex_size);
+    glsafe(::glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_tex_size));
 
     // temporary set to lowest resolution
     max_tex_size = 2048;
@@ -644,7 +644,7 @@ void Bed3D::render_prusa(const std::string &key, float theta, bool useVBOs) cons
     // use anisotropic filter if graphic card allows
     GLfloat max_anisotropy = 0.0f;
     if (glewIsSupported("GL_EXT_texture_filter_anisotropic"))
-        ::glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy);
+        glsafe(::glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy));
 
     std::string filename = tex_path + "_top.png";
     if ((m_top_texture.get_id() == 0) || (m_top_texture.get_source() != filename))
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index 8e62d8262..aa6a6bace 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -32,7 +32,7 @@
 #include "GUI.hpp"
 
 #ifdef HAS_GLSAFE
-void glAssertRecentCallImpl()
+void glAssertRecentCallImpl(const char *file_name, unsigned int line, const char *function_name)
 {
     GLenum err = glGetError();
     if (err == GL_NO_ERROR)
@@ -41,13 +41,14 @@ void glAssertRecentCallImpl()
     switch (err) {
     case GL_INVALID_ENUM:       sErr = "Invalid Enum";      break;
     case GL_INVALID_VALUE:      sErr = "Invalid Value";     break;
+    // be aware that GL_INVALID_OPERATION is generated if glGetError is executed between the execution of glBegin and the corresponding execution of glEnd 
     case GL_INVALID_OPERATION:  sErr = "Invalid Operation"; break;
     case GL_STACK_OVERFLOW:     sErr = "Stack Overflow";    break;
     case GL_STACK_UNDERFLOW:    sErr = "Stack Underflow";   break;
     case GL_OUT_OF_MEMORY:      sErr = "Out Of Memory";     break;
     default:                    sErr = "Unknown";           break;
     }
-    BOOST_LOG_TRIVIAL(error) << "OpenGL error " << (int)err << ": " << sErr;
+	BOOST_LOG_TRIVIAL(error) << "OpenGL error in " << file_name << ":" << line << ", function " << function_name << "() : " << (int)err << " - " << sErr;
     assert(false);
 }
 #endif
@@ -98,25 +99,25 @@ void GLIndexedVertexArray::finalize_geometry(bool use_VBOs)
 
     if (use_VBOs) {
         if (! empty()) {
-            glsafe(glGenBuffers(1, &this->vertices_and_normals_interleaved_VBO_id));
-            glsafe(glBindBuffer(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved_VBO_id));
-            glsafe(glBufferData(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved.size() * 4, this->vertices_and_normals_interleaved.data(), GL_STATIC_DRAW));
-            glsafe(glBindBuffer(GL_ARRAY_BUFFER, 0));
+            glsafe(::glGenBuffers(1, &this->vertices_and_normals_interleaved_VBO_id));
+            glsafe(::glBindBuffer(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved_VBO_id));
+            glsafe(::glBufferData(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved.size() * 4, this->vertices_and_normals_interleaved.data(), GL_STATIC_DRAW));
+            glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
             this->vertices_and_normals_interleaved.clear();
         }
         if (! this->triangle_indices.empty()) {
-            glsafe(glGenBuffers(1, &this->triangle_indices_VBO_id));
-            glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices_VBO_id));
-            glsafe(glBufferData(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices.size() * 4, this->triangle_indices.data(), GL_STATIC_DRAW));
+            glsafe(::glGenBuffers(1, &this->triangle_indices_VBO_id));
+            glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices_VBO_id));
+            glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices.size() * 4, this->triangle_indices.data(), GL_STATIC_DRAW));
             this->triangle_indices.clear();
         }
         if (! this->quad_indices.empty()) {
-            glsafe(glGenBuffers(1, &this->quad_indices_VBO_id));
-            glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices_VBO_id));
-            glsafe(glBufferData(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices.size() * 4, this->quad_indices.data(), GL_STATIC_DRAW));
+            glsafe(::glGenBuffers(1, &this->quad_indices_VBO_id));
+            glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices_VBO_id));
+            glsafe(::glBufferData(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices.size() * 4, this->quad_indices.data(), GL_STATIC_DRAW));
             this->quad_indices.clear();
         }
-        glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
+        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
     }
     this->shrink_to_fit();
 }
@@ -124,15 +125,15 @@ void GLIndexedVertexArray::finalize_geometry(bool use_VBOs)
 void GLIndexedVertexArray::release_geometry()
 {
     if (this->vertices_and_normals_interleaved_VBO_id) {
-        glsafe(glDeleteBuffers(1, &this->vertices_and_normals_interleaved_VBO_id));
+        glsafe(::glDeleteBuffers(1, &this->vertices_and_normals_interleaved_VBO_id));
         this->vertices_and_normals_interleaved_VBO_id = 0;
     }
     if (this->triangle_indices_VBO_id) {
-        glsafe(glDeleteBuffers(1, &this->triangle_indices_VBO_id));
+        glsafe(::glDeleteBuffers(1, &this->triangle_indices_VBO_id));
         this->triangle_indices_VBO_id = 0;
     }
     if (this->quad_indices_VBO_id) {
-        glsafe(glDeleteBuffers(1, &this->quad_indices_VBO_id));
+        glsafe(::glDeleteBuffers(1, &this->quad_indices_VBO_id));
         this->quad_indices_VBO_id = 0;
     }
     this->clear();
@@ -142,42 +143,42 @@ void GLIndexedVertexArray::release_geometry()
 void GLIndexedVertexArray::render() const
 {
     if (this->vertices_and_normals_interleaved_VBO_id) {
-        glsafe(glBindBuffer(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved_VBO_id));
-        glsafe(glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), (const void*)(3 * sizeof(float))));
-        glsafe(glNormalPointer(GL_FLOAT, 6 * sizeof(float), nullptr));
+        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved_VBO_id));
+        glsafe(::glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), (const void*)(3 * sizeof(float))));
+        glsafe(::glNormalPointer(GL_FLOAT, 6 * sizeof(float), nullptr));
     } else {
-        glsafe(glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data() + 3));
-        glsafe(glNormalPointer(GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data()));
+        glsafe(::glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data() + 3));
+        glsafe(::glNormalPointer(GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data()));
     }
-    glsafe(glEnableClientState(GL_VERTEX_ARRAY));
-    glsafe(glEnableClientState(GL_NORMAL_ARRAY));
+    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
 
     if (this->indexed()) {
         if (this->vertices_and_normals_interleaved_VBO_id) {
             // Render using the Vertex Buffer Objects.
             if (this->triangle_indices_size > 0) {
-                glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices_VBO_id));
-                glsafe(glDrawElements(GL_TRIANGLES, GLsizei(this->triangle_indices_size), GL_UNSIGNED_INT, nullptr));
+                glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices_VBO_id));
+                glsafe(::glDrawElements(GL_TRIANGLES, GLsizei(this->triangle_indices_size), GL_UNSIGNED_INT, nullptr));
             }
             if (this->quad_indices_size > 0) {
-                glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices_VBO_id));
-                glsafe(glDrawElements(GL_QUADS, GLsizei(this->quad_indices_size), GL_UNSIGNED_INT, nullptr));
+                glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices_VBO_id));
+                glsafe(::glDrawElements(GL_QUADS, GLsizei(this->quad_indices_size), GL_UNSIGNED_INT, nullptr));
             }
             glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
         } else {
             // Render in an immediate mode.
             if (! this->triangle_indices.empty())
-                glsafe(glDrawElements(GL_TRIANGLES, GLsizei(this->triangle_indices_size), GL_UNSIGNED_INT, this->triangle_indices.data()));
+                glsafe(::glDrawElements(GL_TRIANGLES, GLsizei(this->triangle_indices_size), GL_UNSIGNED_INT, this->triangle_indices.data()));
             if (! this->quad_indices.empty())
-                glsafe(glDrawElements(GL_QUADS, GLsizei(this->quad_indices_size), GL_UNSIGNED_INT, this->quad_indices.data()));
+                glsafe(::glDrawElements(GL_QUADS, GLsizei(this->quad_indices_size), GL_UNSIGNED_INT, this->quad_indices.data()));
         }
     } else
-        glsafe(glDrawArrays(GL_TRIANGLES, 0, GLsizei(this->vertices_and_normals_interleaved_size / 6)));
+        glsafe(::glDrawArrays(GL_TRIANGLES, 0, GLsizei(this->vertices_and_normals_interleaved_size / 6)));
 
     if (this->vertices_and_normals_interleaved_VBO_id)
-        glsafe(glBindBuffer(GL_ARRAY_BUFFER, 0));
-    glsafe(glDisableClientState(GL_VERTEX_ARRAY));
-    glsafe(glDisableClientState(GL_NORMAL_ARRAY));
+        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
+    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
 }
 
 void GLIndexedVertexArray::render(
@@ -190,42 +191,49 @@ void GLIndexedVertexArray::render(
 
     if (this->vertices_and_normals_interleaved_VBO_id) {
         // Render using the Vertex Buffer Objects.
-        glsafe(glBindBuffer(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved_VBO_id));
-        glsafe(glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), (const void*)(3 * sizeof(float))));
-        glsafe(glNormalPointer(GL_FLOAT, 6 * sizeof(float), nullptr));
-        glsafe(glEnableClientState(GL_VERTEX_ARRAY));
-        glsafe(glEnableClientState(GL_NORMAL_ARRAY));
+        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, this->vertices_and_normals_interleaved_VBO_id));
+        glsafe(::glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), (const void*)(3 * sizeof(float))));
+        glsafe(::glNormalPointer(GL_FLOAT, 6 * sizeof(float), nullptr));
+        glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+        glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
         if (this->triangle_indices_size > 0) {
-            glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices_VBO_id));
-            glsafe(glDrawElements(GL_TRIANGLES, GLsizei(std::min(this->triangle_indices_size, tverts_range.second - tverts_range.first)), GL_UNSIGNED_INT, (const void*)(tverts_range.first * 4)));
+            glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->triangle_indices_VBO_id));
+            glsafe(::glDrawElements(GL_TRIANGLES, GLsizei(std::min(this->triangle_indices_size, tverts_range.second - tverts_range.first)), GL_UNSIGNED_INT, (const void*)(tverts_range.first * 4)));
         }
         if (this->quad_indices_size > 0) {
-            glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices_VBO_id));
-            glsafe(glDrawElements(GL_QUADS, GLsizei(std::min(this->quad_indices_size, qverts_range.second - qverts_range.first)), GL_UNSIGNED_INT, (const void*)(qverts_range.first * 4)));
+            glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, this->quad_indices_VBO_id));
+            glsafe(::glDrawElements(GL_QUADS, GLsizei(std::min(this->quad_indices_size, qverts_range.second - qverts_range.first)), GL_UNSIGNED_INT, (const void*)(qverts_range.first * 4)));
         }
-        glsafe(glBindBuffer(GL_ARRAY_BUFFER, 0));
-        glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
+        glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
+        glsafe(::glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0));
     } else {
         // Render in an immediate mode.
-        glsafe(glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data() + 3));
-        glsafe(glNormalPointer(GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data()));
-        glsafe(glEnableClientState(GL_VERTEX_ARRAY));
-        glsafe(glEnableClientState(GL_NORMAL_ARRAY));
+        glsafe(::glVertexPointer(3, GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data() + 3));
+        glsafe(::glNormalPointer(GL_FLOAT, 6 * sizeof(float), this->vertices_and_normals_interleaved.data()));
+        glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+        glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
         if (! this->triangle_indices.empty())
-            glsafe(glDrawElements(GL_TRIANGLES, GLsizei(std::min(this->triangle_indices_size, tverts_range.second - tverts_range.first)), GL_UNSIGNED_INT, (const void*)(this->triangle_indices.data() + tverts_range.first)));
+            glsafe(::glDrawElements(GL_TRIANGLES, GLsizei(std::min(this->triangle_indices_size, tverts_range.second - tverts_range.first)), GL_UNSIGNED_INT, (const void*)(this->triangle_indices.data() + tverts_range.first)));
         if (! this->quad_indices.empty())
-            glsafe(glDrawElements(GL_QUADS, GLsizei(std::min(this->quad_indices_size, qverts_range.second - qverts_range.first)), GL_UNSIGNED_INT, (const void*)(this->quad_indices.data() + qverts_range.first)));
+            glsafe(::glDrawElements(GL_QUADS, GLsizei(std::min(this->quad_indices_size, qverts_range.second - qverts_range.first)), GL_UNSIGNED_INT, (const void*)(this->quad_indices.data() + qverts_range.first)));
     }
 
-    glsafe(glDisableClientState(GL_VERTEX_ARRAY));
-    glsafe(glDisableClientState(GL_NORMAL_ARRAY));
+    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
 }
 
 const float GLVolume::SELECTED_COLOR[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
-const float GLVolume::HOVER_COLOR[4] = { 0.4f, 0.9f, 0.1f, 1.0f };
+const float GLVolume::HOVER_SELECT_COLOR[4] = { 0.4f, 0.9f, 0.1f, 1.0f };
+const float GLVolume::HOVER_DESELECT_COLOR[4] = { 1.0f, 0.75f, 0.75f, 1.0f };
 const float GLVolume::OUTSIDE_COLOR[4] = { 0.0f, 0.38f, 0.8f, 1.0f };
 const float GLVolume::SELECTED_OUTSIDE_COLOR[4] = { 0.19f, 0.58f, 1.0f, 1.0f };
 const float GLVolume::DISABLED_COLOR[4] = { 0.25f, 0.25f, 0.25f, 1.0f };
+const float GLVolume::MODEL_COLOR[4][4] = {
+    { 1.0f, 1.0f, 0.0f, 1.f },
+    { 1.0f, 0.5f, 0.5f, 1.f },
+    { 0.5f, 1.0f, 0.5f, 1.f },
+    { 0.5f, 0.5f, 1.0f, 1.f }
+};
 const float GLVolume::SLA_SUPPORT_COLOR[4] = { 0.75f, 0.75f, 0.75f, 1.0f };
 const float GLVolume::SLA_PAD_COLOR[4] = { 0.0f, 0.2f, 0.0f, 1.0f };
 
@@ -244,7 +252,7 @@ GLVolume::GLVolume(float r, float g, float b, float a)
     , zoom_to_volumes(true)
     , shader_outside_printer_detection_enabled(false)
     , is_outside(false)
-    , hover(false)
+    , hover(HS_None)
     , is_modifier(false)
     , is_wipe_tower(false)
     , is_extrusion_path(false)
@@ -282,12 +290,19 @@ void GLVolume::set_render_color(const float* rgba, unsigned int size)
 void GLVolume::set_render_color()
 {
     if (force_native_color)
-        set_render_color(color, 4);
+    {
+        if (is_outside && shader_outside_printer_detection_enabled)
+            set_render_color(OUTSIDE_COLOR, 4);
+        else
+            set_render_color(color, 4);
+    }
     else {
-        if (selected)
+        if (hover == HS_Select)
+            set_render_color(HOVER_SELECT_COLOR, 4);
+        else if (hover == HS_Deselect)
+            set_render_color(HOVER_DESELECT_COLOR, 4);
+        else if (selected)
             set_render_color(is_outside ? SELECTED_OUTSIDE_COLOR : SELECTED_COLOR, 4);
-        else if (hover)
-            set_render_color(HOVER_COLOR, 4);
         else if (disabled)
             set_render_color(DISABLED_COLOR, 4);
         else if (is_outside && shader_outside_printer_detection_enabled)
@@ -333,6 +348,13 @@ Transform3d GLVolume::world_matrix() const
     return m;
 }
 
+bool GLVolume::is_left_handed() const
+{
+    const Vec3d &m1 = m_instance_transformation.get_mirror();
+    const Vec3d &m2 = m_volume_transformation.get_mirror();
+    return m1.x() * m1.y() * m1.z() * m2.x() * m2.y() * m2.z() < 0.;
+}
+
 const BoundingBoxf3& GLVolume::transformed_bounding_box() const
 {
 	assert(bounding_box.defined || bounding_box.min(0) >= bounding_box.max(0) || bounding_box.min(1) >= bounding_box.max(1) || bounding_box.min(2) >= bounding_box.max(2));
@@ -348,19 +370,18 @@ const BoundingBoxf3& GLVolume::transformed_bounding_box() const
 
 const BoundingBoxf3& GLVolume::transformed_convex_hull_bounding_box() const
 {
-    if (m_transformed_convex_hull_bounding_box_dirty)
-    {
-        if ((m_convex_hull != nullptr) && (m_convex_hull->stl.stats.number_of_facets > 0))
-            m_transformed_convex_hull_bounding_box = m_convex_hull->transformed_bounding_box(world_matrix());
-        else
-            m_transformed_convex_hull_bounding_box = bounding_box.transformed(world_matrix());
-
-        m_transformed_convex_hull_bounding_box_dirty = false;
-    }
-
+	if (m_transformed_convex_hull_bounding_box_dirty)
+		m_transformed_convex_hull_bounding_box = this->transformed_convex_hull_bounding_box(world_matrix());
     return m_transformed_convex_hull_bounding_box;
 }
 
+BoundingBoxf3 GLVolume::transformed_convex_hull_bounding_box(const Transform3d &trafo) const
+{
+	return (m_convex_hull != nullptr && m_convex_hull->stl.stats.number_of_facets > 0) ? 
+		m_convex_hull->transformed_bounding_box(trafo) :
+		bounding_box.transformed(trafo);
+}
+
 void GLVolume::set_range(double min_z, double max_z)
 {
     this->qverts_range.first  = 0;
@@ -401,6 +422,8 @@ void GLVolume::render() const
     if (!is_active)
         return;
 
+    if (this->is_left_handed())
+        glFrontFace(GL_CW);
     glsafe(::glCullFace(GL_BACK));
     glsafe(::glPushMatrix());
 
@@ -410,6 +433,8 @@ void GLVolume::render() const
     else
         this->indexed_vertex_array.render();
     glsafe(::glPopMatrix());
+    if (this->is_left_handed())
+        glFrontFace(GL_CCW);
 }
 
 void GLVolume::render_VBOs(int color_id, int detection_id, int worldmatrix_id) const
@@ -420,6 +445,9 @@ void GLVolume::render_VBOs(int color_id, int detection_id, int worldmatrix_id) c
     if (!indexed_vertex_array.vertices_and_normals_interleaved_VBO_id)
         return;
 
+    if (this->is_left_handed())
+        glFrontFace(GL_CW);
+
     GLsizei n_triangles = GLsizei(std::min(indexed_vertex_array.triangle_indices_size, tverts_range.second - tverts_range.first));
     GLsizei n_quads = GLsizei(std::min(indexed_vertex_array.quad_indices_size, qverts_range.second - qverts_range.first));
     if (n_triangles + n_quads == 0)
@@ -481,6 +509,9 @@ void GLVolume::render_VBOs(int color_id, int detection_id, int worldmatrix_id) c
     }
 
     glsafe(::glPopMatrix());
+
+    if (this->is_left_handed())
+        glFrontFace(GL_CCW);
 }
 
 void GLVolume::render_legacy() const
@@ -489,6 +520,9 @@ void GLVolume::render_legacy() const
     if (!is_active)
         return;
 
+    if (this->is_left_handed())
+        glFrontFace(GL_CW);
+
     GLsizei n_triangles = GLsizei(std::min(indexed_vertex_array.triangle_indices_size, tverts_range.second - tverts_range.first));
     GLsizei n_quads = GLsizei(std::min(indexed_vertex_array.quad_indices_size, qverts_range.second - qverts_range.first));
     if (n_triangles + n_quads == 0)
@@ -520,8 +554,14 @@ void GLVolume::render_legacy() const
         glsafe(::glDrawElements(GL_QUADS, n_quads, GL_UNSIGNED_INT, indexed_vertex_array.quad_indices.data() + qverts_range.first));
 
     glsafe(::glPopMatrix());
+
+    if (this->is_left_handed())
+        glFrontFace(GL_CCW);
 }
 
+bool GLVolume::is_sla_support() const { return this->composite_id.volume_id == -int(slaposSupportTree); }
+bool GLVolume::is_sla_pad() const { return this->composite_id.volume_id == -int(slaposBasePool); }
+
 std::vector<int> GLVolumeCollection::load_object(
     const ModelObject       *model_object,
     int                      obj_idx,
@@ -544,19 +584,12 @@ int GLVolumeCollection::load_object_volume(
     const std::string              &color_by,
     bool                            use_VBOs)
 {
-    static float colors[4][4] = {
-        { 1.0f, 1.0f, 0.0f, 1.f }, 
-        { 1.0f, 0.5f, 0.5f, 1.f },
-        { 0.5f, 1.0f, 0.5f, 1.f }, 
-        { 0.5f, 0.5f, 1.0f, 1.f }
-    };
-
     const ModelVolume   *model_volume = model_object->volumes[volume_idx];
     const int            extruder_id  = model_volume->extruder_id();
     const ModelInstance *instance     = model_object->instances[instance_idx];
     const TriangleMesh& mesh = model_volume->mesh;
     float color[4];
-    memcpy(color, colors[((color_by == "volume") ? volume_idx : obj_idx) % 4], sizeof(float) * 3);
+    memcpy(color, GLVolume::MODEL_COLOR[((color_by == "volume") ? volume_idx : obj_idx) % 4], sizeof(float) * 3);
 /*    if (model_volume->is_support_blocker()) {
         color[0] = 1.0f;
         color[1] = 0.2f;
@@ -571,10 +604,7 @@ int GLVolumeCollection::load_object_volume(
     this->volumes.emplace_back(new GLVolume(color));
     GLVolume &v = *this->volumes.back();
     v.set_color_from_model_volume(model_volume);
-    if (use_VBOs)
-        v.indexed_vertex_array.load_mesh_full_shading(mesh);
-    else
-        v.indexed_vertex_array.load_mesh_flat_shading(mesh);
+    v.indexed_vertex_array.load_mesh(mesh, use_VBOs);
 
     // finalize_geometry() clears the vertex arrays, therefore the bounding box has to be computed before finalize_geometry().
     v.bounding_box = v.indexed_vertex_array.bounding_box();
@@ -616,14 +646,10 @@ void GLVolumeCollection::load_object_auxiliary(
 	// Convex hull is required for out of print bed detection.
 	TriangleMesh convex_hull = mesh.convex_hull_3d();
     for (const std::pair<size_t, size_t> &instance_idx : instances) {
-        const ModelInstance            &model_instance = *print_object->model_object()->instances[instance_idx.first];
-        const SLAPrintObject::Instance &print_instance = print_object->instances()[instance_idx.second];
+        const ModelInstance &model_instance = *print_object->model_object()->instances[instance_idx.first];
         this->volumes.emplace_back(new GLVolume((milestone == slaposBasePool) ? GLVolume::SLA_PAD_COLOR : GLVolume::SLA_SUPPORT_COLOR));
         GLVolume &v = *this->volumes.back();
-        if (use_VBOs)
-            v.indexed_vertex_array.load_mesh_full_shading(mesh);
-        else
-            v.indexed_vertex_array.load_mesh_flat_shading(mesh);
+        v.indexed_vertex_array.load_mesh(mesh, use_VBOs);
         // finalize_geometry() clears the vertex arrays, therefore the bounding box has to be computed before finalize_geometry().
         v.bounding_box = v.indexed_vertex_array.bounding_box();
         v.indexed_vertex_array.finalize_geometry(use_VBOs);
@@ -690,63 +716,61 @@ int GLVolumeCollection::load_wipe_tower_preview(
     brim_mesh.translate(-brim_width, -brim_width, 0.f);
     mesh.merge(brim_mesh);
 
-    mesh.rotate(rotation_angle, &origin_of_rotation); // rotates the box according to the config rotation setting
-
     this->volumes.emplace_back(new GLVolume(color));
     GLVolume &v = *this->volumes.back();
-
-    if (use_VBOs)
-        v.indexed_vertex_array.load_mesh_full_shading(mesh);
-    else
-        v.indexed_vertex_array.load_mesh_flat_shading(mesh);
-
+    v.indexed_vertex_array.load_mesh(mesh, use_VBOs);
     v.set_volume_offset(Vec3d(pos_x, pos_y, 0.0));
+    v.set_volume_rotation(Vec3d(0., 0., (M_PI/180.) * rotation_angle));
 
     // finalize_geometry() clears the vertex arrays, therefore the bounding box has to be computed before finalize_geometry().
     v.bounding_box = v.indexed_vertex_array.bounding_box();
     v.indexed_vertex_array.finalize_geometry(use_VBOs);
 	v.composite_id = GLVolume::CompositeID(obj_idx, 0, 0);
+    v.geometry_id.first = 0;
+    v.geometry_id.second = wipe_tower_instance_id().id;
     v.is_wipe_tower = true;
     v.shader_outside_printer_detection_enabled = ! size_unknown;
     return int(this->volumes.size() - 1);
 }
 
-typedef std::pair<GLVolume*, double> GLVolumeWithZ;
-typedef std::vector<GLVolumeWithZ> GLVolumesWithZList;
-static GLVolumesWithZList volumes_to_render(const GLVolumePtrs& volumes, GLVolumeCollection::ERenderType type, std::function<bool(const GLVolume&)> filter_func)
+GLVolumeWithIdAndZList volumes_to_render(const GLVolumePtrs& volumes, GLVolumeCollection::ERenderType type, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func)
 {
-    GLVolumesWithZList list;
+    GLVolumeWithIdAndZList list;
     list.reserve(volumes.size());
 
-    for (GLVolume* volume : volumes)
+    for (unsigned int i = 0; i < (unsigned int)volumes.size(); ++i)
     {
+        GLVolume* volume = volumes[i];
         bool is_transparent = (volume->render_color[3] < 1.0f);
         if ((((type == GLVolumeCollection::Opaque) && !is_transparent) ||
              ((type == GLVolumeCollection::Transparent) && is_transparent) ||
              (type == GLVolumeCollection::All)) &&
             (! filter_func || filter_func(*volume)))
-            list.emplace_back(std::make_pair(volume, 0.0));
+            list.emplace_back(std::make_pair(volume, std::make_pair(i, 0.0)));
     }
 
     if ((type == GLVolumeCollection::Transparent) && (list.size() > 1))
     {
-        Transform3d modelview_matrix;
-        glsafe(::glGetDoublev(GL_MODELVIEW_MATRIX, modelview_matrix.data()));
-
-        for (GLVolumeWithZ& volume : list)
+        for (GLVolumeWithIdAndZ& volume : list)
         {
-            volume.second = volume.first->bounding_box.transformed(modelview_matrix * volume.first->world_matrix()).max(2);
+            volume.second.second = volume.first->bounding_box.transformed(view_matrix * volume.first->world_matrix()).max(2);
         }
 
         std::sort(list.begin(), list.end(),
-            [](const GLVolumeWithZ& v1, const GLVolumeWithZ& v2) -> bool { return v1.second < v2.second; }
+            [](const GLVolumeWithIdAndZ& v1, const GLVolumeWithIdAndZ& v2) -> bool { return v1.second.second < v2.second.second; }
+        );
+    }
+    else if ((type == GLVolumeCollection::Opaque) && (list.size() > 1))
+    {
+        std::sort(list.begin(), list.end(),
+            [](const GLVolumeWithIdAndZ& v1, const GLVolumeWithIdAndZ& v2) -> bool { return v1.first->selected && !v2.first->selected; }
         );
     }
 
     return list;
 }
 
-void GLVolumeCollection::render_VBOs(GLVolumeCollection::ERenderType type, bool disable_cullface, std::function<bool(const GLVolume&)> filter_func) const
+void GLVolumeCollection::render_VBOs(GLVolumeCollection::ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func) const
 {
     glsafe(::glEnable(GL_BLEND));
     glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
@@ -760,12 +784,14 @@ void GLVolumeCollection::render_VBOs(GLVolumeCollection::ERenderType type, bool
  
     GLint current_program_id;
     glsafe(::glGetIntegerv(GL_CURRENT_PROGRAM, &current_program_id));
-    GLint color_id = (current_program_id > 0) ? glGetUniformLocation(current_program_id, "uniform_color") : -1;
-    GLint z_range_id = (current_program_id > 0) ? glGetUniformLocation(current_program_id, "z_range") : -1;
-    GLint print_box_min_id = (current_program_id > 0) ? glGetUniformLocation(current_program_id, "print_box.min") : -1;
-    GLint print_box_max_id = (current_program_id > 0) ? glGetUniformLocation(current_program_id, "print_box.max") : -1;
-    GLint print_box_detection_id = (current_program_id > 0) ? glGetUniformLocation(current_program_id, "print_box.volume_detection") : -1;
-    GLint print_box_worldmatrix_id = (current_program_id > 0) ? glGetUniformLocation(current_program_id, "print_box.volume_world_matrix") : -1;
+    GLint color_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "uniform_color") : -1;
+    GLint z_range_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "z_range") : -1;
+    GLint clipping_plane_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "clipping_plane") : -1;
+    GLint print_box_min_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "print_box.min") : -1;
+    GLint print_box_max_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "print_box.max") : -1;
+    GLint print_box_detection_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "print_box.volume_detection") : -1;
+    GLint print_box_worldmatrix_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "print_box.volume_world_matrix") : -1;
+    glcheck();
 
     if (print_box_min_id != -1)
         glsafe(::glUniform3fv(print_box_min_id, 1, (const GLfloat*)print_box_min));
@@ -776,8 +802,11 @@ void GLVolumeCollection::render_VBOs(GLVolumeCollection::ERenderType type, bool
     if (z_range_id != -1)
         glsafe(::glUniform2fv(z_range_id, 1, (const GLfloat*)z_range));
 
-    GLVolumesWithZList to_render = volumes_to_render(this->volumes, type, filter_func);
-    for (GLVolumeWithZ& volume : to_render) {
+    if (clipping_plane_id != -1)
+        glsafe(::glUniform4fv(clipping_plane_id, 1, (const GLfloat*)clipping_plane));
+
+    GLVolumeWithIdAndZList to_render = volumes_to_render(this->volumes, type, view_matrix, filter_func);
+    for (GLVolumeWithIdAndZ& volume : to_render) {
         volume.first->set_render_color();
         volume.first->render_VBOs(color_id, print_box_detection_id, print_box_worldmatrix_id);
     }
@@ -794,32 +823,32 @@ void GLVolumeCollection::render_VBOs(GLVolumeCollection::ERenderType type, bool
     glsafe(::glDisable(GL_BLEND));
 }
 
-void GLVolumeCollection::render_legacy(ERenderType type, bool disable_cullface, std::function<bool(const GLVolume&)> filter_func) const
+void GLVolumeCollection::render_legacy(ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func) const
 {
-    glsafe(glEnable(GL_BLEND));
-    glsafe(glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+    glsafe(::glEnable(GL_BLEND));
+    glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
-    glsafe(glCullFace(GL_BACK));
+    glsafe(::glCullFace(GL_BACK));
     if (disable_cullface)
         glsafe(::glDisable(GL_CULL_FACE));
 
-    glsafe(glEnableClientState(GL_VERTEX_ARRAY));
-    glsafe(glEnableClientState(GL_NORMAL_ARRAY));
+    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
  
-	GLVolumesWithZList to_render = volumes_to_render(this->volumes, type, filter_func);
-    for (GLVolumeWithZ& volume : to_render)
+    GLVolumeWithIdAndZList to_render = volumes_to_render(this->volumes, type, view_matrix, filter_func);
+    for (GLVolumeWithIdAndZ& volume : to_render)
     {
         volume.first->set_render_color();
         volume.first->render_legacy();
     }
 
-    glsafe(glDisableClientState(GL_VERTEX_ARRAY));
-    glsafe(glDisableClientState(GL_NORMAL_ARRAY));
+    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
 
     if (disable_cullface)
         glsafe(::glEnable(GL_CULL_FACE));
 
-    glsafe(glDisable(GL_BLEND));
+    glsafe(::glDisable(GL_BLEND));
 }
 
 bool GLVolumeCollection::check_outside_state(const DynamicPrintConfig* config, ModelInstance::EPrintVolumeState* out_state)
@@ -1744,7 +1773,8 @@ void GLModel::render_VBOs() const
 
     GLint current_program_id;
     glsafe(::glGetIntegerv(GL_CURRENT_PROGRAM, &current_program_id));
-    GLint color_id = (current_program_id > 0) ? glGetUniformLocation(current_program_id, "uniform_color") : -1;
+    GLint color_id = (current_program_id > 0) ? ::glGetUniformLocation(current_program_id, "uniform_color") : -1;
+    glcheck();
     m_volume.render_VBOs(color_id, -1, -1);
 
     glsafe(::glBindBuffer(GL_ARRAY_BUFFER, 0));
@@ -1829,12 +1859,7 @@ bool GLArrow::on_init(bool useVBOs)
     triangles.emplace_back(7, 13, 6);
 
     m_useVBOs = useVBOs;
-
-    if (m_useVBOs)
-        m_volume.indexed_vertex_array.load_mesh_full_shading(TriangleMesh(vertices, triangles));
-    else
-        m_volume.indexed_vertex_array.load_mesh_flat_shading(TriangleMesh(vertices, triangles));
-
+	m_volume.indexed_vertex_array.load_mesh(TriangleMesh(vertices, triangles), useVBOs);
     m_volume.finalize_geometry(m_useVBOs);
     return true;
 }
@@ -1949,12 +1974,7 @@ bool GLCurvedArrow::on_init(bool useVBOs)
     triangles.emplace_back(vertices_per_level, 2 * vertices_per_level + 1, vertices_per_level + 1);
 
     m_useVBOs = useVBOs;
-
-    if (m_useVBOs)
-        m_volume.indexed_vertex_array.load_mesh_full_shading(TriangleMesh(vertices, triangles));
-    else
-        m_volume.indexed_vertex_array.load_mesh_flat_shading(TriangleMesh(vertices, triangles));
-
+	m_volume.indexed_vertex_array.load_mesh(TriangleMesh(vertices, triangles), useVBOs);
     m_volume.bounding_box = m_volume.indexed_vertex_array.bounding_box();
     m_volume.finalize_geometry(m_useVBOs);
     return true;
@@ -1989,10 +2009,7 @@ bool GLBed::on_init_from_file(const std::string& filename, bool useVBOs)
     TriangleMesh mesh = model.mesh();
     mesh.repair();
 
-    if (m_useVBOs)
-        m_volume.indexed_vertex_array.load_mesh_full_shading(mesh);
-    else
-        m_volume.indexed_vertex_array.load_mesh_flat_shading(mesh);
+	m_volume.indexed_vertex_array.load_mesh(mesh, useVBOs);
 
     float color[4] = { 0.235f, 0.235f, 0.235f, 1.0f };
     set_color(color, 4);
diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp
index 00f0b9994..603bd5861 100644
--- a/src/slic3r/GUI/3DScene.hpp
+++ b/src/slic3r/GUI/3DScene.hpp
@@ -16,12 +16,14 @@
 #endif
 
 #ifdef HAS_GLSAFE
-extern void glAssertRecentCallImpl();
-inline void glAssertRecentCall() { glAssertRecentCallImpl(); }
-#define glsafe(cmd) do { cmd; glAssertRecentCallImpl(); } while (false)
+extern void glAssertRecentCallImpl(const char *file_name, unsigned int line, const char *function_name);
+inline void glAssertRecentCall() { glAssertRecentCallImpl(__FILE__, __LINE__, __FUNCTION__); }
+#define glsafe(cmd) do { cmd; glAssertRecentCallImpl(__FILE__, __LINE__, __FUNCTION__); } while (false)
+#define glcheck() do { glAssertRecentCallImpl(__FILE__, __LINE__, __FUNCTION__); } while (false)
 #else
 inline void glAssertRecentCall() { }
 #define glsafe(cmd) cmd
+#define glcheck()
 #endif
 
 namespace Slic3r {
@@ -115,6 +117,7 @@ public:
 
     void load_mesh_flat_shading(const TriangleMesh &mesh);
     void load_mesh_full_shading(const TriangleMesh &mesh);
+	void load_mesh(const TriangleMesh &mesh, bool use_VBOs) { use_VBOs ? this->load_mesh_full_shading(mesh) : this->load_mesh_flat_shading(mesh); }
 
     inline bool has_VBOs() const { return vertices_and_normals_interleaved_VBO_id != 0; }
 
@@ -223,13 +226,22 @@ private:
 class GLVolume {
 public:
     static const float SELECTED_COLOR[4];
-    static const float HOVER_COLOR[4];
+    static const float HOVER_SELECT_COLOR[4];
+    static const float HOVER_DESELECT_COLOR[4];
     static const float OUTSIDE_COLOR[4];
     static const float SELECTED_OUTSIDE_COLOR[4];
     static const float DISABLED_COLOR[4];
+    static const float MODEL_COLOR[4][4];
     static const float SLA_SUPPORT_COLOR[4];
     static const float SLA_PAD_COLOR[4];
 
+    enum EHoverState : unsigned char
+    {
+        HS_None,
+        HS_Select,
+        HS_Deselect
+    };
+
     GLVolume(float r = 1.f, float g = 1.f, float b = 1.f, float a = 1.f);
     GLVolume(const float *rgba) : GLVolume(rgba[0], rgba[1], rgba[2], rgba[3]) {}
     ~GLVolume();
@@ -272,6 +284,8 @@ public:
         int             volume_id;
         // Instance ID, which is equal to the index of the respective ModelInstance in ModelObject.instances array.
         int             instance_id;
+		bool operator==(const CompositeID &rhs) const { return object_id == rhs.object_id && volume_id == rhs.volume_id && instance_id == rhs.instance_id; }
+		bool operator!=(const CompositeID &rhs) const { return ! (*this == rhs); }
     };
     CompositeID         composite_id;
     // Fingerprint of the source geometry. For ModelVolumes, it is the ModelVolume::ID and ModelInstanceID, 
@@ -293,8 +307,8 @@ public:
     bool                shader_outside_printer_detection_enabled;
     // Wheter or not this volume is outside print volume.
     bool                is_outside;
-    // Boolean: Is mouse over this object?
-    bool                hover;
+    // Is mouse or rectangle selection over this object to select/deselect it ?
+    EHoverState         hover;
     // Wheter or not this volume has been generated from a modifier
     bool                is_modifier;
     // Wheter or not this volume has been generated from the wipe tower
@@ -389,8 +403,12 @@ public:
     int                 instance_idx() const { return this->composite_id.instance_id; }
 
     Transform3d         world_matrix() const;
+    bool                is_left_handed() const;
 
     const BoundingBoxf3& transformed_bounding_box() const;
+    // non-caching variant
+    BoundingBoxf3        transformed_convex_hull_bounding_box(const Transform3d &trafo) const;
+    // caching variant
     const BoundingBoxf3& transformed_convex_hull_bounding_box() const;
 
     bool                empty() const { return this->indexed_vertex_array.empty(); }
@@ -405,9 +423,14 @@ public:
     void                release_geometry() { this->indexed_vertex_array.release_geometry(); }
 
     void                set_bounding_boxes_as_dirty() { m_transformed_bounding_box_dirty = true; m_transformed_convex_hull_bounding_box_dirty = true; }
+
+    bool                is_sla_support() const;
+    bool                is_sla_pad() const;
 };
 
 typedef std::vector<GLVolume*> GLVolumePtrs;
+typedef std::pair<GLVolume*, std::pair<unsigned int, double>> GLVolumeWithIdAndZ;
+typedef std::vector<GLVolumeWithIdAndZ> GLVolumeWithIdAndZList;
 
 class GLVolumeCollection
 {
@@ -427,6 +450,9 @@ private:
     // z range for clipping in shaders
     float z_range[2];
 
+    // plane coeffs for clipping in shaders
+    float clipping_plane[4];
+
 public:
     GLVolumePtrs volumes;
 
@@ -463,8 +489,8 @@ public:
         int obj_idx, float pos_x, float pos_y, float width, float depth, float height, float rotation_angle, bool use_VBOs, bool size_unknown, float brim_width);
 
     // Render the volumes by OpenGL.
-	void render_VBOs(ERenderType type, bool disable_cullface, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const;
-    void render_legacy(ERenderType type, bool disable_cullface, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const;
+    void render_VBOs(ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const;
+    void render_legacy(ERenderType type, bool disable_cullface, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func = std::function<bool(const GLVolume&)>()) const;
 
     // Finalize the initialization of the geometry & indices,
     // upload the geometry and indices to OpenGL VBO objects
@@ -485,6 +511,7 @@ public:
     }
 
     void set_z_range(float min_z, float max_z) { z_range[0] = min_z; z_range[1] = max_z; }
+    void set_clipping_plane(const double* coeffs) { clipping_plane[0] = coeffs[0]; clipping_plane[1] = coeffs[1]; clipping_plane[2] = coeffs[2]; clipping_plane[3] = coeffs[3]; }
 
     // returns true if all the volumes are completely contained in the print volume
     // returns the containment state in the given out_state, if non-null
@@ -501,6 +528,8 @@ private:
     GLVolumeCollection& operator=(const GLVolumeCollection &);
 };
 
+GLVolumeWithIdAndZList volumes_to_render(const GLVolumePtrs& volumes, GLVolumeCollection::ERenderType type, const Transform3d& view_matrix, std::function<bool(const GLVolume&)> filter_func = nullptr);
+
 class GLModel
 {
 protected:
diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp
index 8ff74f326..591156342 100644
--- a/src/slic3r/GUI/AboutDialog.cpp
+++ b/src/slic3r/GUI/AboutDialog.cpp
@@ -32,8 +32,11 @@ void AboutDialogLogo::onRepaint(wxEvent &event)
 }
 
 AboutDialog::AboutDialog()
-    : wxDialog(NULL, wxID_ANY, _(L("About Slic3r")), wxDefaultPosition, wxDefaultSize, wxCAPTION)
+    : DPIDialog(NULL, wxID_ANY, wxString::Format(_(L("About %s")), SLIC3R_APP_NAME), wxDefaultPosition, 
+                wxDefaultSize, /*wxCAPTION*/wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
+    SetFont(wxGetApp().normal_font());
+
 	wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 	SetBackgroundColour(bgr_clr);
     wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL);
@@ -42,19 +45,17 @@ AboutDialog::AboutDialog()
 	main_sizer->Add(hsizer, 0, wxEXPAND | wxALL, 20);
 
     // logo
-// 	wxBitmap logo_bmp = wxBitmap(from_u8(Slic3r::var("Slic3r_192px.png")), wxBITMAP_TYPE_PNG);
-//     auto *logo = new wxStaticBitmap(this, wxID_ANY, std::move(logo_bmp));
-	auto *logo = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("Slic3r_192px.png"));
-	hsizer->Add(logo, 1, wxALIGN_CENTER_VERTICAL);
+    m_logo_bitmap = ScalableBitmap(this, "Slic3r_192px.png", 192);
+    m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bitmap.bmp());
+	hsizer->Add(m_logo, 1, wxALIGN_CENTER_VERTICAL);
     
     wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL); 	
     hsizer->Add(vsizer, 2, wxEXPAND|wxLEFT, 20);
 
     // title
     {
-        wxStaticText* title = new wxStaticText(this, wxID_ANY, "Slic3r++", wxDefaultPosition, wxDefaultSize);
-        wxFont title_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-        title_font.SetWeight(wxFONTWEIGHT_BOLD);
+        wxStaticText* title = new wxStaticText(this, wxID_ANY, SLIC3R_APP_NAME, wxDefaultPosition, wxDefaultSize);
+        wxFont title_font = GUI::wxGetApp().bold_font();
         title_font.SetFamily(wxFONTFAMILY_ROMAN);
         title_font.SetPointSize(24);
         title->SetFont(title_font);
@@ -65,9 +66,9 @@ AboutDialog::AboutDialog()
     {
         auto version_string = _(L("Version"))+ " " + std::string(SLIC3R_VERSION);
         wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize);
-        wxFont version_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+        wxFont version_font = GetFont();
         #ifdef __WXMSW__
-            version_font.SetPointSize(9);
+        version_font.SetPointSize(version_font.GetPointSize()-1);
         #else
             version_font.SetPointSize(11);
         #endif
@@ -76,18 +77,24 @@ AboutDialog::AboutDialog()
     }
     
     // text
-    wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO/*NEVER*/);
+    m_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO/*NEVER*/);
     {
-        html->SetMinSize(wxSize(-1, 16 * wxGetApp().em_unit()));
-        wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+        m_html->SetMinSize(wxSize(-1, 16 * wxGetApp().em_unit()));
+        wxFont font = GetFont();
         const auto text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
 		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 fs = font.GetPointSize()-1;
         int size[] = {fs,fs,fs,fs,fs,fs,fs};
-        html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
-        html->SetBorders(2);
+        m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
+        m_html->SetBorders(2);
+        const wxString copyright_str = _(L("Copyright"));
+        // TRN "Slic3r _is licensed under the_ License"
+        const wxString is_lecensed_str = _(L("is licensed under the"));
+        const wxString license_str = _(L("GNU Affero General Public License, version 3"));
+        const wxString based_on_str = _(L("Slic3r++ is based on PrusaSlicer which is based on Slic3r by Alessandro Ranellucci and the RepRap community."));
+        const wxString contributors_str = _(L("Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik, Durand Rémi and numerous others."));
 		const auto text = wxString::Format(
             "<html>"
             "<body bgcolor= %s link= %s>"
@@ -103,24 +110,51 @@ AboutDialog::AboutDialog()
             "Slic3r logo designed by Corey Daniels, <a href=\"http://www.famfamfam.com/lab/icons/silk/\">Silk Icon Set</a> designed by Mark James. "
             "</font>"
             "</body>"
-            "</html>", bgr_clr_str, text_clr_str, text_clr_str);
-        html->SetPage(text);
-        vsizer->Add(html, 1, wxEXPAND | wxBOTTOM, 10);
-        html->Bind(wxEVT_HTML_LINK_CLICKED, &AboutDialog::onLinkClicked, this);
+            "</html>", bgr_clr_str, text_clr_str, text_clr_str,
+            copyright_str, copyright_str,
+            is_lecensed_str,
+            license_str,
+            based_on_str,
+            contributors_str);
+        m_html->SetPage(text);
+        vsizer->Add(m_html, 1, wxEXPAND | wxBOTTOM, 10);
+        m_html->Bind(wxEVT_HTML_LINK_CLICKED, &AboutDialog::onLinkClicked, this);
     }
     
     wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxCLOSE);
     this->SetEscapeId(wxID_CLOSE);
     this->Bind(wxEVT_BUTTON, &AboutDialog::onCloseDialog, this, wxID_CLOSE);
     vsizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, 3);
-    
-//     this->Bind(wxEVT_LEFT_DOWN, &AboutDialog::onCloseDialog, this);
-//     logo->Bind(wxEVT_LEFT_DOWN, &AboutDialog::onCloseDialog, this);
 
 	SetSizer(main_sizer);
 	main_sizer->SetSizeHints(this);
 }
 
+void AboutDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    m_logo_bitmap.msw_rescale();
+    m_logo->SetBitmap(m_logo_bitmap.bmp());
+
+    const wxFont& font = GetFont();
+    const int fs = font.GetPointSize() - 1;
+    int font_size[] = { fs, fs, fs, fs, fs, fs, fs };
+    m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
+
+    const int& em = em_unit();
+
+    msw_buttons_rescale(this, em, { wxID_CLOSE });
+
+    m_html->SetMinSize(wxSize(-1, 16 * em));
+    m_html->Refresh();
+
+    const wxSize& size = wxSize(65 * em, 30 * em);
+
+    SetMinSize(size);
+    Fit();
+
+    Refresh();
+}
+
 void AboutDialog::onLinkClicked(wxHtmlLinkEvent &event)
 {
     wxLaunchDefaultBrowser(event.GetLinkInfo().GetHref());
diff --git a/src/slic3r/GUI/AboutDialog.hpp b/src/slic3r/GUI/AboutDialog.hpp
index 01f7564c5..7019b21f6 100644
--- a/src/slic3r/GUI/AboutDialog.hpp
+++ b/src/slic3r/GUI/AboutDialog.hpp
@@ -7,6 +7,9 @@
 #include <wx/intl.h>
 #include <wx/html/htmlwin.h>
 
+#include "GUI_Utils.hpp"
+#include "wxExtensions.hpp"
+
 namespace Slic3r { 
 namespace GUI {
 
@@ -20,10 +23,16 @@ private:
     void onRepaint(wxEvent &event);
 };
 
-class AboutDialog : public wxDialog
+class AboutDialog : public DPIDialog
 {
+    ScalableBitmap  m_logo_bitmap;
+    wxHtmlWindow*   m_html;
+    wxStaticBitmap* m_logo;
 public:
     AboutDialog();
+
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
     
 private:
     void onLinkClicked(wxHtmlLinkEvent &event);
diff --git a/src/slic3r/GUI/AppConfig.cpp b/src/slic3r/GUI/AppConfig.cpp
index a537870ee..ac7c8d46e 100644
--- a/src/slic3r/GUI/AppConfig.cpp
+++ b/src/slic3r/GUI/AppConfig.cpp
@@ -22,7 +22,7 @@ namespace Slic3r {
 
 static const std::string VENDOR_PREFIX = "vendor:";
 static const std::string MODEL_PREFIX = "model:";
-static const std::string VERSION_CHECK_URL = "https://raw.githubusercontent.com/prusa3d/Slic3r-settings/master/live/Slic3rPE.version";
+static const std::string VERSION_CHECK_URL = "https://raw.githubusercontent.com/prusa3d/PrusaSlicer-settings/master/live/PrusaSlicer.version";
 
 void AppConfig::reset()
 {
@@ -55,7 +55,7 @@ void AppConfig::set_defaults()
         set("preset_update", "1");
 
     // Use OpenGL 1.1 even if OpenGL 2.0 is available. This is mainly to support some buggy Intel HD Graphics drivers.
-    // https://github.com/prusa3d/Slic3r/issues/233
+    // github.com/prusa3d/PrusaSlicer/issues/233
     if (get("use_legacy_opengl").empty())
         set("use_legacy_opengl", "0");
 
@@ -263,7 +263,7 @@ void AppConfig::reset_selections()
 
 std::string AppConfig::config_path()
 {
-	return (boost::filesystem::path(Slic3r::data_dir()) / "slic3r.ini").make_preferred().string();
+	return (boost::filesystem::path(Slic3r::data_dir()) / (SLIC3R_APP_KEY ".ini")).make_preferred().string();
 }
 
 std::string AppConfig::version_check_url() const
diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
index 62cced4c8..826f50605 100644
--- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp
+++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp
@@ -16,6 +16,7 @@
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/GCode/PostProcessor.hpp"
 #include "libslic3r/GCode/PreviewData.hpp"
+#include "libslic3r/libslic3r.h"
 
 #include <cassert>
 #include <stdexcept>
@@ -27,6 +28,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include "I18N.hpp"
 
 namespace Slic3r {
 
@@ -80,82 +82,32 @@ void BackgroundSlicingProcess::process_fff()
 	    	// Perform the final post-processing of the export path by applying the print statistics over the file name.
 	    	std::string export_path = m_fff_print->print_statistics().finalize_output_path(m_export_path);
 		    if (copy_file(m_temp_output_path, export_path) != 0)
-	    		throw std::runtime_error("Copying of the temporary G-code to the output G-code failed");
-	    	m_print->set_status(95, "Running post-processing scripts");
+	    		throw std::runtime_error(_utf8(L("Copying of the temporary G-code to the output G-code failed")));
+	    	m_print->set_status(95, _utf8(L("Running post-processing scripts")));
 	    	run_post_process_scripts(export_path, m_fff_print->config());
-	    	m_print->set_status(100, "G-code file exported to " + export_path);
+	    	m_print->set_status(100, (boost::format(_utf8(L("G-code file exported to %1%"))) % export_path).str());
 	    } else if (! m_upload_job.empty()) {
 			prepare_upload();
 	    } else {
-	    	m_print->set_status(100, "Slicing complete");
+			m_print->set_status(100, _utf8(L("Slicing complete")));
 	    }
 		this->set_step_done(bspsGCodeFinalize);
 	}
 }
 
-// Pseudo type for specializing LayerWriter trait class
-struct SLAZipFmt {};
-
-// The implementation of creating zipped archives with wxWidgets
-template<> class LayerWriter<SLAZipFmt> {
-    wxFileName fpath;
-    wxFFileOutputStream zipfile;
-    wxZipOutputStream zipstream;
-    wxStdOutputStream pngstream;
-
-public:
-
-    inline LayerWriter(const std::string& zipfile_path):
-        fpath(zipfile_path),
-        zipfile(zipfile_path),
-        zipstream(zipfile),
-        pngstream(zipstream)
-    {
-        if(!is_ok())
-            throw std::runtime_error("Cannot create zip file.");
-    }
-
-    ~LayerWriter() {
-        // In case of an error (disk space full) zipstream destructor would
-        // crash.
-        pngstream.clear();
-        zipstream.CloseEntry();
-    }
-
-    inline void next_entry(const std::string& fname) {
-        zipstream.PutNextEntry(fname);
-    }
-
-    inline std::string get_name() const {
-        return fpath.GetName().ToUTF8().data();
-    }
-
-    template<class T> inline LayerWriter& operator<<(const T& arg) {
-        pngstream << arg; return *this;
-    }
-
-    bool is_ok() const {
-        return pngstream.good() && zipstream.IsOk() && zipfile.IsOk();
-    }
-
-    inline void close() {
-        zipstream.Close();
-        zipfile.Close();
-    }
-};
-
 void BackgroundSlicingProcess::process_sla()
 {
     assert(m_print == m_sla_print);
     m_print->process();
     if (this->set_step_started(bspsGCodeFinalize)) {
         if (! m_export_path.empty()) {
-            m_sla_print->export_raster<SLAZipFmt>(m_export_path);
-            m_print->set_status(100, "Masked SLA file exported to " + m_export_path);
+        	const std::string export_path = m_sla_print->print_statistics().finalize_output_path(m_export_path);
+            m_sla_print->export_raster(export_path);
+            m_print->set_status(100, (boost::format(_utf8(L("Masked SLA file exported to %1%"))) % export_path).str());
         } else if (! m_upload_job.empty()) {
             prepare_upload();
         } else {
-            m_print->set_status(100, "Slicing complete");
+			m_print->set_status(100, _utf8(L("Slicing complete")));
         }
         this->set_step_done(bspsGCodeFinalize);
     }
@@ -442,21 +394,21 @@ void BackgroundSlicingProcess::prepare_upload()
 
 	// Generate a unique temp path to which the gcode/zip file is copied/exported
 	boost::filesystem::path source_path = boost::filesystem::temp_directory_path()
-		/ boost::filesystem::unique_path(".printhost.%%%%-%%%%-%%%%-%%%%.gcode");
+		/ boost::filesystem::unique_path("." SLIC3R_APP_KEY ".upload.%%%%-%%%%-%%%%-%%%%");
 
 	if (m_print == m_fff_print) {
-		m_print->set_status(95, "Running post-processing scripts");
+		m_print->set_status(95, _utf8(L("Running post-processing scripts")));
 		if (copy_file(m_temp_output_path, source_path.string()) != 0) {
-			throw std::runtime_error("Copying of the temporary G-code to the output G-code failed");
+			throw std::runtime_error(_utf8(L("Copying of the temporary G-code to the output G-code failed")));
 		}
 		run_post_process_scripts(source_path.string(), m_fff_print->config());
 		m_upload_job.upload_data.upload_path = m_fff_print->print_statistics().finalize_output_path(m_upload_job.upload_data.upload_path.string());
-	} else {
-		m_sla_print->export_raster<SLAZipFmt>(source_path.string());
-		// TODO: Also finalize upload path like with FFF when there are statistics for SLA print
+    } else {
+		m_upload_job.upload_data.upload_path = m_sla_print->print_statistics().finalize_output_path(m_upload_job.upload_data.upload_path.string());
+        m_sla_print->export_raster(source_path.string(), m_upload_job.upload_data.upload_path.string());
 	}
 
-	m_print->set_status(100, (boost::format("Scheduling upload to `%1%`. See Window -> Print Host Upload Queue") % m_upload_job.printhost->get_host()).str());
+	m_print->set_status(100, (boost::format(_utf8(L("Scheduling upload to `%1%`. See Window -> Print Host Upload Queue"))) % m_upload_job.printhost->get_host()).str());
 
 	m_upload_job.upload_data.source_path = std::move(source_path);
 
diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp
index 7bbf1ac7f..d471a46c9 100644
--- a/src/slic3r/GUI/BedShapeDialog.cpp
+++ b/src/slic3r/GUI/BedShapeDialog.cpp
@@ -18,6 +18,7 @@ namespace GUI {
 
 void BedShapeDialog::build_dialog(ConfigOptionPoints* default_pt)
 {
+    SetFont(wxGetApp().normal_font());
 	m_panel = new BedShapePanel(this);
 	m_panel->build_panel(default_pt);
 
@@ -36,6 +37,22 @@ void BedShapeDialog::build_dialog(ConfigOptionPoints* default_pt)
 	}));
 }
 
+void BedShapeDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    const int& em = em_unit();
+    m_panel->m_shape_options_book->SetMinSize(wxSize(25 * em, -1));
+
+    for (auto og : m_panel->m_optgroups)
+        og->msw_rescale();
+
+    const wxSize& size = wxSize(50 * em, -1);
+
+    SetMinSize(size);
+    SetSize(size);
+
+    Refresh();
+}
+
 void BedShapePanel::build_panel(ConfigOptionPoints* default_pt)
 {
 //  on_change(nullptr);
@@ -51,14 +68,14 @@ void BedShapePanel::build_panel(ConfigOptionPoints* default_pt)
 	auto optgroup = init_shape_options_page(_(L("Rectangular")));
 		ConfigOptionDef def;
 		def.type = coPoints;
-		def.default_value = new ConfigOptionPoints{ Vec2d(200, 200) };
+		def.set_default_value(new ConfigOptionPoints{ Vec2d(200, 200) });
 		def.label = L("Size");
 		def.tooltip = L("Size in X and Y of the rectangular plate.");
 		Option option(def, "rect_size");
 		optgroup->append_single_option_line(option);
 
 		def.type = coPoints;
-		def.default_value = new ConfigOptionPoints{ Vec2d(0, 0) };
+		def.set_default_value(new ConfigOptionPoints{ Vec2d(0, 0) });
 		def.label = L("Origin");
 		def.tooltip = L("Distance of the 0,0 G-code coordinate from the front left corner of the rectangle.");
 		option = Option(def, "rect_origin");
@@ -66,7 +83,7 @@ void BedShapePanel::build_panel(ConfigOptionPoints* default_pt)
 
 		optgroup = init_shape_options_page(_(L("Circular")));
 		def.type = coFloat;
-		def.default_value = new ConfigOptionFloat(200);
+		def.set_default_value(new ConfigOptionFloat(200));
 		def.sidetext = L("mm");
 		def.label = L("Diameter");
 		def.tooltip = L("Diameter of the print bed. It is assumed that origin (0,0) is located in the center.");
@@ -125,7 +142,7 @@ ConfigOptionsGroupShp BedShapePanel::init_shape_options_page(wxString title)
 	ConfigOptionsGroupShp optgroup;
 	optgroup = std::make_shared<ConfigOptionsGroup>(panel, _(L("Settings")));
 
-    optgroup->label_width = 10*wxGetApp().em_unit();//100;
+    optgroup->label_width = 10;
 	optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value) {
 		update_shape();
 	};
@@ -313,7 +330,7 @@ void BedShapePanel::load_stl()
 		model = Model::read_from_file(file_name);
 	}
 	catch (std::exception &e) {
-		auto msg = _(L("Error! ")) + file_name + " : " + e.what() + ".";
+		auto msg = _(L("Error!")) + " " + file_name + " : " + e.what() + ".";
 		show_error(this, msg);
 		exit(1);
 	}
diff --git a/src/slic3r/GUI/BedShapeDialog.hpp b/src/slic3r/GUI/BedShapeDialog.hpp
index 538fccc34..72e50a05d 100644
--- a/src/slic3r/GUI/BedShapeDialog.hpp
+++ b/src/slic3r/GUI/BedShapeDialog.hpp
@@ -16,11 +16,8 @@ namespace GUI {
 using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>;
 class BedShapePanel : public wxPanel
 {
-	wxChoicebook*	m_shape_options_book;
 	Bed_2D*			m_canvas;
 
-	std::vector <ConfigOptionsGroupShp>	m_optgroups;
-
 public:
 	BedShapePanel(wxWindow* parent) : wxPanel(parent, wxID_ANY) {}
 	~BedShapePanel() {}
@@ -35,18 +32,25 @@ public:
 	
 	// Returns the resulting bed shape polygon. This value will be stored to the ini file.
 	std::vector<Vec2d>	GetValue() { return m_canvas->m_bed_shape; }
+
+	wxChoicebook*	m_shape_options_book;
+	std::vector <ConfigOptionsGroupShp>	m_optgroups;
+
 };
 
-class BedShapeDialog : public wxDialog
+class BedShapeDialog : public DPIDialog
 {
 	BedShapePanel*	m_panel;
 public:
-	BedShapeDialog(wxWindow* parent) : wxDialog(parent, wxID_ANY, _(L("Bed Shape")),
+	BedShapeDialog(wxWindow* parent) : DPIDialog(parent, wxID_ANY, _(L("Bed Shape")),
         wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {}
 	~BedShapeDialog() {}
 
 	void		build_dialog(ConfigOptionPoints* default_pt);
 	std::vector<Vec2d>	GetValue() { return m_panel->GetValue(); }
+
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
 };
 
 } // GUI
diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp
index 16baa1629..3e8924143 100644
--- a/src/slic3r/GUI/BitmapCache.cpp
+++ b/src/slic3r/GUI/BitmapCache.cpp
@@ -1,5 +1,7 @@
 #include "BitmapCache.hpp"
 
+#include "libslic3r/Utils.hpp"
+
 #if ! defined(WIN32) && ! defined(__APPLE__)
 #define BROKEN_ALPHA
 #endif
@@ -9,24 +11,41 @@
     #include <wx/rawbmp.h>
 #endif /* BROKEN_ALPHA */
 
+#define NANOSVG_IMPLEMENTATION
+#include "nanosvg/nanosvg.h"
+#define NANOSVGRAST_IMPLEMENTATION
+#include "nanosvg/nanosvgrast.h"
+#include "GUI_App.hpp"
+
 namespace Slic3r { namespace GUI {
 
 void BitmapCache::clear()
 {
     for (std::pair<const std::string, wxBitmap*> &bitmap : m_map)
         delete bitmap.second;
+
+    m_map.clear();
 }
 
-static wxBitmap wxImage_to_wxBitmap_with_alpha(wxImage &&image)
+static wxBitmap wxImage_to_wxBitmap_with_alpha(wxImage &&image, float scale = 1.0f)
 {
 #ifdef BROKEN_ALPHA
     wxMemoryOutputStream stream;
     image.SaveFile(stream, wxBITMAP_TYPE_PNG);
     wxStreamBuffer *buf = stream.GetOutputStreamBuffer();
     return wxBitmap::NewFromPNGData(buf->GetBufferStart(), buf->GetBufferSize());
+#else
+#ifdef __APPLE__
+    // This is a c-tor native to Mac OS. We need to let the Mac OS wxBitmap implementation
+    // know that the image may already be scaled appropriately for Retina,
+    // and thereby that it's not supposed to upscale it.
+    // Contrary to intuition, the `scale` argument isn't "please scale this to such and such"
+    // but rather "the wxImage is sized for backing scale such and such".
+    return wxBitmap(std::move(image), -1, scale);
 #else
     return wxBitmap(std::move(image));
 #endif
+#endif
 }
 
 wxBitmap* BitmapCache::insert(const std::string &bitmap_key, size_t width, size_t height)
@@ -155,6 +174,102 @@ wxBitmap* BitmapCache::insert(const std::string &bitmap_key, const wxBitmap *beg
 #endif
 }
 
+wxBitmap* BitmapCache::insert_raw_rgba(const std::string &bitmap_key, unsigned width, unsigned height, const unsigned char *raw_data, float scale /* = 1.0f */, const bool grayscale/* = false*/)
+{
+    wxImage image(width, height);
+    image.InitAlpha();
+    unsigned char *rgb   = image.GetData();
+    unsigned char *alpha = image.GetAlpha();
+    unsigned int pixels = width * height;
+    for (unsigned int i = 0; i < pixels; ++ i) {
+        *rgb   ++ = *raw_data ++;
+        *rgb   ++ = *raw_data ++;
+        *rgb   ++ = *raw_data ++;
+        *alpha ++ = *raw_data ++;
+    }
+
+    if (grayscale)
+        image = image.ConvertToGreyscale(m_gs, m_gs, m_gs);
+
+    return this->insert(bitmap_key, wxImage_to_wxBitmap_with_alpha(std::move(image), scale));
+}
+
+wxBitmap* BitmapCache::load_png(const std::string &bitmap_name, unsigned int width, unsigned int height, 
+    const bool grayscale/* = false*/)
+{
+    std::string bitmap_key = bitmap_name + ( height !=0 ? 
+                                           "-h" + std::to_string(height) : 
+                                           "-w" + std::to_string(width))
+                                         + (grayscale ? "-gs" : "");
+
+    auto it = m_map.find(bitmap_key);
+    if (it != m_map.end())
+        return it->second;
+
+    wxImage image;
+    if (! image.LoadFile(Slic3r::GUI::from_u8(Slic3r::var(bitmap_name + ".png")), wxBITMAP_TYPE_PNG) ||
+        image.GetWidth() == 0 || image.GetHeight() == 0)
+        return nullptr;
+
+    if (height != 0 && image.GetHeight() != height)
+        width   = int(0.5f + float(image.GetWidth()) * height / image.GetHeight());
+    else if (width != 0 && image.GetWidth() != width)
+        height  = int(0.5f + float(image.GetHeight()) * width / image.GetWidth());
+
+    if (height != 0 && width != 0)
+        image.Rescale(width, height, wxIMAGE_QUALITY_BILINEAR);
+
+    if (grayscale)
+        image = image.ConvertToGreyscale(m_gs, m_gs, m_gs);
+
+    return this->insert(bitmap_key, wxImage_to_wxBitmap_with_alpha(std::move(image)));
+}
+
+wxBitmap* BitmapCache::load_svg(const std::string &bitmap_name, unsigned target_width, unsigned target_height, 
+    float scale /* = 1.0f */, const bool grayscale/* = false*/)
+{
+    std::string bitmap_key = bitmap_name + ( target_height !=0 ? 
+                                           "-h" + std::to_string(target_height) : 
+                                           "-w" + std::to_string(target_width))
+                                         + (scale != 1.0f ? "-s" + std::to_string(scale) : "")
+                                         + (grayscale ? "-gs" : "");
+
+    target_height != 0 ? target_height *= scale : target_width *= scale;
+
+    auto it = m_map.find(bitmap_key);
+    if (it != m_map.end())
+        return it->second;
+
+    NSVGimage *image = ::nsvgParseFromFile(Slic3r::var(bitmap_name + ".svg").c_str(), "px", 96.0f);
+    if (image == nullptr)
+        return nullptr;
+
+    float svg_scale = target_height != 0 ? 
+                  (float)target_height / image->height  : target_width != 0 ?
+                  (float)target_width / image->width    : 1;
+
+    int   width    = (int)(svg_scale * image->width + 0.5f);
+    int   height   = (int)(svg_scale * image->height + 0.5f);
+    int   n_pixels = width * height;
+    if (n_pixels <= 0) {
+        ::nsvgDelete(image);
+        return nullptr;
+    }
+
+    NSVGrasterizer *rast = ::nsvgCreateRasterizer();
+    if (rast == nullptr) {
+        ::nsvgDelete(image);
+        return nullptr;
+    }
+
+    std::vector<unsigned char> data(n_pixels * 4, 0);
+    ::nsvgRasterize(rast, image, 0, 0, svg_scale, data.data(), width, height, width * 4);
+    ::nsvgDeleteRasterizer(rast);
+    ::nsvgDelete(image);
+
+    return this->insert_raw_rgba(bitmap_key, width, height, data.data(), scale, grayscale);
+}
+
 wxBitmap BitmapCache::mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency)
 {
     wxImage image(width, height);
diff --git a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp
index 0cb70d28b..10ce3299e 100644
--- a/src/slic3r/GUI/BitmapCache.hpp
+++ b/src/slic3r/GUI/BitmapCache.hpp
@@ -29,6 +29,12 @@ public:
 	wxBitmap* 		insert(const std::string &name, const wxBitmap &bmp, const wxBitmap &bmp2, const wxBitmap &bmp3);
 	wxBitmap* 		insert(const std::string &name, const std::vector<wxBitmap> &bmps) { return this->insert(name, &bmps.front(), &bmps.front() + bmps.size()); }
 	wxBitmap* 		insert(const std::string &name, const wxBitmap *begin, const wxBitmap *end);
+	wxBitmap* 		insert_raw_rgba(const std::string &bitmap_key, unsigned width, unsigned height, const unsigned char *raw_data, float scale = 1.0f, const bool grayscale = false);
+
+	// Load png from resources/icons. bitmap_key is given without the .png suffix. Bitmap will be rescaled to provided height/width if nonzero.
+    wxBitmap* 		load_png(const std::string &bitmap_key, unsigned int width = 0, unsigned int height = 0, const bool grayscale = false);
+	// Load svg from resources/icons. bitmap_key is given without the .svg suffix. SVG will be rasterized to provided height/width.
+    wxBitmap* 		load_svg(const std::string &bitmap_key, unsigned int width = 0, unsigned int height = 0, float scale = 1.0f, const bool grayscale = false);
 
 	static wxBitmap mksolid(size_t width, size_t height, unsigned char r, unsigned char g, unsigned char b, unsigned char transparency);
 	static wxBitmap mksolid(size_t width, size_t height, const unsigned char rgb[3]) { return mksolid(width, height, rgb[0], rgb[1], rgb[2], wxALPHA_OPAQUE); }
@@ -36,6 +42,7 @@ public:
 
 private:
     std::map<std::string, wxBitmap*>	m_map;
+    double m_gs = 0.2; // value, used for image.ConvertToGreyscale(m_gs, m_gs, m_gs)
 };
 
 } // GUI
diff --git a/src/slic3r/GUI/ButtonsDescription.cpp b/src/slic3r/GUI/ButtonsDescription.cpp
index fb4c24286..0610199f5 100644
--- a/src/slic3r/GUI/ButtonsDescription.cpp
+++ b/src/slic3r/GUI/ButtonsDescription.cpp
@@ -7,13 +7,14 @@
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "I18N.hpp"
+#include "wxExtensions.hpp"
 
 namespace Slic3r {
 namespace GUI {
 
-ButtonsDescription::ButtonsDescription(wxWindow* parent, t_icon_descriptions* icon_descriptions) :
+ButtonsDescription::ButtonsDescription(wxWindow* parent, const std::vector<Entry> &entries) :
 	wxDialog(parent, wxID_ANY, _(L("Buttons And Text Colors Description")), wxDefaultPosition, wxDefaultSize),
-	m_icon_descriptions(icon_descriptions)
+	m_entries(entries)
 {
 	auto grid_sizer = new wxFlexGridSizer(3, 20, 20);
 
@@ -21,18 +22,13 @@ ButtonsDescription::ButtonsDescription(wxWindow* parent, t_icon_descriptions* ic
 	main_sizer->Add(grid_sizer, 0, wxEXPAND | wxALL, 20);
 
 	// Icon description
-	for (auto pair : *m_icon_descriptions)
+	for (const Entry &entry : m_entries)
 	{
-		auto icon = new wxStaticBitmap(this, wxID_ANY, *pair.first);
+		auto icon = new wxStaticBitmap(this, wxID_ANY, entry.bitmap->bmp());
 		grid_sizer->Add(icon, -1, wxALIGN_CENTRE_VERTICAL);
-
-		std::istringstream f(pair.second);
-		std::string s;
-		getline(f, s, ';');
-		auto description = new wxStaticText(this, wxID_ANY, _(s));
+		auto description = new wxStaticText(this, wxID_ANY, _(entry.symbol));
 		grid_sizer->Add(description, -1, wxALIGN_CENTRE_VERTICAL);
-		getline(f, s, ';');
-		description = new wxStaticText(this, wxID_ANY, _(s));
+		description = new wxStaticText(this, wxID_ANY, _(entry.explanation));
 		grid_sizer->Add(description, -1, wxALIGN_CENTRE_VERTICAL | wxEXPAND);
 	}
 
diff --git a/src/slic3r/GUI/ButtonsDescription.hpp b/src/slic3r/GUI/ButtonsDescription.hpp
index 81baaf191..5ca74290a 100644
--- a/src/slic3r/GUI/ButtonsDescription.hpp
+++ b/src/slic3r/GUI/ButtonsDescription.hpp
@@ -4,19 +4,27 @@
 #include <wx/dialog.h>
 #include <vector>
 
+class ScalableBitmap;
+
 namespace Slic3r {
 namespace GUI {
 
-using t_icon_descriptions = std::vector<std::pair<wxBitmap*, std::string>>;
-
 class ButtonsDescription : public wxDialog
 {
-	t_icon_descriptions* m_icon_descriptions;
 public:
-	ButtonsDescription(wxWindow* parent, t_icon_descriptions* icon_descriptions);
+	struct Entry {
+		Entry(ScalableBitmap *bitmap, const std::string &symbol, const std::string &explanation) : bitmap(bitmap), symbol(symbol), explanation(explanation) {}
+
+		ScalableBitmap *bitmap;
+		std::string     symbol;
+		std::string   	explanation;
+	};
+
+	ButtonsDescription(wxWindow* parent, const std::vector<Entry> &entries);
 	~ButtonsDescription() {}
 
-
+private:
+	std::vector<Entry> m_entries;
 };
 
 } // GUI
diff --git a/src/slic3r/GUI/Camera.cpp b/src/slic3r/GUI/Camera.cpp
index c748efa64..dd6cbefe1 100644
--- a/src/slic3r/GUI/Camera.cpp
+++ b/src/slic3r/GUI/Camera.cpp
@@ -1,9 +1,21 @@
 #include "libslic3r/libslic3r.h"
 
 #include "Camera.hpp"
+#include "3DScene.hpp"
+
+#include <GL/glew.h>
 
 static const float GIMBALL_LOCK_THETA_MAX = 180.0f;
 
+// phi / theta angles to orient the camera.
+static const float VIEW_DEFAULT[2] = { 45.0f, 45.0f };
+static const float VIEW_LEFT[2] = { 90.0f, 90.0f };
+static const float VIEW_RIGHT[2] = { -90.0f, 90.0f };
+static const float VIEW_TOP[2] = { 0.0f, 0.0f };
+static const float VIEW_BOTTOM[2] = { 0.0f, 180.0f };
+static const float VIEW_FRONT[2] = { 0.0f, 90.0f };
+static const float VIEW_REAR[2] = { 180.0f, 90.0f };
+
 namespace Slic3r {
 namespace GUI {
 
@@ -13,6 +25,7 @@ Camera::Camera()
     , phi(45.0f)
 //    , distance(0.0f)
     , requires_zoom_to_bed(false)
+    , inverted_phi(false)
     , m_theta(45.0f)
     , m_target(Vec3d::Zero())
 {
@@ -57,6 +70,64 @@ void Camera::set_scene_box(const BoundingBoxf3& box)
     m_scene_box = box;
 }
 
+bool Camera::select_view(const std::string& direction)
+{
+    const float* dir_vec = nullptr;
+
+    if (direction == "iso")
+        dir_vec = VIEW_DEFAULT;
+    else if (direction == "left")
+        dir_vec = VIEW_LEFT;
+    else if (direction == "right")
+        dir_vec = VIEW_RIGHT;
+    else if (direction == "top")
+        dir_vec = VIEW_TOP;
+    else if (direction == "bottom")
+        dir_vec = VIEW_BOTTOM;
+    else if (direction == "front")
+        dir_vec = VIEW_FRONT;
+    else if (direction == "rear")
+        dir_vec = VIEW_REAR;
+
+    if (dir_vec != nullptr)
+    {
+        phi = dir_vec[0];
+        set_theta(dir_vec[1], false);
+        return true;
+    }
+    else
+        return false;
+}
+
+void Camera::apply_viewport(int x, int y, unsigned int w, unsigned int h) const
+{
+    glsafe(::glViewport(0, 0, w, h));
+    glsafe(::glGetIntegerv(GL_VIEWPORT, m_viewport.data()));
+}
+
+void Camera::apply_view_matrix() const
+{
+    glsafe(::glMatrixMode(GL_MODELVIEW));
+    glsafe(::glLoadIdentity());
+
+    glsafe(::glRotatef(-m_theta, 1.0f, 0.0f, 0.0f)); // pitch
+    glsafe(::glRotatef(phi, 0.0f, 0.0f, 1.0f));          // yaw
+    glsafe(::glTranslated(-m_target(0), -m_target(1), -m_target(2)));
+
+    glsafe(::glGetDoublev(GL_MODELVIEW_MATRIX, m_view_matrix.data()));
+}
+
+void Camera::apply_ortho_projection(float x_min, float x_max, float y_min, float y_max, float z_min, float z_max) const
+{
+    glsafe(::glMatrixMode(GL_PROJECTION));
+    glsafe(::glLoadIdentity());
+
+    glsafe(::glOrtho(x_min, x_max, y_min, y_max, z_min, z_max));
+    glsafe(::glGetDoublev(GL_PROJECTION_MATRIX, m_projection_matrix.data()));
+
+    glsafe(::glMatrixMode(GL_MODELVIEW));
+}
+
 } // GUI
 } // Slic3r
 
diff --git a/src/slic3r/GUI/Camera.hpp b/src/slic3r/GUI/Camera.hpp
index d50dc6e4d..b9c5dfc32 100644
--- a/src/slic3r/GUI/Camera.hpp
+++ b/src/slic3r/GUI/Camera.hpp
@@ -2,6 +2,7 @@
 #define slic3r_Camera_hpp_
 
 #include "libslic3r/BoundingBox.hpp"
+#include <array>
 
 namespace Slic3r {
 namespace GUI {
@@ -21,11 +22,16 @@ struct Camera
     float phi;
 //    float distance;
     bool requires_zoom_to_bed;
+    bool inverted_phi;
 
 private:
     Vec3d m_target;
     float m_theta;
 
+    mutable std::array<int, 4> m_viewport;
+    mutable Transform3d m_view_matrix;
+    mutable Transform3d m_projection_matrix;
+
     BoundingBoxf3 m_scene_box;
 
 public:
@@ -41,6 +47,22 @@ public:
 
     const BoundingBoxf3& get_scene_box() const { return m_scene_box; }
     void set_scene_box(const BoundingBoxf3& box);
+
+    bool select_view(const std::string& direction);
+
+    const std::array<int, 4>& get_viewport() const { return m_viewport; }
+    const Transform3d& get_view_matrix() const { return m_view_matrix; }
+    const Transform3d& get_projection_matrix() const { return m_projection_matrix; }
+
+    Vec3d get_dir_right() const { return m_view_matrix.matrix().block(0, 0, 3, 3).row(0); }
+    Vec3d get_dir_up() const { return m_view_matrix.matrix().block(0, 0, 3, 3).row(1); }
+    Vec3d get_dir_forward() const { return m_view_matrix.matrix().block(0, 0, 3, 3).row(2); }
+
+    Vec3d get_position() const { return m_view_matrix.matrix().block(0, 0, 3, 3).row(3); }
+
+    void apply_viewport(int x, int y, unsigned int w, unsigned int h) const;
+    void apply_view_matrix() const;
+    void apply_ortho_projection(float x_min, float x_max, float y_min, float y_max, float z_min, float z_max) const;
 };
 
 } // GUI
diff --git a/src/slic3r/GUI/ConfigSnapshotDialog.cpp b/src/slic3r/GUI/ConfigSnapshotDialog.cpp
index 205e84f57..f905941f3 100644
--- a/src/slic3r/GUI/ConfigSnapshotDialog.cpp
+++ b/src/slic3r/GUI/ConfigSnapshotDialog.cpp
@@ -6,6 +6,7 @@
 
 #include "libslic3r/Utils.hpp"
 #include "GUI_App.hpp"
+#include "wxExtensions.hpp"
 
 namespace Slic3r { 
 namespace GUI {
@@ -35,7 +36,7 @@ static wxString generate_html_row(const Config::Snapshot &snapshot, bool row_eve
     text += "\">";
     text += "<td>";
     // Format the row header.
-    text += wxString("<font size=\"5\"><b>") + (snapshot_active ? _(L("Active: ")) : "") + 
+    text += wxString("<font size=\"5\"><b>") + (snapshot_active ? _(L("Active")) + ": " : "") + 
         Utils::format_local_date_time(snapshot.time_captured) + ": " + format_reason(snapshot.reason);
     if (! snapshot.comment.empty())
         text += " (" + wxString::FromUTF8(snapshot.comment.data()) + ")";
@@ -66,7 +67,7 @@ static wxString generate_html_row(const Config::Snapshot &snapshot, bool row_eve
     }
 
     if (! compatible) {
-        text += "<p align=\"right\">" + _(L("Incompatible with this Slic3r")) + "</p>";
+        text += "<p align=\"right\">" + wxString::Format(_(L("Incompatible with this %s")), SLIC3R_APP_NAME) + "</p>";
     }
     else if (! snapshot_active)
         text += "<p align=\"right\"><a href=\"" + snapshot.id + "\">" + _(L("Activate")) + "</a></p>";
@@ -95,21 +96,26 @@ static wxString generate_html_page(const Config::SnapshotDB &snapshot_db, const
 }
 
 ConfigSnapshotDialog::ConfigSnapshotDialog(const Config::SnapshotDB &snapshot_db, const wxString &on_snapshot)
-    : wxDialog(NULL, wxID_ANY, _(L("Configuration Snapshots")), wxDefaultPosition, 
+    : DPIDialog(NULL, wxID_ANY, _(L("Configuration Snapshots")), wxDefaultPosition, 
                wxSize(45 * wxGetApp().em_unit(), 40 * wxGetApp().em_unit()), 
                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX)
 {
+    this->SetFont(wxGetApp().normal_font());
     this->SetBackgroundColour(*wxWHITE);
     
     wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL);
     this->SetSizer(vsizer);
 
     // text
-    wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
+    html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
     {
-        wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+        wxFont font = wxGetApp().normal_font();//wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
         #ifdef __WXMSW__
-            int size[] = {8,8,8,8,11,11,11};
+            const int fs = font.GetPointSize();
+            const int fs1 = static_cast<int>(0.8f*fs);
+            const int fs2 = static_cast<int>(1.1f*fs);
+            int size[] = {fs1, fs1, fs1, fs1, fs2, fs2, fs2};
+//             int size[] = {8,8,8,8,11,11,11};
         #else
             int size[] = {11,11,11,11,14,14,14};
         #endif
@@ -127,6 +133,28 @@ ConfigSnapshotDialog::ConfigSnapshotDialog(const Config::SnapshotDB &snapshot_db
     vsizer->Add(buttons, 0, wxEXPAND | wxRIGHT | wxBOTTOM, 3);
 }
 
+void ConfigSnapshotDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    wxFont font = GetFont();
+    const int fs = font.GetPointSize();
+    const int fs1 = static_cast<int>(0.8f*fs);
+    const int fs2 = static_cast<int>(1.1f*fs);
+    int font_size[] = { fs1, fs1, fs1, fs1, fs2, fs2, fs2 };
+
+    html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
+    html->Refresh();
+
+    const int& em = em_unit();
+
+    msw_buttons_rescale(this, em, { wxID_CLOSE});
+
+    const wxSize& size = wxSize(45 * em, 40 * em);
+    SetMinSize(size);
+    Fit();
+
+    Refresh();
+}
+
 void ConfigSnapshotDialog::onLinkClicked(wxHtmlLinkEvent &event)
 {
     m_snapshot_to_activate = event.GetLinkInfo().GetHref();
diff --git a/src/slic3r/GUI/ConfigSnapshotDialog.hpp b/src/slic3r/GUI/ConfigSnapshotDialog.hpp
index f43fb8ed1..9b8b69ecf 100644
--- a/src/slic3r/GUI/ConfigSnapshotDialog.hpp
+++ b/src/slic3r/GUI/ConfigSnapshotDialog.hpp
@@ -2,6 +2,7 @@
 #define slic3r_GUI_ConfigSnapshotDialog_hpp_
 
 #include "GUI.hpp"
+#include "GUI_Utils.hpp"
 
 #include <wx/wx.h>
 #include <wx/intl.h>
@@ -14,18 +15,23 @@ namespace Config {
 	class SnapshotDB;
 }
 
-class ConfigSnapshotDialog : public wxDialog
+class ConfigSnapshotDialog : public DPIDialog
 {
 public:
     ConfigSnapshotDialog(const Config::SnapshotDB &snapshot_db, const wxString &id);
     const std::string& snapshot_to_activate() const { return m_snapshot_to_activate; }
 
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
+
 private:
     void onLinkClicked(wxHtmlLinkEvent &event);
     void onCloseDialog(wxEvent &);
 
     // If set, it contains a snapshot ID to be restored after the dialog closes.
     std::string m_snapshot_to_activate;
+
+    wxHtmlWindow* html;
 };
 
 } // namespace GUI
diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp
index e358ec9ab..657bd136a 100644
--- a/src/slic3r/GUI/ConfigWizard.cpp
+++ b/src/slic3r/GUI/ConfigWizard.cpp
@@ -18,6 +18,7 @@
 #include <wx/dataview.h>
 #include <wx/notebook.h>
 #include <wx/display.h>
+#include <wx/filefn.h>
 #include <wx/debug.h>
 
 #include "libslic3r/Utils.hpp"
@@ -36,10 +37,10 @@ namespace GUI {
 
 struct PrinterPickerEvent : public wxEvent
 {
-	std::string vendor_id;
-	std::string model_id;
-	std::string variant_name;
-	bool enable;
+    std::string vendor_id;
+    std::string model_id;
+    std::string variant_name;
+    bool enable;
 
     PrinterPickerEvent(wxEventType eventType, int winid, std::string vendor_id, std::string model_id, std::string variant_name, bool enable)
         : wxEvent(winid, eventType)
@@ -47,12 +48,12 @@ struct PrinterPickerEvent : public wxEvent
         , model_id(std::move(model_id))
         , variant_name(std::move(variant_name))
         , enable(enable)
-	{}
+    {}
 
-	virtual wxEvent *Clone() const
-	{
-		return new PrinterPickerEvent(*this);
-	}
+    virtual wxEvent *Clone() const
+    {
+        return new PrinterPickerEvent(*this);
+    }
 };
 
 wxDEFINE_EVENT(EVT_PRINTER_PICK, PrinterPickerEvent);
@@ -62,31 +63,37 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
     , vendor_id(vendor.id)
     , width(0)
 {
-	const auto &models = vendor.models;
+    const auto &models = vendor.models;
 
-	auto *sizer = new wxBoxSizer(wxVERTICAL);
+    auto *sizer = new wxBoxSizer(wxVERTICAL);
 
     const auto font_title = GetFont().MakeBold().Scaled(1.3f);
     const auto font_name = GetFont().MakeBold();
     const auto font_alt_nozzle = GetFont().Scaled(0.9f);
 
-	// wxGrid appends widgets by rows, but we need to construct them in columns.
-	// These vectors are used to hold the elements so that they can be appended in the right order.
-	std::vector<wxStaticText*> titles;
-	std::vector<wxStaticBitmap*> bitmaps;
-	std::vector<wxPanel*> variants_panels;
+    // wxGrid appends widgets by rows, but we need to construct them in columns.
+    // These vectors are used to hold the elements so that they can be appended in the right order.
+    std::vector<wxStaticText*> titles;
+    std::vector<wxStaticBitmap*> bitmaps;
+    std::vector<wxPanel*> variants_panels;
 
     int max_row_width = 0;
     int current_row_width = 0;
 
-	for (const auto &model : models) {
+    for (const auto &model : models) {
         if (! filter(model)) { continue; }
 
-		wxBitmap bitmap(GUI::from_u8(Slic3r::var((boost::format("printers/%1%_%2%.png") % vendor.id % model.id).str())), wxBITMAP_TYPE_PNG);
+        wxBitmap bitmap;
+        int bitmap_width = 0;
+        const wxString bitmap_file = GUI::from_u8(Slic3r::var((boost::format("printers/%1%_%2%.png") % vendor.id % model.id).str()));
+        if (wxFileExists(bitmap_file)) {
+            bitmap.LoadFile(bitmap_file, wxBITMAP_TYPE_PNG);
+            bitmap_width = bitmap.GetWidth();
+        }
 
-		auto *title = new wxStaticText(this, wxID_ANY, model.name, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+        auto *title = new wxStaticText(this, wxID_ANY, model.name, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
         title->SetFont(font_name);
-        const int wrap_width = std::max((int)MODEL_MIN_WRAP, bitmap.GetWidth());
+        const int wrap_width = std::max((int)MODEL_MIN_WRAP, bitmap_width);
         title->Wrap(wrap_width);
 
         current_row_width += wrap_width;
@@ -95,15 +102,15 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
             current_row_width = 0;
         }
 
-		titles.push_back(title);
+        titles.push_back(title);
 
-		auto *bitmap_widget = new wxStaticBitmap(this, wxID_ANY, bitmap);
-		bitmaps.push_back(bitmap_widget);
+        auto *bitmap_widget = new wxStaticBitmap(this, wxID_ANY, bitmap);
+        bitmaps.push_back(bitmap_widget);
 
-		auto *variants_panel = new wxPanel(this);
-		auto *variants_sizer = new wxBoxSizer(wxVERTICAL);
-		variants_panel->SetSizer(variants_sizer);
-		const auto model_id = model.id;
+        auto *variants_panel = new wxPanel(this);
+        auto *variants_sizer = new wxBoxSizer(wxVERTICAL);
+        variants_panel->SetSizer(variants_sizer);
+        const auto model_id = model.id;
 
         for (size_t i = 0; i < model.variants.size(); i++) {
             const auto &variant = model.variants[i];
@@ -118,21 +125,21 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
                 variants_sizer->Add(alt_label, 0, wxBOTTOM, 3);
             }
 
-			auto *cbox = new Checkbox(variants_panel, label, model_id, variant.name);
+            auto *cbox = new Checkbox(variants_panel, label, model_id, variant.name);
             i == 0 ? cboxes.push_back(cbox) : cboxes_alt.push_back(cbox);
 
-			bool enabled = appconfig_vendors.get_variant(MAIN_VENDOR, model_id, variant.name);
-			cbox->SetValue(enabled);
+            bool enabled = appconfig_vendors.get_variant(MAIN_VENDOR, model_id, variant.name);
+            cbox->SetValue(enabled);
 
-			variants_sizer->Add(cbox, 0, wxBOTTOM, 3);
+            variants_sizer->Add(cbox, 0, wxBOTTOM, 3);
 
             cbox->Bind(wxEVT_CHECKBOX, [this, cbox](wxCommandEvent &event) {
                 on_checkbox(cbox, event.IsChecked());
-			});
-		}
+            });
+        }
 
-		variants_panels.push_back(variants_panel);
-	}
+        variants_panels.push_back(variants_panel);
+    }
 
     width = std::max(max_row_width, current_row_width);
 
@@ -184,16 +191,19 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
         auto *sel_none = new wxButton(this, wxID_ANY, _(L("None")));
         sel_all_std->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &event) { this->select_all(true, false); });
         sel_all->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &event) { this->select_all(true, true); });
-	sel_none->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &event) { this->select_all(false); });
+        sel_none->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &event) { this->select_all(false); });
         title_sizer->Add(sel_all_std, 0, wxRIGHT, BTN_SPACING);
         title_sizer->Add(sel_all, 0, wxRIGHT, BTN_SPACING);
         title_sizer->Add(sel_none);
+
+        // fill button indexes used later for buttons rescaling
+        m_button_indexes = { sel_all_std->GetId(), sel_all->GetId(), sel_none->GetId() };
     }
 
     sizer->Add(title_sizer, 0, wxEXPAND | wxBOTTOM, BTN_SPACING);
     sizer->Add(printer_grid);
 
-	SetSizer(sizer);
+    SetSizer(sizer);
 }
 
 PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxString title, size_t max_cols, const AppConfig &appconfig_vendors)
@@ -202,12 +212,12 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, wxSt
 
 void PrinterPicker::select_all(bool select, bool alternates)
 {
-	for (const auto &cb : cboxes) {
-		if (cb->GetValue() != select) {
-			cb->SetValue(select);
-			on_checkbox(cb, select);
-		}
-	}
+    for (const auto &cb : cboxes) {
+        if (cb->GetValue() != select) {
+            cb->SetValue(select);
+            on_checkbox(cb, select);
+        }
+    }
 
     if (! select) { alternates = false; }
 
@@ -215,22 +225,22 @@ void PrinterPicker::select_all(bool select, bool alternates)
         if (cb->GetValue() != alternates) {
             cb->SetValue(alternates);
             on_checkbox(cb, alternates);
-}
+        }
     }
 }
 
 void PrinterPicker::select_one(size_t i, bool select)
 {
-	if (i < cboxes.size() && cboxes[i]->GetValue() != select) {
-		cboxes[i]->SetValue(select);
-		on_checkbox(cboxes[i], select);
-	}
+    if (i < cboxes.size() && cboxes[i]->GetValue() != select) {
+        cboxes[i]->SetValue(select);
+        on_checkbox(cboxes[i], select);
+    }
 }
 
 void PrinterPicker::on_checkbox(const Checkbox *cbox, bool checked)
 {
-	PrinterPickerEvent evt(EVT_PRINTER_PICK, GetId(), vendor_id, cbox->model, cbox->variant, checked);
-	AddPendingEvent(evt);
+    PrinterPickerEvent evt(EVT_PRINTER_PICK, GetId(), vendor_id, cbox->model, cbox->variant, checked);
+    AddPendingEvent(evt);
 }
 
 
@@ -242,59 +252,66 @@ ConfigWizardPage::ConfigWizardPage(ConfigWizard *parent, wxString title, wxStrin
     , shortname(std::move(shortname))
     , indent(indent)
 {
-	auto *sizer = new wxBoxSizer(wxVERTICAL);
+    auto *sizer = new wxBoxSizer(wxVERTICAL);
 
-	auto *text = new wxStaticText(this, wxID_ANY, std::move(title), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+    auto *text = new wxStaticText(this, wxID_ANY, std::move(title), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
     const auto font = GetFont().MakeBold().Scaled(1.5);
-	text->SetFont(font);
-	sizer->Add(text, 0, wxALIGN_LEFT, 0);
-	sizer->AddSpacer(10);
+    text->SetFont(font);
+    sizer->Add(text, 0, wxALIGN_LEFT, 0);
+    sizer->AddSpacer(10);
 
-	content = new wxBoxSizer(wxVERTICAL);
-	sizer->Add(content, 1);
+    content = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(content, 1);
 
-	SetSizer(sizer);
+    SetSizer(sizer);
 
-	this->Hide();
+    this->Hide();
 
-	Bind(wxEVT_SIZE, [this](wxSizeEvent &event) {
-		this->Layout();
-		event.Skip();
-	});
+    Bind(wxEVT_SIZE, [this](wxSizeEvent &event) {
+        this->Layout();
+        event.Skip();
+    });
 }
 
 ConfigWizardPage::~ConfigWizardPage() {}
 
 void ConfigWizardPage::append_text(wxString text)
 {
-	auto *widget = new wxStaticText(this, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
-	widget->Wrap(WRAP_WIDTH);
-	widget->SetMinSize(wxSize(WRAP_WIDTH, -1));
-	append(widget);
+    auto *widget = new wxStaticText(this, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+    widget->Wrap(WRAP_WIDTH);
+    widget->SetMinSize(wxSize(WRAP_WIDTH, -1));
+    append(widget);
 }
 
 void ConfigWizardPage::append_spacer(int space)
 {
-	content->AddSpacer(space);
+    content->AddSpacer(space);
 }
 
 
 // Wizard pages
 
 PageWelcome::PageWelcome(ConfigWizard *parent)
-    : ConfigWizardPage(parent, wxString::Format(_(L("Welcome to the Slic3r %s")), ConfigWizard::name()), _(L("Welcome")))
+    : ConfigWizardPage(parent, wxString::Format(
+#ifdef __APPLE__
+            _(L("Welcome to the %s Configuration Assistant"))
+#else
+            _(L("Welcome to the %s Configuration Wizard"))
+#endif
+            , SLIC3R_APP_NAME), _(L("Welcome")))
     , cbox_reset(nullptr)
 {
-	if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) {
-		wxString::Format(_(L("Run %s")), ConfigWizard::name());
-		append_text(wxString::Format(
-			_(L("Hello, welcome to Slic3r++ (fork of Slic3r Slic3r++)! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
-			ConfigWizard::name())
-		);
-	} else {
-		cbox_reset = new wxCheckBox(this, wxID_ANY, _(L("Remove user profiles - install from scratch (a snapshot will be taken beforehand)")));
-		append(cbox_reset);
-	}
+    if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) {
+        wxString::Format(_(L("Run %s")), ConfigWizard::name());
+        append_text(wxString::Format(
+            _(L("Hello, welcome to %s! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
+            SLIC3R_APP_NAME,
+            ConfigWizard::name())
+        );
+    } else {
+        cbox_reset = new wxCheckBox(this, wxID_ANY, _(L("Remove user profiles - install from scratch (a snapshot will be taken beforehand)")));
+        append(cbox_reset);
+    }
 
     Show();
 }
@@ -307,9 +324,9 @@ PagePrinters::PagePrinters(ConfigWizard *parent, wxString title, wxString shortn
         COL_SIZE = 200,
     };
 
-    bool check_first_variant = wizard_p()->check_first_variant();
+    bool check_first_variant = technology == PrinterTechnology::ptFFF && wizard_p()->check_first_variant();
 
-		AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
+    AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
 
     const auto families = vendor.families();
     for (const auto &family : families) {
@@ -325,21 +342,21 @@ PagePrinters::PagePrinters(ConfigWizard *parent, wxString title, wxString shortn
         const auto picker_title = family.empty() ? wxString() : wxString::Format(_(L("%s Family")), family);
         auto *picker = new PrinterPicker(this, vendor, picker_title, MAX_COLS, appconfig_vendors, filter);
 
-		if (check_first_variant) {
-			// Select the default (first) model/variant on the Prusa vendor
+        if (check_first_variant) {
+            // Select the default (first) model/variant on the Prusa vendor
             picker->select_one(0, true);
             check_first_variant = false;
-		}
+        }
 
         picker->Bind(EVT_PRINTER_PICK, [this, &appconfig_vendors](const PrinterPickerEvent &evt) {
-			appconfig_vendors.set_variant(evt.vendor_id, evt.model_id, evt.variant_name, evt.enable);
-		});
+            appconfig_vendors.set_variant(evt.vendor_id, evt.model_id, evt.variant_name, evt.enable);
+        });
 
         append(new wxStaticLine(this));
 
         append(picker);
         printer_pickers.push_back(picker);
-	}
+    }
 }
 
 void PagePrinters::select_all(bool select, bool alternates)
@@ -372,7 +389,7 @@ PageCustom::PageCustom(ConfigWizard *parent)
             else { tc_profile_name->SetValue(profile_name_prev); }
         } else {
             profile_name_prev = tc_profile_name->GetValue();
-}
+        }
         evt.Skip();
     });
 
@@ -391,78 +408,84 @@ PageUpdate::PageUpdate(ConfigWizard *parent)
     , version_check(true)
     , preset_update(true)
 {
-	const AppConfig *app_config = GUI::get_app_config();
-	auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-	boldfont.SetWeight(wxFONTWEIGHT_BOLD);
+    const AppConfig *app_config = GUI::get_app_config();
+    auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    boldfont.SetWeight(wxFONTWEIGHT_BOLD);
 
-	auto *box_slic3r = new wxCheckBox(this, wxID_ANY, _(L("Check for application updates")));
-	box_slic3r->SetValue(app_config->get("version_check") == "1");
-	append(box_slic3r);
-	append_text(_(L("If enabled, Slic3r checks for new versions of Slic3r PE 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.")));
+    auto *box_slic3r = new wxCheckBox(this, wxID_ANY, _(L("Check for application updates")));
+    box_slic3r->SetValue(app_config->get("version_check") == "1");
+    append(box_slic3r);
+    append_text(wxString::Format(_(L(
+        "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.")), SLIC3R_APP_NAME));
 
-	append_spacer(VERTICAL_SPACING);
+    append_spacer(VERTICAL_SPACING);
 
-	auto *box_presets = new wxCheckBox(this, wxID_ANY, _(L("Update built-in Presets automatically")));
-	box_presets->SetValue(app_config->get("preset_update") == "1");
-	append(box_presets);
-	append_text(_(L("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.")));
-	const auto text_bold = _(L("Updates are never applied without user's consent and never overwrite user's customized settings."));
-	auto *label_bold = new wxStaticText(this, wxID_ANY, text_bold);
-	label_bold->SetFont(boldfont);
-	label_bold->Wrap(WRAP_WIDTH);
-	append(label_bold);
-	append_text(_(L("Additionally a backup snapshot of the whole configuration is created before an update is applied.")));
+    auto *box_presets = new wxCheckBox(this, wxID_ANY, _(L("Update built-in Presets automatically")));
+    box_presets->SetValue(app_config->get("preset_update") == "1");
+    append(box_presets);
+    append_text(wxString::Format(_(L(
+        "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.")), SLIC3R_APP_NAME));
+    const auto text_bold = _(L("Updates are never applied without user's consent and never overwrite user's customized settings."));
+    auto *label_bold = new wxStaticText(this, wxID_ANY, text_bold);
+    label_bold->SetFont(boldfont);
+    label_bold->Wrap(WRAP_WIDTH);
+    append(label_bold);
+    append_text(_(L("Additionally a backup snapshot of the whole configuration is created before an update is applied.")));
 
-	box_slic3r->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent &event) { this->version_check = event.IsChecked(); });
-	box_presets->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent &event) { this->preset_update = event.IsChecked(); });
+    box_slic3r->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent &event) { this->version_check = event.IsChecked(); });
+    box_presets->Bind(wxEVT_CHECKBOX, [this](wxCommandEvent &event) { this->preset_update = event.IsChecked(); });
 }
 
 PageVendors::PageVendors(ConfigWizard *parent)
     : ConfigWizardPage(parent, _(L("Other Vendors")), _(L("Other Vendors")))
 {
-	append_text(_(L("Pick another vendor supported by Slic3r++:")));
+    append_text(wxString::Format(_(L("Pick another vendor supported by %s:")), SLIC3R_APP_NAME));
 
-	auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-	boldfont.SetWeight(wxFONTWEIGHT_BOLD);
+    auto boldfont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    boldfont.SetWeight(wxFONTWEIGHT_BOLD);
 
-	AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
-	wxArrayString choices_vendors;
+    AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
+    wxArrayString choices_vendors;
 
-	for (const auto vendor_pair : wizard_p()->vendors) {
-		const auto &vendor = vendor_pair.second;
-		if (vendor.id == MAIN_VENDOR) { continue; }
+    for (const auto vendor_pair : wizard_p()->vendors) {
+        const auto &vendor = vendor_pair.second;
+        if (vendor.id == MAIN_VENDOR) { continue; }
 
         auto *picker = new PrinterPicker(this, vendor, "", MAX_COLS, appconfig_vendors);
-		picker->Hide();
-		pickers.push_back(picker);
-		choices_vendors.Add(vendor.name);
+        picker->Hide();
+        pickers.push_back(picker);
+        choices_vendors.Add(vendor.name);
 
-		picker->Bind(EVT_PRINTER_PICK, [this, &appconfig_vendors](const PrinterPickerEvent &evt) {
-			appconfig_vendors.set_variant(evt.vendor_id, evt.model_id, evt.variant_name, evt.enable);
-		});
-	}
+        picker->Bind(EVT_PRINTER_PICK, [this, &appconfig_vendors](const PrinterPickerEvent &evt) {
+            appconfig_vendors.set_variant(evt.vendor_id, evt.model_id, evt.variant_name, evt.enable);
+        });
+    }
 
-	auto *vendor_picker = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices_vendors);
-	if (choices_vendors.GetCount() > 0) {
-		vendor_picker->SetSelection(0);
-		on_vendor_pick(0);
-	}
+    auto *vendor_picker = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices_vendors);
+    if (choices_vendors.GetCount() > 0) {
+        vendor_picker->SetSelection(0);
+        on_vendor_pick(0);
+    }
 
-	vendor_picker->Bind(wxEVT_CHOICE, [this](wxCommandEvent &evt) {
-		this->on_vendor_pick(evt.GetInt());
-	});
+    vendor_picker->Bind(wxEVT_CHOICE, [this](wxCommandEvent &evt) {
+        this->on_vendor_pick(evt.GetInt());
+    });
 
-	append(vendor_picker);
+    append(vendor_picker);
     for (PrinterPicker *picker : pickers) { this->append(picker); }
 }
 
 void PageVendors::on_vendor_pick(size_t i)
 {
-	for (PrinterPicker *picker : pickers) { picker->Hide(); }
-	if (i < pickers.size()) {
-		pickers[i]->Show();
+    for (PrinterPicker *picker : pickers) { picker->Hide(); }
+    if (i < pickers.size()) {
+        pickers[i]->Show();
         parent->Layout();
-	}
+    }
 }
 
 PageFirmware::PageFirmware(ConfigWizard *parent)
@@ -470,54 +493,54 @@ PageFirmware::PageFirmware(ConfigWizard *parent)
     , gcode_opt(*print_config_def.get("gcode_flavor"))
     , gcode_picker(nullptr)
 {
-	append_text(_(L("Choose the type of firmware used by your printer.")));
-	append_text(gcode_opt.tooltip);
+    append_text(_(L("Choose the type of firmware used by your printer.")));
+    append_text(_(gcode_opt.tooltip));
 
-	wxArrayString choices;
-	choices.Alloc(gcode_opt.enum_labels.size());
-	for (const auto &label : gcode_opt.enum_labels) {
-		choices.Add(label);
-	}
+    wxArrayString choices;
+    choices.Alloc(gcode_opt.enum_labels.size());
+    for (const auto &label : gcode_opt.enum_labels) {
+        choices.Add(label);
+    }
 
-	gcode_picker = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices);
-	const auto &enum_values = gcode_opt.enum_values;
-	auto needle = enum_values.cend();
-	if (gcode_opt.default_value != nullptr) {
-		needle = std::find(enum_values.cbegin(), enum_values.cend(), gcode_opt.default_value->serialize());
-	}
-	if (needle != enum_values.cend()) {
-		gcode_picker->SetSelection(needle - enum_values.cbegin());
-	} else {
-		gcode_picker->SetSelection(0);
-	}
+    gcode_picker = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices);
+    const auto &enum_values = gcode_opt.enum_values;
+    auto needle = enum_values.cend();
+    if (gcode_opt.default_value) {
+        needle = std::find(enum_values.cbegin(), enum_values.cend(), gcode_opt.default_value->serialize());
+    }
+    if (needle != enum_values.cend()) {
+        gcode_picker->SetSelection(needle - enum_values.cbegin());
+    } else {
+        gcode_picker->SetSelection(0);
+    }
 
-	append(gcode_picker);
+    append(gcode_picker);
 }
 
 void PageFirmware::apply_custom_config(DynamicPrintConfig &config)
 {
-	auto sel = gcode_picker->GetSelection();
+    auto sel = gcode_picker->GetSelection();
     if (sel >= 0 && (size_t)sel < gcode_opt.enum_labels.size()) {
-		auto *opt = new ConfigOptionEnum<GCodeFlavor>(static_cast<GCodeFlavor>(sel));
-		config.set_key_value("gcode_flavor", opt);
-	}
+        auto *opt = new ConfigOptionEnum<GCodeFlavor>(static_cast<GCodeFlavor>(sel));
+        config.set_key_value("gcode_flavor", opt);
+    }
 }
 
 PageBedShape::PageBedShape(ConfigWizard *parent)
     : ConfigWizardPage(parent, _(L("Bed Shape and Size")), _(L("Bed Shape")), 1)
     , shape_panel(new BedShapePanel(this))
 {
-	append_text(_(L("Set the shape of your printer's bed.")));
+    append_text(_(L("Set the shape of your printer's bed.")));
 
-	shape_panel->build_panel(wizard_p()->custom_config->option<ConfigOptionPoints>("bed_shape"));
-	append(shape_panel);
+    shape_panel->build_panel(wizard_p()->custom_config->option<ConfigOptionPoints>("bed_shape"));
+    append(shape_panel);
 }
 
 void PageBedShape::apply_custom_config(DynamicPrintConfig &config)
 {
-	const auto points(shape_panel->GetValue());
-	auto *opt = new ConfigOptionPoints(points);
-	config.set_key_value("bed_shape", opt);
+    const auto points(shape_panel->GetValue());
+    auto *opt = new ConfigOptionPoints(points);
+    config.set_key_value("bed_shape", opt);
 }
 
 PageDiameters::PageDiameters(ConfigWizard *parent)
@@ -525,50 +548,64 @@ PageDiameters::PageDiameters(ConfigWizard *parent)
     , spin_nozzle(new wxSpinCtrlDouble(this, wxID_ANY))
     , spin_filam(new wxSpinCtrlDouble(this, wxID_ANY))
 {
-	spin_nozzle->SetDigits(2);
-	spin_nozzle->SetIncrement(0.1);
-	const auto &def_nozzle = *print_config_def.get("nozzle_diameter");
-	auto *default_nozzle = dynamic_cast<const ConfigOptionFloats*>(def_nozzle.default_value);
-	spin_nozzle->SetValue(default_nozzle != nullptr && default_nozzle->size() > 0 ? default_nozzle->get_at(0) : 0.5);
+    spin_nozzle->SetDigits(2);
+    spin_nozzle->SetIncrement(0.1);
+    auto *default_nozzle = print_config_def.get("nozzle_diameter")->get_default_value<ConfigOptionFloats>();
+    spin_nozzle->SetValue(default_nozzle != nullptr && default_nozzle->size() > 0 ? default_nozzle->get_at(0) : 0.5);
 
-	spin_filam->SetDigits(2);
-	spin_filam->SetIncrement(0.25);
-	const auto &def_filam = *print_config_def.get("filament_diameter");
-	auto *default_filam = dynamic_cast<const ConfigOptionFloats*>(def_filam.default_value);
-	spin_filam->SetValue(default_filam != nullptr && default_filam->size() > 0 ? default_filam->get_at(0) : 3.0);
+    spin_filam->SetDigits(2);
+    spin_filam->SetIncrement(0.25);
+    auto *default_filam = print_config_def.get("filament_diameter")->get_default_value<ConfigOptionFloats>();
+    spin_filam->SetValue(default_filam != nullptr && default_filam->size() > 0 ? default_filam->get_at(0) : 3.0);
 
-	append_text(_(L("Enter the diameter of your printer's hot end nozzle.")));
+    append_text(_(L("Enter the diameter of your printer's hot end nozzle.")));
 
-	auto *sizer_nozzle = new wxFlexGridSizer(3, 5, 5);
-	auto *text_nozzle = new wxStaticText(this, wxID_ANY, _(L("Nozzle Diameter:")));
-	auto *unit_nozzle = new wxStaticText(this, wxID_ANY, _(L("mm")));
-	sizer_nozzle->AddGrowableCol(0, 1);
-	sizer_nozzle->Add(text_nozzle, 0, wxALIGN_CENTRE_VERTICAL);
-	sizer_nozzle->Add(spin_nozzle);
-	sizer_nozzle->Add(unit_nozzle, 0, wxALIGN_CENTRE_VERTICAL);
-	append(sizer_nozzle);
+    auto *sizer_nozzle = new wxFlexGridSizer(3, 5, 5);
+    auto *text_nozzle = new wxStaticText(this, wxID_ANY, _(L("Nozzle Diameter:")));
+    auto *unit_nozzle = new wxStaticText(this, wxID_ANY, _(L("mm")));
+    sizer_nozzle->AddGrowableCol(0, 1);
+    sizer_nozzle->Add(text_nozzle, 0, wxALIGN_CENTRE_VERTICAL);
+    sizer_nozzle->Add(spin_nozzle);
+    sizer_nozzle->Add(unit_nozzle, 0, wxALIGN_CENTRE_VERTICAL);
+    append(sizer_nozzle);
 
-	append_spacer(VERTICAL_SPACING);
+    append_spacer(VERTICAL_SPACING);
 
-	append_text(_(L("Enter the diameter of your filament.")));
-	append_text(_(L("Good precision is required, so use a caliper and do multiple measurements along the filament, then compute the average.")));
+    append_text(_(L("Enter the diameter of your filament.")));
+    append_text(_(L("Good precision is required, so use a caliper and do multiple measurements along the filament, then compute the average.")));
 
-	auto *sizer_filam = new wxFlexGridSizer(3, 5, 5);
-	auto *text_filam = new wxStaticText(this, wxID_ANY, _(L("Filament Diameter:")));
-	auto *unit_filam = new wxStaticText(this, wxID_ANY, _(L("mm")));
-	sizer_filam->AddGrowableCol(0, 1);
-	sizer_filam->Add(text_filam, 0, wxALIGN_CENTRE_VERTICAL);
-	sizer_filam->Add(spin_filam);
-	sizer_filam->Add(unit_filam, 0, wxALIGN_CENTRE_VERTICAL);
-	append(sizer_filam);
+    auto *sizer_filam = new wxFlexGridSizer(3, 5, 5);
+    auto *text_filam = new wxStaticText(this, wxID_ANY, _(L("Filament Diameter:")));
+    auto *unit_filam = new wxStaticText(this, wxID_ANY, _(L("mm")));
+    sizer_filam->AddGrowableCol(0, 1);
+    sizer_filam->Add(text_filam, 0, wxALIGN_CENTRE_VERTICAL);
+    sizer_filam->Add(spin_filam);
+    sizer_filam->Add(unit_filam, 0, wxALIGN_CENTRE_VERTICAL);
+    append(sizer_filam);
 }
 
 void PageDiameters::apply_custom_config(DynamicPrintConfig &config)
 {
-	auto *opt_nozzle = new ConfigOptionFloats(1, spin_nozzle->GetValue());
-	config.set_key_value("nozzle_diameter", opt_nozzle);
-	auto *opt_filam = new ConfigOptionFloats(1, spin_filam->GetValue());
-	config.set_key_value("filament_diameter", opt_filam);
+    auto *opt_nozzle = new ConfigOptionFloats(1, spin_nozzle->GetValue());
+    config.set_key_value("nozzle_diameter", opt_nozzle);
+    auto *opt_filam = new ConfigOptionFloats(1, spin_filam->GetValue());
+    config.set_key_value("filament_diameter", opt_filam);
+
+    auto set_extrusion_width = [&config, opt_nozzle](const char *key, double dmr) {
+        char buf[64];
+        sprintf(buf, "%.2lf", dmr * opt_nozzle->values.front() / 0.4);
+		config.set_key_value(key, new ConfigOptionFloatOrPercent(atof(buf), false));
+	};
+
+    set_extrusion_width("support_material_extrusion_width",   0.35);
+	set_extrusion_width("top_infill_extrusion_width",		  0.40);
+	set_extrusion_width("first_layer_extrusion_width",		  0.42);
+
+	set_extrusion_width("extrusion_width",					  0.45);
+	set_extrusion_width("perimeter_extrusion_width",		  0.45);
+	set_extrusion_width("external_perimeter_extrusion_width", 0.45);
+	set_extrusion_width("infill_extrusion_width",			  0.45);
+	set_extrusion_width("solid_infill_extrusion_width",       0.45);
 }
 
 PageTemperatures::PageTemperatures(ConfigWizard *parent)
@@ -576,55 +613,55 @@ PageTemperatures::PageTemperatures(ConfigWizard *parent)
     , spin_extr(new wxSpinCtrlDouble(this, wxID_ANY))
     , spin_bed(new wxSpinCtrlDouble(this, wxID_ANY))
 {
-	spin_extr->SetIncrement(5.0);
-	const auto &def_extr = *print_config_def.get("temperature");
-	spin_extr->SetRange(def_extr.min, def_extr.max);
-	auto *default_extr = dynamic_cast<const ConfigOptionInts*>(def_extr.default_value);
-	spin_extr->SetValue(default_extr != nullptr && default_extr->size() > 0 ? default_extr->get_at(0) : 200);
+    spin_extr->SetIncrement(5.0);
+    const auto &def_extr = *print_config_def.get("temperature");
+    spin_extr->SetRange(def_extr.min, def_extr.max);
+    auto *default_extr = def_extr.get_default_value<ConfigOptionInts>();
+    spin_extr->SetValue(default_extr != nullptr && default_extr->size() > 0 ? default_extr->get_at(0) : 200);
 
-	spin_bed->SetIncrement(5.0);
-	const auto &def_bed = *print_config_def.get("bed_temperature");
-	spin_bed->SetRange(def_bed.min, def_bed.max);
-	auto *default_bed = dynamic_cast<const ConfigOptionInts*>(def_bed.default_value);
-	spin_bed->SetValue(default_bed != nullptr && default_bed->size() > 0 ? default_bed->get_at(0) : 0);
+    spin_bed->SetIncrement(5.0);
+    const auto &def_bed = *print_config_def.get("bed_temperature");
+    spin_bed->SetRange(def_bed.min, def_bed.max);
+    auto *default_bed = def_bed.get_default_value<ConfigOptionInts>();
+    spin_bed->SetValue(default_bed != nullptr && default_bed->size() > 0 ? default_bed->get_at(0) : 0);
 
-	append_text(_(L("Enter the temperature needed for extruding your filament.")));
-	append_text(_(L("A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS.")));
+    append_text(_(L("Enter the temperature needed for extruding your filament.")));
+    append_text(_(L("A rule of thumb is 160 to 230 °C for PLA, and 215 to 250 °C for ABS.")));
 
-	auto *sizer_extr = new wxFlexGridSizer(3, 5, 5);
-	auto *text_extr = new wxStaticText(this, wxID_ANY, _(L("Extrusion Temperature:")));
-	auto *unit_extr = new wxStaticText(this, wxID_ANY, _(L("°C")));
-	sizer_extr->AddGrowableCol(0, 1);
-	sizer_extr->Add(text_extr, 0, wxALIGN_CENTRE_VERTICAL);
-	sizer_extr->Add(spin_extr);
-	sizer_extr->Add(unit_extr, 0, wxALIGN_CENTRE_VERTICAL);
-	append(sizer_extr);
+    auto *sizer_extr = new wxFlexGridSizer(3, 5, 5);
+    auto *text_extr = new wxStaticText(this, wxID_ANY, _(L("Extrusion Temperature:")));
+    auto *unit_extr = new wxStaticText(this, wxID_ANY, _(L("°C")));
+    sizer_extr->AddGrowableCol(0, 1);
+    sizer_extr->Add(text_extr, 0, wxALIGN_CENTRE_VERTICAL);
+    sizer_extr->Add(spin_extr);
+    sizer_extr->Add(unit_extr, 0, wxALIGN_CENTRE_VERTICAL);
+    append(sizer_extr);
 
-	append_spacer(VERTICAL_SPACING);
+    append_spacer(VERTICAL_SPACING);
 
-	append_text(_(L("Enter the bed temperature needed for getting your filament to stick to your heated bed.")));
-	append_text(_(L("A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have no heated bed.")));
+    append_text(_(L("Enter the bed temperature needed for getting your filament to stick to your heated bed.")));
+    append_text(_(L("A rule of thumb is 60 °C for PLA and 110 °C for ABS. Leave zero if you have no heated bed.")));
 
-	auto *sizer_bed = new wxFlexGridSizer(3, 5, 5);
-	auto *text_bed = new wxStaticText(this, wxID_ANY, _(L("Bed Temperature:")));
-	auto *unit_bed = new wxStaticText(this, wxID_ANY, _(L("°C")));
-	sizer_bed->AddGrowableCol(0, 1);
-	sizer_bed->Add(text_bed, 0, wxALIGN_CENTRE_VERTICAL);
-	sizer_bed->Add(spin_bed);
-	sizer_bed->Add(unit_bed, 0, wxALIGN_CENTRE_VERTICAL);
-	append(sizer_bed);
+    auto *sizer_bed = new wxFlexGridSizer(3, 5, 5);
+    auto *text_bed = new wxStaticText(this, wxID_ANY, _(L("Bed Temperature:")));
+    auto *unit_bed = new wxStaticText(this, wxID_ANY, _(L("°C")));
+    sizer_bed->AddGrowableCol(0, 1);
+    sizer_bed->Add(text_bed, 0, wxALIGN_CENTRE_VERTICAL);
+    sizer_bed->Add(spin_bed);
+    sizer_bed->Add(unit_bed, 0, wxALIGN_CENTRE_VERTICAL);
+    append(sizer_bed);
 }
 
 void PageTemperatures::apply_custom_config(DynamicPrintConfig &config)
 {
-	auto *opt_extr = new ConfigOptionInts(1, spin_extr->GetValue());
-	config.set_key_value("temperature", opt_extr);
-	auto *opt_extr1st = new ConfigOptionInts(1, spin_extr->GetValue());
-	config.set_key_value("first_layer_temperature", opt_extr1st);
-	auto *opt_bed = new ConfigOptionInts(1, spin_bed->GetValue());
-	config.set_key_value("bed_temperature", opt_bed);
-	auto *opt_bed1st = new ConfigOptionInts(1, spin_bed->GetValue());
-	config.set_key_value("first_layer_bed_temperature", opt_bed1st);
+    auto *opt_extr = new ConfigOptionInts(1, spin_extr->GetValue());
+    config.set_key_value("temperature", opt_extr);
+    auto *opt_extr1st = new ConfigOptionInts(1, spin_extr->GetValue());
+    config.set_key_value("first_layer_temperature", opt_extr1st);
+    auto *opt_bed = new ConfigOptionInts(1, spin_bed->GetValue());
+    config.set_key_value("bed_temperature", opt_bed);
+    auto *opt_bed1st = new ConfigOptionInts(1, spin_bed->GetValue());
+    config.set_key_value("first_layer_bed_temperature", opt_bed1st);
 }
 
 
@@ -632,39 +669,39 @@ void PageTemperatures::apply_custom_config(DynamicPrintConfig &config)
 
 ConfigWizardIndex::ConfigWizardIndex(wxWindow *parent)
     : wxPanel(parent)
-    , bg(GUI::from_u8(Slic3r::var("Slic3r_192px_transparent.png")), wxBITMAP_TYPE_PNG)
-    , bullet_black(GUI::from_u8(Slic3r::var("bullet_black.png")), wxBITMAP_TYPE_PNG)
-    , bullet_blue(GUI::from_u8(Slic3r::var("bullet_blue.png")), wxBITMAP_TYPE_PNG)
-    , bullet_white(GUI::from_u8(Slic3r::var("bullet_white.png")), wxBITMAP_TYPE_PNG)
+    , bg(ScalableBitmap(parent, "Slic3r_192px_transparent.png", 192))
+    , bullet_black(ScalableBitmap(parent, "bullet_black.png"))
+    , bullet_blue(ScalableBitmap(parent, "bullet_blue.png"))
+    , bullet_white(ScalableBitmap(parent, "bullet_white.png"))
     , item_active(0)
     , item_hover(-1)
     , last_page((size_t)-1)
 {
-	SetMinSize(bg.GetSize());
+    SetMinSize(bg.bmp().GetSize());
 
     const wxSize size = GetTextExtent("m");
-    em = size.x;
+    em_w = size.x;
     em_h = size.y;
 
-	// Add logo bitmap.
-	// This could be done in on_paint() along with the index labels, but I've found it tricky
-	// to get the bitmap rendered well on all platforms with transparent background.
-	// In some cases it didn't work at all. And so wxStaticBitmap is used here instead,
-	// because it has all the platform quirks figured out.
-	auto *sizer = new wxBoxSizer(wxVERTICAL);
-	auto *logo = new wxStaticBitmap(this, wxID_ANY, bg);
-	sizer->AddStretchSpacer();
-	sizer->Add(logo);
-	SetSizer(sizer);
+    // Add logo bitmap.
+    // This could be done in on_paint() along with the index labels, but I've found it tricky
+    // to get the bitmap rendered well on all platforms with transparent background.
+    // In some cases it didn't work at all. And so wxStaticBitmap is used here instead,
+    // because it has all the platform quirks figured out.
+    auto *sizer = new wxBoxSizer(wxVERTICAL);
+    logo = new wxStaticBitmap(this, wxID_ANY, bg.bmp());
+    sizer->AddStretchSpacer();
+    sizer->Add(logo);
+    SetSizer(sizer);
 
-	Bind(wxEVT_PAINT, &ConfigWizardIndex::on_paint, this);
+    Bind(wxEVT_PAINT, &ConfigWizardIndex::on_paint, this);
     Bind(wxEVT_MOTION, &ConfigWizardIndex::on_mouse_move, this);
 
     Bind(wxEVT_LEAVE_WINDOW, [this](wxMouseEvent &evt) {
         if (item_hover != -1) {
             item_hover = -1;
             Refresh();
-}
+        }
         evt.Skip();
     });
 
@@ -680,12 +717,12 @@ void ConfigWizardIndex::add_page(ConfigWizardPage *page)
     last_page = items.size();
     items.emplace_back(Item { page->shortname, page->indent, page });
     Refresh();
-	}
+}
 
 void ConfigWizardIndex::add_label(wxString label, unsigned indent)
 {
     items.emplace_back(Item { std::move(label), indent, nullptr });
-	Refresh();
+    Refresh();
 }
 
 ConfigWizardPage* ConfigWizardIndex::active_page() const
@@ -731,8 +768,8 @@ void ConfigWizardIndex::go_to(size_t i)
         wxCommandEvent evt(EVT_INDEX_PAGE, GetId());
         AddPendingEvent(evt);
 
-	Refresh();
-}
+        Refresh();
+    }
 }
 
 void ConfigWizardIndex::go_to(ConfigWizardPage *page)
@@ -755,31 +792,44 @@ void ConfigWizardIndex::clear()
 
 void ConfigWizardIndex::on_paint(wxPaintEvent & evt)
 {
-	const auto size = GetClientSize();
-	if (size.GetHeight() == 0 || size.GetWidth() == 0) { return; }
+    const auto size = GetClientSize();
+    if (size.GetHeight() == 0 || size.GetWidth() == 0) { return; }
 
-	wxPaintDC dc(this);
+    wxPaintDC dc(this);
 
-	const auto bullet_w = bullet_black.GetSize().GetWidth();
-	const auto bullet_h = bullet_black.GetSize().GetHeight();
+    const auto bullet_w = bullet_black.bmp().GetSize().GetWidth();
+    const auto bullet_h = bullet_black.bmp().GetSize().GetHeight();
     const int yoff_icon = bullet_h < em_h ? (em_h - bullet_h) / 2 : 0;
     const int yoff_text = bullet_h > em_h ? (bullet_h - em_h) / 2 : 0;
     const int yinc = item_height();
 
-	unsigned y = 0;
+    int index_width = 0;
+
+    unsigned y = 0;
     for (size_t i = 0; i < items.size(); i++) {
         const Item& item = items[i];
-        unsigned x = em/2 + item.indent * em;
+        unsigned x = em_w/2 + item.indent * em_w;
 
         if (i == item_active || item_hover >= 0 && i == (size_t)item_hover) {
-            dc.DrawBitmap(bullet_blue,  x, y + yoff_icon, false);
+            dc.DrawBitmap(bullet_blue.bmp(), x, y + yoff_icon, false);
         }
-        else if (i < item_active)  { dc.DrawBitmap(bullet_black, x, y + yoff_icon, false); }
-        else if (i > item_active)  { dc.DrawBitmap(bullet_white, x, y + yoff_icon, false); }
+        else if (i < item_active)  { dc.DrawBitmap(bullet_black.bmp(), x, y + yoff_icon, false); }
+        else if (i > item_active)  { dc.DrawBitmap(bullet_white.bmp(), x, y + yoff_icon, false); }
 
-        dc.DrawText(item.label, x + bullet_w + em/2, y + yoff_text);
-		y += yinc;
-	}
+        x += + bullet_w + em_w/2;
+        const auto text_size = dc.GetTextExtent(item.label);
+        dc.DrawText(item.label, x, y + yoff_text);
+
+        y += yinc;
+        index_width = std::max(index_width, (int)x + text_size.x);
+    }
+
+    if (GetMinSize().x < index_width) {
+        CallAfter([this, index_width]() {
+            SetMinSize(wxSize(index_width, GetMinSize().y));
+            Refresh();
+        });
+    }
 }
 
 void ConfigWizardIndex::on_mouse_move(wxMouseEvent &evt)
@@ -797,6 +847,22 @@ void ConfigWizardIndex::on_mouse_move(wxMouseEvent &evt)
     evt.Skip();
 }
 
+void ConfigWizardIndex::msw_rescale()
+{
+    const wxSize size = GetTextExtent("m");
+    em_w = size.x;
+    em_h = size.y;
+
+    bg.msw_rescale();
+    SetMinSize(bg.bmp().GetSize());
+    logo->SetBitmap(bg.bmp());
+
+    bullet_black.msw_rescale();
+    bullet_blue.msw_rescale();
+    bullet_white.msw_rescale();
+    Refresh();
+}
+
 
 // priv
 
@@ -826,6 +892,29 @@ void ConfigWizard::priv::load_pages(bool custom_setup)
     q->Layout();
 }
 
+void ConfigWizard::priv::init_dialog_size()
+{
+    // Clamp the Wizard size based on screen dimensions
+
+    const auto idx = wxDisplay::GetFromWindow(q);
+    wxDisplay display(idx != wxNOT_FOUND ? idx : 0u);
+
+    const auto disp_rect = display.GetClientArea();
+    wxRect window_rect(
+        disp_rect.x + disp_rect.width / 20,
+        disp_rect.y + disp_rect.height / 20,
+        9*disp_rect.width / 10,
+        9*disp_rect.height / 10);
+
+    const int width_hint = index->GetSize().GetWidth() + 900+/*page_fff->get_width()*/ + 30 * em();    // XXX: magic constant, I found no better solution
+    if (width_hint < window_rect.width) {
+        window_rect.x += (window_rect.width - width_hint) / 2;
+        window_rect.width = width_hint;
+    }
+
+    q->SetSize(window_rect);
+}
+
 bool ConfigWizard::priv::check_first_variant() const
 {
     return run_reason == RR_DATA_EMPTY || run_reason == RR_DATA_LEGACY;
@@ -833,51 +922,51 @@ bool ConfigWizard::priv::check_first_variant() const
 
 void ConfigWizard::priv::load_vendors()
 {
-	const fs::path vendor_dir = fs::path(Slic3r::data_dir()) / "vendor";
-	const fs::path rsrc_vendor_dir = fs::path(resources_dir()) / "profiles";
+    const fs::path vendor_dir = fs::path(Slic3r::data_dir()) / "vendor";
+    const fs::path rsrc_vendor_dir = fs::path(resources_dir()) / "profiles";
 
-	// Load vendors from the "vendors" directory in datadir
+    // Load vendors from the "vendors" directory in datadir
     for (auto &dir_entry : boost::filesystem::directory_iterator(vendor_dir))
-		if (Slic3r::is_ini_file(dir_entry)) {
-			try {
-				auto vp = VendorProfile::from_ini(dir_entry.path());
-				vendors[vp.id] = std::move(vp);
-			}
-			catch (const std::exception& e) {
-				BOOST_LOG_TRIVIAL(error) << boost::format("Error loading vendor bundle %1%: %2%") % dir_entry.path() % e.what();
-			}
-		}
+        if (Slic3r::is_ini_file(dir_entry)) {
+            try {
+                auto vp = VendorProfile::from_ini(dir_entry.path());
+                vendors[vp.id] = std::move(vp);
+            }
+            catch (const std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << boost::format("Error loading vendor bundle %1%: %2%") % dir_entry.path() % e.what();
+            }
+        }
 
-	// Additionally load up vendors from the application resources directory, but only those not seen in the datadir
+    // Additionally load up vendors from the application resources directory, but only those not seen in the datadir
     for (auto &dir_entry : boost::filesystem::directory_iterator(rsrc_vendor_dir))
-		if (Slic3r::is_ini_file(dir_entry)) {   
-			const auto id = dir_entry.path().stem().string();
-			if (vendors.find(id) == vendors.end()) {
-				try {
-					auto vp = VendorProfile::from_ini(dir_entry.path());
-					vendors_rsrc[vp.id] = dir_entry.path().filename().string();
-					vendors[vp.id] = std::move(vp);
-				}
-				catch (const std::exception& e) {
-					BOOST_LOG_TRIVIAL(error) << boost::format("Error loading vendor bundle %1%: %2%") % dir_entry.path() % e.what();
-				}
-			}
-		}
+        if (Slic3r::is_ini_file(dir_entry)) {
+            const auto id = dir_entry.path().stem().string();
+            if (vendors.find(id) == vendors.end()) {
+                try {
+                    auto vp = VendorProfile::from_ini(dir_entry.path());
+                    vendors_rsrc[vp.id] = dir_entry.path().filename().string();
+                    vendors[vp.id] = std::move(vp);
+                }
+                catch (const std::exception& e) {
+                    BOOST_LOG_TRIVIAL(error) << boost::format("Error loading vendor bundle %1%: %2%") % dir_entry.path() % e.what();
+                }
+            }
+        }
 
-	// Load up the set of vendors / models / variants the user has had enabled up till now
-	const AppConfig *app_config = GUI::get_app_config();
-	appconfig_vendors.set_vendors(*app_config);
+    // Load up the set of vendors / models / variants the user has had enabled up till now
+    const AppConfig *app_config = GUI::get_app_config();
+    appconfig_vendors.set_vendors(*app_config);
 }
 
 void ConfigWizard::priv::add_page(ConfigWizardPage *page)
 {
-	hscroll_sizer->Add(page, 0, wxEXPAND);
-	}
+    hscroll_sizer->Add(page, 0, wxEXPAND);
+}
 
 void ConfigWizard::priv::enable_next(bool enable)
 {
-	btn_next->Enable(enable);
-	btn_finish->Enable(enable);
+    btn_next->Enable(enable);
+    btn_finish->Enable(enable);
 }
 
 void ConfigWizard::priv::on_custom_setup(bool custom_wanted)
@@ -887,48 +976,66 @@ void ConfigWizard::priv::on_custom_setup(bool custom_wanted)
 
 void ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater)
 {
-		const auto enabled_vendors = appconfig_vendors.vendors();
+    const auto enabled_vendors = appconfig_vendors.vendors();
 
-		// Install bundles from resources if needed:
-		std::vector<std::string> install_bundles;
-		for (const auto &vendor_rsrc : vendors_rsrc) {
-			const auto vendor = enabled_vendors.find(vendor_rsrc.first);
-			if (vendor == enabled_vendors.end()) { continue; }
+    // Install bundles from resources if needed:
+    std::vector<std::string> install_bundles;
+    for (const auto &vendor_rsrc : vendors_rsrc) {
+        const auto vendor = enabled_vendors.find(vendor_rsrc.first);
+        if (vendor == enabled_vendors.end()) { continue; }
 
-			size_t size_sum = 0;
-			for (const auto &model : vendor->second) { size_sum += model.second.size(); }
-			if (size_sum == 0) { continue; }
+        size_t size_sum = 0;
+        for (const auto &model : vendor->second) { size_sum += model.second.size(); }
 
-			// This vendor needs to be installed
-			install_bundles.emplace_back(vendor_rsrc.second);
-		}
+        if (size_sum > 0) {
+            // This vendor needs to be installed
+            install_bundles.emplace_back(vendor_rsrc.second);
+        }
+    }
 
-		// Decide whether to create snapshot based on run_reason and the reset profile checkbox
-		bool snapshot = true;
-		switch (run_reason) {
-			case ConfigWizard::RR_DATA_EMPTY:    snapshot = false; break;
-			case ConfigWizard::RR_DATA_LEGACY:   snapshot = true; break;
-			case ConfigWizard::RR_DATA_INCOMPAT: snapshot = false; break;      // In this case snapshot is done by PresetUpdater with the appropriate reason
-			case ConfigWizard::RR_USER:          snapshot = page_welcome->reset_user_profile(); break;
-		}
-		if (install_bundles.size() > 0) {
-			// Install bundles from resources.
-			updater->install_bundles_rsrc(std::move(install_bundles), snapshot);
-		} else {
-			BOOST_LOG_TRIVIAL(info) << "No bundles need to be installed from resources";
-		}
+    // Decide whether to create snapshot based on run_reason and the reset profile checkbox
+    bool snapshot = true;
+    switch (run_reason) {
+        case ConfigWizard::RR_DATA_EMPTY:    snapshot = false; break;
+        case ConfigWizard::RR_DATA_LEGACY:   snapshot = true; break;
+        case ConfigWizard::RR_DATA_INCOMPAT: snapshot = false; break;      // In this case snapshot is done by PresetUpdater with the appropriate reason
+        case ConfigWizard::RR_USER:          snapshot = page_welcome->reset_user_profile(); break;
+    }
+    if (install_bundles.size() > 0) {
+        // Install bundles from resources.
+        updater->install_bundles_rsrc(std::move(install_bundles), snapshot);
+    } else {
+        BOOST_LOG_TRIVIAL(info) << "No bundles need to be installed from resources";
+    }
 
-		if (page_welcome->reset_user_profile()) {
-			BOOST_LOG_TRIVIAL(info) << "Resetting user profiles...";
-			preset_bundle->reset(true);
-		}
+    if (page_welcome->reset_user_profile()) {
+        BOOST_LOG_TRIVIAL(info) << "Resetting user profiles...";
+        preset_bundle->reset(true);
+    }
 
-		app_config->set_vendors(appconfig_vendors);
-		app_config->set("version_check", page_update->version_check ? "1" : "0");
-		app_config->set("preset_update", page_update->preset_update ? "1" : "0");
-		app_config->reset_selections();
-		preset_bundle->load_presets(*app_config);
+    app_config->set_vendors(appconfig_vendors);
+    app_config->set("version_check", page_update->version_check ? "1" : "0");
+    app_config->set("preset_update", page_update->preset_update ? "1" : "0");
 
+    std::string preferred_model;
+
+    // Figure out the default pre-selected printer based on the seletions in the picker.
+    // The default is the first selected printer model (one with at least 1 variant selected).
+    // The default is only applied by load_presets() if the user doesn't have a (visible) printer
+    // selected already.
+    const auto vendor_prusa = vendors.find("PrusaResearch");
+    const auto config_prusa = enabled_vendors.find("PrusaResearch");
+    if (vendor_prusa != vendors.end() && config_prusa != enabled_vendors.end()) {
+        for (const auto &model : vendor_prusa->second.models) {
+            const auto model_it = config_prusa->second.find(model.id);
+            if (model_it != config_prusa->second.end() && model_it->second.size() > 0) {
+                preferred_model = model.id;
+                break;
+            }
+        }
+    }
+
+    preset_bundle->load_presets(*app_config, preferred_model);
 
     if (page_custom->custom_wanted()) {
         page_firmware->apply_custom_config(*custom_config);
@@ -938,10 +1045,10 @@ void ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
 
         const std::string profile_name = page_custom->profile_name();
         preset_bundle->load_config(profile_name, *custom_config);
-		}
+    }
 
-	// Update the selections from the compatibilty.
-	preset_bundle->export_selections(*app_config);
+    // Update the selections from the compatibilty.
+    preset_bundle->export_selections(*app_config);
 }
 
 static const boost::unordered_map<PrinterTechnology, std::string> tech_to_string{ {
@@ -953,45 +1060,47 @@ static const boost::unordered_map<PrinterTechnology, std::string> tech_to_string
 // Public
 
 ConfigWizard::ConfigWizard(wxWindow *parent, RunReason reason)
-    : wxDialog(parent, wxID_ANY, _(name().ToStdString()), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+    : DPIDialog(parent, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + name(), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
     , p(new priv(this))
 {
-	p->run_reason = reason;
+    this->SetFont(wxGetApp().normal_font());
+    p->run_reason = reason;
 
-	p->load_vendors();
-	p->custom_config.reset(DynamicPrintConfig::new_from_defaults_keys({
-		"gcode_flavor", "bed_shape", "nozzle_diameter", "filament_diameter", "temperature", "bed_temperature",
-	}));
+    p->load_vendors();
+    p->custom_config.reset(DynamicPrintConfig::new_from_defaults_keys({
+        "gcode_flavor", "bed_shape", "nozzle_diameter", "filament_diameter", "temperature", "bed_temperature",
+    }));
 
-	p->index = new ConfigWizardIndex(this);
+    p->index = new ConfigWizardIndex(this);
 
-	auto *vsizer = new wxBoxSizer(wxVERTICAL);
-	auto *topsizer = new wxBoxSizer(wxHORIZONTAL);
-	auto *hline = new wxStaticLine(this);
-	p->btnsizer = new wxBoxSizer(wxHORIZONTAL);
+    auto *vsizer = new wxBoxSizer(wxVERTICAL);
+    auto *topsizer = new wxBoxSizer(wxHORIZONTAL);
+    auto *hline = new wxStaticLine(this);
+    p->btnsizer = new wxBoxSizer(wxHORIZONTAL);
 
-	// Initially we _do not_ SetScrollRate in order to figure out the overall width of the Wizard  without scrolling.
-	// Later, we compare that to the size of the current screen and set minimum width based on that (see below).
-	p->hscroll = new wxScrolledWindow(this);
-	p->hscroll_sizer = new wxBoxSizer(wxHORIZONTAL);
-	p->hscroll->SetSizer(p->hscroll_sizer);
+    // Initially we _do not_ SetScrollRate in order to figure out the overall width of the Wizard  without scrolling.
+    // Later, we compare that to the size of the current screen and set minimum width based on that (see below).
+    p->hscroll = new wxScrolledWindow(this);
+    p->hscroll_sizer = new wxBoxSizer(wxHORIZONTAL);
+    p->hscroll->SetSizer(p->hscroll_sizer);
 
-	topsizer->Add(p->index, 0, wxEXPAND);
-	topsizer->AddSpacer(INDEX_MARGIN);
-	topsizer->Add(p->hscroll, 1, wxEXPAND);
+    topsizer->Add(p->index, 0, wxEXPAND);
+    topsizer->AddSpacer(INDEX_MARGIN);
+    topsizer->Add(p->hscroll, 1, wxEXPAND);
 
-    auto *btn_sel_all = new wxButton(this, wxID_ANY, _(L("Select all standard printers in this page")));
-    p->btnsizer->Add(btn_sel_all);
+    p->btn_sel_all = new wxButton(this, wxID_ANY, _(L("Select all standard printers in this page")));
+    p->btnsizer->Add(p->btn_sel_all);
 
-	p->btn_prev = new wxButton(this, wxID_ANY, _(L("< &Back")));
-	p->btn_next = new wxButton(this, wxID_ANY, _(L("&Next >")));
-	p->btn_finish = new wxButton(this, wxID_APPLY, _(L("&Finish")));
+    p->btn_prev = new wxButton(this, wxID_ANY, _(L("< &Back")));
+    p->btn_next = new wxButton(this, wxID_ANY, _(L("&Next >")));
+    p->btn_finish = new wxButton(this, wxID_APPLY, _(L("&Finish")));
     p->btn_cancel = new wxButton(this, wxID_CANCEL, _(L("Cancel")));   // Note: The label needs to be present, otherwise we get accelerator bugs on Mac
-	p->btnsizer->AddStretchSpacer();
-	p->btnsizer->Add(p->btn_prev, 0, wxLEFT, BTN_SPACING);
-	p->btnsizer->Add(p->btn_next, 0, wxLEFT, BTN_SPACING);
-	p->btnsizer->Add(p->btn_finish, 0, wxLEFT, BTN_SPACING);
-	p->btnsizer->Add(p->btn_cancel, 0, wxLEFT, BTN_SPACING);
+    p->btnsizer->AddStretchSpacer();
+    p->btnsizer->Add(p->btn_prev, 0, wxLEFT, BTN_SPACING);
+    p->btnsizer->Add(p->btn_next, 0, wxLEFT, BTN_SPACING);
+    p->btnsizer->Add(p->btn_finish, 0, wxLEFT, BTN_SPACING);
+    p->btnsizer->Add(p->btn_cancel, 0, wxLEFT, BTN_SPACING);
+
 
     p->add_page(p->page_welcome = new PageWelcome(this));
 
@@ -1009,47 +1118,26 @@ ConfigWizard::ConfigWizard(wxWindow *parent, RunReason reason)
     }
 
     p->add_page(p->page_custom   = new PageCustom(this));
-	p->add_page(p->page_update   = new PageUpdate(this));
-	p->add_page(p->page_firmware = new PageFirmware(this));
-	p->add_page(p->page_bed      = new PageBedShape(this));
-	p->add_page(p->page_diams    = new PageDiameters(this));
-	p->add_page(p->page_temps    = new PageTemperatures(this));
+    p->add_page(p->page_update   = new PageUpdate(this));
+    p->add_page(p->page_firmware = new PageFirmware(this));
+    p->add_page(p->page_bed      = new PageBedShape(this));
+    p->add_page(p->page_diams    = new PageDiameters(this));
+    p->add_page(p->page_temps    = new PageTemperatures(this));
 
     p->load_pages(false);
 
-	vsizer->Add(topsizer, 1, wxEXPAND | wxALL, DIALOG_MARGIN);
-	vsizer->Add(hline, 0, wxEXPAND);
-	vsizer->Add(p->btnsizer, 0, wxEXPAND | wxALL, DIALOG_MARGIN);
+    vsizer->Add(topsizer, 1, wxEXPAND | wxALL, DIALOG_MARGIN);
+    vsizer->Add(hline, 0, wxEXPAND);
+    vsizer->Add(p->btnsizer, 0, wxEXPAND | wxALL, DIALOG_MARGIN);
 
-	SetSizer(vsizer);
-	SetSizerAndFit(vsizer);
+    SetSizer(vsizer);
+    SetSizerAndFit(vsizer);
 
-	// We can now enable scrolling on hscroll
-	p->hscroll->SetScrollRate(30, 30);
+    // We can now enable scrolling on hscroll
+    p->hscroll->SetScrollRate(30, 30);
 
     on_window_geometry(this, [this]() {
-        // Clamp the Wizard size based on screen dimensions
-
-        const auto idx = wxDisplay::GetFromWindow(this);
-        wxDisplay display(idx != wxNOT_FOUND ? idx : 0u);
-
-        const auto disp_rect = display.GetClientArea();
-        wxRect window_rect(
-            disp_rect.x + disp_rect.width / 20,
-            disp_rect.y + disp_rect.height / 20,
-            9*disp_rect.width / 10,
-            9*disp_rect.height / 10);
-        int max_width = 0;
-        for (auto page : p->page_vendors) {
-            max_width = std::max(max_width, page->get_width());
-        }
-        const int width_hint = p->index->GetSize().GetWidth() + max_width + 300;    // XXX: magic constant, I found no better solution
-        if (width_hint < window_rect.width) {
-            window_rect.x += (window_rect.width - width_hint) / 2;
-            window_rect.width = width_hint;
-	}
-
-        SetSize(window_rect);
+        p->init_dialog_size();
     });
 
     p->btn_prev->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &) { this->p->index->go_prev(); });
@@ -1057,7 +1145,7 @@ ConfigWizard::ConfigWizard(wxWindow *parent, RunReason reason)
     p->btn_finish->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &) { this->EndModal(wxID_OK); });
     p->btn_finish->Hide();
 
-    btn_sel_all->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &) {
+    p->btn_sel_all->Bind(wxEVT_BUTTON, [this](const wxCommandEvent &) {
         ConfigWizardPage *page = p->index->active_page();
         PagePrinters *page_printers = dynamic_cast<PagePrinters*>(page);
         if (page_printers)
@@ -1078,31 +1166,51 @@ ConfigWizard::~ConfigWizard() {}
 
 bool ConfigWizard::run(PresetBundle *preset_bundle, const PresetUpdater *updater)
 {
-	BOOST_LOG_TRIVIAL(info) << "Running ConfigWizard, reason: " << p->run_reason;
-	if (ShowModal() == wxID_OK) {
-		auto *app_config = GUI::get_app_config();
-		p->apply_config(app_config, preset_bundle, updater);
+    BOOST_LOG_TRIVIAL(info) << "Running ConfigWizard, reason: " << p->run_reason;
+    if (ShowModal() == wxID_OK) {
+        auto *app_config = GUI::get_app_config();
+        p->apply_config(app_config, preset_bundle, updater);
         app_config->set_legacy_datadir(false);
-		BOOST_LOG_TRIVIAL(info) << "ConfigWizard applied";
-		return true;
-	} else {
-		BOOST_LOG_TRIVIAL(info) << "ConfigWizard cancelled";
-		return false;
-	}
+        BOOST_LOG_TRIVIAL(info) << "ConfigWizard applied";
+        return true;
+    } else {
+        BOOST_LOG_TRIVIAL(info) << "ConfigWizard cancelled";
+        return false;
+    }
 }
 
 
 const wxString& ConfigWizard::name(const bool from_menu/* = false*/)
 {
-	// A different naming convention is used for the Wizard on Windows vs. OSX & GTK.
-#if WIN32
-    static const wxString config_wizard_name = L("Configuration Wizard");
-    static const wxString config_wizard_name_menu = L("Configuration &Wizard");
+    // A different naming convention is used for the Wizard on Windows vs. OSX & GTK.
+#if __APPLE__
+    static const wxString config_wizard_name =  _(L("Configuration Assistant"));
+    static const wxString config_wizard_name_menu = _(L("Configuration &Assistant"));
 #else
-	static const wxString config_wizard_name =  L("Configuration Assistant");
-    static const wxString config_wizard_name_menu = L("Configuration &Assistant");
+    static const wxString config_wizard_name = _(L("Configuration Wizard"));
+    static const wxString config_wizard_name_menu = _(L("Configuration &Wizard"));
 #endif
-	return from_menu ? config_wizard_name_menu : config_wizard_name;
+    return from_menu ? config_wizard_name_menu : config_wizard_name;
+}
+
+void ConfigWizard::on_dpi_changed(const wxRect &suggested_rect)
+{
+    p->index->msw_rescale();
+
+    const int& em = em_unit();
+
+    msw_buttons_rescale(this, em, { wxID_APPLY, 
+                                    wxID_CANCEL,
+                                    p->btn_sel_all->GetId(),
+                                    p->btn_next->GetId(),
+                                    p->btn_prev->GetId() });
+    for (PagePrinters* page : p->page_vendors)
+        for (PrinterPicker* printer_picker : page->printer_pickers)
+            msw_buttons_rescale(this, em, printer_picker->get_button_indexes());
+
+    p->init_dialog_size();
+
+    Refresh();
 }
 
 }
diff --git a/src/slic3r/GUI/ConfigWizard.hpp b/src/slic3r/GUI/ConfigWizard.hpp
index c9ee05529..b707e525b 100644
--- a/src/slic3r/GUI/ConfigWizard.hpp
+++ b/src/slic3r/GUI/ConfigWizard.hpp
@@ -5,6 +5,8 @@
 
 #include <wx/dialog.h>
 
+#include "GUI_Utils.hpp"
+
 namespace Slic3r {
 
 class PresetBundle;
@@ -13,7 +15,7 @@ class PresetUpdater;
 namespace GUI {
 
 
-class ConfigWizard: public wxDialog
+class ConfigWizard: public DPIDialog
 {
 public:
     // Why is the Wizard run
@@ -35,6 +37,10 @@ public:
     bool run(PresetBundle *preset_bundle, const PresetUpdater *updater);
 
     static const wxString& name(const bool from_menu = false);
+
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override ;
+
 private:
     struct priv;
     std::unique_ptr<priv> p;
diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp
index 8c24f1f9f..4e0f5d8bc 100644
--- a/src/slic3r/GUI/ConfigWizard_private.hpp
+++ b/src/slic3r/GUI/ConfigWizard_private.hpp
@@ -69,8 +69,11 @@ struct PrinterPicker: wxPanel
     void on_checkbox(const Checkbox *cbox, bool checked);
 
     int get_width() const { return width; }
+    const std::vector<int>& get_button_indexes() { return m_button_indexes; }
 private:
     int width;
+
+    std::vector<int> m_button_indexes;
 };
 
 struct ConfigWizardPage: wxPanel
@@ -204,7 +207,9 @@ public:
     void go_to(ConfigWizardPage *page);
 
     void clear();
+    void msw_rescale();
 
+    int em() const { return em_w; }
 private:
     struct Item
     {
@@ -215,20 +220,29 @@ private:
         bool operator==(ConfigWizardPage *page) const { return this->page == page; }
     };
 
-    int em;
+    int em_w;
     int em_h;
-
+    /* #ys_FIXME_delete_after_testing by VK 
     const wxBitmap bg;
     const wxBitmap bullet_black;
     const wxBitmap bullet_blue;
     const wxBitmap bullet_white;
+    */
+    ScalableBitmap bg;
+    ScalableBitmap bullet_black;
+    ScalableBitmap bullet_blue;
+    ScalableBitmap bullet_white;
+    wxStaticBitmap* logo;
 
     std::vector<Item> items;
     size_t item_active;
     ssize_t item_hover;
     size_t last_page;
 
-    int item_height() const { return std::max(bullet_black.GetSize().GetHeight(), em) + em; }
+    /* #ys_FIXME_delete_after_testing by VK 
+    int item_height() const { return std::max(bullet_black.GetSize().GetHeight(), em_w) + em_w; }
+    */
+    int item_height() const { return std::max(bullet_black.bmp().GetSize().GetHeight(), em_w) + em_w; }
 
     void on_paint(wxPaintEvent &evt);
     void on_mouse_move(wxMouseEvent &evt);
@@ -250,6 +264,7 @@ struct ConfigWizard::priv
     wxBoxSizer *btnsizer = nullptr;
     ConfigWizardPage *page_current = nullptr;
     ConfigWizardIndex *index = nullptr;
+    wxButton *btn_sel_all = nullptr;
     wxButton *btn_prev = nullptr;
     wxButton *btn_next = nullptr;
     wxButton *btn_finish = nullptr;
@@ -269,6 +284,7 @@ struct ConfigWizard::priv
     priv(ConfigWizard *q) : q(q) {}
 
     void load_pages(bool custom_setup);
+    void init_dialog_size();
 
     bool check_first_variant() const;
     void load_vendors();
@@ -278,6 +294,8 @@ struct ConfigWizard::priv
     void on_custom_setup(bool custom_wanted);
 
     void apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater);
+
+    int em() const { return index->em(); }
 };
 
 
diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index e6da79a7b..db61a4cbf 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -15,40 +15,41 @@ namespace Slic3r { namespace GUI {
 
 wxString double_to_string(double const value, const int max_precision /*= 4*/)
 {
-	if (value - int(value) == 0)
-		return wxString::Format(_T("%i"), int(value));
+// Style_NoTrailingZeroes does not work on OSX. It also does not work correctly with some locales on Windows.
+//	return wxNumberFormatter::ToString(value, max_precision, wxNumberFormatter::Style_NoTrailingZeroes);
 
-    int precision = max_precision;
-    for (size_t p = 1; p < max_precision; p++)
-	{
-		double cur_val = pow(10, p)*value;
-		if (cur_val - int(cur_val) == 0) {
-			precision = p;
-			break;
+	wxString s = wxNumberFormatter::ToString(value, max_precision, wxNumberFormatter::Style_None);
+
+	// The following code comes from wxNumberFormatter::RemoveTrailingZeroes(wxString& s)
+	// with the exception that here one sets the decimal separator explicitely to dot.
+    // If number is in scientific format, trailing zeroes belong to the exponent and cannot be removed.
+    if (s.find_first_of("eE") == wxString::npos) {
+	    const size_t posDecSep = s.find(".");
+	    // No decimal point => removing trailing zeroes irrelevant for integer number.
+	    if (posDecSep != wxString::npos) {
+		    // Find the last character to keep.
+		    size_t posLastNonZero = s.find_last_not_of("0");
+		    // If it's the decimal separator itself, don't keep it neither.
+		    if (posLastNonZero == posDecSep)
+		        -- posLastNonZero;
+		    s.erase(posLastNonZero + 1);
+		    // Remove sign from orphaned zero.
+		    if (s.compare("-0") == 0)
+		        s = "0";
 		}
 	}
-	return wxNumberFormatter::ToString(value, precision, wxNumberFormatter::Style_None);
+
+    return s;
 }
 
 void Field::PostInitialize()
 {
 	auto color = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-	m_Undo_btn			= new MyButton(m_parent, wxID_ANY, "", wxDefaultPosition,wxDefaultSize, wxBU_EXACTFIT | wxNO_BORDER);
-	m_Undo_to_sys_btn	= new MyButton(m_parent, wxID_ANY, "", wxDefaultPosition,wxDefaultSize, wxBU_EXACTFIT | wxNO_BORDER);
-	if (wxMSW) {
-		m_Undo_btn->SetBackgroundColour(color);
-		m_Undo_btn->SetBackgroundStyle(wxBG_STYLE_PAINT);
-		m_Undo_to_sys_btn->SetBackgroundColour(color);
-		m_Undo_to_sys_btn->SetBackgroundStyle(wxBG_STYLE_PAINT);
-	}
-	m_Undo_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_back_to_initial_value(); }));
-	m_Undo_to_sys_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_back_to_sys_value(); }));
+	m_Undo_btn			= new RevertButton(m_parent, "bullet_white.png");
+	m_Undo_to_sys_btn	= new RevertButton(m_parent, "bullet_white.png");
 
-	//set default bitmap
-	wxBitmap bmp;
-	bmp.LoadFile(from_u8(var("bullet_white.png")), wxBITMAP_TYPE_PNG);
-	set_undo_bitmap(&bmp);
-	set_undo_to_sys_bitmap(&bmp);
+    m_Undo_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_back_to_initial_value(); }));
+	m_Undo_to_sys_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_back_to_sys_value(); }));
 
 	switch (m_opt.type)
 	{
@@ -66,6 +67,9 @@ void Field::PostInitialize()
 		break;
 	}
 
+    // initialize m_unit_value
+    m_em_unit = em_unit(m_parent);
+
 	BUILD();
 }
 
@@ -108,6 +112,7 @@ wxString Field::get_tooltip_text(const wxString& default_string)
 {
 	wxString tooltip_text("");
 	wxString tooltip = _(m_opt.tooltip);
+    edit_tooltip(tooltip);
 	if (tooltip.length() > 0)
         tooltip_text = tooltip + "\n" + _(L("default value")) + "\t: " +
         (boost::iends_with(m_opt_id, "_gcode") ? "\n" : "") + default_string +
@@ -213,8 +218,8 @@ bool is_defined_input_value(wxWindow* win, const ConfigOptionType& type)
 
 void TextCtrl::BUILD() {
     auto size = wxSize(wxDefaultSize);
-    if (m_opt.height >= 0) size.SetHeight(m_opt.height);
-    if (m_opt.width >= 0) size.SetWidth(m_opt.width);
+    if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+    if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
 
 	wxString text_value = wxString(""); 
 
@@ -222,7 +227,7 @@ void TextCtrl::BUILD() {
 	case coFloatOrPercent:
 	{
 		text_value = double_to_string(m_opt.default_value->getFloat());
-		if (static_cast<const ConfigOptionFloatOrPercent*>(m_opt.default_value)->percent)
+		if (m_opt.get_default_value<ConfigOptionFloatOrPercent>()->percent)
 			text_value += "%";
 		break;
 	}
@@ -237,19 +242,19 @@ void TextCtrl::BUILD() {
 	case coFloat:
 	{
 		double val = m_opt.type == coFloats ?
-			static_cast<const ConfigOptionFloats*>(m_opt.default_value)->get_at(m_opt_idx) :
+			m_opt.get_default_value<ConfigOptionFloats>()->get_at(m_opt_idx) :
 			m_opt.type == coFloat ? 
 				m_opt.default_value->getFloat() :
-				static_cast<const ConfigOptionPercents*>(m_opt.default_value)->get_at(m_opt_idx);
+				m_opt.get_default_value<ConfigOptionPercents>()->get_at(m_opt_idx);
 		text_value = double_to_string(val);
 		break;
 	}
 	case coString:			
-		text_value = static_cast<const ConfigOptionString*>(m_opt.default_value)->value;
+		text_value = m_opt.get_default_value<ConfigOptionString>()->value;
 		break;
 	case coStrings:
 	{
-		const ConfigOptionStrings *vec = static_cast<const ConfigOptionStrings*>(m_opt.default_value);
+		const ConfigOptionStrings *vec = m_opt.get_default_value<ConfigOptionStrings>();
 		if (vec == nullptr || vec->empty()) break; //for the case of empty default value
 		text_value = vec->get_at(m_opt_idx);
 		break;
@@ -279,8 +284,8 @@ void TextCtrl::BUILD() {
             e.Skip();
             temp->GetToolTip()->Enable(true);
 #endif // __WXGTK__
-            propagate_value();
             bEnterPressed = true;
+            propagate_value();
         }), temp->GetId());
     }
 
@@ -358,6 +363,21 @@ boost::any& TextCtrl::get_value()
 	return m_value;
 }
 
+void TextCtrl::msw_rescale()
+{
+    Field::msw_rescale();
+    auto size = wxSize(wxDefaultSize);
+    if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+    if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
+
+    if (size != wxDefaultSize)
+    {
+        wxTextCtrl* field = dynamic_cast<wxTextCtrl*>(window);
+        field->SetMinSize(size);
+    }
+
+}
+
 void TextCtrl::enable() { dynamic_cast<wxTextCtrl*>(window)->Enable(); dynamic_cast<wxTextCtrl*>(window)->SetEditable(true); }
 void TextCtrl::disable() { dynamic_cast<wxTextCtrl*>(window)->Disable(); dynamic_cast<wxTextCtrl*>(window)->SetEditable(false); }
 
@@ -372,15 +392,16 @@ void TextCtrl::change_field_value(wxEvent& event)
 
 void CheckBox::BUILD() {
 	auto size = wxSize(wxDefaultSize);
-	if (m_opt.height >= 0) size.SetHeight(m_opt.height);
-	if (m_opt.width >= 0) size.SetWidth(m_opt.width);
+	if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+	if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
 
 	bool check_value =	m_opt.type == coBool ? 
 						m_opt.default_value->getBool() : m_opt.type == coBools ? 
-						static_cast<const ConfigOptionBools*>(m_opt.default_value)->get_at(m_opt_idx) : 
-    					false;
+							m_opt.get_default_value<ConfigOptionBools>()->get_at(m_opt_idx) : 
+    						false;
 
-	auto temp = new wxCheckBox(m_parent, wxID_ANY, wxString(""), wxDefaultPosition, size); 
+	// Set Label as a string of at least one space simbol to correct system scaling of a CheckBox 
+	auto temp = new wxCheckBox(m_parent, wxID_ANY, wxString(" "), wxDefaultPosition, size); 
 	temp->SetFont(Slic3r::GUI::wxGetApp().normal_font());
 	temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
 	temp->SetValue(check_value);
@@ -405,12 +426,20 @@ boost::any& CheckBox::get_value()
  	return m_value;
 }
 
+void CheckBox::msw_rescale()
+{
+    Field::msw_rescale();
+
+    wxCheckBox* field = dynamic_cast<wxCheckBox*>(window);
+    field->SetMinSize(wxSize(-1, int(1.5f*field->GetFont().GetPixelSize().y +0.5f)));
+}
+
 int undef_spin_val = -9999;		//! Probably, It's not necessary
 
 void SpinCtrl::BUILD() {
 	auto size = wxSize(wxDefaultSize);
-	if (m_opt.height >= 0) size.SetHeight(m_opt.height);
-	if (m_opt.width >= 0) size.SetWidth(m_opt.width);
+    if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+    if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
 
 	wxString	text_value = wxString("");
 	int			default_value = 0;
@@ -422,7 +451,7 @@ void SpinCtrl::BUILD() {
 		break;
 	case coInts:
 	{
-		const ConfigOptionInts *vec = static_cast<const ConfigOptionInts*>(m_opt.default_value);
+		const ConfigOptionInts *vec = m_opt.get_default_value<ConfigOptionInts>();
 		if (vec == nullptr || vec->empty()) break;
 		for (size_t id = 0; id < vec->size(); ++id)
 		{
@@ -488,6 +517,17 @@ void SpinCtrl::BUILD() {
         else tmp_value = -9999;
 #ifdef __WXOSX__
         propagate_value();
+
+        // Forcibly set the input value for SpinControl, since the value 
+	    // inserted from the clipboard is not updated under OSX
+        if (tmp_value > -9999) {
+            wxSpinCtrl* spin = dynamic_cast<wxSpinCtrl*>(window);
+            spin->SetValue(tmp_value);
+
+            // But in SetValue() is executed m_text_ctrl->SelectAll(), so
+            // discard this selection and set insertion point to the end of string
+            spin->GetText()->SetInsertionPointEnd();
+        }
 #endif
 	}), temp->GetId());
 	
@@ -505,10 +545,18 @@ void SpinCtrl::propagate_value()
         on_change_field();
 }
 
+void SpinCtrl::msw_rescale()
+{
+    Field::msw_rescale();
+
+    wxSpinCtrl* field = dynamic_cast<wxSpinCtrl*>(window);
+    field->SetMinSize(wxSize(-1, int(1.9f*field->GetFont().GetPixelSize().y)));
+}
+
 void Choice::BUILD() {
-    wxSize size(15 * wxGetApp().em_unit(), -1);
-	if (m_opt.height >= 0) size.SetHeight(m_opt.height);
-	if (m_opt.width >= 0) size.SetWidth(m_opt.width);
+    wxSize size(m_width * m_em_unit, -1);
+    if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+    if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
 
 	wxBitmapComboBox* temp;	
     if (!m_opt.gui_type.empty() && m_opt.gui_type.compare("select_open") != 0) {
@@ -540,20 +588,37 @@ void Choice::BUILD() {
 	else{
 		for (auto el : m_opt.enum_labels.empty() ? m_opt.enum_values : m_opt.enum_labels) {
 			const wxString& str = _(el);//m_opt_id == "support" ? _(el) : el;
-			//FIXME Vojtech: Why is the single column empty icon necessary? It is a workaround of some kind, but what for?
-			// Please document such workarounds by comments!
-            // temp->Append(str, create_scaled_bitmap("empty_icon.png"));
-            temp->Append(str, wxNullBitmap);
+			temp->Append(str);
 		}
 		set_selection();
 	}
+
+#ifndef __WXGTK__
+    /* Workaround for a correct rendering of the control without Bitmap (under MSW and OSX):
+     * 
+     * 1. We should create small Bitmap to fill Bitmaps RefData,
+     *    ! in this case wxBitmap.IsOK() return true.
+     * 2. But then set width to 0 value for no using of bitmap left and right spacing 
+     * 3. Set this empty bitmap to the at list one item and BitmapCombobox will be recreated correct
+     * 
+     * Note: Set bitmap height to the Font size because of OSX rendering.
+     */
+    wxBitmap empty_bmp(1, temp->GetFont().GetPixelSize().y + 2);
+    empty_bmp.SetWidth(0);
+    temp->SetItemBitmap(0, empty_bmp);
+#endif
+
 // 	temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent e) { on_change_field(); }), temp->GetId());
  	temp->Bind(wxEVT_COMBOBOX, ([this](wxCommandEvent e) { on_change_field(); }), temp->GetId());
 
     if (m_is_editable) {
         temp->Bind(wxEVT_KILL_FOCUS, ([this](wxEvent& e) {
             e.Skip();
-            if (m_opt.type == coStrings) return;
+            if (m_opt.type == coStrings) {
+                on_change_field();
+                return;
+            }
+
             double old_val = !m_value.empty() ? boost::any_cast<double>(m_value) : -99999;
             if (is_defined_input_value<wxBitmapComboBox>(window, m_opt.type)) {
                 if (fabs(old_val - boost::any_cast<double>(get_value())) <= 0.0001)
@@ -571,6 +636,11 @@ void Choice::BUILD() {
 
 void Choice::set_selection()
 {
+    /* To prevent earlier control updating under OSX set m_disable_change_event to true
+     * (under OSX wxBitmapComboBox send wxEVT_COMBOBOX even after SetSelection())
+     */
+    m_disable_change_event = true;
+
 	wxString text_value = wxString("");
 
     wxBitmapComboBox* field = dynamic_cast<wxBitmapComboBox*>(window);
@@ -593,7 +663,7 @@ void Choice::set_selection()
 		break;
 	}
 	case coEnum:{
-		int id_value = static_cast<const ConfigOptionEnum<SeamPosition>*>(m_opt.default_value)->value; //!!
+		int id_value = m_opt.get_default_value<ConfigOptionEnum<SeamPosition>>()->value; //!!
         field->SetSelection(id_value);
 		break;
 	}
@@ -613,7 +683,7 @@ void Choice::set_selection()
 		break;
 	}
 	case coStrings:{
-		text_value = static_cast<const ConfigOptionStrings*>(m_opt.default_value)->get_at(m_opt_idx);
+		text_value = m_opt.get_default_value<ConfigOptionStrings>()->get_at(m_opt_idx);
 
 		size_t idx = 0;
 		for (auto el : m_opt.enum_values)
@@ -836,14 +906,58 @@ boost::any& Choice::get_value()
 	return m_value;
 }
 
+void Choice::msw_rescale()
+{
+    Field::msw_rescale();
+
+    wxBitmapComboBox* field = dynamic_cast<wxBitmapComboBox*>(window);
+
+    const wxString selection = field->GetString(field->GetSelection());
+
+	/* To correct scaling (set new controll size) of a wxBitmapCombobox 
+	 * we need to refill control with new bitmaps. So, in our case : 
+	 * 1. clear conrol
+	 * 2. add content
+	 * 3. add scaled "empty" bitmap to the at least one item
+	 */
+    field->Clear();
+    wxSize size(wxDefaultSize);
+    size.SetWidth((m_opt.width > 0 ? m_opt.width : m_width) * m_em_unit);
+ 
+    // Set rescaled min height to correct layout
+    field->SetMinSize(wxSize(-1, int(1.5f*field->GetFont().GetPixelSize().y + 0.5f)));
+    // Set rescaled size
+    field->SetSize(size);
+
+    size_t idx, counter = idx = 0;
+    if (m_opt.enum_labels.empty() && m_opt.enum_values.empty()) {}
+    else{
+        for (auto el : m_opt.enum_labels.empty() ? m_opt.enum_values : m_opt.enum_labels) {
+            const wxString& str = _(el);
+            field->Append(str);
+            if (el.compare(selection) == 0)
+                idx = counter;
+            ++counter;
+        }
+    }
+
+    wxBitmap empty_bmp(1, field->GetFont().GetPixelSize().y + 2);
+    empty_bmp.SetWidth(0);
+    field->SetItemBitmap(0, empty_bmp);
+
+    idx == m_opt.enum_values.size() ?
+        field->SetValue(selection) :
+        field->SetSelection(idx);
+}
+
 void ColourPicker::BUILD()
 {
 	auto size = wxSize(wxDefaultSize);
-	if (m_opt.height >= 0) size.SetHeight(m_opt.height);
-	if (m_opt.width >= 0) size.SetWidth(m_opt.width);
+    if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+    if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
 
 	// Validate the color
-	wxString clr_str(static_cast<const ConfigOptionStrings*>(m_opt.default_value)->get_at(m_opt_idx));
+	wxString clr_str(m_opt.get_default_value<ConfigOptionStrings>()->get_at(m_opt_idx));
 	wxColour clr(clr_str);
 	if (! clr.IsOk()) {
 		clr = wxTransparentColour;
@@ -875,9 +989,9 @@ void PointCtrl::BUILD()
 {
 	auto temp = new wxBoxSizer(wxHORIZONTAL);
 
-    const wxSize field_size(4 * wxGetApp().em_unit(), -1);
+    const wxSize field_size(4 * m_em_unit, -1);
 
-	auto default_pt = static_cast<const ConfigOptionPoints*>(m_opt.default_value)->values.at(0);
+	auto default_pt = m_opt.get_default_value<ConfigOptionPoints>()->values.at(0);
 	double val = default_pt(0);
 	wxString X = val - int(val) == 0 ? wxString::Format(_T("%i"), int(val)) : wxNumberFormatter::ToString(val, 2, wxNumberFormatter::Style_None);
 	val = default_pt(1);
@@ -918,6 +1032,16 @@ void PointCtrl::BUILD()
 	y_textctrl->SetToolTip(get_tooltip_text(X+", "+Y));
 }
 
+void PointCtrl::msw_rescale()
+{
+    Field::msw_rescale();
+
+    const wxSize field_size(4 * m_em_unit, -1);
+
+    x_textctrl->SetMinSize(field_size);
+    y_textctrl->SetMinSize(field_size);
+}
+
 void PointCtrl::propagate_value(wxTextCtrl* win)
 {
     if (!win->GetValue().empty()) 
@@ -963,10 +1087,10 @@ boost::any& PointCtrl::get_value()
 void StaticText::BUILD()
 {
 	auto size = wxSize(wxDefaultSize);
-	if (m_opt.height >= 0) size.SetHeight(m_opt.height);
-	if (m_opt.width >= 0) size.SetWidth(m_opt.width);
+    if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+    if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
 
-    const wxString legend(static_cast<const ConfigOptionString*>(m_opt.default_value)->value);
+    const wxString legend = wxString::FromUTF8(m_opt.get_default_value<ConfigOptionString>()->value.c_str());
     auto temp = new wxStaticText(m_parent, wxID_ANY, legend, wxDefaultPosition, size, wxST_ELLIPSIZE_MIDDLE);
 	temp->SetFont(Slic3r::GUI::wxGetApp().normal_font());
 	temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
@@ -978,6 +1102,22 @@ void StaticText::BUILD()
 	temp->SetToolTip(get_tooltip_text(legend));
 }
 
+void StaticText::msw_rescale()
+{
+    Field::msw_rescale();
+
+    auto size = wxSize(wxDefaultSize);
+    if (m_opt.height >= 0) size.SetHeight(m_opt.height*m_em_unit);
+    if (m_opt.width >= 0) size.SetWidth(m_opt.width*m_em_unit);
+
+    if (size != wxDefaultSize)
+    {
+        wxStaticText* field = dynamic_cast<wxStaticText*>(window);
+        field->SetSize(size);
+        field->SetMinSize(size);
+    }
+}
+
 void SliderCtrl::BUILD()
 {
 	auto size = wxSize(wxDefaultSize);
@@ -986,7 +1126,7 @@ void SliderCtrl::BUILD()
 
 	auto temp = new wxBoxSizer(wxHORIZONTAL);
 
-	auto def_val = static_cast<const ConfigOptionInt*>(m_opt.default_value)->value;
+	auto def_val = m_opt.get_default_value<ConfigOptionInt>()->value;
 	auto min = m_opt.min == INT_MIN ? 0 : m_opt.min;
 	auto max = m_opt.max == INT_MAX ? 100 : m_opt.max;
 
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp
index 128d60d47..ae449450a 100644
--- a/src/slic3r/GUI/Field.hpp
+++ b/src/slic3r/GUI/Field.hpp
@@ -19,6 +19,7 @@
 #include "libslic3r/Utils.hpp"
 
 #include "GUI.hpp"
+#include "wxExtensions.hpp"
 
 #ifdef __WXMSW__
 #define wxMSW true
@@ -36,19 +37,24 @@ using t_back_to_init = std::function<void(const std::string&)>;
 
 wxString double_to_string(double const value, const int max_precision = 4);
 
-class MyButton : public wxButton
+class RevertButton : public ScalableButton
 {
     bool hidden = false; // never show button if it's hidden ones
 public:
-	MyButton() {}
-	MyButton(wxWindow* parent, wxWindowID id, const wxString& label = wxEmptyString,
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize, long style = 0,
-		const wxValidator& validator = wxDefaultValidator,
-		const wxString& name = wxTextCtrlNameStr)
-	{
-		this->Create(parent, id, label, pos, size, style, validator, name);
-	}
+// 	RevertButton() {} 
+// 	RevertButton(wxWindow* parent, wxWindowID id, const wxString& label = wxEmptyString,
+// 		const wxPoint& pos = wxDefaultPosition,
+// 		const wxSize& size = wxDefaultSize, long style = 0,
+// 		const wxValidator& validator = wxDefaultValidator,
+// 		const wxString& name = wxTextCtrlNameStr)
+// 	{
+// 		this->Create(parent, id, label, pos, size, style, validator, name);
+// 	}
+    RevertButton(
+        wxWindow *parent,
+        const std::string& icon_name = ""
+        ) :
+        ScalableButton(parent, wxID_ANY, icon_name) {}
 
 	// overridden from wxWindow base class
 	virtual bool
@@ -154,19 +160,19 @@ public:
 		return std::move(p); //!p;
     }
 
-    bool 	set_undo_bitmap(const wxBitmap *bmp) {
+    bool 	set_undo_bitmap(const ScalableBitmap *bmp) {
     	if (m_undo_bitmap != bmp) {
     		m_undo_bitmap = bmp;
-    		m_Undo_btn->SetBitmap(*bmp);
+    		m_Undo_btn->SetBitmap_(*bmp);
     		return true;
     	}
     	return false;
     }
 
-    bool 	set_undo_to_sys_bitmap(const wxBitmap *bmp) {
+    bool 	set_undo_to_sys_bitmap(const ScalableBitmap *bmp) {
     	if (m_undo_to_sys_bitmap != bmp) {
     		m_undo_to_sys_bitmap = bmp;
-    		m_Undo_to_sys_btn->SetBitmap(*bmp);
+    		m_Undo_to_sys_btn->SetBitmap_(*bmp);
     		return true;
     	}
     	return false;
@@ -211,15 +217,26 @@ public:
 		m_side_text = side_text;
     }
 
+    virtual void msw_rescale() {
+        m_Undo_to_sys_btn->msw_rescale();
+        m_Undo_btn->msw_rescale();
+
+        // update em_unit value
+        m_em_unit = em_unit(m_parent);
+    }
+
+    bool get_enter_pressed() const { return bEnterPressed; }
+    void set_enter_pressed(bool pressed) { bEnterPressed = pressed; }
+
 protected:
-	MyButton*			m_Undo_btn = nullptr;
+	RevertButton*			m_Undo_btn = nullptr;
 	// Bitmap and Tooltip text for m_Undo_btn. The wxButton will be updated only if the new wxBitmap pointer differs from the currently rendered one.
-	const wxBitmap*		m_undo_bitmap = nullptr;
-	const wxString*		m_undo_tooltip = nullptr;
-	MyButton*			m_Undo_to_sys_btn = nullptr;
+	const ScalableBitmap*   m_undo_bitmap = nullptr;
+	const wxString*         m_undo_tooltip = nullptr;
+	RevertButton*			m_Undo_to_sys_btn = nullptr;
 	// Bitmap and Tooltip text for m_Undo_to_sys_btn. The wxButton will be updated only if the new wxBitmap pointer differs from the currently rendered one.
-	const wxBitmap*		m_undo_to_sys_bitmap = nullptr;
-	const wxString*		m_undo_to_sys_tooltip = nullptr;
+    const ScalableBitmap*   m_undo_to_sys_bitmap = nullptr;
+	const wxString*		    m_undo_to_sys_tooltip = nullptr;
 
 	wxStaticText*		m_Label = nullptr;
 	// Color for Label. The wxColour will be updated only if the new wxColour pointer differs from the currently rendered one.
@@ -230,6 +247,8 @@ protected:
 	// current value
 	boost::any			m_value;
 
+    int                 m_em_unit;
+
     bool    bEnterPressed = false;
     
 	friend class OptionsGroup;
@@ -273,6 +292,8 @@ public:
     }
 
 	boost::any&		get_value() override;
+
+    void            msw_rescale() override;
     
     virtual void	enable();
     virtual void	disable();
@@ -301,6 +322,8 @@ public:
 	}
 	boost::any&		get_value() override;
 
+    void            msw_rescale() override;
+
 	void			enable() override { dynamic_cast<wxCheckBox*>(window)->Enable(); }
 	void			disable() override { dynamic_cast<wxCheckBox*>(window)->Disable(); }
 	wxWindow*		getWindow() override { return window; }
@@ -337,6 +360,8 @@ public:
 		return m_value = tmp_value;
 	}
 
+    void            msw_rescale() override;
+
 	void			enable() override { dynamic_cast<wxSpinCtrl*>(window)->Enable(); }
 	void			disable() override { dynamic_cast<wxSpinCtrl*>(window)->Disable(); }
 	wxWindow*		getWindow() override { return window; }
@@ -344,6 +369,7 @@ public:
 
 class Choice : public Field {
 	using Field::Field;
+    int             m_width{ 15 };
 public:
 	Choice(const ConfigOptionDef& opt, const t_config_option_key& id) : Field(opt, id) {}
 	Choice(wxWindow* parent, const ConfigOptionDef& opt, const t_config_option_key& id) : Field(parent, opt, id) {}
@@ -363,6 +389,8 @@ public:
 	void			set_values(const std::vector<std::string> &values);
 	boost::any&		get_value() override;
 
+    void            msw_rescale() override;
+
 	void			enable() override { dynamic_cast<wxBitmapComboBox*>(window)->Enable(); };
 	void			disable() override{ dynamic_cast<wxBitmapComboBox*>(window)->Disable(); };
 	wxWindow*		getWindow() override { return window; }
@@ -414,6 +442,8 @@ public:
 	void			set_value(const boost::any& value, bool change_event = false);
 	boost::any&		get_value() override;
 
+    void            msw_rescale() override;
+
 	void			enable() override {
 		x_textctrl->Enable();
 		y_textctrl->Enable(); }
@@ -435,7 +465,7 @@ public:
 
 	void			set_value(const std::string& value, bool change_event = false) {
 		m_disable_change_event = !change_event;
-		dynamic_cast<wxStaticText*>(window)->SetLabel(value);
+		dynamic_cast<wxStaticText*>(window)->SetLabel(wxString::FromUTF8(value.data()));
 		m_disable_change_event = false;
 	}
 	void			set_value(const boost::any& value, bool change_event = false) {
@@ -446,6 +476,8 @@ public:
 
 	boost::any&		get_value()override { return m_value; }
 
+    void            msw_rescale() override;
+
 	void			enable() override { dynamic_cast<wxStaticText*>(window)->Enable(); };
 	void			disable() override{ dynamic_cast<wxStaticText*>(window)->Disable(); };
 	wxWindow*		getWindow() override { return window; }
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
index 1a294d210..a9969802f 100644
--- a/src/slic3r/GUI/FirmwareDialog.cpp
+++ b/src/slic3r/GUI/FirmwareDialog.cpp
@@ -18,6 +18,7 @@
 #include "MsgDialog.hpp"
 #include "../Utils/HexFile.hpp"
 #include "../Utils/Serial.hpp"
+#include "wxExtensions.hpp"
 
 // wx includes need to come after asio because of the WinSock.h problem
 #include "FirmwareDialog.hpp"
@@ -59,6 +60,8 @@ enum {
 	USB_PID_MK3      = 2,
 	USB_PID_MMU_BOOT = 3,
 	USB_PID_MMU_APP  = 4,
+	USB_PID_CW1_BOOT = 7,
+	USB_PID_CW1_APP  = 8,
 };
 
 // This enum discriminates the kind of information in EVT_AVRDUDE,
@@ -77,6 +80,13 @@ wxDEFINE_EVENT(EVT_AVRDUDE, wxCommandEvent);
 wxDECLARE_EVENT(EVT_ASYNC_DIALOG, wxCommandEvent);
 wxDEFINE_EVENT(EVT_ASYNC_DIALOG, wxCommandEvent);
 
+struct Avr109Pid
+{
+	unsigned boot;
+	unsigned app;
+
+	Avr109Pid(unsigned boot, unsigned app) : boot(boot), app(app) {}
+};
 
 // Private
 
@@ -109,6 +119,10 @@ struct FirmwareDialog::priv
 
 	wxTimer timer_pulse;
 
+    int min_width;
+    int min_height;
+    int min_height_expanded;
+
 	// Async modal dialog during flashing
 	std::mutex mutex;
 	int modal_response;
@@ -146,24 +160,40 @@ struct FirmwareDialog::priv
 	void flashing_done(AvrDudeComplete complete);
 	void enable_port_picker(bool enable);
 	void load_hex_file(const wxString &path);
-	void queue_status(wxString message);
-	void queue_error(const wxString &message);
+	void queue_event(AvrdudeEvent aevt, wxString message);
 
 	bool ask_model_id_mismatch(const std::string &printer_model);
 	bool check_model_id();
-	void wait_for_mmu_bootloader(unsigned retries);
-	void mmu_reboot(const SerialPortInfo &port);
-	void lookup_port_mmu();
+	void avr109_wait_for_bootloader(Avr109Pid usb_pid, unsigned retries);
+	void avr109_reboot(const SerialPortInfo &port);
+	void avr109_lookup_port(Avr109Pid usb_pid);
 	void prepare_common();
 	void prepare_mk2();
 	void prepare_mk3();
-	void prepare_mm_control();
+	void prepare_avr109(Avr109Pid usb_pid);
 	void perform_upload();
 
 	void user_cancel();
 	void on_avrdude(const wxCommandEvent &evt);
 	void on_async_dialog(const wxCommandEvent &evt);
 	void ensure_joined();
+
+	void queue_status(wxString message) { queue_event(AE_STATUS, std::move(message)); }
+
+	template<class ...Args> void queue_message(const wxString &format, Args... args) {
+		auto message = wxString::Format(format, args...);
+		BOOST_LOG_TRIVIAL(info) << message;
+		message.Append('\n');
+		queue_event(AE_MESSAGE, std::move(message));
+	}
+
+	template<class ...Args> void queue_error(const wxString &format, Args... args) {
+		queue_message(format, args...);
+		queue_event(AE_STATUS, _(L("Flashing failed")) +": "+ wxString::Format(format, args...));
+		avrdude->cancel();
+	}
+
+	static const char* avr109_dev_name(Avr109Pid usb_pid);
 };
 
 void FirmwareDialog::priv::find_serial_ports()
@@ -259,26 +289,18 @@ void FirmwareDialog::priv::enable_port_picker(bool enable)
 void FirmwareDialog::priv::load_hex_file(const wxString &path)
 {
 	hex_file = HexFile(path.wx_str());
-	enable_port_picker(hex_file.device != HexFile::DEV_MM_CONTROL);
+	const bool auto_lookup = hex_file.device == HexFile::DEV_MM_CONTROL || hex_file.device == HexFile::DEV_CW1;
+	enable_port_picker(! auto_lookup);
 }
 
-void FirmwareDialog::priv::queue_status(wxString message)
+void FirmwareDialog::priv::queue_event(AvrdudeEvent aevt, wxString message)
 {
 	auto evt = new wxCommandEvent(EVT_AVRDUDE, this->q->GetId());
-	evt->SetExtraLong(AE_STATUS);
+	evt->SetExtraLong(aevt);
 	evt->SetString(std::move(message));
 	wxQueueEvent(this->q, evt);
 }
 
-void FirmwareDialog::priv::queue_error(const wxString &message)
-{
-	auto evt = new wxCommandEvent(EVT_AVRDUDE, this->q->GetId());
-	evt->SetExtraLong(AE_STATUS);
-	evt->SetString(wxString::Format(_(L("Flashing failed: %s")), message));
-
-	wxQueueEvent(this->q, evt);	avrdude->cancel();
-}
-
 bool FirmwareDialog::priv::ask_model_id_mismatch(const std::string &printer_model)
 {
 	// model_id in the hex file doesn't match what the printer repoted.
@@ -356,7 +378,7 @@ bool FirmwareDialog::priv::check_model_id()
 	// return false;
 }
 
-void FirmwareDialog::priv::wait_for_mmu_bootloader(unsigned retries)
+void FirmwareDialog::priv::avr109_wait_for_bootloader(Avr109Pid usb_pid, unsigned retries)
 {
 	enum {
 		SLEEP_MS = 500,
@@ -367,61 +389,63 @@ void FirmwareDialog::priv::wait_for_mmu_bootloader(unsigned retries)
 
 		auto ports = Utils::scan_serial_ports_extended();
 		ports.erase(std::remove_if(ports.begin(), ports.end(), [=](const SerialPortInfo &port ) {
-			return port.id_vendor != USB_VID_PRUSA || port.id_product != USB_PID_MMU_BOOT;
+			return port.id_vendor != USB_VID_PRUSA || port.id_product != usb_pid.boot;
 		}), ports.end());
 
 		if (ports.size() == 1) {
 			port = ports[0];
 			return;
 		} else if (ports.size() > 1) {
-			BOOST_LOG_TRIVIAL(error) << "Several VID/PID 0x2c99/3 devices found";
-			queue_error(_(L("Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at a time for flashing.")));
+			queue_message("Several VID/PID 0x2c99/%u devices found", usb_pid.boot);
+			queue_error(_(L("Multiple %s devices found. Please only connect one at a time for flashing.")), avr109_dev_name(usb_pid));
 			return;
 		}
 	}
 }
 
-void FirmwareDialog::priv::mmu_reboot(const SerialPortInfo &port)
+void FirmwareDialog::priv::avr109_reboot(const SerialPortInfo &port)
 {
 	asio::io_service io;
 	Serial serial(io, port.port, 1200);
 	std::this_thread::sleep_for(std::chrono::milliseconds(50));
 }
 
-void FirmwareDialog::priv::lookup_port_mmu()
+void FirmwareDialog::priv::avr109_lookup_port(Avr109Pid usb_pid)
 {
-	static const auto msg_not_found =
-		"The Multi Material Control device was not found.\n"
-		"If the device is connected, please press the Reset button next to the USB connector ...";
+	const char *dev_name = avr109_dev_name(usb_pid);
+	const wxString msg_not_found = wxString::Format(
+		_(L("The %s device was not found.\n"
+			"If the device is connected, please press the Reset button next to the USB connector ...")),
+		dev_name);
 
-	BOOST_LOG_TRIVIAL(info) << "Flashing MMU 2.0, looking for VID/PID 0x2c99/3 or 0x2c99/4 ...";
+	queue_message("Flashing %s, looking for VID/PID 0x2c99/%u or 0x2c99/%u ...", dev_name, usb_pid.boot, usb_pid.app);
 
 	auto ports = Utils::scan_serial_ports_extended();
 	ports.erase(std::remove_if(ports.begin(), ports.end(), [=](const SerialPortInfo &port ) {
 		return port.id_vendor != USB_VID_PRUSA ||
-			port.id_product != USB_PID_MMU_BOOT &&
-			port.id_product != USB_PID_MMU_APP;
+			port.id_product != usb_pid.boot &&
+			port.id_product != usb_pid.app;
 	}), ports.end());
 
 	if (ports.size() == 0) {
-		BOOST_LOG_TRIVIAL(info) << "MMU 2.0 device not found, asking the user to press Reset and waiting for the device to show up ...";
-		queue_status(_(L(msg_not_found)));
-		wait_for_mmu_bootloader(30);
+		queue_message("The %s device was not found.", dev_name);
+		queue_status(msg_not_found);
+		avr109_wait_for_bootloader(usb_pid, 30);
 	} else if (ports.size() > 1) {
-		BOOST_LOG_TRIVIAL(error) << "Several VID/PID 0x2c99/3 devices found";
-		queue_error(_(L("Multiple Original Prusa i3 MMU 2.0 devices found. Please only connect one at a time for flashing.")));
+		queue_message("Several VID/PID 0x2c99/%u devices found", usb_pid.boot);
+		queue_error(_(L("Multiple %s devices found. Please only connect one at a time for flashing.")), dev_name);
 	} else {
-		if (ports[0].id_product == USB_PID_MMU_APP) {
+		if (ports[0].id_product == usb_pid.app) {
 			// The device needs to be rebooted into the bootloader mode
-			BOOST_LOG_TRIVIAL(info) << boost::format("Found VID/PID 0x2c99/4 at `%1%`, rebooting the device ...") % ports[0].port;
-			mmu_reboot(ports[0]);
-			wait_for_mmu_bootloader(10);
+			queue_message("Found VID/PID 0x2c99/%u at `%s`, rebooting the device ...", usb_pid.app, ports[0].port);
+			avr109_reboot(ports[0]);
+			avr109_wait_for_bootloader(usb_pid, 10);
 
 			if (! port) {
 				// The device in bootloader mode was not found, inform the user and wait some more...
-				BOOST_LOG_TRIVIAL(info) << "MMU 2.0 bootloader device not found after reboot, asking the user to press Reset and waiting for the device to show up ...";
-				queue_status(_(L(msg_not_found)));
-				wait_for_mmu_bootloader(30);
+				queue_message("%s device not found after reboot", dev_name);
+				queue_status(msg_not_found);
+				avr109_wait_for_bootloader(usb_pid, 30);
 			}
 		} else {
 			port = ports[0];
@@ -498,16 +522,16 @@ void FirmwareDialog::priv::prepare_mk3()
 	avrdude->push_args(std::move(args));
 }
 
-void FirmwareDialog::priv::prepare_mm_control()
+void FirmwareDialog::priv::prepare_avr109(Avr109Pid usb_pid)
 {
 	port = boost::none;
-	lookup_port_mmu();
+	avr109_lookup_port(usb_pid);
 	if (! port) {
-		queue_error(_(L("The device could not have been found")));
+		queue_error(_(L("The %s device could not have been found")), avr109_dev_name(usb_pid));
 		return;
 	}
 
-	BOOST_LOG_TRIVIAL(info) << boost::format("Found VID/PID 0x2c99/3 at `%1%`, flashing ...") % port->port;
+	queue_message("Found VID/PID 0x2c99/%u at `%s`, flashing ...", usb_pid.boot, port->port);
 	queue_status(label_status_flashing);
 
 	std::vector<std::string> args {{
@@ -568,7 +592,11 @@ void FirmwareDialog::priv::perform_upload()
 					break;
 
 				case HexFile::DEV_MM_CONTROL:
-					this->prepare_mm_control();
+					this->prepare_avr109(Avr109Pid(USB_PID_MMU_BOOT, USB_PID_MMU_APP));
+					break;
+
+				case HexFile::DEV_CW1:
+					this->prepare_avr109(Avr109Pid(USB_PID_CW1_BOOT, USB_PID_CW1_APP));
 					break;
 
 				default:
@@ -576,7 +604,11 @@ void FirmwareDialog::priv::perform_upload()
 					break;
 				}
 			} catch (const std::exception &ex) {
-				queue_error(wxString::Format(_(L("Error accessing port at %s: %s")), port->port, ex.what()));
+				if (port) {
+					queue_error(_(L("Error accessing port at %s: %s")), port->port, ex.what());
+				} else {
+					queue_error(_(L("Error: %s")), ex.what());
+				}
 			}
 		})
 		.on_message(std::move([q, extra_verbose](const char *msg, unsigned /* size */) {
@@ -688,27 +720,38 @@ void FirmwareDialog::priv::ensure_joined()
 	avrdude.reset();
 }
 
+const char* FirmwareDialog::priv::avr109_dev_name(Avr109Pid usb_pid) {
+	switch (usb_pid.boot) {
+		case USB_PID_MMU_BOOT:
+			return "Prusa MMU 2.0 Control";
+		break;
+		case USB_PID_CW1_BOOT:
+			return "Prusa CurWa";
+		break;
+
+		default: throw std::runtime_error((boost::format("Invalid avr109 device USB PID: %1%") % usb_pid.boot).str());
+	}
+}
+
 
 // Public
 
 FirmwareDialog::FirmwareDialog(wxWindow *parent) :
-	wxDialog(parent, wxID_ANY, _(L("Firmware flasher")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
+	GUI::DPIDialog(parent, wxID_ANY, _(L("Firmware flasher")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
 	p(new priv(this))
 {
-	enum {
-		DIALOG_MARGIN = 15,
-		SPACING = 10,
-		MIN_WIDTH = 50,
-		MIN_HEIGHT = 18,
-		MIN_HEIGHT_EXPANDED = 40,
-	};
-
 	const int em = GUI::wxGetApp().em_unit();
-	int min_width = MIN_WIDTH * em;
-	int min_height = MIN_HEIGHT * em;
-	int min_height_expanded = MIN_HEIGHT_EXPANDED * em;
+	p->min_width = MIN_WIDTH * em;
+	p->min_height = MIN_HEIGHT * em;
+	p->min_height_expanded = MIN_HEIGHT_EXPANDED * em;
 
-	wxFont status_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    /* get current font from application, 
+     * because of wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) function
+     * returns font for primary Display
+     */
+    const wxFont& font = GUI::wxGetApp().normal_font();
+    SetFont(font);
+    wxFont status_font = font;//wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 	status_font.MakeBold();
 	wxFont mono_font(wxFontInfo().Family(wxFONTFAMILY_TELETYPE));
 	mono_font.MakeSmaller();
@@ -722,6 +765,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
 	auto *label_hex_picker = new wxStaticText(panel, wxID_ANY, _(L("Firmware image:")));
 	p->hex_picker = new wxFilePickerCtrl(panel, wxID_ANY, wxEmptyString, wxFileSelectorPromptStr,
 		"Hex files (*.hex)|*.hex|All files|*.*");
+	p->hex_picker->GetPickerCtrl()->SetLabelText(_(L("Browse")));
 
 	auto *label_port_picker = new wxStaticText(panel, wxID_ANY, _(L("Serial port:")));
 	p->port_picker = new wxComboBox(panel, wxID_ANY);
@@ -757,7 +801,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
 
 	vsizer->Add(grid, 0, wxEXPAND | wxTOP | wxBOTTOM, SPACING);
 
-	p->spoiler = new wxCollapsiblePane(panel, wxID_ANY, _(L("Advanced: avrdude output log")), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE | wxCP_NO_TLW_RESIZE);
+	p->spoiler = new wxCollapsiblePane(panel, wxID_ANY, _(L("Advanced: Output log")), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE | wxCP_NO_TLW_RESIZE);
 	auto *spoiler_pane = p->spoiler->GetPane();
 	auto *spoiler_sizer = new wxBoxSizer(wxVERTICAL);
 	p->txt_stdout = new wxTextCtrl(spoiler_pane, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
@@ -779,10 +823,10 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
 
 	auto *topsizer = new wxBoxSizer(wxVERTICAL);
 	topsizer->Add(panel, 1, wxEXPAND | wxALL, DIALOG_MARGIN);
-	SetMinSize(wxSize(min_width, min_height));
+	SetMinSize(wxSize(p->min_width, p->min_height));
 	SetSizerAndFit(topsizer);
 	const auto size = GetSize();
-	SetSize(std::max(size.GetWidth(), static_cast<int>(min_width)), std::max(size.GetHeight(), static_cast<int>(min_height)));
+	SetSize(std::max(size.GetWidth(), static_cast<int>(p->min_width)), std::max(size.GetHeight(), static_cast<int>(p->min_height)));
 	Layout();
 
     SetEscapeId(wxID_CLOSE); // To close the dialog using "Esc" button
@@ -798,11 +842,11 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
 
 	p->spoiler->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, [=](wxCollapsiblePaneEvent &evt) {
 		if (evt.GetCollapsed()) {
-			this->SetMinSize(wxSize(min_width, min_height));
+			this->SetMinSize(wxSize(p->min_width, p->min_height));
 			const auto new_height = this->GetSize().GetHeight() - this->p->txt_stdout->GetSize().GetHeight();
 			this->SetSize(this->GetSize().GetWidth(), new_height);
 		} else {
-			this->SetMinSize(wxSize(min_width, min_height_expanded));
+			this->SetMinSize(wxSize(p->min_width, p->min_height_expanded));
 		}
 
 		this->Layout();
@@ -857,5 +901,25 @@ void FirmwareDialog::run(wxWindow *parent)
 	dialog.ShowModal();
 }
 
+void FirmwareDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    const int& em = em_unit();
+
+    msw_buttons_rescale(this, em, { p->btn_close->GetId(), 
+                                    p->btn_rescan->GetId(),
+                                    p->btn_flash->GetId(),
+                                    p->hex_picker->GetPickerCtrl()->GetId()
+                                                            });
+
+    p->min_width = MIN_WIDTH * em;
+    p->min_height = MIN_HEIGHT * em;
+    p->min_height_expanded = MIN_HEIGHT_EXPANDED * em;
+
+    const int min_height = p->spoiler->IsExpanded() ? p->min_height_expanded : p->min_height;
+    SetMinSize(wxSize(p->min_width, min_height));
+    Fit();
+
+    Refresh();
+}
 
 }
diff --git a/src/slic3r/GUI/FirmwareDialog.hpp b/src/slic3r/GUI/FirmwareDialog.hpp
index ad048bf5d..7c688d379 100644
--- a/src/slic3r/GUI/FirmwareDialog.hpp
+++ b/src/slic3r/GUI/FirmwareDialog.hpp
@@ -4,13 +4,22 @@
 #include <memory>
 
 #include <wx/dialog.h>
+#include "GUI_Utils.hpp"
 
 
 namespace Slic3r {
 
 
-class FirmwareDialog: public wxDialog
+class FirmwareDialog: public GUI::DPIDialog
 {
+    enum {
+        DIALOG_MARGIN = 15,
+        SPACING = 10,
+        MIN_WIDTH = 50,
+        MIN_HEIGHT = /*18*/25,
+        MIN_HEIGHT_EXPANDED = 40,
+    };
+
 public:
 	FirmwareDialog(wxWindow *parent);
 	FirmwareDialog(FirmwareDialog &&) = delete;
@@ -20,6 +29,9 @@ public:
 	~FirmwareDialog();
 
 	static void run(wxWindow *parent);
+
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
 private:
 	struct priv;
 	std::unique_ptr<priv> p;
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 2995e601d..ee5277ba0 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -16,6 +16,7 @@
 #include "slic3r/GUI/GLShader.hpp"
 #include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/PresetBundle.hpp"
+#include "slic3r/GUI/Tab.hpp"
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"
 #include "GUI_ObjectManipulation.hpp"
@@ -52,19 +53,13 @@
 #include <float.h>
 #include <algorithm>
 #include <cmath>
+#if ENABLE_RENDER_STATISTICS
+#include <chrono>
+#endif // ENABLE_RENDER_STATISTICS
 
 static const float TRACKBALLSIZE = 0.8f;
 static const float GROUND_Z = -0.02f;
 
-// phi / theta angles to orient the camera.
-static const float VIEW_DEFAULT[2] = { 45.0f, 45.0f };
-static const float VIEW_LEFT[2] = { 90.0f, 90.0f };
-static const float VIEW_RIGHT[2] = { -90.0f, 90.0f };
-static const float VIEW_TOP[2] = { 0.0f, 0.0f };
-static const float VIEW_BOTTOM[2] = { 0.0f, 180.0f };
-static const float VIEW_FRONT[2] = { 0.0f, 90.0f };
-static const float VIEW_REAR[2] = { 180.0f, 90.0f };
-
 static const float GIZMO_RESET_BUTTON_HEIGHT = 22.0f;
 static const float GIZMO_RESET_BUTTON_WIDTH = 70.f;
 
@@ -125,62 +120,6 @@ void Size::set_scale_factor(int scale_factor)
     m_scale_factor = scale_factor;
 }
 
-Rect::Rect()
-    : m_left(0.0f)
-    , m_top(0.0f)
-    , m_right(0.0f)
-    , m_bottom(0.0f)
-{
-}
-
-Rect::Rect(float left, float top, float right, float bottom)
-    : m_left(left)
-    , m_top(top)
-    , m_right(right)
-    , m_bottom(bottom)
-{
-}
-
-float Rect::get_left() const
-{
-    return m_left;
-}
-
-void Rect::set_left(float left)
-{
-    m_left = left;
-}
-
-float Rect::get_top() const
-{
-    return m_top;
-}
-
-void Rect::set_top(float top)
-{
-    m_top = top;
-}
-
-float Rect::get_right() const
-{
-    return m_right;
-}
-
-void Rect::set_right(float right)
-{
-    m_right = right;
-}
-
-float Rect::get_bottom() const
-{
-    return m_bottom;
-}
-
-void Rect::set_bottom(float bottom)
-{
-    m_bottom = bottom;
-}
-
 #if !ENABLE_TEXTURES_FROM_SVG
 GLCanvas3D::Shader::Shader()
     : m_shader(nullptr)
@@ -283,7 +222,7 @@ GLCanvas3D::LayersEditing::~LayersEditing()
 {
     if (m_z_texture_id != 0)
     {
-        ::glDeleteTextures(1, &m_z_texture_id);
+        glsafe(::glDeleteTextures(1, &m_z_texture_id));
         m_z_texture_id = 0;
     }
     delete m_slicing_parameters;
@@ -297,14 +236,14 @@ bool GLCanvas3D::LayersEditing::init(const std::string& vertex_shader_filename,
     if (!m_shader.init(vertex_shader_filename, fragment_shader_filename))
         return false;
 
-    ::glGenTextures(1, (GLuint*)&m_z_texture_id);
-    ::glBindTexture(GL_TEXTURE_2D, m_z_texture_id);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1);
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glGenTextures(1, (GLuint*)&m_z_texture_id));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, m_z_texture_id));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
     return true;
 }
@@ -320,16 +259,21 @@ void GLCanvas3D::LayersEditing::set_config(const DynamicPrintConfig* config)
 void GLCanvas3D::LayersEditing::select_object(const Model &model, int object_id)
 {
     const ModelObject *model_object_new = (object_id >= 0) ? model.objects[object_id] : nullptr;
-    if (model_object_new == nullptr || this->last_object_id != object_id || m_model_object != model_object_new || m_model_object->id() != model_object_new->id()) {
+    // Maximum height of an object changes when the object gets rotated or scaled.
+    // Changing maximum height of an object will invalidate the layer heigth editing profile.
+    // m_model_object->raw_bounding_box() is cached, therefore it is cheap even if this method is called frequently.
+	float new_max_z = (model_object_new == nullptr) ? 0.f : model_object_new->raw_bounding_box().size().z();
+	if (m_model_object != model_object_new || this->last_object_id != object_id || m_object_max_z != new_max_z ||
+        (model_object_new != nullptr && m_model_object->id() != model_object_new->id())) {
         m_layer_height_profile.clear();
         m_layer_height_profile_modified = false;
         delete m_slicing_parameters;
-        m_slicing_parameters = nullptr;
+        m_slicing_parameters   = nullptr;
         m_layers_texture.valid = false;
+        this->last_object_id   = object_id;
+        m_model_object         = model_object_new;
+        m_object_max_z         = new_max_z;
     }
-    this->last_object_id = object_id;
-    m_model_object       = model_object_new;
-    m_object_max_z       = (m_model_object == nullptr) ? 0.f : m_model_object->bounding_box().max.z();
 }
 
 bool GLCanvas3D::LayersEditing::is_allowed() const
@@ -360,12 +304,12 @@ void GLCanvas3D::LayersEditing::render_overlay(const GLCanvas3D& canvas) const
     const Rect& bar_rect = get_bar_rect_viewport(canvas);
     const Rect& reset_rect = get_reset_rect_viewport(canvas);
 
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
     // The viewport and camera are set to complete view and glOrtho(-$x / 2, $x / 2, -$y / 2, $y / 2, -$depth, $depth),
     // where x, y is the window size divided by $self->_zoom.
-    ::glPushMatrix();
-    ::glLoadIdentity();
+    glsafe(::glPushMatrix());
+    glsafe(::glLoadIdentity());
 
     _render_tooltip_texture(canvas, bar_rect, reset_rect);
     _render_reset_texture(reset_rect);
@@ -373,14 +317,14 @@ void GLCanvas3D::LayersEditing::render_overlay(const GLCanvas3D& canvas) const
     _render_profile(bar_rect);
 
     // Revert the matrices.
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glEnable(GL_DEPTH_TEST));
 }
 
 float GLCanvas3D::LayersEditing::get_cursor_z_relative(const GLCanvas3D& canvas)
 {
-    const Point& mouse_pos = canvas.get_local_mouse_position();
+    const Vec2d mouse_pos = canvas.get_local_mouse_position();
     const Rect& rect = get_bar_rect_screen(canvas);
     float x = (float)mouse_pos(0);
     float y = (float)mouse_pos(1);
@@ -430,7 +374,7 @@ Rect GLCanvas3D::LayersEditing::get_bar_rect_viewport(const GLCanvas3D& canvas)
     float half_w = 0.5f * (float)cnv_size.get_width();
     float half_h = 0.5f * (float)cnv_size.get_height();
 
-    float zoom = canvas.get_camera_zoom();
+    float zoom = canvas.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 
     return Rect((half_w - thickness_bar_width(canvas)) * inv_zoom, half_h * inv_zoom, half_w * inv_zoom, (-half_h + reset_button_height(canvas)) * inv_zoom);
@@ -442,7 +386,7 @@ Rect GLCanvas3D::LayersEditing::get_reset_rect_viewport(const GLCanvas3D& canvas
     float half_w = 0.5f * (float)cnv_size.get_width();
     float half_h = 0.5f * (float)cnv_size.get_height();
 
-    float zoom = canvas.get_camera_zoom();
+    float zoom = canvas.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 
     return Rect((half_w - thickness_bar_width(canvas)) * inv_zoom, (-half_h + reset_button_height(canvas)) * inv_zoom, half_w * inv_zoom, -half_h * inv_zoom);
@@ -473,7 +417,7 @@ void GLCanvas3D::LayersEditing::_render_tooltip_texture(const GLCanvas3D& canvas
     const float width = (float)m_tooltip_texture.get_width() * scale;
     const float height = (float)m_tooltip_texture.get_height() * scale;
 
-    float zoom = canvas.get_camera_zoom();
+    float zoom = canvas.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
     float gap = 10.0f * inv_zoom;
 
@@ -511,8 +455,8 @@ void GLCanvas3D::LayersEditing::_render_active_object_annotations(const GLCanvas
     // The shader requires the original model coordinates when rendering to the texture, so we pass it the unit matrix
     m_shader.set_uniform("volume_world_matrix", UNIT_MATRIX);
 
-    ::glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    ::glBindTexture(GL_TEXTURE_2D, m_z_texture_id);
+    glsafe(::glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, m_z_texture_id));
 
     // Render the color bar
     float l = bar_rect.get_left();
@@ -526,8 +470,8 @@ void GLCanvas3D::LayersEditing::_render_active_object_annotations(const GLCanvas
     ::glVertex3f(r, b, 0.0f);
     ::glVertex3f(r, t, m_object_max_z);
     ::glVertex3f(l, t, m_object_max_z);
-    ::glEnd();
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glEnd());
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
     m_shader.stop_using();
 }
@@ -543,18 +487,18 @@ void GLCanvas3D::LayersEditing::_render_profile(const Rect& bar_rect) const
     float x = bar_rect.get_left() + (float)m_slicing_parameters->layer_height * scale_x;
 
     // Baseline
-    ::glColor3f(0.0f, 0.0f, 0.0f);
+    glsafe(::glColor3f(0.0f, 0.0f, 0.0f));
     ::glBegin(GL_LINE_STRIP);
     ::glVertex2f(x, bar_rect.get_bottom());
     ::glVertex2f(x, bar_rect.get_top());
-    ::glEnd();
+    glsafe(::glEnd());
 
     // Curve
-    ::glColor3f(0.0f, 0.0f, 1.0f);
+    glsafe(::glColor3f(0.0f, 0.0f, 1.0f));
     ::glBegin(GL_LINE_STRIP);
     for (unsigned int i = 0; i < m_layer_height_profile.size(); i += 2)
         ::glVertex2f(bar_rect.get_left() + (float)m_layer_height_profile[i + 1] * scale_x, bar_rect.get_bottom() + (float)m_layer_height_profile[i] * scale_y);
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
 void GLCanvas3D::LayersEditing::render_volumes(const GLCanvas3D& canvas, const GLVolumeCollection &volumes) const
@@ -565,51 +509,52 @@ void GLCanvas3D::LayersEditing::render_volumes(const GLCanvas3D& canvas, const G
     assert(shader_id > 0);
 
     GLint current_program_id;
-    glGetIntegerv(GL_CURRENT_PROGRAM, &current_program_id);
+    glsafe(::glGetIntegerv(GL_CURRENT_PROGRAM, &current_program_id));
     if (shader_id > 0 && shader_id != current_program_id)
         // The layer editing shader is not yet active. Activate it.
-        glUseProgram(shader_id);
+        glsafe(::glUseProgram(shader_id));
     else
         // The layer editing shader was already active.
         current_program_id = -1;
 
-    GLint z_to_texture_row_id               = glGetUniformLocation(shader_id, "z_to_texture_row");
-    GLint z_texture_row_to_normalized_id    = glGetUniformLocation(shader_id, "z_texture_row_to_normalized");
-    GLint z_cursor_id                       = glGetUniformLocation(shader_id, "z_cursor");
-    GLint z_cursor_band_width_id            = glGetUniformLocation(shader_id, "z_cursor_band_width");
-    GLint world_matrix_id                   = glGetUniformLocation(shader_id, "volume_world_matrix");
+    GLint z_to_texture_row_id               = ::glGetUniformLocation(shader_id, "z_to_texture_row");
+    GLint z_texture_row_to_normalized_id    = ::glGetUniformLocation(shader_id, "z_texture_row_to_normalized");
+    GLint z_cursor_id                       = ::glGetUniformLocation(shader_id, "z_cursor");
+    GLint z_cursor_band_width_id            = ::glGetUniformLocation(shader_id, "z_cursor_band_width");
+    GLint world_matrix_id                   = ::glGetUniformLocation(shader_id, "volume_world_matrix");
+    glcheck();
 
     if (z_to_texture_row_id != -1 && z_texture_row_to_normalized_id != -1 && z_cursor_id != -1 && z_cursor_band_width_id != -1 && world_matrix_id != -1) 
     {
         const_cast<LayersEditing*>(this)->generate_layer_height_texture();
 
         // Uniforms were resolved, go ahead using the layer editing shader.
-        glUniform1f(z_to_texture_row_id, GLfloat(m_layers_texture.cells - 1) / (GLfloat(m_layers_texture.width) * GLfloat(m_object_max_z)));
-        glUniform1f(z_texture_row_to_normalized_id, GLfloat(1.0f / m_layers_texture.height));
-		glUniform1f(z_cursor_id, GLfloat(m_object_max_z) * GLfloat(this->get_cursor_z_relative(canvas)));
-		glUniform1f(z_cursor_band_width_id, GLfloat(this->band_width));
+        glsafe(::glUniform1f(z_to_texture_row_id, GLfloat(m_layers_texture.cells - 1) / (GLfloat(m_layers_texture.width) * GLfloat(m_object_max_z))));
+        glsafe(::glUniform1f(z_texture_row_to_normalized_id, GLfloat(1.0f / m_layers_texture.height)));
+        glsafe(::glUniform1f(z_cursor_id, GLfloat(m_object_max_z) * GLfloat(this->get_cursor_z_relative(canvas))));
+        glsafe(::glUniform1f(z_cursor_band_width_id, GLfloat(this->band_width)));
         // Initialize the layer height texture mapping.
         GLsizei w = (GLsizei)m_layers_texture.width;
         GLsizei h = (GLsizei)m_layers_texture.height;
         GLsizei half_w = w / 2;
         GLsizei half_h = h / 2;
-        ::glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-        glBindTexture(GL_TEXTURE_2D, m_z_texture_id);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-        glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, half_w, half_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, m_layers_texture.data.data());
-        glTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, half_w, half_h, GL_RGBA, GL_UNSIGNED_BYTE, m_layers_texture.data.data() + m_layers_texture.width * m_layers_texture.height * 4);
+        glsafe(::glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+        glsafe(::glBindTexture(GL_TEXTURE_2D, m_z_texture_id));
+        glsafe(::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0));
+        glsafe(::glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, half_w, half_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0));
+        glsafe(::glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, m_layers_texture.data.data()));
+        glsafe(::glTexSubImage2D(GL_TEXTURE_2D, 1, 0, 0, half_w, half_h, GL_RGBA, GL_UNSIGNED_BYTE, m_layers_texture.data.data() + m_layers_texture.width * m_layers_texture.height * 4));
         for (const GLVolume *glvolume : volumes.volumes) {
             // Render the object using the layer editing shader and texture.
             if (! glvolume->is_active || glvolume->composite_id.object_id != this->last_object_id || glvolume->is_modifier)
                 continue;
-            ::glUniformMatrix4fv(world_matrix_id, 1, GL_FALSE, (const GLfloat*)glvolume->world_matrix().cast<float>().data());
+            glsafe(::glUniformMatrix4fv(world_matrix_id, 1, GL_FALSE, (const GLfloat*)glvolume->world_matrix().cast<float>().data()));
             glvolume->render();
         }
         // Revert back to the previous shader.
         glBindTexture(GL_TEXTURE_2D, 0);
         if (current_program_id > 0)
-            glUseProgram(current_program_id);
+            glsafe(::glUseProgram(current_program_id));
     } 
     else 
     {
@@ -619,7 +564,7 @@ void GLCanvas3D::LayersEditing::render_volumes(const GLCanvas3D& canvas, const G
 			// Render the object using the layer editing shader and texture.
 			if (!glvolume->is_active || glvolume->composite_id.object_id != this->last_object_id || glvolume->is_modifier)
 				continue;
-			::glUniformMatrix4fv(world_matrix_id, 1, GL_FALSE, (const GLfloat*)glvolume->world_matrix().cast<float>().data());
+            glsafe(::glUniformMatrix4fv(world_matrix_id, 1, GL_FALSE, (const GLfloat*)glvolume->world_matrix().cast<float>().data()));
 			glvolume->render();
 		}
 	}
@@ -687,7 +632,7 @@ void GLCanvas3D::LayersEditing::update_slicing_parameters()
 {
 	if (m_slicing_parameters == nullptr) {
 		m_slicing_parameters = new SlicingParameters();
-    	*m_slicing_parameters = PrintObject::slicing_parameters(*m_config, *m_model_object);
+    	*m_slicing_parameters = PrintObject::slicing_parameters(*m_config, *m_model_object, m_object_max_z);
     }
 }
 
@@ -731,885 +676,10 @@ GLCanvas3D::Mouse::Mouse()
     : dragging(false)
     , position(DBL_MAX, DBL_MAX)
     , scene_position(DBL_MAX, DBL_MAX, DBL_MAX)
-    , ignore_up_event(false)
+    , ignore_left_up(false)
 {
 }
 
-#if ENABLE_SVG_ICONS
-const float GLCanvas3D::Gizmos::Default_Icons_Size = 64;
-#endif // ENABLE_SVG_ICONS
-
-GLCanvas3D::Gizmos::Gizmos()
-    : m_enabled(false)
-#if ENABLE_SVG_ICONS
-    , m_icons_texture_dirty(true)
-#endif // ENABLE_SVG_ICONS
-    , m_current(Undefined)
-#if ENABLE_SVG_ICONS
-    , m_overlay_icons_size(Default_Icons_Size)
-    , m_overlay_scale(1.0f)
-    , m_overlay_border(5.0f)
-    , m_overlay_gap_y(5.0f)
-{
-}
-#else
-{
-    set_overlay_scale(1.0);
-}
-#endif // ENABLE_SVG_ICONS
-
-GLCanvas3D::Gizmos::~Gizmos()
-{
-    reset();
-}
-
-bool GLCanvas3D::Gizmos::init(GLCanvas3D& parent)
-{
-#if !ENABLE_SVG_ICONS
-    m_icons_texture.metadata.filename = "gizmos.png";
-    m_icons_texture.metadata.icon_size = 64;
-
-    if (!m_icons_texture.metadata.filename.empty())
-    {
-        if (!m_icons_texture.texture.load_from_file(resources_dir() + "/icons/" + m_icons_texture.metadata.filename, false))
-        {
-            reset();
-            return false;
-        }
-    }
-#endif // !ENABLE_SVG_ICONS
-
-    m_background_texture.metadata.filename = "toolbar_background.png";
-    m_background_texture.metadata.left = 16;
-    m_background_texture.metadata.top = 16;
-    m_background_texture.metadata.right = 16;
-    m_background_texture.metadata.bottom = 16;
-
-    if (!m_background_texture.metadata.filename.empty())
-    {
-        if (!m_background_texture.texture.load_from_file(resources_dir() + "/icons/" + m_background_texture.metadata.filename, false))
-        {
-            reset();
-            return false;
-        }
-    }
-
-#if ENABLE_SVG_ICONS
-    GLGizmoBase* gizmo = new GLGizmoMove3D(parent, "move.svg", 0);
-#else
-    GLGizmoBase* gizmo = new GLGizmoMove3D(parent, 0);
-#endif // ENABLE_SVG_ICONS
-    if (gizmo == nullptr)
-        return false;
-
-    if (!gizmo->init())
-        return false;
-
-    m_gizmos.insert(GizmosMap::value_type(Move, gizmo));
-
-#if ENABLE_SVG_ICONS
-    gizmo = new GLGizmoScale3D(parent, "scale.svg", 1);
-#else
-    gizmo = new GLGizmoScale3D(parent, 1);
-#endif // ENABLE_SVG_ICONS
-    if (gizmo == nullptr)
-        return false;
-
-    if (!gizmo->init())
-        return false;
-
-    m_gizmos.insert(GizmosMap::value_type(Scale, gizmo));
-
-#if ENABLE_SVG_ICONS
-    gizmo = new GLGizmoRotate3D(parent, "rotate.svg", 2);
-#else
-    gizmo = new GLGizmoRotate3D(parent, 2);
-#endif // ENABLE_SVG_ICONS
-    if (gizmo == nullptr)
-    {
-        reset();
-        return false;
-    }
-
-    if (!gizmo->init())
-    {
-        reset();
-        return false;
-    }
-
-    m_gizmos.insert(GizmosMap::value_type(Rotate, gizmo));
-
-#if ENABLE_SVG_ICONS
-    gizmo = new GLGizmoFlatten(parent, "place.svg", 3);
-#else
-    gizmo = new GLGizmoFlatten(parent, 3);
-#endif // ENABLE_SVG_ICONS
-    if (gizmo == nullptr)
-        return false;
-
-    if (!gizmo->init()) {
-        reset();
-        return false;
-    }
-
-    m_gizmos.insert(GizmosMap::value_type(Flatten, gizmo));
-
-#if ENABLE_SVG_ICONS
-    gizmo = new GLGizmoCut(parent, "cut.svg", 4);
-#else
-    gizmo = new GLGizmoCut(parent, 4);
-#endif // ENABLE_SVG_ICONS
-    if (gizmo == nullptr)
-        return false;
-
-    if (!gizmo->init()) {
-        reset();
-        return false;
-    }
-
-    m_gizmos.insert(GizmosMap::value_type(Cut, gizmo));
-
-#if ENABLE_SVG_ICONS
-    gizmo = new GLGizmoSlaSupports(parent, "sla_supports.svg", 5);
-#else
-    gizmo = new GLGizmoSlaSupports(parent, 5);
-#endif // ENABLE_SVG_ICONS
-    if (gizmo == nullptr)
-        return false;
-
-    if (!gizmo->init()) {
-        reset();
-        return false;
-    }
-
-    m_gizmos.insert(GizmosMap::value_type(SlaSupports, gizmo));
-
-    return true;
-}
-
-bool GLCanvas3D::Gizmos::is_enabled() const
-{
-    return m_enabled;
-}
-
-void GLCanvas3D::Gizmos::set_enabled(bool enable)
-{
-    m_enabled = enable;
-}
-
-#if ENABLE_SVG_ICONS
-void GLCanvas3D::Gizmos::set_overlay_icon_size(float size)
-{
-    if (m_overlay_icons_size != size)
-    {
-        m_overlay_icons_size = size;
-        m_icons_texture_dirty = true;
-    }
-}
-#endif // ENABLE_SVG_ICONS
-
-void GLCanvas3D::Gizmos::set_overlay_scale(float scale)
-{
-#if ENABLE_SVG_ICONS
-    if (m_overlay_scale != scale)
-    {
-        m_overlay_scale = scale;
-        m_icons_texture_dirty = true;
-    }
-#else
-    m_overlay_icons_scale = scale;
-    m_overlay_border = 5.0f * scale;
-    m_overlay_gap_y = 5.0f * scale;
-#endif // ENABLE_SVG_ICONS
-}
-
-std::string GLCanvas3D::Gizmos::update_hover_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos, const Selection& selection)
-{
-    std::string name = "";
-
-    if (!m_enabled)
-        return name;
-
-    float cnv_h = (float)canvas.get_canvas_size().get_height();
-    float height = get_total_overlay_height();
-#if ENABLE_SVG_ICONS
-    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
-    float scaled_border = m_overlay_border * m_overlay_scale;
-    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
-    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
-    float top_y = 0.5f * (cnv_h - height) + scaled_border;
-#else
-    float top_y = 0.5f * (cnv_h - height) + m_overlay_border;
-    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
-#endif // ENABLE_SVG_ICONS
-
-    for (GizmosMap::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if ((it->second == nullptr) || !it->second->is_selectable())
-            continue;
-
-#if ENABLE_SVG_ICONS
-        bool inside = (scaled_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= scaled_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
-#else
-        bool inside = (m_overlay_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= m_overlay_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
-#endif // ENABLE_SVG_ICONS
-        if (inside)
-            name = it->second->get_name();
-
-        if (it->second->is_activable(selection) && (it->second->get_state() != GLGizmoBase::On))
-            it->second->set_state(inside ? GLGizmoBase::Hover : GLGizmoBase::Off);
-
-#if ENABLE_SVG_ICONS
-        top_y += scaled_stride_y;
-#else
-        top_y += (scaled_icons_size + m_overlay_gap_y);
-#endif // ENABLE_SVG_ICONS
-    }
-
-    return name;
-}
-
-void GLCanvas3D::Gizmos::update_on_off_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos, const Selection& selection)
-{
-    if (!m_enabled)
-        return;
-
-    float cnv_h = (float)canvas.get_canvas_size().get_height();
-    float height = get_total_overlay_height();
-
-#if ENABLE_SVG_ICONS
-    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
-    float scaled_border = m_overlay_border * m_overlay_scale;
-    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
-    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
-    float top_y = 0.5f * (cnv_h - height) + scaled_border;
-#else
-    float top_y = 0.5f * (cnv_h - height) + m_overlay_border;
-    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
-#endif // ENABLE_SVG_ICONS
-
-    for (GizmosMap::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if ((it->second == nullptr) || !it->second->is_selectable())
-            continue;
-
-#if ENABLE_SVG_ICONS
-        bool inside = (scaled_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= scaled_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
-#else
-        bool inside = (m_overlay_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= m_overlay_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
-#endif // ENABLE_SVG_ICONS
-        if (it->second->is_activable(selection) && inside)
-        {
-            if ((it->second->get_state() == GLGizmoBase::On))
-            {
-                it->second->set_state(GLGizmoBase::Hover);
-                m_current = Undefined;
-            }
-            else if ((it->second->get_state() == GLGizmoBase::Hover))
-            {
-                it->second->set_state(GLGizmoBase::On);
-                m_current = it->first;
-            }
-        }
-        else
-            it->second->set_state(GLGizmoBase::Off);
-
-#if ENABLE_SVG_ICONS
-        top_y += scaled_stride_y;
-#else
-        top_y += (scaled_icons_size + m_overlay_gap_y);
-#endif // ENABLE_SVG_ICONS
-    }
-
-    GizmosMap::iterator it = m_gizmos.find(m_current);
-    if ((it != m_gizmos.end()) && (it->second != nullptr) && (it->second->get_state() != GLGizmoBase::On))
-        it->second->set_state(GLGizmoBase::On);
-}
-
-void GLCanvas3D::Gizmos::update_on_off_state(const Selection& selection)
-{
-    GizmosMap::iterator it = m_gizmos.find(m_current);
-    if ((it != m_gizmos.end()) && (it->second != nullptr))
-    {
-        if (!it->second->is_activable(selection))
-        {
-            it->second->set_state(GLGizmoBase::Off);
-            m_current = Undefined;
-        }
-    }
-}
-
-void GLCanvas3D::Gizmos::reset_all_states()
-{
-    if (!m_enabled)
-        return;
-
-    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if (it->second != nullptr)
-        {
-            it->second->set_state(GLGizmoBase::Off);
-            it->second->set_hover_id(-1);
-        }
-    }
-
-    m_current = Undefined;
-}
-
-void GLCanvas3D::Gizmos::set_hover_id(int id)
-{
-    if (!m_enabled)
-        return;
-
-    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if ((it->second != nullptr) && (it->second->get_state() == GLGizmoBase::On))
-            it->second->set_hover_id(id);
-    }
-}
-
-void GLCanvas3D::Gizmos::enable_grabber(EType type, unsigned int id, bool enable)
-{
-    if (!m_enabled)
-        return;
-
-    GizmosMap::const_iterator it = m_gizmos.find(type);
-    if (it != m_gizmos.end())
-    {
-        if (enable)
-            it->second->enable_grabber(id);
-        else
-            it->second->disable_grabber(id);
-    }
-}
-
-bool GLCanvas3D::Gizmos::overlay_contains_mouse(const GLCanvas3D& canvas, const Vec2d& mouse_pos) const
-{
-    if (!m_enabled)
-        return false;
-
-    float cnv_h = (float)canvas.get_canvas_size().get_height();
-    float height = get_total_overlay_height();
-
-#if ENABLE_SVG_ICONS
-    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
-    float scaled_border = m_overlay_border * m_overlay_scale;
-    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
-    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
-    float top_y = 0.5f * (cnv_h - height) + scaled_border;
-#else
-    float top_y = 0.5f * (cnv_h - height) + m_overlay_border;
-    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
-#endif // ENABLE_SVG_ICONS
-
-    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if ((it->second == nullptr) || !it->second->is_selectable())
-            continue;
-
-#if ENABLE_SVG_ICONS
-        if ((scaled_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= scaled_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size))
-#else
-        if ((m_overlay_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= m_overlay_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size))
-#endif // ENABLE_SVG_ICONS
-            return true;
-
-#if ENABLE_SVG_ICONS
-        top_y += scaled_stride_y;
-#else
-        top_y += (scaled_icons_size + m_overlay_gap_y);
-#endif // ENABLE_SVG_ICONS
-    }
-
-    return false;
-}
-
-bool GLCanvas3D::Gizmos::grabber_contains_mouse() const
-{
-    if (!m_enabled)
-        return false;
-
-    GLGizmoBase* curr = get_current();
-    return (curr != nullptr) ? (curr->get_hover_id() != -1) : false;
-}
-
-void GLCanvas3D::Gizmos::update(const Linef3& mouse_ray, const Selection& selection, bool shift_down, const Point* mouse_pos)
-{
-    if (!m_enabled)
-        return;
-
-    GLGizmoBase* curr = get_current();
-    if (curr != nullptr)
-        curr->update(GLGizmoBase::UpdateData(mouse_ray, mouse_pos, shift_down), selection);
-}
-
-GLCanvas3D::Gizmos::EType GLCanvas3D::Gizmos::get_current_type() const
-{
-    return m_current;
-}
-
-bool GLCanvas3D::Gizmos::is_running() const
-{
-    if (!m_enabled)
-        return false;
-
-    GLGizmoBase* curr = get_current();
-    return (curr != nullptr) ? (curr->get_state() == GLGizmoBase::On) : false;
-}
-
-bool GLCanvas3D::Gizmos::handle_shortcut(int key, const Selection& selection)
-{
-    if (!m_enabled || selection.is_empty())
-        return false;
-
-    EType old_current = m_current;
-    bool handled = false;
-    for (GizmosMap::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if ((it->second == nullptr) || !it->second->is_selectable())
-            continue;
-
-        int it_key = it->second->get_shortcut_key();
-
-        if (it->second->is_activable(selection) && ((it_key == key - 64) || (it_key == key - 96)))
-        {
-            if ((it->second->get_state() == GLGizmoBase::On))
-            {
-                it->second->set_state(GLGizmoBase::Off);
-                m_current = Undefined;
-                handled = true;
-            }
-            else if ((it->second->get_state() == GLGizmoBase::Off))
-            {
-                it->second->set_state(GLGizmoBase::On);
-                m_current = it->first;
-                handled = true;
-            }
-        }
-    }
-
-    if (handled && (old_current != Undefined) && (old_current != m_current))
-    {
-        GizmosMap::const_iterator it = m_gizmos.find(old_current);
-        if (it != m_gizmos.end())
-            it->second->set_state(GLGizmoBase::Off);
-    }
-
-    return handled;
-}
-
-bool GLCanvas3D::Gizmos::is_dragging() const
-{
-    if (!m_enabled)
-        return false;
-
-    GLGizmoBase* curr = get_current();
-    return (curr != nullptr) ? curr->is_dragging() : false;
-}
-
-void GLCanvas3D::Gizmos::start_dragging(const Selection& selection)
-{
-    if (!m_enabled)
-        return;
-
-    GLGizmoBase* curr = get_current();
-    if (curr != nullptr)
-        curr->start_dragging(selection);
-}
-
-void GLCanvas3D::Gizmos::stop_dragging()
-{
-    if (!m_enabled)
-        return;
-
-    GLGizmoBase* curr = get_current();
-    if (curr != nullptr)
-        curr->stop_dragging();
-}
-
-Vec3d GLCanvas3D::Gizmos::get_displacement() const
-{
-    if (!m_enabled)
-        return Vec3d::Zero();
-
-    GizmosMap::const_iterator it = m_gizmos.find(Move);
-    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoMove3D*>(it->second)->get_displacement() : Vec3d::Zero();
-}
-
-Vec3d GLCanvas3D::Gizmos::get_scale() const
-{
-    if (!m_enabled)
-        return Vec3d::Ones();
-
-    GizmosMap::const_iterator it = m_gizmos.find(Scale);
-    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoScale3D*>(it->second)->get_scale() : Vec3d::Ones();
-}
-
-void GLCanvas3D::Gizmos::set_scale(const Vec3d& scale)
-{
-    if (!m_enabled)
-        return;
-
-    GizmosMap::const_iterator it = m_gizmos.find(Scale);
-    if (it != m_gizmos.end())
-        reinterpret_cast<GLGizmoScale3D*>(it->second)->set_scale(scale);
-}
-
-Vec3d GLCanvas3D::Gizmos::get_rotation() const
-{
-    if (!m_enabled)
-        return Vec3d::Zero();
-
-    GizmosMap::const_iterator it = m_gizmos.find(Rotate);
-    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoRotate3D*>(it->second)->get_rotation() : Vec3d::Zero();
-}
-
-void GLCanvas3D::Gizmos::set_rotation(const Vec3d& rotation)
-{
-    if (!m_enabled)
-        return;
-
-    GizmosMap::const_iterator it = m_gizmos.find(Rotate);
-    if (it != m_gizmos.end())
-        reinterpret_cast<GLGizmoRotate3D*>(it->second)->set_rotation(rotation);
-}
-
-Vec3d GLCanvas3D::Gizmos::get_flattening_normal() const
-{
-    if (!m_enabled)
-        return Vec3d::Zero();
-
-    GizmosMap::const_iterator it = m_gizmos.find(Flatten);
-    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoFlatten*>(it->second)->get_flattening_normal() : Vec3d::Zero();
-}
-
-void GLCanvas3D::Gizmos::set_flattening_data(const ModelObject* model_object)
-{
-    if (!m_enabled)
-        return;
-
-    GizmosMap::const_iterator it = m_gizmos.find(Flatten);
-    if (it != m_gizmos.end())
-        reinterpret_cast<GLGizmoFlatten*>(it->second)->set_flattening_data(model_object);
-}
-
-void GLCanvas3D::Gizmos::set_sla_support_data(ModelObject* model_object, const Selection& selection)
-{
-    if (!m_enabled)
-        return;
-
-    GizmosMap::const_iterator it = m_gizmos.find(SlaSupports);
-    if (it != m_gizmos.end())
-        reinterpret_cast<GLGizmoSlaSupports*>(it->second)->set_sla_support_data(model_object, selection);
-}
-
-
-// Returns true if the gizmo used the event to do something, false otherwise.
-bool GLCanvas3D::Gizmos::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down)
-{
-    if (!m_enabled)
-        return false;
-
-    GizmosMap::const_iterator it = m_gizmos.find(SlaSupports);
-    if (it != m_gizmos.end())
-        return reinterpret_cast<GLGizmoSlaSupports*>(it->second)->gizmo_event(action, mouse_position, shift_down);
-
-    return false;
-}
-
-void GLCanvas3D::Gizmos::render_current_gizmo(const Selection& selection) const
-{
-    if (!m_enabled)
-        return;
-
-    do_render_current_gizmo(selection);
-}
-
-void GLCanvas3D::Gizmos::render_current_gizmo_for_picking_pass(const Selection& selection) const
-{
-    if (!m_enabled)
-        return;
-
-    GLGizmoBase* curr = get_current();
-    if (curr != nullptr)
-        curr->render_for_picking(selection);
-}
-
-void GLCanvas3D::Gizmos::render_overlay(const GLCanvas3D& canvas, const Selection& selection) const
-{
-    if (!m_enabled)
-        return;
-
-#if ENABLE_SVG_ICONS
-    if (m_icons_texture_dirty)
-        generate_icons_texture();
-#endif // ENABLE_SVG_ICONS
-
-    ::glDisable(GL_DEPTH_TEST);
-
-    ::glPushMatrix();
-    ::glLoadIdentity();
-
-    do_render_overlay(canvas, selection);
-
-    ::glPopMatrix();
-}
-
-
-void GLCanvas3D::Gizmos::reset()
-{
-    for (GizmosMap::value_type& gizmo : m_gizmos)
-    {
-        delete gizmo.second;
-        gizmo.second = nullptr;
-    }
-
-    m_gizmos.clear();
-}
-
-void GLCanvas3D::Gizmos::do_render_overlay(const GLCanvas3D& canvas, const Selection& selection) const
-{
-    if (m_gizmos.empty())
-        return;
-
-    float cnv_w = (float)canvas.get_canvas_size().get_width();
-    float cnv_h = (float)canvas.get_canvas_size().get_height();
-    float zoom = canvas.get_camera_zoom();
-    float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
-
-    float height = get_total_overlay_height();
-    float width = get_total_overlay_width();
-#if ENABLE_SVG_ICONS
-    float scaled_border = m_overlay_border * m_overlay_scale * inv_zoom;
-#else
-    float scaled_border = m_overlay_border * inv_zoom;
-#endif // ENABLE_SVG_ICONS
-
-    float top_x = (-0.5f * cnv_w) * inv_zoom;
-    float top_y = (0.5f * height) * inv_zoom;
-
-    float left = top_x;
-    float top = top_y;
-    float right = left + width * inv_zoom;
-    float bottom = top - height * inv_zoom;
-
-    // renders background
-    unsigned int bg_tex_id = m_background_texture.texture.get_id();
-    float bg_tex_width = (float)m_background_texture.texture.get_width();
-    float bg_tex_height = (float)m_background_texture.texture.get_height();
-    if ((bg_tex_id != 0) && (bg_tex_width > 0) && (bg_tex_height > 0))
-    {
-        float inv_bg_tex_width = (bg_tex_width != 0.0f) ? 1.0f / bg_tex_width : 0.0f;
-        float inv_bg_tex_height = (bg_tex_height != 0.0f) ? 1.0f / bg_tex_height : 0.0f;
-
-        float bg_uv_left = 0.0f;
-        float bg_uv_right = 1.0f;
-        float bg_uv_top = 1.0f;
-        float bg_uv_bottom = 0.0f;
-
-        float bg_left = left;
-        float bg_right = right;
-        float bg_top = top;
-        float bg_bottom = bottom;
-        float bg_width = right - left;
-        float bg_height = top - bottom;
-        float bg_min_size = std::min(bg_width, bg_height);
-
-        float bg_uv_i_left = (float)m_background_texture.metadata.left * inv_bg_tex_width;
-        float bg_uv_i_right = 1.0f - (float)m_background_texture.metadata.right * inv_bg_tex_width;
-        float bg_uv_i_top = 1.0f - (float)m_background_texture.metadata.top * inv_bg_tex_height;
-        float bg_uv_i_bottom = (float)m_background_texture.metadata.bottom * inv_bg_tex_height;
-
-        float bg_i_left = bg_left + scaled_border;
-        float bg_i_right = bg_right - scaled_border;
-        float bg_i_top = bg_top - scaled_border;
-        float bg_i_bottom = bg_bottom + scaled_border;
-
-        bg_uv_left = bg_uv_i_left;
-        bg_i_left = bg_left;
-
-        if ((m_overlay_border > 0) && (bg_uv_top != bg_uv_i_top))
-        {
-            if (bg_uv_left != bg_uv_i_left)
-                GLTexture::render_sub_texture(bg_tex_id, bg_left, bg_i_left, bg_i_top, bg_top, { { bg_uv_left, bg_uv_i_top }, { bg_uv_i_left, bg_uv_i_top }, { bg_uv_i_left, bg_uv_top }, { bg_uv_left, bg_uv_top } });
-
-            GLTexture::render_sub_texture(bg_tex_id, bg_i_left, bg_i_right, bg_i_top, bg_top, { { bg_uv_i_left, bg_uv_i_top }, { bg_uv_i_right, bg_uv_i_top }, { bg_uv_i_right, bg_uv_top }, { bg_uv_i_left, bg_uv_top } });
-
-            if (bg_uv_right != bg_uv_i_right)
-                GLTexture::render_sub_texture(bg_tex_id, bg_i_right, bg_right, bg_i_top, bg_top, { { bg_uv_i_right, bg_uv_i_top }, { bg_uv_right, bg_uv_i_top }, { bg_uv_right, bg_uv_top }, { bg_uv_i_right, bg_uv_top } });
-        }
-
-        if ((m_overlay_border > 0) && (bg_uv_left != bg_uv_i_left))
-            GLTexture::render_sub_texture(bg_tex_id, bg_left, bg_i_left, bg_i_bottom, bg_i_top, { { bg_uv_left, bg_uv_i_bottom }, { bg_uv_i_left, bg_uv_i_bottom }, { bg_uv_i_left, bg_uv_i_top }, { bg_uv_left, bg_uv_i_top } });
-
-        GLTexture::render_sub_texture(bg_tex_id, bg_i_left, bg_i_right, bg_i_bottom, bg_i_top, { { bg_uv_i_left, bg_uv_i_bottom }, { bg_uv_i_right, bg_uv_i_bottom }, { bg_uv_i_right, bg_uv_i_top }, { bg_uv_i_left, bg_uv_i_top } });
-
-        if ((m_overlay_border > 0) && (bg_uv_right != bg_uv_i_right))
-            GLTexture::render_sub_texture(bg_tex_id, bg_i_right, bg_right, bg_i_bottom, bg_i_top, { { bg_uv_i_right, bg_uv_i_bottom }, { bg_uv_right, bg_uv_i_bottom }, { bg_uv_right, bg_uv_i_top }, { bg_uv_i_right, bg_uv_i_top } });
-
-        if ((m_overlay_border > 0) && (bg_uv_bottom != bg_uv_i_bottom))
-        {
-            if (bg_uv_left != bg_uv_i_left)
-                GLTexture::render_sub_texture(bg_tex_id, bg_left, bg_i_left, bg_bottom, bg_i_bottom, { { bg_uv_left, bg_uv_bottom }, { bg_uv_i_left, bg_uv_bottom }, { bg_uv_i_left, bg_uv_i_bottom }, { bg_uv_left, bg_uv_i_bottom } });
-
-            GLTexture::render_sub_texture(bg_tex_id, bg_i_left, bg_i_right, bg_bottom, bg_i_bottom, { { bg_uv_i_left, bg_uv_bottom }, { bg_uv_i_right, bg_uv_bottom }, { bg_uv_i_right, bg_uv_i_bottom }, { bg_uv_i_left, bg_uv_i_bottom } });
-
-            if (bg_uv_right != bg_uv_i_right)
-                GLTexture::render_sub_texture(bg_tex_id, bg_i_right, bg_right, bg_bottom, bg_i_bottom, { { bg_uv_i_right, bg_uv_bottom }, { bg_uv_right, bg_uv_bottom }, { bg_uv_right, bg_uv_i_bottom }, { bg_uv_i_right, bg_uv_i_bottom } });
-        }
-    }
-
-#if ENABLE_SVG_ICONS
-    top_x += scaled_border;
-    top_y -= scaled_border;
-    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale * inv_zoom;
-
-    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale * inv_zoom;
-    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
-    unsigned int icons_texture_id = m_icons_texture.get_id();
-    unsigned int tex_width = m_icons_texture.get_width();
-    unsigned int tex_height = m_icons_texture.get_height();
-    float inv_tex_width = (tex_width != 0) ? 1.0f / (float)tex_width : 0.0f;
-    float inv_tex_height = (tex_height != 0) ? 1.0f / (float)tex_height : 0.0f;
-#else
-    top_x += m_overlay_border * inv_zoom;
-    top_y -= m_overlay_border * inv_zoom;
-    float scaled_gap_y = m_overlay_gap_y * inv_zoom;
-
-    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale * inv_zoom;
-    unsigned int icons_texture_id = m_icons_texture.texture.get_id();
-    unsigned int texture_size = m_icons_texture.texture.get_width();
-    float inv_texture_size = (texture_size != 0) ? 1.0f / (float)texture_size : 0.0f;
-#endif // ENABLE_SVG_ICONS
-
-#if ENABLE_SVG_ICONS
-    if ((icons_texture_id == 0) || (tex_width <= 0) || (tex_height <= 0))
-        return;
-#endif // ENABLE_SVG_ICONS
-
-    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if ((it->second == nullptr) || !it->second->is_selectable())
-            continue;
-
-        unsigned int sprite_id = it->second->get_sprite_id();
-        GLGizmoBase::EState state = it->second->get_state();
-
-#if ENABLE_SVG_ICONS
-        float u_icon_size = m_overlay_icons_size * m_overlay_scale * inv_tex_width;
-        float v_icon_size = m_overlay_icons_size * m_overlay_scale * inv_tex_height;
-        float v_top = sprite_id * v_icon_size;
-        float u_left = state * u_icon_size;
-        float v_bottom = v_top + v_icon_size;
-        float u_right = u_left + u_icon_size;
-#else
-        float uv_icon_size = (float)m_icons_texture.metadata.icon_size * inv_texture_size;
-        float v_top = sprite_id * uv_icon_size;
-        float u_left = state * uv_icon_size;
-        float v_bottom = v_top + uv_icon_size;
-        float u_right = u_left + uv_icon_size;
-#endif // ENABLE_SVG_ICONS
-
-        GLTexture::render_sub_texture(icons_texture_id, top_x, top_x + scaled_icons_size, top_y - scaled_icons_size, top_y, { { u_left, v_bottom }, { u_right, v_bottom }, { u_right, v_top }, { u_left, v_top } });
-        if (it->second->get_state() == GLGizmoBase::On) {
-            float toolbar_top = (float)cnv_h - canvas.m_view_toolbar.get_height();
-#if ENABLE_SVG_ICONS
-            it->second->render_input_window(width, 0.5f * cnv_h - top_y * zoom, toolbar_top, selection);
-#else
-            it->second->render_input_window(2.0f * m_overlay_border + icon_size * zoom, 0.5f * cnv_h - top_y * zoom, toolbar_top, selection);
-#endif // ENABLE_SVG_ICONS
-        }
-#if ENABLE_SVG_ICONS
-        top_y -= scaled_stride_y;
-#else
-        top_y -= (scaled_icons_size + scaled_gap_y);
-#endif // ENABLE_SVG_ICONS
-    }
-}
-
-void GLCanvas3D::Gizmos::do_render_current_gizmo(const Selection& selection) const
-{
-    GLGizmoBase* curr = get_current();
-    if (curr != nullptr)
-        curr->render(selection);
-}
-
-float GLCanvas3D::Gizmos::get_total_overlay_height() const
-{
-#if ENABLE_SVG_ICONS
-    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
-    float scaled_border = m_overlay_border * m_overlay_scale;
-    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
-    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
-    float height = 2.0f * scaled_border;
-#else
-    float height = 2.0f * m_overlay_border;
-
-    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
-#endif // ENABLE_SVG_ICONS
-
-    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if ((it->second == nullptr) || !it->second->is_selectable())
-            continue;
-
-#if ENABLE_SVG_ICONS
-        height += scaled_stride_y;
-#else
-        height += (scaled_icons_size + m_overlay_gap_y);
-#endif // ENABLE_SVG_ICONS
-    }
-
-#if ENABLE_SVG_ICONS
-    return height - scaled_gap_y;
-#else
-    return height - m_overlay_gap_y;
-#endif // ENABLE_SVG_ICONS
-}
-
-float GLCanvas3D::Gizmos::get_total_overlay_width() const
-{
-#if ENABLE_SVG_ICONS
-    return (2.0f * m_overlay_border + m_overlay_icons_size) * m_overlay_scale;
-#else
-    return (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale + 2.0f * m_overlay_border;
-#endif // ENABLE_SVG_ICONS
-}
-
-GLGizmoBase* GLCanvas3D::Gizmos::get_current() const
-{
-    GizmosMap::const_iterator it = m_gizmos.find(m_current);
-    return (it != m_gizmos.end()) ? it->second : nullptr;
-}
-
-#if ENABLE_SVG_ICONS
-bool GLCanvas3D::Gizmos::generate_icons_texture() const
-{
-    std::string path = resources_dir() + "/icons/";
-    std::vector<std::string> filenames;
-    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
-    {
-        if (it->second != nullptr)
-        {
-            const std::string& icon_filename = it->second->get_icon_filename();
-            if (!icon_filename.empty())
-                filenames.push_back(path + icon_filename);
-        }
-    }
-
-    std::vector<std::pair<int, bool>> states;
-    states.push_back(std::make_pair(1, false));
-    states.push_back(std::make_pair(0, false));
-    states.push_back(std::make_pair(0, true));
-
-    bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, (unsigned int)(m_overlay_icons_size * m_overlay_scale));
-    if (res)
-        m_icons_texture_dirty = false;
-
-    return res;
-}
-#endif // ENABLE_SVG_ICONS
-
 const unsigned char GLCanvas3D::WarningTexture::Background_Color[3] = { 120, 120, 120 };//{ 9, 91, 134 };
 const unsigned char GLCanvas3D::WarningTexture::Opacity = 255;
 
@@ -1638,6 +708,7 @@ void GLCanvas3D::WarningTexture::activate(WarningTexture::Warning warning, bool
         m_warnings.erase(it);
         if (m_warnings.empty()) { // nothing remains to be shown
     reset();
+            m_msg_text = "";// save information for rescaling
             return;
         }
     }
@@ -1646,18 +717,23 @@ void GLCanvas3D::WarningTexture::activate(WarningTexture::Warning warning, bool
     std::string text;
     bool red_colored = false;
     switch (m_warnings.back()) {
-        case ObjectOutside      : text = L("Detected object outside print volume"); break;
-        case ToolpathOutside    : text = L("Detected toolpath outside print volume"); break;
+        case ObjectOutside      : text = L("An object outside the print area was detected"); break;
+        case ToolpathOutside    : text = L("A toolpath outside the print area was detected"); break;
+        case SlaSupportsOutside : text = L("SLA supports outside the print area were detected"); break;
         case SomethingNotShown  : text = L("Some objects are not visible when editing supports"); break;
         case ObjectClashed: {
-            text = L("Detected object outside print volume\n"
-                     "Resolve a clash to continue slicing/export process correctly"); 
+            text = L("An object outside the print area was detected\n"
+                     "Resolve the current problem to continue slicing");
             red_colored = true;
             break;
         }
     }
 
     _generate(text, canvas, red_colored); // GUI::GLTexture::reset() is called at the beginning of generate(...)
+
+    // save information for rescaling
+    m_msg_text = text;
+    m_is_colored_red = red_colored;
 }
 
 
@@ -1721,12 +797,19 @@ bool GLCanvas3D::WarningTexture::_generate(const std::string& msg_utf8, const GL
     if (msg_utf8.empty())
         return false;
 
-    wxString msg = GUI::from_u8(msg_utf8);
+    wxString msg = _(msg_utf8);
 
     wxMemoryDC memDC;
+
+#ifdef __WXMSW__
+    // set scaled application normal font as default font 
+    wxFont font = wxGetApp().normal_font();
+#else
     // select default font
     const float scale = canvas.get_canvas_size().get_scale_factor();
     wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale);
+#endif
+
     font.MakeLarger();
     font.MakeBold();
     memDC.SetFont(font);
@@ -1778,14 +861,14 @@ bool GLCanvas3D::WarningTexture::_generate(const std::string& msg_utf8, const GL
     }
 
     // sends buffer to gpu
-    ::glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    ::glGenTextures(1, &m_id);
-    ::glBindTexture(GL_TEXTURE_2D, (GLuint)m_id);
-    ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data());
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+    glsafe(::glGenTextures(1, &m_id));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)m_id));
+    glsafe(::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data()));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
     return true;
 }
@@ -1797,12 +880,12 @@ void GLCanvas3D::WarningTexture::render(const GLCanvas3D& canvas) const
 
     if ((m_id > 0) && (m_original_width > 0) && (m_original_height > 0) && (m_width > 0) && (m_height > 0))
     {
-        ::glDisable(GL_DEPTH_TEST);
-        ::glPushMatrix();
-        ::glLoadIdentity();
+        glsafe(::glDisable(GL_DEPTH_TEST));
+        glsafe(::glPushMatrix());
+        glsafe(::glLoadIdentity());
 
         const Size& cnv_size = canvas.get_canvas_size();
-        float zoom = canvas.get_camera_zoom();
+        float zoom = canvas.get_camera().zoom;
         float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
         float left = (-0.5f * (float)m_original_width) * inv_zoom;
         float top = (-0.5f * (float)cnv_size.get_height() + (float)m_original_height + 2.0f) * inv_zoom;
@@ -1822,11 +905,19 @@ void GLCanvas3D::WarningTexture::render(const GLCanvas3D& canvas) const
 
         GLTexture::render_sub_texture(m_id, left, right, bottom, top, uvs);
 
-        ::glPopMatrix();
-        ::glEnable(GL_DEPTH_TEST);
+        glsafe(::glPopMatrix());
+        glsafe(::glEnable(GL_DEPTH_TEST));
     }
 }
 
+void GLCanvas3D::WarningTexture::msw_rescale(const GLCanvas3D& canvas)
+{
+    if (m_msg_text.empty())
+        return;
+
+    _generate(m_msg_text, canvas, m_is_colored_red);
+}
+
 const unsigned char GLCanvas3D::LegendTexture::Squares_Border_Color[3] = { 64, 64, 64 };
 const unsigned char GLCanvas3D::LegendTexture::Default_Background_Color[3] = { (unsigned char)(DEFAULT_BG_LIGHT_COLOR[0] * 255.0f), (unsigned char)(DEFAULT_BG_LIGHT_COLOR[1] * 255.0f), (unsigned char)(DEFAULT_BG_LIGHT_COLOR[2] * 255.0f) };
 const unsigned char GLCanvas3D::LegendTexture::Error_Background_Color[3] = { (unsigned char)(ERROR_BG_LIGHT_COLOR[0] * 255.0f), (unsigned char)(ERROR_BG_LIGHT_COLOR[1] * 255.0f), (unsigned char)(ERROR_BG_LIGHT_COLOR[2] * 255.0f) };
@@ -1896,13 +987,16 @@ bool GLCanvas3D::LegendTexture::generate(const GCodePreviewData& preview_data, c
     const int scaled_square_contour = Px_Square_Contour * scale;
     const int scaled_border = Px_Border * scale;
 
-    // select default font
-    wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale_gl);
 #ifdef __WXMSW__
+    // set scaled application normal font as default font 
+    wxFont font = wxGetApp().normal_font();
+
     // Disabling ClearType works, but the font returned is very different (much thicker) from the default.
 //    msw_disable_cleartype(font);
     bool cleartype = is_font_cleartype(font);
 #else
+    // select default font
+    wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Scale(scale_gl);
     bool cleartype = false;
 #endif /* __WXMSW__ */
 
@@ -2050,14 +1144,14 @@ bool GLCanvas3D::LegendTexture::generate(const GCodePreviewData& preview_data, c
     }
 
     // sends buffer to gpu
-    ::glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    ::glGenTextures(1, &m_id);
-    ::glBindTexture(GL_TEXTURE_2D, (GLuint)m_id);
-    ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data());
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+    glsafe(::glGenTextures(1, &m_id));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)m_id));
+    glsafe(::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data()));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
     return true;
 }
@@ -2066,12 +1160,12 @@ void GLCanvas3D::LegendTexture::render(const GLCanvas3D& canvas) const
 {
     if ((m_id > 0) && (m_original_width > 0) && (m_original_height > 0) && (m_width > 0) && (m_height > 0))
     {
-        ::glDisable(GL_DEPTH_TEST);
-        ::glPushMatrix();
-        ::glLoadIdentity();
+        glsafe(::glDisable(GL_DEPTH_TEST));
+        glsafe(::glPushMatrix());
+        glsafe(::glLoadIdentity());
 
         const Size& cnv_size = canvas.get_canvas_size();
-        float zoom = canvas.get_camera_zoom();
+        float zoom = canvas.get_camera().zoom;
         float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
         float left = (-0.5f * (float)cnv_size.get_width()) * inv_zoom;
         float top = (0.5f * (float)cnv_size.get_height()) * inv_zoom;
@@ -2091,8 +1185,8 @@ void GLCanvas3D::LegendTexture::render(const GLCanvas3D& canvas) const
 
         GLTexture::render_sub_texture(m_id, left, right, bottom, top, uvs);
 
-        ::glPopMatrix();
-        ::glEnable(GL_DEPTH_TEST);
+        glsafe(::glPopMatrix());
+        glsafe(::glEnable(GL_DEPTH_TEST));
     }
 }
 
@@ -2109,11 +1203,13 @@ wxDEFINE_EVENT(EVT_GLCANVAS_INSTANCE_MOVED, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLCANVAS_INSTANCE_ROTATED, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLCANVAS_INSTANCE_SCALED, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLCANVAS_WIPETOWER_MOVED, Vec3dEvent);
+wxDEFINE_EVENT(EVT_GLCANVAS_WIPETOWER_ROTATED, Vec3dEvent);
 wxDEFINE_EVENT(EVT_GLCANVAS_ENABLE_ACTION_BUTTONS, Event<bool>);
 wxDEFINE_EVENT(EVT_GLCANVAS_UPDATE_GEOMETRY, Vec3dsEvent<2>);
 wxDEFINE_EVENT(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent);
+wxDEFINE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent);
 
 GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar)
     : m_canvas(canvas)
@@ -2139,7 +1235,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar
     , m_initialized(false)
     , m_use_VBOs(false)
     , m_apply_zoom_to_volumes_filter(false)
-    , m_hover_volume_id(-1)
     , m_legend_texture_enabled(false)
     , m_picking_enabled(false)
     , m_moving_enabled(false)
@@ -2148,6 +1243,7 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar
     , m_regenerate_volumes(true)
     , m_moving(false)
     , m_tab_down(false)
+    , m_cursor_type(Standard)
     , m_color_by("volume")
     , m_reload_delayed(false)
     , m_render_sla_auxiliaries(true)
@@ -2181,53 +1277,53 @@ bool GLCanvas3D::init(bool useVBOs, bool use_legacy_opengl)
     if ((m_canvas == nullptr) || (m_context == nullptr))
         return false;
 
-    ::glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-    ::glClearDepth(1.0f);
+    glsafe(::glClearColor(1.0f, 1.0f, 1.0f, 1.0f));
+    glsafe(::glClearDepth(1.0f));
 
-    ::glDepthFunc(GL_LESS);
+    glsafe(::glDepthFunc(GL_LESS));
 
-    ::glEnable(GL_DEPTH_TEST);
-    ::glEnable(GL_CULL_FACE);
-    ::glEnable(GL_BLEND);
-    ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glsafe(::glEnable(GL_DEPTH_TEST));
+    glsafe(::glEnable(GL_CULL_FACE));
+    glsafe(::glEnable(GL_BLEND));
+    glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
     // Set antialiasing / multisampling
-    ::glDisable(GL_LINE_SMOOTH);
-    ::glDisable(GL_POLYGON_SMOOTH);
+    glsafe(::glDisable(GL_LINE_SMOOTH));
+    glsafe(::glDisable(GL_POLYGON_SMOOTH));
 
     // ambient lighting
     GLfloat ambient[4] = { 0.3f, 0.3f, 0.3f, 1.0f };
-    ::glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient);
+    glsafe(::glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient));
 
-    ::glEnable(GL_LIGHT0);
-    ::glEnable(GL_LIGHT1);
+    glsafe(::glEnable(GL_LIGHT0));
+    glsafe(::glEnable(GL_LIGHT1));
 
     // light from camera
     GLfloat specular_cam[4] = { 0.3f, 0.3f, 0.3f, 1.0f };
-    ::glLightfv(GL_LIGHT1, GL_SPECULAR, specular_cam);
+    glsafe(::glLightfv(GL_LIGHT1, GL_SPECULAR, specular_cam));
     GLfloat diffuse_cam[4] = { 0.2f, 0.2f, 0.2f, 1.0f };
-    ::glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse_cam);
+    glsafe(::glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse_cam));
 
     // light from above
     GLfloat specular_top[4] = { 0.2f, 0.2f, 0.2f, 1.0f };
-    ::glLightfv(GL_LIGHT0, GL_SPECULAR, specular_top);
+    glsafe(::glLightfv(GL_LIGHT0, GL_SPECULAR, specular_top));
     GLfloat diffuse_top[4] = { 0.5f, 0.5f, 0.5f, 1.0f };
-    ::glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse_top);
+    glsafe(::glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse_top));
 
     // Enables Smooth Color Shading; try GL_FLAT for (lack of) fun.
-    ::glShadeModel(GL_SMOOTH);
+    glsafe(::glShadeModel(GL_SMOOTH));
 
     // A handy trick -- have surface material mirror the color.
-    ::glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-    ::glEnable(GL_COLOR_MATERIAL);
+    glsafe(::glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE));
+    glsafe(::glEnable(GL_COLOR_MATERIAL));
 
     if (m_multisample_allowed)
-        ::glEnable(GL_MULTISAMPLE);
+        glsafe(::glEnable(GL_MULTISAMPLE));
 
     if (useVBOs && !m_shader.init("gouraud.vs", "gouraud.fs"))
         return false;
 
-    if (useVBOs && !m_layers_editing.init("variable_layer_height.vs", "variable_layer_height.fs"))
+    if (m_toolbar.is_enabled() && useVBOs && !m_layers_editing.init("variable_layer_height.vs", "variable_layer_height.fs"))
         return false;
 
     m_use_VBOs = useVBOs;
@@ -2248,7 +1344,7 @@ bool GLCanvas3D::init(bool useVBOs, bool use_legacy_opengl)
     if (!_init_toolbar())
         return false;
 
-    if (!m_selection.init(m_use_VBOs))
+    if (m_selection.is_enabled() && !m_selection.init(m_use_VBOs))
         return false;
 
     post_event(SimpleEvent(EVT_GLCANVAS_INIT));
@@ -2354,11 +1450,6 @@ void GLCanvas3D::set_color_by(const std::string& value)
     m_color_by = value;
 }
 
-float GLCanvas3D::get_camera_zoom() const
-{
-    return m_camera.zoom;
-}
-
 BoundingBoxf3 GLCanvas3D::volumes_bounding_box() const
 {
     BoundingBoxf3 bb;
@@ -2409,6 +1500,8 @@ void GLCanvas3D::enable_layers_editing(bool enable)
         if (v->is_modifier)
             v->force_transparent = enable;
     }
+
+    set_as_dirty();
 }
 
 void GLCanvas3D::enable_legend_texture(bool enable)
@@ -2432,6 +1525,11 @@ void GLCanvas3D::enable_gizmos(bool enable)
     m_gizmos.set_enabled(enable);
 }
 
+void GLCanvas3D::enable_selection(bool enable)
+{
+    m_selection.set_enabled(enable);
+}
+
 void GLCanvas3D::enable_toolbar(bool enable)
 {
     m_toolbar.set_enabled(enable);
@@ -2467,30 +1565,8 @@ void GLCanvas3D::zoom_to_selection()
 
 void GLCanvas3D::select_view(const std::string& direction)
 {
-    const float* dir_vec = nullptr;
-
-    if (direction == "iso")
-        dir_vec = VIEW_DEFAULT;
-    else if (direction == "left")
-        dir_vec = VIEW_LEFT;
-    else if (direction == "right")
-        dir_vec = VIEW_RIGHT;
-    else if (direction == "top")
-        dir_vec = VIEW_TOP;
-    else if (direction == "bottom")
-        dir_vec = VIEW_BOTTOM;
-    else if (direction == "front")
-        dir_vec = VIEW_FRONT;
-    else if (direction == "rear")
-        dir_vec = VIEW_REAR;
-
-    if (dir_vec != nullptr)
-    {
-        m_camera.phi = dir_vec[0];
-        m_camera.set_theta(dir_vec[1], false);
-        if (m_canvas != nullptr)
-            m_canvas->Refresh();
-    }
+    if (m_camera.select_view(direction) && (m_canvas != nullptr))
+        m_canvas->Refresh();
 }
 
 void GLCanvas3D::update_volumes_colors_by_extruder()
@@ -2519,6 +1595,10 @@ void GLCanvas3D::render()
     if (!_set_current() || !_3DScene::init(m_canvas))
         return;
 
+#if ENABLE_RENDER_STATISTICS
+    auto start_time = std::chrono::high_resolution_clock::now();
+#endif // ENABLE_RENDER_STATISTICS
+
     if (m_bed.get_shape().empty())
     {
         // this happens at startup when no data is still saved under <>\AppData\Roaming\Slic3rPE
@@ -2534,12 +1614,12 @@ void GLCanvas3D::render()
         m_camera.requires_zoom_to_bed = false;
     }
 
-    _camera_tranform();
+    m_camera.apply_view_matrix();
 
     GLfloat position_cam[4] = { 1.0f, 0.0f, 1.0f, 0.0f };
-    ::glLightfv(GL_LIGHT1, GL_POSITION, position_cam);
+    glsafe(::glLightfv(GL_LIGHT1, GL_POSITION, position_cam));
     GLfloat position_top[4] = { -0.5f, -0.5f, 1.0f, 0.0f };
-    ::glLightfv(GL_LIGHT0, GL_POSITION, position_top);
+    glsafe(::glLightfv(GL_LIGHT0, GL_POSITION, position_top));
 
     float theta = m_camera.get_theta();
     if (theta > 180.f)
@@ -2548,11 +1628,18 @@ void GLCanvas3D::render()
 
     wxGetApp().imgui()->new_frame();
 
-    // picking pass
-    _picking_pass();
+    if (m_picking_enabled)
+    {
+        if (m_rectangle_selection.is_dragging())
+            // picking pass using rectangle selection
+            _rectangular_selection_picking_pass();
+        else
+            // regular picking pass
+            _picking_pass();
+    }
 
     // draw scene
-    ::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
     _render_background();
 
     // textured bed needs to be rendered after objects if the texture is transparent
@@ -2585,6 +1672,9 @@ void GLCanvas3D::render()
     _render_camera_target();
 #endif // ENABLE_SHOW_CAMERA_TARGET
 
+    if (m_picking_enabled && m_rectangle_selection.is_dragging())
+        m_rectangle_selection.render(*this);
+
     // draw overlays
     _render_gizmos_overlay();
     _render_warning_texture();
@@ -2594,12 +1684,29 @@ void GLCanvas3D::render()
 #endif // !ENABLE_SVG_ICONS
     _render_toolbar();
     _render_view_toolbar();
-    if (m_layers_editing.last_object_id >= 0)
+    if ((m_layers_editing.last_object_id >= 0) && (m_layers_editing.object_max_z() > 0.0f))
         m_layers_editing.render_overlay(*this);
 
+#if ENABLE_RENDER_STATISTICS
+    ImGuiWrapper& imgui = *wxGetApp().imgui();
+    imgui.set_next_window_bg_alpha(0.5f);
+    imgui.begin(std::string("Render statistics"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
+    imgui.text(_(L("Last frame")) +": ");
+    ImGui::SameLine();
+    imgui.text(std::to_string(m_render_stats.last_frame));
+    ImGui::SameLine();
+    imgui.text(" "+_(L("ms")));
+    imgui.end();
+#endif // ENABLE_RENDER_STATISTICS
+
     wxGetApp().imgui()->render();
 
     m_canvas->SwapBuffers();
+
+#if ENABLE_RENDER_STATISTICS
+    auto end_time = std::chrono::high_resolution_clock::now();
+    m_render_stats.last_frame = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time).count();
+#endif // ENABLE_RENDER_STATISTICS
 }
 
 void GLCanvas3D::select_all()
@@ -2608,6 +1715,16 @@ void GLCanvas3D::select_all()
     m_dirty = true;
 }
 
+void GLCanvas3D::deselect_all()
+{
+    m_selection.clear();
+    m_selection.set_mode(Selection::Instance);
+    wxGetApp().obj_manipul()->set_dirty();
+    m_gizmos.reset_all_states();
+    m_gizmos.update_data(*this);
+    post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
+}
+
 void GLCanvas3D::delete_selected()
 {
     m_selection.erase();
@@ -2679,7 +1796,7 @@ void GLCanvas3D::mirror_selection(Axis axis)
 {
     m_selection.mirror(axis);
     do_mirror();
-    wxGetApp().obj_manipul()->update_settings_value(m_selection);
+    wxGetApp().obj_manipul()->set_dirty();
 }
 
 // Reload the 3D scene of 
@@ -2724,6 +1841,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
     // State of the sla_steps for all SLAPrintObjects.
     std::vector<SLASupportState>   sla_support_state;
 
+    std::vector<size_t> instance_ids_selected;
     std::vector<size_t> map_glvolume_old_to_new(m_volumes.volumes.size(), size_t(-1));
     std::vector<GLVolume*> glvolumes_new;
     glvolumes_new.reserve(m_volumes.volumes.size());
@@ -2788,6 +1906,10 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
                 if (it != model_volume_state.end() && it->geometry_id == key.geometry_id)
 					mvs = &(*it);
             }
+            // Emplace instance ID of the volume. Both the aux volumes and model volumes share the same instance ID.
+            // The wipe tower has its own wipe_tower_instance_id().
+            if (m_selection.contains_volume(volume_id))
+                instance_ids_selected.emplace_back(volume->geometry_id.second);
             if (mvs == nullptr || force_full_scene_refresh) {
                 // This GLVolume will be released.
                 if (volume->is_wipe_tower) {
@@ -2819,13 +1941,18 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
                 }
             }
         }
+        sort_remove_duplicates(instance_ids_selected);
     }
 
     if (m_reload_delayed)
         return;
 
+	bool update_object_list = false;
+
     if (m_regenerate_volumes)
     {
+		if (m_volumes.volumes != glvolumes_new)
+			update_object_list = true;
         m_volumes.volumes = std::move(glvolumes_new);
         for (unsigned int obj_idx = 0; obj_idx < (unsigned int)m_model->objects.size(); ++ obj_idx) {
             const ModelObject &model_object = *m_model->objects[obj_idx];
@@ -2840,12 +1967,16 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
                         // New volume.
                         m_volumes.load_object_volume(&model_object, obj_idx, volume_idx, instance_idx, m_color_by, m_use_VBOs && m_initialized);
 						m_volumes.volumes.back()->geometry_id = key.geometry_id;
+						update_object_list = true;
                     } else {
 						// Recycling an old GLVolume.
 						GLVolume &existing_volume = *m_volumes.volumes[it->volume_idx];
                         assert(existing_volume.geometry_id == key.geometry_id);
 						// Update the Object/Volume/Instance indices into the current Model.
-                        existing_volume.composite_id = it->composite_id;
+						if (existing_volume.composite_id != it->composite_id) {
+							existing_volume.composite_id = it->composite_id;
+							update_object_list = true;
+						}
                     }
                 }
             }
@@ -2854,6 +1985,9 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
             size_t idx = 0;
             const SLAPrint *sla_print = this->sla_print();
 			std::vector<double> shift_zs(m_model->objects.size(), 0);
+            double relative_correction_z = sla_print->relative_correction().z();
+            if (relative_correction_z <= EPSILON)
+                relative_correction_z = 1.;
 			for (const SLAPrintObject *print_object : sla_print->objects()) {
                 SLASupportState   &state        = sla_support_state[idx ++];
                 const ModelObject *model_object = print_object->model_object();
@@ -2867,7 +2001,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
                 assert(it != sla_print->model().objects.end());
 				object_idx = it - sla_print->model().objects.begin();
 				// Cache the Z offset to be applied to all volumes with this object_idx.
-				shift_zs[object_idx] = print_object->get_current_elevation();
+				shift_zs[object_idx] = print_object->get_current_elevation() / relative_correction_z;
                 // Collect indices of this print_object's instances, for which the SLA support meshes are to be added to the scene.
                 // pairs of <instance_idx, print_instance_idx>
 				std::vector<std::pair<size_t, size_t>> instances[std::tuple_size<SLASteps>::value];
@@ -2944,13 +2078,18 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
 
         update_volumes_colors_by_extruder();
 		// Update selection indices based on the old/new GLVolumeCollection.
-		m_selection.volumes_changed(map_glvolume_old_to_new);
+        if (m_selection.get_mode() == Selection::Instance)
+            m_selection.instances_changed(instance_ids_selected);
+        else
+            m_selection.volumes_changed(map_glvolume_old_to_new);
 	}
 
-    _update_gizmos_data();
+    m_gizmos.update_data(*this);
+    m_gizmos.refresh_on_off_state(m_selection);
 
     // Update the toolbar
-    post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
+	if (update_object_list)
+		post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
 
     // checks for geometry outside the print volume to render it accordingly
     if (!m_volumes.empty())
@@ -3001,7 +2140,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
         // to force a reset of its cache
         auto manip = wxGetApp().obj_manipul();
         if (manip != nullptr)
-            manip->update_settings_value(m_selection);
+            manip->set_dirty();
     }
 
     // and force this canvas to be redrawn.
@@ -3032,13 +2171,13 @@ void GLCanvas3D::load_gcode_preview(const GCodePreviewData& preview_data, const
                 m_volumes.volumes.erase(std::remove_if(m_volumes.volumes.begin(), m_volumes.volumes.end(),
                     [](const GLVolume* volume) { return volume->print_zs.empty(); }), m_volumes.volumes.end());
 
-                _load_shells_fff();
+                _load_fff_shells();
             }
             _update_toolpath_volumes_outside_state();
         }
         
         _update_gcode_volumes_visibility(preview_data);
-        _show_warning_texture_if_needed();
+        _show_warning_texture_if_needed(WarningTexture::ToolpathOutside);
 
         if (m_volumes.empty())
             reset_legend_texture();
@@ -3053,7 +2192,9 @@ void GLCanvas3D::load_sla_preview()
     if ((m_canvas != nullptr) && (print != nullptr))
     {
         _set_current();
-        _load_shells_sla();
+        _load_sla_shells();
+        _update_sla_shells_outside_state();
+        _show_warning_texture_if_needed(WarningTexture::SlaSupportsOutside);
     }
 }
 
@@ -3079,7 +2220,7 @@ void GLCanvas3D::load_preview(const std::vector<std::string>& str_tool_colors, c
     }
 
     _update_toolpath_volumes_outside_state();
-    _show_warning_texture_if_needed();
+    _show_warning_texture_if_needed(WarningTexture::ToolpathOutside);
     if (color_print_values.empty())
         reset_legend_texture();
     else {
@@ -3162,6 +2303,9 @@ void GLCanvas3D::on_idle(wxIdleEvent& evt)
 
 void GLCanvas3D::on_char(wxKeyEvent& evt)
 {
+    if (!m_initialized)
+        return;
+
     // see include/wx/defs.h enum wxKeyCode
     int keyCode = evt.GetKeyCode();
     int ctrlMask = wxMOD_CONTROL;
@@ -3172,19 +2316,38 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
         return;
     }
 
+    if (m_gizmos.on_char(evt, *this))
+        return;
+
 //#ifdef __APPLE__
 //    ctrlMask |= wxMOD_RAW_CONTROL;
 //#endif /* __APPLE__ */
     if ((evt.GetModifiers() & ctrlMask) != 0) {
         switch (keyCode) {
+#ifdef __APPLE__
         case 'a':
         case 'A':
+#else /* __APPLE__ */
         case WXK_CONTROL_A:
-            if (m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.gizmo_event(SLAGizmoEventType::SelectAll)) // Sla gizmo selects all support points
-                m_dirty = true;
-            else
+#endif /* __APPLE__ */
                 post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL));
         break;
+#ifdef __APPLE__
+        case 'c':
+        case 'C':
+#else /* __APPLE__ */
+        case WXK_CONTROL_C:
+#endif /* __APPLE__ */
+            post_event(SimpleEvent(EVT_GLTOOLBAR_COPY));
+        break;
+#ifdef __APPLE__
+        case 'v':
+        case 'V':
+#else /* __APPLE__ */
+        case WXK_CONTROL_V:
+#endif /* __APPLE__ */
+            post_event(SimpleEvent(EVT_GLTOOLBAR_PASTE));
+        break;
 #ifdef __APPLE__
         case WXK_BACK: // the low cost Apple solutions are not equipped with a Delete key, use Backspace instead.
 #else /* __APPLE__ */
@@ -3198,32 +2361,16 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
     } else {
         switch (keyCode)
         {
-        // key ESC
-        case WXK_ESCAPE: {
-            if (m_gizmos.get_current_type() != Gizmos::SlaSupports || !m_gizmos.gizmo_event(SLAGizmoEventType::DiscardChanges))
-                m_gizmos.reset_all_states();
-            m_dirty = true;
-            break;
-        }
-
-        case WXK_RETURN: {
-            if (m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.gizmo_event(SLAGizmoEventType::ApplyChanges))
-                m_dirty = true;
-            break;
-        }
-
 #ifdef __APPLE__
         case WXK_BACK: // the low cost Apple solutions are not equipped with a Delete key, use Backspace instead.
 #else /* __APPLE__ */
 		case WXK_DELETE:
 #endif /* __APPLE__ */
-                  if (m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.gizmo_event(SLAGizmoEventType::Delete))
-                      m_dirty = true;
-                  else
-                      post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE));
+                  post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE));
                   break;
 
-		case '0': { select_view("iso"); break; }
+        case WXK_ESCAPE: { deselect_all(); break; }
+        case '0': { select_view("iso"); break; }
         case '1': { select_view("top"); break; }
         case '2': { select_view("bottom"); break; }
         case '3': { select_view("front"); break; }
@@ -3234,15 +2381,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
         case '-': { post_event(Event<int>(EVT_GLCANVAS_INCREASE_INSTANCES, -1)); break; }
         case '?': { post_event(SimpleEvent(EVT_GLCANVAS_QUESTION_MARK)); break; }
         case 'A':
-        case 'a': {
-            if (m_gizmos.get_current_type() == Gizmos::SlaSupports) {
-                if (m_gizmos.gizmo_event(SLAGizmoEventType::AutomaticGeneration))
-                    m_dirty = true;
-            }
-            else
-                post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE));
-            break;
-        }
+        case 'a': { post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE)); break; }
         case 'B':
         case 'b': { zoom_to_bed(); break; }
         case 'I':
@@ -3251,25 +2390,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
         case 'o': { set_camera_zoom(-1.0f); break; }
         case 'Z':
         case 'z': { m_selection.is_empty() ? zoom_to_volumes() : zoom_to_selection(); break; }
-        case 'M':
-        case 'm': {
-            if (m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.gizmo_event(SLAGizmoEventType::ManualEditing)) {
-                m_dirty = true;
-                break;
-            }
-        } // intentional fallthrough
-        default:
-        {
-            if (m_gizmos.handle_shortcut(keyCode, m_selection))
-            {
-                _update_gizmos_data();
-                m_dirty = true;
-            }
-            else
-                evt.Skip();
-
-            break;
-        }
+        default:  { evt.Skip(); break; }
         }
     }
 }
@@ -3281,18 +2402,64 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
     auto imgui = wxGetApp().imgui();
     if (imgui->update_key_data(evt)) {
         render();
-    } else
-    if (evt.GetEventType() == wxEVT_KEY_UP) {
-        if (m_tab_down && keyCode == WXK_TAB && !evt.HasAnyModifiers()) {
-            // Enable switching between 3D and Preview with Tab
-            // m_canvas->HandleAsNavigationKey(evt);   // XXX: Doesn't work in some cases / on Linux
-            post_event(SimpleEvent(EVT_GLCANVAS_TAB));
-        } else if (m_gizmos.get_current_type() == Gizmos::SlaSupports && keyCode == WXK_SHIFT && m_gizmos.gizmo_event(SLAGizmoEventType::ShiftUp)) {
-            // shift has been just released - SLA gizmo might want to close rectangular selection.
-            m_dirty = true;
+    }
+    else
+    {
+        if (!m_gizmos.on_key(evt, *this))
+        {
+            if (evt.GetEventType() == wxEVT_KEY_UP) {
+                if (m_tab_down && keyCode == WXK_TAB && !evt.HasAnyModifiers()) {
+                    // Enable switching between 3D and Preview with Tab
+                    // m_canvas->HandleAsNavigationKey(evt);   // XXX: Doesn't work in some cases / on Linux
+                    post_event(SimpleEvent(EVT_GLCANVAS_TAB));
+                }
+                else if (keyCode == WXK_SHIFT)
+                {
+                    if (m_picking_enabled && m_rectangle_selection.is_dragging())
+                    {
+                        _update_selection_from_hover();
+                        m_rectangle_selection.stop_dragging();
+                        m_mouse.ignore_left_up = true;
+                        m_dirty = true;
+                    }
+//                    set_cursor(Standard);
+                }
+                else if (keyCode == WXK_ALT)
+                {
+                    if (m_picking_enabled && m_rectangle_selection.is_dragging())
+                    {
+                        _update_selection_from_hover();
+                        m_rectangle_selection.stop_dragging();
+                        m_mouse.ignore_left_up = true;
+                        m_dirty = true;
+                    }
+//                    set_cursor(Standard);
+                }
+                else if (keyCode == WXK_CONTROL)
+                    m_dirty = true;
+            }
+            else if (evt.GetEventType() == wxEVT_KEY_DOWN) {
+                m_tab_down = keyCode == WXK_TAB && !evt.HasAnyModifiers();
+                if (keyCode == WXK_SHIFT)
+                {
+                    if (m_picking_enabled && (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports))
+                    {
+                        m_mouse.ignore_left_up = false;
+//                        set_cursor(Cross);
+                    }
+                }
+                else if (keyCode == WXK_ALT)
+                {
+                    if (m_picking_enabled && (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports))
+                    {
+                        m_mouse.ignore_left_up = false;
+//                        set_cursor(Cross);
+                    }
+                }
+                else if (keyCode == WXK_CONTROL)
+                    m_dirty = true;
+            }
         }
-    } else if (evt.GetEventType() == wxEVT_KEY_DOWN) {
-        m_tab_down = keyCode == WXK_TAB && !evt.HasAnyModifiers();
     }
 
     if (keyCode != WXK_TAB
@@ -3306,6 +2473,9 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
 
 void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt)
 {
+    if (!m_initialized)
+        return;
+
     // Ignore the wheel events if the middle button is pressed.
     if (evt.MiddleIsDown())
         return;
@@ -3335,6 +2505,10 @@ void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt)
         }
     }
 
+    // Inform gizmos about the event so they have the opportunity to react.
+    if (m_gizmos.on_mouse_wheel(evt, *this))
+        return;
+
     // Calculate the zoom delta and apply it to the current zoom factor
     float zoom = (float)evt.GetWheelRotation() / (float)evt.GetWheelDelta();
     set_camera_zoom(zoom);
@@ -3396,6 +2570,19 @@ std::string format_mouse_event_debug_message(const wxMouseEvent &evt)
 
 void GLCanvas3D::on_mouse(wxMouseEvent& evt)
 {
+    auto mouse_up_cleanup = [this](){
+        m_moving = false;
+        m_mouse.drag.move_volume_idx = -1;
+        m_mouse.set_start_position_3D_as_invalid();
+        m_mouse.set_start_position_2D_as_invalid();
+        m_mouse.dragging = false;
+        m_mouse.ignore_left_up = false;
+        m_dirty = true;
+
+        if (m_canvas->HasCapture())
+            m_canvas->ReleaseMouse();
+    };
+
 #if ENABLE_RETINA_GL
     const float scale = m_retina_helper->get_scale_factor();
     evt.SetX(evt.GetX() * scale);
@@ -3432,11 +2619,27 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
 #endif /* SLIC3R_DEBUG_MOUSE_EVENTS */
 	}
 
-    bool processed_by_toolbar = m_toolbar.on_mouse(evt, *this);
-    processed_by_toolbar |= m_view_toolbar.on_mouse(evt, *this);
-
-    if (processed_by_toolbar)
+    if (m_toolbar.on_mouse(evt, *this))
     {
+        if (evt.LeftUp() || evt.MiddleUp() || evt.RightUp())
+            mouse_up_cleanup();
+        m_mouse.set_start_position_3D_as_invalid();
+        return;
+    }
+
+    if (m_view_toolbar.on_mouse(evt, *this))
+    {
+        if (evt.LeftUp() || evt.MiddleUp() || evt.RightUp())
+            mouse_up_cleanup();
+        m_mouse.set_start_position_3D_as_invalid();
+        return;
+    }
+
+    if (m_gizmos.on_mouse(evt, *this))
+    {
+        if (evt.LeftUp() || evt.MiddleUp() || evt.RightUp())
+            mouse_up_cleanup();
+
         m_mouse.set_start_position_3D_as_invalid();
         return;
     }
@@ -3447,7 +2650,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
     int selected_object_idx = m_selection.get_object_idx();
     int layer_editing_object_idx = is_layers_editing_enabled() ? selected_object_idx : -1;
     m_layers_editing.select_object(*m_model, layer_editing_object_idx);
-    bool gizmos_overlay_contains_mouse = m_gizmos.overlay_contains_mouse(*this, m_mouse.position);
 
     if (m_mouse.drag.move_requires_threshold && m_mouse.is_move_start_threshold_position_2D_defined() && m_mouse.is_move_threshold_met(pos))
     {
@@ -3473,7 +2675,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             if (top_level_wnd && top_level_wnd->IsActive())
                 m_canvas->SetFocus();
             m_mouse.position = pos.cast<double>();
-            // 1) forces a frame render to ensure that m_hover_volume_id is updated even when the user right clicks while
+            // 1) forces a frame render to ensure that m_hover_volume_idxs is updated even when the user right clicks while
             // the context menu is shown, ensuring it to disappear if the mouse is outside any volume and to
             // change the volume hover state if any is under the mouse 
             // 2) when switching between 3d view and preview the size of the canvas changes if the side panels are visible,
@@ -3489,10 +2691,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
         m_mouse.position = Vec2d(-1.0, -1.0);
         m_dirty = true;
     }
-    else if (evt.LeftDClick() && (m_gizmos.get_current_type() != Gizmos::Undefined))
-    {
-        m_mouse.ignore_up_event = true;
-    }
     else if (evt.LeftDown() || evt.RightDown())
     {
         // If user pressed left or right button we first check whether this happened
@@ -3517,34 +2715,13 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
                 m_dirty = true;
             }
         }
-        else if (!m_selection.is_empty() && gizmos_overlay_contains_mouse)
+        else if (evt.LeftDown() && (evt.ShiftDown() || evt.AltDown()) && m_picking_enabled)
         {
-            m_gizmos.update_on_off_state(*this, m_mouse.position, m_selection);
-            _update_gizmos_data();
-            m_dirty = true;
-        }
-        else if (evt.LeftDown() && m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.gizmo_event(SLAGizmoEventType::LeftDown, Vec2d(pos(0), pos(1)), evt.ShiftDown()))
-        {
-            // the gizmo got the event and took some action, there is no need to do anything more
-        }
-        else if (evt.LeftDown() && !m_selection.is_empty() && m_gizmos.grabber_contains_mouse())
-        {
-            _update_gizmos_data();
-            m_selection.start_dragging();
-            m_gizmos.start_dragging(m_selection);
-
-            if (m_gizmos.get_current_type() == Gizmos::Flatten) {
-                // Rotate the object so the normal points downward:
-                m_selection.flattening_rotate(m_gizmos.get_flattening_normal());
-                do_flatten();
-                wxGetApp().obj_manipul()->update_settings_value(m_selection);
+            if (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports)
+            {
+                m_rectangle_selection.start_dragging(m_mouse.position, evt.ShiftDown() ? GLSelectionRectangle::Select : GLSelectionRectangle::Deselect);
+                m_dirty = true;
             }
-
-            m_dirty = true;
-        }
-        else if ((selected_object_idx != -1) && evt.RightDown() && m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.gizmo_event(SLAGizmoEventType::RightDown))
-        {
-            // event was taken care of by the SlaSupports gizmo
         }
         else
         {
@@ -3552,21 +2729,21 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             // Don't deselect a volume if layer editing is enabled. We want the object to stay selected
             // during the scene manipulation.
 
-            if (m_picking_enabled && ((m_hover_volume_id != -1) || !is_layers_editing_enabled()))
+            if (m_picking_enabled && (!m_hover_volume_idxs.empty() || !is_layers_editing_enabled()))
             {
-                if (evt.LeftDown() && (m_hover_volume_id != -1))
+                if (evt.LeftDown() && !m_hover_volume_idxs.empty())
                 {
-                    bool already_selected = m_selection.contains_volume(m_hover_volume_id);
-                    bool shift_down = evt.ShiftDown();
+                    int volume_idx = get_first_hover_volume_idx();
+                    bool already_selected = m_selection.contains_volume(volume_idx);
+                    bool ctrl_down = evt.CmdDown();
 
                     Selection::IndicesList curr_idxs = m_selection.get_volume_idxs();
 
-                    if (already_selected && shift_down)
-                        m_selection.remove(m_hover_volume_id);
+                    if (already_selected && ctrl_down)
+                        m_selection.remove(volume_idx);
                     else
                     {
-                        bool add_as_single = !already_selected && !shift_down;
-                        m_selection.add(m_hover_volume_id, add_as_single);
+                        m_selection.add(volume_idx, !ctrl_down, true);
                         m_mouse.drag.move_requires_threshold = !already_selected;
                         if (already_selected)
                             m_mouse.set_move_start_threshold_position_2D_as_invalid();
@@ -3574,29 +2751,33 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
                             m_mouse.drag.move_start_threshold_position_2D = pos;
                     }
 
+                    // propagate event through callback
                     if (curr_idxs != m_selection.get_volume_idxs())
                     {
+                        if (m_selection.is_empty())
+                            m_gizmos.reset_all_states();
+                        else
+                            m_gizmos.refresh_on_off_state(m_selection);
 
-                        m_gizmos.update_on_off_state(m_selection);
-                        _update_gizmos_data();
+                        m_gizmos.update_data(*this);
                         post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
                         m_dirty = true;
                     }
                 }
             }
 
-            // propagate event through callback
-            if (m_hover_volume_id != -1)
+            if (!m_hover_volume_idxs.empty())
             {
                 if (evt.LeftDown() && m_moving_enabled && (m_mouse.drag.move_volume_idx == -1))
                 {
                     // Only accept the initial position, if it is inside the volume bounding box.
-                    BoundingBoxf3 volume_bbox = m_volumes.volumes[m_hover_volume_id]->transformed_bounding_box();
+                    int volume_idx = get_first_hover_volume_idx();
+                    BoundingBoxf3 volume_bbox = m_volumes.volumes[volume_idx]->transformed_bounding_box();
                     volume_bbox.offset(1.0);
                     if (volume_bbox.contains(m_mouse.scene_position))
                     {
                         // The dragging operation is initiated.
-                        m_mouse.drag.move_volume_idx = m_hover_volume_id;
+                        m_mouse.drag.move_volume_idx = volume_idx;
                         m_selection.start_dragging();
                         m_mouse.drag.start_position_3D = m_mouse.scene_position;
                         m_moving = true;
@@ -3605,8 +2786,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             }
         }
     }
-    else if (evt.Dragging() && evt.LeftIsDown() && !gizmos_overlay_contains_mouse && (m_layers_editing.state == LayersEditing::Unknown)
-          && (m_mouse.drag.move_volume_idx != -1) && m_gizmos.get_current_type() != Gizmos::SlaSupports /* don't allow dragging objects with the Sla gizmo on */)
+    else if (evt.Dragging() && evt.LeftIsDown() && (m_layers_editing.state == LayersEditing::Unknown) && (m_mouse.drag.move_volume_idx != -1))
     {
         if (!m_mouse.drag.move_requires_threshold)
         {
@@ -3614,7 +2794,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
 
             Vec3d cur_pos = m_mouse.drag.start_position_3D;
             // we do not want to translate objects if the user just clicked on an object while pressing shift to remove it from the selection and then drag
-            if (m_selection.contains_volume(m_hover_volume_id))
+            if (m_selection.contains_volume(get_first_hover_volume_idx()))
             {
                 if (m_camera.get_theta() == 90.0f)
                 {
@@ -3629,11 +2809,8 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
                     // vector from the starting position to the found intersection
                     Vec3d inters_vec = inters - m_mouse.drag.start_position_3D;
 
-                    // get the view matrix back from opengl
-                    GLfloat matrix[16];
-                    ::glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
-                    Vec3d camera_right((double)matrix[0], (double)matrix[4], (double)matrix[8]);
-                    Vec3d camera_up((double)matrix[1], (double)matrix[5], (double)matrix[9]);
+                    Vec3d camera_right = m_camera.get_dir_right();
+                    Vec3d camera_up = m_camera.get_dir_up();
 
                     // finds projection of the vector along the camera axes
                     double projection_x = inters_vec.dot(camera_right);
@@ -3654,58 +2831,16 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
 
             m_regenerate_volumes = false;
             m_selection.translate(cur_pos - m_mouse.drag.start_position_3D);
-            wxGetApp().obj_manipul()->update_settings_value(m_selection);
-
+            wxGetApp().obj_manipul()->set_dirty();
             m_dirty = true;
         }
     }
-    else if (evt.Dragging() && m_gizmos.is_dragging())
+    else if (evt.Dragging() && evt.LeftIsDown() && m_picking_enabled && m_rectangle_selection.is_dragging())
     {
-        if (!m_canvas->HasCapture())
-            m_canvas->CaptureMouse();
-
-        m_mouse.dragging = true;
-        m_gizmos.update(mouse_ray(pos), m_selection, evt.ShiftDown(), &pos);
-
-        switch (m_gizmos.get_current_type())
-        {
-        case Gizmos::Move:
-        {
-            // Apply new temporary offset
-            m_selection.translate(m_gizmos.get_displacement());
-            wxGetApp().obj_manipul()->update_settings_value(m_selection);
-            break;
-        }
-        case Gizmos::Scale:
-        {
-            // Apply new temporary scale factors
-            m_selection.scale(m_gizmos.get_scale(), evt.AltDown());
-            wxGetApp().obj_manipul()->update_settings_value(m_selection);
-            break;
-        }
-        case Gizmos::Rotate:
-        {
-            // Apply new temporary rotations
-			TransformationType transformation_type(TransformationType::World_Relative_Joint);
-			if (evt.AltDown())
-				transformation_type.set_independent();
-			m_selection.rotate(m_gizmos.get_rotation(), transformation_type);
-            wxGetApp().obj_manipul()->update_settings_value(m_selection);
-            break;
-        }
-        default:
-            break;
-        }
-
+        m_rectangle_selection.dragging(pos.cast<double>());
         m_dirty = true;
     }
-    else if (evt.Dragging() && m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.gizmo_event(SLAGizmoEventType::Dragging, Vec2d(pos(0), pos(1)), evt.ShiftDown()))
-    {
-        // the gizmo got the event and took some action, no need to do anything more here
-        m_dirty = true;
-    }
-    // do not process dragging if the mouse is into any of the HUD elements
-    else if (evt.Dragging() && !gizmos_overlay_contains_mouse)
+    else if (evt.Dragging())
     {
         m_mouse.dragging = true;
 
@@ -3718,10 +2853,11 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
         else if (evt.LeftIsDown())
         {
             // if dragging over blank area with left button, rotate
-            if ((m_hover_volume_id == -1) && m_mouse.is_start_position_3D_defined())
+            if (m_hover_volume_idxs.empty() && m_mouse.is_start_position_3D_defined())
             {
                 const Vec3d& orig = m_mouse.drag.start_position_3D;
-                m_camera.phi += (((float)pos(0) - (float)orig(0)) * TRACKBALLSIZE);
+                float sign = m_camera.inverted_phi ? -1.0f : 1.0f;
+                m_camera.phi += sign * ((float)pos(0) - (float)orig(0)) * TRACKBALLSIZE;
                 m_camera.set_theta(m_camera.get_theta() - ((float)pos(1) - (float)orig(1)) * TRACKBALLSIZE, wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() != ptSLA);
                 m_dirty = true;
             }
@@ -3751,88 +2887,50 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             _stop_timer();
             m_layers_editing.accept_changes(*this);
         }
-        else if (evt.LeftUp() && m_gizmos.get_current_type() == Gizmos::SlaSupports && !m_gizmos.is_dragging()
-              && !m_mouse.dragging)
-        {
-            // in case SLA gizmo is selected, we just pass the LeftUp event and stop processing - neither
-            // object moving or selecting is suppressed in that case
-            m_gizmos.gizmo_event(SLAGizmoEventType::LeftUp, Vec2d(pos(0), pos(1)), evt.ShiftDown());
-        }
         else if ((m_mouse.drag.move_volume_idx != -1) && m_mouse.dragging)
         {
             m_regenerate_volumes = false;
             do_move();
-            wxGetApp().obj_manipul()->update_settings_value(m_selection);
+            wxGetApp().obj_manipul()->set_dirty();
             // Let the platter know that the dragging finished, so a delayed refresh
             // of the scene with the background processing data should be performed.
             post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED));
         }
-        else if (evt.LeftUp() && !m_mouse.dragging && (m_hover_volume_id == -1) && !gizmos_overlay_contains_mouse && !m_gizmos.is_dragging()
-              && !is_layers_editing_enabled())
+        else if (evt.LeftUp() && m_picking_enabled && m_rectangle_selection.is_dragging())
+        {
+            if (evt.ShiftDown() || evt.AltDown())
+                _update_selection_from_hover();
+
+            m_rectangle_selection.stop_dragging();
+        }
+        else if (evt.LeftUp() && !m_mouse.ignore_left_up && !m_mouse.dragging && m_hover_volume_idxs.empty() && !is_layers_editing_enabled())
         {
             // deselect and propagate event through callback
-            if (!evt.ShiftDown() && m_picking_enabled && !m_mouse.ignore_up_event)
-            {
-                m_selection.clear();
-                m_selection.set_mode(Selection::Instance);
-                wxGetApp().obj_manipul()->update_settings_value(m_selection);
-                m_gizmos.reset_all_states();
-                _update_gizmos_data();
-                post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
-            }
-            m_mouse.ignore_up_event = false;
-        }
-        else if (evt.LeftUp() && m_gizmos.is_dragging())
-        {
-            switch (m_gizmos.get_current_type())
-            {
-            case Gizmos::Move:
-            {
-                m_regenerate_volumes = false;
-                do_move();
-                break;
-            }
-            case Gizmos::Scale:
-            {
-                do_scale();
-                break;
-            }
-            case Gizmos::Rotate:
-            {
-                do_rotate();
-                break;
-            }
-            default:
-                break;
-            }
-            m_gizmos.stop_dragging();
-            _update_gizmos_data();
-
-            wxGetApp().obj_manipul()->update_settings_value(m_selection);
-            // Let the platter know that the dragging finished, so a delayed refresh
-            // of the scene with the background processing data should be performed.
-            post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED));
-            m_camera.set_scene_box(scene_bounding_box());
+            if (!evt.ShiftDown() && m_picking_enabled)
+                deselect_all();
         }
+        else if (evt.LeftUp() && m_mouse.dragging)
+            // Flips X mouse deltas if bed is upside down
+            m_camera.inverted_phi = (m_camera.get_dir_up()(2) < 0.0);
         else if (evt.RightUp())
         {
             m_mouse.position = pos.cast<double>();
-            // forces a frame render to ensure that m_hover_volume_id is updated even when the user right clicks while
+            // forces a frame render to ensure that m_hover_volume_idxs is updated even when the user right clicks while
             // the context menu is already shown
             render();
-            if (m_hover_volume_id != -1)
+            if (!m_hover_volume_idxs.empty())
             {
                 // if right clicking on volume, propagate event through callback (shows context menu)
-                if (m_volumes.volumes[m_hover_volume_id]->hover
-                    && !m_volumes.volumes[m_hover_volume_id]->is_wipe_tower // no context menu for the wipe tower
-                    && m_gizmos.get_current_type() != Gizmos::SlaSupports)  // disable context menu when the gizmo is open
+                int volume_idx = get_first_hover_volume_idx();
+                if (!m_volumes.volumes[volume_idx]->is_wipe_tower // no context menu for the wipe tower
+                    && m_gizmos.get_current_type() != GLGizmosManager::SlaSupports)  // disable context menu when the gizmo is open
                 {
                     // forces the selection of the volume
-                    m_selection.add(m_hover_volume_id);
-                    m_gizmos.update_on_off_state(m_selection);
+                    m_selection.add(volume_idx);
+                    m_gizmos.refresh_on_off_state(m_selection);
                     post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
-                    _update_gizmos_data();
-                    wxGetApp().obj_manipul()->update_settings_value(m_selection);
+                    m_gizmos.update_data(*this);
+                    wxGetApp().obj_manipul()->set_dirty();
                     // forces a frame render to update the view before the context menu is shown
                     render();
 
@@ -3846,25 +2944,15 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             }
         }
 
-        m_moving = false;
-        m_mouse.drag.move_volume_idx = -1;
-        m_mouse.set_start_position_3D_as_invalid();
-        m_mouse.set_start_position_2D_as_invalid();
-        m_mouse.dragging = false;
-        m_dirty = true;
-
-        if (m_canvas->HasCapture())
-            m_canvas->ReleaseMouse();
+        mouse_up_cleanup();
     }
     else if (evt.Moving())
     {
         m_mouse.position = pos.cast<double>();
         std::string tooltip = "";
 
-        // updates gizmos overlay
-        tooltip = m_gizmos.update_hover_state(*this, m_mouse.position, m_selection);
-        if (m_selection.is_empty())
-            m_gizmos.reset_all_states();
+        if (tooltip.empty())
+            tooltip = m_gizmos.get_tooltip();
 
         if (tooltip.empty())
             tooltip = m_toolbar.get_tooltip();
@@ -3874,6 +2962,10 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
 
         set_tooltip(tooltip);
 
+        // updates gizmos overlay
+        if (m_selection.is_empty())
+            m_gizmos.reset_all_states();
+
         // Only refresh if picking is enabled, in that case the objects may get highlighted if the mouse cursor hovers over.
         if (m_picking_enabled)
             m_dirty = true;
@@ -3909,19 +3001,25 @@ Size GLCanvas3D::get_canvas_size() const
     w *= factor;
     h *= factor;
 #else
-    const float factor = 1.0;
+    const float factor = 1.0f;
 #endif
 
     return Size(w, h, factor);
 }
 
-Point GLCanvas3D::get_local_mouse_position() const
+Vec2d GLCanvas3D::get_local_mouse_position() const
 {
     if (m_canvas == nullptr)
-        return Point();
+		return Vec2d::Zero();
 
     wxPoint mouse_pos = m_canvas->ScreenToClient(wxGetMousePosition());
-    return Point(mouse_pos.x, mouse_pos.y);
+    const double factor = 
+#if ENABLE_RETINA_GL
+        m_retina_helper->get_scale_factor();
+#else
+        1.0;
+#endif
+    return Vec2d(factor * mouse_pos.x, factor * mouse_pos.y);
 }
 
 void GLCanvas3D::reset_legend_texture()
@@ -3943,10 +3041,10 @@ void GLCanvas3D::set_tooltip(const std::string& tooltip) const
             if (tooltip.empty())
                 m_canvas->UnsetToolTip();
             else
-                t->SetTip(tooltip);
+                t->SetTip(wxString::FromUTF8(tooltip.data()));
         }
         else if (!tooltip.empty()) // Avoid "empty" tooltips => unset of the empty tooltip leads to application crash under OSX
-            m_canvas->SetToolTip(tooltip);
+            m_canvas->SetToolTip(wxString::FromUTF8(tooltip.data()));
     }
 }
 
@@ -4020,6 +3118,10 @@ void GLCanvas3D::do_rotate()
     for (const GLVolume* v : m_volumes.volumes)
     {
         int object_idx = v->object_idx();
+        if (object_idx == 1000) { // the wipe tower
+            Vec3d offset = v->get_volume_offset();
+            post_event(Vec3dEvent(EVT_GLCANVAS_WIPETOWER_ROTATED, Vec3d(offset(0), offset(1), v->get_volume_rotation()(2))));
+        }
         if ((object_idx < 0) || ((int)m_model->objects.size() <= object_idx))
             continue;
 
@@ -4164,7 +3266,7 @@ void GLCanvas3D::do_mirror()
 void GLCanvas3D::set_camera_zoom(float zoom)
 {
     zoom = std::max(std::min(zoom, 4.0f), -4.0f) / 10.0f;
-    zoom = get_camera_zoom() / (1.0f - zoom);
+    zoom = m_camera.zoom / (1.0f - zoom);
 
     // Don't allow to zoom too far outside the scene.
     float zoom_min = _get_zoom_to_bounding_box_factor(_max_bounding_box());
@@ -4181,8 +3283,8 @@ void GLCanvas3D::set_camera_zoom(float zoom)
 void GLCanvas3D::update_gizmos_on_off_state()
 {
     set_as_dirty();
-    _update_gizmos_data();
-    m_gizmos.update_on_off_state(get_selection());
+    m_gizmos.update_data(*this);
+    m_gizmos.refresh_on_off_state(get_selection());
 }
 
 void GLCanvas3D::handle_sidebar_focus_event(const std::string& opt_key, bool focus_on)
@@ -4216,6 +3318,69 @@ void GLCanvas3D::update_ui_from_settings()
 #endif
 }
 
+
+
+arr::WipeTowerInfo GLCanvas3D::get_wipe_tower_info() const
+{
+    arr::WipeTowerInfo wti;
+    for (const GLVolume* vol : m_volumes.volumes) {
+        if (vol->is_wipe_tower) {
+            wti.is_wipe_tower = true;
+            wti.pos = Vec2d(m_config->opt_float("wipe_tower_x"),
+                            m_config->opt_float("wipe_tower_y"));
+            wti.rotation = (M_PI/180.) * m_config->opt_float("wipe_tower_rotation_angle");
+            const BoundingBoxf3& bb = vol->bounding_box;
+            wti.bb_size = Vec2d(bb.size()(0), bb.size()(1));
+            break;
+        }
+    }
+    return wti;
+}
+
+
+void GLCanvas3D::arrange_wipe_tower(const arr::WipeTowerInfo& wti) const
+{
+    if (wti.is_wipe_tower) {
+        DynamicPrintConfig cfg;
+        cfg.opt<ConfigOptionFloat>("wipe_tower_x", true)->value = wti.pos(0);
+        cfg.opt<ConfigOptionFloat>("wipe_tower_y", true)->value = wti.pos(1);
+        cfg.opt<ConfigOptionFloat>("wipe_tower_rotation_angle", true)->value = (180./M_PI) * wti.rotation;
+        wxGetApp().get_tab(Preset::TYPE_PRINT)->load_config(cfg);
+    }
+}
+
+
+Linef3 GLCanvas3D::mouse_ray(const Point& mouse_pos)
+{
+    float z0 = 0.0f;
+    float z1 = 1.0f;
+    return Linef3(_mouse_to_3d(mouse_pos, &z0), _mouse_to_3d(mouse_pos, &z1));
+}
+
+double GLCanvas3D::get_size_proportional_to_max_bed_size(double factor) const
+{
+    return factor * m_bed.get_bounding_box().max_size();
+}
+
+void GLCanvas3D::set_cursor(ECursorType type)
+{
+    if ((m_canvas != nullptr) && (m_cursor_type != type))
+    {
+        switch (type)
+        {
+        case Standard: { m_canvas->SetCursor(*wxSTANDARD_CURSOR); break; }
+        case Cross: { m_canvas->SetCursor(*wxCROSS_CURSOR); break; }
+        }
+
+        m_cursor_type = type;
+    }
+}
+
+void GLCanvas3D::msw_rescale()
+{
+    m_warning_texture.msw_rescale(*this);
+}
+
 bool GLCanvas3D::_is_shown_on_screen() const
 {
     return (m_canvas != nullptr) ? m_canvas->IsShownOnScreen() : false;
@@ -4266,7 +3431,7 @@ bool GLCanvas3D::_init_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "add.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Add...") + " [" + GUI::shortkey_ctrl_prefix() + "I]";
+    item.tooltip = _utf8(L("Add...")) + " [" + GUI::shortkey_ctrl_prefix() + "I]";
     item.sprite_id = 0;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_ADD)); };
     if (!m_toolbar.add_item(item))
@@ -4276,7 +3441,7 @@ bool GLCanvas3D::_init_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "remove.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Delete") + " [Del]";
+    item.tooltip = _utf8(L("Delete")) + " [Del]";
     item.sprite_id = 1;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_DELETE)); };
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_delete(); };
@@ -4287,7 +3452,7 @@ bool GLCanvas3D::_init_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "delete_all.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Delete all") + " [" + GUI::shortkey_ctrl_prefix() + "Del]";
+    item.tooltip = _utf8(L("Delete all")) + " [" + GUI::shortkey_ctrl_prefix() + "Del]";
     item.sprite_id = 2;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_DELETE_ALL)); };
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_delete_all(); };
@@ -4298,7 +3463,7 @@ bool GLCanvas3D::_init_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "arrange.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Arrange [A]");
+    item.tooltip = _utf8(L("Arrange")) + " [A]";
     item.sprite_id = 3;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_ARRANGE)); };
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_arrange(); };
@@ -4308,12 +3473,37 @@ bool GLCanvas3D::_init_toolbar()
     if (!m_toolbar.add_separator())
         return false;
 
+    item.name = "copy";
+#if ENABLE_SVG_ICONS
+    item.icon_filename = "copy.svg";
+#endif // ENABLE_SVG_ICONS
+    item.tooltip = _utf8(L("Copy")) + " [" + GUI::shortkey_ctrl_prefix() + "C]";
+    item.sprite_id = 4;
+    item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_COPY)); };
+    item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_copy(); };
+    if (!m_toolbar.add_item(item))
+        return false;
+
+    item.name = "paste";
+#if ENABLE_SVG_ICONS
+    item.icon_filename = "paste.svg";
+#endif // ENABLE_SVG_ICONS
+    item.tooltip = _utf8(L("Paste")) + " [" + GUI::shortkey_ctrl_prefix() + "V]";
+    item.sprite_id = 5;
+    item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_PASTE)); };
+    item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_paste(); };
+    if (!m_toolbar.add_item(item))
+        return false;
+
+    if (!m_toolbar.add_separator())
+        return false;
+
     item.name = "more";
 #if ENABLE_SVG_ICONS
     item.icon_filename = "instance_add.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Add instance [+]");
-    item.sprite_id = 4;
+    item.tooltip = _utf8(L("Add instance")) + " [+]";
+    item.sprite_id = 6;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_MORE)); };
     item.visibility_callback = []()->bool { return wxGetApp().get_mode() != comSimple; };
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_increase_instances(); };
@@ -4324,8 +3514,8 @@ bool GLCanvas3D::_init_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "instance_remove.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Remove instance [-]");
-    item.sprite_id = 5;
+    item.tooltip = _utf8(L("Remove instance")) + " [-]";
+    item.sprite_id = 7;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_FEWER)); };
     item.visibility_callback = []()->bool { return wxGetApp().get_mode() != comSimple; };
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_decrease_instances(); };
@@ -4339,8 +3529,8 @@ bool GLCanvas3D::_init_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "split_objects.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Split to objects");
-    item.sprite_id = 6;
+    item.tooltip = _utf8(L("Split to objects"));
+    item.sprite_id = 8;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_SPLIT_OBJECTS)); };
     item.visibility_callback = GLToolbarItem::Default_Visibility_Callback;
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_split_to_objects(); };
@@ -4351,8 +3541,8 @@ bool GLCanvas3D::_init_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "split_parts.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Split to parts");
-    item.sprite_id = 7;
+    item.tooltip = _utf8(L("Split to parts"));
+    item.sprite_id = 9;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_SPLIT_VOLUMES)); };
     item.visibility_callback = []()->bool { return wxGetApp().get_mode() != comSimple; };
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_split_to_volumes(); };
@@ -4364,13 +3554,13 @@ bool GLCanvas3D::_init_toolbar()
 
     item.name = "layersediting";
 #if ENABLE_SVG_ICONS
-    item.icon_filename = "layers.svg";
+    item.icon_filename = "layers_white.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Layers editing");
-    item.sprite_id = 8;
+    item.tooltip = _utf8(L("Layers editing"));
+    item.sprite_id = 10;
     item.is_toggable = true;
     item.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_LAYERSEDITING)); };
-    item.visibility_callback = GLToolbarItem::Default_Visibility_Callback;
+    item.visibility_callback = [this]()->bool { return m_process->current_printer_technology() == ptFFF; };
     item.enabled_state_callback = []()->bool { return wxGetApp().plater()->can_layers_editing(); };
     if (!m_toolbar.add_item(item))
         return false;
@@ -4380,8 +3570,9 @@ bool GLCanvas3D::_init_toolbar()
 
 bool GLCanvas3D::_set_current()
 {
-    if ((m_canvas != nullptr) && (m_context != nullptr))
+    if (_is_shown_on_screen() && (m_context != nullptr)) {
         return m_canvas->SetCurrent(*m_context);
+    }
 
     return false;
 }
@@ -4391,19 +3582,18 @@ void GLCanvas3D::_resize(unsigned int w, unsigned int h)
     if ((m_canvas == nullptr) && (m_context == nullptr))
         return;
 
-    wxGetApp().imgui()->set_display_size((float)w, (float)h);
+    auto *imgui = wxGetApp().imgui();
+    imgui->set_display_size((float)w, (float)h);
+    const float font_size = 1.5f * wxGetApp().em_unit();
 #if ENABLE_RETINA_GL
-    wxGetApp().imgui()->set_style_scaling(m_retina_helper->get_scale_factor());
+    imgui->set_scaling(font_size, 1.0f, m_retina_helper->get_scale_factor());
 #else
-    wxGetApp().imgui()->set_style_scaling(m_canvas->GetContentScaleFactor());
+    imgui->set_scaling(font_size, m_canvas->GetContentScaleFactor(), 1.0f);
 #endif
 
     // ensures that this canvas is current
     _set_current();
-    ::glViewport(0, 0, w, h);
-
-    ::glMatrixMode(GL_PROJECTION);
-    ::glLoadIdentity();
+    m_camera.apply_viewport(0, 0, w, h);
 
     const BoundingBoxf3& bbox = _max_bounding_box();
 
@@ -4413,7 +3603,7 @@ void GLCanvas3D::_resize(unsigned int w, unsigned int h)
     {
         float w2 = w;
         float h2 = h;
-        float two_zoom = 2.0f * get_camera_zoom();
+        float two_zoom = 2.0f * m_camera.zoom;
         if (two_zoom != 0.0f)
         {
             float inv_two_zoom = 1.0f / two_zoom;
@@ -4422,8 +3612,9 @@ void GLCanvas3D::_resize(unsigned int w, unsigned int h)
         }
 
         // FIXME: calculate a tighter value for depth will improve z-fighting
-        float depth = 5.0f * (float)bbox.max_size();
-        ::glOrtho(-w2, w2, -h2, h2, -depth, depth);
+        // Set at least some minimum depth in case the bounding box is empty to avoid an OpenGL driver error.
+        float depth = std::max(1.f, 5.0f * (float)bbox.max_size());
+        m_camera.apply_ortho_projection(-w2, w2, -h2, h2, -depth, depth);
 
         break;
     }
@@ -4456,8 +3647,6 @@ void GLCanvas3D::_resize(unsigned int w, unsigned int h)
     }
     }
 
-    ::glMatrixMode(GL_MODELVIEW);
-
     m_dirty = false;
 }
 
@@ -4491,16 +3680,11 @@ float GLCanvas3D::_get_zoom_to_bounding_box_factor(const BoundingBoxf3& bbox) co
     // then calculates the vertices coordinate on this plane along the camera xy axes
 
     // we need the view matrix, we let opengl calculate it (same as done in render())
-    _camera_tranform();
+    m_camera.apply_view_matrix();
 
-    // get the view matrix back from opengl
-    GLfloat matrix[16];
-    ::glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
-
-    // camera axes
-    Vec3d right((double)matrix[0], (double)matrix[4], (double)matrix[8]);
-    Vec3d up((double)matrix[1], (double)matrix[5], (double)matrix[9]);
-    Vec3d forward((double)matrix[2], (double)matrix[6], (double)matrix[10]);
+    Vec3d right = m_camera.get_dir_right();
+    Vec3d up = m_camera.get_dir_up();
+    Vec3d forward = m_camera.get_dir_forward();
 
     Vec3d bb_min = bbox.min;
     Vec3d bb_max = bbox.max;
@@ -4561,76 +3745,144 @@ void GLCanvas3D::_refresh_if_shown_on_screen()
         }
     }
 
-void GLCanvas3D::_camera_tranform() const
-{
-    ::glMatrixMode(GL_MODELVIEW);
-    ::glLoadIdentity();
-
-    ::glRotatef(-m_camera.get_theta(), 1.0f, 0.0f, 0.0f); // pitch
-    ::glRotatef(m_camera.phi, 0.0f, 0.0f, 1.0f);          // yaw
-    Vec3d target = -m_camera.get_target();
-    ::glTranslated(target(0), target(1), target(2));
-}
-
 void GLCanvas3D::_picking_pass() const
 {
-    const Vec2d& pos = m_mouse.position;
-
-    if (m_picking_enabled && !m_mouse.dragging && (pos != Vec2d(DBL_MAX, DBL_MAX)))
+    if (m_picking_enabled && !m_mouse.dragging && (m_mouse.position != Vec2d(DBL_MAX, DBL_MAX)))
     {
+        m_hover_volume_idxs.clear();
+
         // Render the object for picking.
         // FIXME This cannot possibly work in a multi - sampled context as the color gets mangled by the anti - aliasing.
         // Better to use software ray - casting on a bounding - box hierarchy.
 
         if (m_multisample_allowed)
-            ::glDisable(GL_MULTISAMPLE);
+            glsafe(::glDisable(GL_MULTISAMPLE));
 
-        ::glDisable(GL_BLEND);
-        ::glEnable(GL_DEPTH_TEST);
+        glsafe(::glDisable(GL_BLEND));
+        glsafe(::glEnable(GL_DEPTH_TEST));
 
-        ::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
+
+        m_camera_clipping_plane = m_gizmos.get_sla_clipping_plane();
+        if (m_camera_clipping_plane.is_active()) {
+            ::glClipPlane(GL_CLIP_PLANE0, (GLdouble*)m_camera_clipping_plane.get_data());
+            ::glEnable(GL_CLIP_PLANE0);
+        }
+        _render_volumes_for_picking();
+        if (m_camera_clipping_plane.is_active())
+            ::glDisable(GL_CLIP_PLANE0);
 
-        _render_volumes(true);
         m_gizmos.render_current_gizmo_for_picking_pass(m_selection);
 
         if (m_multisample_allowed)
-            ::glEnable(GL_MULTISAMPLE);
+            glsafe(::glEnable(GL_MULTISAMPLE));
 
         int volume_id = -1;
 
         GLubyte color[4] = { 0, 0, 0, 0 };
         const Size& cnv_size = get_canvas_size();
-        bool inside = (0 <= pos(0)) && (pos(0) < cnv_size.get_width()) && (0 <= pos(1)) && (pos(1) < cnv_size.get_height());
+        bool inside = (0 <= m_mouse.position(0)) && (m_mouse.position(0) < cnv_size.get_width()) && (0 <= m_mouse.position(1)) && (m_mouse.position(1) < cnv_size.get_height());
         if (inside)
         {
-            ::glReadPixels(pos(0), cnv_size.get_height() - pos(1) - 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, (void*)color);
-            volume_id = color[0] + color[1] * 256 + color[2] * 256 * 256;
+            glsafe(::glReadPixels(m_mouse.position(0), cnv_size.get_height() - m_mouse.position(1) - 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, (void*)color));
+            volume_id = color[0] + (color[1] << 8) + (color[2] << 16);
         }
         if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size()))
         {
-            m_hover_volume_id = volume_id;
+            m_hover_volume_idxs.push_back(volume_id);
             m_gizmos.set_hover_id(-1);
         }
         else
-        {
-            m_hover_volume_id = -1;
             m_gizmos.set_hover_id(inside && volume_id <= GLGizmoBase::BASE_ID ? (GLGizmoBase::BASE_ID - volume_id) : -1);
-        }
 
         _update_volumes_hover_state();
     }
 }
 
+void GLCanvas3D::_rectangular_selection_picking_pass() const
+{
+    m_gizmos.set_hover_id(-1);
+
+    std::set<int> idxs;
+
+    if (m_picking_enabled)
+    {
+        if (m_multisample_allowed)
+            glsafe(::glDisable(GL_MULTISAMPLE));
+
+        glsafe(::glDisable(GL_BLEND));
+        glsafe(::glEnable(GL_DEPTH_TEST));
+
+        glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
+
+        _render_volumes_for_picking();
+
+        if (m_multisample_allowed)
+            glsafe(::glEnable(GL_MULTISAMPLE));
+
+        int width = std::max((int)m_rectangle_selection.get_width(), 1);
+        int height = std::max((int)m_rectangle_selection.get_height(), 1);
+        int px_count = width * height;
+
+        int left = (int)m_rectangle_selection.get_left();
+        int top = get_canvas_size().get_height() - (int)m_rectangle_selection.get_top();
+        if ((left >= 0) && (top >= 0))
+        {
+#define USE_PARALLEL 1
+#if USE_PARALLEL
+            struct Pixel
+            {
+                std::array<GLubyte, 4> data;
+                int id() const { return data[0] + (data[1] << 8) + (data[2] << 16); }
+            };
+
+            std::vector<Pixel> frame(px_count);
+            glsafe(::glReadPixels(left, top, width, height, GL_RGBA, GL_UNSIGNED_BYTE, (void*)frame.data()));
+
+            tbb::spin_mutex mutex;
+            tbb::parallel_for(tbb::blocked_range<size_t>(0, frame.size(), (size_t)width),
+                [this, &frame, &idxs, &mutex](const tbb::blocked_range<size_t>& range) {
+                for (size_t i = range.begin(); i < range.end(); ++i)
+                {
+                    int volume_id = frame[i].id();
+                    if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size()))
+                    {
+                        mutex.lock();
+                        idxs.insert(volume_id);
+                        mutex.unlock();
+                    }
+                }
+            }
+            );
+#else
+            std::vector<GLubyte> frame(4 * px_count);
+            glsafe(::glReadPixels(left, top, width, height, GL_RGBA, GL_UNSIGNED_BYTE, (void*)frame.data()));
+
+            for (int i = 0; i < px_count; ++i)
+            {
+                int px_id = 4 * i;
+                int volume_id = frame[px_id] + (frame[px_id + 1] << 8) + (frame[px_id + 2] << 16);
+                if ((0 <= volume_id) && (volume_id < (int)m_volumes.volumes.size()))
+                    idxs.insert(volume_id);
+            }
+#endif // USE_PARALLEL
+        }
+    }
+
+    m_hover_volume_idxs.assign(idxs.begin(), idxs.end());
+    _update_volumes_hover_state();
+}
+
 void GLCanvas3D::_render_background() const
 {
-    ::glPushMatrix();
-    ::glLoadIdentity();
-    ::glMatrixMode(GL_PROJECTION);
-    ::glPushMatrix();
-    ::glLoadIdentity();
+    glsafe(::glPushMatrix());
+    glsafe(::glLoadIdentity());
+    glsafe(::glMatrixMode(GL_PROJECTION));
+    glsafe(::glPushMatrix());
+    glsafe(::glLoadIdentity());
 
     // Draws a bottom to top gradient over the complete screen.
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
     ::glBegin(GL_QUADS);
     if (m_dynamic_background_enabled && _is_any_volume_outside())
@@ -4648,13 +3900,13 @@ void GLCanvas3D::_render_background() const
 
     ::glVertex2f(1.0f, 1.0f);
     ::glVertex2f(-1.0f, 1.0f);
-    ::glEnd();
+    glsafe(::glEnd());
 
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glEnable(GL_DEPTH_TEST));
 
-    ::glPopMatrix();
-    ::glMatrixMode(GL_MODELVIEW);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
+    glsafe(::glMatrixMode(GL_MODELVIEW));
+    glsafe(::glPopMatrix());
 }
 
 void GLCanvas3D::_render_bed(float theta) const
@@ -4671,13 +3923,17 @@ void GLCanvas3D::_render_axes() const
     m_bed.render_axes();
 }
 
+
+
 void GLCanvas3D::_render_objects() const
 {
     if (m_volumes.empty())
         return;
 
-    ::glEnable(GL_LIGHTING);
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glEnable(GL_LIGHTING));
+    glsafe(::glEnable(GL_DEPTH_TEST));
+
+    m_camera_clipping_plane = m_gizmos.get_sla_clipping_plane();
 
     if (m_use_VBOs)
     {
@@ -4699,48 +3955,57 @@ void GLCanvas3D::_render_objects() const
         else
             m_volumes.set_z_range(-FLT_MAX, FLT_MAX);
 
+        m_volumes.set_clipping_plane(m_camera_clipping_plane.get_data());
+
         m_shader.start_using();
-        if (m_picking_enabled && m_layers_editing.is_enabled() && m_layers_editing.last_object_id != -1) {
-			int object_id = m_layers_editing.last_object_id;
-			m_volumes.render_VBOs(GLVolumeCollection::Opaque, false, [object_id](const GLVolume &volume) {
+        if (m_picking_enabled && !m_gizmos.is_dragging() && m_layers_editing.is_enabled() && (m_layers_editing.last_object_id != -1) && (m_layers_editing.object_max_z() > 0.0f)) {
+            int object_id = m_layers_editing.last_object_id;
+            m_volumes.render_VBOs(GLVolumeCollection::Opaque, false, m_camera.get_view_matrix(), [object_id](const GLVolume &volume) {
                 // Which volume to paint without the layer height profile shader?
-				return volume.is_active && (volume.is_modifier || volume.composite_id.object_id != object_id);
+                return volume.is_active && (volume.is_modifier || volume.composite_id.object_id != object_id);
             });
             // Let LayersEditing handle rendering of the active object using the layer height profile shader.
             m_layers_editing.render_volumes(*this, this->m_volumes);
         } else {
             // do not cull backfaces to show broken geometry, if any
-            m_volumes.render_VBOs(GLVolumeCollection::Opaque, m_picking_enabled, [this](const GLVolume& volume) {
+            m_volumes.render_VBOs(GLVolumeCollection::Opaque, m_picking_enabled, m_camera.get_view_matrix(), [this](const GLVolume& volume) {
                 return (m_render_sla_auxiliaries || volume.composite_id.volume_id >= 0);
             });
         }
-        m_volumes.render_VBOs(GLVolumeCollection::Transparent, false);
+        m_volumes.render_VBOs(GLVolumeCollection::Transparent, false, m_camera.get_view_matrix());
         m_shader.stop_using();
     }
     else
     {
+        ::glClipPlane(GL_CLIP_PLANE0, (GLdouble*)m_camera_clipping_plane.get_data());
+        ::glEnable(GL_CLIP_PLANE0);
+
         if (m_use_clipping_planes)
         {
-            ::glClipPlane(GL_CLIP_PLANE0, (GLdouble*)m_clipping_planes[0].get_data());
-            ::glEnable(GL_CLIP_PLANE0);
-            ::glClipPlane(GL_CLIP_PLANE1, (GLdouble*)m_clipping_planes[1].get_data());
-            ::glEnable(GL_CLIP_PLANE1);
+            glsafe(::glClipPlane(GL_CLIP_PLANE1, (GLdouble*)m_clipping_planes[0].get_data()));
+            glsafe(::glEnable(GL_CLIP_PLANE1));
+            glsafe(::glClipPlane(GL_CLIP_PLANE2, (GLdouble*)m_clipping_planes[1].get_data()));
+            glsafe(::glEnable(GL_CLIP_PLANE2));
         }
+        
 
         // do not cull backfaces to show broken geometry, if any
-        m_volumes.render_legacy(GLVolumeCollection::Opaque, m_picking_enabled, [this](const GLVolume& volume) {
-                return (m_render_sla_auxiliaries || volume.composite_id.volume_id >= 0);
-            });
-        m_volumes.render_legacy(GLVolumeCollection::Transparent, false);
+        m_volumes.render_legacy(GLVolumeCollection::Opaque, m_picking_enabled, m_camera.get_view_matrix(), [this](const GLVolume& volume) {
+            return (m_render_sla_auxiliaries || volume.composite_id.volume_id >= 0);
+        });
+        m_volumes.render_legacy(GLVolumeCollection::Transparent, false, m_camera.get_view_matrix());
+
+        ::glDisable(GL_CLIP_PLANE0);
 
         if (m_use_clipping_planes)
         {
-            ::glDisable(GL_CLIP_PLANE0);
-            ::glDisable(GL_CLIP_PLANE1);
+            glsafe(::glDisable(GL_CLIP_PLANE1));
+            glsafe(::glDisable(GL_CLIP_PLANE2));
         }
     }
-
-    ::glDisable(GL_LIGHTING);
+    
+    m_camera_clipping_plane = ClippingPlane::ClipsNothing();
+    glsafe(::glDisable(GL_LIGHTING));
 }
 
 void GLCanvas3D::_render_selection() const
@@ -4775,53 +4040,51 @@ void GLCanvas3D::_render_legend_texture() const
     m_legend_texture.render(*this);
 }
 
-void GLCanvas3D::_render_volumes(bool fake_colors) const
+void GLCanvas3D::_render_volumes_for_picking() const
 {
     static const GLfloat INV_255 = 1.0f / 255.0f;
 
-    if (!fake_colors)
-        ::glEnable(GL_LIGHTING);
-
     // do not cull backfaces to show broken geometry, if any
-    ::glDisable(GL_CULL_FACE);
+    glsafe(::glDisable(GL_CULL_FACE));
 
-    ::glEnable(GL_BLEND);
-    ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glsafe(::glEnable(GL_BLEND));
+    glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
-    ::glEnableClientState(GL_VERTEX_ARRAY);
-    ::glEnableClientState(GL_NORMAL_ARRAY);
+    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glEnableClientState(GL_NORMAL_ARRAY));
 
-    unsigned int volume_id = 0;
-    for (GLVolume* vol : m_volumes.volumes)
+    const Transform3d& view_matrix = m_camera.get_view_matrix();
+    GLVolumeWithIdAndZList to_render = volumes_to_render(m_volumes.volumes, GLVolumeCollection::Opaque, view_matrix);
+    for (const GLVolumeWithIdAndZ& volume : to_render)
     {
-        if (fake_colors)
-        {
-            // Object picking mode. Render the object with a color encoding the object index.
-            unsigned int r = (volume_id & 0x000000FF) >> 0;
-            unsigned int g = (volume_id & 0x0000FF00) >> 8;
-            unsigned int b = (volume_id & 0x00FF0000) >> 16;
-            ::glColor3f((GLfloat)r * INV_255, (GLfloat)g * INV_255, (GLfloat)b * INV_255);
-        }
-        else
-        {
-            vol->set_render_color();
-            ::glColor4fv(vol->render_color);
-        }
+        // Object picking mode. Render the object with a color encoding the object index.
+        unsigned int r = (volume.second.first & 0x000000FF) >> 0;
+        unsigned int g = (volume.second.first & 0x0000FF00) >> 8;
+        unsigned int b = (volume.second.first & 0x00FF0000) >> 16;
+        glsafe(::glColor3f((GLfloat)r * INV_255, (GLfloat)g * INV_255, (GLfloat)b * INV_255));
 
-        if ((!fake_colors || !vol->disabled) && (vol->composite_id.volume_id >= 0 || m_render_sla_auxiliaries))
-            vol->render();
-
-        ++volume_id;
+        if (!volume.first->disabled && ((volume.first->composite_id.volume_id >= 0) || m_render_sla_auxiliaries))
+            volume.first->render();
     }
 
-    ::glDisableClientState(GL_NORMAL_ARRAY);
-    ::glDisableClientState(GL_VERTEX_ARRAY);
-    ::glDisable(GL_BLEND);
+    to_render = volumes_to_render(m_volumes.volumes, GLVolumeCollection::Transparent, view_matrix);
+    for (const GLVolumeWithIdAndZ& volume : to_render)
+    {
+        // Object picking mode. Render the object with a color encoding the object index.
+        unsigned int r = (volume.second.first & 0x000000FF) >> 0;
+        unsigned int g = (volume.second.first & 0x0000FF00) >> 8;
+        unsigned int b = (volume.second.first & 0x00FF0000) >> 16;
+        glsafe(::glColor3f((GLfloat)r * INV_255, (GLfloat)g * INV_255, (GLfloat)b * INV_255));
 
-    ::glEnable(GL_CULL_FACE);
+        if (!volume.first->disabled && ((volume.first->composite_id.volume_id >= 0) || m_render_sla_auxiliaries))
+            volume.first->render();
+    }
 
-    if (!fake_colors)
-        ::glDisable(GL_LIGHTING);
+    glsafe(::glDisableClientState(GL_NORMAL_ARRAY));
+    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glDisable(GL_BLEND));
+
+    glsafe(::glEnable(GL_CULL_FACE));
 }
 
 void GLCanvas3D::_render_current_gizmo() const
@@ -4834,7 +4097,8 @@ void GLCanvas3D::_render_gizmos_overlay() const
 #if ENABLE_RETINA_GL
     m_gizmos.set_overlay_scale(m_retina_helper->get_scale_factor());
 #else
-    m_gizmos.set_overlay_scale(m_canvas->GetContentScaleFactor());
+//     m_gizmos.set_overlay_scale(m_canvas->GetContentScaleFactor());
+    m_gizmos.set_overlay_scale(wxGetApp().em_unit()*0.1f);//! #ys_FIXME_experiment
 #endif /* __WXMSW__ */
 
     m_gizmos.render_overlay(*this, m_selection);
@@ -4846,11 +4110,12 @@ void GLCanvas3D::_render_toolbar() const
 #if ENABLE_RETINA_GL
     m_toolbar.set_scale(m_retina_helper->get_scale_factor());
 #else
-    m_toolbar.set_scale(m_canvas->GetContentScaleFactor());
+//     m_toolbar.set_scale(m_canvas->GetContentScaleFactor());
+    m_toolbar.set_scale(wxGetApp().em_unit()*0.1f);//! #ys_FIXME_experiment
 #endif // ENABLE_RETINA_GL
 
     Size cnv_size = get_canvas_size();
-    float zoom = get_camera_zoom();
+    float zoom = m_camera.zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 
     GLToolbar::Layout::EOrientation orientation = m_toolbar.get_layout_orientation();
@@ -4909,11 +4174,12 @@ void GLCanvas3D::_render_view_toolbar() const
 #if ENABLE_RETINA_GL
     m_view_toolbar.set_scale(m_retina_helper->get_scale_factor());
 #else
-    m_view_toolbar.set_scale(m_canvas->GetContentScaleFactor());
+//     m_view_toolbar.set_scale(m_canvas->GetContentScaleFactor());
+    m_view_toolbar.set_scale(wxGetApp().em_unit()*0.1f); //! #ys_FIXME_experiment
 #endif // ENABLE_RETINA_GL
 
     Size cnv_size = get_canvas_size();
-    float zoom = get_camera_zoom();
+    float zoom = m_camera.zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 
     // places the toolbar on the bottom-left corner of the 3d scene
@@ -4935,9 +4201,9 @@ void GLCanvas3D::_render_camera_target() const
 {
     double half_length = 5.0;
 
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
-    ::glLineWidth(2.0f);
+    glsafe(::glLineWidth(2.0f));
     ::glBegin(GL_LINES);
     const Vec3d& target = m_camera.get_target();
     // draw line for x axis
@@ -4952,7 +4218,7 @@ void GLCanvas3D::_render_camera_target() const
     ::glColor3f(0.0f, 0.0f, 1.0f);
     ::glVertex3d(target(0), target(1), target(2) - half_length);
     ::glVertex3d(target(0), target(1), target(2) + half_length);
-    ::glEnd();
+    glsafe(::glEnd());
 }
 #endif // ENABLE_SHOW_CAMERA_TARGET
 
@@ -4973,6 +4239,9 @@ void GLCanvas3D::_render_sla_slices() const
     {
         const SLAPrintObject* obj = print_objects[i];
 
+        if (!obj->is_step_done(slaposSliceSupports))
+            continue;
+
         SlaCap::ObjectIdToTrianglesMap::iterator it_caps_bottom = m_sla_caps[0].triangles.find(i);
         SlaCap::ObjectIdToTrianglesMap::iterator it_caps_top    = m_sla_caps[1].triangles.find(i);
         {
@@ -4996,89 +4265,79 @@ void GLCanvas3D::_render_sla_slices() const
         Pointf3s &top_obj_triangles    = it_caps_top->second.object;
         Pointf3s &top_sup_triangles    = it_caps_top->second.supports;
 
-        const std::vector<SLAPrintObject::Instance>& instances = obj->instances();
-        struct InstanceTransform
-        {
-            Vec3d offset;
-            float rotation;
-        };
-
-        std::vector<InstanceTransform> instance_transforms;
-        for (const SLAPrintObject::Instance& inst : instances)
-        {
-			instance_transforms.push_back({ to_3d(unscale(inst.shift), 0.), Geometry::rad2deg(inst.rotation) });
-        }
-
-        if ((bottom_obj_triangles.empty() || bottom_sup_triangles.empty() || top_obj_triangles.empty() || top_sup_triangles.empty()) && obj->is_step_done(slaposIndexSlices))
+        if ((bottom_obj_triangles.empty() || bottom_sup_triangles.empty() || top_obj_triangles.empty() || top_sup_triangles.empty()) &&
+            !obj->get_slice_index().empty())
         {
+            double layer_height         = print->default_object_config().layer_height.value;
             double initial_layer_height = print->material_config().initial_layer_height.value;
-            LevelID key_zero = obj->get_slice_records().begin()->key();
-			LevelID key_low  = LevelID((clip_min_z - initial_layer_height) / SCALING_FACTOR) + key_zero;
-			LevelID key_high = LevelID((clip_max_z - initial_layer_height) / SCALING_FACTOR) + key_zero;
-			auto slice_range = obj->get_slice_records(key_low - LevelID(SCALED_EPSILON), key_high - LevelID(SCALED_EPSILON));
-            auto it_low  = slice_range.begin();
-            auto it_high = std::prev(slice_range.end());
-    
-            if (! it_low.is_end() && it_low->key() < key_low + LevelID(SCALED_EPSILON)) {
-                const ExPolygons& obj_bottom = obj->get_slices_from_record(it_low, soModel);
-                const ExPolygons& sup_bottom = obj->get_slices_from_record(it_low, soSupport);
+            bool   left_handed          = obj->is_left_handed();
+
+            coord_t key_zero = obj->get_slice_index().front().print_level();
+            // Slice at the center of the slab starting at clip_min_z will be rendered for the lower plane.
+            coord_t key_low  = coord_t((clip_min_z - initial_layer_height + layer_height) / SCALING_FACTOR) + key_zero;
+            // Slice at the center of the slab ending at clip_max_z will be rendered for the upper plane.
+            coord_t key_high = coord_t((clip_max_z - initial_layer_height) / SCALING_FACTOR) + key_zero;
+
+            const SliceRecord& slice_low  = obj->closest_slice_to_print_level(key_low, coord_t(SCALED_EPSILON));
+            const SliceRecord& slice_high = obj->closest_slice_to_print_level(key_high, coord_t(SCALED_EPSILON));
+
+            // Offset to avoid OpenGL Z fighting between the object's horizontal surfaces and the triangluated surfaces of the cuts.
+            double plane_shift_z = 0.002;
+
+            if (slice_low.is_valid()) {
+                const ExPolygons& obj_bottom = slice_low.get_slice(soModel);
+                const ExPolygons& sup_bottom = slice_low.get_slice(soSupport);
                 // calculate model bottom cap
                 if (bottom_obj_triangles.empty() && !obj_bottom.empty())
-                    bottom_obj_triangles = triangulate_expolygons_3d(obj_bottom, clip_min_z, true);
+                    bottom_obj_triangles = triangulate_expolygons_3d(obj_bottom, clip_min_z - plane_shift_z, ! left_handed);
                 // calculate support bottom cap
                 if (bottom_sup_triangles.empty() && !sup_bottom.empty())
-                    bottom_sup_triangles = triangulate_expolygons_3d(sup_bottom, clip_min_z, true);
+                    bottom_sup_triangles = triangulate_expolygons_3d(sup_bottom, clip_min_z - plane_shift_z, ! left_handed);
             }
 
-            if (! it_high.is_end() && it_high->key() < key_high + LevelID(SCALED_EPSILON)) {
-                const ExPolygons& obj_top = obj->get_slices_from_record(it_high, soModel);
-                const ExPolygons& sup_top = obj->get_slices_from_record(it_high, soSupport);
+            if (slice_high.is_valid()) {
+                const ExPolygons& obj_top = slice_high.get_slice(soModel);
+                const ExPolygons& sup_top = slice_high.get_slice(soSupport);
                 // calculate model top cap
                 if (top_obj_triangles.empty() && !obj_top.empty())
-                    top_obj_triangles = triangulate_expolygons_3d(obj_top, clip_max_z, false);
+                    top_obj_triangles = triangulate_expolygons_3d(obj_top, clip_max_z + plane_shift_z, left_handed);
                 // calculate support top cap
                 if (top_sup_triangles.empty() && !sup_top.empty())
-                    top_sup_triangles = triangulate_expolygons_3d(sup_top, clip_max_z, false);
+                    top_sup_triangles = triangulate_expolygons_3d(sup_top, clip_max_z + plane_shift_z, left_handed);
             }
         }
 
         if (!bottom_obj_triangles.empty() || !top_obj_triangles.empty() || !bottom_sup_triangles.empty() || !top_sup_triangles.empty())
         {
-            for (const InstanceTransform& inst : instance_transforms)
+			for (const SLAPrintObject::Instance& inst : obj->instances())
             {
-                ::glPushMatrix();
-                ::glTranslated(inst.offset(0), inst.offset(1), inst.offset(2));
-                ::glRotatef(inst.rotation, 0.0, 0.0, 1.0);
-
-                ::glBegin(GL_TRIANGLES);
-
-                ::glColor3f(1.0f, 0.37f, 0.0f);
-
-                for (const Vec3d& v : bottom_obj_triangles)
-                {
-                    ::glVertex3dv((GLdouble*)v.data());
-                }
-
-                for (const Vec3d& v : top_obj_triangles)
-                {
-                    ::glVertex3dv((GLdouble*)v.data());
-                }
-
-                ::glColor3f(1.0f, 0.0f, 0.37f);
-
-                for (const Vec3d& v : bottom_sup_triangles)
-                {
-                    ::glVertex3dv((GLdouble*)v.data());
-                }
-
-                for (const Vec3d& v : top_sup_triangles)
-                {
-                    ::glVertex3dv((GLdouble*)v.data());
-                }
-
-                ::glEnd();
-
-                ::glPopMatrix();
+                glsafe(::glPushMatrix());
+                glsafe(::glTranslated(unscale<double>(inst.shift.x()), unscale<double>(inst.shift.y()), 0));
+                glsafe(::glRotatef(Geometry::rad2deg(inst.rotation), 0.0, 0.0, 1.0));
+				if (obj->is_left_handed())
+                    // The polygons are mirrored by X.
+                    glsafe(::glScalef(-1.0, 1.0, 1.0));
+                glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+                glsafe(::glColor3f(1.0f, 0.37f, 0.0f));
+				if (!bottom_obj_triangles.empty()) {
+                    glsafe(::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)bottom_obj_triangles.front().data()));
+                    glsafe(::glDrawArrays(GL_TRIANGLES, 0, bottom_obj_triangles.size()));
+				}
+				if (! top_obj_triangles.empty()) {
+                    glsafe(::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)top_obj_triangles.front().data()));
+                    glsafe(::glDrawArrays(GL_TRIANGLES, 0, top_obj_triangles.size()));
+				}
+                glsafe(::glColor3f(1.0f, 0.0f, 0.37f));
+				if (! bottom_sup_triangles.empty()) {
+                    glsafe(::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)bottom_sup_triangles.front().data()));
+                    glsafe(::glDrawArrays(GL_TRIANGLES, 0, bottom_sup_triangles.size()));
+				}
+				if (! top_sup_triangles.empty()) {
+                    glsafe(::glVertexPointer(3, GL_DOUBLE, 0, (GLdouble*)top_sup_triangles.front().data()));
+                    glsafe(::glDrawArrays(GL_TRIANGLES, 0, top_sup_triangles.size()));
+				}
+                glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
+                glsafe(::glPopMatrix());
             }
         }
     }
@@ -5095,78 +4354,99 @@ void GLCanvas3D::_render_selection_sidebar_hints() const
         m_shader.stop_using();
 }
 
+
 void GLCanvas3D::_update_volumes_hover_state() const
 {
     for (GLVolume* v : m_volumes.volumes)
     {
-        v->hover = false;
+        v->hover = GLVolume::HS_None;
     }
 
-    if (m_hover_volume_id == -1)
+    if (m_hover_volume_idxs.empty())
         return;
 
-    GLVolume* volume = m_volumes.volumes[m_hover_volume_id];
+    bool ctrl_pressed = wxGetKeyState(WXK_CONTROL); // additive select/deselect
+    bool shift_pressed = wxGetKeyState(WXK_SHIFT);  // select by rectangle
+    bool alt_pressed = wxGetKeyState(WXK_ALT);      // deselect by rectangle
 
-    switch (m_selection.get_mode())
+    if (alt_pressed && (shift_pressed || ctrl_pressed))
     {
-    case Selection::Volume:
-    {
-        volume->hover = true;
-        break;
+        // illegal combinations of keys
+        m_hover_volume_idxs.clear();
+        return;
     }
-    case Selection::Instance:
-    {
-        int object_idx = volume->object_idx();
-        int instance_idx = volume->instance_idx();
 
-        for (GLVolume* v : m_volumes.volumes)
+    bool selection_modifiers_only = m_selection.is_empty() || m_selection.is_any_modifier();
+
+    bool hover_modifiers_only = true;
+    for (int i : m_hover_volume_idxs)
+    {
+        if (!m_volumes.volumes[i]->is_modifier)
         {
-            if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx))
-                v->hover = true;
+            hover_modifiers_only = false;
+            break;
         }
-
-        break;
     }
-    }
-}
 
-void GLCanvas3D::_update_gizmos_data()
-{
-    if (!m_gizmos.is_enabled())
+    std::set<std::pair<int, int>> hover_instances;
+    for (int i : m_hover_volume_idxs)
+    {
+        const GLVolume& v = *m_volumes.volumes[i];
+        hover_instances.insert(std::make_pair(v.object_idx(), v.instance_idx()));
+    }
+
+    bool hover_from_single_instance = hover_instances.size() == 1;
+
+    if (hover_modifiers_only && !hover_from_single_instance)
+    {
+        // do not allow to select volumes from different instances
+        m_hover_volume_idxs.clear();
         return;
-
-    bool enable_move_z = !m_selection.is_wipe_tower();
-    m_gizmos.enable_grabber(Gizmos::Move, 2, enable_move_z);
-    bool enable_scale_xyz = m_selection.is_single_full_instance() || m_selection.is_single_volume() || m_selection.is_single_modifier();
-    for (int i = 0; i < 6; ++i)
-    {
-        m_gizmos.enable_grabber(Gizmos::Scale, i, enable_scale_xyz);
     }
 
-    if (m_selection.is_single_full_instance())
+    for (int i : m_hover_volume_idxs)
     {
-        // all volumes in the selection belongs to the same instance, any of them contains the needed data, so we take the first
-        const GLVolume* volume = m_volumes.volumes[*m_selection.get_volume_idxs().begin()];
-        m_gizmos.set_scale(volume->get_instance_scaling_factor());
-        m_gizmos.set_rotation(Vec3d::Zero());
-        ModelObject* model_object = m_model->objects[m_selection.get_object_idx()];
-        m_gizmos.set_flattening_data(model_object);
-        m_gizmos.set_sla_support_data(model_object, m_selection);
-    }
-    else if (m_selection.is_single_volume() || m_selection.is_single_modifier())
-    {
-        const GLVolume* volume = m_volumes.volumes[*m_selection.get_volume_idxs().begin()];
-        m_gizmos.set_scale(volume->get_volume_scaling_factor());
-        m_gizmos.set_rotation(Vec3d::Zero());
-        m_gizmos.set_flattening_data(nullptr);
-        m_gizmos.set_sla_support_data(nullptr, m_selection);
-    }
-    else
-    {
-        m_gizmos.set_scale(Vec3d::Ones());
-        m_gizmos.set_rotation(Vec3d::Zero());
-        m_gizmos.set_flattening_data(m_selection.is_from_single_object() ? m_model->objects[m_selection.get_object_idx()] : nullptr);
-        m_gizmos.set_sla_support_data(nullptr, m_selection);
+        GLVolume& volume = *m_volumes.volumes[i];
+        if (volume.hover != GLVolume::HS_None)
+            continue;
+
+        bool deselect = volume.selected && ((ctrl_pressed && !shift_pressed) || alt_pressed);
+        // (volume->is_modifier && !selection_modifiers_only && !is_ctrl_pressed) -> allows hovering on selected modifiers belonging to selection of type Instance
+        bool select = (!volume.selected || (volume.is_modifier && !selection_modifiers_only && !ctrl_pressed)) && !alt_pressed;
+
+        if (select || deselect)
+        {
+            bool as_volume =
+                volume.is_modifier && hover_from_single_instance && !ctrl_pressed &&
+                (
+                (!deselect) ||
+                (deselect && !m_selection.is_single_full_instance() && (volume.object_idx() == m_selection.get_object_idx()) && (volume.instance_idx() == m_selection.get_instance_idx()))
+                );
+
+            if (as_volume)
+            {
+                if (deselect)
+                    volume.hover = GLVolume::HS_Deselect;
+                else
+                    volume.hover = GLVolume::HS_Select;
+            }
+            else
+            {
+                int object_idx = volume.object_idx();
+                int instance_idx = volume.instance_idx();
+
+                for (GLVolume* v : m_volumes.volumes)
+                {
+                    if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx))
+                    {
+                        if (deselect)
+                            v->hover = GLVolume::HS_Deselect;
+                        else
+                            v->hover = GLVolume::HS_Select;
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -5199,24 +4479,20 @@ Vec3d GLCanvas3D::_mouse_to_3d(const Point& mouse_pos, float* z)
     if (m_canvas == nullptr)
         return Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
 
-    _camera_tranform();
 
-    GLint viewport[4];
-    ::glGetIntegerv(GL_VIEWPORT, viewport);
-    GLdouble modelview_matrix[16];
-    ::glGetDoublev(GL_MODELVIEW_MATRIX, modelview_matrix);
-    GLdouble projection_matrix[16];
-    ::glGetDoublev(GL_PROJECTION_MATRIX, projection_matrix);
+    const std::array<int, 4>& viewport = m_camera.get_viewport();
+    const Transform3d& modelview_matrix = m_camera.get_view_matrix();
+    const Transform3d& projection_matrix = m_camera.get_projection_matrix();
 
     GLint y = viewport[3] - (GLint)mouse_pos(1);
     GLfloat mouse_z;
     if (z == nullptr)
-        ::glReadPixels((GLint)mouse_pos(0), y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, (void*)&mouse_z);
+        glsafe(::glReadPixels((GLint)mouse_pos(0), y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, (void*)&mouse_z));
     else
         mouse_z = *z;
 
     GLdouble out_x, out_y, out_z;
-    ::gluUnProject((GLdouble)mouse_pos(0), (GLdouble)y, (GLdouble)mouse_z, modelview_matrix, projection_matrix, viewport, &out_x, &out_y, &out_z);
+    ::gluUnProject((GLdouble)mouse_pos(0), (GLdouble)y, (GLdouble)mouse_z, (GLdouble*)modelview_matrix.data(), (GLdouble*)projection_matrix.data(), (GLint*)viewport.data(), &out_x, &out_y, &out_z);
     return Vec3d((double)out_x, (double)out_y, (double)out_z);
 }
 
@@ -5225,13 +4501,6 @@ Vec3d GLCanvas3D::_mouse_to_bed_3d(const Point& mouse_pos)
     return mouse_ray(mouse_pos).intersect_plane(0.0);
 }
 
-Linef3 GLCanvas3D::mouse_ray(const Point& mouse_pos)
-{
-    float z0 = 0.0f;
-    float z1 = 1.0f;
-    return Linef3(_mouse_to_3d(mouse_pos, &z0), _mouse_to_3d(mouse_pos, &z1));
-}
-
 void GLCanvas3D::_start_timer()
 {
     m_timer.Start(100, wxTIMER_CONTINUOUS);
@@ -6060,6 +5329,10 @@ bool GLCanvas3D::_travel_paths_by_tool(const GCodePreviewData& preview_data, con
     // creates a new volume for each tool
     for (Tool& tool : tools)
     {
+        // tool.value could be invalid (as it was with https://github.com/prusa3d/PrusaSlicer/issues/2179), we better check
+        if (tool.value >= tool_colors.size())
+            continue;
+
         GLVolume* volume = new GLVolume(tool_colors.data() + tool.value * 4);
         if (volume == nullptr)
             return false;
@@ -6074,7 +5347,7 @@ bool GLCanvas3D::_travel_paths_by_tool(const GCodePreviewData& preview_data, con
     for (const GCodePreviewData::Travel::Polyline& polyline : preview_data.travel.polylines)
     {
         ToolsList::iterator tool = std::find(tools.begin(), tools.end(), Tool(polyline.extruder_id));
-        if (tool != tools.end())
+        if (tool != tools.end() && tool->volume != nullptr)
         {
             tool->volume->print_zs.push_back(unscale<double>(polyline.polyline.bounding_box().min(2)));
             tool->volume->offsets.push_back(tool->volume->indexed_vertex_array.quad_indices.size());
@@ -6149,7 +5422,7 @@ void GLCanvas3D::_load_gcode_unretractions(const GCodePreviewData& preview_data)
     }
 }
 
-void GLCanvas3D::_load_shells_fff()
+void GLCanvas3D::_load_fff_shells()
 {
     size_t initial_volumes_count = m_volumes.volumes.size();
     m_gcode_preview_volume_index.first_volumes.emplace_back(GCodePreviewVolumeIndex::Shell, 0, (unsigned int)initial_volumes_count);
@@ -6198,96 +5471,56 @@ void GLCanvas3D::_load_shells_fff()
     }
 }
 
-void GLCanvas3D::_load_shells_sla()
+void GLCanvas3D::_load_sla_shells()
 {
+    //FIXME use reload_scene
+#if 1
     const SLAPrint* print = this->sla_print();
     if (print->objects().empty())
         // nothing to render, return
         return;
 
+    auto add_volume = [this](const SLAPrintObject &object, int volume_id, const SLAPrintObject::Instance& instance,
+        const TriangleMesh &mesh, const float color[4], bool outside_printer_detection_enabled) {
+        m_volumes.volumes.emplace_back(new GLVolume(color));
+        GLVolume& v = *m_volumes.volumes.back();
+        v.indexed_vertex_array.load_mesh(mesh, m_use_VBOs);
+		v.shader_outside_printer_detection_enabled = outside_printer_detection_enabled;
+        v.composite_id.volume_id = volume_id;
+        v.set_instance_offset(unscale(instance.shift(0), instance.shift(1), 0));
+        v.set_instance_rotation(Vec3d(0.0, 0.0, (double)instance.rotation));
+        v.set_instance_mirror(X, object.is_left_handed() ? -1. : 1.);
+    };
+
     // adds objects' volumes 
-    int obj_idx = 0;
     for (const SLAPrintObject* obj : print->objects())
-    {
-        if (!obj->is_step_done(slaposIndexSlices))
-            continue;
-
-        unsigned int initial_volumes_count = (unsigned int)m_volumes.volumes.size();
-
-        const ModelObject* model_obj = obj->model_object();
-        std::vector<int> instance_idxs(model_obj->instances.size());
-        for (int i = 0; i < (int)model_obj->instances.size(); ++i)
-        {
-            instance_idxs[i] = i;
-        }
-
-        m_volumes.load_object(model_obj, obj_idx, instance_idxs, "object", m_use_VBOs && m_initialized);
-
-        const std::vector<SLAPrintObject::Instance>& instances = obj->instances();
-
-        for (const SLAPrintObject::Instance& instance : instances)
-        {
-            Vec3d offset = unscale(instance.shift(0), instance.shift(1), 0);
-            Vec3d rotation(0.0, 0.0, (double)instance.rotation);
-
-            unsigned int partial_volumes_count = (unsigned int)m_volumes.volumes.size();
-
-            // add supports
-            if (obj->is_step_done(slaposSupportTree) && obj->has_mesh(slaposSupportTree))
-            {
-                const TriangleMesh& mesh = obj->support_mesh();
-                m_volumes.volumes.emplace_back(new GLVolume(GLVolume::SLA_SUPPORT_COLOR));
-                GLVolume& v = *m_volumes.volumes.back();
-
-                if (m_use_VBOs)
-                    v.indexed_vertex_array.load_mesh_full_shading(mesh);
-                else
-                    v.indexed_vertex_array.load_mesh_flat_shading(mesh);
-
-                v.shader_outside_printer_detection_enabled = true;
-                v.composite_id.volume_id = -1;
-                v.set_instance_offset(offset);
-                v.set_instance_rotation(rotation);
+        if (obj->is_step_done(slaposSliceSupports)) {
+            unsigned int initial_volumes_count = (unsigned int)m_volumes.volumes.size();
+            for (const SLAPrintObject::Instance& instance : obj->instances()) {
+                add_volume(*obj, 0, instance, obj->transformed_mesh(), GLVolume::MODEL_COLOR[0], true);
+                // Set the extruder_id and volume_id to achieve the same color as in the 3D scene when
+                // through the update_volumes_colors_by_extruder() call.
+                m_volumes.volumes.back()->extruder_id = obj->model_object()->volumes.front()->extruder_id();
+                if (obj->is_step_done(slaposSupportTree) && obj->has_mesh(slaposSupportTree))
+                    add_volume(*obj, -int(slaposSupportTree), instance, obj->support_mesh(), GLVolume::SLA_SUPPORT_COLOR, true);
+                if (obj->is_step_done(slaposBasePool) && obj->has_mesh(slaposBasePool))
+                    add_volume(*obj, -int(slaposBasePool), instance, obj->pad_mesh(), GLVolume::SLA_PAD_COLOR, true);
             }
-
-            // add pad
-            if (obj->is_step_done(slaposBasePool) && obj->has_mesh(slaposBasePool))
-            {
-                const TriangleMesh& mesh = obj->pad_mesh();
-                m_volumes.volumes.emplace_back(new GLVolume(GLVolume::SLA_PAD_COLOR));
-                GLVolume& v = *m_volumes.volumes.back();
-
-                if (m_use_VBOs)
-                    v.indexed_vertex_array.load_mesh_full_shading(mesh);
-                else
-                    v.indexed_vertex_array.load_mesh_flat_shading(mesh);
-
-                v.shader_outside_printer_detection_enabled = false;
-                v.composite_id.volume_id = -1;
-                v.set_instance_offset(offset);
-                v.set_instance_rotation(rotation);
-            }
-
-            // finalize volumes and sends geometry to gpu
-            for (unsigned int i = partial_volumes_count; i < m_volumes.volumes.size(); ++i)
-            {
+            double shift_z = obj->get_current_elevation();
+            for (unsigned int i = initial_volumes_count; i < m_volumes.volumes.size(); ++ i) {
                 GLVolume& v = *m_volumes.volumes[i];
+                // finalize volumes and sends geometry to gpu
                 v.bounding_box = v.indexed_vertex_array.bounding_box();
                 v.indexed_vertex_array.finalize_geometry(m_use_VBOs);
+                // apply shift z
+                v.set_sla_shift_z(shift_z);
             }
-
-            ++obj_idx;
         }
 
-        // apply shift z
-        double shift_z = obj->get_current_elevation();
-        for (unsigned int i = initial_volumes_count; i < m_volumes.volumes.size(); ++i)
-        {
-            m_volumes.volumes[i]->set_sla_shift_z(shift_z);
-        }
-    }
-
     update_volumes_colors_by_extruder();
+#else
+    this->reload_scene(true, true);
+#endif
 }
 
 void GLCanvas3D::_update_gcode_volumes_visibility(const GCodePreviewData& preview_data)
@@ -6373,10 +5606,35 @@ void GLCanvas3D::_update_toolpath_volumes_outside_state()
     }
 }
 
-void GLCanvas3D::_show_warning_texture_if_needed()
+void GLCanvas3D::_update_sla_shells_outside_state()
+{
+    // tolerance to avoid false detection at bed edges
+    static const double tolerance_x = 0.05;
+    static const double tolerance_y = 0.05;
+
+    BoundingBoxf3 print_volume;
+    if (m_config != nullptr)
+    {
+        const ConfigOptionPoints* opt = dynamic_cast<const ConfigOptionPoints*>(m_config->option("bed_shape"));
+        if (opt != nullptr)
+        {
+            BoundingBox bed_box_2D = get_extents(Polygon::new_scale(opt->values));
+            print_volume = BoundingBoxf3(Vec3d(unscale<double>(bed_box_2D.min(0)) - tolerance_x, unscale<double>(bed_box_2D.min(1)) - tolerance_y, 0.0), Vec3d(unscale<double>(bed_box_2D.max(0)) + tolerance_x, unscale<double>(bed_box_2D.max(1)) + tolerance_y, m_config->opt_float("max_print_height")));
+            // Allow the objects to protrude below the print bed
+            print_volume.min(2) = -1e10;
+        }
+    }
+
+    for (GLVolume* volume : m_volumes.volumes)
+    {
+        volume->is_outside = ((print_volume.radius() > 0.0) && volume->is_sla_support()) ? !print_volume.contains(volume->transformed_convex_hull_bounding_box()) : false;
+    }
+}
+
+void GLCanvas3D::_show_warning_texture_if_needed(WarningTexture::Warning warning)
 {
     _set_current();
-    _set_warning_texture(WarningTexture::ToolpathOutside, _is_any_volume_outside());
+    _set_warning_texture(warning, _is_any_volume_outside());
     }
 
 std::vector<float> GLCanvas3D::_parse_colors(const std::vector<std::string>& colors)
@@ -6495,6 +5753,59 @@ void GLCanvas3D::_resize_toolbars() const
 }
 #endif // !ENABLE_SVG_ICONS
 
+void GLCanvas3D::_update_selection_from_hover()
+{
+    bool ctrl_pressed = wxGetKeyState(WXK_CONTROL);
+
+    if (m_hover_volume_idxs.empty())
+    {
+        if (!ctrl_pressed && (m_rectangle_selection.get_state() == GLSelectionRectangle::Select))
+            m_selection.clear();
+
+        return;
+    }
+
+    GLSelectionRectangle::EState state = m_rectangle_selection.get_state();
+
+    bool hover_modifiers_only = true;
+    for (int i : m_hover_volume_idxs)
+    {
+        if (!m_volumes.volumes[i]->is_modifier)
+        {
+            hover_modifiers_only = false;
+            break;
+        }
+    }
+
+    if ((state == GLSelectionRectangle::Select) && !ctrl_pressed)
+        m_selection.clear();
+
+    for (int i : m_hover_volume_idxs)
+    {
+        if (state == GLSelectionRectangle::Select)
+        {
+            if (hover_modifiers_only)
+            {
+                const GLVolume& v = *m_volumes.volumes[i];
+                m_selection.add_volume(v.object_idx(), v.volume_idx(), v.instance_idx(), false);
+            }
+            else
+                m_selection.add(i, false);
+        }
+        else
+            m_selection.remove(i);
+    }
+
+    if (m_selection.is_empty())
+        m_gizmos.reset_all_states();
+    else
+        m_gizmos.refresh_on_off_state(m_selection);
+
+    m_gizmos.update_data(*this);
+    post_event(SimpleEvent(EVT_GLCANVAS_OBJECT_SELECT));
+    m_dirty = true;
+}
+
 const Print* GLCanvas3D::fff_print() const
 {
     return (m_process == nullptr) ? nullptr : m_process->fff_print();
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 29e0fbb08..51a36cf69 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -4,12 +4,14 @@
 #include <stddef.h>
 #include <memory>
 
+#include "libslic3r/ModelArrange.hpp"
 #include "3DScene.hpp"
 #include "GLToolbar.hpp"
 #include "Event.hpp"
 #include "3DBed.hpp"
 #include "Camera.hpp"
 #include "Selection.hpp"
+#include "Gizmos/GLGizmosManager.hpp"
 
 #include <float.h>
 
@@ -64,33 +66,37 @@ public:
     void set_scale_factor(int height);
 };
 
-class Rect
+
+class ClippingPlane
 {
-    float m_left;
-    float m_top;
-    float m_right;
-    float m_bottom;
+    double m_data[4];
 
 public:
-    Rect();
-    Rect(float left, float top, float right, float bottom);
+    ClippingPlane()
+    {
+        m_data[0] = 0.0;
+        m_data[1] = 0.0;
+        m_data[2] = 1.0;
+        m_data[3] = 0.0;
+    }
 
-    float get_left() const;
-    void set_left(float left);
+    ClippingPlane(const Vec3d& direction, double offset)
+    {
+        Vec3d norm_dir = direction.normalized();
+        m_data[0] = norm_dir(0);
+        m_data[1] = norm_dir(1);
+        m_data[2] = norm_dir(2);
+        m_data[3] = offset;
+    }
 
-    float get_top() const;
-    void set_top(float top);
+    bool is_active() const { return m_data[3] != DBL_MAX; }
 
-    float get_right() const;
-    void set_right(float right);
+    static ClippingPlane ClipsNothing() { return ClippingPlane(Vec3d(0., 0., 1.), DBL_MAX); }
 
-    float get_bottom() const;
-    void set_bottom(float bottom);
-
-    float get_width() const { return m_right - m_left; }
-    float get_height() const { return m_top - m_bottom; }
+    const double* get_data() const { return m_data; }
 };
 
+
 wxDECLARE_EVENT(EVT_GLCANVAS_OBJECT_SELECT, SimpleEvent);
 
 using Vec2dEvent = Event<Vec2d>;
@@ -111,27 +117,13 @@ wxDECLARE_EVENT(EVT_GLCANVAS_INSTANCE_MOVED, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLCANVAS_WIPETOWER_MOVED, Vec3dEvent);
 wxDECLARE_EVENT(EVT_GLCANVAS_INSTANCE_ROTATED, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLCANVAS_INSTANCE_SCALED, SimpleEvent);
+wxDECLARE_EVENT(EVT_GLCANVAS_WIPETOWER_ROTATED, Vec3dEvent);
 wxDECLARE_EVENT(EVT_GLCANVAS_ENABLE_ACTION_BUTTONS, Event<bool>);
 wxDECLARE_EVENT(EVT_GLCANVAS_UPDATE_GEOMETRY, Vec3dsEvent<2>);
 wxDECLARE_EVENT(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent);
-
-// this describes events being passed from GLCanvas3D to SlaSupport gizmo
-enum class SLAGizmoEventType {
-    LeftDown = 1,
-    LeftUp,
-    RightDown,
-    Dragging,
-    Delete,
-    SelectAll,
-    ShiftUp,
-    ApplyChanges,
-    DiscardChanges,
-    AutomaticGeneration,
-    ManualEditing
-};
-
+wxDECLARE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent);
 
 class GLCanvas3D
 {
@@ -313,7 +305,7 @@ class GLCanvas3D
         Vec2d position;
         Vec3d scene_position;
         Drag drag;
-        bool ignore_up_event;
+        bool ignore_left_up;
 
         Mouse();
 
@@ -330,145 +322,6 @@ class GLCanvas3D
         }
     };
 
-public:
-    class ClippingPlane
-    {
-        double m_data[4];
-
-    public:
-        ClippingPlane()
-        {
-            m_data[0] = 0.0;
-            m_data[1] = 0.0;
-            m_data[2] = 1.0;
-            m_data[3] = 0.0;
-        }
-
-        ClippingPlane(const Vec3d& direction, double offset)
-        {
-            Vec3d norm_dir = direction.normalized();
-            m_data[0] = norm_dir(0);
-            m_data[1] = norm_dir(1);
-            m_data[2] = norm_dir(2);
-            m_data[3] = offset;
-        }
-
-        const double* get_data() const { return m_data; }
-    };
-
-private:
-    class Gizmos
-    {
-    public:
-#if ENABLE_SVG_ICONS
-        static const float Default_Icons_Size;
-#endif // ENABLE_SVG_ICONS
-
-        enum EType : unsigned char
-        {
-            Undefined,
-            Move,
-            Scale,
-            Rotate,
-            Flatten,
-            Cut,
-            SlaSupports,
-            Num_Types
-        };
-
-    private:
-        bool m_enabled;
-        typedef std::map<EType, GLGizmoBase*> GizmosMap;
-        GizmosMap m_gizmos;
-#if ENABLE_SVG_ICONS
-        mutable GLTexture m_icons_texture;
-        mutable bool m_icons_texture_dirty;
-#else
-        ItemsIconsTexture m_icons_texture;
-#endif // ENABLE_SVG_ICONS
-        BackgroundTexture m_background_texture;
-        EType m_current;
-
-#if ENABLE_SVG_ICONS
-        float m_overlay_icons_size;
-        float m_overlay_scale;
-#else
-        float m_overlay_icons_scale;
-#endif // ENABLE_SVG_ICONS
-        float m_overlay_border;
-        float m_overlay_gap_y;
-
-    public:
-        Gizmos();
-        ~Gizmos();
-
-        bool init(GLCanvas3D& parent);
-
-        bool is_enabled() const;
-        void set_enabled(bool enable);
-
-#if ENABLE_SVG_ICONS
-        void set_overlay_icon_size(float size);
-#endif // ENABLE_SVG_ICONS
-        void set_overlay_scale(float scale);
-
-        std::string update_hover_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos, const Selection& selection);
-        void update_on_off_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos, const Selection& selection);
-        void update_on_off_state(const Selection& selection);
-        void reset_all_states();
-
-        void set_hover_id(int id);
-        void enable_grabber(EType type, unsigned int id, bool enable);
-
-        bool overlay_contains_mouse(const GLCanvas3D& canvas, const Vec2d& mouse_pos) const;
-        bool grabber_contains_mouse() const;
-        void update(const Linef3& mouse_ray, const Selection& selection, bool shift_down, const Point* mouse_pos = nullptr);
-        Rect get_reset_rect_viewport(const GLCanvas3D& canvas) const;
-        EType get_current_type() const;
-
-        bool is_running() const;
-        bool handle_shortcut(int key, const Selection& selection);
-
-        bool is_dragging() const;
-        void start_dragging(const Selection& selection);
-        void stop_dragging();
-
-        Vec3d get_displacement() const;
-
-        Vec3d get_scale() const;
-        void set_scale(const Vec3d& scale);
-
-        Vec3d get_rotation() const;
-        void set_rotation(const Vec3d& rotation);
-
-        Vec3d get_flattening_normal() const;
-
-        void set_flattening_data(const ModelObject* model_object);
-
-        void set_sla_support_data(ModelObject* model_object, const Selection& selection);
-        bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position = Vec2d::Zero(), bool shift_down = false);
-
-        void render_current_gizmo(const Selection& selection) const;
-        void render_current_gizmo_for_picking_pass(const Selection& selection) const;
-
-        void render_overlay(const GLCanvas3D& canvas, const Selection& selection) const;
-
-    private:
-        void reset();
-
-        void do_render_overlay(const GLCanvas3D& canvas, const Selection& selection) const;
-        void do_render_current_gizmo(const Selection& selection) const;
-
-        float get_total_overlay_height() const;
-        float get_total_overlay_width() const;
-
-        GLGizmoBase* get_current() const;
-
-#if ENABLE_SVG_ICONS
-        bool generate_icons_texture() const;
-#endif // ENABLE_SVG_ICONS
-    };
-
     struct SlaCap
     {
         struct Triangles
@@ -493,6 +346,7 @@ private:
         enum Warning {
             ObjectOutside,
             ToolpathOutside,
+            SlaSupportsOutside,
             SomethingNotShown,
             ObjectClashed
         };
@@ -502,6 +356,9 @@ private:
         void activate(WarningTexture::Warning warning, bool state, const GLCanvas3D& canvas);
         void render(const GLCanvas3D& canvas) const;
 
+        // function used to get an information for rescaling of the warning
+        void msw_rescale(const GLCanvas3D& canvas);
+
     private:
         static const unsigned char Background_Color[3];
         static const unsigned char Opacity;
@@ -509,6 +366,10 @@ private:
         int m_original_width;
         int m_original_height;
 
+        // information for rescaling of the warning legend
+        std::string     m_msg_text = "";
+        bool            m_is_colored_red{false};
+
         // Information about which warnings are currently active.
         std::vector<Warning> m_warnings;
 
@@ -541,6 +402,23 @@ private:
         void render(const GLCanvas3D& canvas) const;
     };
 
+#if ENABLE_RENDER_STATISTICS
+    struct RenderStats
+    {
+        long long last_frame;
+
+        RenderStats() : last_frame(0) {}
+    };
+#endif // ENABLE_RENDER_STATISTICS
+
+public:
+    enum ECursorType : unsigned char
+    {
+        Standard,
+        Cross
+    };
+
+private:
     wxGLCanvas* m_canvas;
     wxGLContext* m_context;
 #if ENABLE_RETINA_GL
@@ -556,9 +434,10 @@ private:
     LayersEditing m_layers_editing;
     Shader m_shader;
     Mouse m_mouse;
-    mutable Gizmos m_gizmos;
+    mutable GLGizmosManager m_gizmos;
     mutable GLToolbar m_toolbar;
     ClippingPlane m_clipping_planes[2];
+    mutable ClippingPlane m_camera_clipping_plane;
     bool m_use_clipping_planes;
     mutable SlaCap m_sla_caps[2];
     std::string m_sidebar_field;
@@ -574,7 +453,7 @@ private:
     bool m_initialized;
     bool m_use_VBOs;
     bool m_apply_zoom_to_volumes_filter;
-    mutable int m_hover_volume_id;
+    mutable std::vector<int> m_hover_volume_idxs;
     bool m_warning_texture_enabled;
     bool m_legend_texture_enabled;
     bool m_picking_enabled;
@@ -584,6 +463,8 @@ private:
     bool m_regenerate_volumes;
     bool m_moving;
     bool m_tab_down;
+    ECursorType m_cursor_type;
+    GLSelectionRectangle m_rectangle_selection;
 
     // Following variable is obsolete and it should be safe to remove it.
     // I just don't want to do it now before a release (Lukas Matena 24.3.2019)
@@ -595,6 +476,10 @@ private:
 
     GCodePreviewVolumeIndex m_gcode_preview_volume_index;
 
+#if ENABLE_RENDER_STATISTICS
+    RenderStats m_render_stats;
+#endif // ENABLE_RENDER_STATISTICS
+
 public:
     GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar);
     ~GLCanvas3D();
@@ -633,11 +518,12 @@ public:
             m_sla_caps[id].reset();
         }
     }
+    void reset_clipping_planes_cache() { m_sla_caps[0].triangles.clear(); m_sla_caps[1].triangles.clear(); }
     void set_use_clipping_planes(bool use) { m_use_clipping_planes = use; }
 
     void set_color_by(const std::string& value);
 
-    float get_camera_zoom() const;
+    const Camera& get_camera() const { return m_camera; }
 
     BoundingBoxf3 volumes_bounding_box() const;
     BoundingBoxf3 scene_bounding_box() const;
@@ -652,6 +538,7 @@ public:
     void enable_picking(bool enable);
     void enable_moving(bool enable);
     void enable_gizmos(bool enable);
+    void enable_selection(bool enable);
     void enable_toolbar(bool enable);
     void enable_dynamic_background(bool enable);
     void allow_multisample(bool allow);
@@ -668,6 +555,7 @@ public:
     void render();
 
     void select_all();
+    void deselect_all();
     void delete_selected();
     void ensure_on_bed(unsigned int object_idx);
 
@@ -697,7 +585,7 @@ public:
     void on_paint(wxPaintEvent& evt);
 
     Size get_canvas_size() const;
-    Point get_local_mouse_position() const;
+    Vec2d get_local_mouse_position() const;
 
     void reset_legend_texture();
 
@@ -712,11 +600,33 @@ public:
     void set_camera_zoom(float zoom);
 
     void update_gizmos_on_off_state();
+    void reset_all_gizmos() { m_gizmos.reset_all_states(); }
 
     void handle_sidebar_focus_event(const std::string& opt_key, bool focus_on);
 
     void update_ui_from_settings();
 
+    float get_view_toolbar_height() const { return m_view_toolbar.get_height(); }
+
+    int get_move_volume_id() const { return m_mouse.drag.move_volume_idx; }
+    int get_first_hover_volume_idx() const { return m_hover_volume_idxs.empty() ? -1 : m_hover_volume_idxs.front(); }
+
+    arr::WipeTowerInfo get_wipe_tower_info() const;
+    void arrange_wipe_tower(const arr::WipeTowerInfo& wti) const;
+
+    // Returns the view ray line, in world coordinate, at the given mouse position.
+    Linef3 mouse_ray(const Point& mouse_pos);
+
+    void set_mouse_as_dragging() { m_mouse.dragging = true; }
+    void disable_regenerate_volumes() { m_regenerate_volumes = false; }
+    void refresh_camera_scene_box() { m_camera.set_scene_box(scene_bounding_box()); }
+    bool is_mouse_dragging() const { return m_mouse.dragging; }
+
+    double get_size_proportional_to_max_bed_size(double factor) const;
+
+    void set_cursor(ECursorType type);
+    void msw_rescale();
+
 private:
     bool _is_shown_on_screen() const;
 
@@ -732,8 +642,8 @@ private:
 
     void _refresh_if_shown_on_screen();
 
-    void _camera_tranform() const;
     void _picking_pass() const;
+    void _rectangular_selection_picking_pass() const;
     void _render_background() const;
     void _render_bed(float theta) const;
     void _render_axes() const;
@@ -744,7 +654,7 @@ private:
 #endif // ENABLE_RENDER_SELECTION_CENTER
     void _render_warning_texture() const;
     void _render_legend_texture() const;
-    void _render_volumes(bool fake_colors) const;
+    void _render_volumes_for_picking() const;
     void _render_current_gizmo() const;
     void _render_gizmos_overlay() const;
     void _render_toolbar() const;
@@ -756,7 +666,6 @@ private:
     void _render_selection_sidebar_hints() const;
 
     void _update_volumes_hover_state() const;
-    void _update_gizmos_data();
 
     void _perform_layer_editing_action(wxMouseEvent* evt = nullptr);
 
@@ -767,9 +676,6 @@ private:
     // Convert the screen space coordinate to world coordinate on the bed.
     Vec3d _mouse_to_bed_3d(const Point& mouse_pos);
 
-    // Returns the view ray line, in world coordinate, at the given mouse position.
-    Linef3 mouse_ray(const Point& mouse_pos);
-
     void _start_timer();
     void _stop_timer();
 
@@ -796,13 +702,14 @@ private:
     // generates gcode unretractions geometry
     void _load_gcode_unretractions(const GCodePreviewData& preview_data);
     // generates objects and wipe tower geometry
-    void _load_shells_fff();
+    void _load_fff_shells();
     // generates objects geometry for sla
-    void _load_shells_sla();
+    void _load_sla_shells();
     // sets gcode geometry visibility according to user selection
     void _update_gcode_volumes_visibility(const GCodePreviewData& preview_data);
     void _update_toolpath_volumes_outside_state();
-    void _show_warning_texture_if_needed();
+    void _update_sla_shells_outside_state();
+    void _show_warning_texture_if_needed(WarningTexture::Warning warning);
 
     // generates the legend texture in dependence of the current shown view type
     void _generate_legend_texture(const GCodePreviewData& preview_data, const std::vector<float>& tool_colors);
@@ -816,6 +723,9 @@ private:
     void _resize_toolbars() const;
 #endif // !ENABLE_SVG_ICONS
 
+    // updates the selection from the content of m_hover_volume_idxs
+    void _update_selection_from_hover();
+
     static std::vector<float> _parse_colors(const std::vector<std::string>& colors);
 
 public:
diff --git a/src/slic3r/GUI/GLSelectionRectangle.cpp b/src/slic3r/GUI/GLSelectionRectangle.cpp
new file mode 100644
index 000000000..2f736531c
--- /dev/null
+++ b/src/slic3r/GUI/GLSelectionRectangle.cpp
@@ -0,0 +1,117 @@
+#include "GLSelectionRectangle.hpp"
+#include "Camera.hpp"
+#include "3DScene.hpp"
+#include "GLCanvas3D.hpp"
+
+#include <GL/glew.h>
+
+namespace Slic3r {
+namespace GUI {
+
+    void GLSelectionRectangle::start_dragging(const Vec2d& mouse_position, EState state)
+    {
+        if (is_dragging() || (state == Off))
+            return;
+
+        m_state = state;
+        m_start_corner = mouse_position;
+        m_end_corner = mouse_position;
+    }
+
+    void GLSelectionRectangle::dragging(const Vec2d& mouse_position)
+    {
+        if (!is_dragging())
+            return;
+
+        m_end_corner = mouse_position;
+    }
+
+    std::vector<unsigned int> GLSelectionRectangle::stop_dragging(const GLCanvas3D& canvas, const std::vector<Vec3d>& points)
+    {
+        std::vector<unsigned int> out;
+
+        if (!is_dragging())
+            return out;
+
+        m_state = Off;
+
+        const Camera& camera = canvas.get_camera();
+        const std::array<int, 4>& viewport = camera.get_viewport();
+        const Transform3d& modelview_matrix = camera.get_view_matrix();
+        const Transform3d& projection_matrix = camera.get_projection_matrix();
+
+        // bounding box created from the rectangle corners - will take care of order of the corners
+        BoundingBox rectangle(Points{ Point(m_start_corner.cast<coord_t>()), Point(m_end_corner.cast<coord_t>()) });
+
+        // Iterate over all points and determine whether they're in the rectangle.
+        for (unsigned int i = 0; i<points.size(); ++i) {
+            const Vec3d& point = points[i];
+            GLdouble out_x, out_y, out_z;
+            ::gluProject((GLdouble)point(0), (GLdouble)point(1), (GLdouble)point(2), (GLdouble*)modelview_matrix.data(), (GLdouble*)projection_matrix.data(), (GLint*)viewport.data(), &out_x, &out_y, &out_z);
+            out_y = canvas.get_canvas_size().get_height() - out_y;
+
+            if (rectangle.contains(Point(out_x, out_y)))
+                out.push_back(i);
+        }
+
+        return out;
+    }
+
+    void GLSelectionRectangle::stop_dragging()
+    {
+        if (is_dragging())
+            m_state = Off;
+    }
+
+    void GLSelectionRectangle::render(const GLCanvas3D& canvas) const
+    {
+        if (!is_dragging())
+            return;
+
+        float zoom = canvas.get_camera().zoom;
+        float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
+
+        Size cnv_size = canvas.get_canvas_size();
+        float cnv_half_width = 0.5f * (float)cnv_size.get_width();
+        float cnv_half_height = 0.5f * (float)cnv_size.get_height();
+        if ((cnv_half_width == 0.0f) || (cnv_half_height == 0.0f))
+            return;
+
+        Vec2d start(m_start_corner(0) - cnv_half_width, cnv_half_height - m_start_corner(1));
+        Vec2d end(m_end_corner(0) - cnv_half_width, cnv_half_height - m_end_corner(1));
+
+        float left = (float)std::min(start(0), end(0)) * inv_zoom;
+        float top = (float)std::max(start(1), end(1)) * inv_zoom;
+        float right = (float)std::max(start(0), end(0)) * inv_zoom;
+        float bottom = (float)std::min(start(1), end(1)) * inv_zoom;
+
+        glsafe(::glLineWidth(1.5f));
+        float color[3];
+        color[0] = (m_state == Select) ? 0.3f : 1.0f;
+        color[1] = (m_state == Select) ? 1.0f : 0.3f;
+        color[2] = 0.3f;
+        glsafe(::glColor3fv(color));
+
+        glsafe(::glDisable(GL_DEPTH_TEST));
+
+        glsafe(::glPushMatrix());
+        glsafe(::glLoadIdentity());
+
+        glsafe(::glPushAttrib(GL_ENABLE_BIT));
+        glsafe(::glLineStipple(4, 0xAAAA));
+        glsafe(::glEnable(GL_LINE_STIPPLE));
+
+        ::glBegin(GL_LINE_LOOP);
+        ::glVertex2f((GLfloat)left, (GLfloat)bottom);
+        ::glVertex2f((GLfloat)right, (GLfloat)bottom);
+        ::glVertex2f((GLfloat)right, (GLfloat)top);
+        ::glVertex2f((GLfloat)left, (GLfloat)top);
+        glsafe(::glEnd());
+
+        glsafe(::glPopAttrib());
+
+        glsafe(::glPopMatrix());
+    }
+
+} // namespace GUI
+} // namespace Slic3r
diff --git a/src/slic3r/GUI/GLSelectionRectangle.hpp b/src/slic3r/GUI/GLSelectionRectangle.hpp
new file mode 100644
index 000000000..d9869771e
--- /dev/null
+++ b/src/slic3r/GUI/GLSelectionRectangle.hpp
@@ -0,0 +1,56 @@
+#ifndef slic3r_GLSelectionRectangle_hpp_
+#define slic3r_GLSelectionRectangle_hpp_
+
+#include "libslic3r/Point.hpp"
+
+namespace Slic3r {
+namespace GUI {
+    
+struct Camera;
+class GLCanvas3D;
+
+class GLSelectionRectangle {
+public:
+    enum EState {
+            Off,
+            Select,
+            Deselect
+    };
+
+    // Initiates the rectangle. 
+    void start_dragging(const Vec2d& mouse_position, EState state);
+
+    // To be called on mouse move.
+    void dragging(const Vec2d& mouse_position);
+
+    // Given a vector of points in world coordinates, the function returns indices of those
+    // that are in the rectangle. It then disables the rectangle.
+    std::vector<unsigned int> stop_dragging(const GLCanvas3D& canvas, const std::vector<Vec3d>& points);
+
+    // Disables the rectangle.
+    void stop_dragging();
+
+    void render(const GLCanvas3D& canvas) const;
+
+    bool is_dragging() const { return m_state != Off; }
+    EState get_state() const { return m_state; }
+
+    float get_width() const { return std::abs(m_start_corner(0) - m_end_corner(0)); }
+    float get_height() const { return std::abs(m_start_corner(1) - m_end_corner(1)); }
+    float get_left() const { return std::min(m_start_corner(0), m_end_corner(0)); }
+    float get_right() const { return std::max(m_start_corner(0), m_end_corner(0)); }
+    float get_top() const { return std::max(m_start_corner(1), m_end_corner(1)); }
+    float get_bottom() const { return std::min(m_start_corner(1), m_end_corner(1)); }
+
+private:
+    EState m_state = Off;
+    Vec2d m_start_corner;
+    Vec2d m_end_corner;
+};
+
+    
+} // namespace GUI
+} // namespace Slic3r
+
+
+#endif // slic3r_GLGizmoSlaSupports_hpp_
diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp
index f401f5466..7f3bc0893 100644
--- a/src/slic3r/GUI/GLShader.cpp
+++ b/src/slic3r/GUI/GLShader.cpp
@@ -3,6 +3,7 @@
 #include "GLShader.hpp"
 
 #include "libslic3r/Utils.hpp"
+#include "3DScene.hpp"
 #include <boost/nowide/fstream.hpp>
 
 #include <string>
@@ -52,21 +53,22 @@ bool GLShader::load_from_text(const char *fragment_shader, const char *vertex_sh
     }
 
     if (fragment_shader != nullptr) {
-        this->fragment_program_id = glCreateShader(GL_FRAGMENT_SHADER);
+        this->fragment_program_id = ::glCreateShader(GL_FRAGMENT_SHADER);
+        glcheck();
         if (this->fragment_program_id == 0) {
             last_error = "glCreateShader(GL_FRAGMENT_SHADER) failed.";
             return false;
         }
         GLint len = (GLint)strlen(fragment_shader);
-        glShaderSource(this->fragment_program_id, 1, &fragment_shader, &len);
-        glCompileShader(this->fragment_program_id);
+        glsafe(::glShaderSource(this->fragment_program_id, 1, &fragment_shader, &len));
+        glsafe(::glCompileShader(this->fragment_program_id));
         GLint params;
-        glGetShaderiv(this->fragment_program_id, GL_COMPILE_STATUS, &params);
+        glsafe(::glGetShaderiv(this->fragment_program_id, GL_COMPILE_STATUS, &params));
         if (params == GL_FALSE) {
             // Compilation failed. Get the log.
-            glGetShaderiv(this->fragment_program_id, GL_INFO_LOG_LENGTH, &params);
+            glsafe(::glGetShaderiv(this->fragment_program_id, GL_INFO_LOG_LENGTH, &params));
             std::vector<char> msg(params);
-            glGetShaderInfoLog(this->fragment_program_id, params, &params, msg.data());
+            glsafe(::glGetShaderInfoLog(this->fragment_program_id, params, &params, msg.data()));
             this->last_error = std::string("Fragment shader compilation failed:\n") + msg.data();
             this->release();
             return false;
@@ -74,22 +76,23 @@ bool GLShader::load_from_text(const char *fragment_shader, const char *vertex_sh
     }
 
     if (vertex_shader != nullptr) {
-        this->vertex_program_id = glCreateShader(GL_VERTEX_SHADER);
+        this->vertex_program_id = ::glCreateShader(GL_VERTEX_SHADER);
+        glcheck();
         if (this->vertex_program_id == 0) {
             last_error = "glCreateShader(GL_VERTEX_SHADER) failed.";
             this->release();
             return false;
         }
         GLint len = (GLint)strlen(vertex_shader);
-        glShaderSource(this->vertex_program_id, 1, &vertex_shader, &len);
-        glCompileShader(this->vertex_program_id);
+        glsafe(::glShaderSource(this->vertex_program_id, 1, &vertex_shader, &len));
+        glsafe(::glCompileShader(this->vertex_program_id));
         GLint params;
-        glGetShaderiv(this->vertex_program_id, GL_COMPILE_STATUS, &params);
+        glsafe(::glGetShaderiv(this->vertex_program_id, GL_COMPILE_STATUS, &params));
         if (params == GL_FALSE) {
             // Compilation failed. Get the log.
-            glGetShaderiv(this->vertex_program_id, GL_INFO_LOG_LENGTH, &params);
+            glsafe(::glGetShaderiv(this->vertex_program_id, GL_INFO_LOG_LENGTH, &params));
             std::vector<char> msg(params);
-            glGetShaderInfoLog(this->vertex_program_id, params, &params, msg.data());
+            glsafe(::glGetShaderInfoLog(this->vertex_program_id, params, &params, msg.data()));
             this->last_error = std::string("Vertex shader compilation failed:\n") + msg.data();
             this->release();
             return false;
@@ -97,7 +100,8 @@ bool GLShader::load_from_text(const char *fragment_shader, const char *vertex_sh
     }
 
     // Link shaders
-    this->shader_program_id = glCreateProgram();
+    this->shader_program_id = ::glCreateProgram();
+    glcheck();
     if (this->shader_program_id == 0) {
         last_error = "glCreateProgram() failed.";
         this->release();
@@ -105,18 +109,18 @@ bool GLShader::load_from_text(const char *fragment_shader, const char *vertex_sh
     }
 
     if (this->fragment_program_id)
-        glAttachShader(this->shader_program_id, this->fragment_program_id);
+        glsafe(::glAttachShader(this->shader_program_id, this->fragment_program_id));
     if (this->vertex_program_id)
-        glAttachShader(this->shader_program_id, this->vertex_program_id);
-    glLinkProgram(this->shader_program_id);
+        glsafe(::glAttachShader(this->shader_program_id, this->vertex_program_id));
+    glsafe(::glLinkProgram(this->shader_program_id));
 
     GLint params;
-    glGetProgramiv(this->shader_program_id, GL_LINK_STATUS, &params);
+    glsafe(::glGetProgramiv(this->shader_program_id, GL_LINK_STATUS, &params));
     if (params == GL_FALSE) {
         // Linking failed. Get the log.
-        glGetProgramiv(this->vertex_program_id, GL_INFO_LOG_LENGTH, &params);
+        glsafe(::glGetProgramiv(this->vertex_program_id, GL_INFO_LOG_LENGTH, &params));
         std::vector<char> msg(params);
-        glGetProgramInfoLog(this->vertex_program_id, params, &params, msg.data());
+        glsafe(::glGetProgramInfoLog(this->vertex_program_id, params, &params, msg.data()));
         this->last_error = std::string("Shader linking failed:\n") + msg.data();
         this->release();
         return false;
@@ -165,31 +169,31 @@ void GLShader::release()
 {
     if (this->shader_program_id) {
         if (this->vertex_program_id)
-            glDetachShader(this->shader_program_id, this->vertex_program_id);
+            glsafe(::glDetachShader(this->shader_program_id, this->vertex_program_id));
         if (this->fragment_program_id)
-            glDetachShader(this->shader_program_id, this->fragment_program_id);
-        glDeleteProgram(this->shader_program_id);
+            glsafe(::glDetachShader(this->shader_program_id, this->fragment_program_id));
+        glsafe(::glDeleteProgram(this->shader_program_id));
         this->shader_program_id = 0;
     }
 
     if (this->vertex_program_id) {
-        glDeleteShader(this->vertex_program_id);
+        glsafe(::glDeleteShader(this->vertex_program_id));
         this->vertex_program_id = 0;
     }
     if (this->fragment_program_id) {
-        glDeleteShader(this->fragment_program_id);
+        glsafe(::glDeleteShader(this->fragment_program_id));
         this->fragment_program_id = 0;
     }
 }
 
 void GLShader::enable() const
 {
-    glUseProgram(this->shader_program_id);
+    glsafe(::glUseProgram(this->shader_program_id));
 }
 
 void GLShader::disable() const
 {
-    glUseProgram(0);
+    glsafe(::glUseProgram(0));
 }
 
 // Return shader vertex attribute ID
@@ -208,7 +212,7 @@ bool GLShader::set_uniform(const char *name, float value) const
 {
     int id = this->get_uniform_location(name);
     if (id >= 0) { 
-        glUniform1fARB(id, value);
+        glsafe(::glUniform1fARB(id, value));
         return true;
     }
     return false;
@@ -219,7 +223,7 @@ bool GLShader::set_uniform(const char* name, const float* matrix) const
     int id = get_uniform_location(name);
     if (id >= 0)
     {
-        ::glUniformMatrix4fv(id, 1, GL_FALSE, (const GLfloat*)matrix);
+        glsafe(::glUniformMatrix4fv(id, 1, GL_FALSE, (const GLfloat*)matrix));
         return true;
     }
     return false;
@@ -230,7 +234,7 @@ bool GLShader::set_uniform(const char* name, int value) const
     int id = get_uniform_location(name);
     if (id >= 0)
     {
-        ::glUniform1i(id, value);
+        glsafe(::glUniform1i(id, value));
         return true;
     }
     return false;
diff --git a/src/slic3r/GUI/GLTexture.cpp b/src/slic3r/GUI/GLTexture.cpp
index b48ca2044..2fff0869a 100644
--- a/src/slic3r/GUI/GLTexture.cpp
+++ b/src/slic3r/GUI/GLTexture.cpp
@@ -1,6 +1,8 @@
 #include "libslic3r/libslic3r.h"
 #include "GLTexture.hpp"
 
+#include "3DScene.hpp"
+
 #include <GL/glew.h>
 
 #include <wx/image.h>
@@ -11,15 +13,11 @@
 #include <vector>
 #include <algorithm>
 
-#define NANOSVG_IMPLEMENTATION
 #include "nanosvg/nanosvg.h"
-#define NANOSVGRAST_IMPLEMENTATION
 #include "nanosvg/nanosvgrast.h"
 
 #include "libslic3r/Utils.hpp"
 
-#include "libslic3r/Utils.hpp"
-
 namespace Slic3r {
 namespace GUI {
 
@@ -177,15 +175,15 @@ bool GLTexture::load_from_svg_files_as_sprites_array(const std::vector<std::stri
     nsvgDeleteRasterizer(rast);
 
     // sends data to gpu
-    ::glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    ::glGenTextures(1, &m_id);
-    ::glBindTexture(GL_TEXTURE_2D, m_id);
-    ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data());
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glsafe(::glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+    glsafe(::glGenTextures(1, &m_id));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, m_id));
+    glsafe(::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data()));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
 
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
     m_source = filenames.front();
     
@@ -218,7 +216,7 @@ bool GLTexture::load_from_svg_files_as_sprites_array(const std::vector<std::stri
 void GLTexture::reset()
 {
     if (m_id != 0)
-        ::glDeleteTextures(1, &m_id);
+        glsafe(::glDeleteTextures(1, &m_id));
 
     m_id = 0;
     m_width = 0;
@@ -233,25 +231,25 @@ void GLTexture::render_texture(unsigned int tex_id, float left, float right, flo
 
 void GLTexture::render_sub_texture(unsigned int tex_id, float left, float right, float bottom, float top, const GLTexture::Quad_UVs& uvs)
 {
-    ::glEnable(GL_BLEND);
-    ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glsafe(::glEnable(GL_BLEND));
+    glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
-    ::glEnable(GL_TEXTURE_2D);
-    ::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+    glsafe(::glEnable(GL_TEXTURE_2D));
+    glsafe(::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE));
 
-    ::glBindTexture(GL_TEXTURE_2D, (GLuint)tex_id);
+    glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)tex_id));
 
     ::glBegin(GL_QUADS);
     ::glTexCoord2f(uvs.left_bottom.u, uvs.left_bottom.v); ::glVertex2f(left, bottom);
     ::glTexCoord2f(uvs.right_bottom.u, uvs.right_bottom.v); ::glVertex2f(right, bottom);
     ::glTexCoord2f(uvs.right_top.u, uvs.right_top.v); ::glVertex2f(right, top);
     ::glTexCoord2f(uvs.left_top.u, uvs.left_top.v); ::glVertex2f(left, top);
-    ::glEnd();
+    glsafe(::glEnd());
 
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
-    ::glDisable(GL_TEXTURE_2D);
-    ::glDisable(GL_BLEND);
+    glsafe(::glDisable(GL_TEXTURE_2D));
+    glsafe(::glDisable(GL_BLEND));
 }
 
 unsigned int GLTexture::generate_mipmaps(wxImage& image)
@@ -286,7 +284,7 @@ unsigned int GLTexture::generate_mipmaps(wxImage& image)
             data[data_id + 3] = (img_alpha != nullptr) ? img_alpha[i] : 255;
         }
 
-        ::glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, (GLsizei)w, (GLsizei)h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data());
+        glsafe(::glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, (GLsizei)w, (GLsizei)h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data()));
     }
 
     return (unsigned int)level;
@@ -334,25 +332,25 @@ bool GLTexture::load_from_png(const std::string& filename, bool use_mipmaps)
     }
 
     // sends data to gpu
-    ::glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    ::glGenTextures(1, &m_id);
-    ::glBindTexture(GL_TEXTURE_2D, m_id);
-    ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data());
+    glsafe(::glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+    glsafe(::glGenTextures(1, &m_id));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, m_id));
+    glsafe(::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data()));
     if (use_mipmaps)
     {
         // we manually generate mipmaps because glGenerateMipmap() function is not reliable on all graphics cards
         unsigned int levels_count = generate_mipmaps(image);
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, levels_count);
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, levels_count));
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR));
     }
     else
     {
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
     }
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
 
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
     m_source = filename;
 
@@ -378,6 +376,7 @@ bool GLTexture::load_from_svg(const std::string& filename, bool use_mipmaps, uns
     if (n_pixels <= 0)
     {
         reset();
+        nsvgDelete(image);
         return false;
     }
 
@@ -395,10 +394,10 @@ bool GLTexture::load_from_svg(const std::string& filename, bool use_mipmaps, uns
     nsvgRasterize(rast, image, 0, 0, scale, data.data(), m_width, m_height, m_width * 4);
 
     // sends data to gpu
-    ::glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    ::glGenTextures(1, &m_id);
-    ::glBindTexture(GL_TEXTURE_2D, m_id);
-    ::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data());
+    glsafe(::glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+    glsafe(::glGenTextures(1, &m_id));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, m_id));
+    glsafe(::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)m_width, (GLsizei)m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data()));
     if (use_mipmaps)
     {
         // we manually generate mipmaps because glGenerateMipmap() function is not reliable on all graphics cards
@@ -414,20 +413,20 @@ bool GLTexture::load_from_svg(const std::string& filename, bool use_mipmaps, uns
             scale /= 2.0f;
 
             nsvgRasterize(rast, image, 0, 0, scale, data.data(), lod_w, lod_h, lod_w * 4);
-            ::glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, (GLsizei)lod_w, (GLsizei)lod_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data());
+            glsafe(::glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, (GLsizei)lod_w, (GLsizei)lod_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const void*)data.data()));
         }
 
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, level);
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, level));
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR));
     }
     else
     {
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+        glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0));
     }
-    ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
 
-    ::glBindTexture(GL_TEXTURE_2D, 0);
+    glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
     m_source = filename;
 
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp
index 2f7f13f6f..842700aef 100644
--- a/src/slic3r/GUI/GLToolbar.cpp
+++ b/src/slic3r/GUI/GLToolbar.cpp
@@ -21,6 +21,8 @@ wxDEFINE_EVENT(EVT_GLTOOLBAR_ADD, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLTOOLBAR_DELETE, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLTOOLBAR_DELETE_ALL, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLTOOLBAR_ARRANGE, SimpleEvent);
+wxDEFINE_EVENT(EVT_GLTOOLBAR_COPY, SimpleEvent);
+wxDEFINE_EVENT(EVT_GLTOOLBAR_PASTE, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLTOOLBAR_MORE, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLTOOLBAR_FEWER, SimpleEvent);
 wxDEFINE_EVENT(EVT_GLTOOLBAR_SPLIT_OBJECTS, SimpleEvent);
@@ -388,10 +390,10 @@ void GLToolbar::render(const GLCanvas3D& parent) const
         generate_icons_texture();
 #endif // ENABLE_SVG_ICONS
 
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
-    ::glPushMatrix();
-    ::glLoadIdentity();
+    glsafe(::glPushMatrix());
+    glsafe(::glLoadIdentity());
 
     switch (m_layout.type)
     {
@@ -400,7 +402,7 @@ void GLToolbar::render(const GLCanvas3D& parent) const
     case Layout::Vertical: { render_vertical(parent); break; }
     }
 
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 }
 
 bool GLToolbar::on_mouse(wxMouseEvent& evt, GLCanvas3D& parent)
@@ -444,11 +446,11 @@ bool GLToolbar::on_mouse(wxMouseEvent& evt, GLCanvas3D& parent)
         {
             m_mouse_capture.left = true;
             m_mouse_capture.parent = &parent;
+            processed = true;
             if ((item_id != -2) && !m_items[item_id]->is_separator())
             {
                 // mouse is inside an icon
                 do_action((unsigned int)item_id, parent);
-                processed = true;
             }
         }
         else if (evt.MiddleDown())
@@ -612,7 +614,7 @@ std::string GLToolbar::update_hover_state_horizontal(const Vec2d& mouse_pos, GLC
 {
     // NB: mouse_pos is already scaled appropriately
 
-    float zoom = parent.get_camera_zoom();
+    float zoom = parent.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 #if ENABLE_SVG_ICONS
     float factor = m_layout.scale * inv_zoom;
@@ -717,7 +719,7 @@ std::string GLToolbar::update_hover_state_vertical(const Vec2d& mouse_pos, GLCan
 {
     // NB: mouse_pos is already scaled appropriately
 
-    float zoom = parent.get_camera_zoom();
+    float zoom = parent.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 #if ENABLE_SVG_ICONS
     float factor = m_layout.scale * inv_zoom;
@@ -834,7 +836,7 @@ int GLToolbar::contains_mouse_horizontal(const Vec2d& mouse_pos, const GLCanvas3
 {
     // NB: mouse_pos is already scaled appropriately
 
-    float zoom = parent.get_camera_zoom();
+    float zoom = parent.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 #if ENABLE_SVG_ICONS
     float factor = m_layout.scale * inv_zoom;
@@ -917,7 +919,7 @@ int GLToolbar::contains_mouse_vertical(const Vec2d& mouse_pos, const GLCanvas3D&
 {
     // NB: mouse_pos is already scaled appropriately
 
-    float zoom = parent.get_camera_zoom();
+    float zoom = parent.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 #if ENABLE_SVG_ICONS
     float factor = m_layout.scale * inv_zoom;
@@ -1013,7 +1015,7 @@ void GLToolbar::render_horizontal(const GLCanvas3D& parent) const
         return;
 #endif // !ENABLE_SVG_ICONS
 
-    float zoom = parent.get_camera_zoom();
+    float zoom = parent.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 #if ENABLE_SVG_ICONS
     float factor = inv_zoom * m_layout.scale;
@@ -1168,7 +1170,7 @@ void GLToolbar::render_vertical(const GLCanvas3D& parent) const
         return;
 #endif // !ENABLE_SVG_ICONS
 
-    float zoom = parent.get_camera_zoom();
+    float zoom = parent.get_camera().zoom;
     float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
 #if ENABLE_SVG_ICONS
     float factor = inv_zoom * m_layout.scale;
diff --git a/src/slic3r/GUI/GLToolbar.hpp b/src/slic3r/GUI/GLToolbar.hpp
index 5fac1f5b2..24314d60f 100644
--- a/src/slic3r/GUI/GLToolbar.hpp
+++ b/src/slic3r/GUI/GLToolbar.hpp
@@ -7,6 +7,7 @@
 
 #include "GLTexture.hpp"
 #include "Event.hpp"
+#include "libslic3r/Point.hpp"
 
 class wxEvtHandler;
 
@@ -19,6 +20,8 @@ wxDECLARE_EVENT(EVT_GLTOOLBAR_ADD, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLTOOLBAR_DELETE_ALL, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLTOOLBAR_ARRANGE, SimpleEvent);
+wxDECLARE_EVENT(EVT_GLTOOLBAR_COPY, SimpleEvent);
+wxDECLARE_EVENT(EVT_GLTOOLBAR_PASTE, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLTOOLBAR_MORE, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLTOOLBAR_FEWER, SimpleEvent);
 wxDECLARE_EVENT(EVT_GLTOOLBAR_SPLIT_OBJECTS, SimpleEvent);
diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index e3d8cc76d..33415e00c 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -125,9 +125,6 @@ void config_wizard(int reason)
     if (! wxGetApp().check_unsaved_changes())
     	return;
 
-    // save selected preset before config wizard running
-    const auto printer_preset_name = wxGetApp().preset_bundle->printers.get_edited_preset().name;
-
 	try {
 		ConfigWizard wizard(nullptr, static_cast<ConfigWizard::RunReason>(reason));
         wizard.run(wxGetApp().preset_bundle, wxGetApp().preset_updater);
@@ -136,10 +133,8 @@ void config_wizard(int reason)
 		show_error(nullptr, e.what());
 	}
 
-    // select old(before config wizard running) preset
-	wxGetApp().get_tab(Preset::TYPE_PRINTER)->select_preset(printer_preset_name); 
-    // If old preset if invisible now, then first visible preset will be selected
-    // So, let control the case if multi-part object is on the scene and first visible preset is SLA
+	wxGetApp().load_current_presets();
+
     if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA &&
         wxGetApp().obj_list()->has_multi_part_objects())
     {
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index a6a356b2c..2e9c16309 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -3,6 +3,8 @@
 #include "GUI_ObjectManipulation.hpp"
 #include "I18N.hpp"
 
+#include <algorithm>
+#include <iterator>
 #include <exception>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
@@ -14,10 +16,14 @@
 #include <wx/menu.h>
 #include <wx/menuitem.h>
 #include <wx/filedlg.h>
+#include <wx/progdlg.h>
 #include <wx/dir.h>
 #include <wx/wupdlock.h>
 #include <wx/filefn.h>
 #include <wx/sysopt.h>
+#include <wx/msgdlg.h>
+#include <wx/log.h>
+#include <wx/intl.h>
 
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Model.hpp"
@@ -31,7 +37,8 @@
 
 #include "../Utils/PresetUpdater.hpp"
 #include "../Utils/PrintHost.hpp"
-#include "ConfigWizard_private.hpp"
+#include "../Utils/MacDarkMode.hpp"
+#include "ConfigWizard.hpp"
 #include "slic3r/Config/Snapshot.hpp"
 #include "ConfigSnapshotDialog.hpp"
 #include "FirmwareDialog.hpp"
@@ -40,6 +47,10 @@
 #include "SysInfoDialog.hpp"
 #include "KBShortcutsDialog.hpp"
 
+#ifdef __WXMSW__
+#include <Shlobj.h>
+#endif // __WXMSW__
+
 namespace Slic3r {
 namespace GUI {
 
@@ -47,13 +58,14 @@ namespace GUI {
 wxString file_wildcards(FileType file_type, const std::string &custom_extension)
 {
     static const std::string defaults[FT_SIZE] = {
-        /* FT_STL */   "STL files (*.stl)|*.stl;*.STL",
-        /* FT_OBJ */   "OBJ files (*.obj)|*.obj;*.OBJ",
-        /* FT_AMF */   "AMF files (*.amf)|*.zip.amf;*.amf;*.AMF;*.xml;*.XML",
-        /* FT_3MF */   "3MF files (*.3mf)|*.3mf;*.3MF;",
-        /* FT_PRUSA */ "Prusa Control files (*.prusa)|*.prusa;*.PRUSA",
-        /* FT_GCODE */ "G-code files (*.gcode, *.gco, *.g, *.ngc)|*.gcode;*.GCODE;*.gco;*.GCO;*.g;*.G;*.ngc;*.NGC",
-        /* FT_MODEL */ "Known files (*.stl, *.obj, *.amf, *.xml, *.3mf, *.prusa)|*.stl;*.STL;*.obj;*.OBJ;*.amf;*.AMF;*.xml;*.XML;*.3mf;*.3MF;*.prusa;*.PRUSA",
+        /* FT_STL */     "STL files (*.stl)|*.stl;*.STL",
+        /* FT_OBJ */     "OBJ files (*.obj)|*.obj;*.OBJ",
+        /* FT_AMF */     "AMF files (*.amf)|*.zip.amf;*.amf;*.AMF;*.xml;*.XML",
+        /* FT_3MF */     "3MF files (*.3mf)|*.3mf;*.3MF;",
+        /* FT_PRUSA */   "Prusa Control files (*.prusa)|*.prusa;*.PRUSA",
+        /* FT_GCODE */   "G-code files (*.gcode, *.gco, *.g, *.ngc)|*.gcode;*.GCODE;*.gco;*.GCO;*.g;*.G;*.ngc;*.NGC",
+        /* FT_MODEL */   "Known files (*.stl, *.obj, *.amf, *.xml, *.3mf, *.prusa)|*.stl;*.STL;*.obj;*.OBJ;*.amf;*.AMF;*.xml;*.XML;*.3mf;*.3MF;*.prusa;*.PRUSA",
+        /* FT_PROJECT */ "Project files (*.3mf, *.amf)|*.3mf;*.3MF;*.amf;*.AMF",
 
         /* FT_INI */   "INI files (*.ini)|*.ini;*.INI",
         /* FT_SVG */   "SVG files (*.svg)|*.svg;*.SVG",
@@ -75,6 +87,52 @@ wxString file_wildcards(FileType file_type, const std::string &custom_extension)
 
 static std::string libslic3r_translate_callback(const char *s) { return wxGetTranslation(wxString(s, wxConvUTF8)).utf8_str().data(); }
 
+static void register_dpi_event()
+{
+#ifdef WIN32
+    enum { WM_DPICHANGED_ = 0x02e0 };
+
+    wxWindow::MSWRegisterMessageHandler(WM_DPICHANGED_, [](wxWindow *win, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) {
+        const int dpi = wParam & 0xffff;
+        const auto rect = reinterpret_cast<PRECT>(lParam);
+        const wxRect wxrect(wxPoint(rect->top, rect->left), wxPoint(rect->bottom, rect->right));
+
+        DpiChangedEvent evt(EVT_DPI_CHANGED, dpi, wxrect);
+        win->GetEventHandler()->AddPendingEvent(evt);
+
+        return true;
+    });
+#endif
+}
+
+
+static void generic_exception_handle()
+{
+    // Note: Some wxWidgets APIs use wxLogError() to report errors, eg. wxImage
+    // - see https://docs.wxwidgets.org/3.1/classwx_image.html#aa249e657259fe6518d68a5208b9043d0
+    //
+    // wxLogError typically goes around exception handling and display an error dialog some time
+    // after an error is logged even if exception handling and OnExceptionInMainLoop() take place.
+    // This is why we use wxLogError() here as well instead of a custom dialog, because it accumulates
+    // errors if multiple have been collected and displays just one error message for all of them.
+    // Otherwise we would get multiple error messages for one missing png, for example.
+    //
+    // If a custom error message window (or some other solution) were to be used, it would be necessary
+    // to turn off wxLogError() usage in wx APIs, most notably in wxImage
+    // - see https://docs.wxwidgets.org/trunk/classwx_image.html#aa32e5d3507cc0f8c3330135bc0befc6a
+
+    try {
+        throw;
+    } catch (const std::exception &ex) {
+        wxLogError("Internal error: %s", ex.what());
+        BOOST_LOG_TRIVIAL(error) << boost::format("Uncaught exception: %1%") % ex.what();
+        throw;
+    } catch (...) {
+        wxLogError("Unknown internal error");
+        BOOST_LOG_TRIVIAL(error) << "Uncaught exception: Unknown error";
+    }
+}
+
 IMPLEMENT_APP(GUI_App)
 
 GUI_App::GUI_App()
@@ -84,15 +142,24 @@ GUI_App::GUI_App()
 {}
 
 bool GUI_App::OnInit()
+{
+    try {
+        return on_init_inner();
+    } catch (...) {
+        generic_exception_handle();
+        return false;
+    }
+}
+
+bool GUI_App::on_init_inner()
 {
     // Verify resources path
     const wxString resources_dir = from_u8(Slic3r::resources_dir());
     wxCHECK_MSG(wxDirExists(resources_dir), false,
         wxString::Format("Resources path does not exist or is not a directory: %s", resources_dir));
-    wxCHECK_MSG(m_imgui->init(), false, "Failed to initialize ImGui");
 
-    SetAppName("Slic3r++-beta");
-    SetAppDisplayName("Slic3r++");
+    SetAppName(SLIC3R_APP_KEY);
+    SetAppDisplayName(SLIC3R_APP_NAME);
 
 // Enable this to get the default Win32 COMCTRL32 behavior of static boxes.
 //    wxSystemOptions::SetOption("msw.staticbox.optimized-paint", 0);
@@ -114,13 +181,7 @@ bool GUI_App::OnInit()
 
     // just checking for existence of Slic3r::data_dir is not enough : it may be an empty directory
     // supplied as argument to --datadir; in that case we should still run the wizard
-    try { 
-        preset_bundle->setup_directories();
-    } catch (const std::exception &ex) {
-        show_error(nullptr, ex.what());
-        // Exit the application.
-        return false;
-    }
+    preset_bundle->setup_directories();
 
     app_conf_exists = app_config->exists();
     // load settings
@@ -129,28 +190,35 @@ bool GUI_App::OnInit()
     app_config->set("version", SLIC3R_VERSION);
     app_config->save();
 
+#ifdef __WXMSW__
+    associate_3mf_files();
+#endif // __WXMSW__
+
     preset_updater = new PresetUpdater();
     Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent &evt) {
         app_config->set("version_online", into_u8(evt.GetString()));
         app_config->save();
     });
 
+    // initialize label colors and fonts
+    init_label_colours();
+    init_fonts();
+
     load_language();
     //wxSetlocale(LC_NUMERIC, "C");
 
     // Suppress the '- default -' presets.
     preset_bundle->set_default_suppressed(app_config->get("no_defaults") == "1");
-	try {
-		preset_bundle->load_presets(*app_config);
-	} catch (const std::exception &ex) {
-        show_error(nullptr, ex.what());
-	}
+    try {
+        preset_bundle->load_presets(*app_config);
+    } catch (const std::exception &ex) {
+        show_error(nullptr, from_u8(ex.what()));
+    }
+
+    register_dpi_event();
 
     // Let the libslic3r know the callback, which will translate messages on demand.
     Slic3r::I18N::set_translate_callback(libslic3r_translate_callback);
-    // initialize label colors and fonts
-    init_label_colours();
-    init_fonts();
 
     // application frame
     if (wxImage::FindHandler(wxBITMAP_TYPE_PNG) == nullptr)
@@ -164,8 +232,8 @@ bool GUI_App::OnInit()
 
     Bind(wxEVT_IDLE, [this](wxIdleEvent& event)
     {
-		if (! plater_)
-			return;
+        if (! plater_)
+            return;
 
         if (app_config->dirty() && app_config->get("autosave") == "1")
             app_config->save();
@@ -176,7 +244,7 @@ bool GUI_App::OnInit()
         // and after MainFrame is created & shown.
         // 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 not better way to do it.
+        // This is ugly but I honestly found no better way to do it.
         // Neither wxShowEvent nor wxWindowCreateEvent work reliably.
         static bool once = true;
         if (once) {
@@ -187,12 +255,12 @@ bool GUI_App::OnInit()
                     mainframe->Close();
                 }
             } catch (const std::exception &ex) {
-                show_error(nullptr, ex.what());
+                show_error(nullptr, from_u8(ex.what()));
             }
 
             CallAfter([this] {
                 if (!config_wizard_startup(app_conf_exists)) {
-                    // Only notify if there was not wizard so as not to bother too much ...
+                    // Only notify if there was no wizard so as not to bother too much ...
                     preset_updater->slic3r_update_notify();
                 }
                 preset_updater->sync(preset_bundle);
@@ -203,7 +271,16 @@ bool GUI_App::OnInit()
     load_current_presets();
 
     mainframe->Show(true);
+
+    /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
+     * change min hight of object list to the normal min value (15 * wxGetApp().em_unit()) 
+     * after first whole Mainframe updating/layouting
+     */
+    if (obj_list()->GetMinSize().GetY() > 15 * em_unit())
+        obj_list()->SetMinSize(wxSize(-1, 15 * em_unit()));
+
     update_mode(); // update view mode after fix of the object_list size
+
     m_initialized = true;
     return true;
 }
@@ -221,17 +298,31 @@ unsigned GUI_App::get_colour_approx_luma(const wxColour &colour)
         ));
 }
 
+bool GUI_App::dark_mode()
+{
+    const unsigned luma = get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    return luma < 128;
+}
+
+bool GUI_App::dark_mode_menus()
+{
+#if __APPLE__
+    return mac_dark_mode();
+#else
+    return dark_mode();
+#endif
+}
+
 void GUI_App::init_label_colours()
 {
-    auto luma = get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-    if (luma >= 128) {
-        m_color_label_modified = wxColour(252, 77, 1);
-        m_color_label_sys = wxColour(26, 132, 57);
-    }
-    else {
+    if (dark_mode()) {
         m_color_label_modified = wxColour(253, 111, 40);
         m_color_label_sys = wxColour(115, 220, 103);
     }
+    else {
+        m_color_label_modified = wxColour(252, 77, 1);
+        m_color_label_sys = wxColour(26, 132, 57);
+    }
     m_color_label_default = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
 }
 
@@ -262,6 +353,21 @@ void GUI_App::init_fonts()
 #endif /*__WXMAC__*/
 }
 
+void GUI_App::update_fonts(const MainFrame *main_frame)
+{
+    /* Only normal and bold fonts are used for an application rescale,
+     * because of under MSW small and normal fonts are the same.
+     * To avoid same rescaling twice, just fill this values
+     * from rescaled MainFrame
+     */
+	if (main_frame == nullptr)
+		main_frame = this->mainframe;
+    m_normal_font   = main_frame->normal_font();
+    m_small_font    = m_normal_font;
+    m_bold_font     = main_frame->normal_font().Bold();
+    m_em_unit       = main_frame->em_unit();
+}
+
 void GUI_App::set_label_clr_modified(const wxColour& clr) {
     m_color_label_modified = clr;
     auto clr_str = wxString::Format(wxT("#%02X%02X%02X"), clr.Red(), clr.Green(), clr.Blue());
@@ -280,31 +386,57 @@ void GUI_App::set_label_clr_sys(const wxColour& clr) {
 
 void GUI_App::recreate_GUI()
 {
+    // Weird things happen as the Paint messages are floating around the windows being destructed.
+    // Avoid the Paint messages by hiding the main window.
+    // Also the application closes much faster without these unnecessary screen refreshes.
+    // In addition, there were some crashes due to the Paint events sent to already destructed windows.
+    mainframe->Show(false);
+
+    const auto msg_name = _(L("Changing of an application language")) + dots;
+    wxProgressDialog dlg(msg_name, msg_name);
+    dlg.Pulse();
+
     // to make sure nobody accesses data from the soon-to-be-destroyed widgets:
     tabs_list.clear();
     plater_ = nullptr;
 
+    dlg.Update(10, _(L("Recreating")) + dots);
+
     MainFrame* topwindow = mainframe;
     mainframe = new MainFrame();
     sidebar().obj_list()->init_objects(); // propagate model objects to object list
 
     if (topwindow) {
         SetTopWindow(mainframe);
+
+        dlg.Update(30, _(L("Recreating")) + dots);
         topwindow->Destroy();
     }
 
+    dlg.Update(80, _(L("Loading of current presets")) + dots);
+
     m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg()));
 
     load_current_presets();
 
     mainframe->Show(true);
 
-    // On OSX the UI was not initialized correctly if the wizard was called
-    // before the UI was up and running.
-    CallAfter([]() {
-        // Run the config wizard, don't offer the "reset user profile" checkbox.
-        config_wizard_startup(true);
-    });
+    dlg.Update(90, _(L("Loading of a mode view")) + dots);
+
+    /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
+    * change min hight of object list to the normal min value (15 * wxGetApp().em_unit())
+    * after first whole Mainframe updating/layouting
+    */
+    if (obj_list()->GetMinSize().GetY() > 15 * em_unit())
+        obj_list()->SetMinSize(wxSize(-1, 15 * em_unit()));
+
+    update_mode();
+
+    // #ys_FIXME_delete_after_testing  Do we still need this  ?
+//     CallAfter([]() {
+//         // Run the config wizard, don't offer the "reset user profile" checkbox.
+//         config_wizard_startup(true);
+//     });
 }
 
 void GUI_App::system_info()
@@ -351,7 +483,7 @@ void GUI_App::update_ui_from_settings()
     mainframe->update_ui_from_settings();
 }
 
-void GUI_App::persist_window_geometry(wxTopLevelWindow *window)
+void GUI_App::persist_window_geometry(wxTopLevelWindow *window, bool default_maximized)
 {
     const std::string name = into_u8(window->GetName());
 
@@ -360,7 +492,7 @@ void GUI_App::persist_window_geometry(wxTopLevelWindow *window)
         event.Skip();
     });
 
-    window_pos_restore(window, name);
+    window_pos_restore(window, name, default_maximized);
 
     on_window_geometry(window, [=]() {
         window_pos_sanitize(window);
@@ -371,9 +503,9 @@ void GUI_App::load_project(wxWindow *parent, wxString& input_file)
 {
     input_file.Clear();
     wxFileDialog dialog(parent ? parent : GetTopWindow(),
-        _(L("Choose one file (3MF):")),
+        _(L("Choose one file (3MF/AMF):")),
         app_config->get_last_dir(), "",
-        file_wildcards(FT_3MF), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+        file_wildcards(FT_PROJECT), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 
     if (dialog.ShowModal() == wxID_OK)
         input_file = dialog.GetPath();
@@ -391,66 +523,105 @@ void GUI_App::import_model(wxWindow *parent, wxArrayString& input_files)
         dialog.GetPaths(input_files);
 }
 
-// select language from the list of installed languages
-bool GUI_App::select_language(  wxArrayString & names,
-                                wxArrayLong & identifiers)
+bool GUI_App::switch_language()
 {
-    wxCHECK_MSG(names.Count() == identifiers.Count(), false,
-        _(L("Array of language names and identifiers should have the same size.")));
-    int init_selection = 0;
-    long current_language = m_wxLocale ? m_wxLocale->GetLanguage() : wxLANGUAGE_UNKNOWN;
-    for (auto lang : identifiers) {
-        if (lang == current_language)
-            break;
-        ++init_selection;
+    if (select_language()) {
+        save_language();
+        _3DScene::remove_all_canvases();
+        recreate_GUI();
+        return true;
+    } else {
+        return false;
     }
-    if (init_selection == identifiers.size())
-        init_selection = 0;
-    long index = wxGetSingleChoiceIndex(_(L("Select the language")), _(L("Language")),
-        names, init_selection);
-    if (index != -1)
-    {
-        m_wxLocale = new wxLocale;
-        m_wxLocale->Init(identifiers[index]);
+}
+
+// select language from the list of installed languages
+bool GUI_App::select_language()
+{
+    const auto langs = get_installed_languages();
+    wxArrayString names;
+    names.Alloc(langs.size());
+
+    int init_selection = -1;
+    const auto current_language = m_wxLocale ? m_wxLocale->GetLanguage() : wxLocale::GetSystemLanguage();
+
+    for (size_t i = 0; i < langs.size(); i++) {
+        const auto lang = langs[i]->Language;
+        const bool is_english = lang >= wxLANGUAGE_ENGLISH && lang <= wxLANGUAGE_ENGLISH_ZIMBABWE;
+
+        if (lang == current_language || (current_language == wxLANGUAGE_UNKNOWN && is_english)) {
+            init_selection = i;
+        }
+
+        names.Add(langs[i]->Description);
+    }
+
+    const long index = wxGetSingleChoiceIndex(
+        _(L("Select the language")),
+        _(L("Language")), names, init_selection >= 0 ? init_selection : 0);
+
+    if (index != -1) {
+        const wxLanguageInfo *lang = langs[index];
+        if (lang->Language == current_language) {
+            // There was no change
+            return false;
+        }
+
+        m_wxLocale = new wxLocale;    // FIXME: leak?
+        m_wxLocale->Init(lang->Language);
 		m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
-        m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3r++");
+        m_wxLocale->AddCatalog(SLIC3R_APP_KEY);
 		//FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
 		//wxSetlocale(LC_NUMERIC, "C");
         Preset::update_suffix_modified();
-		m_imgui->set_language(m_wxLocale->GetCanonicalName().ToUTF8().data());
+        m_imgui->set_language(into_u8(lang->CanonicalName));
         return true;
     }
+
     return false;
 }
 
-// load language saved at application config
+// Load gettext translation files and activate them at the start of the application,
+// based on the "translation_language" key stored in the application config.
 bool GUI_App::load_language()
 {
     wxString language = wxEmptyString;
     if (app_config->has("translation_language"))
         language = app_config->get("translation_language");
 
-    if (language.IsEmpty())
-        return false;
-    wxArrayString	names;
-    wxArrayLong		identifiers;
-    get_installed_languages(names, identifiers);
-    for (size_t i = 0; i < identifiers.Count(); i++)
-    {
-        if (wxLocale::GetLanguageCanonicalName(identifiers[i]) == language)
-        {
-            m_wxLocale = new wxLocale;
-            m_wxLocale->Init(identifiers[i]);
-            m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
-            m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3r++");
-			//FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
-            //wxSetlocale(LC_NUMERIC, "C");
-			Preset::update_suffix_modified();
-			m_imgui->set_language(m_wxLocale->GetCanonicalName().ToUTF8().data());
-            return true;
+    if (language.IsEmpty()) {
+        int lang = wxLocale::GetSystemLanguage();
+        if (lang != wxLANGUAGE_UNKNOWN) {
+            const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
+            if (info != nullptr)
+                language = info->CanonicalName;
         }
     }
-    return false;
+
+    const wxLanguageInfo *info = nullptr;
+    if (! language.IsEmpty()) {
+        const auto langs = get_installed_languages();
+        for (const wxLanguageInfo *this_info : langs)
+            if (this_info->CanonicalName == language) {
+                info = this_info;
+                break;
+            }
+    }
+
+    m_wxLocale = new wxLocale;
+    if (info == nullptr) {
+        m_wxLocale->Init(wxLANGUAGE_DEFAULT);
+        m_imgui->set_language("en");
+    } else {
+        m_wxLocale->Init(info->Language);
+        m_wxLocale->AddCatalogLookupPathPrefix(from_u8(localization_dir()));
+        m_wxLocale->AddCatalog(SLIC3R_APP_KEY);
+        m_imgui->set_language(into_u8(info->CanonicalName));
+    }
+    //FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only.
+    //wxSetlocale(LC_NUMERIC, "C");
+    Preset::update_suffix_modified();
+    return true;
 }
 
 // save language at application config
@@ -464,38 +635,31 @@ void GUI_App::save_language()
     app_config->save();
 }
 
-// get list of installed languages 
-void GUI_App::get_installed_languages(wxArrayString & names, wxArrayLong & identifiers)
+// Get a list of installed languages
+std::vector<const wxLanguageInfo*> GUI_App::get_installed_languages()
 {
-    names.Clear();
-    identifiers.Clear();
+    std::vector<const wxLanguageInfo*> res;
 
 	wxDir dir(from_u8(localization_dir()));
     wxString filename;
     const wxLanguageInfo * langinfo;
     wxString name = wxLocale::GetLanguageName(wxLANGUAGE_DEFAULT);
-    if (!name.IsEmpty())
-    {
-        names.Add(_(L("Default")));
-        identifiers.Add(wxLANGUAGE_DEFAULT);
+    if (!name.IsEmpty()) {
+        res.push_back(wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT));
     }
-    for (bool cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS);
-        cont; cont = dir.GetNext(&filename))
-    {
+
+    for (bool cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS); cont; cont = dir.GetNext(&filename)) {
         langinfo = wxLocale::FindLanguageInfo(filename);
-        if (langinfo != NULL)
-        {
+        if (langinfo != NULL) {
             auto full_file_name = dir.GetName() + wxFileName::GetPathSeparator() +
-                filename + wxFileName::GetPathSeparator() +
-                /*GetAppName()*/"Slic3r++" + 
-                wxT(".mo");
-            if (wxFileExists(full_file_name))
-            {
-                names.Add(langinfo->Description);
-                identifiers.Add(langinfo->Language);
+                filename + wxFileName::GetPathSeparator() + SLIC3R_APP_KEY + wxT(".mo");
+            if (wxFileExists(full_file_name)) {
+                res.push_back(langinfo);
             }
         }
     }
+
+    return res;
 }
 
 Tab* GUI_App::get_tab(Preset::Type type)
@@ -565,7 +729,7 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
     Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Check(get_mode() == comAdvanced); }, config_id_base + ConfigMenuModeAdvanced);
     Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Check(get_mode() == comExpert); }, config_id_base + ConfigMenuModeExpert);
 
-    local_menu->AppendSubMenu(mode_menu, _(L("Mode")), _(L("Slic3r View Mode")));
+    local_menu->AppendSubMenu(mode_menu, _(L("Mode")), wxString::Format(_(L("%s View Mode")), SLIC3R_APP_NAME));
     local_menu->AppendSeparator();
     local_menu->Append(config_id_base + ConfigMenuLanguage, _(L("Change Application &Language")));
     local_menu->AppendSeparator();
@@ -582,6 +746,12 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
             // Take a configuration snapshot.
             if (check_unsaved_changes()) {
                 wxTextEntryDialog dlg(nullptr, _(L("Taking configuration snapshot")), _(L("Snapshot name")));
+                
+                // set current normal font for dialog children, 
+                // because of just dlg.SetFont(normal_font()) has no result;
+                for (auto child : dlg.GetChildren())
+                    child->SetFont(normal_font());
+
                 if (dlg.ShowModal() == wxID_OK)
                     app_config->set("on_snapshot",
                     Slic3r::GUI::Config::SnapshotDB::singleton().take_snapshot(
@@ -614,16 +784,19 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
         }
         case ConfigMenuLanguage:
         {
-            wxArrayString names;
-            wxArrayLong identifiers;
-            get_installed_languages(names, identifiers);
-            if (select_language(names, identifiers)) {
-                save_language();
-                show_info(mainframe->m_tabpanel, _(L("Application will be restarted")), _(L("Attention!")));
-                _3DScene::remove_all_canvases();// remove all canvas before recreate GUI
-                //wxSetlocale(LC_NUMERIC, "C");
-                recreate_GUI();
-            }
+            /* Before change application language, let's check unsaved changes on 3D-Scene
+             * and draw user's attention to the application restarting after a language change
+             */
+            wxMessageDialog dialog(nullptr,
+                _(L("Switching the language will trigger application restart.\n"
+                    "You will lose content of the plater.")) + "\n\n" +
+                _(L("Do you want to proceed?")),
+                wxString(SLIC3R_APP_NAME) + " - " + _(L("Language selection")),
+                wxICON_QUESTION | wxOK | wxCANCEL);
+            if ( dialog.ShowModal() == wxID_CANCEL)
+                return;
+
+            switch_language();
             break;
         }
         case ConfigMenuFlashFirmware:
@@ -644,23 +817,23 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
 // to notify the user whether he is aware that some preset changes will be lost.
 bool GUI_App::check_unsaved_changes()
 {
-    std::string dirty;
+    wxString dirty;
     PrinterTechnology printer_technology = preset_bundle->printers.get_edited_preset().printer_technology();
     for (Tab *tab : tabs_list)
         if (tab->supports_printer_technology(printer_technology) && tab->current_preset_is_dirty())
             if (dirty.empty())
-                dirty = tab->name();
+                dirty = tab->title();
             else
-                dirty += std::string(", ") + tab->name();
+                dirty += wxString(", ") + tab->title();
     if (dirty.empty())
         // No changes, the application may close or reload presets.
         return true;
     // Ask the user.
-    auto dialog = new wxMessageDialog(mainframe,
-        _(L("You have unsaved changes ")) + dirty + _(L(". Discard changes and continue anyway?")),
-        _(L("Unsaved Presets")),
+    wxMessageDialog dialog(mainframe,
+        _(L("The presets on the following tabs were modified")) + ": " + dirty + "\n\n" + _(L("Discard changes and continue anyway?")),
+        wxString(SLIC3R_APP_NAME) + " - " + _(L("Unsaved Presets")),
         wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
-    return dialog->ShowModal() == wxID_YES;
+    return dialog.ShowModal() == wxID_YES;
 }
 
 bool GUI_App::checked_tab(Tab* tab)
@@ -678,7 +851,7 @@ void GUI_App::load_current_presets()
 	this->plater()->set_printer_technology(printer_technology);
     for (Tab *tab : tabs_list)
 		if (tab->supports_printer_technology(printer_technology)) {
-			if (tab->name() == "printer")
+			if (tab->type() == Preset::TYPE_PRINTER)
 				static_cast<TabPrinter*>(tab)->update_pages();
 			tab->load_current_preset();
 		}
@@ -686,18 +859,7 @@ void GUI_App::load_current_presets()
 
 bool GUI_App::OnExceptionInMainLoop()
 {
-    try {
-        throw;
-    } catch (const std::exception &ex) {
-        const std::string error = (boost::format("Uncaught exception: %1%") % ex.what()).str();
-        BOOST_LOG_TRIVIAL(error) << error;
-        show_error(nullptr, from_u8(error));
-    } catch (...) {
-        const char *error = "Uncaught exception: Unknown error";
-        BOOST_LOG_TRIVIAL(error) << error;
-        show_error(nullptr, from_u8(error));
-    }
-
+    generic_exception_handle();
     return false;
 }
 
@@ -755,6 +917,11 @@ int GUI_App::extruders_cnt() const
            preset.config.option<ConfigOptionFloats>("nozzle_diameter")->values.size();
 }
 
+void GUI_App::open_web_page_localized(const std::string &http_address)
+{
+    wxLaunchDefaultBrowser(http_address + "&lng=" + this->current_language_code());
+}
+
 void GUI_App::window_pos_save(wxTopLevelWindow* window, const std::string &name)
 {
     if (name.empty()) { return; }
@@ -765,15 +932,21 @@ void GUI_App::window_pos_save(wxTopLevelWindow* window, const std::string &name)
     app_config->save();
 }
 
-void GUI_App::window_pos_restore(wxTopLevelWindow* window, const std::string &name)
+void GUI_App::window_pos_restore(wxTopLevelWindow* window, const std::string &name, bool default_maximized)
 {
     if (name.empty()) { return; }
     const auto config_key = (boost::format("window_%1%") % name).str();
 
-    if (! app_config->has(config_key)) { return; }
+    if (! app_config->has(config_key)) {
+        window->Maximize(default_maximized);
+        return;
+    }
 
     auto metrics = WindowMetrics::deserialize(app_config->get(config_key));
-    if (! metrics) { return; }
+    if (! metrics) {
+        window->Maximize(default_maximized);
+        return;
+    }
 
     window->SetSize(metrics->get_rect());
     window->Maximize(metrics->get_maximized());
@@ -823,5 +996,64 @@ void GUI_App::window_pos_sanitize(wxTopLevelWindow* window)
 // }
 
 
+#ifdef __WXMSW__
+void GUI_App::associate_3mf_files()
+{
+    // see as reference: https://stackoverflow.com/questions/20245262/c-program-needs-an-file-association
+
+    auto reg_set = [](HKEY hkeyHive, const wchar_t* pszVar, const wchar_t* pszValue)
+    {
+        wchar_t szValueCurrent[1000];
+        DWORD dwType;
+        DWORD dwSize = sizeof(szValueCurrent);
+
+        int iRC = ::RegGetValueW(hkeyHive, pszVar, nullptr, RRF_RT_ANY, &dwType, szValueCurrent, &dwSize);
+
+        bool bDidntExist = iRC == ERROR_FILE_NOT_FOUND;
+
+        if ((iRC != ERROR_SUCCESS) && !bDidntExist)
+            // an error occurred
+            return;
+
+        if (!bDidntExist)
+        {
+            if (dwType != REG_SZ)
+                // invalid type
+                return;
+
+            if (::wcscmp(szValueCurrent, pszValue) == 0)
+                // value already set
+                return;
+        }
+
+        DWORD dwDisposition;
+        HKEY hkey;
+        iRC = ::RegCreateKeyExW(hkeyHive, pszVar, 0, 0, 0, KEY_ALL_ACCESS, nullptr, &hkey, &dwDisposition);
+        if (iRC == ERROR_SUCCESS)
+            iRC = ::RegSetValueExW(hkey, L"", 0, REG_SZ, (BYTE*)pszValue, (::wcslen(pszValue) + 1) * sizeof(wchar_t));
+
+        RegCloseKey(hkey);
+    };
+
+    wchar_t app_path[MAX_PATH];
+    ::GetModuleFileNameW(nullptr, app_path, sizeof(app_path));
+
+    std::wstring prog_path = L"\"" + std::wstring(app_path) + L"\"";
+    std::wstring prog_id = L"Slic3r++.1";
+    std::wstring prog_desc = L"Slic3r++";
+    std::wstring prog_command = prog_path + L" \"%1\"";
+    std::wstring reg_base = L"Software\\Classes";
+    std::wstring reg_extension = reg_base + L"\\.3mf";
+    std::wstring reg_prog_id = reg_base + L"\\" + prog_id;
+    std::wstring reg_prog_id_command = reg_prog_id + L"\\Shell\\Open\\Command";
+
+    reg_set(HKEY_CURRENT_USER, reg_extension.c_str(), prog_id.c_str());
+    reg_set(HKEY_CURRENT_USER, reg_prog_id.c_str(), prog_desc.c_str());
+    reg_set(HKEY_CURRENT_USER, reg_prog_id_command.c_str(), prog_command.c_str());
+
+    ::SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+}
+#endif // __WXMSW__
+
 } // GUI
 } //Slic3r
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index fb47c5bf6..1c9a462c6 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -19,6 +19,7 @@ class wxMenuItem;
 class wxMenuBar;
 class wxTopLevelWindow;
 class wxNotebook;
+struct wxLanguageInfo;
 
 namespace Slic3r {
 class AppConfig;
@@ -39,6 +40,7 @@ enum FileType
     FT_PRUSA,
     FT_GCODE,
     FT_MODEL,
+    FT_PROJECT,
 
     FT_INI,
     FT_SVG,
@@ -94,10 +96,13 @@ public:
 
     GUI_App();
 
-    unsigned        get_colour_approx_luma(const wxColour &colour);
+    static unsigned get_colour_approx_luma(const wxColour &colour);
+    static bool     dark_mode();
+    static bool     dark_mode_menus();
     void            init_label_colours();
     void            update_label_colours_from_appconfig();
     void            init_fonts();
+	void            update_fonts(const MainFrame *main_frame = nullptr);
     void            set_label_clr_modified(const wxColour& clr);
     void            set_label_clr_sys(const wxColour& clr);
 
@@ -116,18 +121,15 @@ public:
     void            keyboard_shortcuts();
     void            load_project(wxWindow *parent, wxString& input_file);
     void            import_model(wxWindow *parent, wxArrayString& input_files);
-    static bool     catch_error(std::function<void()> cb,
-//                                 wxMessageDialog* message_dialog,
-                                const std::string& err);
-//     void            notify(/*message*/);
+    static bool     catch_error(std::function<void()> cb, const std::string& err);
 
-    void            persist_window_geometry(wxTopLevelWindow *window);
+    void            persist_window_geometry(wxTopLevelWindow *window, bool default_maximized = false);
     void            update_ui_from_settings();
 
-    bool            select_language(wxArrayString & names, wxArrayLong & identifiers);
+    bool            switch_language();
+    // Load gettext translation files and activate them at the start of the application,
+    // based on the "translation_language" key stored in the application config.
     bool            load_language();
-    void            save_language();
-    void            get_installed_languages(wxArrayString & names, wxArrayLong & identifiers);
 
     Tab*            get_tab(Preset::Type type);
     ConfigOptionMode get_mode();
@@ -139,6 +141,8 @@ public:
     bool            checked_tab(Tab* tab);
     void            load_current_presets();
 
+    wxString        current_language_code() { return m_wxLocale != nullptr ? m_wxLocale->GetCanonicalName() : wxString("en_US"); }
+
     virtual bool OnExceptionInMainLoop();
 
 #ifdef __APPLE__
@@ -168,10 +172,19 @@ public:
 
     PrintHostJobQueue& printhost_job_queue() { return *m_printhost_job_queue.get(); }
 
+    void            open_web_page_localized(const std::string &http_address);
+
 private:
+    bool            on_init_inner();
     void            window_pos_save(wxTopLevelWindow* window, const std::string &name);
-    void            window_pos_restore(wxTopLevelWindow* window, const std::string &name);
+    void            window_pos_restore(wxTopLevelWindow* window, const std::string &name, bool default_maximized = false);
     void            window_pos_sanitize(wxTopLevelWindow* window);
+    bool            select_language();
+    void            save_language();
+    std::vector<const wxLanguageInfo*> get_installed_languages();
+#ifdef __WXMSW__
+    void            associate_3mf_files();
+#endif // __WXMSW__
 };
 DECLARE_APP(GUI_App)
 
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 9f8955a4e..e5f290232 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -39,6 +39,15 @@ FreqSettingsBundle FREQ_SETTINGS_BUNDLE_SLA =
     { L("Pad and Support")      , { "supports_enable", "pad_enable" } }
 };
 
+// Note: id accords to type of the sub-object (adding volume), so sequence of the menu items is important
+std::vector<std::pair<std::string, std::string>> ADD_VOLUME_MENU_ITEMS = { 
+//     menu_item Name            menu_item bitmap name
+    {L("Add part"),              "add_part" },           // ~ModelVolumeType::MODEL_PART
+    {L("Add modifier"),          "add_modifier"},        // ~ModelVolumeType::PARAMETER_MODIFIER
+    {L("Add support enforcer"),  "support_enforcer"},    // ~ModelVolumeType::SUPPORT_ENFORCER
+    {L("Add support blocker"),   "support_blocker"}      // ~ModelVolumeType::SUPPORT_BLOCKER
+};
+
 static PrinterTechnology printer_technology()
 {
     return wxGetApp().preset_bundle->printers.get_selected_preset().printer_technology();
@@ -61,19 +70,22 @@ ObjectList::ObjectList(wxWindow* parent) :
 {
     // Fill CATEGORY_ICON
     {
+        // Note: `this` isn't passed to create_scaled_bitmap() here because of bugs in the widget,
+        // see note in PresetBundle::load_compatible_bitmaps()
+
         // ptFFF
-		CATEGORY_ICON[L("Layers and Perimeters")]	= create_scaled_bitmap("layers.png"); // wxBitmap(from_u8(var("layers.png")), wxBITMAP_TYPE_PNG);
-		CATEGORY_ICON[L("Infill")]					= create_scaled_bitmap("infill.png"); // wxBitmap(from_u8(var("infill.png")), wxBITMAP_TYPE_PNG);
-		CATEGORY_ICON[L("Support material")]		= create_scaled_bitmap("building.png"); // wxBitmap(from_u8(var("building.png")), wxBITMAP_TYPE_PNG);
-		CATEGORY_ICON[L("Speed")]					= create_scaled_bitmap("time.png"); // wxBitmap(from_u8(var("time.png")), wxBITMAP_TYPE_PNG);
-		CATEGORY_ICON[L("Extruders")]				= create_scaled_bitmap("funnel.png"); // wxBitmap(from_u8(var("funnel.png")), wxBITMAP_TYPE_PNG);
-		CATEGORY_ICON[L("Extrusion Width")]			= create_scaled_bitmap("funnel.png"); // wxBitmap(from_u8(var("funnel.png")), wxBITMAP_TYPE_PNG);
-// 		CATEGORY_ICON[L("Skirt and brim")]			= create_scaled_bitmap("box.png"); // wxBitmap(from_u8(var("box.png")), wxBITMAP_TYPE_PNG);
-// 		CATEGORY_ICON[L("Speed > Acceleration")]	= create_scaled_bitmap("time.png"); // wxBitmap(from_u8(var("time.png")), wxBITMAP_TYPE_PNG);
-		CATEGORY_ICON[L("Advanced")]				= create_scaled_bitmap("wand.png"); // wxBitmap(from_u8(var("wand.png")), wxBITMAP_TYPE_PNG);
-		// ptSLA
-		CATEGORY_ICON[L("Supports")]				= create_scaled_bitmap("building.png"); // wxBitmap(from_u8(var("building.png")), wxBITMAP_TYPE_PNG);
-		CATEGORY_ICON[L("Pad")]				        = create_scaled_bitmap("brick.png"); // wxBitmap(from_u8(var("brick.png")), wxBITMAP_TYPE_PNG);
+        CATEGORY_ICON[L("Layers and Perimeters")]    = create_scaled_bitmap(nullptr, "layers");
+        CATEGORY_ICON[L("Infill")]                   = create_scaled_bitmap(nullptr, "infill");
+        CATEGORY_ICON[L("Support material")]         = create_scaled_bitmap(nullptr, "support");
+        CATEGORY_ICON[L("Speed")]                    = create_scaled_bitmap(nullptr, "time");
+        CATEGORY_ICON[L("Extruders")]                = create_scaled_bitmap(nullptr, "funnel");
+        CATEGORY_ICON[L("Extrusion Width")]          = create_scaled_bitmap(nullptr, "funnel");
+//         CATEGORY_ICON[L("Skirt and brim")]          = create_scaled_bitmap(nullptr, "skirt+brim"); 
+//         CATEGORY_ICON[L("Speed > Acceleration")]    = create_scaled_bitmap(nullptr, "time");
+        CATEGORY_ICON[L("Advanced")]                 = create_scaled_bitmap(nullptr, "wrench");
+        // ptSLA
+        CATEGORY_ICON[L("Supports")]                 = create_scaled_bitmap(nullptr, "support"/*"sla_supports"*/);
+        CATEGORY_ICON[L("Pad")]                      = create_scaled_bitmap(nullptr, "pad");
     }
 
     // create control
@@ -82,20 +94,42 @@ ObjectList::ObjectList(wxWindow* parent) :
     init_icons();
 
     // describe control behavior 
-    Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxEvent& event) {
+    Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& event) {
 #ifndef __APPLE__
         // On Windows and Linux, forces a kill focus emulation on the object manipulator fields because this event handler is called
         // before the kill focus event handler on the object manipulator when changing selection in the list, invalidating the object
         // manipulator cache with the following call to selection_changed()
         wxGetApp().obj_manipul()->emulate_kill_focus();
+#else
+        // To avoid selection update from SetSelection() and UnselectAll() under osx
+        if (m_prevent_list_events)
+            return;
 #endif // __APPLE__
+
+        /* For multiple selection with pressed SHIFT, 
+         * event.GetItem() returns value of a first item in selection list 
+         * instead of real last clicked item.
+         * So, let check last selected item in such strange way
+         */
+        if (wxGetKeyState(WXK_SHIFT))
+        {
+            wxDataViewItemArray sels;
+            GetSelections(sels);
+            if (sels.front() == m_last_selected_item)
+                m_last_selected_item = sels.back();
+            else
+                m_last_selected_item = event.GetItem();
+        }
+        else
+            m_last_selected_item = event.GetItem();
+
         selection_changed();
 #ifndef __WXMSW__
         set_tooltip_for_item(get_mouse_position_in_control());
 #endif //__WXMSW__        
     });
 
-    Bind(wxEVT_CHAR, [this](wxKeyEvent& event) { key_event(event); }); // doesn't work on OSX
+//    Bind(wxEVT_CHAR, [this](wxKeyEvent& event) { key_event(event); }); // doesn't work on OSX
 
 #ifdef __WXMSW__
     GetMainWindow()->Bind(wxEVT_MOTION, [this](wxMouseEvent& event) {
@@ -117,8 +151,28 @@ ObjectList::ObjectList(wxWindow* parent) :
     Bind(wxCUSTOMEVT_LAST_VOLUME_IS_DELETED, [this](wxCommandEvent& e)   { last_volume_is_deleted(e.GetInt()); });
 
 #ifdef __WXOSX__
-    Bind(wxEVT_KEY_DOWN, &ObjectList::OnChar, this);
+//    Bind(wxEVT_KEY_DOWN, &ObjectList::OnChar, this);
 #endif //__WXOSX__
+
+    {
+        // Accelerators
+        wxAcceleratorEntry entries[6];
+        entries[0].Set(wxACCEL_CTRL, (int) 'C',    wxID_COPY);
+        entries[1].Set(wxACCEL_CTRL, (int) 'X',    wxID_CUT);
+        entries[2].Set(wxACCEL_CTRL, (int) 'V',    wxID_PASTE);
+        entries[3].Set(wxACCEL_CTRL, (int) 'A',    wxID_SELECTALL);
+        entries[4].Set(wxACCEL_NORMAL, WXK_DELETE, wxID_DELETE);
+        entries[5].Set(wxACCEL_NORMAL, WXK_BACK,   wxID_DELETE);
+        wxAcceleratorTable accel(6, entries);
+        SetAcceleratorTable(accel);
+
+        this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { wxPostEvent((wxEvtHandler*)wxGetApp().plater()->canvas3D()->get_wxglcanvas(), SimpleEvent(EVT_GLTOOLBAR_COPY)); }, wxID_COPY);
+        this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { wxPostEvent((wxEvtHandler*)wxGetApp().plater()->canvas3D()->get_wxglcanvas(), SimpleEvent(EVT_GLTOOLBAR_PASTE)); }, wxID_PASTE);
+        this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->select_item_all_children(); }, wxID_SELECTALL);
+        this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->remove(); }, wxID_DELETE);
+    }
+
+    Bind(wxEVT_SIZE, ([this](wxSizeEvent &e) { this->EnsureVisible(this->GetCurrentItem()); e.Skip(); }));
 }
 
 ObjectList::~ObjectList()
@@ -127,12 +181,16 @@ ObjectList::~ObjectList()
 
 void ObjectList::create_objects_ctrl()
 {
-    SetMinSize(wxSize(-1, 15 * wxGetApp().em_unit()));
+    /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
+     * 1. set a height of the list to some big value 
+     * 2. change it to the normal min value (15 * wxGetApp().em_unit()) after first whole Mainframe updating/layouting
+     */
+    SetMinSize(wxSize(-1, 3000));
 
     m_sizer = new wxBoxSizer(wxVERTICAL);
     m_sizer->Add(this, 1, wxGROW);
 
-    m_objects_model = new PrusaObjectDataViewModel;
+    m_objects_model = new ObjectDataViewModel;
     AssociateModel(m_objects_model);
     m_objects_model->SetAssociatedControl(this);
 #if wxUSE_DRAG_AND_DROP && wxUSE_UNICODE
@@ -142,7 +200,7 @@ void ObjectList::create_objects_ctrl()
 
     // column 0(Icon+Text) of the view control: 
     // And Icon can be consisting of several bitmaps
-    AppendColumn(new wxDataViewColumn(_(L("Name")), new PrusaBitmapTextRenderer(),
+    AppendColumn(new wxDataViewColumn(_(L("Name")), new BitmapTextRenderer(),
         0, 20*wxGetApp().em_unit()/*200*/, wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE));
 
     // column 1 of the view control:
@@ -162,6 +220,76 @@ void ObjectList::create_popup_menus()
     create_instance_popupmenu(&m_menu_instance);
 }
 
+void ObjectList::get_selected_item_indexes(int& obj_idx, int& vol_idx, const wxDataViewItem& input_item/* = wxDataViewItem(0)*/)
+{
+    const wxDataViewItem item = input_item == wxDataViewItem(0) ? GetSelection() : input_item;
+
+    if (!item)
+    {
+        obj_idx = vol_idx = -1;
+        return;
+    }
+
+    const ItemType type = m_objects_model->GetItemType(item);
+
+    obj_idx =   type & itObject ? m_objects_model->GetIdByItem(item) :
+                type & itVolume ? m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item)) : -1;
+
+    vol_idx =   type & itVolume ? m_objects_model->GetVolumeIdByItem(item) : -1;
+}
+
+int ObjectList::get_mesh_errors_count(const int obj_idx, const int vol_idx /*= -1*/) const
+{
+    if (obj_idx < 0)
+        return 0;
+
+    return (*m_objects)[obj_idx]->get_mesh_errors_count(vol_idx);
+}
+
+wxString ObjectList::get_mesh_errors_list(const int obj_idx, const int vol_idx /*= -1*/) const
+{    
+    const int errors = get_mesh_errors_count(obj_idx, vol_idx);
+
+    if (errors == 0)
+        return ""; // hide tooltip
+
+    // Create tooltip string, if there are errors 
+    wxString tooltip = wxString::Format(_(L("Auto-repaired (%d errors):\n")), errors);
+
+    const stl_stats& stats = vol_idx == -1 ?
+                            (*m_objects)[obj_idx]->get_object_stl_stats() :
+                            (*m_objects)[obj_idx]->volumes[vol_idx]->mesh.stl.stats;
+
+    std::map<std::string, int> error_msg = {
+        { L("degenerate facets"),   stats.degenerate_facets },
+        { L("edges fixed"),         stats.edges_fixed       },
+        { L("facets removed"),      stats.facets_removed    },
+        { L("facets added"),        stats.facets_added      },
+        { L("facets reversed"),     stats.facets_reversed   },
+        { L("backwards edges"),     stats.backwards_edges   }
+    };
+
+    for (const auto& error : error_msg)
+        if (error.second > 0)
+            tooltip += wxString::Format("\t%d %s\n", error.second, _(error.first));
+
+    if (is_windows10())
+        tooltip += _(L("Right button click the icon to fix STL through Netfabb"));
+
+    return tooltip;
+}
+
+wxString ObjectList::get_mesh_errors_list()
+{
+    if (!GetSelection())
+        return "";
+
+    int obj_idx, vol_idx;
+    get_selected_item_indexes(obj_idx, vol_idx);
+
+    return get_mesh_errors_list(obj_idx, vol_idx);
+}
+
 void ObjectList::set_tooltip_for_item(const wxPoint& pt)
 {
     wxDataViewItem item;
@@ -169,40 +297,24 @@ void ObjectList::set_tooltip_for_item(const wxPoint& pt)
     HitTest(pt, item, col);
     if (!item) return;
 
+    /* GetMainWindow() return window, associated with wxDataViewCtrl.
+     * And for this window we should to set tooltips.
+     * Just this->SetToolTip(tooltip) => has no effect.
+     */
+
     if (col->GetTitle() == " " && GetSelectedItemsCount()<2)
         GetMainWindow()->SetToolTip(_(L("Right button click the icon to change the object settings")));
-    else if (col->GetTitle() == _("Name") &&
-        m_objects_model->GetBitmap(item).GetRefData() == m_bmp_manifold_warning.GetRefData()) {
-        int obj_idx = m_objects_model->GetIdByItem(item);
-        auto& stats = (*m_objects)[obj_idx]->volumes[0]->mesh.stl.stats;
-        int errors = stats.degenerate_facets + stats.edges_fixed + stats.facets_removed +
-            stats.facets_added + stats.facets_reversed + stats.backwards_edges;
-
-        wxString tooltip = wxString::Format(_(L("Auto-repaired (%d errors):\n")), errors);
-
-        std::map<std::string, int> error_msg;
-        error_msg[L("degenerate facets")] = stats.degenerate_facets;
-        error_msg[L("edges fixed")] = stats.edges_fixed;
-        error_msg[L("facets removed")] = stats.facets_removed;
-        error_msg[L("facets added")] = stats.facets_added;
-        error_msg[L("facets reversed")] = stats.facets_reversed;
-        error_msg[L("backwards edges")] = stats.backwards_edges;
-
-        for (auto error : error_msg)
-        {
-            if (error.second > 0)
-                tooltip += wxString::Format(_("\t%d %s\n"), error.second, error.first);
+    else if (col->GetTitle() == _("Name"))
+    {
+#ifdef __WXMSW__
+        if (pt.x < 2 * wxGetApp().em_unit() || pt.x > 4 * wxGetApp().em_unit()) {
+            GetMainWindow()->SetToolTip(""); // hide tooltip
+            return;
         }
-// OR
-//             tooltip += wxString::Format(_(L("%d degenerate facets, %d edges fixed, %d facets removed, "
-//                                             "%d facets added, %d facets reversed, %d backwards edges")),
-//                                             stats.degenerate_facets, stats.edges_fixed, stats.facets_removed,
-//                                             stats.facets_added, stats.facets_reversed, stats.backwards_edges);
-
-        if (is_windows10())
-            tooltip += _(L("Right button click the icon to fix STL through Netfabb"));
-
-        GetMainWindow()->SetToolTip(tooltip);
+#endif //__WXMSW__
+        int obj_idx, vol_idx;
+        get_selected_item_indexes(obj_idx, vol_idx, item);
+        GetMainWindow()->SetToolTip(get_mesh_errors_list(obj_idx, vol_idx));
     }
     else
         GetMainWindow()->SetToolTip(""); // hide tooltip
@@ -224,10 +336,25 @@ int ObjectList::get_selected_obj_idx() const
     return -1;
 }
 
+DynamicPrintConfig& ObjectList::get_item_config(const wxDataViewItem& item) const 
+{
+    assert(item);
+    const ItemType type = m_objects_model->GetItemType(item);
+
+    const int obj_idx = type & itObject ? m_objects_model->GetIdByItem(item) :
+        m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item));
+
+    const int vol_idx = type & itVolume ? m_objects_model->GetVolumeIdByItem(item) : -1;
+
+    assert(obj_idx >= 0 || ((type & itVolume) && vol_idx >=0));
+    return type & itObject|itInstance ? (*m_objects)[obj_idx]->config :
+        (*m_objects)[obj_idx]->volumes[vol_idx]->config;
+}
+
 wxDataViewColumn* ObjectList::create_objects_list_extruder_column(int extruders_count)
 {
     wxArrayString choices;
-    choices.Add("default");
+    choices.Add(_(L("default")));
     for (int i = 1; i <= extruders_count; ++i)
         choices.Add(wxString::Format("%d", i));
     wxDataViewChoiceRenderer *c =
@@ -248,7 +375,7 @@ void ObjectList::update_extruder_values_for_items(const int max_extruder)
         wxString extruder;
         if (!object->config.has("extruder") ||
             object->config.option<ConfigOptionInt>("extruder")->value > max_extruder)
-            extruder = "default";
+            extruder = _(L("default"));
         else
             extruder = wxString::Format("%d", object->config.option<ConfigOptionInt>("extruder")->value);
 
@@ -260,7 +387,7 @@ void ObjectList::update_extruder_values_for_items(const int max_extruder)
                 if (!item) continue;
                 if (!object->volumes[id]->config.has("extruder") ||
                     object->volumes[id]->config.option<ConfigOptionInt>("extruder")->value > max_extruder)
-                    extruder = "default";
+                    extruder = _(L("default"));
                 else
                     extruder = wxString::Format("%d", object->volumes[id]->config.option<ConfigOptionInt>("extruder")->value); 
 
@@ -349,37 +476,71 @@ void ObjectList::update_name_in_model(const wxDataViewItem& item) const
 
 void ObjectList::init_icons()
 {
-//     m_bmp_modifiermesh      = wxBitmap(from_u8(var("lambda.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("plugin.png")), wxBITMAP_TYPE_PNG);
-//     m_bmp_solidmesh         = wxBitmap(from_u8(var("object.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("package.png")), wxBITMAP_TYPE_PNG);
-
-//     m_bmp_support_enforcer  = wxBitmap(from_u8(var("support_enforcer_.png")), wxBITMAP_TYPE_PNG);
-//     m_bmp_support_blocker   = wxBitmap(from_u8(var("support_blocker_.png")), wxBITMAP_TYPE_PNG);
-
-
-    m_bmp_modifiermesh     = create_scaled_bitmap("lambda.png");
-    m_bmp_solidmesh        = create_scaled_bitmap("object.png");
-    m_bmp_support_enforcer = create_scaled_bitmap("support_enforcer_.png");
-    m_bmp_support_blocker  = create_scaled_bitmap("support_blocker_.png");
-
+    m_bmp_solidmesh         = ScalableBitmap(nullptr, ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::MODEL_PART)        ].second);
+    m_bmp_modifiermesh      = ScalableBitmap(nullptr, ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::PARAMETER_MODIFIER)].second);
+    m_bmp_support_enforcer  = ScalableBitmap(nullptr, ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_ENFORCER)  ].second);
+    m_bmp_support_blocker   = ScalableBitmap(nullptr, ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_BLOCKER)   ].second); 
 
     m_bmp_vector.reserve(4); // bitmaps for different types of parts 
-    m_bmp_vector.push_back(&m_bmp_solidmesh);         // Add part
-    m_bmp_vector.push_back(&m_bmp_modifiermesh);      // Add modifier
-    m_bmp_vector.push_back(&m_bmp_support_enforcer);  // Add support enforcer
-    m_bmp_vector.push_back(&m_bmp_support_blocker);   // Add support blocker
+    m_bmp_vector.push_back(&m_bmp_solidmesh.bmp());         
+    m_bmp_vector.push_back(&m_bmp_modifiermesh.bmp());      
+    m_bmp_vector.push_back(&m_bmp_support_enforcer.bmp());  
+    m_bmp_vector.push_back(&m_bmp_support_blocker.bmp());   
+
+
+    // Set volumes default bitmaps for the model
     m_objects_model->SetVolumeBitmaps(m_bmp_vector);
 
     // init icon for manifold warning
-//     m_bmp_manifold_warning  = wxBitmap(from_u8(var("exclamation_mark_.png")), wxBITMAP_TYPE_PNG);//(Slic3r::var("error.png")), wxBITMAP_TYPE_PNG);
-    m_bmp_manifold_warning  = create_scaled_bitmap("exclamation_mark_.png");
-
-    // init bitmap for "Split to sub-objects" context menu
-//     m_bmp_split             = wxBitmap(from_u8(var("split.png")), wxBITMAP_TYPE_PNG);
-    m_bmp_split             = create_scaled_bitmap("split.png");
+    m_bmp_manifold_warning  = ScalableBitmap(nullptr, "exclamation");
+    // Set warning bitmap for the model
+    m_objects_model->SetWarningBitmap(&m_bmp_manifold_warning.bmp());
 
     // init bitmap for "Add Settings" context menu
-//     m_bmp_cog               = wxBitmap(from_u8(var("cog.png")), wxBITMAP_TYPE_PNG);
-    m_bmp_cog               = create_scaled_bitmap("cog.png");
+    m_bmp_cog               = ScalableBitmap(nullptr, "cog");
+}
+
+void ObjectList::msw_rescale_icons()
+{
+    m_bmp_vector.clear();
+    m_bmp_vector.reserve(4); // bitmaps for different types of parts 
+    for (ScalableBitmap* bitmap : { &m_bmp_solidmesh,            // Add part
+                                    &m_bmp_modifiermesh,         // Add modifier
+                                    &m_bmp_support_enforcer,     // Add support enforcer
+                                    &m_bmp_support_blocker })    // Add support blocker                                                           
+    {
+        bitmap->msw_rescale();
+        m_bmp_vector.push_back(& bitmap->bmp());
+    }
+    // Set volumes default bitmaps for the model
+    m_objects_model->SetVolumeBitmaps(m_bmp_vector);
+
+    m_bmp_manifold_warning.msw_rescale();
+    // Set warning bitmap for the model
+    m_objects_model->SetWarningBitmap(&m_bmp_manifold_warning.bmp());
+
+    m_bmp_cog.msw_rescale();
+
+
+    // Update CATEGORY_ICON according to new scale
+    {
+        // Note: `this` isn't passed to create_scaled_bitmap() here because of bugs in the widget,
+        // see note in PresetBundle::load_compatible_bitmaps()
+
+        // ptFFF
+        CATEGORY_ICON[L("Layers and Perimeters")]    = create_scaled_bitmap(nullptr, "layers");
+        CATEGORY_ICON[L("Infill")]                   = create_scaled_bitmap(nullptr, "infill");
+        CATEGORY_ICON[L("Support material")]         = create_scaled_bitmap(nullptr, "support");
+        CATEGORY_ICON[L("Speed")]                    = create_scaled_bitmap(nullptr, "time");
+        CATEGORY_ICON[L("Extruders")]                = create_scaled_bitmap(nullptr, "funnel");
+        CATEGORY_ICON[L("Extrusion Width")]          = create_scaled_bitmap(nullptr, "funnel");
+//         CATEGORY_ICON[L("Skirt and brim")]          = create_scaled_bitmap(nullptr, "skirt+brim"); 
+//         CATEGORY_ICON[L("Speed > Acceleration")]    = create_scaled_bitmap(nullptr, "time");
+        CATEGORY_ICON[L("Advanced")]                 = create_scaled_bitmap(nullptr, "wrench");
+        // ptSLA
+        CATEGORY_ICON[L("Supports")]                 = create_scaled_bitmap(nullptr, "support"/*"sla_supports"*/);
+        CATEGORY_ICON[L("Pad")]                      = create_scaled_bitmap(nullptr, "pad");
+    }
 }
 
 
@@ -403,6 +564,65 @@ void ObjectList::selection_changed()
     part_selection_changed();
 }
 
+void ObjectList::paste_volumes_into_list(int obj_idx, const ModelVolumePtrs& volumes)
+{
+    if ((obj_idx < 0) || ((int)m_objects->size() <= obj_idx))
+        return;
+
+    if (volumes.empty())
+        return;
+
+    ModelObject& model_object = *(*m_objects)[obj_idx];
+    const auto object_item = m_objects_model->GetItemById(obj_idx);
+
+    wxDataViewItemArray items;
+
+    for (const ModelVolume* volume : volumes)
+    {
+        const wxDataViewItem& vol_item = m_objects_model->AddVolumeChild(object_item, wxString::FromUTF8(volume->name.c_str()), volume->type(), 
+            volume->get_mesh_errors_count()>0 ,
+            volume->config.has("extruder") ? volume->config.option<ConfigOptionInt>("extruder")->value : 0);
+        auto opt_keys = volume->config.keys();
+        if (!opt_keys.empty() && !((opt_keys.size() == 1) && (opt_keys[0] == "extruder")))
+            select_item(m_objects_model->AddSettingsChild(vol_item));
+
+        items.Add(vol_item);
+    }
+
+    changed_object(obj_idx);
+
+    if (items.size() > 1)
+    {
+        m_selection_mode = smVolume;
+        m_last_selected_item = wxDataViewItem(0);
+    }
+
+    select_items(items);
+#ifndef __WXOSX__ //#ifdef __WXMSW__ // #ys_FIXME
+    selection_changed();
+#endif //no __WXOSX__ //__WXMSW__
+}
+
+void ObjectList::paste_objects_into_list(const std::vector<size_t>& object_idxs)
+{
+    if (object_idxs.empty())
+        return;
+
+    wxDataViewItemArray items;
+    for (const size_t object : object_idxs)
+    {
+        add_object_to_list(object);
+        items.Add(m_objects_model->GetItemById(object));
+    }
+
+    wxGetApp().plater()->changed_objects(object_idxs);
+
+    select_items(items);
+#ifndef __WXOSX__ //#ifdef __WXMSW__ // #ys_FIXME
+    selection_changed();
+#endif //no __WXOSX__ //__WXMSW__
+}
+
 void ObjectList::OnChar(wxKeyEvent& event)
 {
     if (event.GetKeyCode() == WXK_BACK){
@@ -436,10 +656,13 @@ void ObjectList::OnContextMenu(wxDataViewEvent&)
 
     if (title == " ")
         show_context_menu();
-    else if (title == _("Name") && pt.x >15 &&
-             m_objects_model->GetBitmap(item).GetRefData() == m_bmp_manifold_warning.GetRefData())
+    else if (title == _("Name"))
     {
-        if (is_windows10())
+        int obj_idx, vol_idx;
+        get_selected_item_indexes(obj_idx, vol_idx, item);
+
+        if (is_windows10() && get_mesh_errors_count(obj_idx, vol_idx) > 0 && 
+            pt.x > 2*wxGetApp().em_unit() && pt.x < 4*wxGetApp().em_unit() )
             fix_through_netfabb();
     }
 
@@ -488,11 +711,14 @@ void ObjectList::key_event(wxKeyEvent& event)
         || event.GetKeyCode() == WXK_BACK
 #endif //__WXOSX__
         ) {
-        printf("WXK_BACK\n");
         remove();
     }
-    else if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_SHIFT))
+    else if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_CONTROL/*WXK_SHIFT*/))
         select_item_all_children();
+    else if (wxGetKeyState(wxKeyCode('C')) && wxGetKeyState(WXK_CONTROL))
+        wxPostEvent((wxEvtHandler*)wxGetApp().plater()->canvas3D()->get_wxglcanvas(), SimpleEvent(EVT_GLTOOLBAR_COPY));
+    else if (wxGetKeyState(wxKeyCode('V')) && wxGetKeyState(WXK_CONTROL))
+        wxPostEvent((wxEvtHandler*)wxGetApp().plater()->canvas3D()->get_wxglcanvas(), SimpleEvent(EVT_GLTOOLBAR_PASTE));
     else
         event.Skip();
 }
@@ -603,8 +829,7 @@ void ObjectList::OnDrop(wxDataViewEvent &event)
     select_item(m_objects_model->ReorganizeChildren(from_volume_id, to_volume_id,
                                                     m_objects_model->GetParent(item)));
 
-    m_parts_changed = true;
-    parts_changed(m_dragged_data.obj_idx());
+    changed_object(m_dragged_data.obj_idx());
 
     m_dragged_data.clear();
 }
@@ -797,6 +1022,7 @@ void ObjectList::get_freq_settings_choice(const wxString& bundle_name)
 {
     const std::vector<std::string>& options = get_options_for_bundle(bundle_name);
 
+    assert(m_config);
     auto opt_keys = m_config->keys();
 
     const DynamicPrintConfig& from_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
@@ -826,6 +1052,10 @@ void ObjectList::update_settings_item()
         const auto settings_item = m_objects_model->IsSettingsItem(item) ? item : m_objects_model->GetSettingsItem(item);
         select_item(settings_item ? settings_item :
             m_objects_model->AddSettingsChild(item));
+
+        // update object selection on Plater
+        if (!m_prevent_canvas_selection_update)
+            update_selections_on_canvas();
     }
     else {
         auto panel = wxGetApp().sidebar().scrolled_panel();
@@ -835,79 +1065,72 @@ void ObjectList::update_settings_item()
     }
 }
 
-void ObjectList::append_menu_item_add_generic(wxMenuItem* menu, const ModelVolumeType type) {
+wxMenu* ObjectList::append_submenu_add_generic(wxMenu* menu, const ModelVolumeType type) {
     auto sub_menu = new wxMenu;
 
     if (wxGetApp().get_mode() == comExpert) {
     append_menu_item(sub_menu, wxID_ANY, _(L("Load")) + " " + dots, "",
-        [this, type](wxCommandEvent&) { load_subobject(type); }, "", menu->GetMenu());
+        [this, type](wxCommandEvent&) { load_subobject(type); }, "", menu);
     sub_menu->AppendSeparator();
     }
 
     for (auto& item : { L("Box"), L("Cylinder"), L("Sphere"), L("Slab") }) {
         append_menu_item(sub_menu, wxID_ANY, _(item), "",
-            [this, type, item](wxCommandEvent&) { load_generic_subobject(item, type); }, "", menu->GetMenu());
+            [this, type, item](wxCommandEvent&) { load_generic_subobject(item, type); }, "", menu);
     }
 
-    menu->SetSubMenu(sub_menu);
+    return sub_menu;
 }
 
 void ObjectList::append_menu_items_add_volume(wxMenu* menu)
 {
-    // Note: id accords to type of the sub-object, so sequence of the menu items is important
-    std::vector<std::string> menu_object_types_items = {L("Add part"),              // ~ModelVolumeType::MODEL_PART
-                                                        L("Add modifier"),          // ~ModelVolumeType::PARAMETER_MODIFIER
-                                                        L("Add support enforcer"),  // ~ModelVolumeType::SUPPORT_ENFORCER
-                                                        L("Add support blocker") }; // ~ModelVolumeType::SUPPORT_BLOCKER
-
     // Update "add" items(delete old & create new)  settings popupmenu
-    for (auto& item : menu_object_types_items){
-        const auto settings_id = menu->FindItem(_(item));
+    for (auto& item : ADD_VOLUME_MENU_ITEMS){
+        const auto settings_id = menu->FindItem(_(item.first));
         if (settings_id != wxNOT_FOUND)
             menu->Destroy(settings_id);
     }
 
     const ConfigOptionMode mode = wxGetApp().get_mode();
 
-    if (mode == comAdvanced)
-    {
-        append_menu_item(menu, wxID_ANY, _(L("Add part")), "",
-			[this](wxCommandEvent&) { load_subobject(ModelVolumeType::MODEL_PART); }, *m_bmp_vector[int(ModelVolumeType::MODEL_PART)]);
+    if (mode == comAdvanced) {
+        append_menu_item(menu, wxID_ANY, _(ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::MODEL_PART)].first), "",
+            [this](wxCommandEvent&) { load_subobject(ModelVolumeType::MODEL_PART); }, ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::MODEL_PART)].second);
     }
     if (mode == comSimple) {
-        append_menu_item(menu, wxID_ANY, _(L("Add support enforcer")), "",
+        append_menu_item(menu, wxID_ANY, _(ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_ENFORCER)].first), "",
             [this](wxCommandEvent&) { load_generic_subobject(L("Box"), ModelVolumeType::SUPPORT_ENFORCER); },
-            *m_bmp_vector[int(ModelVolumeType::SUPPORT_ENFORCER)]);
-        append_menu_item(menu, wxID_ANY, _(L("Add support blocker")), "",
+            ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_ENFORCER)].second);
+        append_menu_item(menu, wxID_ANY, _(ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_BLOCKER)].first), "",
             [this](wxCommandEvent&) { load_generic_subobject(L("Box"), ModelVolumeType::SUPPORT_BLOCKER); },
-            *m_bmp_vector[int(ModelVolumeType::SUPPORT_BLOCKER)]);
+            ADD_VOLUME_MENU_ITEMS[int(ModelVolumeType::SUPPORT_BLOCKER)].second);
 
         return;
     }
     
-    for (int type = mode == comExpert ? 0 : 1 ; type < menu_object_types_items.size(); type++)
+    for (int type = mode == comExpert ? 0 : 1 ; type < ADD_VOLUME_MENU_ITEMS.size(); type++)
     {
-        auto& item = menu_object_types_items[type];
+        auto& item = ADD_VOLUME_MENU_ITEMS[type];
 
-        auto menu_item = new wxMenuItem(menu, wxID_ANY, _(item));
-        menu_item->SetBitmap(*m_bmp_vector[type]);
-        append_menu_item_add_generic(menu_item, ModelVolumeType(type));
-
-        menu->Append(menu_item);
+        wxMenu* sub_menu = append_submenu_add_generic(menu, ModelVolumeType(type));
+        append_submenu(menu, sub_menu, wxID_ANY, _(item.first), "", item.second);
     }
 }
 
 wxMenuItem* ObjectList::append_menu_item_split(wxMenu* menu) 
 {
     return append_menu_item(menu, wxID_ANY, _(L("Split to parts")), "",
-        [this](wxCommandEvent&) { split(); }, m_bmp_split, menu);
+        [this](wxCommandEvent&) { split(); }, "split_parts_SMALL", menu, 
+        [this]() { return is_splittable(); }, wxGetApp().plater());
 }
 
 wxMenuItem* ObjectList::append_menu_item_settings(wxMenu* menu_) 
 {
-    PrusaMenu* menu = dynamic_cast<PrusaMenu*>(menu_);
+    MenuWithSeparators* menu = dynamic_cast<MenuWithSeparators*>(menu_);
+
+    const wxString menu_name = _(L("Add settings"));
     // Delete old items from settings popupmenu
-    auto settings_id = menu->FindItem(_("Add settings"));
+    auto settings_id = menu->FindItem(menu_name);
     if (settings_id != wxNOT_FOUND)
         menu->Destroy(settings_id);
 
@@ -951,7 +1174,7 @@ wxMenuItem* ObjectList::append_menu_item_settings(wxMenu* menu_)
 
     if (printer_technology() == ptFFF ||
         menu->GetMenuItems().size() > 0 && !menu->GetMenuItems().back()->IsSeparator())
-        menu->m_separator_frst = menu->AppendSeparator();
+        menu->SetFirstSeparator();
 
     // Add frequently settings
     create_freq_settings_popupmenu(menu);
@@ -959,17 +1182,13 @@ wxMenuItem* ObjectList::append_menu_item_settings(wxMenu* menu_)
     if (mode == comAdvanced)
         return nullptr;
 
-    menu->m_separator_scnd = menu->AppendSeparator();
+    menu->SetSecondSeparator();
 
     // Add full settings list
-    auto  menu_item = new wxMenuItem(menu, wxID_ANY, _(L("Add settings")));
-    menu_item->SetBitmap(m_bmp_cog);
+    auto  menu_item = new wxMenuItem(menu, wxID_ANY, menu_name);
+    menu_item->SetBitmap(m_bmp_cog.bmp());
 
-//     const auto sel_vol = get_selected_model_volume();
-//     if (sel_vol && sel_vol->type() >= ModelVolumeType::SUPPORT_ENFORCER)
-//         menu_item->Enable(false);
-//     else
-        menu_item->SetSubMenu(create_settings_popupmenu(menu));
+    menu_item->SetSubMenu(create_settings_popupmenu(menu));
 
     return menu->Append(menu_item);
 }
@@ -981,39 +1200,77 @@ wxMenuItem* ObjectList::append_menu_item_change_type(wxMenu* menu)
 
 }
 
-wxMenuItem* ObjectList::append_menu_item_instance_to_object(wxMenu* menu)
+wxMenuItem* ObjectList::append_menu_item_instance_to_object(wxMenu* menu, wxWindow* parent)
 {
     return append_menu_item(menu, wxID_ANY, _(L("Set as a Separated Object")), "",
-        [this](wxCommandEvent&) { split_instances(); }, "", menu);
+        [this](wxCommandEvent&) { split_instances(); }, "", menu, [](){return wxGetApp().plater()->can_set_instance_to_object(); }, parent);
 }
 
 void ObjectList::append_menu_items_osx(wxMenu* menu)
 {
-    append_menu_item(menu, wxID_ANY, _(L("Delete item")), "",
-        [this](wxCommandEvent&) { remove(); }, "", menu);
-    
     append_menu_item(menu, wxID_ANY, _(L("Rename")), "",
         [this](wxCommandEvent&) { rename_item(); }, "", menu);
     
     menu->AppendSeparator();
 }
 
-void ObjectList::append_menu_item_fix_through_netfabb(wxMenu* menu)
+wxMenuItem* ObjectList::append_menu_item_fix_through_netfabb(wxMenu* menu)
 {
     if (!is_windows10())
-        return;
-    append_menu_item(menu, wxID_ANY, _(L("Fix through the Netfabb")), "",
-        [this](wxCommandEvent&) { fix_through_netfabb(); }, "", menu);
+        return nullptr;
+    Plater* plater = wxGetApp().plater();
+    wxMenuItem* menu_item = append_menu_item(menu, wxID_ANY, _(L("Fix through the Netfabb")), "",
+        [this](wxCommandEvent&) { fix_through_netfabb(); }, "", menu, 
+        [plater]() {return plater->can_fix_through_netfabb(); }, plater);
     menu->AppendSeparator();
+
+    return menu_item;
 }
 
 void ObjectList::append_menu_item_export_stl(wxMenu* menu) const 
 {
-    append_menu_item(menu, wxID_ANY, _(L("Export object as STL")) + dots, "",
-        [](wxCommandEvent&) { wxGetApp().plater()->export_stl(true); }, "", menu);
+    append_menu_item(menu, wxID_ANY, _(L("Export as STL")) + dots, "",
+        [](wxCommandEvent&) { wxGetApp().plater()->export_stl(false, true); }, "", menu);
     menu->AppendSeparator();
 }
 
+void ObjectList::append_menu_item_change_extruder(wxMenu* menu) const
+{
+    const wxString name = _(L("Change extruder"));
+    // Delete old menu item
+    const int item_id = menu->FindItem(name);
+    if (item_id != wxNOT_FOUND)
+        menu->Destroy(item_id);
+
+    const int extruders_cnt = extruders_count();
+    const wxDataViewItem item = GetSelection();
+    if (item && extruders_cnt > 1)
+    {
+        DynamicPrintConfig& config = get_item_config(item);
+
+        const int initial_extruder = !config.has("extruder") ? 0 :
+                                      config.option<ConfigOptionInt>("extruder")->value;
+
+        wxMenu* extruder_selection_menu = new wxMenu();
+
+        for (int i = 0; i <= extruders_cnt; i++)
+        {
+            const wxString& item_name = i == 0 ? _(L("Default")) : wxString::Format("%d", i);
+
+            append_menu_radio_item(extruder_selection_menu, wxID_ANY, item_name, "",
+                [this, i](wxCommandEvent&) { set_extruder_for_selected_items(i); }, menu)->Check(i == initial_extruder);
+        }
+
+        menu->AppendSubMenu(extruder_selection_menu, name, _(L("Select new extruder for the object/part")));
+    }
+}
+
+void ObjectList::append_menu_item_delete(wxMenu* menu)
+{
+    append_menu_item(menu, wxID_ANY, _(L("Delete")), "",
+        [this](wxCommandEvent&) { remove(); }, "", menu);
+}
+
 void ObjectList::create_object_popupmenu(wxMenu *menu)
 {
 #ifdef __WXOSX__  
@@ -1030,9 +1287,6 @@ void ObjectList::create_object_popupmenu(wxMenu *menu)
     // rest of a object_menu will be added later in:
     // - append_menu_items_add_volume() -> for "Add (volumes)"
     // - append_menu_item_settings() -> for "Add (settings)"
-
-    wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
-        evt.Enable(is_splittable()); }, m_menu_item_split->GetId());
 }
 
 void ObjectList::create_sla_object_popupmenu(wxMenu *menu)
@@ -1054,6 +1308,7 @@ void ObjectList::create_part_popupmenu(wxMenu *menu)
 #endif // __WXOSX__
 
     append_menu_item_fix_through_netfabb(menu);
+    append_menu_item_export_stl(menu);
 
     m_menu_item_split_part = append_menu_item_split(menu);
 
@@ -1063,17 +1318,22 @@ void ObjectList::create_part_popupmenu(wxMenu *menu)
 
     // rest of a object_sla_menu will be added later in:
     // - append_menu_item_settings() -> for "Add (settings)"
-
-    wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
-            evt.Enable(is_splittable()); }, m_menu_item_split_part->GetId());
 }
 
 void ObjectList::create_instance_popupmenu(wxMenu*menu)
 {
-    m_menu_item_split_instances = append_menu_item_instance_to_object(menu);
+    m_menu_item_split_instances = append_menu_item_instance_to_object(menu, wxGetApp().plater());
 
+    /* New behavior logic:
+     * 1. Split Object to several separated object, if ALL instances are selected
+     * 2. Separate selected instances from the initial object to the separated object,
+     *    if some (not all) instances are selected
+     */
     wxGetApp().plater()->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) {
-        evt.Enable(can_split_instances()); }, m_menu_item_split_instances->GetId());
+//         evt.Enable(can_split_instances()); }, m_menu_item_split_instances->GetId());
+        evt.SetText(wxGetApp().plater()->canvas3D()->get_selection().is_single_full_object() ? 
+                    _(L("Set as a Separated Objects")) : _(L("Set as a Separated Object")));
+    }, m_menu_item_split_instances->GetId());
 }
 
 wxMenu* ObjectList::create_settings_popupmenu(wxMenu *parent_menu)
@@ -1141,26 +1401,27 @@ void ObjectList::load_subobject(ModelVolumeType type)
     int obj_idx = m_objects_model->GetIdByItem(item);
 
     if (obj_idx < 0) return;
-    wxArrayString part_names;
-    load_part((*m_objects)[obj_idx], part_names, type);
 
-    parts_changed(obj_idx);
+    std::vector<std::pair<wxString, bool>> volumes_info;
+    load_part((*m_objects)[obj_idx], volumes_info, type);
 
-    for (int i = 0; i < part_names.size(); ++i) {
-        const wxDataViewItem sel_item = m_objects_model->AddVolumeChild(item, part_names.Item(i), type);
 
-        if (i == part_names.size() - 1)
-            select_item(sel_item);
-    }
+    changed_object(obj_idx);
+
+    wxDataViewItem sel_item;
+    for (const auto& volume : volumes_info )
+        sel_item = m_objects_model->AddVolumeChild(item, volume.first, type, volume.second);
+        
+    if (sel_item)
+        select_item(sel_item);
 }
 
 void ObjectList::load_part( ModelObject* model_object,
-                            wxArrayString& part_names, 
+                            std::vector<std::pair<wxString, bool>> &volumes_info,
                             ModelVolumeType type)
 {
     wxWindow* parent = wxGetApp().tab_panel()->GetPage(0);
 
-    m_parts_changed = false;
     wxArrayString input_files;
     wxGetApp().import_model(parent, input_files);
     for (int i = 0; i < input_files.size(); ++i) {
@@ -1171,7 +1432,7 @@ void ObjectList::load_part( ModelObject* model_object,
             model = Model::read_from_file(input_file);
         }
         catch (std::exception &e) {
-            auto msg = _(L("Error! ")) + input_file + " : " + e.what() + ".";
+            auto msg = _(L("Error!")) + " " + input_file + " : " + e.what() + ".";
             show_error(parent, msg);
             exit(1);
         }
@@ -1192,12 +1453,10 @@ void ObjectList::load_part( ModelObject* model_object,
                 new_volume->set_type(type);
                 new_volume->name = boost::filesystem::path(input_file).filename().string();
 
-                part_names.Add(from_u8(new_volume->name));
+                volumes_info.push_back(std::make_pair(from_u8(new_volume->name), new_volume->get_mesh_errors_count()>0));
 
                 // set a default extruder value, since user can't add it manually
                 new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));
-
-                m_parts_changed = true;
             }
         }
     }
@@ -1211,19 +1470,12 @@ Geometry::Transformation volume_to_bed_transformation(const Geometry::Transforma
 {
     Geometry::Transformation out;
 
-	// Is the angle close to a multiple of 90 degrees?
-	auto ninety_degrees = [](double a) { 
-		a = fmod(std::abs(a), 0.5 * PI);
-		if (a > 0.25 * PI)
-			a = 0.5 * PI - a;
-		return a < 0.001;
-	};
     if (instance_transformation.is_scaling_uniform()) {
         // No need to run the non-linear least squares fitting for uniform scaling.
         // Just set the inverse.
 		out.set_from_transform(instance_transformation.get_matrix(true).inverse());
     }
-	else if (ninety_degrees(instance_transformation.get_rotation().x()) && ninety_degrees(instance_transformation.get_rotation().y()) && ninety_degrees(instance_transformation.get_rotation().z()))
+	else if (Geometry::is_rotation_ninety_degrees(instance_transformation.get_rotation()))
 	{
 		// Anisotropic scaling, rotation by multiples of ninety degrees.
 		Eigen::Matrix3d instance_rotation_trafo =
@@ -1296,9 +1548,7 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode
     const wxString name = _(L("Generic")) + "-" + _(type_name);
     TriangleMesh mesh;
 
-    auto& bed_shape = printer_config().option<ConfigOptionPoints>("bed_shape")->values;
-    const auto& sz = BoundingBoxf(bed_shape).size();
-    const auto side = 0.1 * std::max(sz(0), sz(1));
+    double side = wxGetApp().plater()->canvas3D()->get_size_proportional_to_max_bed_size(0.1);
 
     if (type_name == "Box")
         // Sitting on the print bed, left front front corner at (0, 0).
@@ -1349,11 +1599,11 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode
     // set a default extruder value, since user can't add it manually
     new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));
 
-    m_parts_changed = true;
-    parts_changed(obj_idx);
+    changed_object(obj_idx);
 
     const auto object_item = m_objects_model->GetTopParent(GetSelection());
-    select_item(m_objects_model->AddVolumeChild(object_item, name, type));
+    select_item(m_objects_model->AddVolumeChild(object_item, name, type, 
+        new_volume->get_mesh_errors_count()>0));
 #ifndef __WXOSX__ //#ifdef __WXMSW__ // #ys_FIXME
     selection_changed();
 #endif //no __WXOSX__ //__WXMSW__
@@ -1385,6 +1635,10 @@ void ObjectList::del_subobject_item(wxDataViewItem& item)
     else if (!del_subobject_from_object(obj_idx, idx, type))
         return;
 
+    // If last volume item with warning was deleted, unmark object item
+    if (type == itVolume && (*m_objects)[obj_idx]->get_mesh_errors_count() == 0)
+        m_objects_model->DeleteWarningIcon(m_objects_model->GetParent(item));
+
     m_objects_model->Delete(item);
 }
 
@@ -1414,8 +1668,7 @@ void ObjectList::del_instances_from_object(const int obj_idx)
 
     (*m_objects)[obj_idx]->invalidate_bounding_box(); // ? #ys_FIXME
 
-    m_parts_changed = true;
-    parts_changed(obj_idx);
+    changed_object(obj_idx);
 }
 
 bool ObjectList::del_subobject_from_object(const int obj_idx, const int idx, const int type)
@@ -1460,8 +1713,7 @@ bool ObjectList::del_subobject_from_object(const int obj_idx, const int idx, con
     else
         return false;
 
-    m_parts_changed = true;
-    parts_changed(obj_idx);
+    changed_object(obj_idx);
 
     return true;
 }
@@ -1493,26 +1745,25 @@ void ObjectList::split()
     else
         parent = item;
 
-    for (auto id = 0; id < model_object->volumes.size(); id++) {
-        const auto vol_item = m_objects_model->AddVolumeChild(parent, from_u8(model_object->volumes[id]->name),
-                                            model_object->volumes[id]->is_modifier() ? 
-                                                ModelVolumeType::PARAMETER_MODIFIER : ModelVolumeType::MODEL_PART,
-                                            model_object->volumes[id]->config.has("extruder") ?
-                                                model_object->volumes[id]->config.option<ConfigOptionInt>("extruder")->value : 0,
-                                            false);
+    for (const ModelVolume* volume : model_object->volumes) {
+        const wxDataViewItem& vol_item = m_objects_model->AddVolumeChild(parent, from_u8(volume->name),
+            volume->is_modifier() ? ModelVolumeType::PARAMETER_MODIFIER : ModelVolumeType::MODEL_PART,
+            volume->get_mesh_errors_count()>0,
+            volume->config.has("extruder") ?
+            volume->config.option<ConfigOptionInt>("extruder")->value : 0,
+            false);
         // add settings to the part, if it has those
-        auto opt_keys = model_object->volumes[id]->config.keys();
+        auto opt_keys = volume->config.keys();
         if ( !(opt_keys.size() == 1 && opt_keys[0] == "extruder") ) {
             select_item(m_objects_model->AddSettingsChild(vol_item));
-            Collapse(vol_item);
+            Expand(vol_item);
         }
     }
 
     if (parent == item)
         Expand(parent);
 
-    m_parts_changed = true;
-    parts_changed(obj_idx);
+    changed_object(obj_idx);
 }
 
 bool ObjectList::get_volume_by_item(const wxDataViewItem& item, ModelVolume*& volume)
@@ -1569,38 +1820,36 @@ bool ObjectList::can_split_instances()
     return selection.is_multiple_full_instance() || selection.is_single_full_instance();
 }
 
-void ObjectList::part_settings_changed()
+// NO_PARAMETERS function call means that changed object index will be determine from Selection() 
+void ObjectList::changed_object(const int obj_idx/* = -1*/) const 
 {
-    m_part_settings_changed = true;
-    wxGetApp().plater()->changed_object(get_selected_obj_idx());
-    m_part_settings_changed = false;
-}
-
-void ObjectList::parts_changed(int obj_idx)
-{
-    wxGetApp().plater()->changed_object(obj_idx);
-    m_parts_changed = false;
+    wxGetApp().plater()->changed_object(obj_idx < 0 ? get_selected_obj_idx() : obj_idx);
 }
 
 void ObjectList::part_selection_changed()
 {
     int obj_idx = -1;
+    int volume_id = -1;
     m_config = nullptr;
     wxString og_name = wxEmptyString;
 
     bool update_and_show_manipulations = false;
     bool update_and_show_settings = false;
 
-    if (multiple_selection()) {
+    const auto item = GetSelection();
+
+    if ( multiple_selection() || item && m_objects_model->GetItemType(item) == itInstanceRoot ) 
+    {
         og_name = _(L("Group manipulation"));
-        update_and_show_manipulations = true;
+
+        const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
+        // don't show manipulation panel for case of all Object's parts selection 
+        update_and_show_manipulations = !selection.is_single_full_instance();
     }
     else
     {
-        const auto item = GetSelection();
         if (item)
         {
-            bool is_part = false;
             if (m_objects_model->GetParent(item) == wxDataViewItem(0)) {
                 obj_idx = m_objects_model->GetIdByItem(item);
                 og_name = _(L("Object manipulation"));
@@ -1618,7 +1867,6 @@ void ObjectList::part_selection_changed()
                     }
                     else {
                         og_name = _(L("Part Settings to modify"));
-                        is_part = true;
                         auto main_parent = m_objects_model->GetParent(parent);
                         obj_idx = m_objects_model->GetIdByItem(main_parent);
                         const auto volume_id = m_objects_model->GetVolumeIdByItem(parent);
@@ -1628,8 +1876,7 @@ void ObjectList::part_selection_changed()
                 }
                 else if (m_objects_model->GetItemType(item) == itVolume) {
                     og_name = _(L("Part manipulation"));
-                    is_part = true;
-                    const auto volume_id = m_objects_model->GetVolumeIdByItem(item);
+                    volume_id = m_objects_model->GetVolumeIdByItem(item);
                     m_config = &(*m_objects)[obj_idx]->volumes[volume_id]->config;
                     update_and_show_manipulations = true;
                 }
@@ -1649,7 +1896,11 @@ void ObjectList::part_selection_changed()
 
     if (update_and_show_manipulations) {
         wxGetApp().obj_manipul()->get_og()->set_name(" " + og_name + " ");
-        wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(GetSelection()));
+
+        if (item) {
+            wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item));
+            wxGetApp().obj_manipul()->update_warning_icon_state(get_mesh_errors_list(obj_idx, volume_id));
+        }
     }
 
     if (update_and_show_settings)
@@ -1669,34 +1920,26 @@ void ObjectList::part_selection_changed()
 void ObjectList::add_object_to_list(size_t obj_idx)
 {
     auto model_object = (*m_objects)[obj_idx];
-    wxString item_name = from_u8(model_object->name);
+    const wxString& item_name = from_u8(model_object->name);
     const auto item = m_objects_model->Add(item_name,
                       !model_object->config.has("extruder") ? 0 :
-                      model_object->config.option<ConfigOptionInt>("extruder")->value);
-
-    // Add error icon if detected auto-repaire
-    auto stats = model_object->volumes[0]->mesh.stl.stats;
-    int errors = stats.degenerate_facets + stats.edges_fixed + stats.facets_removed +
-        stats.facets_added + stats.facets_reversed + stats.backwards_edges;
-    if (errors > 0) {
-        wxVariant variant;
-        variant << PrusaDataViewBitmapText(item_name, m_bmp_manifold_warning);
-        m_objects_model->SetValue(variant, item, 0);
-    }
+                      model_object->config.option<ConfigOptionInt>("extruder")->value,
+                      get_mesh_errors_count(obj_idx) > 0);
 
     // add volumes to the object
     if (model_object->volumes.size() > 1) {
-        for (auto id = 0; id < model_object->volumes.size(); id++) {
-            auto vol_item = m_objects_model->AddVolumeChild(item,
-                from_u8(model_object->volumes[id]->name),
-                model_object->volumes[id]->type(),
-                !model_object->volumes[id]->config.has("extruder") ? 0 :
-                model_object->volumes[id]->config.option<ConfigOptionInt>("extruder")->value,
+        for (const ModelVolume* volume : model_object->volumes) {
+            const wxDataViewItem& vol_item = m_objects_model->AddVolumeChild(item,
+                from_u8(volume->name),
+                volume->type(),
+                volume->get_mesh_errors_count()>0,
+                !volume->config.has("extruder") ? 0 :
+                volume->config.option<ConfigOptionInt>("extruder")->value,
                 false);
-            auto opt_keys = model_object->volumes[id]->config.keys();
+            auto opt_keys = volume->config.keys();
             if (!opt_keys.empty() && !(opt_keys.size() == 1 && opt_keys[0] == "extruder")) {
                 select_item(m_objects_model->AddSettingsChild(vol_item));
-                Collapse(vol_item);
+                Expand(vol_item);
             }
         }
         Expand(item);
@@ -1710,7 +1953,7 @@ void ObjectList::add_object_to_list(size_t obj_idx)
     auto opt_keys = model_object->config.keys();
     if (!opt_keys.empty() && !(opt_keys.size() == 1 && opt_keys[0] == "extruder")) {
         select_item(m_objects_model->AddSettingsChild(item));
-        Collapse(item);
+        Expand(item);
     }
 
 #ifndef __WXOSX__ 
@@ -1876,11 +2119,22 @@ bool ObjectList::multiple_selection() const
     return GetSelectedItemsCount() > 1;
 }
 
+bool ObjectList::is_selected(const ItemType type) const
+{
+    const wxDataViewItem& item = GetSelection();
+    if (item)
+        return m_objects_model->GetItemType(item) == type;
+
+    return false;
+}
+
 void ObjectList::update_selections()
 {
     const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
     wxDataViewItemArray sels;
 
+    m_selection_mode = smInstance;
+
     // We doesn't update selection if SettingsItem for the current object/part is selected
     if (GetSelectedItemsCount() == 1 && m_objects_model->GetItemType(GetSelection()) == itSettings )
     {
@@ -1888,38 +2142,67 @@ void ObjectList::update_selections()
         if (selection.is_single_full_object() && 
             m_objects_model->GetIdByItem(m_objects_model->GetParent(item)) == selection.get_object_idx())
             return; 
-        if (selection.is_single_volume() || selection.is_modifier()) {
+        if (selection.is_single_volume() || selection.is_any_modifier()) {
             const auto gl_vol = selection.get_volume(*selection.get_volume_idxs().begin());
             if (m_objects_model->GetVolumeIdByItem(m_objects_model->GetParent(item)) == gl_vol->volume_idx())
                 return;
         }
-    }
 
-    if (selection.is_single_full_object())
-    {
-        sels.Add(m_objects_model->GetItemById(selection.get_object_idx()));
+        // but if there is selected only one of several instances by context menu,
+        // then select this instance in ObjectList
+        if (selection.is_single_full_instance())
+            sels.Add(m_objects_model->GetItemByInstanceId(selection.get_object_idx(), selection.get_instance_idx()));
     }
-    else if (selection.is_single_volume() || selection.is_modifier() || 
-             selection.is_multiple_volume() || selection.is_multiple_full_object()) {
+    else if (selection.is_single_full_object() || selection.is_multiple_full_object())
+    {
+        const Selection::ObjectIdxsToInstanceIdxsMap& objects_content = selection.get_content();
+        for (const auto& object : objects_content) {
+            if (object.second.size() == 1)          // object with 1 instance                
+                sels.Add(m_objects_model->GetItemById(object.first));
+            else if (object.second.size() > 1)      // object with several instances                
+            {
+                wxDataViewItemArray current_sels;
+                GetSelections(current_sels);
+                const wxDataViewItem frst_inst_item = m_objects_model->GetItemByInstanceId(object.first, 0);
+
+                bool root_is_selected = false;
+                for (const auto& item:current_sels)
+                    if (item == m_objects_model->GetParent(frst_inst_item) || 
+                        item == m_objects_model->GetTopParent(frst_inst_item)) {
+                        root_is_selected = true;
+                        sels.Add(item);
+                        break;
+                    }
+                if (root_is_selected)
+                    continue;
+
+                const Selection::InstanceIdxsList& instances = object.second;
+                for (const auto& inst : instances)
+                    sels.Add(m_objects_model->GetItemByInstanceId(object.first, inst));
+            }
+        }
+    }
+    else if (selection.is_any_volume() || selection.is_any_modifier())
+    {
         for (auto idx : selection.get_volume_idxs()) {
             const auto gl_vol = selection.get_volume(idx);
-            if (selection.is_multiple_full_object())
-                sels.Add(m_objects_model->GetItemById(gl_vol->object_idx()));
-			else if (gl_vol->volume_idx() >= 0)
+			if (gl_vol->volume_idx() >= 0)
                 // Only add GLVolumes with non-negative volume_ids. GLVolumes with negative volume ids
                 // are not associated with ModelVolumes, but they are temporarily generated by the backend
                 // (for example, SLA supports or SLA pad).
                 sels.Add(m_objects_model->GetItemByVolumeId(gl_vol->object_idx(), gl_vol->volume_idx()));
         }
+        m_selection_mode = smVolume;
     }
-    else if (selection.is_single_full_instance() || selection.is_multiple_full_instance()) {
+    else if (selection.is_single_full_instance() || selection.is_multiple_full_instance())
+    {
         for (auto idx : selection.get_instance_idxs()) {            
             sels.Add(m_objects_model->GetItemByInstanceId(selection.get_object_idx(), idx));
         }
     }
     else if (selection.is_mixed())
     {
-        auto& objects_content_list = selection.get_content();
+        const Selection::ObjectIdxsToInstanceIdxsMap& objects_content_list = selection.get_content();
 
         for (auto idx : selection.get_volume_idxs()) {
             const auto gl_vol = selection.get_volume(idx);
@@ -1952,26 +2235,14 @@ void ObjectList::update_selections()
                 sels.Add(m_objects_model->GetItemByVolumeId(glv_obj_idx, glv_vol_idx));
         }
     }
+
+    if (sels.size() == 0)
+        m_selection_mode = smUndef;
     
     select_items(sels);
 
-    /* Because of ScrollLines() and GetItemRect() functions are implemented 
-     * only for GENERIC DataViewCtrl in current version of wxWidgets,
-     * use this part of code only for MSW 
-     */
-#if defined(wxUSE_GENERICDATAVIEWCTRL)
     // Scroll selected Item in the middle of an object list
-    if (GetSelection()) {
-        const wxRect& sel_rc = GetItemRect(GetSelection());
-        const wxRect& main_rc = GetClientRect();
-        if (sel_rc.GetBottom() <= main_rc.GetTop()+sel_rc.height ||
-            sel_rc.GetTop() >= main_rc.GetBottom() )
-        {
-            const wxRect& top_rc = GetItemRect(GetTopItem());
-            ScrollLines(int((sel_rc.y - top_rc.y) / top_rc.GetHeight()) - 0.5*GetCountPerPage());
-        }
-    }
-#endif
+    this->EnsureVisible(this->GetCurrentItem());
 }
 
 void ObjectList::update_selections_on_canvas()
@@ -1985,33 +2256,39 @@ void ObjectList::update_selections_on_canvas()
         return;
     }
 
-    auto add_to_selection = [this](const wxDataViewItem& item, Selection& selection, bool as_single_selection)
+    auto add_to_selection = [this](const wxDataViewItem& item, Selection& selection, int instance_idx, bool as_single_selection)
     {
-        if (m_objects_model->GetParent(item) == wxDataViewItem(0)) {
-            selection.add_object(m_objects_model->GetIdByItem(item), as_single_selection);
+        const ItemType& type = m_objects_model->GetItemType(item);
+        if ( type == itInstanceRoot || m_objects_model->GetParent(item) == wxDataViewItem(0) ) {
+            wxDataViewItem obj_item = type == itInstanceRoot ? m_objects_model->GetParent(item) : item;
+            selection.add_object(m_objects_model->GetIdByItem(obj_item), as_single_selection);
             return;
         }
 
-        if (m_objects_model->GetItemType(item) == itVolume) {
+        if (type == itVolume) {
             const int obj_idx = m_objects_model->GetIdByItem(m_objects_model->GetParent(item));
             const int vol_idx = m_objects_model->GetVolumeIdByItem(item);
-            selection.add_volume(obj_idx, vol_idx, 0, as_single_selection);
+            selection.add_volume(obj_idx, vol_idx, std::max(instance_idx, 0), as_single_selection);
         }
-        else if (m_objects_model->GetItemType(item) == itInstance) {
+        else if (type == itInstance) {
             const int obj_idx = m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item));
             const int inst_idx = m_objects_model->GetInstanceIdByItem(item);
             selection.add_instance(obj_idx, inst_idx, as_single_selection);
         }
     };
 
+    // stores current instance idx before to clear the selection
+    int instance_idx = selection.get_instance_idx();
+
     if (sel_cnt == 1) {
         wxDataViewItem item = GetSelection();
         if (m_objects_model->GetItemType(item) & (itSettings|itInstanceRoot))
-            add_to_selection(m_objects_model->GetParent(item), selection, true);
+            add_to_selection(m_objects_model->GetParent(item), selection, instance_idx, true);
         else
-            add_to_selection(item, selection, true);
-            
+            add_to_selection(item, selection, instance_idx, true);
+
         wxGetApp().plater()->canvas3D()->update_gizmos_on_off_state();
+        wxGetApp().plater()->canvas3D()->render();
         return;
     }
     
@@ -2020,9 +2297,10 @@ void ObjectList::update_selections_on_canvas()
 
     selection.clear();
     for (auto item: sels)
-        add_to_selection(item, selection, false);
+        add_to_selection(item, selection, instance_idx, false);
 
     wxGetApp().plater()->canvas3D()->update_gizmos_on_off_state();
+    wxGetApp().plater()->canvas3D()->render();
 }
 
 void ObjectList::select_item(const wxDataViewItem& item)
@@ -2063,22 +2341,101 @@ void ObjectList::select_item_all_children()
     if (!GetSelection() || m_objects_model->GetItemType(GetSelection()) == itObject) {
         for (int i = 0; i < m_objects->size(); i++)
             sels.Add(m_objects_model->GetItemById(i));
+        m_selection_mode = smInstance;
     }
     else {
         const auto item = GetSelection();
         // Some volume(instance) is selected    =>  select all volumes(instances) inside the current object
-        if (m_objects_model->GetItemType(item) & (itVolume | itInstance)) {
+        if (m_objects_model->GetItemType(item) & (itVolume | itInstance))
             m_objects_model->GetChildren(m_objects_model->GetParent(item), sels);
-        }
+
+        m_selection_mode = m_objects_model->GetItemType(item)&itVolume ? smVolume : smInstance;
     }
 
     SetSelections(sels);
     selection_changed();
 }
 
+// update selection mode for non-multiple selection
+void ObjectList::update_selection_mode()
+{
+    // All items are unselected 
+    if (!GetSelection())
+    {
+        m_last_selected_item = wxDataViewItem(0);
+        m_selection_mode = smUndef;
+        return;
+    }
+
+    const ItemType type = m_objects_model->GetItemType(GetSelection());
+    m_selection_mode =  type&itSettings ? smUndef   :
+                        type&itVolume   ? smVolume  : smInstance;
+}
+
+// check last selected item. If is it possible to select it
+bool ObjectList::check_last_selection(wxString& msg_str)
+{
+    if (!m_last_selected_item)
+        return true;
+        
+    const bool is_shift_pressed = wxGetKeyState(WXK_SHIFT);
+
+    /* We can't mix Parts and Objects/Instances.
+     * So, show information about it
+     */
+    const ItemType type = m_objects_model->GetItemType(m_last_selected_item);
+
+    // check a case of a selection of the Parts from different Objects
+    bool impossible_multipart_selection = false;
+    if (type & itVolume && m_selection_mode == smVolume)
+    {
+        wxDataViewItemArray sels;
+        GetSelections(sels);
+        for (const auto& sel: sels)
+            if (sel != m_last_selected_item && 
+                m_objects_model->GetParent(sel) != m_objects_model->GetParent(m_last_selected_item))
+            {
+                impossible_multipart_selection = true;
+                break;
+            }
+    }
+
+    if (impossible_multipart_selection ||
+        type & itSettings ||
+        type & itVolume && m_selection_mode == smInstance ||
+        !(type & itVolume) && m_selection_mode == smVolume)
+    {
+        // Inform user why selection isn't complited
+        const wxString item_type = m_selection_mode == smInstance ? _(L("Object or Instance")) : _(L("Part"));
+
+        msg_str = wxString::Format( _(L("Unsupported selection")) + "\n\n" + 
+                                    _(L("You started your selection with %s Item.")) + "\n" +
+                                    _(L("In this mode you can select only other %s Items%s")), 
+                                    item_type, item_type,
+                                    m_selection_mode == smInstance ? "." : 
+                                                        " " + _(L("of a current Object")));
+
+        // Unselect last selected item, if selection is without SHIFT
+        if (!is_shift_pressed) {
+            Unselect(m_last_selected_item);
+            show_info(this, msg_str, _(L("Info")));
+        }
+        
+        return is_shift_pressed;
+    }
+
+    return true;
+}
+
 void ObjectList::fix_multiselection_conflicts()
 {
-    if (GetSelectedItemsCount() <= 1)
+    if (GetSelectedItemsCount() <= 1) {
+        update_selection_mode();
+        return;
+    }
+
+    wxString msg_string;
+    if (!check_last_selection(msg_string))
         return;
 
     m_prevent_list_events = true;
@@ -2086,12 +2443,58 @@ void ObjectList::fix_multiselection_conflicts()
     wxDataViewItemArray sels;
     GetSelections(sels);
 
-    for (auto item : sels) {
-        if (m_objects_model->GetItemType(item) & (itSettings|itInstanceRoot))
-            Unselect(item);
-        else if (m_objects_model->GetParent(item) != wxDataViewItem(0))
-            Unselect(m_objects_model->GetParent(item));
+    if (m_selection_mode == smVolume)
+    {
+        // identify correct parent of the initial selected item
+        const wxDataViewItem& parent = m_objects_model->GetParent(m_last_selected_item == sels.front() ? sels.back() : sels.front());
+
+        sels.clear();
+        wxDataViewItemArray children; // selected volumes from current parent
+        m_objects_model->GetChildren(parent, children);
+
+        for (const auto child : children)
+            if (IsSelected(child) && m_objects_model->GetItemType(child)&itVolume)
+                sels.Add(child);
+
+        // If some part is selected, unselect all items except of selected parts of the current object
+        UnselectAll();
+        SetSelections(sels);
     }
+    else
+    {
+        for (const auto item : sels)
+        {
+            if (!IsSelected(item)) // if this item is unselected now (from previous actions)
+                continue;
+
+            if (m_objects_model->GetItemType(item) & itSettings) {
+                Unselect(item);
+                continue;
+            }
+
+            const wxDataViewItem& parent = m_objects_model->GetParent(item);
+            if (parent != wxDataViewItem(0) && IsSelected(parent))
+                Unselect(parent);
+            else
+            {
+                wxDataViewItemArray unsels;
+                m_objects_model->GetAllChildren(item, unsels);
+                for (const auto unsel_item : unsels)
+                    Unselect(unsel_item);
+            }
+
+            if (m_objects_model->GetItemType(item) & itVolume)
+                Unselect(item);
+
+            m_selection_mode = smInstance;
+        }
+    }
+
+    if (!msg_string.IsEmpty())
+        show_info(this, msg_string, _(L("Info")));
+
+    if (!IsSelected(m_last_selected_item))
+        m_last_selected_item = wxDataViewItem(0);
 
     m_prevent_list_events = false;
 }
@@ -2134,9 +2537,9 @@ void ObjectList::change_part_type()
         }
     }
 
-    const wxString names[] = { "Part", "Modifier", "Support Enforcer", "Support Blocker" };
+    const wxString names[] = { _(L("Part")), _(L("Modifier")), _(L("Support Enforcer")), _(L("Support Blocker")) };
     
-    auto new_type = ModelVolumeType(wxGetSingleChoiceIndex("Type: ", _(L("Select type of part")), wxArrayString(4, names), int(type)));
+    auto new_type = ModelVolumeType(wxGetSingleChoiceIndex(_(L("Type:")), _(L("Select type of part")), wxArrayString(4, names), int(type)));
 
 	if (new_type == type || new_type == ModelVolumeType::INVALID)
         return;
@@ -2145,8 +2548,7 @@ void ObjectList::change_part_type()
     volume->set_type(new_type);
     m_objects_model->SetVolumeType(item, new_type);
 
-    m_parts_changed = true;
-    parts_changed(get_selected_obj_idx());
+    changed_object(get_selected_obj_idx());
 
     // Update settings showing, if we have it
     //(we show additional settings for Part and Modifier and hide it for Support Blocker/Enforcer)
@@ -2223,6 +2625,12 @@ void ObjectList::update_object_menu()
 
 void ObjectList::instances_to_separated_object(const int obj_idx, const std::set<int>& inst_idxs)
 {
+    if ((*m_objects)[obj_idx]->instances.size() == inst_idxs.size())
+    {
+        instances_to_separated_objects(obj_idx);
+        return;
+    }
+
     // create new object from selected instance  
     ModelObject* model_object = (*m_objects)[obj_idx]->get_model()->add_object(*(*m_objects)[obj_idx]);
     for (int inst_idx = model_object->instances.size() - 1; inst_idx >= 0; inst_idx--)
@@ -2243,6 +2651,31 @@ void ObjectList::instances_to_separated_object(const int obj_idx, const std::set
     }
 }
 
+void ObjectList::instances_to_separated_objects(const int obj_idx)
+{
+    const int inst_cnt = (*m_objects)[obj_idx]->instances.size();
+
+    for (int i = inst_cnt-1; i > 0 ; i--)
+    {
+        // create new object from initial
+        ModelObject* object = (*m_objects)[obj_idx]->get_model()->add_object(*(*m_objects)[obj_idx]);
+        for (int inst_idx = object->instances.size() - 1; inst_idx >= 0; inst_idx--)
+        {
+            if (inst_idx == i)
+                continue;
+            // delete unnecessary instances
+            object->delete_instance(inst_idx);
+        }
+
+        // Add new object to the object_list
+        add_object_to_list(m_objects->size() - 1);
+
+        // delete current instance from the initial object
+        del_subobject_from_object(obj_idx, i, itInstance);
+        delete_instance_from_list(obj_idx, i);
+    }
+}
+
 void ObjectList::split_instances()
 {
     const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
@@ -2250,6 +2683,12 @@ void ObjectList::split_instances()
     if (obj_idx == -1)
         return;
 
+    if (selection.is_single_full_object())
+    {
+        instances_to_separated_objects(obj_idx);
+        return;
+    }
+
     const int inst_idx = selection.get_instance_idx();
     const std::set<int> inst_idxs = inst_idx < 0 ?
                                     selection.get_instance_idxs() :
@@ -2289,7 +2728,7 @@ void ObjectList::rename_item()
     wxVariant valueOld;
     m_objects_model->GetValue(valueOld, item, 0);
 
-    PrusaDataViewBitmapText bmpText;
+    DataViewBitmapText bmpText;
     bmpText << valueOld;
 
     // But replace the text with the value entered by user.
@@ -2303,18 +2742,10 @@ void ObjectList::rename_item()
     update_name_in_model(item);
 }
 
-void ObjectList::fix_through_netfabb() const 
+void ObjectList::fix_through_netfabb() 
 {
-    const wxDataViewItem item = GetSelection();
-    if (!item)
-        return;
-    
-    const ItemType type = m_objects_model->GetItemType(item);
-
-    const int obj_idx = type & itObject ? m_objects_model->GetIdByItem(item) :
-                        type & itVolume ? m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item)) : -1;
-
-    const int vol_idx = type & itVolume ? m_objects_model->GetVolumeIdByItem(item) : -1;
+    int obj_idx, vol_idx;
+    get_selected_item_indexes(obj_idx, vol_idx);
 
     wxGetApp().plater()->fix_through_netfabb(obj_idx, vol_idx);
     
@@ -2328,20 +2759,44 @@ void ObjectList::update_item_error_icon(const int obj_idx, const int vol_idx) co
     if (!item)
         return;
 
-    auto model_object = (*m_objects)[obj_idx];
-
-    const stl_stats& stats = model_object->volumes[vol_idx<0 ? 0 : vol_idx]->mesh.stl.stats;
-    const int errors = stats.degenerate_facets + stats.edges_fixed + stats.facets_removed +
-                       stats.facets_added + stats.facets_reversed + stats.backwards_edges;
-
-    if (errors == 0) {
-        // delete Error_icon if all errors are fixed
-        wxVariant variant;
-        variant << PrusaDataViewBitmapText(from_u8(model_object->name), wxNullBitmap);
-        m_objects_model->SetValue(variant, item, 0);
+    if (get_mesh_errors_count(obj_idx, vol_idx) == 0)
+    {
+        // if whole object has no errors more,
+        if (get_mesh_errors_count(obj_idx) == 0)
+            // unmark all items in the object
+            m_objects_model->DeleteWarningIcon(vol_idx >= 0 ? m_objects_model->GetParent(item) : item, true);
+        else
+            // unmark fixed item only
+            m_objects_model->DeleteWarningIcon(item);
     }
 }
 
+void ObjectList::msw_rescale()
+{
+    const int em = wxGetApp().em_unit();
+    // update min size !!! A width of control shouldn't be a wxDefaultCoord
+    SetMinSize(wxSize(1, 15 * em));
+
+    GetColumn(0)->SetWidth(19 * em);
+    GetColumn(1)->SetWidth( 8 * em);
+    GetColumn(2)->SetWidth( 2 * em);
+
+    // rescale all icons, used by ObjectList
+    msw_rescale_icons();
+
+    // rescale/update existing items with bitmaps
+    m_objects_model->Rescale();
+
+    // rescale menus
+    for (MenuWithSeparators* menu : { &m_menu_object, 
+                                      &m_menu_part, 
+                                      &m_menu_sla_object, 
+                                      &m_menu_instance })
+        msw_rescale_menu(menu);
+
+    Layout();
+}
+
 void ObjectList::ItemValueChanged(wxDataViewEvent &event)
 {
     if (event.GetColumn() == 0)
@@ -2355,7 +2810,7 @@ void ObjectList::OnEditingDone(wxDataViewEvent &event)
     if (event.GetColumn() != 0)
         return;
 
-    const auto renderer = dynamic_cast<PrusaBitmapTextRenderer*>(GetColumn(0)->GetRenderer());
+    const auto renderer = dynamic_cast<BitmapTextRenderer*>(GetColumn(0)->GetRenderer());
 
     if (renderer->WasCanceled())
         show_error(this, _(L("The supplied name is not valid;")) + "\n" +
@@ -2374,11 +2829,6 @@ void ObjectList::show_multi_selection_menu()
 
     wxMenu* menu = new wxMenu();
 
-#ifdef __WXOSX__
-    append_menu_item(menu, wxID_ANY, _(L("Delete items")), "",
-        [this](wxCommandEvent&) { remove(); }, "", menu);
-#endif //__WXOSX__
-
     if (extruders_count() > 1)
         append_menu_item(menu, wxID_ANY, _(L("Set extruder for selected items")),
             _(L("Select extruder number for selected objects and/or parts")),
@@ -2390,7 +2840,7 @@ void ObjectList::show_multi_selection_menu()
 void ObjectList::extruder_selection()
 {
     wxArrayString choices;
-    choices.Add("default");
+    choices.Add(_(L("default")));
     for (int i = 1; i <= extruders_count(); ++i)
         choices.Add(wxString::Format("%d", i));
 
@@ -2400,7 +2850,7 @@ void ObjectList::extruder_selection()
     if (selected_extruder.IsEmpty())
         return;
 
-    const int extruder_num = selected_extruder == "default" ? 0 : atoi(selected_extruder.c_str());
+    const int extruder_num = selected_extruder == _(L("default")) ? 0 : atoi(selected_extruder.c_str());
 
 //          /* Another variant for an extruder selection */
 //     extruder_num = wxGetNumberFromUser(_(L("Attention!!! \n"
@@ -2421,15 +2871,7 @@ void ObjectList::set_extruder_for_selected_items(const int extruder) const
 
     for (const wxDataViewItem& item : sels)
     {
-        const ItemType type = m_objects_model->GetItemType(item);
-
-        const int obj_idx = type & itObject ? m_objects_model->GetIdByItem(item) :
-                            m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item));
-
-        const int vol_idx = type & itVolume ? m_objects_model->GetVolumeIdByItem(item) : -1;
-
-        DynamicPrintConfig& config = type & itObject ? (*m_objects)[obj_idx]->config : 
-                                     (*m_objects)[obj_idx]->volumes[vol_idx]->config;
+        DynamicPrintConfig& config = get_item_config(item);
         
         if (config.has("extruder")) {
             if (extruder == 0)
@@ -2440,9 +2882,18 @@ void ObjectList::set_extruder_for_selected_items(const int extruder) const
         else if (extruder > 0)
             config.set_key_value("extruder", new ConfigOptionInt(extruder));
 
-        const wxString extruder_str = extruder == 0 ? wxString ("default") : 
+        const wxString extruder_str = extruder == 0 ? wxString (_(L("default"))) : 
                                       wxString::Format("%d", config.option<ConfigOptionInt>("extruder")->value);
-        m_objects_model->SetValue(extruder_str, item, 1);
+
+        auto const type = m_objects_model->GetItemType(item);
+
+        /* We can change extruder for Object/Volume only.
+         * So, if Instance is selected, get its Object item and change it
+         */
+        m_objects_model->SetValue(extruder_str, type & itInstance ? m_objects_model->GetTopParent(item) : item, 1);
+
+        const int obj_idx = type & itObject ? m_objects_model->GetIdByItem(item) :
+                            m_objects_model->GetIdByItem(m_objects_model->GetTopParent(item));
 
         wxGetApp().plater()->canvas3D()->ensure_on_bed(obj_idx);
     }
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index e0df8dd40..2932d86f9 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -13,8 +13,8 @@
 
 class wxBoxSizer;
 class wxMenuItem;
-class PrusaObjectDataViewModel;
-class PrusaMenu;
+class ObjectDataViewModel;
+class MenuWithSeparators;
 
 namespace Slic3r {
 class ConfigOptionsGroup;
@@ -31,6 +31,8 @@ typedef std::map<std::string, std::vector<std::string>> FreqSettingsBundle;
 //				  category ->		vector 			 ( option	;  label )
 typedef std::map< std::string, std::vector< std::pair<std::string, std::string> > > settings_menu_hierarchy;
 
+typedef std::vector<ModelVolume*> ModelVolumePtrs;
+
 namespace GUI {
 
 wxDECLARE_EVENT(EVT_OBJ_LIST_OBJECT_SELECT, SimpleEvent);
@@ -60,6 +62,12 @@ struct ItemForDelete
 
 class ObjectList : public wxDataViewCtrl
 {
+    enum SELECTION_MODE
+    {
+        smUndef,
+        smVolume,
+        smInstance
+    } m_selection_mode {smUndef};
 
     struct dragged_item_data
     {
@@ -100,18 +108,17 @@ class ObjectList : public wxDataViewCtrl
     wxBoxSizer          *m_sizer {nullptr};
     wxWindow            *m_parent {nullptr};
 
-    wxBitmap	m_bmp_modifiermesh;
-    wxBitmap	m_bmp_solidmesh;
-    wxBitmap	m_bmp_support_enforcer;
-    wxBitmap	m_bmp_support_blocker;
-    wxBitmap	m_bmp_manifold_warning;
-    wxBitmap	m_bmp_cog;
-    wxBitmap	m_bmp_split;
+    ScalableBitmap	    m_bmp_modifiermesh;
+    ScalableBitmap	    m_bmp_solidmesh;
+    ScalableBitmap	    m_bmp_support_enforcer;
+    ScalableBitmap	    m_bmp_support_blocker;
+    ScalableBitmap	    m_bmp_manifold_warning;
+    ScalableBitmap	    m_bmp_cog;
 
-    PrusaMenu   m_menu_object;
-    PrusaMenu   m_menu_part;
-    PrusaMenu   m_menu_sla_object;
-    PrusaMenu   m_menu_instance;
+    MenuWithSeparators  m_menu_object;
+    MenuWithSeparators  m_menu_part;
+    MenuWithSeparators  m_menu_sla_object;
+    MenuWithSeparators  m_menu_instance;
     wxMenuItem* m_menu_item_split { nullptr };
     wxMenuItem* m_menu_item_split_part { nullptr };
     wxMenuItem* m_menu_item_settings { nullptr };
@@ -131,10 +138,8 @@ class ObjectList : public wxDataViewCtrl
                                                            // update_settings_items - updating canvas selection is undesirable,
                                                            // because it would turn off the gizmos (mainly a problem for the SLA gizmo)
 
-    bool        m_parts_changed = false;
-    bool        m_part_settings_changed = false;
-
     int         m_selected_row = 0;
+    wxDataViewItem m_last_selected_item {nullptr};
 
 #if 0
     FreqSettingsBundle m_freq_settings_fff;
@@ -148,7 +153,7 @@ public:
 
     std::map<std::string, wxBitmap> CATEGORY_ICON;
 
-    PrusaObjectDataViewModel	*m_objects_model{ nullptr };
+    ObjectDataViewModel	*m_objects_model{ nullptr };
     DynamicPrintConfig          *m_config {nullptr};
 
     std::vector<ModelObject*>   *m_objects{ nullptr };
@@ -167,7 +172,18 @@ public:
     void                update_extruder_values_for_items(const int max_extruder);
 
     void                init_icons();
+    void                msw_rescale_icons();
 
+    // Get obj_idx and vol_idx values for the selected (by default) or an adjusted item
+    void                get_selected_item_indexes(int& obj_idx, int& vol_idx, const wxDataViewItem& item = wxDataViewItem(0));
+    // Get count of errors in the mesh
+    int                 get_mesh_errors_count(const int obj_idx, const int vol_idx = -1) const;
+    /* Get list of errors in the mesh. Return value is a string, used for the tooltip
+     * Function without parameters is for a call from Manipulation panel, 
+     * when we don't know parameters of selected item 
+     */
+    wxString            get_mesh_errors_list(const int obj_idx, const int vol_idx = -1) const;
+    wxString            get_mesh_errors_list();
     void                set_tooltip_for_item(const wxPoint& pt);
 
     void                selection_changed();
@@ -178,15 +194,17 @@ public:
     void                get_freq_settings_choice(const wxString& bundle_name);
     void                update_settings_item();
 
-    void                append_menu_item_add_generic(wxMenuItem* menu, const ModelVolumeType type);
+    wxMenu*             append_submenu_add_generic(wxMenu* menu, const ModelVolumeType type);
     void                append_menu_items_add_volume(wxMenu* menu);
     wxMenuItem*         append_menu_item_split(wxMenu* menu);
     wxMenuItem*         append_menu_item_settings(wxMenu* menu);
     wxMenuItem*         append_menu_item_change_type(wxMenu* menu);
-    wxMenuItem*         append_menu_item_instance_to_object(wxMenu* menu);
+    wxMenuItem*         append_menu_item_instance_to_object(wxMenu* menu, wxWindow* parent);
     void                append_menu_items_osx(wxMenu* menu);
-    void                append_menu_item_fix_through_netfabb(wxMenu* menu);
+    wxMenuItem*         append_menu_item_fix_through_netfabb(wxMenu* menu);
     void                append_menu_item_export_stl(wxMenu* menu) const ;
+    void                append_menu_item_change_extruder(wxMenu* menu) const;
+    void                append_menu_item_delete(wxMenu* menu);
     void                create_object_popupmenu(wxMenu *menu);
     void                create_sla_object_popupmenu(wxMenu*menu);
     void                create_part_popupmenu(wxMenu*menu);
@@ -197,7 +215,7 @@ public:
     void                update_opt_keys(t_config_option_keys& t_optopt_keys);
 
     void                load_subobject(ModelVolumeType type);
-    void                load_part(ModelObject* model_object, wxArrayString& part_names, ModelVolumeType type);
+    void                load_part(ModelObject* model_object, std::vector<std::pair<wxString, bool>> &volumes_info, ModelVolumeType type);
 	void                load_generic_subobject(const std::string& type_name, const ModelVolumeType type);
     void                del_object(const int obj_idx);
     void                del_subobject_item(wxDataViewItem& item);
@@ -213,12 +231,10 @@ public:
     wxPoint             get_mouse_position_in_control();
     wxBoxSizer*         get_sizer() {return  m_sizer;}
     int                 get_selected_obj_idx() const;
-    bool                is_parts_changed() const { return m_parts_changed; }
-    bool                is_part_settings_changed() const { return m_part_settings_changed; }
-    void                part_settings_changed();
+    DynamicPrintConfig& get_item_config(const wxDataViewItem& item) const;
 
-    void                 parts_changed(int obj_idx);
-    void                 part_selection_changed();
+    void                changed_object(const int obj_idx = -1) const;
+    void                part_selection_changed();
 
     // Add object to the list
     void add_object_to_list(size_t obj_idx);
@@ -249,12 +265,15 @@ public:
 
     void init_objects();
     bool multiple_selection() const ;
+    bool is_selected(const ItemType type) const;
     void update_selections();
     void update_selections_on_canvas();
     void select_item(const wxDataViewItem& item);
     void select_items(const wxDataViewItemArray& sels);
     void select_all();
     void select_item_all_children();
+    void update_selection_mode();
+    bool check_last_selection(wxString& msg_str);
     // correct current selections to avoid of the possible conflicts
     void fix_multiselection_conflicts();
 
@@ -267,10 +286,17 @@ public:
     void update_object_menu();
 
     void instances_to_separated_object(const int obj_idx, const std::set<int>& inst_idx);
+    void instances_to_separated_objects(const int obj_idx);
     void split_instances();
     void rename_item();
-    void fix_through_netfabb() const;
+    void fix_through_netfabb();
     void update_item_error_icon(const int obj_idx, int vol_idx) const ;
+
+    void paste_volumes_into_list(int obj_idx, const ModelVolumePtrs& volumes);
+    void paste_objects_into_list(const std::vector<size_t>& object_idxs);
+
+    void msw_rescale();
+
 private:
     void OnChar(wxKeyEvent& event);
     void OnContextMenu(wxDataViewEvent &event);
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index 6c8fdcab7..5bf25f3fc 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -10,20 +10,97 @@
 #include "Selection.hpp"
 
 #include <boost/algorithm/string.hpp>
+#include "slic3r/Utils/FixModelByWin10.hpp"
 
 namespace Slic3r
 {
 namespace GUI
 {
 
+static wxBitmapComboBox* create_word_local_combo(wxWindow *parent)
+{
+    wxSize size(15 * wxGetApp().em_unit(), -1);
+
+    wxBitmapComboBox *temp = nullptr;
+#ifdef __WXOSX__
+    /* wxBitmapComboBox with wxCB_READONLY style return NULL for GetTextCtrl(),
+     * so ToolTip doesn't shown.
+     * Next workaround helps to solve this problem
+     */
+    temp = new wxBitmapComboBox();
+    temp->SetTextCtrlStyle(wxTE_READONLY);
+	temp->Create(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr);
+#else
+	temp = new wxBitmapComboBox(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr, wxCB_READONLY);
+#endif //__WXOSX__
+
+    temp->SetFont(Slic3r::GUI::wxGetApp().normal_font());
+    temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
+
+    temp->Append(_(L("World coordinates")));
+    temp->Append(_(L("Local coordinates")));
+    temp->SetSelection(0);
+    temp->SetValue(temp->GetString(0));
+
+#ifndef __WXGTK__
+    /* Workaround for a correct rendering of the control without Bitmap (under MSW and OSX):
+     * 
+     * 1. We should create small Bitmap to fill Bitmaps RefData,
+     *    ! in this case wxBitmap.IsOK() return true.
+     * 2. But then set width to 0 value for no using of bitmap left and right spacing 
+     * 3. Set this empty bitmap to the at list one item and BitmapCombobox will be recreated correct
+     * 
+     * Note: Set bitmap height to the Font size because of OSX rendering.
+     */
+    wxBitmap empty_bmp(1, temp->GetFont().GetPixelSize().y + 2);
+    empty_bmp.SetWidth(0);
+    temp->SetItemBitmap(0, empty_bmp);
+#endif
+
+    temp->SetToolTip(_(L("Select coordinate space, in which the transformation will be performed.")));
+	return temp;
+}
+
+void msw_rescale_word_local_combo(wxBitmapComboBox* combo)
+{
+    const wxString selection = combo->GetString(combo->GetSelection());
+
+    /* To correct scaling (set new controll size) of a wxBitmapCombobox
+     * we need to refill control with new bitmaps. So, in our case :
+     * 1. clear control
+     * 2. add content
+     * 3. add scaled "empty" bitmap to the at least one item
+     */
+    combo->Clear();
+    wxSize size(wxDefaultSize);
+    size.SetWidth(15 * wxGetApp().em_unit());
+
+    // Set rescaled min height to correct layout
+    combo->SetMinSize(wxSize(-1, int(1.5f*combo->GetFont().GetPixelSize().y + 0.5f)));
+    // Set rescaled size
+    combo->SetSize(size);
+    
+    combo->Append(_(L("World coordinates")));
+    combo->Append(_(L("Local coordinates")));
+//     combo->SetSelection(0);
+//     combo->SetValue(combo->GetString(0));
+
+    wxBitmap empty_bmp(1, combo->GetFont().GetPixelSize().y + 2);
+    empty_bmp.SetWidth(0);
+    combo->SetItemBitmap(0, empty_bmp);
+
+    combo->SetValue(selection);
+}
+
 ObjectManipulation::ObjectManipulation(wxWindow* parent) :
     OG_Settings(parent, true)
 #ifndef __APPLE__
     , m_focused_option("")
 #endif // __APPLE__
 {
+    m_manifold_warning_bmp = ScalableBitmap(parent, "exclamation");
     m_og->set_name(_(L("Object Manipulation")));
-    m_og->label_width = 12 * wxGetApp().em_unit();//125;
+    m_og->label_width = 12;//125;
     m_og->set_grid_vgap(5);
     
     m_og->m_on_change = std::bind(&ObjectManipulation::on_change, this, std::placeholders::_1, std::placeholders::_2);
@@ -42,43 +119,81 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
     ConfigOptionDef def;
 
     // Objects(sub-objects) name
-    def.label = L("Name");
+//     def.label = L("Name");
+//     def.gui_type = "legend";
+//     def.tooltip = L("Object name");
+//     def.width = 21 * wxGetApp().em_unit();
+//     def.default_value = new ConfigOptionString{ " " };
+//     m_og->append_single_option_line(Option(def, "object_name"));
+
+    Line line = Line{ "Name", "Object name" };
+
+    auto manifold_warning_icon = [this](wxWindow* parent) {
+        m_fix_throught_netfab_bitmap = new wxStaticBitmap(parent, wxID_ANY, wxNullBitmap);
+        auto sizer = new wxBoxSizer(wxHORIZONTAL);
+        sizer->Add(m_fix_throught_netfab_bitmap);
+
+        if (is_windows10())
+            m_fix_throught_netfab_bitmap->Bind(wxEVT_CONTEXT_MENU, [this](wxCommandEvent &e)
+            {
+                // if object/sub-object has no errors
+                if (m_fix_throught_netfab_bitmap->GetBitmap().GetRefData() == wxNullBitmap.GetRefData())
+                    return;
+
+                wxGetApp().obj_list()->fix_through_netfabb();
+                update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_list());
+            });
+
+        return sizer;
+    };
+
+    line.append_widget(manifold_warning_icon);
+    def.label = "";
     def.gui_type = "legend";
     def.tooltip = L("Object name");
-    def.width = 21 * wxGetApp().em_unit();
-    def.default_value = new ConfigOptionString{ " " };
-    m_og->append_single_option_line(Option(def, "object_name"));
+#ifdef __APPLE__
+    def.width = 19;
+#else
+    def.width = 21;
+#endif
+    def.set_default_value(new ConfigOptionString{ " " });
+    line.append_option(Option(def, "object_name"));
+    m_og->append_line(line);
 
-    const int field_width = 5 * wxGetApp().em_unit()/*50*/;
+    const int field_width = 5;
 
     // Legend for object modification
-    auto line = Line{ "", "" };
+    line = Line{ "", "" };
     def.label = "";
     def.type = coString;
     def.width = field_width/*50*/;
 
-    std::vector<std::string> axes{ "x", "y", "z" };
-    for (const auto axis : axes) {
-        const auto label = boost::algorithm::to_upper_copy(axis);
-        def.default_value = new ConfigOptionString{ "   " + label };
+	for (const std::string axis : { "x", "y", "z" }) {
+        const std::string label = boost::algorithm::to_upper_copy(axis);
+        def.set_default_value(new ConfigOptionString{ "   " + label });
         Option option = Option(def, axis + "_axis_legend");
         line.append_option(option);
     }
+    line.near_label_widget = [this](wxWindow* parent) {
+        wxBitmapComboBox *combo = create_word_local_combo(parent);
+		combo->Bind(wxEVT_COMBOBOX, ([this](wxCommandEvent &evt) { this->set_world_coordinates(evt.GetSelection() != 1); }), combo->GetId());
+        m_word_local_combo = combo;
+        return combo;
+    };
     m_og->append_line(line);
 
-
     auto add_og_to_object_settings = [this, field_width](const std::string& option_name, const std::string& sidetext)
     {
         Line line = { _(option_name), "" };
         ConfigOptionDef def;
         def.type = coFloat;
-        def.default_value = new ConfigOptionFloat(0.0);
+        def.set_default_value(new ConfigOptionFloat(0.0));
         def.width = field_width/*50*/;
 
         // Add "uniform scaling" button in front of "Scale" option 
         if (option_name == "Scale") {
             line.near_label_widget = [this](wxWindow* parent) {
-                auto btn = new PrusaLockButton(parent, wxID_ANY);
+                auto btn = new LockButton(parent, wxID_ANY);
                 btn->Bind(wxEVT_BUTTON, [btn, this](wxCommandEvent &event){
                     event.Skip();
                     wxTheApp->CallAfter([btn, this]() { set_uniform_scaling(btn->IsLocked()); });
@@ -92,18 +207,16 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
         else if (option_name == "Size") {
             line.near_label_widget = [this](wxWindow* parent) {
                 return new wxStaticBitmap(parent, wxID_ANY, wxNullBitmap, wxDefaultPosition,
-//                                           wxBitmap(from_u8(var("one_layer_lock_on.png")), wxBITMAP_TYPE_PNG).GetSize());
-                                          create_scaled_bitmap("one_layer_lock_on.png").GetSize());
+                                          create_scaled_bitmap(m_parent, "one_layer_lock_on.png").GetSize());
             };
         }
 
         const std::string lower_name = boost::algorithm::to_lower_copy(option_name);
 
-        std::vector<std::string> axes{ "x", "y", "z" };
-        for (auto axis : axes) {
-            if (axis == "z")
+        for (const char *axis : { "_x", "_y", "_z" }) {
+            if (axis[1] == 'z')
                 def.sidetext = sidetext;
-            Option option = Option(def, lower_name + "_" + axis);
+            Option option = Option(def, lower_name + axis);
             option.opt.full_width = true;
             line.append_option(option);
         }
@@ -118,40 +231,48 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
     m_og->append_line(add_og_to_object_settings(L("Scale"), "%"), &m_scale_Label);
     m_og->append_line(add_og_to_object_settings(L("Size"), "mm"));
 
-    /* Unused parameter at this time
-    def.label = L("Place on bed");
-    def.type = coBool;
-    def.tooltip = L("Automatic placing of models on printing bed in Y axis");
-    def.gui_type = "";
-    def.sidetext = "";
-    def.default_value = new ConfigOptionBool{ false };
-    m_og->append_single_option_line(Option(def, "place_on_bed"));
-    */
+    // call back for a rescale of button "Set uniform scale"
+    m_og->rescale_near_label_widget = [this](wxWindow* win) {
+        auto *ctrl = dynamic_cast<LockButton*>(win);
+        if (ctrl == nullptr)
+            return;
+        ctrl->msw_rescale();
+    };
 }
 
 void ObjectManipulation::Show(const bool show)
 {
-    if (show == IsShown())
-        return;
+	if (show != IsShown()) {
+		// Show all lines of the panel. Some of these lines will be hidden in the lines below.
+		m_og->Show(show);
 
-    m_og->Show(show);
-
-    if (show && wxGetApp().get_mode() != comSimple) {
-        m_og->get_grid_sizer()->Show(size_t(0), false);
-        m_og->get_grid_sizer()->Show(size_t(1), false);
+        if (show && wxGetApp().get_mode() != comSimple) {
+            // Show the label and the name of the STL in simple mode only.
+            // Label "Name: "
+            m_og->get_grid_sizer()->Show(size_t(0), false);
+            // The actual name of the STL.
+            m_og->get_grid_sizer()->Show(size_t(1), false);
+        }
     }
+
+	if (show) {
+		// Show the "World Coordinates" / "Local Coordintes" Combo in Advanced / Expert mode only.
+		bool show_world_local_combo = wxGetApp().plater()->canvas3D()->get_selection().is_single_full_instance() && wxGetApp().get_mode() != comSimple;
+		m_word_local_combo->Show(show_world_local_combo);
+	}
 }
 
 bool ObjectManipulation::IsShown()
 {
-    return m_og->get_grid_sizer()->IsShown(2);
+	return dynamic_cast<const wxStaticBoxSizer*>(m_og->sizer)->GetStaticBox()->IsShown(); //  m_og->get_grid_sizer()->IsShown(2);
 }
 
 void ObjectManipulation::UpdateAndShow(const bool show)
 {
-    if (show) {
-        update_settings_value(wxGetApp().plater()->canvas3D()->get_selection());
-    }
+	if (show) {
+        this->set_dirty();
+		this->update_if_dirty();
+	}
 
     OG_Settings::UpdateAndShow(show);
 }
@@ -161,40 +282,44 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
 	m_new_move_label_string   = L("Position");
     m_new_rotate_label_string = L("Rotation");
     m_new_scale_label_string  = L("Scale factors");
+
+    if (wxGetApp().get_mode() == comSimple)
+        m_world_coordinates = true;
+
+    ObjectList* obj_list = wxGetApp().obj_list();
     if (selection.is_single_full_instance())
     {
         // all volumes in the selection belongs to the same instance, any of them contains the needed instance data, so we take the first one
         const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
         m_new_position = volume->get_instance_offset();
-        m_new_rotation = volume->get_instance_rotation();
-        m_new_scale    = volume->get_instance_scaling_factor();
-        int obj_idx = volume->object_idx();
-        int instance_idx = volume->instance_idx();
-        if ((0 <= obj_idx) && (obj_idx < (int)wxGetApp().model_objects()->size()))
-        {
-            bool changed_box = false;
-            if (!m_cache.instance.matches_object(obj_idx))
-            {
-                m_cache.instance.set(obj_idx, instance_idx, (*wxGetApp().model_objects())[obj_idx]->raw_mesh_bounding_box().size());
-                changed_box = true;
-            }
-            if (changed_box || !m_cache.instance.matches_instance(instance_idx) || !m_cache.scale.isApprox(100.0 * m_new_scale))
-                m_new_size = volume->get_instance_transformation().get_matrix(true, true) * m_cache.instance.box_size;
-        }
-        else
-            // this should never happen
-            m_new_size = Vec3d::Zero();
+
+        // Verify whether the instance rotation is multiples of 90 degrees, so that the scaling in world coordinates is possible.
+		if (m_world_coordinates && ! m_uniform_scale && 
+            ! Geometry::is_rotation_ninety_degrees(volume->get_instance_rotation())) {
+			// Manipulating an instance in the world coordinate system, rotation is not multiples of ninety degrees, therefore enforce uniform scaling.
+			m_uniform_scale = true;
+			m_lock_bnt->SetLock(true);
+		}
+
+        if (m_world_coordinates) {
+			m_new_rotate_label_string = L("Rotate");
+			m_new_rotation = Vec3d::Zero();
+			m_new_size     = selection.get_scaled_instance_bounding_box().size();
+			m_new_scale    = m_new_size.cwiseProduct(selection.get_unscaled_instance_bounding_box().size().cwiseInverse()) * 100.;
+		} else {
+			m_new_rotation = volume->get_instance_rotation() * (180. / M_PI);
+			m_new_size     = volume->get_instance_transformation().get_scaling_factor().cwiseProduct((*wxGetApp().model_objects())[volume->object_idx()]->raw_mesh_bounding_box().size());
+			m_new_scale    = volume->get_instance_scaling_factor() * 100.;
+		}
 
         m_new_enabled  = true;
     }
-    else if (selection.is_single_full_object())
+    else if (selection.is_single_full_object() && obj_list->is_selected(itObject))
     {
-        m_cache.instance.reset();
-
         const BoundingBoxf3& box = selection.get_bounding_box();
         m_new_position = box.center();
         m_new_rotation = Vec3d::Zero();
-        m_new_scale    = Vec3d(1.0, 1.0, 1.0);
+        m_new_scale    = Vec3d(100., 100., 100.);
         m_new_size     = box.size();
         m_new_rotate_label_string = L("Rotate");
 		m_new_scale_label_string  = L("Scale");
@@ -202,17 +327,15 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
     }
     else if (selection.is_single_modifier() || selection.is_single_volume())
     {
-        m_cache.instance.reset();
-
         // the selection contains a single volume
         const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
         m_new_position = volume->get_volume_offset();
-        m_new_rotation = volume->get_volume_rotation();
-        m_new_scale    = volume->get_volume_scaling_factor();
-        m_new_size = volume->get_volume_transformation().get_matrix(true, true) * volume->bounding_box.size();
+        m_new_rotation = volume->get_volume_rotation() * (180. / M_PI);
+        m_new_scale    = volume->get_volume_scaling_factor() * 100.;
+        m_new_size = volume->get_volume_transformation().get_scaling_factor().cwiseProduct(volume->bounding_box.size());
         m_new_enabled = true;
     }
-    else if (wxGetApp().obj_list()->multiple_selection())
+    else if (obj_list->multiple_selection() || obj_list->is_selected(itInstanceRoot))
     {
         reset_settings_value();
 		m_new_move_label_string   = L("Translate");
@@ -221,87 +344,51 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
         m_new_size = selection.get_bounding_box().size();
         m_new_enabled  = true;
     }
-    else
-        reset_settings_value();
-
-    m_dirty = true;
+	else {
+        // No selection, reset the cache.
+//		assert(selection.is_empty());
+		reset_settings_value();
+	}
 }
 
 void ObjectManipulation::update_if_dirty()
 {
-    if (!m_dirty)
+    if (! m_dirty)
         return;
 
-    if (m_cache.move_label_string != _(m_new_move_label_string)+ ":")
-    {
-        m_cache.move_label_string = _(m_new_move_label_string)+ ":";
-        m_move_Label->SetLabel(m_cache.move_label_string);
+    const Selection &selection = wxGetApp().plater()->canvas3D()->get_selection();
+    this->update_settings_value(selection);
+
+    auto update_label = [](wxString &label_cache, const std::string &new_label, wxStaticText *widget) {
+        wxString new_label_localized = _(new_label) + ":";
+        if (label_cache != new_label_localized) {
+            label_cache = new_label_localized;
+            widget->SetLabel(new_label_localized);
+        }
+    };
+    update_label(m_cache.move_label_string,   m_new_move_label_string,   m_move_Label);
+    update_label(m_cache.rotate_label_string, m_new_rotate_label_string, m_rotate_Label);
+    update_label(m_cache.scale_label_string,  m_new_scale_label_string,  m_scale_Label);
+
+    char axis[2] = "x";
+    for (int i = 0; i < 3; ++ i, ++ axis[0]) {
+        auto update = [this, i, &axis](Vec3d &cached, Vec3d &cached_rounded, const char *key, const Vec3d &new_value) {
+			wxString new_text = double_to_string(new_value(i), 2);
+			double new_rounded;
+			new_text.ToDouble(&new_rounded);
+			if (std::abs(cached_rounded(i) - new_rounded) > EPSILON) {
+				cached_rounded(i) = new_rounded;
+                m_og->set_value(std::string(key) + axis, new_text);
+            }
+			cached(i) = new_value(i);
+		};
+        update(m_cache.position, m_cache.position_rounded, "position_", m_new_position);
+        update(m_cache.scale,    m_cache.scale_rounded,    "scale_",    m_new_scale);
+        update(m_cache.size,     m_cache.size_rounded,     "size_",     m_new_size);
+        update(m_cache.rotation, m_cache.rotation_rounded, "rotation_", m_new_rotation);
     }
 
-    if (m_cache.rotate_label_string != _(m_new_rotate_label_string)+ ":")
-    {
-        m_cache.rotate_label_string = _(m_new_rotate_label_string)+ ":";
-        m_rotate_Label->SetLabel(m_cache.rotate_label_string);
-    }
-
-    if (m_cache.scale_label_string != _(m_new_scale_label_string)+ ":")
-    {
-        m_cache.scale_label_string = _(m_new_scale_label_string)+ ":";
-        m_scale_Label->SetLabel(m_cache.scale_label_string);
-    }
-
-    if (m_cache.position(0) != m_new_position(0))
-        m_og->set_value("position_x", double_to_string(m_new_position(0), 2));
-
-    if (m_cache.position(1) != m_new_position(1))
-        m_og->set_value("position_y", double_to_string(m_new_position(1), 2));
-
-    if (m_cache.position(2) != m_new_position(2))
-        m_og->set_value("position_z", double_to_string(m_new_position(2), 2));
-
-    m_cache.position = m_new_position;
-
-    auto scale = m_new_scale * 100.0;
-    if (m_cache.scale(0) != scale(0))
-        m_og->set_value("scale_x", double_to_string(scale(0), 2));
-
-    if (m_cache.scale(1) != scale(1))
-        m_og->set_value("scale_y", double_to_string(scale(1), 2));
-
-    if (m_cache.scale(2) != scale(2))
-        m_og->set_value("scale_z", double_to_string(scale(2), 2));
-
-    m_cache.scale = scale;
-
-    if (m_cache.size(0) != m_new_size(0))
-        m_og->set_value("size_x", double_to_string(m_new_size(0), 2));
-
-    if (m_cache.size(1) != m_new_size(1))
-        m_og->set_value("size_y", double_to_string(m_new_size(1), 2));
-
-    if (m_cache.size(2) != m_new_size(2))
-        m_og->set_value("size_z", double_to_string(m_new_size(2), 2));
-
-    m_cache.size = m_new_size;
-
-    Vec3d deg_rotation;
-    for (size_t i = 0; i < 3; ++i)
-    {
-        deg_rotation(i) = Geometry::rad2deg(m_new_rotation(i));
-    }
-
-    if ((m_cache.rotation(0) != m_new_rotation(0)) || (m_new_rotation(0) == 0.0))
-        m_og->set_value("rotation_x", double_to_string(deg_rotation(0), 2));
-
-    if ((m_cache.rotation(1) != m_new_rotation(1)) || (m_new_rotation(1) == 0.0))
-        m_og->set_value("rotation_y", double_to_string(deg_rotation(1), 2));
-
-    if ((m_cache.rotation(2) != m_new_rotation(2)) || (m_new_rotation(2) == 0.0))
-        m_og->set_value("rotation_z", double_to_string(deg_rotation(2), 2));
-
-    m_cache.rotation = deg_rotation;
-
-    if (wxGetApp().plater()->canvas3D()->get_selection().requires_uniform_scale()) {
+    if (selection.requires_uniform_scale()) {
         m_lock_bnt->SetLock(true);
         m_lock_bnt->Disable();
     }
@@ -310,6 +397,12 @@ void ObjectManipulation::update_if_dirty()
         m_lock_bnt->Enable();
     }
 
+    { 
+        int new_selection = m_world_coordinates ? 0 : 1; 
+        if (m_word_local_combo->GetSelection() != new_selection)
+            m_word_local_combo->SetSelection(new_selection);
+    }
+
     if (m_new_enabled)
         m_og->enable();
     else
@@ -335,19 +428,32 @@ void ObjectManipulation::emulate_kill_focus()
 }
 #endif // __APPLE__
 
+void ObjectManipulation::update_warning_icon_state(const wxString& tooltip)
+{
+    m_fix_throught_netfab_bitmap->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp());
+    m_fix_throught_netfab_bitmap->SetToolTip(tooltip);
+}
+
 void ObjectManipulation::reset_settings_value()
 {
     m_new_position = Vec3d::Zero();
     m_new_rotation = Vec3d::Zero();
-    m_new_scale = Vec3d::Ones();
+    m_new_scale = Vec3d::Ones() * 100.;
     m_new_size = Vec3d::Zero();
     m_new_enabled = false;
-    m_cache.instance.reset();
-    m_dirty = true;
+    // no need to set the dirty flag here as this method is called from update_settings_value(),
+    // which is called from update_if_dirty(), which resets the dirty flag anyways.
+//    m_dirty = true;
 }
 
-void ObjectManipulation::change_position_value(const Vec3d& position)
+void ObjectManipulation::change_position_value(int axis, double value)
 {
+    if (std::abs(m_cache.position_rounded(axis) - value) < EPSILON)
+        return;
+
+    Vec3d position = m_cache.position;
+    position(axis) = value;
+
     auto canvas = wxGetApp().plater()->canvas3D();
     Selection& selection = canvas->get_selection();
     selection.start_dragging();
@@ -355,141 +461,133 @@ void ObjectManipulation::change_position_value(const Vec3d& position)
     canvas->do_move();
 
     m_cache.position = position;
+	m_cache.position_rounded(axis) = DBL_MAX;
+    this->UpdateAndShow(true);
 }
 
-void ObjectManipulation::change_rotation_value(const Vec3d& rotation)
+void ObjectManipulation::change_rotation_value(int axis, double value)
 {
+    if (std::abs(m_cache.rotation_rounded(axis) - value) < EPSILON)
+        return;
+
+    Vec3d rotation = m_cache.rotation;
+    rotation(axis) = value;
+
     GLCanvas3D* canvas = wxGetApp().plater()->canvas3D();
-    const Selection& selection = canvas->get_selection();
+    Selection& selection = canvas->get_selection();
 
     TransformationType transformation_type(TransformationType::World_Relative_Joint);
     if (selection.is_single_full_instance() || selection.requires_local_axes())
 		transformation_type.set_independent();
-	if (selection.is_single_full_instance()) {
+	if (selection.is_single_full_instance() && ! m_world_coordinates) {
         //FIXME Selection::rotate() does not process absoulte rotations correctly: It does not recognize the axis index, which was changed.
 		// transformation_type.set_absolute();
 		transformation_type.set_local();
 	}
 
-    Vec3d rad_rotation;
-    for (size_t i = 0; i < 3; ++i)
-		rad_rotation(i) = Geometry::deg2rad((transformation_type.absolute()) ? rotation(i) : rotation(i) - m_cache.rotation(i));
-
-    canvas->get_selection().start_dragging();
-	canvas->get_selection().rotate(rad_rotation, transformation_type);
+    selection.start_dragging();
+	selection.rotate(
+		(M_PI / 180.0) * (transformation_type.absolute() ? rotation : rotation - m_cache.rotation), 
+		transformation_type);
     canvas->do_rotate();
 
     m_cache.rotation = rotation;
+	m_cache.rotation_rounded(axis) = DBL_MAX;
+	this->UpdateAndShow(true);
 }
 
-void ObjectManipulation::change_scale_value(const Vec3d& scale)
+void ObjectManipulation::change_scale_value(int axis, double value)
 {
-    Vec3d scaling_factor = scale;
-    const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
-    if (m_uniform_scale || selection.requires_uniform_scale())
-    {
-        Vec3d abs_scale_diff = (scale - m_cache.scale).cwiseAbs();
-        double max_diff = abs_scale_diff(X);
-        Axis max_diff_axis = X;
-        if (max_diff < abs_scale_diff(Y))
-        {
-            max_diff = abs_scale_diff(Y);
-            max_diff_axis = Y;
-        }
-        if (max_diff < abs_scale_diff(Z))
-        {
-            max_diff = abs_scale_diff(Z);
-            max_diff_axis = Z;
-        }
-        scaling_factor = scale(max_diff_axis) * Vec3d::Ones();
-    }
+    if (std::abs(m_cache.scale_rounded(axis) - value) < EPSILON)
+        return;
 
-    scaling_factor *= 0.01;
+    Vec3d scale = m_cache.scale;
+	scale(axis) = value;
 
-    auto canvas = wxGetApp().plater()->canvas3D();
-    canvas->get_selection().start_dragging();
-    canvas->get_selection().scale(scaling_factor, false);
-    canvas->do_scale();
-
-    if (!m_cache.scale.isApprox(scale))
-        m_cache.instance.instance_idx = -1;
+    this->do_scale(axis, scale);
 
     m_cache.scale = scale;
+	m_cache.scale_rounded(axis) = DBL_MAX;
+	this->UpdateAndShow(true);
 }
 
-void ObjectManipulation::change_size_value(const Vec3d& size)
+void ObjectManipulation::change_size_value(int axis, double value)
 {
+    if (std::abs(m_cache.size_rounded(axis) - value) < EPSILON)
+        return;
+
+    Vec3d size = m_cache.size;
+    size(axis) = value;
+
     const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
 
     Vec3d ref_size = m_cache.size;
-    if (selection.is_single_volume() || selection.is_single_modifier())
-    {
-        const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
-        ref_size = volume->bounding_box.size();
-    }
-    else if (selection.is_single_full_instance())
-        ref_size = m_cache.instance.box_size;
+	if (selection.is_single_volume() || selection.is_single_modifier())
+		ref_size = selection.get_volume(*selection.get_volume_idxs().begin())->bounding_box.size();
+	else if (selection.is_single_full_instance())
+		ref_size = m_world_coordinates ? 
+            selection.get_unscaled_instance_bounding_box().size() :
+            (*wxGetApp().model_objects())[selection.get_volume(*selection.get_volume_idxs().begin())->object_idx()]->raw_mesh_bounding_box().size();
 
-    Vec3d scale = 100.0 * Vec3d(size(0) / ref_size(0), size(1) / ref_size(1), size(2) / ref_size(2));
-    Vec3d scaling_factor = scale;
-
-    if (m_uniform_scale || selection.requires_uniform_scale())
-    {
-        Vec3d abs_scale_diff = (scale - m_cache.scale).cwiseAbs();
-        double max_diff = abs_scale_diff(X);
-        Axis max_diff_axis = X;
-        if (max_diff < abs_scale_diff(Y))
-        {
-            max_diff = abs_scale_diff(Y);
-            max_diff_axis = Y;
-        }
-        if (max_diff < abs_scale_diff(Z))
-        {
-            max_diff = abs_scale_diff(Z);
-            max_diff_axis = Z;
-        }
-        scaling_factor = scale(max_diff_axis) * Vec3d::Ones();
-    }
-
-    scaling_factor *= 0.01;
-
-    auto canvas = wxGetApp().plater()->canvas3D();
-    canvas->get_selection().start_dragging();
-    canvas->get_selection().scale(scaling_factor, false);
-    canvas->do_scale();
+    this->do_scale(axis, 100. * Vec3d(size(0) / ref_size(0), size(1) / ref_size(1), size(2) / ref_size(2)));
 
     m_cache.size = size;
+	m_cache.size_rounded(axis) = DBL_MAX;
+	this->UpdateAndShow(true);
 }
 
-void ObjectManipulation::on_change(const t_config_option_key& opt_key, const boost::any& value)
+void ObjectManipulation::do_scale(int axis, const Vec3d &scale) const
 {
-    // needed to hide the visual hints in 3D scene
-    wxGetApp().plater()->canvas3D()->handle_sidebar_focus_event(opt_key, false);
+    Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
+    Vec3d scaling_factor = scale;
+
+    TransformationType transformation_type(TransformationType::World_Relative_Joint);
+    if (selection.is_single_full_instance()) {
+        transformation_type.set_absolute();
+        if (! m_world_coordinates)
+            transformation_type.set_local();
+    }
+
+    if (m_uniform_scale || selection.requires_uniform_scale())
+        scaling_factor = scale(axis) * Vec3d::Ones();
+
+    selection.start_dragging();
+    selection.scale(scaling_factor * 0.01, transformation_type);
+    wxGetApp().plater()->canvas3D()->do_scale();
+}
+
+void ObjectManipulation::on_change(t_config_option_key opt_key, const boost::any& value)
+{
+    Field* field = m_og->get_field(opt_key);
+    bool enter_pressed = (field != nullptr) && field->get_enter_pressed();
+    if (!enter_pressed)
+    {
+        // if the change does not come from the user pressing the ENTER key
+        // we need to hide the visual hints in 3D scene
+        wxGetApp().plater()->canvas3D()->handle_sidebar_focus_event(opt_key, false);
+
 #ifndef __APPLE__
-    m_focused_option = "";
+        m_focused_option = "";
 #endif // __APPLE__
+    }
+    else
+        // if the change comes from the user pressing the ENTER key, restore the key state
+        field->set_enter_pressed(false);
 
     if (!m_cache.is_valid())
         return;
 
-    std::vector<std::string> axes{ "_x", "_y", "_z" };
+    int    axis      = opt_key.back() - 'x';
+    double new_value = boost::any_cast<double>(m_og->get_value(opt_key));
 
-    std::string param;
-    std::copy(opt_key.begin(), opt_key.end() - 2, std::back_inserter(param));
-
-    size_t i = 0;
-    Vec3d new_value;
-    for (auto axis : axes)
-        new_value(i++) = boost::any_cast<double>(m_og->get_value(param + axis));
-
-    if (param == "position")
-        change_position_value(new_value);
-    else if (param == "rotation")
-        change_rotation_value(new_value);
-    else if (param == "scale")
-        change_scale_value(new_value);
-    else if (param == "size")
-        change_size_value(new_value);
+    if (boost::starts_with(opt_key, "position_"))
+        change_position_value(axis, new_value);
+    else if (boost::starts_with(opt_key, "rotation_"))
+        change_rotation_value(axis, new_value);
+    else if (boost::starts_with(opt_key, "scale_"))
+        change_scale_value(axis, new_value);
+    else if (boost::starts_with(opt_key, "size_"))
+        change_size_value(axis, new_value);
 }
 
 void ObjectManipulation::on_fill_empty_value(const std::string& opt_key)
@@ -503,38 +601,73 @@ void ObjectManipulation::on_fill_empty_value(const std::string& opt_key)
     if (!m_cache.is_valid())
         return;
 
-    std::string param;
-    std::copy(opt_key.begin(), opt_key.end() - 2, std::back_inserter(param));
+    const Vec3d *vec = nullptr;
+    Vec3d       *rounded = nullptr;
+	if (boost::starts_with(opt_key, "position_")) {
+		vec = &m_cache.position;
+        rounded = &m_cache.position_rounded;
+    } else if (boost::starts_with(opt_key, "rotation_")) {
+		vec = &m_cache.rotation;
+        rounded = &m_cache.rotation_rounded;
+    } else if (boost::starts_with(opt_key, "scale_")) {
+		vec = &m_cache.scale;
+        rounded = &m_cache.scale_rounded;
+    } else if (boost::starts_with(opt_key, "size_")) {
+		vec = &m_cache.size;
+        rounded = &m_cache.size_rounded;
+    } else
+		assert(false);
 
-    double value = 0.0;
-
-    if (param == "position") {
-        int axis = opt_key.back() == 'x' ? 0 :
-            opt_key.back() == 'y' ? 1 : 2;
-
-        value = m_cache.position(axis);
+	if (vec != nullptr) {
+        int axis = opt_key.back() - 'x';
+        wxString new_text = double_to_string((*vec)(axis));
+		m_og->set_value(opt_key, new_text);
+		new_text.ToDouble(&(*rounded)(axis));
     }
-    else if (param == "rotation") {
-        int axis = opt_key.back() == 'x' ? 0 :
-            opt_key.back() == 'y' ? 1 : 2;
+}
 
-        value = m_cache.rotation(axis);
+void ObjectManipulation::set_uniform_scaling(const bool new_value)
+{ 
+    const Selection &selection = wxGetApp().plater()->canvas3D()->get_selection();
+	if (selection.is_single_full_instance() && m_world_coordinates && !new_value) {
+        // Verify whether the instance rotation is multiples of 90 degrees, so that the scaling in world coordinates is possible.
+        // all volumes in the selection belongs to the same instance, any of them contains the needed instance data, so we take the first one
+        const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
+        // Is the angle close to a multiple of 90 degrees?
+		if (! Geometry::is_rotation_ninety_degrees(volume->get_instance_rotation())) {
+            // Cannot apply scaling in the world coordinate system.
+			wxMessageDialog dlg(GUI::wxGetApp().mainframe,
+                _(L("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.")) + "\n" +
+                _(L("This operation is irreversible.\n"
+                    "Do you want to proceed?")),
+                SLIC3R_APP_NAME,
+				wxYES_NO | wxCANCEL | wxCANCEL_DEFAULT | wxICON_QUESTION);
+            if (dlg.ShowModal() != wxID_YES) {
+                // Enforce uniform scaling.
+                m_lock_bnt->SetLock(true);
+                return;
+            }
+            // Bake the rotation into the meshes of the object.
+            (*wxGetApp().model_objects())[volume->composite_id.object_id]->bake_xy_rotation_into_meshes(volume->composite_id.instance_id);
+            // Update the 3D scene, selections etc.
+            wxGetApp().plater()->update();
+            // Recalculate cached values at this panel, refresh the screen.
+            this->UpdateAndShow(true);
+        }
     }
-    else if (param == "scale") {
-        int axis = opt_key.back() == 'x' ? 0 :
-            opt_key.back() == 'y' ? 1 : 2;
+    m_uniform_scale = new_value;
+}
 
-        value = m_cache.scale(axis);
-    }
-    else if (param == "size") {
-        int axis = opt_key.back() == 'x' ? 0 :
-            opt_key.back() == 'y' ? 1 : 2;
+void ObjectManipulation::msw_rescale()
+{
+    msw_rescale_word_local_combo(m_word_local_combo);
+    m_manifold_warning_bmp.msw_rescale();
+    m_fix_throught_netfab_bitmap->SetBitmap(m_manifold_warning_bmp.bmp());
 
-        value = m_cache.size(axis);
-    }
-
-    m_og->set_value(opt_key, double_to_string(value));
+    get_og()->msw_rescale();
 }
 
 } //namespace GUI
-} //namespace Slic3r 
\ No newline at end of file
+} //namespace Slic3r 
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
index a5a180a56..7c359f3d7 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
@@ -6,8 +6,10 @@
 #include "GUI_ObjectSettings.hpp"
 #include "GLCanvas3D.hpp"
 
+class wxBitmapComboBox;
 class wxStaticText;
-class PrusaLockButton;
+class LockButton;
+class wxStaticBitmap;
 
 namespace Slic3r {
 namespace GUI {
@@ -19,41 +21,28 @@ class ObjectManipulation : public OG_Settings
     struct Cache
     {
         Vec3d position;
+        Vec3d position_rounded;
         Vec3d rotation;
+        Vec3d rotation_rounded;
         Vec3d scale;
+        Vec3d scale_rounded;
         Vec3d size;
+        Vec3d size_rounded;
 
-        std::string move_label_string;
-        std::string rotate_label_string;
-        std::string scale_label_string;
-
-        struct Instance
-        {
-            int object_idx;
-            int instance_idx;
-            Vec3d box_size;
-
-            Instance() { reset(); }
-            void reset() { this->object_idx = -1; this->instance_idx = -1; this->box_size = Vec3d::Zero(); }
-            void set(int object_idx, int instance_idx, const Vec3d& box_size) { this->object_idx = object_idx; this->instance_idx = instance_idx; this->box_size = box_size; }
-            bool matches(int object_idx, int instance_idx) const { return (this->object_idx == object_idx) && (this->instance_idx == instance_idx); }
-            bool matches_object(int object_idx) const { return (this->object_idx == object_idx); }
-            bool matches_instance(int instance_idx) const { return (this->instance_idx == instance_idx); }
-        };
-
-        Instance instance;
+        wxString move_label_string;
+        wxString rotate_label_string;
+        wxString scale_label_string;
 
         Cache() { reset(); }
         void reset()
         {
-            position = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
-            rotation = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
-            scale = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
-            size = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
-            move_label_string = "";
-            rotate_label_string = "";
-            scale_label_string = "";
-            instance.reset();
+            position = position_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
+            rotation = rotation_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
+            scale = scale_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
+            size = size_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
+            move_label_string = wxString();
+            rotate_label_string = wxString();
+            scale_label_string = wxString();
         }
         bool is_valid() const { return position != Vec3d(DBL_MAX, DBL_MAX, DBL_MAX); }
     };
@@ -76,7 +65,13 @@ class ObjectManipulation : public OG_Settings
     Vec3d           m_new_size;
     bool            m_new_enabled;
     bool            m_uniform_scale {true};
-    PrusaLockButton* m_lock_bnt{ nullptr };
+    // Does the object manipulation panel work in World or Local coordinates?
+    bool            m_world_coordinates = true;
+    LockButton*     m_lock_bnt{ nullptr };
+    wxBitmapComboBox* m_word_local_combo = nullptr;
+
+    ScalableBitmap  m_manifold_warning_bmp;
+    wxStaticBitmap* m_fix_throught_netfab_bitmap;
 
 #ifndef __APPLE__
     // Currently focused option name (empty if none)
@@ -91,13 +86,15 @@ public:
     bool        IsShown() override;
     void        UpdateAndShow(const bool show) override;
 
-    void        update_settings_value(const Selection& selection);
-
+    void        set_dirty() { m_dirty = true; }
 	// Called from the App to update the UI if dirty.
 	void		update_if_dirty();
 
-    void        set_uniform_scaling(const bool uniform_scale) { m_uniform_scale = uniform_scale;}
+    void        set_uniform_scaling(const bool uniform_scale);
     bool        get_uniform_scaling() const { return m_uniform_scale; }
+    // Does the object manipulation panel work in World or Local coordinates?
+    void        set_world_coordinates(const bool world_coordinates) { m_world_coordinates = world_coordinates; this->UpdateAndShow(true); }
+    bool        get_world_coordinates() const { return m_world_coordinates; }
 
     void reset_cache() { m_cache.reset(); }
 #ifndef __APPLE__
@@ -107,8 +104,12 @@ public:
     void emulate_kill_focus();
 #endif // __APPLE__
 
+    void update_warning_icon_state(const wxString& tooltip);
+    void msw_rescale();
+
 private:
     void reset_settings_value();
+    void update_settings_value(const Selection& selection);
 
     // update size values after scale unit changing or "gizmos"
     void update_size_value(const Vec3d& size);
@@ -116,12 +117,13 @@ private:
     void update_rotation_value(const Vec3d& rotation);
 
     // change values 
-    void    change_position_value(const Vec3d& position);
-    void    change_rotation_value(const Vec3d& rotation);
-    void    change_scale_value(const Vec3d& scale);
-    void    change_size_value(const Vec3d& size);
+    void change_position_value(int axis, double value);
+    void change_rotation_value(int axis, double value);
+    void change_scale_value(int axis, double value);
+    void change_size_value(int axis, double value);
+    void do_scale(int axis, const Vec3d &scale) const;
 
-    void on_change(const t_config_option_key& opt_key, const boost::any& value);
+    void on_change(t_config_option_key opt_key, const boost::any& value);
     void on_fill_empty_value(const std::string& opt_key);
 };
 
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp
index dbfdb8e6c..4107e872a 100644
--- a/src/slic3r/GUI/GUI_ObjectSettings.cpp
+++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp
@@ -59,6 +59,8 @@ ObjectSettings::ObjectSettings(wxWindow* parent) :
 
     m_settings_list_sizer = new wxBoxSizer(wxVERTICAL);
     m_og->sizer->Add(m_settings_list_sizer, 1, wxEXPAND | wxLEFT, 5);
+
+    m_bmp_delete = ScalableBitmap(parent, "cross");
 }
 
 void ObjectSettings::update_settings_list()
@@ -77,15 +79,13 @@ void ObjectSettings::update_settings_list()
 		{
 			auto opt_key = (line.get_options())[0].opt_id;  //we assume that we have one option per line
 
-// 			auto btn = new wxBitmapButton(parent, wxID_ANY, wxBitmap(from_u8(var("colorchange_delete_on.png")), wxBITMAP_TYPE_PNG),
-			auto btn = new wxBitmapButton(parent, wxID_ANY, create_scaled_bitmap("colorchange_delete_on.png"),
-				wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
-#ifdef __WXMSW__
-            btn->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-#endif // __WXMSW__
+			auto btn = new ScalableButton(parent, wxID_ANY, m_bmp_delete);
+            btn->SetToolTip(_(L("Remove parameter")));
+
 			btn->Bind(wxEVT_BUTTON, [opt_key, config, this](wxEvent &event) {
 				config->erase(opt_key);
-                wxTheApp->CallAfter([this]() { 
+                wxGetApp().obj_list()->changed_object();
+                wxTheApp->CallAfter([this]() {
                     wxWindowUpdateLocker noUpdates(m_parent);
                     update_settings_list(); 
                     m_parent->Layout(); 
@@ -122,23 +122,35 @@ void ObjectSettings::update_settings_list()
                 if (cat.second.size() == 1 && cat.second[0] == "extruder")
                     continue;
 
-                auto optgroup = std::make_shared<ConfigOptionsGroup>(m_og->ctrl_parent(), cat.first, config, false, extra_column);
-                optgroup->label_width = 15 * wxGetApp().em_unit();//150;
-                optgroup->sidetext_width = 7 * wxGetApp().em_unit();//70;
+                auto optgroup = std::make_shared<ConfigOptionsGroup>(m_og->ctrl_parent(), _(cat.first), config, false, extra_column);
+                optgroup->label_width = 15;
+                optgroup->sidetext_width = 5.5;
 
                 optgroup->m_on_change = [](const t_config_option_key& opt_id, const boost::any& value) {
-                                        wxGetApp().obj_list()->part_settings_changed(); };
+                                        wxGetApp().obj_list()->changed_object(); };
 
+                const bool is_extriders_cat = cat.first == "Extruders";
                 for (auto& opt : cat.second)
                 {
                     if (opt == "extruder")
                         continue;
                     Option option = optgroup->get_option(opt);
-                    option.opt.width = 7 * wxGetApp().em_unit();//70;
+                    option.opt.width = 12;
+                    if (is_extriders_cat)
+                        option.opt.max = wxGetApp().extruders_cnt();
                     optgroup->append_single_option_line(option);
                 }
                 optgroup->reload_config();
                 m_settings_list_sizer->Add(optgroup->sizer, 0, wxEXPAND | wxALL, 0);
+
+                // call back for rescaling of the extracolumn control
+                optgroup->rescale_extra_column_item = [this](wxWindow* win) {
+                    auto *ctrl = dynamic_cast<ScalableButton*>(win);
+                    if (ctrl == nullptr)
+                        return;
+                    ctrl->SetBitmap_(m_bmp_delete);
+                };
+
                 m_og_settings.push_back(optgroup);
 
                 categories.push_back(cat.first);
@@ -163,5 +175,13 @@ void ObjectSettings::UpdateAndShow(const bool show)
     OG_Settings::UpdateAndShow(show);
 }
 
+void ObjectSettings::msw_rescale()
+{
+    m_bmp_delete.msw_rescale();
+
+    for (auto group : m_og_settings)
+        group->msw_rescale();
+}
+
 } //namespace GUI
 } //namespace Slic3r 
\ No newline at end of file
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.hpp b/src/slic3r/GUI/GUI_ObjectSettings.hpp
index 12115e208..3d49f13b7 100644
--- a/src/slic3r/GUI/GUI_ObjectSettings.hpp
+++ b/src/slic3r/GUI/GUI_ObjectSettings.hpp
@@ -4,6 +4,7 @@
 #include <memory>
 #include <vector>
 #include <wx/panel.h>
+#include "wxExtensions.hpp"
 
 class wxBoxSizer;
 
@@ -37,12 +38,15 @@ class ObjectSettings : public OG_Settings
     // option groups for settings
     std::vector <std::shared_ptr<ConfigOptionsGroup>> m_og_settings;
 
+    ScalableBitmap m_bmp_delete;
+
 public:
     ObjectSettings(wxWindow* parent);
     ~ObjectSettings() {}
 
     void        update_settings_list();
     void        UpdateAndShow(const bool show) override;
+    void        msw_rescale();
 };
 
 }}
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index 2361ff6d3..c9228d085 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -27,7 +27,7 @@
 namespace Slic3r {
 namespace GUI {
 
-    View3D::View3D(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process)
+View3D::View3D(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process)
     : m_canvas_widget(nullptr)
     , m_canvas(nullptr)
 {
@@ -62,6 +62,7 @@ bool View3D::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_
     m_canvas->set_process(process);
     m_canvas->set_config(config);
     m_canvas->enable_gizmos(true);
+    m_canvas->enable_selection(true);
     m_canvas->enable_toolbar(true);
 
     wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
@@ -98,6 +99,12 @@ void View3D::select_all()
         m_canvas->select_all();
 }
 
+void View3D::deselect_all()
+{
+    if (m_canvas != nullptr)
+        m_canvas->deselect_all();
+}
+
 void View3D::delete_selected()
 {
     if (m_canvas != nullptr)
@@ -154,7 +161,9 @@ void View3D::render()
         m_canvas->set_as_dirty();
 }
 
-Preview::Preview(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, DynamicPrintConfig* config, BackgroundSlicingProcess* process, GCodePreviewData* gcode_preview_data, std::function<void()> schedule_background_process_func)
+Preview::Preview(
+    wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model, DynamicPrintConfig* config, 
+    BackgroundSlicingProcess* process, GCodePreviewData* gcode_preview_data, std::function<void()> schedule_background_process_func)
     : m_canvas_widget(nullptr)
     , m_canvas(nullptr)
     , m_double_slider_sizer(nullptr)
@@ -178,14 +187,14 @@ Preview::Preview(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_t
     , m_volumes_cleanup_required(false)
 #endif // __linux__
 {
-    if (init(parent, bed, camera, view_toolbar))
+    if (init(parent, bed, camera, view_toolbar, model))
     {
         show_hide_ui_elements("none");
         load_print();
     }
 }
 
-bool Preview::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar)
+bool Preview::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model)
 {
     if (!Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 /* disable wxTAB_TRAVERSAL */))
         return false;
@@ -195,6 +204,7 @@ bool Preview::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view
     m_canvas = _3DScene::get_canvas(this->m_canvas_widget);
     m_canvas->allow_multisample(GLCanvas3DManager::can_multisample());
     m_canvas->set_config(m_config);
+    m_canvas->set_model(model);
     m_canvas->set_process(m_process);
     m_canvas->enable_legend_texture(true);
     m_canvas->enable_dynamic_background(true);
@@ -392,6 +402,18 @@ void Preview::refresh_print()
     load_print(true);
 }
 
+void Preview::msw_rescale()
+{
+    // rescale slider
+    if (m_slider) m_slider->msw_rescale();
+
+    // rescale warning legend on the canvas
+    get_canvas3d()->msw_rescale();
+
+    // rescale legend
+    refresh_print();
+}
+
 void Preview::bind_event_handlers()
 {
     this->Bind(wxEVT_SIZE, &Preview::on_size, this);
@@ -503,7 +525,7 @@ void Preview::on_checkbox_shells(wxCommandEvent& evt)
 
 void Preview::create_double_slider()
 {
-    m_slider = new PrusaDoubleSlider(this, wxID_ANY, 0, 0, 0, 100);
+    m_slider = new DoubleSlider(this, wxID_ANY, 0, 0, 0, 100);
     m_double_slider_sizer->Add(m_slider, 0, wxEXPAND, 0);
 
     // sizer, m_canvas_widget
@@ -772,15 +794,16 @@ void Preview::load_print_as_sla()
     std::vector<double> zs;
     double initial_layer_height = print->material_config().initial_layer_height.value;
     for (const SLAPrintObject* obj : print->objects())
-        if (obj->is_step_done(slaposIndexSlices))
+        if (obj->is_step_done(slaposSliceSupports) && !obj->get_slice_index().empty())
         {
-            auto slicerecords = obj->get_slice_records();
-            auto low_coord = slicerecords.begin()->key();
-            for (auto& rec : slicerecords)
-                zs.emplace_back(initial_layer_height + (rec.key() - low_coord) * SCALING_FACTOR);
+            auto low_coord = obj->get_slice_index().front().print_level();
+            for (auto& rec : obj->get_slice_index())
+                zs.emplace_back(initial_layer_height + (rec.print_level() - low_coord) * SCALING_FACTOR);
         }
     sort_remove_duplicates(zs);
 
+    m_canvas->reset_clipping_planes_cache();
+
     n_layers = (unsigned int)zs.size();
     if (n_layers == 0)
     {
@@ -813,8 +836,8 @@ void Preview::on_sliders_scroll_changed(wxEvent& event)
         }
         else if (tech == ptSLA)
         {
-            m_canvas->set_clipping_plane(0, GLCanvas3D::ClippingPlane(Vec3d::UnitZ(), -m_slider->GetLowerValueD()));
-            m_canvas->set_clipping_plane(1, GLCanvas3D::ClippingPlane(-Vec3d::UnitZ(), m_slider->GetHigherValueD()));
+            m_canvas->set_clipping_plane(0, ClippingPlane(Vec3d::UnitZ(), -m_slider->GetLowerValueD()));
+            m_canvas->set_clipping_plane(1, ClippingPlane(-Vec3d::UnitZ(), m_slider->GetHigherValueD()));
             m_canvas->set_use_clipping_planes(m_slider->GetHigherValue() != 0);
             m_canvas_widget->Refresh();
         }
diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp
index 96c49e54f..b70d01fa4 100644
--- a/src/slic3r/GUI/GUI_Preview.hpp
+++ b/src/slic3r/GUI/GUI_Preview.hpp
@@ -13,7 +13,7 @@ class wxStaticText;
 class wxChoice;
 class wxComboCtrl;
 class wxCheckBox;
-class PrusaDoubleSlider;
+class DoubleSlider;
 
 namespace Slic3r {
 
@@ -47,6 +47,7 @@ public:
 
     void select_view(const std::string& direction);
     void select_all();
+    void deselect_all();
     void delete_selected();
     void mirror_selection(Axis axis);
 
@@ -99,10 +100,11 @@ class Preview : public wxPanel
     bool m_loaded;
     bool m_enabled;
 
-    PrusaDoubleSlider* m_slider {nullptr};
+    DoubleSlider* m_slider {nullptr};
 
 public:
-    Preview(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, DynamicPrintConfig* config, BackgroundSlicingProcess* process, GCodePreviewData* gcode_preview_data, std::function<void()> schedule_background_process = [](){});
+    Preview(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model, DynamicPrintConfig* config, 
+        BackgroundSlicingProcess* process, GCodePreviewData* gcode_preview_data, std::function<void()> schedule_background_process = [](){});
     virtual ~Preview();
 
     wxGLCanvas* get_wxglcanvas() { return m_canvas_widget; }
@@ -119,8 +121,10 @@ public:
     void reload_print(bool keep_volumes = false);
     void refresh_print();
 
+    void msw_rescale();
+
 private:
-    bool init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar);
+    bool init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model);
 
     void bind_event_handlers();
     void unbind_event_handlers();
diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp
index 56d6eaeb5..754e69351 100644
--- a/src/slic3r/GUI/GUI_Utils.cpp
+++ b/src/slic3r/GUI/GUI_Utils.cpp
@@ -4,9 +4,14 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
 #include <wx/toplevel.h>
 #include <wx/sizer.h>
 #include <wx/checkbox.h>
+#include <wx/dcclient.h>
 
 #include "libslic3r/Config.hpp"
 
@@ -48,6 +53,66 @@ void on_window_geometry(wxTopLevelWindow *tlw, std::function<void()> callback)
 #endif
 }
 
+wxDEFINE_EVENT(EVT_DPI_CHANGED, DpiChangedEvent);
+
+#ifdef _WIN32
+template<class F> typename F::FN winapi_get_function(const wchar_t *dll, const char *fn_name) {
+    static HINSTANCE dll_handle = LoadLibraryExW(dll, nullptr, 0);
+
+    if (dll_handle == nullptr) { return nullptr; }
+    return (F::FN)GetProcAddress(dll_handle, fn_name);
+}
+#endif
+
+// If called with nullptr, a DPI for the primary monitor is returned.
+int get_dpi_for_window(wxWindow *window)
+{
+#ifdef _WIN32
+    enum MONITOR_DPI_TYPE_ {
+        // This enum is inlined here to avoid build-time dependency
+        MDT_EFFECTIVE_DPI_ = 0,
+        MDT_ANGULAR_DPI_ = 1,
+        MDT_RAW_DPI_ = 2,
+        MDT_DEFAULT_ = MDT_EFFECTIVE_DPI_,
+    };
+
+    // Need strong types for winapi_get_function() to work
+    struct GetDpiForWindow_t { typedef HRESULT (WINAPI *FN)(HWND hwnd); };
+    struct GetDpiForMonitor_t { typedef HRESULT (WINAPI *FN)(HMONITOR hmonitor, MONITOR_DPI_TYPE_ dpiType, UINT *dpiX, UINT *dpiY); };
+
+    static auto GetDpiForWindow_fn = winapi_get_function<GetDpiForWindow_t>(L"User32.dll", "GetDpiForWindow");
+    static auto GetDpiForMonitor_fn = winapi_get_function<GetDpiForMonitor_t>(L"Shcore.dll", "GetDpiForMonitor");
+
+	// Desktop Window is the window of the primary monitor.
+	const HWND hwnd = (window == nullptr) ? ::GetDesktopWindow() : window->GetHandle();
+
+    if (GetDpiForWindow_fn != nullptr) {
+        // We're on Windows 10, we have per-screen DPI settings
+        return GetDpiForWindow_fn(hwnd);
+    } else if (GetDpiForMonitor_fn != nullptr) {
+        // We're on Windows 8.1, we have per-system DPI
+        // Note: MonitorFromWindow() is available on all Windows.
+
+        const HMONITOR monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+        UINT dpiX;
+        UINT dpiY;
+        return GetDpiForMonitor_fn(monitor, MDT_EFFECTIVE_DPI_, &dpiX, &dpiY) == S_OK ? dpiX : DPI_DEFAULT;
+    } else {
+        // We're on Windows earlier than 8.1, use DC
+
+        const HDC hdc = GetDC(hwnd);
+        if (hdc == NULL) { return DPI_DEFAULT; }
+        return GetDeviceCaps(hdc, LOGPIXELSX);
+    }
+#elif defined __linux__
+    // TODO
+    return DPI_DEFAULT;
+#elif defined __APPLE__
+    // TODO
+    return DPI_DEFAULT;
+#endif
+}
+
 
 CheckboxFileDialog::ExtraPanel::ExtraPanel(wxWindow *parent)
     : wxPanel(parent, wxID_ANY)
diff --git a/src/slic3r/GUI/GUI_Utils.hpp b/src/slic3r/GUI/GUI_Utils.hpp
index d84dd40f9..8cefb68d0 100644
--- a/src/slic3r/GUI/GUI_Utils.hpp
+++ b/src/slic3r/GUI/GUI_Utils.hpp
@@ -8,11 +8,15 @@
 
 #include <boost/optional.hpp>
 
+#include <wx/frame.h>
+#include <wx/dialog.h>
 #include <wx/event.h>
 #include <wx/filedlg.h>
 #include <wx/gdicmn.h>
 #include <wx/panel.h>
+#include <wx/dcclient.h>
 #include <wx/debug.h>
+#include <wx/settings.h>
 
 class wxCheckBox;
 class wxTopLevelWindow;
@@ -27,6 +31,155 @@ wxTopLevelWindow* find_toplevel_parent(wxWindow *window);
 
 void on_window_geometry(wxTopLevelWindow *tlw, std::function<void()> callback);
 
+enum { DPI_DEFAULT = 96 };
+
+int get_dpi_for_window(wxWindow *window);
+
+struct DpiChangedEvent : public wxEvent {
+    int dpi;
+    wxRect rect;
+
+    DpiChangedEvent(wxEventType eventType, int dpi, wxRect rect)
+        : wxEvent(0, eventType), dpi(dpi), rect(rect)
+    {}
+
+    virtual wxEvent *Clone() const
+    {
+        return new DpiChangedEvent(*this);
+    }
+};
+
+wxDECLARE_EVENT(EVT_DPI_CHANGED, DpiChangedEvent);
+
+template<class P> class DPIAware : public P
+{
+public:
+    DPIAware(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos=wxDefaultPosition,
+        const wxSize &size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE, const wxString &name=wxFrameNameStr)
+        : P(parent, id, title, pos, size, style, name)
+    {
+        m_scale_factor = (float)get_dpi_for_window(this) / (float)DPI_DEFAULT;
+        m_prev_scale_factor = m_scale_factor;
+		float scale_primary_display = (float)get_dpi_for_window(nullptr) / (float)DPI_DEFAULT;
+		m_normal_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+		if (std::abs(m_scale_factor - scale_primary_display) > 1e-6)
+			m_normal_font = m_normal_font.Scale(m_scale_factor / scale_primary_display);
+
+        // An analog of em_unit value from GUI_App.
+        m_em_unit = std::max<size_t>(10, 10 * m_scale_factor);
+
+//        recalc_font();
+
+        this->Bind(EVT_DPI_CHANGED, [this](const DpiChangedEvent &evt) {
+            m_scale_factor = (float)evt.dpi / (float)DPI_DEFAULT;
+
+            if (!m_can_rescale)
+                return;
+
+            if (is_new_scale_factor())
+                rescale(evt.rect);
+        });
+
+        this->Bind(wxEVT_MOVE_START, [this](wxMoveEvent& event)
+        {
+            event.Skip();
+
+            // Suppress application rescaling, when a MainFrame moving is not ended
+            m_can_rescale = false;
+        });
+
+        this->Bind(wxEVT_MOVE_END, [this](wxMoveEvent& event)
+        {
+            event.Skip();
+
+            m_can_rescale = is_new_scale_factor();
+
+            // If scale factor is different after moving of MainFrame ...
+            if (m_can_rescale)
+                // ... rescale application
+                rescale(event.GetRect());
+            else
+            // set value to _true_ in purpose of possibility of a display dpi changing from System Settings
+                m_can_rescale = true;
+        });
+    }
+
+    virtual ~DPIAware() {}
+
+    float   scale_factor() const        { return m_scale_factor; }
+    float   prev_scale_factor() const   { return m_prev_scale_factor; }
+
+    int     em_unit() const             { return m_em_unit; }
+//    int     font_size() const           { return m_font_size; }
+    const wxFont& normal_font() const   { return m_normal_font; }
+
+protected:
+    virtual void on_dpi_changed(const wxRect &suggested_rect) = 0;
+
+private:
+    float m_scale_factor;
+    int m_em_unit;
+//    int m_font_size;
+
+    wxFont m_normal_font;
+    float m_prev_scale_factor;
+    bool  m_can_rescale{ true };
+
+//    void recalc_font()
+//    {
+//        wxClientDC dc(this);
+//        const auto metrics = dc.GetFontMetrics();
+//        m_font_size = metrics.height;
+//         m_em_unit = metrics.averageWidth;
+//    }
+
+    // check if new scale is differ from previous
+    bool    is_new_scale_factor() const { return fabs(m_scale_factor - m_prev_scale_factor) > 0.001; }
+
+    // recursive function for scaling fonts for all controls in Window
+    void    scale_controls_fonts(wxWindow *window, const float scale_f)
+    {
+        auto children = window->GetChildren();
+
+        for (auto child : children) {
+            scale_controls_fonts(child, scale_f);
+            child->SetFont(child->GetFont().Scaled(scale_f));
+        }
+
+        window->Layout();
+    }
+
+    void    rescale(const wxRect &suggested_rect)
+    {
+        this->Freeze();
+        const float relative_scale_factor = m_scale_factor / m_prev_scale_factor;
+
+        // rescale fonts of all controls
+        scale_controls_fonts(this, relative_scale_factor);
+        this->SetFont(this->GetFont().Scaled(relative_scale_factor));
+
+
+        // rescale normal_font value
+        m_normal_font = m_normal_font.Scaled(relative_scale_factor);
+
+        // An analog of em_unit value from GUI_App.
+        m_em_unit = std::max<size_t>(10, 10 * m_scale_factor);
+
+        // rescale missed controls sizes and images
+        on_dpi_changed(suggested_rect);
+
+        this->Layout();
+        this->Thaw();
+
+        // reset previous scale factor from current scale factor value
+        m_prev_scale_factor = m_scale_factor;
+    }
+
+};
+
+typedef DPIAware<wxFrame> DPIFrame;
+typedef DPIAware<wxDialog> DPIDialog;
+
 
 class EventGuard
 {
@@ -103,7 +256,7 @@ public:
     }
 
     void unbind() { event_storage.reset(nullptr); }
-    explicit operator bool() const noexcept { return !!event_storage; }
+    explicit operator bool() const { return !!event_storage; }
 };
 
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
index 1e12674ec..030bd0146 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
@@ -1,4 +1,5 @@
 #include "GLGizmoBase.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
 
 #include <GL/glew.h>
 
@@ -15,7 +16,7 @@
 namespace Slic3r {
 namespace GUI {
 
-const float GLGizmoBase::Grabber::SizeFactor = 0.025f;
+const float GLGizmoBase::Grabber::SizeFactor = 0.05f;
 const float GLGizmoBase::Grabber::MinHalfSize = 1.5f;
 const float GLGizmoBase::Grabber::DraggingScaleFactor = 1.25f;
 
@@ -52,7 +53,7 @@ float GLGizmoBase::Grabber::get_half_size(float size) const
 
 float GLGizmoBase::Grabber::get_dragging_half_size(float size) const
 {
-    return std::max(size * SizeFactor * DraggingScaleFactor, MinHalfSize);
+    return get_half_size(size) * DraggingScaleFactor;
 }
 
 void GLGizmoBase::Grabber::render(float size, const float* render_color, bool use_lighting) const
@@ -60,62 +61,62 @@ void GLGizmoBase::Grabber::render(float size, const float* render_color, bool us
     float half_size = dragging ? get_dragging_half_size(size) : get_half_size(size);
 
     if (use_lighting)
-        ::glEnable(GL_LIGHTING);
+        glsafe(::glEnable(GL_LIGHTING));
 
-    ::glColor3fv(render_color);
+    glsafe(::glColor3fv(render_color));
 
-    ::glPushMatrix();
-    ::glTranslated(center(0), center(1), center(2));
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslated(center(0), center(1), center(2)));
 
-    ::glRotated(Geometry::rad2deg(angles(2)), 0.0, 0.0, 1.0);
-    ::glRotated(Geometry::rad2deg(angles(1)), 0.0, 1.0, 0.0);
-    ::glRotated(Geometry::rad2deg(angles(0)), 1.0, 0.0, 0.0);
+    glsafe(::glRotated(Geometry::rad2deg(angles(2)), 0.0, 0.0, 1.0));
+    glsafe(::glRotated(Geometry::rad2deg(angles(1)), 0.0, 1.0, 0.0));
+    glsafe(::glRotated(Geometry::rad2deg(angles(0)), 1.0, 0.0, 0.0));
 
     // face min x
-    ::glPushMatrix();
-    ::glTranslatef(-(GLfloat)half_size, 0.0f, 0.0f);
-    ::glRotatef(-90.0f, 0.0f, 1.0f, 0.0f);
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslatef(-(GLfloat)half_size, 0.0f, 0.0f));
+    glsafe(::glRotatef(-90.0f, 0.0f, 1.0f, 0.0f));
     render_face(half_size);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     // face max x
-    ::glPushMatrix();
-    ::glTranslatef((GLfloat)half_size, 0.0f, 0.0f);
-    ::glRotatef(90.0f, 0.0f, 1.0f, 0.0f);
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslatef((GLfloat)half_size, 0.0f, 0.0f));
+    glsafe(::glRotatef(90.0f, 0.0f, 1.0f, 0.0f));
     render_face(half_size);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     // face min y
-    ::glPushMatrix();
-    ::glTranslatef(0.0f, -(GLfloat)half_size, 0.0f);
-    ::glRotatef(90.0f, 1.0f, 0.0f, 0.0f);
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslatef(0.0f, -(GLfloat)half_size, 0.0f));
+    glsafe(::glRotatef(90.0f, 1.0f, 0.0f, 0.0f));
     render_face(half_size);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     // face max y
-    ::glPushMatrix();
-    ::glTranslatef(0.0f, (GLfloat)half_size, 0.0f);
-    ::glRotatef(-90.0f, 1.0f, 0.0f, 0.0f);
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslatef(0.0f, (GLfloat)half_size, 0.0f));
+    glsafe(::glRotatef(-90.0f, 1.0f, 0.0f, 0.0f));
     render_face(half_size);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     // face min z
-    ::glPushMatrix();
-    ::glTranslatef(0.0f, 0.0f, -(GLfloat)half_size);
-    ::glRotatef(180.0f, 1.0f, 0.0f, 0.0f);
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslatef(0.0f, 0.0f, -(GLfloat)half_size));
+    glsafe(::glRotatef(180.0f, 1.0f, 0.0f, 0.0f));
     render_face(half_size);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     // face max z
-    ::glPushMatrix();
-    ::glTranslatef(0.0f, 0.0f, (GLfloat)half_size);
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslatef(0.0f, 0.0f, (GLfloat)half_size));
     render_face(half_size);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     if (use_lighting)
-        ::glDisable(GL_LIGHTING);
+        glsafe(::glDisable(GL_LIGHTING));
 }
 
 void GLGizmoBase::Grabber::render_face(float half_size) const
@@ -128,7 +129,7 @@ void GLGizmoBase::Grabber::render_face(float half_size) const
     ::glVertex3f((GLfloat)half_size, (GLfloat)half_size, 0.0f);
     ::glVertex3f(-(GLfloat)half_size, (GLfloat)half_size, 0.0f);
     ::glVertex3f(-(GLfloat)half_size, -(GLfloat)half_size, 0.0f);
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
 #if ENABLE_SVG_ICONS
@@ -231,13 +232,7 @@ std::array<float, 3> GLGizmoBase::picking_color_component(unsigned int id) const
 
 void GLGizmoBase::render_grabbers(const BoundingBoxf3& box) const
 {
-    float size = (float)box.max_size();
-
-    for (int i = 0; i < (int)m_grabbers.size(); ++i)
-    {
-        if (m_grabbers[i].enabled)
-            m_grabbers[i].render((m_hover_id == i), size);
-    }
+    render_grabbers((float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0));
 }
 
 void GLGizmoBase::render_grabbers(float size) const
@@ -251,7 +246,7 @@ void GLGizmoBase::render_grabbers(float size) const
 
 void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const
 {
-    float size = (float)box.max_size();
+    float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0);
 
     for (unsigned int i = 0; i < (unsigned int)m_grabbers.size(); ++i)
     {
@@ -261,7 +256,7 @@ void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const
             m_grabbers[i].color[0] = color[0];
             m_grabbers[i].color[1] = color[1];
             m_grabbers[i].color[2] = color[2];
-            m_grabbers[i].render_for_picking(size);
+            m_grabbers[i].render_for_picking(mean_size);
         }
     }
 }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
index b70c1f8df..a29aaed3f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
@@ -3,7 +3,6 @@
 
 #include "libslic3r/Point.hpp"
 
-#include "slic3r/GUI/GLCanvas3D.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/Selection.hpp"
 
@@ -24,7 +23,8 @@ namespace GUI {
 static const float DEFAULT_BASE_COLOR[3] = { 0.625f, 0.625f, 0.625f };
 static const float DEFAULT_DRAG_COLOR[3] = { 1.0f, 1.0f, 1.0f };
 static const float DEFAULT_HIGHLIGHT_COLOR[3] = { 1.0f, 0.38f, 0.0f };
-static const float AXES_COLOR[3][3] = { { 1.0f, 0.0f, 0.0f }, { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 1.0f } };
+static const float AXES_COLOR[3][3] = { { 0.75f, 0.0f, 0.0f }, { 0.0f, 0.75f, 0.0f }, { 0.0f, 0.0f, 0.75f } };
+static const float CONSTRAINED_COLOR[3] = { 0.5f, 0.5f, 0.5f };
 
 
 
@@ -77,10 +77,9 @@ public:
     {
         const Linef3 mouse_ray;
         const Point* mouse_pos;
-        bool shift_down;
 
-        UpdateData(const Linef3& mouse_ray, const Point* mouse_pos = nullptr, bool shift_down = false)
-            : mouse_ray(mouse_ray), mouse_pos(mouse_pos), shift_down(shift_down)
+        UpdateData(const Linef3& mouse_ray, const Point* mouse_pos = nullptr)
+            : mouse_ray(mouse_ray), mouse_pos(mouse_pos)
         {}
     };
 
@@ -142,6 +141,7 @@ public:
 
     void start_dragging(const Selection& selection);
     void stop_dragging();
+
     bool is_dragging() const { return m_dragging; }
 
     void update(const UpdateData& data, const Selection& selection);
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index e228706c0..8934bc52b 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -1,5 +1,6 @@
 // Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
 #include "GLGizmoCut.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
 
 #include <GL/glew.h>
 
@@ -15,12 +16,6 @@ namespace Slic3r {
 namespace GUI {
 
 
-
-
-
-
-// GLGizmoCut
-
 class GLGizmoCutPanel : public wxPanel
 {
 public:
@@ -90,7 +85,7 @@ bool GLGizmoCut::on_init()
 
 std::string GLGizmoCut::on_get_name() const
 {
-    return L("Cut [C]");
+    return (_(L("Cut")) + " [C]").ToUTF8().data();
 }
 
 void GLGizmoCut::on_set_state()
@@ -141,10 +136,10 @@ void GLGizmoCut::on_render(const Selection& selection) const
     const float max_x = box.max(0) + Margin;
     const float min_y = box.min(1) - Margin;
     const float max_y = box.max(1) + Margin;
-    ::glEnable(GL_DEPTH_TEST);
-    ::glDisable(GL_CULL_FACE);
-    ::glEnable(GL_BLEND);
-    ::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glsafe(::glEnable(GL_DEPTH_TEST));
+    glsafe(::glDisable(GL_CULL_FACE));
+    glsafe(::glEnable(GL_BLEND));
+    glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
 
     // Draw the cutting plane
     ::glBegin(GL_QUADS);
@@ -153,10 +148,10 @@ void GLGizmoCut::on_render(const Selection& selection) const
     ::glVertex3f(max_x, min_y, plane_center(2));
     ::glVertex3f(max_x, max_y, plane_center(2));
     ::glVertex3f(min_x, max_y, plane_center(2));
-    ::glEnd();
+    glsafe(::glEnd());
 
-    ::glEnable(GL_CULL_FACE);
-    ::glDisable(GL_BLEND);
+    glsafe(::glEnable(GL_CULL_FACE));
+    glsafe(::glDisable(GL_BLEND));
 
     // TODO: draw cut part contour?
 
@@ -164,32 +159,35 @@ void GLGizmoCut::on_render(const Selection& selection) const
     m_grabbers[0].center = plane_center;
     m_grabbers[0].center(2) = plane_center(2) + Offset;
 
-    ::glDisable(GL_DEPTH_TEST);
-    ::glLineWidth(m_hover_id != -1 ? 2.0f : 1.5f);
-    ::glColor3f(1.0, 1.0, 0.0);
+    glsafe(::glDisable(GL_DEPTH_TEST));
+    glsafe(::glLineWidth(m_hover_id != -1 ? 2.0f : 1.5f));
+    glsafe(::glColor3f(1.0, 1.0, 0.0));
     ::glBegin(GL_LINES);
     ::glVertex3dv(plane_center.data());
     ::glVertex3dv(m_grabbers[0].center.data());
-    ::glEnd();
+    glsafe(::glEnd());
 
     std::copy(std::begin(GrabberColor), std::end(GrabberColor), m_grabbers[0].color);
-    m_grabbers[0].render(m_hover_id == 0, box.max_size());
+    m_grabbers[0].render(m_hover_id == 0, (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0));
 }
 
 void GLGizmoCut::on_render_for_picking(const Selection& selection) const
 {
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
     render_grabbers_for_picking(selection.get_bounding_box());
 }
 
 void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit, const Selection& selection)
 {
+    const float approx_height = m_imgui->scaled(11.0f);
+    y = std::min(y, bottom_limit - approx_height);
     m_imgui->set_next_window_pos(x, y, ImGuiCond_Always);
+
     m_imgui->set_next_window_bg_alpha(0.5f);
     m_imgui->begin(_(L("Cut")), ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
 
-    ImGui::PushItemWidth(100.0f);
+    ImGui::PushItemWidth(m_imgui->scaled(5.0f));
     bool _value_changed = ImGui::InputDouble("Z", &m_cut_z, 0.0f, 0.0f, "%.2f");
 
     m_imgui->checkbox(_(L("Keep upper part")), m_keep_upper);
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
index 2ed048677..ec991a241 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
@@ -29,7 +29,7 @@ bool GLGizmoFlatten::on_init()
 
 std::string GLGizmoFlatten::on_get_name() const
 {
-    return L("Place on face [F]");
+    return (_(L("Place on face")) + " [F]").ToUTF8().data();
 }
 
 bool GLGizmoFlatten::on_is_activable(const Selection& selection) const
@@ -49,67 +49,67 @@ void GLGizmoFlatten::on_start_dragging(const Selection& selection)
 
 void GLGizmoFlatten::on_render(const Selection& selection) const
 {
-    ::glClear(GL_DEPTH_BUFFER_BIT);
+    glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
 
-    ::glEnable(GL_DEPTH_TEST);
-    ::glEnable(GL_BLEND);
+    glsafe(::glEnable(GL_DEPTH_TEST));
+    glsafe(::glEnable(GL_BLEND));
 
     if (selection.is_single_full_instance())
     {
         const Transform3d& m = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix();
-        ::glPushMatrix();
-        ::glTranslatef(0.f, 0.f, selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z());
-        ::glMultMatrixd(m.data());
+        glsafe(::glPushMatrix());
+        glsafe(::glTranslatef(0.f, 0.f, selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z()));
+        glsafe(::glMultMatrixd(m.data()));
         if (this->is_plane_update_necessary())
 			const_cast<GLGizmoFlatten*>(this)->update_planes();
         for (int i = 0; i < (int)m_planes.size(); ++i)
         {
             if (i == m_hover_id)
-                ::glColor4f(0.9f, 0.9f, 0.9f, 0.75f);
+                glsafe(::glColor4f(0.9f, 0.9f, 0.9f, 0.75f));
             else
-                ::glColor4f(0.9f, 0.9f, 0.9f, 0.5f);
+                glsafe(::glColor4f(0.9f, 0.9f, 0.9f, 0.5f));
 
             ::glBegin(GL_POLYGON);
             for (const Vec3d& vertex : m_planes[i].vertices)
             {
                 ::glVertex3dv(vertex.data());
             }
-            ::glEnd();
+            glsafe(::glEnd());
         }
-        ::glPopMatrix();
+        glsafe(::glPopMatrix());
     }
 
-    ::glEnable(GL_CULL_FACE);
-    ::glDisable(GL_BLEND);
+    glsafe(::glEnable(GL_CULL_FACE));
+    glsafe(::glDisable(GL_BLEND));
 }
 
 void GLGizmoFlatten::on_render_for_picking(const Selection& selection) const
 {
-    ::glDisable(GL_DEPTH_TEST);
-    ::glDisable(GL_BLEND);
+    glsafe(::glDisable(GL_DEPTH_TEST));
+    glsafe(::glDisable(GL_BLEND));
 
     if (selection.is_single_full_instance())
     {
         const Transform3d& m = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix();
-        ::glPushMatrix();
-        ::glTranslatef(0.f, 0.f, selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z());
-        ::glMultMatrixd(m.data());
+        glsafe(::glPushMatrix());
+        glsafe(::glTranslatef(0.f, 0.f, selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z()));
+        glsafe(::glMultMatrixd(m.data()));
         if (this->is_plane_update_necessary())
 			const_cast<GLGizmoFlatten*>(this)->update_planes();
         for (int i = 0; i < (int)m_planes.size(); ++i)
         {
-            ::glColor3fv(picking_color_component(i).data());
+            glsafe(::glColor3fv(picking_color_component(i).data()));
             ::glBegin(GL_POLYGON);
             for (const Vec3d& vertex : m_planes[i].vertices)
             {
                 ::glVertex3dv(vertex.data());
             }
-            ::glEnd();
+            glsafe(::glEnd());
         }
-        ::glPopMatrix();
+        glsafe(::glPopMatrix());
     }
 
-    ::glEnable(GL_CULL_FACE);
+    glsafe(::glEnable(GL_CULL_FACE));
 }
 
 void GLGizmoFlatten::set_flattening_data(const ModelObject* model_object)
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
index 03151c433..a2ea738f5 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
@@ -3,6 +3,7 @@
 
 #include <GL/glew.h>
 
+#include <wx/utils.h> 
 
 namespace Slic3r {
 namespace GUI {
@@ -48,7 +49,7 @@ bool GLGizmoMove3D::on_init()
 
 std::string GLGizmoMove3D::on_get_name() const
 {
-    return L("Move [M]");
+    return (_(L("Move")) + " [M]").ToUTF8().data();
 }
 
 void GLGizmoMove3D::on_start_dragging(const Selection& selection)
@@ -97,8 +98,8 @@ void GLGizmoMove3D::on_render(const Selection& selection) const
     else if (!m_grabbers[2].dragging && (m_hover_id == 2))
         set_tooltip("Z");
 
-    ::glClear(GL_DEPTH_BUFFER_BIT);
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
+    glsafe(::glEnable(GL_DEPTH_TEST));
 
     const BoundingBoxf3& box = selection.get_bounding_box();
     const Vec3d& center = box.center();
@@ -115,7 +116,7 @@ void GLGizmoMove3D::on_render(const Selection& selection) const
     m_grabbers[2].center = Vec3d(center(0), center(1), box.max(2) + Offset);
     ::memcpy((void*)m_grabbers[2].color, (const void*)&AXES_COLOR[2], 3 * sizeof(float));
 
-    ::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f);
+    glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
 
     if (m_hover_id == -1)
     {
@@ -124,11 +125,11 @@ void GLGizmoMove3D::on_render(const Selection& selection) const
         {
             if (m_grabbers[i].enabled)
             {
-                ::glColor3fv(AXES_COLOR[i]);
+                glsafe(::glColor3fv(AXES_COLOR[i]));
                 ::glBegin(GL_LINES);
                 ::glVertex3dv(center.data());
                 ::glVertex3dv(m_grabbers[i].center.data());
-                ::glEnd();
+                glsafe(::glEnd());
             }
         }
 
@@ -143,21 +144,22 @@ void GLGizmoMove3D::on_render(const Selection& selection) const
     else
     {
         // draw axis
-        ::glColor3fv(AXES_COLOR[m_hover_id]);
+        glsafe(::glColor3fv(AXES_COLOR[m_hover_id]));
         ::glBegin(GL_LINES);
         ::glVertex3dv(center.data());
         ::glVertex3dv(m_grabbers[m_hover_id].center.data());
-        ::glEnd();
+        glsafe(::glEnd());
 
         // draw grabber
-        m_grabbers[m_hover_id].render(true, box.max_size());
+        float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0);
+        m_grabbers[m_hover_id].render(true, mean_size);
         render_grabber_extension((Axis)m_hover_id, box, false);
     }
 }
 
 void GLGizmoMove3D::on_render_for_picking(const Selection& selection) const
 {
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
     const BoundingBoxf3& box = selection.get_bounding_box();
     render_grabbers_for_picking(box);
@@ -205,7 +207,7 @@ double GLGizmoMove3D::calc_projection(const UpdateData& data) const
         projection = inters_vec.dot(starting_vec.normalized());
     }
 
-    if (data.shift_down)
+    if (wxGetKeyState(WXK_SHIFT))
         projection = m_snap_step * (double)std::round(projection / m_snap_step);
 
     return projection;
@@ -216,7 +218,8 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box
     if (m_quadric == nullptr)
         return;
 
-    double size = m_dragging ? (double)m_grabbers[axis].get_dragging_half_size((float)box.max_size()) : (double)m_grabbers[axis].get_half_size((float)box.max_size());
+    float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0);
+    double size = m_dragging ? (double)m_grabbers[axis].get_dragging_half_size(mean_size) : (double)m_grabbers[axis].get_half_size(mean_size);
 
     float color[3];
     ::memcpy((void*)color, (const void*)m_grabbers[axis].color, 3 * sizeof(float));
@@ -228,25 +231,25 @@ void GLGizmoMove3D::render_grabber_extension(Axis axis, const BoundingBoxf3& box
     }
 
     if (!picking)
-        ::glEnable(GL_LIGHTING);
+        glsafe(::glEnable(GL_LIGHTING));
 
-    ::glColor3fv(color);
-    ::glPushMatrix();
-    ::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2));
+    glsafe(::glColor3fv(color));
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslated(m_grabbers[axis].center(0), m_grabbers[axis].center(1), m_grabbers[axis].center(2)));
     if (axis == X)
-        ::glRotated(90.0, 0.0, 1.0, 0.0);
+        glsafe(::glRotated(90.0, 0.0, 1.0, 0.0));
     else if (axis == Y)
-        ::glRotated(-90.0, 1.0, 0.0, 0.0);
+        glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
 
-    ::glTranslated(0.0, 0.0, 2.0 * size);
+    glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
     ::gluQuadricOrientation(m_quadric, GLU_OUTSIDE);
     ::gluCylinder(m_quadric, 0.75 * size, 0.0, 3.0 * size, 36, 1);
     ::gluQuadricOrientation(m_quadric, GLU_INSIDE);
     ::gluDisk(m_quadric, 0.0, 0.75 * size, 36, 1);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     if (!picking)
-        ::glDisable(GL_LIGHTING);
+        glsafe(::glDisable(GL_LIGHTING));
 }
 
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
index 72b9ad18a..68b9a8c33 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
@@ -155,13 +155,13 @@ void GLGizmoRotate::on_render(const Selection& selection) const
         m_snap_fine_out_radius = m_radius * (1.0f + ScaleLongTooth);
     }
 
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glEnable(GL_DEPTH_TEST));
 
-    ::glPushMatrix();
+    glsafe(::glPushMatrix());
     transform_to_local(selection);
 
-    ::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f);
-    ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color);
+    glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
+    glsafe(::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color));
 
     render_circle();
 
@@ -172,7 +172,7 @@ void GLGizmoRotate::on_render(const Selection& selection) const
         render_reference_radius();
     }
 
-    ::glColor3fv(m_highlight_color);
+    glsafe(::glColor3fv(m_highlight_color));
 
     if (m_hover_id != -1)
         render_angle();
@@ -180,14 +180,14 @@ void GLGizmoRotate::on_render(const Selection& selection) const
     render_grabber(box);
     render_grabber_extension(box, false);
 
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 }
 
 void GLGizmoRotate::on_render_for_picking(const Selection& selection) const
 {
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
-    ::glPushMatrix();
+    glsafe(::glPushMatrix());
 
     transform_to_local(selection);
 
@@ -195,7 +195,7 @@ void GLGizmoRotate::on_render_for_picking(const Selection& selection) const
     render_grabbers_for_picking(box);
     render_grabber_extension(box, true);
 
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 }
 
 void GLGizmoRotate::render_circle() const
@@ -209,7 +209,7 @@ void GLGizmoRotate::render_circle() const
         float z = 0.0f;
         ::glVertex3f((GLfloat)x, (GLfloat)y, (GLfloat)z);
     }
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
 void GLGizmoRotate::render_scale() const
@@ -232,7 +232,7 @@ void GLGizmoRotate::render_scale() const
         ::glVertex3f((GLfloat)in_x, (GLfloat)in_y, (GLfloat)in_z);
         ::glVertex3f((GLfloat)out_x, (GLfloat)out_y, (GLfloat)out_z);
     }
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
 void GLGizmoRotate::render_snap_radii() const
@@ -257,7 +257,7 @@ void GLGizmoRotate::render_snap_radii() const
         ::glVertex3f((GLfloat)in_x, (GLfloat)in_y, (GLfloat)in_z);
         ::glVertex3f((GLfloat)out_x, (GLfloat)out_y, (GLfloat)out_z);
     }
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
 void GLGizmoRotate::render_reference_radius() const
@@ -265,7 +265,7 @@ void GLGizmoRotate::render_reference_radius() const
     ::glBegin(GL_LINES);
     ::glVertex3f(0.0f, 0.0f, 0.0f);
     ::glVertex3f((GLfloat)(m_radius * (1.0f + GrabberOffset)), 0.0f, 0.0f);
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
 void GLGizmoRotate::render_angle() const
@@ -282,7 +282,7 @@ void GLGizmoRotate::render_angle() const
         float z = 0.0f;
         ::glVertex3f((GLfloat)x, (GLfloat)y, (GLfloat)z);
     }
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
 void GLGizmoRotate::render_grabber(const BoundingBoxf3& box) const
@@ -291,12 +291,12 @@ void GLGizmoRotate::render_grabber(const BoundingBoxf3& box) const
     m_grabbers[0].center = Vec3d(::cos(m_angle) * grabber_radius, ::sin(m_angle) * grabber_radius, 0.0);
     m_grabbers[0].angles(2) = m_angle;
 
-    ::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color);
+    glsafe(::glColor3fv((m_hover_id != -1) ? m_drag_color : m_highlight_color));
 
     ::glBegin(GL_LINES);
     ::glVertex3f(0.0f, 0.0f, 0.0f);
     ::glVertex3dv(m_grabbers[0].center.data());
-    ::glEnd();
+    glsafe(::glEnd());
 
     ::memcpy((void*)m_grabbers[0].color, (const void*)m_highlight_color, 3 * sizeof(float));
     render_grabbers(box);
@@ -307,7 +307,8 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
     if (m_quadric == nullptr)
         return;
 
-    double size = m_dragging ? (double)m_grabbers[0].get_dragging_half_size((float)box.max_size()) : (double)m_grabbers[0].get_half_size((float)box.max_size());
+    float mean_size = (float)((box.size()(0) + box.size()(1) + box.size()(2)) / 3.0);
+    double size = m_dragging ? (double)m_grabbers[0].get_dragging_half_size(mean_size) : (double)m_grabbers[0].get_half_size(mean_size);
 
     float color[3];
     ::memcpy((void*)color, (const void*)m_grabbers[0].color, 3 * sizeof(float));
@@ -319,56 +320,56 @@ void GLGizmoRotate::render_grabber_extension(const BoundingBoxf3& box, bool pick
     }
 
     if (!picking)
-        ::glEnable(GL_LIGHTING);
+        glsafe(::glEnable(GL_LIGHTING));
 
-    ::glColor3fv(color);
-    ::glPushMatrix();
-    ::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2));
-    ::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0);
-    ::glRotated(90.0, 1.0, 0.0, 0.0);
-    ::glTranslated(0.0, 0.0, 2.0 * size);
+    glsafe(::glColor3fv(color));
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2)));
+    glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0));
+    glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
+    glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
     ::gluQuadricOrientation(m_quadric, GLU_OUTSIDE);
     ::gluCylinder(m_quadric, 0.75 * size, 0.0, 3.0 * size, 36, 1);
     ::gluQuadricOrientation(m_quadric, GLU_INSIDE);
     ::gluDisk(m_quadric, 0.0, 0.75 * size, 36, 1);
-    ::glPopMatrix();
-    ::glPushMatrix();
-    ::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2));
-    ::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0);
-    ::glRotated(-90.0, 1.0, 0.0, 0.0);
-    ::glTranslated(0.0, 0.0, 2.0 * size);
+    glsafe(::glPopMatrix());
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslated(m_grabbers[0].center(0), m_grabbers[0].center(1), m_grabbers[0].center(2)));
+    glsafe(::glRotated(Geometry::rad2deg(m_angle), 0.0, 0.0, 1.0));
+    glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
+    glsafe(::glTranslated(0.0, 0.0, 2.0 * size));
     ::gluQuadricOrientation(m_quadric, GLU_OUTSIDE);
     ::gluCylinder(m_quadric, 0.75 * size, 0.0, 3.0 * size, 36, 1);
     ::gluQuadricOrientation(m_quadric, GLU_INSIDE);
     ::gluDisk(m_quadric, 0.0, 0.75 * size, 36, 1);
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
     if (!picking)
-        ::glDisable(GL_LIGHTING);
+        glsafe(::glDisable(GL_LIGHTING));
 }
 
 void GLGizmoRotate::transform_to_local(const Selection& selection) const
 {
-    ::glTranslated(m_center(0), m_center(1), m_center(2));
+    glsafe(::glTranslated(m_center(0), m_center(1), m_center(2)));
 
     if (selection.is_single_volume() || selection.is_single_modifier() || selection.requires_local_axes())
     {
         Transform3d orient_matrix = selection.get_volume(*selection.get_volume_idxs().begin())->get_instance_transformation().get_matrix(true, false, true, true);
-        ::glMultMatrixd(orient_matrix.data());
+        glsafe(::glMultMatrixd(orient_matrix.data()));
     }
 
     switch (m_axis)
     {
     case X:
     {
-        ::glRotatef(90.0f, 0.0f, 1.0f, 0.0f);
-        ::glRotatef(-90.0f, 0.0f, 0.0f, 1.0f);
+        glsafe(::glRotatef(90.0f, 0.0f, 1.0f, 0.0f));
+        glsafe(::glRotatef(-90.0f, 0.0f, 0.0f, 1.0f));
         break;
     }
     case Y:
     {
-        ::glRotatef(-90.0f, 0.0f, 0.0f, 1.0f);
-        ::glRotatef(-90.0f, 0.0f, 1.0f, 0.0f);
+        glsafe(::glRotatef(-90.0f, 0.0f, 0.0f, 1.0f));
+        glsafe(::glRotatef(-90.0f, 0.0f, 1.0f, 0.0f));
         break;
     }
     default:
@@ -454,7 +455,7 @@ bool GLGizmoRotate3D::on_init()
 
 std::string GLGizmoRotate3D::on_get_name() const
 {
-    return L("Rotate [R]");
+    return (_(L("Rotate")) + " [R]").ToUTF8().data();
 }
 
 void GLGizmoRotate3D::on_start_dragging(const Selection& selection)
@@ -471,7 +472,7 @@ void GLGizmoRotate3D::on_stop_dragging()
 
 void GLGizmoRotate3D::on_render(const Selection& selection) const
 {
-    ::glClear(GL_DEPTH_BUFFER_BIT);
+    glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
 
     if ((m_hover_id == -1) || (m_hover_id == 0))
         m_gizmos[X].render(selection);
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
index f5946aa56..c65dee4d8 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
@@ -102,7 +102,7 @@ protected:
             m_gizmos[i].set_hover_id((m_hover_id == i) ? 0 : -1);
         }
     }
-    virtual bool on_is_activable(const Selection& selection) const { return !selection.is_wipe_tower(); }
+    virtual bool on_is_activable(const Selection& selection) const { return true; }
     virtual void on_enable_grabber(unsigned int id)
     {
         if ((0 <= id) && (id < 3))
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
index 43152b56c..e8027c871 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
@@ -5,6 +5,8 @@
 
 #include <GL/glew.h>
 
+#include <wx/utils.h> 
+
 namespace Slic3r {
 namespace GUI {
 
@@ -19,8 +21,8 @@ GLGizmoScale3D::GLGizmoScale3D(GLCanvas3D& parent, unsigned int sprite_id)
     : GLGizmoBase(parent, sprite_id)
 #endif // ENABLE_SVG_ICONS
     , m_scale(Vec3d::Ones())
+    , m_offset(Vec3d::Zero())
     , m_snap_step(0.05)
-    , m_starting_scale(Vec3d::Ones())
 {
 }
 
@@ -48,26 +50,35 @@ bool GLGizmoScale3D::on_init()
 
 std::string GLGizmoScale3D::on_get_name() const
 {
-    return L("Scale [S]");
+    return (_(L("Scale")) + " [S]").ToUTF8().data();
 }
 
 void GLGizmoScale3D::on_start_dragging(const Selection& selection)
 {
     if (m_hover_id != -1)
     {
-        m_starting_drag_position = m_grabbers[m_hover_id].center;
-        m_starting_box = selection.get_bounding_box();
+        m_starting.drag_position = m_grabbers[m_hover_id].center;
+        m_starting.ctrl_down = wxGetKeyState(WXK_CONTROL);
+        m_starting.box = (m_starting.ctrl_down && (m_hover_id < 6)) ? m_box : selection.get_bounding_box();
+
+        const Vec3d& center = m_starting.box.center();
+        m_starting.pivots[0] = m_transform * Vec3d(m_starting.box.max(0), center(1), center(2));
+        m_starting.pivots[1] = m_transform * Vec3d(m_starting.box.min(0), center(1), center(2));
+        m_starting.pivots[2] = m_transform * Vec3d(center(0), m_starting.box.max(1), center(2));
+        m_starting.pivots[3] = m_transform * Vec3d(center(0), m_starting.box.min(1), center(2));
+        m_starting.pivots[4] = m_transform * Vec3d(center(0), center(1), m_starting.box.max(2));
+        m_starting.pivots[5] = m_transform * Vec3d(center(0), center(1), m_starting.box.min(2));
     }
 }
 
 void GLGizmoScale3D::on_update(const UpdateData& data, const Selection& selection)
 {
     if ((m_hover_id == 0) || (m_hover_id == 1))
-        do_scale_x(data);
+        do_scale_along_axis(X, data);
     else if ((m_hover_id == 2) || (m_hover_id == 3))
-        do_scale_y(data);
+        do_scale_along_axis(Y, data);
     else if ((m_hover_id == 4) || (m_hover_id == 5))
-        do_scale_z(data);
+        do_scale_along_axis(Z, data);
     else if (m_hover_id >= 6)
         do_scale_uniform(data);
 }
@@ -108,15 +119,15 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
         ((m_hover_id == 6) || (m_hover_id == 7) || (m_hover_id == 8) || (m_hover_id == 9)))
         set_tooltip("X/Y/Z");
 
-    ::glClear(GL_DEPTH_BUFFER_BIT);
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
+    glsafe(::glEnable(GL_DEPTH_TEST));
 
-    BoundingBoxf3 box;
-    Transform3d transform = Transform3d::Identity();
-    Vec3d angles = Vec3d::Zero();
+    m_box.reset();
+    m_transform = Transform3d::Identity();
+    // Transforms grabbers' offsets to world refefence system 
     Transform3d offsets_transform = Transform3d::Identity();
-
-    Vec3d grabber_size = Vec3d::Zero();
+    m_offsets_transform = Transform3d::Identity();
+    Vec3d angles = Vec3d::Zero();
 
     if (single_instance)
     {
@@ -125,64 +136,61 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
         for (unsigned int idx : idxs)
         {
             const GLVolume* vol = selection.get_volume(idx);
-            box.merge(vol->bounding_box.transformed(vol->get_volume_transformation().get_matrix()));
+            m_box.merge(vol->bounding_box.transformed(vol->get_volume_transformation().get_matrix()));
         }
 
         // gets transform from first selected volume
         const GLVolume* v = selection.get_volume(*idxs.begin());
-        transform = v->get_instance_transformation().get_matrix();
+        m_transform = v->get_instance_transformation().get_matrix();
         // gets angles from first selected volume
         angles = v->get_instance_rotation();
         // consider rotation+mirror only components of the transform for offsets
         offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), angles, Vec3d::Ones(), v->get_instance_mirror());
-        grabber_size = v->get_instance_transformation().get_matrix(true, true, false, true) * box.size();
+        m_offsets_transform = offsets_transform;
     }
     else if (single_volume)
     {
         const GLVolume* v = selection.get_volume(*selection.get_volume_idxs().begin());
-        box = v->bounding_box;
-        transform = v->world_matrix();
-        angles = Geometry::extract_euler_angles(transform);
+        m_box = v->bounding_box;
+        m_transform = v->world_matrix();
+        angles = Geometry::extract_euler_angles(m_transform);
         // consider rotation+mirror only components of the transform for offsets
         offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), angles, Vec3d::Ones(), v->get_instance_mirror());
-        grabber_size = v->get_volume_transformation().get_matrix(true, true, false, true) * box.size();
+        m_offsets_transform = Geometry::assemble_transform(Vec3d::Zero(), v->get_volume_rotation(), Vec3d::Ones(), v->get_volume_mirror());
     }
     else
-    {
-        box = selection.get_bounding_box();
-        grabber_size = box.size();
-    }
-
-    m_box = box;
+        m_box = selection.get_bounding_box();
 
     const Vec3d& center = m_box.center();
     Vec3d offset_x = offsets_transform * Vec3d((double)Offset, 0.0, 0.0);
     Vec3d offset_y = offsets_transform * Vec3d(0.0, (double)Offset, 0.0);
     Vec3d offset_z = offsets_transform * Vec3d(0.0, 0.0, (double)Offset);
 
+    bool ctrl_down = (m_dragging && m_starting.ctrl_down) || (!m_dragging && wxGetKeyState(WXK_CONTROL));
+
     // x axis
-    m_grabbers[0].center = transform * Vec3d(m_box.min(0), center(1), center(2)) - offset_x;
-    m_grabbers[1].center = transform * Vec3d(m_box.max(0), center(1), center(2)) + offset_x;
-    ::memcpy((void*)m_grabbers[0].color, (const void*)&AXES_COLOR[0], 3 * sizeof(float));
-    ::memcpy((void*)m_grabbers[1].color, (const void*)&AXES_COLOR[0], 3 * sizeof(float));
+    m_grabbers[0].center = m_transform * Vec3d(m_box.min(0), center(1), center(2)) - offset_x;
+    m_grabbers[1].center = m_transform * Vec3d(m_box.max(0), center(1), center(2)) + offset_x;
+    ::memcpy((void*)m_grabbers[0].color, (ctrl_down && (m_hover_id == 1)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 3 * sizeof(float));
+    ::memcpy((void*)m_grabbers[1].color, (ctrl_down && (m_hover_id == 0)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[0], 3 * sizeof(float));
 
     // y axis
-    m_grabbers[2].center = transform * Vec3d(center(0), m_box.min(1), center(2)) - offset_y;
-    m_grabbers[3].center = transform * Vec3d(center(0), m_box.max(1), center(2)) + offset_y;
-    ::memcpy((void*)m_grabbers[2].color, (const void*)&AXES_COLOR[1], 3 * sizeof(float));
-    ::memcpy((void*)m_grabbers[3].color, (const void*)&AXES_COLOR[1], 3 * sizeof(float));
+    m_grabbers[2].center = m_transform * Vec3d(center(0), m_box.min(1), center(2)) - offset_y;
+    m_grabbers[3].center = m_transform * Vec3d(center(0), m_box.max(1), center(2)) + offset_y;
+    ::memcpy((void*)m_grabbers[2].color, (ctrl_down && (m_hover_id == 3)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 3 * sizeof(float));
+    ::memcpy((void*)m_grabbers[3].color, (ctrl_down && (m_hover_id == 2)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[1], 3 * sizeof(float));
 
     // z axis
-    m_grabbers[4].center = transform * Vec3d(center(0), center(1), m_box.min(2)) - offset_z;
-    m_grabbers[5].center = transform * Vec3d(center(0), center(1), m_box.max(2)) + offset_z;
-    ::memcpy((void*)m_grabbers[4].color, (const void*)&AXES_COLOR[2], 3 * sizeof(float));
-    ::memcpy((void*)m_grabbers[5].color, (const void*)&AXES_COLOR[2], 3 * sizeof(float));
+    m_grabbers[4].center = m_transform * Vec3d(center(0), center(1), m_box.min(2)) - offset_z;
+    m_grabbers[5].center = m_transform * Vec3d(center(0), center(1), m_box.max(2)) + offset_z;
+    ::memcpy((void*)m_grabbers[4].color, (ctrl_down && (m_hover_id == 5)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 3 * sizeof(float));
+    ::memcpy((void*)m_grabbers[5].color, (ctrl_down && (m_hover_id == 4)) ? (const void*)CONSTRAINED_COLOR : (const void*)&AXES_COLOR[2], 3 * sizeof(float));
 
     // uniform
-    m_grabbers[6].center = transform * Vec3d(m_box.min(0), m_box.min(1), center(2)) - offset_x - offset_y;
-    m_grabbers[7].center = transform * Vec3d(m_box.max(0), m_box.min(1), center(2)) + offset_x - offset_y;
-    m_grabbers[8].center = transform * Vec3d(m_box.max(0), m_box.max(1), center(2)) + offset_x + offset_y;
-    m_grabbers[9].center = transform * Vec3d(m_box.min(0), m_box.max(1), center(2)) - offset_x + offset_y;
+    m_grabbers[6].center = m_transform * Vec3d(m_box.min(0), m_box.min(1), center(2)) - offset_x - offset_y;
+    m_grabbers[7].center = m_transform * Vec3d(m_box.max(0), m_box.min(1), center(2)) + offset_x - offset_y;
+    m_grabbers[8].center = m_transform * Vec3d(m_box.max(0), m_box.max(1), center(2)) + offset_x + offset_y;
+    m_grabbers[9].center = m_transform * Vec3d(m_box.min(0), m_box.max(1), center(2)) - offset_x + offset_y;
     for (int i = 6; i < 10; ++i)
     {
         ::memcpy((void*)m_grabbers[i].color, (const void*)m_highlight_color, 3 * sizeof(float));
@@ -194,29 +202,31 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
         m_grabbers[i].angles = angles;
     }
 
-    ::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f);
+    glsafe(::glLineWidth((m_hover_id != -1) ? 2.0f : 1.5f));
 
-    float grabber_mean_size = (float)(grabber_size(0) + grabber_size(1) + grabber_size(2)) / 3.0f;
+    const BoundingBoxf3& selection_box = selection.get_bounding_box();
+
+    float grabber_mean_size = (float)((selection_box.size()(0) + selection_box.size()(1) + selection_box.size()(2)) / 3.0);
 
     if (m_hover_id == -1)
     {
         // draw connections
         if (m_grabbers[0].enabled && m_grabbers[1].enabled)
         {
-            ::glColor3fv(m_grabbers[0].color);
+            glsafe(::glColor3fv(m_grabbers[0].color));
             render_grabbers_connection(0, 1);
         }
         if (m_grabbers[2].enabled && m_grabbers[3].enabled)
         {
-            ::glColor3fv(m_grabbers[2].color);
+            glsafe(::glColor3fv(m_grabbers[2].color));
             render_grabbers_connection(2, 3);
         }
         if (m_grabbers[4].enabled && m_grabbers[5].enabled)
         {
-            ::glColor3fv(m_grabbers[4].color);
+            glsafe(::glColor3fv(m_grabbers[4].color));
             render_grabbers_connection(4, 5);
         }
-        ::glColor3fv(m_base_color);
+        glsafe(::glColor3fv(m_base_color));
         render_grabbers_connection(6, 7);
         render_grabbers_connection(7, 8);
         render_grabbers_connection(8, 9);
@@ -227,7 +237,7 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
     else if ((m_hover_id == 0) || (m_hover_id == 1))
     {
         // draw connection
-        ::glColor3fv(m_grabbers[0].color);
+        glsafe(::glColor3fv(m_grabbers[0].color));
         render_grabbers_connection(0, 1);
         // draw grabbers
         m_grabbers[0].render(true, grabber_mean_size);
@@ -236,7 +246,7 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
     else if ((m_hover_id == 2) || (m_hover_id == 3))
     {
         // draw connection
-        ::glColor3fv(m_grabbers[2].color);
+        glsafe(::glColor3fv(m_grabbers[2].color));
         render_grabbers_connection(2, 3);
         // draw grabbers
         m_grabbers[2].render(true, grabber_mean_size);
@@ -245,7 +255,7 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
     else if ((m_hover_id == 4) || (m_hover_id == 5))
     {
         // draw connection
-        ::glColor3fv(m_grabbers[4].color);
+        glsafe(::glColor3fv(m_grabbers[4].color));
         render_grabbers_connection(4, 5);
         // draw grabbers
         m_grabbers[4].render(true, grabber_mean_size);
@@ -254,7 +264,7 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
     else if (m_hover_id >= 6)
     {
         // draw connection
-        ::glColor3fv(m_drag_color);
+        glsafe(::glColor3fv(m_drag_color));
         render_grabbers_connection(6, 7);
         render_grabbers_connection(7, 8);
         render_grabbers_connection(8, 9);
@@ -269,7 +279,7 @@ void GLGizmoScale3D::on_render(const Selection& selection) const
 
 void GLGizmoScale3D::on_render_for_picking(const Selection& selection) const
 {
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST));
 
     render_grabbers_for_picking(selection.get_bounding_box());
 }
@@ -296,44 +306,54 @@ void GLGizmoScale3D::render_grabbers_connection(unsigned int id_1, unsigned int
         ::glBegin(GL_LINES);
         ::glVertex3dv(m_grabbers[id_1].center.data());
         ::glVertex3dv(m_grabbers[id_2].center.data());
-        ::glEnd();
+        glsafe(::glEnd());
     }
 }
 
-void GLGizmoScale3D::do_scale_x(const UpdateData& data)
+void GLGizmoScale3D::do_scale_along_axis(Axis axis, const UpdateData& data)
 {
     double ratio = calc_ratio(data);
     if (ratio > 0.0)
-        m_scale(0) = m_starting_scale(0) * ratio;
-}
+    {
+        m_scale(axis) = m_starting.scale(axis) * ratio;
+        if (m_starting.ctrl_down)
+        {
+            double local_offset = 0.5 * (m_scale(axis) - m_starting.scale(axis)) * m_starting.box.size()(axis);
+            if (m_hover_id == 2 * axis)
+                local_offset *= -1.0;
 
-void GLGizmoScale3D::do_scale_y(const UpdateData& data)
-{
-    double ratio = calc_ratio(data);
-    if (ratio > 0.0)
-        m_scale(1) = m_starting_scale(1) * ratio;
-}
+            Vec3d local_offset_vec;
+            switch (axis)
+            {
+            case X: { local_offset_vec = local_offset * Vec3d::UnitX(); break; }
+            case Y: { local_offset_vec = local_offset * Vec3d::UnitY(); break; }
+            case Z: { local_offset_vec = local_offset * Vec3d::UnitZ(); break; }
+            }
 
-void GLGizmoScale3D::do_scale_z(const UpdateData& data)
-{
-    double ratio = calc_ratio(data);
-    if (ratio > 0.0)
-        m_scale(2) = m_starting_scale(2) * ratio;
+            m_offset = m_offsets_transform * local_offset_vec;
+        }
+        else
+            m_offset = Vec3d::Zero();
+    }
 }
 
 void GLGizmoScale3D::do_scale_uniform(const UpdateData& data)
 {
     double ratio = calc_ratio(data);
     if (ratio > 0.0)
-        m_scale = m_starting_scale * ratio;
+    {
+        m_scale = m_starting.scale * ratio;
+        m_offset = Vec3d::Zero();
+    }
 }
 
 double GLGizmoScale3D::calc_ratio(const UpdateData& data) const
 {
     double ratio = 0.0;
 
-    // vector from the center to the starting position
-    Vec3d starting_vec = m_starting_drag_position - m_starting_box.center();
+    Vec3d pivot = (m_starting.ctrl_down && (m_hover_id < 6)) ? m_starting.pivots[m_hover_id] : m_starting.box.center();
+
+    Vec3d starting_vec = m_starting.drag_position - pivot;
     double len_starting_vec = starting_vec.norm();
     if (len_starting_vec != 0.0)
     {
@@ -342,9 +362,9 @@ double GLGizmoScale3D::calc_ratio(const UpdateData& data) const
         // use ray-plane intersection see i.e. https://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection algebric form
         // in our case plane normal and ray direction are the same (orthogonal view)
         // when moving to perspective camera the negative z unit axis of the camera needs to be transformed in world space and used as plane normal
-        Vec3d inters = data.mouse_ray.a + (m_starting_drag_position - data.mouse_ray.a).dot(mouse_dir) / mouse_dir.squaredNorm() * mouse_dir;
+        Vec3d inters = data.mouse_ray.a + (m_starting.drag_position - data.mouse_ray.a).dot(mouse_dir) / mouse_dir.squaredNorm() * mouse_dir;
         // vector from the starting position to the found intersection
-        Vec3d inters_vec = inters - m_starting_drag_position;
+        Vec3d inters_vec = inters - m_starting.drag_position;
 
         // finds projection of the vector along the staring direction
         double proj = inters_vec.dot(starting_vec.normalized());
@@ -352,7 +372,7 @@ double GLGizmoScale3D::calc_ratio(const UpdateData& data) const
         ratio = (len_starting_vec + proj) / len_starting_vec;
     }
 
-    if (data.shift_down)
+    if (wxGetKeyState(WXK_SHIFT))
         ratio = m_snap_step * (double)std::round(ratio / m_snap_step);
 
     return ratio;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
index 6e14a361e..3b0717f04 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
@@ -11,15 +11,25 @@ class GLGizmoScale3D : public GLGizmoBase
 {
     static const float Offset;
 
+    struct StartingData
+    {
+        Vec3d scale;
+        Vec3d drag_position;
+        BoundingBoxf3 box;
+        Vec3d pivots[6];
+        bool ctrl_down;
+
+        StartingData() : scale(Vec3d::Ones()), drag_position(Vec3d::Zero()), ctrl_down(false) { for (int i = 0; i < 5; ++i) { pivots[i] = Vec3d::Zero(); } }
+    };
+
     mutable BoundingBoxf3 m_box;
-
+    mutable Transform3d m_transform;
+    // Transforms grabbers offsets to the proper reference system (world for instances, instance for volumes)
+    mutable Transform3d m_offsets_transform;
     Vec3d m_scale;
-
+    Vec3d m_offset;
     double m_snap_step;
-
-    Vec3d m_starting_scale;
-    Vec3d m_starting_drag_position;
-    BoundingBoxf3 m_starting_box;
+    StartingData m_starting;
 
 public:
 #if ENABLE_SVG_ICONS
@@ -32,7 +42,9 @@ public:
     void set_snap_step(double step) { m_snap_step = step; }
 
     const Vec3d& get_scale() const { return m_scale; }
-    void set_scale(const Vec3d& scale) { m_starting_scale = scale; m_scale = scale; }
+    void set_scale(const Vec3d& scale) { m_starting.scale = scale; m_scale = scale; }
+
+    const Vec3d& get_offset() const { return m_offset; }
 
 protected:
     virtual bool on_init();
@@ -47,9 +59,7 @@ protected:
 private:
     void render_grabbers_connection(unsigned int id_1, unsigned int id_2) const;
 
-    void do_scale_x(const UpdateData& data);
-    void do_scale_y(const UpdateData& data);
-    void do_scale_z(const UpdateData& data);
+    void do_scale_along_axis(Axis axis, const UpdateData& data);
     void do_scale_uniform(const UpdateData& data);
 
     double calc_ratio(const UpdateData& data) const;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
index e058e929f..4c3030d0e 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
@@ -1,14 +1,19 @@
 // Include GLGizmoBase.hpp before I18N.hpp as it includes some libigl code, which overrides our localization "L" macro.
 #include "GLGizmoSlaSupports.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
 
 #include <GL/glew.h>
 
 #include <wx/msgdlg.h>
+#include <wx/settings.h>
+#include <wx/stattext.h>
 
 #include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/GUI.hpp"
 #include "slic3r/GUI/GUI_ObjectSettings.hpp"
 #include "slic3r/GUI/GUI_ObjectList.hpp"
 #include "slic3r/GUI/PresetBundle.hpp"
+#include "libslic3r/Tesselate.hpp"
 
 
 namespace Slic3r {
@@ -21,7 +26,7 @@ GLGizmoSlaSupports::GLGizmoSlaSupports(GLCanvas3D& parent, const std::string& ic
 GLGizmoSlaSupports::GLGizmoSlaSupports(GLCanvas3D& parent, unsigned int sprite_id)
     : GLGizmoBase(parent, sprite_id)
 #endif // ENABLE_SVG_ICONS
-    , m_starting_center(Vec3d::Zero()), m_quadric(nullptr)
+    , m_quadric(nullptr)
 {
     m_quadric = ::gluNewQuadric();
     if (m_quadric != nullptr)
@@ -44,24 +49,29 @@ bool GLGizmoSlaSupports::on_init()
 
 void GLGizmoSlaSupports::set_sla_support_data(ModelObject* model_object, const Selection& selection)
 {
-    m_starting_center = Vec3d::Zero();
-    m_old_model_object = m_model_object;
-    m_model_object = model_object;
-    if (selection.is_empty())
-        m_old_instance_id = -1;
+    if (selection.is_empty()) {
+        m_model_object = nullptr;
+        return;
+    }
 
+    if (m_model_object != model_object)
+        m_print_object_idx = -1;
+
+    m_model_object = model_object;
     m_active_instance = selection.get_instance_idx();
 
     if (model_object && selection.is_from_single_instance())
     {
+        // Cache the bb - it's needed for dealing with the clipping plane quite often
+        // It could be done inside update_mesh but one has to account for scaling of the instance.
+        //FIXME calling ModelObject::instance_bounding_box() is expensive!
+        m_active_instance_bb_radius = m_model_object->instance_bounding_box(m_active_instance).radius();
+
         if (is_mesh_update_necessary()) {
             update_mesh();
             editing_mode_reload_cache();
         }
 
-        if (m_model_object != m_old_model_object)
-            m_editing_mode = false;
-
         if (m_editing_mode_cache.empty() && m_model_object->sla_points_status != sla::PointsStatus::UserModified)
             get_data_from_backend();
 
@@ -69,83 +79,185 @@ void GLGizmoSlaSupports::set_sla_support_data(ModelObject* model_object, const S
             m_parent.toggle_model_objects_visibility(false);
             m_parent.toggle_model_objects_visibility(true, m_model_object, m_active_instance);
         }
+        else
+            m_parent.toggle_model_objects_visibility(true, nullptr, -1);
     }
 }
 
 void GLGizmoSlaSupports::on_render(const Selection& selection) const
 {
-    ::glEnable(GL_BLEND);
-    ::glEnable(GL_DEPTH_TEST);
+    // If current m_model_object does not match selection, ask GLCanvas3D to turn us off
+    if (m_state == On
+     && (m_model_object != selection.get_model()->objects[selection.get_object_idx()]
+      || m_active_instance != selection.get_instance_idx())) {
+        m_parent.post_event(SimpleEvent(EVT_GLCANVAS_RESETGIZMOS));
+        return;
+    }
 
-    render_points(selection, false);
-    render_selection_rectangle();
+    glsafe(::glEnable(GL_BLEND));
+    glsafe(::glEnable(GL_DEPTH_TEST));
 
-    ::glDisable(GL_BLEND);
+    m_z_shift = selection.get_volume(*selection.get_volume_idxs().begin())->get_sla_shift_z();
+
+    if (m_quadric != nullptr && selection.is_from_single_instance())
+        render_points(selection, false);
+
+    m_selection_rectangle.render(m_parent);
+    render_clipping_plane(selection);
+
+    glsafe(::glDisable(GL_BLEND));
 }
 
-void GLGizmoSlaSupports::render_selection_rectangle() const
+
+
+void GLGizmoSlaSupports::render_clipping_plane(const Selection& selection) const
 {
-    if (!m_selection_rectangle_active)
+    if (m_clipping_plane_distance == 0.f)
         return;
 
-    ::glLineWidth(1.5f);
-    float render_color[3] = {1.f, 0.f, 0.f};
-    ::glColor3fv(render_color);
+    if (m_clipping_plane_normal == Vec3d::Zero())
+        reset_clipping_plane_normal();
 
-    ::glPushAttrib(GL_TRANSFORM_BIT);   // remember current MatrixMode
+    const Vec3d& direction_to_camera = m_clipping_plane_normal;
 
-    ::glMatrixMode(GL_MODELVIEW);       // cache modelview matrix and set to identity
-    ::glPushMatrix();
-    ::glLoadIdentity();
+    // First cache instance transformation to be used later.
+    const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin());
+    Transform3f instance_matrix = vol->get_instance_transformation().get_matrix().cast<float>();
+    Transform3f instance_matrix_no_translation_no_scaling = vol->get_instance_transformation().get_matrix(true,false,true).cast<float>();
+    Vec3f scaling = vol->get_instance_scaling_factor().cast<float>();
+    Vec3d instance_offset = vol->get_instance_offset();
 
-    ::glMatrixMode(GL_PROJECTION);      // cache projection matrix and set to identity
-    ::glPushMatrix();
-    ::glLoadIdentity();
+    // Calculate distance from mesh origin to the clipping plane (in mesh coordinates).
+    Vec3f up_noscale = instance_matrix_no_translation_no_scaling.inverse() * direction_to_camera.cast<float>();
+    Vec3f up = Vec3f(up_noscale(0)*scaling(0), up_noscale(1)*scaling(1), up_noscale(2)*scaling(2));
+    float height_mesh = (m_active_instance_bb_radius - m_clipping_plane_distance * 2*m_active_instance_bb_radius) * (up_noscale.norm()/up.norm());
 
-    ::glOrtho(0.f, m_canvas_width, m_canvas_height, 0.f, -1.f, 1.f); // set projection matrix so that world coords = window coords
+    // Get transformation of the supports and calculate how far from its origin the clipping plane is.
+    Transform3d supports_trafo = Transform3d::Identity();
+    supports_trafo = supports_trafo.rotate(Eigen::AngleAxisd(vol->get_instance_rotation()(2), Vec3d::UnitZ()));
+    Vec3f up_supports = (supports_trafo.inverse() * direction_to_camera).cast<float>();
+    supports_trafo = supports_trafo.pretranslate(Vec3d(instance_offset(0), instance_offset(1), vol->get_sla_shift_z()));
+    // Instance and supports origin do not coincide, so the following is quite messy:
+    float height_supports = height_mesh * (up.norm() / up_supports.norm()) + instance_offset(2) * (direction_to_camera(2) / direction_to_camera.norm());
 
-    // render the selection  rectangle (window coordinates):
-    ::glPushAttrib(GL_ENABLE_BIT);
-    ::glLineStipple(4, 0xAAAA);
-    ::glEnable(GL_LINE_STIPPLE);
+    // In case either of these was recently changed, the cached triangulated ExPolygons are invalid now.
+    // We are gonna recalculate them both for the object and for the support structures.
+    if (m_clipping_plane_distance != m_old_clipping_plane_distance
+     || m_old_clipping_plane_normal != direction_to_camera) {
 
-    ::glBegin(GL_LINE_LOOP);
-    ::glVertex3f((GLfloat)m_selection_rectangle_start_corner(0), (GLfloat)m_selection_rectangle_start_corner(1), (GLfloat)0.5f);
-    ::glVertex3f((GLfloat)m_selection_rectangle_end_corner(0), (GLfloat)m_selection_rectangle_start_corner(1), (GLfloat)0.5f);
-    ::glVertex3f((GLfloat)m_selection_rectangle_end_corner(0), (GLfloat)m_selection_rectangle_end_corner(1), (GLfloat)0.5f);
-    ::glVertex3f((GLfloat)m_selection_rectangle_start_corner(0), (GLfloat)m_selection_rectangle_end_corner(1), (GLfloat)0.5f);
-    ::glEnd();
-    ::glPopAttrib();
+        m_old_clipping_plane_normal = direction_to_camera;
+        m_old_clipping_plane_distance = m_clipping_plane_distance;
 
-    ::glPopMatrix();                // restore former projection matrix
-    ::glMatrixMode(GL_MODELVIEW);
-    ::glPopMatrix();                // restore former modelview matrix
-    ::glPopAttrib();                // restore former MatrixMode
+        // Now initialize the TMS for the object, perform the cut and save the result.
+        if (! m_tms) {
+            m_tms.reset(new TriangleMeshSlicer(m_mesh));
+        }
+        std::vector<ExPolygons> list_of_expolys;
+        m_tms->set_up_direction(up);
+        m_tms->slice(std::vector<float>{height_mesh}, &list_of_expolys, [](){});
+        m_triangles = triangulate_expolygons_2f(list_of_expolys[0]);
+
+
+
+        // Next, ask the backend if supports are already calculated. If so, we are gonna cut them too.
+        // First we need a pointer to the respective SLAPrintObject. The index into objects vector is
+        // cached so we don't have todo it on each render. We only search for the po if needed:
+        if (m_print_object_idx < 0 || (int)m_parent.sla_print()->objects().size() != m_print_objects_count) {
+            m_print_objects_count = m_parent.sla_print()->objects().size();
+            m_print_object_idx = -1;
+            for (const SLAPrintObject* po : m_parent.sla_print()->objects()) {
+                ++m_print_object_idx;
+                if (po->model_object()->id() == m_model_object->id())
+                    break;
+            }
+        }
+        if (m_print_object_idx >= 0) {
+            const SLAPrintObject* print_object = m_parent.sla_print()->objects()[m_print_object_idx];
+
+            if (print_object->is_step_done(slaposSupportTree)) {
+                // If the supports are already calculated, save the timestamp of the respective step
+                // so we can later tell they were recalculated.
+                size_t timestamp = print_object->step_state_with_timestamp(slaposSupportTree).timestamp;
+
+                if (!m_supports_tms || (int)timestamp != m_old_timestamp) {
+                    // The timestamp has changed - stash the mesh and initialize the TMS.
+                    m_supports_mesh = &print_object->support_mesh();
+                    // The mesh should already have the shared vertices calculated.
+                    m_supports_tms.reset(new TriangleMeshSlicer(m_supports_mesh));
+                    m_old_timestamp = timestamp;
+                }
+
+                // The TMS is initialized - let's do the cutting:
+                list_of_expolys.clear();
+                m_supports_tms->set_up_direction(up_supports);
+                m_supports_tms->slice(std::vector<float>{height_supports}, &list_of_expolys, [](){});
+                m_supports_triangles = triangulate_expolygons_2f(list_of_expolys[0]);
+            }
+            else {
+                // The supports are not valid. We better dump the cached data.
+                m_supports_tms.reset();
+                m_supports_triangles.clear();
+            }
+        }
+    }
+
+    // At this point we have the triangulated cuts for both the object and supports - let's render.
+	if (! m_triangles.empty()) {
+		::glPushMatrix();
+		::glTranslated(0.0, 0.0, m_z_shift);
+		::glMultMatrixf(instance_matrix.data());
+		Eigen::Quaternionf q;
+		q.setFromTwoVectors(Vec3f::UnitZ(), up);
+		Eigen::AngleAxisf aa(q);
+		::glRotatef(aa.angle() * (180./M_PI), aa.axis()(0), aa.axis()(1), aa.axis()(2));
+		::glTranslatef(0.f, 0.f, 0.01f); // to make sure the cut does not intersect the structure itself
+        ::glColor3f(1.0f, 0.37f, 0.0f);
+        ::glBegin(GL_TRIANGLES);
+        for (const Vec2f& point : m_triangles)
+            ::glVertex3f(point(0), point(1), height_mesh);
+
+        ::glEnd();
+		::glPopMatrix();
+	}
+
+    if (! m_supports_triangles.empty() && !m_editing_mode) {
+        // The supports are hidden in the editing mode, so it makes no sense to render the cuts.
+		::glPushMatrix();
+        ::glMultMatrixd(supports_trafo.data());
+        Eigen::Quaternionf q;
+		q.setFromTwoVectors(Vec3f::UnitZ(), up_supports);
+		Eigen::AngleAxisf aa(q);
+		::glRotatef(aa.angle() * (180./M_PI), aa.axis()(0), aa.axis()(1), aa.axis()(2));
+		::glTranslatef(0.f, 0.f, 0.01f);
+        ::glColor3f(1.0f, 0.f, 0.37f);
+        ::glBegin(GL_TRIANGLES);
+        for (const Vec2f& point : m_supports_triangles)
+            ::glVertex3f(point(0), point(1), height_supports);
+
+        ::glEnd();
+		::glPopMatrix();
+	}
 }
 
+
 void GLGizmoSlaSupports::on_render_for_picking(const Selection& selection) const
 {
-    ::glEnable(GL_DEPTH_TEST);
-
+    glsafe(::glEnable(GL_DEPTH_TEST));
     render_points(selection, true);
 }
 
 void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking) const
 {
-    if (m_quadric == nullptr || !selection.is_from_single_instance())
-        return;
-
     if (!picking)
-        ::glEnable(GL_LIGHTING);
+        glsafe(::glEnable(GL_LIGHTING));
 
     const GLVolume* vol = selection.get_volume(*selection.get_volume_idxs().begin());
-    double z_shift = vol->get_sla_shift_z();
     const Transform3d& instance_scaling_matrix_inverse = vol->get_instance_transformation().get_matrix(true, true, false, true).inverse();
     const Transform3d& instance_matrix = vol->get_instance_transformation().get_matrix();
 
-    ::glPushMatrix();
-    ::glTranslated(0.0, 0.0, z_shift);
-    ::glMultMatrixd(instance_matrix.data());
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslated(0.0, 0.0, m_z_shift));
+    glsafe(::glMultMatrixd(instance_matrix.data()));
 
     float render_color[3];
     for (int i = 0; i < (int)m_editing_mode_cache.size(); ++i)
@@ -153,6 +265,9 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
         const sla::SupportPoint& support_point = m_editing_mode_cache[i].support_point;
         const bool& point_selected = m_editing_mode_cache[i].selected;
 
+        if (is_point_clipped(support_point.pos.cast<double>()))
+            continue;
+
         // First decide about the color of the point.
         if (picking) {
             std::array<float, 3> color = picking_color_component(i);
@@ -177,14 +292,14 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
                     for (unsigned char i=0; i<3; ++i) render_color[i] = 0.5f;
             }
         }
-        ::glColor3fv(render_color);
+        glsafe(::glColor3fv(render_color));
         float render_color_emissive[4] = { 0.5f * render_color[0], 0.5f * render_color[1], 0.5f * render_color[2], 1.f};
-        ::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive);
+        glsafe(::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive));
 
         // Inverse matrix of the instance scaling is applied so that the mark does not scale with the object.
-        ::glPushMatrix();
-        ::glTranslated(support_point.pos(0), support_point.pos(1), support_point.pos(2));
-        ::glMultMatrixd(instance_scaling_matrix_inverse.data());
+        glsafe(::glPushMatrix());
+        glsafe(::glTranslated(support_point.pos(0), support_point.pos(1), support_point.pos(2)));
+        glsafe(::glMultMatrixd(instance_scaling_matrix_inverse.data()));
 
         // Matrices set, we can render the point mark now.
         // If in editing mode, we'll also render a cone pointing to the sphere.
@@ -195,40 +310,54 @@ void GLGizmoSlaSupports::render_points(const Selection& selection, bool picking)
             Eigen::Quaterniond q;
             q.setFromTwoVectors(Vec3d{0., 0., 1.}, instance_scaling_matrix_inverse * m_editing_mode_cache[i].normal.cast<double>());
             Eigen::AngleAxisd aa(q);
-            ::glRotated(aa.angle() * (180./M_PI), aa.axis()(0), aa.axis()(1), aa.axis()(2));
+            glsafe(::glRotated(aa.angle() * (180. / M_PI), aa.axis()(0), aa.axis()(1), aa.axis()(2)));
 
             const float cone_radius = 0.25f; // mm
             const float cone_height = 0.75f;
-            ::glPushMatrix();
-            ::glTranslatef(0.f, 0.f, m_editing_mode_cache[i].support_point.head_front_radius * RenderPointScale);
+            glsafe(::glPushMatrix());
+            glsafe(::glTranslatef(0.f, 0.f, m_editing_mode_cache[i].support_point.head_front_radius * RenderPointScale));
             ::gluCylinder(m_quadric, 0.f, cone_radius, cone_height, 24, 1);
-            ::glTranslatef(0.f, 0.f, cone_height);
+            glsafe(::glTranslatef(0.f, 0.f, cone_height));
             ::gluDisk(m_quadric, 0.0, cone_radius, 24, 1);
-            ::glPopMatrix();
+            glsafe(::glPopMatrix());
         }
         ::gluSphere(m_quadric, m_editing_mode_cache[i].support_point.head_front_radius * RenderPointScale, 24, 12);
-        ::glPopMatrix();
+        glsafe(::glPopMatrix());
     }
 
     {
         // Reset emissive component to zero (the default value)
         float render_color_emissive[4] = { 0.f, 0.f, 0.f, 1.f };
-        ::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive);
+        glsafe(::glMaterialfv(GL_FRONT, GL_EMISSION, render_color_emissive));
     }
 
     if (!picking)
-        ::glDisable(GL_LIGHTING);
+        glsafe(::glDisable(GL_LIGHTING));
 
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 }
 
+
+
+bool GLGizmoSlaSupports::is_point_clipped(const Vec3d& point) const
+{
+    const Vec3d& direction_to_camera = m_clipping_plane_normal;
+
+    if (m_clipping_plane_distance == 0.f)
+        return false;
+
+    Vec3d transformed_point = m_model_object->instances.front()->get_transformation().get_matrix() * point;
+    transformed_point(2) += m_z_shift;
+    return direction_to_camera.dot(m_model_object->instances[m_active_instance]->get_offset() + Vec3d(0., 0., m_z_shift)) + m_active_instance_bb_radius
+            - m_clipping_plane_distance * 2*m_active_instance_bb_radius < direction_to_camera.dot(transformed_point);
+}
+
+
+
 bool GLGizmoSlaSupports::is_mesh_update_necessary() const
 {
     return ((m_state == On) && (m_model_object != nullptr) && !m_model_object->instances.empty())
-        && ((m_model_object != m_old_model_object) || m_V.size()==0);
-
-    //if (m_state != On || !m_model_object || m_model_object->instances.empty() || ! m_instance_matrix.isApprox(m_source_data.matrix))
-    //    return false;
+        && ((m_model_object->id() != m_current_mesh_model_id) || m_V.size()==0);
 }
 
 void GLGizmoSlaSupports::update_mesh()
@@ -236,10 +365,12 @@ void GLGizmoSlaSupports::update_mesh()
     wxBusyCursor wait;
     Eigen::MatrixXf& V = m_V;
     Eigen::MatrixXi& F = m_F;
-    // Composite mesh of all instances in the world coordinate system.
+    // We rely on SLA model object having a single volume,
+    // this way we can use that mesh directly.
     // This mesh does not account for the possible Z up SLA offset.
-    TriangleMesh mesh = m_model_object->raw_mesh();
-    const stl_file& stl = mesh.stl;
+    m_mesh = &m_model_object->volumes.front()->mesh;
+    const_cast<TriangleMesh*>(m_mesh)->require_shared_vertices(); // TriangleMeshSlicer needs this
+    const stl_file& stl = m_mesh->stl;
     V.resize(3 * stl.stats.number_of_facets, 3);
     F.resize(stl.stats.number_of_facets, 3);
     for (unsigned int i=0; i<stl.stats.number_of_facets; ++i) {
@@ -251,54 +382,75 @@ void GLGizmoSlaSupports::update_mesh()
         F(i, 1) = 3*i+1;
         F(i, 2) = 3*i+2;
     }
+    m_current_mesh_model_id = m_model_object->id();
+    m_editing_mode = false;
 
     m_AABB = igl::AABB<Eigen::MatrixXf,3>();
     m_AABB.init(m_V, m_F);
 }
 
+// Unprojects the mouse position on the mesh and return the hit point and normal of the facet.
+// The function throws if no intersection if found.
 std::pair<Vec3f, Vec3f> GLGizmoSlaSupports::unproject_on_mesh(const Vec2d& mouse_pos)
 {
     // if the gizmo doesn't have the V, F structures for igl, calculate them first:
     if (m_V.size() == 0)
         update_mesh();
 
-    Eigen::Matrix<GLint, 4, 1, Eigen::DontAlign> viewport;
-    ::glGetIntegerv(GL_VIEWPORT, viewport.data());
-    Eigen::Matrix<GLdouble, 4, 4, Eigen::DontAlign> modelview_matrix;
-    ::glGetDoublev(GL_MODELVIEW_MATRIX, modelview_matrix.data());
-    Eigen::Matrix<GLdouble, 4, 4, Eigen::DontAlign> projection_matrix;
-    ::glGetDoublev(GL_PROJECTION_MATRIX, projection_matrix.data());
+    const Camera& camera = m_parent.get_camera();
+    const std::array<int, 4>& viewport = camera.get_viewport();
+    const Transform3d& modelview_matrix = camera.get_view_matrix();
+    const Transform3d& projection_matrix = camera.get_projection_matrix();
 
     Vec3d point1;
     Vec3d point2;
-    ::gluUnProject(mouse_pos(0), viewport(3)-mouse_pos(1), 0.f, modelview_matrix.data(), projection_matrix.data(), viewport.data(), &point1(0), &point1(1), &point1(2));
-    ::gluUnProject(mouse_pos(0), viewport(3)-mouse_pos(1), 1.f, modelview_matrix.data(), projection_matrix.data(), viewport.data(), &point2(0), &point2(1), &point2(2));
+    ::gluUnProject(mouse_pos(0), viewport[3] - mouse_pos(1), 0.f, modelview_matrix.data(), projection_matrix.data(), viewport.data(), &point1(0), &point1(1), &point1(2));
+    ::gluUnProject(mouse_pos(0), viewport[3] - mouse_pos(1), 1.f, modelview_matrix.data(), projection_matrix.data(), viewport.data(), &point2(0), &point2(1), &point2(2));
 
-    igl::Hit hit;
+    std::vector<igl::Hit> hits;
 
     const Selection& selection = m_parent.get_selection();
     const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
-    double z_offset = volume->get_sla_shift_z();
 
-    point1(2) -= z_offset;
-	point2(2) -= z_offset;
+    point1(2) -= m_z_shift;
+	point2(2) -= m_z_shift;
 
     Transform3d inv = volume->get_instance_transformation().get_matrix().inverse();
 
     point1 = inv * point1;
     point2 = inv * point2;
 
-    if (!m_AABB.intersect_ray(m_V, m_F, point1.cast<float>(), (point2-point1).cast<float>(), hit))
+    if (!m_AABB.intersect_ray(m_V, m_F, point1.cast<float>(), (point2-point1).cast<float>(), hits))
         throw std::invalid_argument("unproject_on_mesh(): No intersection found.");
 
-    int fid = hit.id;   // facet id
-    Vec3f bc(1-hit.u-hit.v, hit.u, hit.v); // barycentric coordinates of the hit
-    Vec3f a = (m_V.row(m_F(fid, 1)) - m_V.row(m_F(fid, 0)));
-    Vec3f b = (m_V.row(m_F(fid, 2)) - m_V.row(m_F(fid, 0)));
+    std::sort(hits.begin(), hits.end(), [](const igl::Hit& a, const igl::Hit& b) { return a.t < b.t; });
+
+    // Now let's iterate through the points and find the first that is not clipped:
+    unsigned int i=0;
+    Vec3f bc;
+    Vec3f a;
+    Vec3f b;
+    Vec3f result;
+    for (i=0; i<hits.size(); ++i) {
+        igl::Hit& hit = hits[i];
+        int fid = hit.id;   // facet id
+        bc = Vec3f(1-hit.u-hit.v, hit.u, hit.v); // barycentric coordinates of the hit
+        a = (m_V.row(m_F(fid, 1)) - m_V.row(m_F(fid, 0)));
+        b = (m_V.row(m_F(fid, 2)) - m_V.row(m_F(fid, 0)));
+        result = bc(0) * m_V.row(m_F(fid, 0)) + bc(1) * m_V.row(m_F(fid, 1)) + bc(2)*m_V.row(m_F(fid, 2));
+        if (m_clipping_plane_distance == 0.f || !is_point_clipped(result.cast<double>()))
+            break;
+    }
+
+    if (i==hits.size() || (hits.size()-i) % 2 != 0) {
+        // All hits are either clipped, or there is an odd number of unclipped
+        // hits - meaning the nearest must be from inside the mesh.
+        throw std::invalid_argument("unproject_on_mesh(): No intersection found.");
+    }
 
     // Calculate and return both the point and the facet normal.
     return std::make_pair(
-            bc(0) * m_V.row(m_F(fid, 0)) + bc(1) * m_V.row(m_F(fid, 1)) + bc(2)*m_V.row(m_F(fid, 2)),
+            result,
             a.cross(b)
         );
 }
@@ -307,27 +459,31 @@ std::pair<Vec3f, Vec3f> GLGizmoSlaSupports::unproject_on_mesh(const Vec2d& mouse
 // The gizmo has an opportunity to react - if it does, it should return true so that the Canvas3D is
 // aware that the event was reacted to and stops trying to make different sense of it. If the gizmo
 // concludes that the event was not intended for it, it should return false.
-bool GLGizmoSlaSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down)
+bool GLGizmoSlaSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down)
 {
     if (m_editing_mode) {
 
-        // left down - show the selection rectangle:
-        if (action == SLAGizmoEventType::LeftDown && shift_down) {
+        // left down with shift - show the selection rectangle:
+        if (action == SLAGizmoEventType::LeftDown && (shift_down || alt_down || control_down)) {
             if (m_hover_id == -1) {
-                m_selection_rectangle_active = true;
-                m_selection_rectangle_start_corner = mouse_position;
-                m_selection_rectangle_end_corner = mouse_position;
-                m_canvas_width = m_parent.get_canvas_size().get_width();
-                m_canvas_height = m_parent.get_canvas_size().get_height();
+                if (shift_down || alt_down) {
+                    m_selection_rectangle.start_dragging(mouse_position, shift_down ? GLSelectionRectangle::Select : GLSelectionRectangle::Deselect);
+                }
+            }
+            else {
+                if (m_editing_mode_cache[m_hover_id].selected)
+                    unselect_point(m_hover_id);
+                else {
+                    if (!alt_down)
+                        select_point(m_hover_id);
+                }
             }
-            else
-                select_point(m_hover_id);
 
             return true;
         }
 
         // left down without selection rectangle - place point on the mesh:
-        if (action == SLAGizmoEventType::LeftDown && !m_selection_rectangle_active && !shift_down) {
+        if (action == SLAGizmoEventType::LeftDown && !m_selection_rectangle.is_dragging() && !shift_down) {
             // If any point is in hover state, this should initiate its move - return control back to GLCanvas:
             if (m_hover_id != -1)
                 return false;
@@ -352,53 +508,80 @@ bool GLGizmoSlaSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
         }
 
         // left up with selection rectangle - select points inside the rectangle:
-        if ((action == SLAGizmoEventType::LeftUp || action == SLAGizmoEventType::ShiftUp) && m_selection_rectangle_active) {
+        if ((action == SLAGizmoEventType::LeftUp || action == SLAGizmoEventType::ShiftUp || action == SLAGizmoEventType::AltUp) && m_selection_rectangle.is_dragging()) {
+            // Is this a selection or deselection rectangle?
+            GLSelectionRectangle::EState rectangle_status = m_selection_rectangle.get_state();
+
+            // First collect positions of all the points in world coordinates.
             const Transform3d& instance_matrix = m_model_object->instances[m_active_instance]->get_transformation().get_matrix();
-            GLint viewport[4];
-            ::glGetIntegerv(GL_VIEWPORT, viewport);
-            GLdouble modelview_matrix[16];
-            ::glGetDoublev(GL_MODELVIEW_MATRIX, modelview_matrix);
-            GLdouble projection_matrix[16];
-            ::glGetDoublev(GL_PROJECTION_MATRIX, projection_matrix);
-
-            const Selection& selection = m_parent.get_selection();
-            const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
-            double z_offset = volume->get_sla_shift_z();
-
-            // bounding box created from the rectangle corners - will take care of order of the corners
-            BoundingBox rectangle(Points{Point(m_selection_rectangle_start_corner.cast<coord_t>()), Point(m_selection_rectangle_end_corner.cast<coord_t>())});
-
-            const Transform3d& instance_matrix_no_translation = volume->get_instance_transformation().get_matrix(true);
-            // we'll recover current look direction from the modelview matrix (in world coords)...
-            Vec3f direction_to_camera(modelview_matrix[2], modelview_matrix[6], modelview_matrix[10]);
-            // ...and transform it to model coords.
-            direction_to_camera = (instance_matrix_no_translation.inverse().cast<float>() * direction_to_camera).normalized().eval();
-
-            // Iterate over all points, check if they're in the rectangle and if so, check that they are not obscured by the mesh:
+            std::vector<Vec3d> points;
             for (unsigned int i=0; i<m_editing_mode_cache.size(); ++i) {
                 const sla::SupportPoint &support_point = m_editing_mode_cache[i].support_point;
-                Vec3f pos = instance_matrix.cast<float>() * support_point.pos;
-                pos(2) += z_offset;
-                  GLdouble out_x, out_y, out_z;
-                 ::gluProject((GLdouble)pos(0), (GLdouble)pos(1), (GLdouble)pos(2), modelview_matrix, projection_matrix, viewport, &out_x, &out_y, &out_z);
-                 out_y = m_canvas_height - out_y;
+                points.push_back(instance_matrix * support_point.pos.cast<double>());
+                points.back()(2) += m_z_shift;
+            }
+            // Now ask the rectangle which of the points are inside.
+            const Camera& camera = m_parent.get_camera();
+            std::vector<unsigned int> selected_idxs = m_selection_rectangle.stop_dragging(m_parent, points);
 
-                if (rectangle.contains(Point(out_x, out_y))) {
+            // we'll recover current look direction (in world coords) and transform it to model coords.
+            const Selection& selection = m_parent.get_selection();
+            const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
+            const Transform3d& instance_matrix_no_translation_no_scaling = volume->get_instance_transformation().get_matrix(true,false,true);
+            Vec3f direction_to_camera = camera.get_dir_forward().cast<float>();
+            Vec3f direction_to_camera_mesh = (instance_matrix_no_translation_no_scaling.inverse().cast<float>() * direction_to_camera).normalized().eval();
+            Vec3f scaling = volume->get_instance_scaling_factor().cast<float>();
+            direction_to_camera_mesh = Vec3f(direction_to_camera_mesh(0)*scaling(0), direction_to_camera_mesh(1)*scaling(1), direction_to_camera_mesh(2)*scaling(2));
+
+            // Iterate over all points in the rectangle and check that they are neither clipped by the
+            // clipping plane nor obscured by the mesh.
+            for (const unsigned int i : selected_idxs) {
+                const sla::SupportPoint &support_point = m_editing_mode_cache[i].support_point;
+                if (!is_point_clipped(support_point.pos.cast<double>())) {
                     bool is_obscured = false;
                     // Cast a ray in the direction of the camera and look for intersection with the mesh:
                     std::vector<igl::Hit> hits;
                     // Offset the start of the ray to the front of the ball + EPSILON to account for numerical inaccuracies.
-                    if (m_AABB.intersect_ray(m_V, m_F, support_point.pos + direction_to_camera * (support_point.head_front_radius + EPSILON), direction_to_camera, hits))
+                    if (m_AABB.intersect_ray(m_V, m_F, support_point.pos + direction_to_camera_mesh * (support_point.head_front_radius + EPSILON), direction_to_camera_mesh, hits)) {
+                        std::sort(hits.begin(), hits.end(), [](const igl::Hit& h1, const igl::Hit& h2) { return h1.t < h2.t; });
+
+                        if (m_clipping_plane_distance != 0.f) {
+                            // If the closest hit facet normal points in the same direction as the ray,
+                            // we are looking through the mesh and should therefore discard the point:
+                            int fid = hits.front().id;   // facet id
+                            Vec3f a = (m_V.row(m_F(fid, 1)) - m_V.row(m_F(fid, 0)));
+                            Vec3f b = (m_V.row(m_F(fid, 2)) - m_V.row(m_F(fid, 0)));
+                            if ((a.cross(b)).dot(direction_to_camera_mesh) > 0.f)
+                                is_obscured = true;
+
+                            // Eradicate all hits that are on clipped surfaces:
+                            for (unsigned int j=0; j<hits.size(); ++j) {
+                                const igl::Hit& hit = hits[j];
+                                int fid = hit.id;   // facet id
+
+                                Vec3f bc = Vec3f(1-hit.u-hit.v, hit.u, hit.v); // barycentric coordinates of the hit
+                                Vec3f hit_pos = bc(0) * m_V.row(m_F(fid, 0)) + bc(1) * m_V.row(m_F(fid, 1)) + bc(2)*m_V.row(m_F(fid, 2));
+                                if (is_point_clipped(hit_pos.cast<double>())) {
+                                    hits.erase(hits.begin()+j);
+                                    --j;
+                                }
+                            }
+                        }
+
                         // FIXME: the intersection could in theory be behind the camera, but as of now we only have camera direction.
                         // Also, the threshold is in mesh coordinates, not in actual dimensions.
-                        if (hits.size() > 1 || hits.front().t > 0.001f)
+                        if (!hits.empty())
                             is_obscured = true;
+                    }
 
-                    if (!is_obscured)
-                        select_point(i);
+                    if (!is_obscured) {
+                        if (rectangle_status == GLSelectionRectangle::Deselect)
+                            unselect_point(i);
+                        else
+                            select_point(i);
+                    }
                 }
             }
-            m_selection_rectangle_active = false;
             return true;
         }
 
@@ -416,8 +599,8 @@ bool GLGizmoSlaSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
                 return true; // point has been placed and the button not released yet
                              // this prevents GLCanvas from starting scene rotation
 
-            if (m_selection_rectangle_active)  {
-                m_selection_rectangle_end_corner = mouse_position;
+            if (m_selection_rectangle.is_dragging())  {
+                m_selection_rectangle.dragging(mouse_position);
                 return true;
             }
 
@@ -468,6 +651,23 @@ bool GLGizmoSlaSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
         }
     }
 
+    if (action == SLAGizmoEventType::MouseWheelUp && control_down) {
+        m_clipping_plane_distance = std::min(1.f, m_clipping_plane_distance + 0.01f);
+        m_parent.set_as_dirty();
+        return true;
+    }
+
+    if (action == SLAGizmoEventType::MouseWheelDown && control_down) {
+        m_clipping_plane_distance = std::max(0.f, m_clipping_plane_distance - 0.01f);
+        m_parent.set_as_dirty();
+        return true;
+    }
+
+    if (action == SLAGizmoEventType::ResetClippingPlane) {
+        reset_clipping_plane_normal();
+        return true;
+    }
+
     return false;
 }
 
@@ -545,6 +745,65 @@ void GLGizmoSlaSupports::update_cache_entry_normal(unsigned int i) const
 
 
 
+
+ClippingPlane GLGizmoSlaSupports::get_sla_clipping_plane() const
+{
+    if (!m_model_object || m_state == Off)
+        return ClippingPlane::ClipsNothing();
+
+    //Eigen::Matrix<GLdouble, 4, 4, Eigen::DontAlign> modelview_matrix;
+    //::glGetDoublev(GL_MODELVIEW_MATRIX, modelview_matrix.data());
+    // we'll recover current look direction from the modelview matrix (in world coords):
+    //Vec3d direction_to_camera(modelview_matrix.data()[2], modelview_matrix.data()[6], modelview_matrix.data()[10]);
+
+    const Vec3d& direction_to_camera = m_clipping_plane_normal;
+    float dist = direction_to_camera.dot(m_model_object->instances[m_active_instance]->get_offset() + Vec3d(0., 0., m_z_shift));
+
+    return ClippingPlane(-direction_to_camera.normalized(),(dist - (-m_active_instance_bb_radius) - m_clipping_plane_distance * 2*m_active_instance_bb_radius));
+}
+
+
+/*
+void GLGizmoSlaSupports::find_intersecting_facets(const igl::AABB<Eigen::MatrixXf, 3>* aabb, const Vec3f& normal, double offset, std::vector<unsigned int>& idxs) const
+{
+    if (aabb->is_leaf()) { // this is a facet
+        // corner.dot(normal) - offset
+        idxs.push_back(aabb->m_primitive);
+    }
+    else { // not a leaf
+    using CornerType = Eigen::AlignedBox<float, 3>::CornerType;
+        bool sign = std::signbit(offset - normal.dot(aabb->m_box.corner(CornerType(0))));
+        for (unsigned int i=1; i<8; ++i)
+            if (std::signbit(offset - normal.dot(aabb->m_box.corner(CornerType(i)))) != sign) {
+                find_intersecting_facets(aabb->m_left, normal, offset, idxs);
+                find_intersecting_facets(aabb->m_right, normal, offset, idxs);
+            }
+    }
+}
+
+
+
+void GLGizmoSlaSupports::make_line_segments() const
+{
+    TriangleMeshSlicer tms(&m_model_object->volumes.front()->mesh);
+    Vec3f normal(0.f, 1.f, 1.f);
+    double d = 0.;
+
+    std::vector<IntersectionLine> lines;
+    find_intersections(&m_AABB, normal, d, lines);
+    ExPolygons expolys;
+    tms.make_expolygons_simple(lines, &expolys);
+
+    SVG svg("slice_loops.svg", get_extents(expolys));
+    svg.draw(expolys);
+    //for (const IntersectionLine &l : lines[i])
+    //    svg.draw(l, "red", 0);
+    //svg.draw_outline(expolygons, "black", "blue", 0);
+    svg.Close();
+}
+*/
+
+
 void GLGizmoSlaSupports::on_render_input_window(float x, float y, float bottom_limit, const Selection& selection)
 {
     if (!m_model_object)
@@ -553,34 +812,35 @@ void GLGizmoSlaSupports::on_render_input_window(float x, float y, float bottom_l
     bool first_run = true; // This is a hack to redraw the button when all points are removed,
                            // so it is not delayed until the background process finishes.
 RENDER_AGAIN:
+    //m_imgui->set_next_window_pos(x, y, ImGuiCond_Always);
+    //const ImVec2 window_size(m_imgui->scaled(18.f, 16.f));
+    //ImGui::SetNextWindowPos(ImVec2(x, y - std::max(0.f, y+window_size.y-bottom_limit) ));
+    //ImGui::SetNextWindowSize(ImVec2(window_size));
+    
+    const float approx_height = m_imgui->scaled(18.0f);
+    y = std::min(y, bottom_limit - approx_height);
     m_imgui->set_next_window_pos(x, y, ImGuiCond_Always);
-
-    const float scaling = m_imgui->get_style_scaling();
-    const ImVec2 window_size(285.f * scaling, 300.f * scaling);
-    ImGui::SetNextWindowPos(ImVec2(x, y - std::max(0.f, y+window_size.y-bottom_limit) ));
-    ImGui::SetNextWindowSize(ImVec2(window_size));
-
     m_imgui->set_next_window_bg_alpha(0.5f);
-    m_imgui->begin(on_get_name(), ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
+    m_imgui->begin(on_get_name(), ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse);
 
-    ImGui::PushItemWidth(100.0f);
+    //ImGui::PushItemWidth(m_imgui->scaled(5.55f));
 
     bool force_refresh = false;
     bool remove_selected = false;
     bool remove_all = false;
 
     if (m_editing_mode) {
-        m_imgui->text(_(L("Left mouse click - add point")));
-        m_imgui->text(_(L("Right mouse click - remove point")));
-        m_imgui->text(_(L("Shift + Left (+ drag) - select point(s)")));
-        m_imgui->text(" ");  // vertical gap
 
         float diameter_upper_cap = static_cast<ConfigOptionFloat*>(wxGetApp().preset_bundle->sla_prints.get_edited_preset().config.option("support_pillar_diameter"))->value;
         if (m_new_point_head_diameter > diameter_upper_cap)
             m_new_point_head_diameter = diameter_upper_cap;
 
-        m_imgui->text(_(L("Head diameter: ")));
-        ImGui::SameLine();
+        wxString text = _(L("Head diameter")) + ": ";
+        m_imgui->text(text);
+        float slider_left = m_imgui->calc_text_size(text).x + m_imgui->scaled(1.f);
+        ImGui::SameLine(/*m_imgui->scaled(6.66f)*/slider_left);
+        ImGui::PushItemWidth(/*m_imgui->scaled(8.33f)*/m_imgui->scaled(15.f) - slider_left);
+
         if (ImGui::SliderFloat("", &m_new_point_head_diameter, 0.1f, diameter_upper_cap, "%.1f")) {
             // value was changed
             for (auto& cache_entry : m_editing_mode_cache)
@@ -616,9 +876,12 @@ RENDER_AGAIN:
         }
     }
     else { // not in editing mode:
-        ImGui::PushItemWidth(100.0f);
-        m_imgui->text(_(L("Minimal points distance: ")));
-        ImGui::SameLine();
+        wxString text1 = _(L("Minimal points distance")) + ": ";
+        wxString text2 = _(L("Support points density")) + ": ";
+        float sliders_left = std::max(m_imgui->calc_text_size(text1).x, m_imgui->calc_text_size(text2).x) + m_imgui->scaled(1.f);
+        m_imgui->text(text1);
+        ImGui::SameLine(/*m_imgui->scaled(9.44f)*/sliders_left);
+        ImGui::PushItemWidth(/*m_imgui->scaled(5.55f)*/m_imgui->scaled(15.f)-sliders_left);
 
         std::vector<const ConfigOption*> opts = get_config_options({"support_points_density_relative", "support_points_minimal_distance"});
         float density = static_cast<const ConfigOptionInt*>(opts[0])->value;
@@ -628,8 +891,9 @@ RENDER_AGAIN:
         if (value_changed)
             m_model_object->config.opt<ConfigOptionFloat>("support_points_minimal_distance", true)->value = minimal_point_distance;
 
-        m_imgui->text(_(L("Support points density: ")));
-        ImGui::SameLine();
+        m_imgui->text(text2);
+        ImGui::SameLine(/*m_imgui->scaled(9.44f)*/sliders_left);
+
         if (ImGui::SliderFloat(" ", &density, 0.f, 200.f, "%.f %%")) {
             value_changed = true;
             m_model_object->config.opt<ConfigOptionInt>("support_points_density_relative", true)->value = (int)density;
@@ -642,25 +906,52 @@ RENDER_AGAIN:
             });
         }
 
-        bool generate = m_imgui->button(_(L("Auto-generate points [A]")));
+        bool generate = m_imgui->button(_(L("Auto-generate points")));
 
         if (generate)
             auto_generate();
 
         m_imgui->text("");
-        if (m_imgui->button(_(L("Manual editing [M]"))))
+        if (m_imgui->button(_(L("Manual editing"))))
             switch_to_editing_mode();
 
         m_imgui->disabled_begin(m_editing_mode_cache.empty());
         remove_all = m_imgui->button(_(L("Remove all points")));
         m_imgui->disabled_end();
 
-        m_imgui->text("");
+        // m_imgui->text("");
+        // m_imgui->text(m_model_object->sla_points_status == sla::PointsStatus::None ? _(L("No points  (will be autogenerated)")) :
+        //              (m_model_object->sla_points_status == sla::PointsStatus::AutoGenerated ? _(L("Autogenerated points (no modifications)")) :
+        //              (m_model_object->sla_points_status == sla::PointsStatus::UserModified ? _(L("User-modified points")) :
+        //              (m_model_object->sla_points_status == sla::PointsStatus::Generating ? _(L("Generation in progress...")) : "UNKNOWN STATUS"))));
+    }
 
-        m_imgui->text(m_model_object->sla_points_status == sla::PointsStatus::None ? "No points  (will be autogenerated)" :
-                     (m_model_object->sla_points_status == sla::PointsStatus::AutoGenerated ? "Autogenerated points (no modifications)" :
-                     (m_model_object->sla_points_status == sla::PointsStatus::UserModified ? "User-modified points" :
-                     (m_model_object->sla_points_status == sla::PointsStatus::Generating ? "Generation in progress..." : "UNKNOWN STATUS"))));
+
+    // Following is rendered in both editing and non-editing mode:
+    m_imgui->text("");
+    wxString text1 = _(L("Clipping of view"))+ ": ";
+    wxString text2 = _(L("Reset direction"));
+    float slider_left = std::max(m_imgui->calc_text_size(text1).x, m_imgui->calc_text_size(text2).x) + m_imgui->scaled(1.5f);
+    if (m_clipping_plane_distance == 0.f)
+        m_imgui->text(text1);
+    else {
+        if (m_imgui->button(text2)) {
+            wxGetApp().CallAfter([this](){
+                    reset_clipping_plane_normal();
+                });
+        }
+    }
+
+    ImGui::SameLine(/*m_imgui->scaled(6.66f)*/slider_left);
+    ImGui::PushItemWidth(/*m_imgui->scaled(8.33f)*/m_imgui->scaled(15.f) - slider_left);
+    ImGui::SliderFloat("  ", &m_clipping_plane_distance, 0.f, 1.f, "%.2f");
+
+
+    if (m_imgui->button("?")) {
+        wxGetApp().CallAfter([]() {
+            SlaGizmoHelpDialog help_dlg;
+            help_dlg.ShowModal();
+        });
     }
 
     m_imgui->end();
@@ -711,44 +1002,54 @@ bool GLGizmoSlaSupports::on_is_selectable() const
 
 std::string GLGizmoSlaSupports::on_get_name() const
 {
-    return L("SLA Support Points [L]");
+    return (_(L("SLA Support Points")) + " [L]").ToUTF8().data();
 }
 
 void GLGizmoSlaSupports::on_set_state()
 {
-    if (m_state == On && m_old_state != On) { // the gizmo was just turned on
-        if (is_mesh_update_necessary())
-            update_mesh();
+        if (m_state == On && m_old_state != On) { // the gizmo was just turned on
+            if (is_mesh_update_necessary())
+                update_mesh();
 
-        // we'll now reload support points:
-        if (m_model_object)
-            editing_mode_reload_cache();
+            // we'll now reload support points:
+            if (m_model_object)
+                editing_mode_reload_cache();
 
-        m_parent.toggle_model_objects_visibility(false);
-        if (m_model_object)
-            m_parent.toggle_model_objects_visibility(true, m_model_object, m_active_instance);
+            m_parent.toggle_model_objects_visibility(false);
+            if (m_model_object)
+                m_parent.toggle_model_objects_visibility(true, m_model_object, m_active_instance);
 
-        // Set default head diameter from config.
-        const DynamicPrintConfig& cfg = wxGetApp().preset_bundle->sla_prints.get_edited_preset().config;
-        m_new_point_head_diameter = static_cast<const ConfigOptionFloat*>(cfg.option("support_head_front_diameter"))->value;
-    }
-    if (m_state == Off && m_old_state != Off) { // the gizmo was just turned Off
-        if (m_model_object) {
-            if (m_unsaved_changes) {
-                wxMessageDialog dlg(GUI::wxGetApp().plater(), _(L("Do you want to save your manually edited support points ?\n")),
-                                    _(L("Save changes?")), wxICON_QUESTION | wxYES | wxNO);
-                if (dlg.ShowModal() == wxID_YES)
-                    editing_mode_apply_changes();
-                else
-                    editing_mode_discard_changes();
-            }
+            // Set default head diameter from config.
+            const DynamicPrintConfig& cfg = wxGetApp().preset_bundle->sla_prints.get_edited_preset().config;
+            m_new_point_head_diameter = static_cast<const ConfigOptionFloat*>(cfg.option("support_head_front_diameter"))->value;
         }
-
-        m_parent.toggle_model_objects_visibility(true);
-        m_editing_mode = false; // so it is not active next time the gizmo opens
-        m_editing_mode_cache.clear();
-    }
-    m_old_state = m_state;
+        if (m_state == Off && m_old_state != Off) { // the gizmo was just turned Off
+            wxGetApp().CallAfter([this]() {
+                // Following is called through CallAfter, because otherwise there was a problem
+                // on OSX with the wxMessageDialog being shown several times when clicked into.
+                if (m_model_object) {
+                    if (m_unsaved_changes) {
+                        wxMessageDialog dlg(GUI::wxGetApp().mainframe, _(L("Do you want to save your manually edited support points?")) + "\n",
+                                            _(L("Save changes?")), wxICON_QUESTION | wxYES | wxNO);
+                        if (dlg.ShowModal() == wxID_YES)
+                            editing_mode_apply_changes();
+                        else
+                            editing_mode_discard_changes();
+                    }
+                }
+                m_parent.toggle_model_objects_visibility(true);
+                m_editing_mode = false; // so it is not active next time the gizmo opens
+                m_editing_mode_cache.clear();
+                m_clipping_plane_distance = 0.f;
+                // Release triangle mesh slicer and the AABB spatial search structure.
+                m_AABB.deinit();
+				m_V = Eigen::MatrixXf();
+				m_F = Eigen::MatrixXi();
+                m_tms.reset();
+                m_supports_tms.reset();
+            });
+        }
+        m_old_state = m_state;
 }
 
 
@@ -781,14 +1082,35 @@ void GLGizmoSlaSupports::select_point(int i)
 }
 
 
+void GLGizmoSlaSupports::unselect_point(int i)
+{
+    m_editing_mode_cache[i].selected = false;
+    m_selection_empty = true;
+    for (const CacheEntry& ce : m_editing_mode_cache) {
+        if (ce.selected) {
+            m_selection_empty = false;
+            break;
+        }
+    }
+}
+
+
 
 void GLGizmoSlaSupports::editing_mode_discard_changes()
 {
-    m_editing_mode_cache.clear();
-    for (const sla::SupportPoint& point : m_model_object->sla_support_points)
-        m_editing_mode_cache.emplace_back(point, false);
-    m_editing_mode = false;
-    m_unsaved_changes = false;
+    // If the points were autogenerated, they may not be on the ModelObject yet.
+    // Because the user probably messed with the cache, we will get the data
+    // from the backend again.
+
+    if (m_model_object->sla_points_status == sla::PointsStatus::AutoGenerated)
+        get_data_from_backend();
+    else {
+        m_editing_mode_cache.clear();
+        for (const sla::SupportPoint& point : m_model_object->sla_support_points)
+            m_editing_mode_cache.emplace_back(point, false);
+    }
+        m_editing_mode = false;
+        m_unsaved_changes = false;
 }
 
 
@@ -806,7 +1128,7 @@ void GLGizmoSlaSupports::editing_mode_apply_changes()
         // Recalculate support structures once the editing mode is left.
         // m_parent.post_event(SimpleEvent(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS));
         // m_parent.post_event(SimpleEvent(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS));
-        wxGetApp().plater()->reslice_SLA_supports(*m_model_object);
+        wxGetApp().CallAfter([this]() { wxGetApp().plater()->reslice_SLA_supports(*m_model_object); });
     }
     m_editing_mode = false;
     m_unsaved_changes = false;
@@ -859,7 +1181,7 @@ void GLGizmoSlaSupports::auto_generate()
         m_model_object->sla_support_points.clear();
         m_model_object->sla_points_status = sla::PointsStatus::Generating;
         m_editing_mode_cache.clear();
-        wxGetApp().plater()->reslice_SLA_supports(*m_model_object);
+        wxGetApp().CallAfter([this]() { wxGetApp().plater()->reslice_SLA_supports(*m_model_object); });
     }
 }
 
@@ -873,5 +1195,77 @@ void GLGizmoSlaSupports::switch_to_editing_mode()
     m_editing_mode = true;
 }
 
+
+
+void GLGizmoSlaSupports::reset_clipping_plane_normal() const
+{
+    Eigen::Matrix<double, 4, 4, Eigen::DontAlign> modelview_matrix;
+    ::glGetDoublev(GL_MODELVIEW_MATRIX, modelview_matrix.data());
+    m_clipping_plane_normal = Vec3d(modelview_matrix.data()[2], modelview_matrix.data()[6], modelview_matrix.data()[10]);
+    m_parent.set_as_dirty();
+}
+
+
+SlaGizmoHelpDialog::SlaGizmoHelpDialog()
+: wxDialog(NULL, wxID_ANY, _(L("SLA gizmo keyboard shortcuts")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+{
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    const wxString ctrl = GUI::shortkey_ctrl_prefix();
+    const wxString alt  = GUI::shortkey_alt_prefix();
+
+
+    // fonts
+    const wxFont& font = wxGetApp().small_font();
+    const wxFont& bold_font = wxGetApp().bold_font();
+
+    auto note_text = new wxStaticText(this, wxID_ANY, _(L("Note: some shortcuts work in (non)editing mode only.")));
+    note_text->SetFont(font);
+
+    auto vsizer    = new wxBoxSizer(wxVERTICAL);
+    auto gridsizer = new wxFlexGridSizer(2, 5, 15);
+    auto hsizer    = new wxBoxSizer(wxHORIZONTAL);
+
+    hsizer->AddSpacer(20);
+    hsizer->Add(vsizer);
+    hsizer->AddSpacer(20);
+
+    vsizer->AddSpacer(20);
+    vsizer->Add(note_text, 1, wxALIGN_CENTRE_HORIZONTAL);
+    vsizer->AddSpacer(20);
+    vsizer->Add(gridsizer);
+    vsizer->AddSpacer(20);
+
+    std::vector<std::pair<wxString, wxString>> shortcuts;
+    shortcuts.push_back(std::make_pair(_(L("Left click")),          _(L("Add point"))));
+    shortcuts.push_back(std::make_pair(_(L("Right click")),         _(L("Remove point"))));
+    shortcuts.push_back(std::make_pair(_(L("Drag")),                _(L("Move point"))));
+    shortcuts.push_back(std::make_pair(ctrl+_(L("Left click")),     _(L("Add point to selection"))));
+    shortcuts.push_back(std::make_pair(alt+_(L("Left click")),      _(L("Remove point from selection"))));
+    shortcuts.push_back(std::make_pair(wxString("Shift+")+_(L("Drag")), _(L("Select by rectangle"))));
+    shortcuts.push_back(std::make_pair(alt+_(L("Drag")),            _(L("Deselect by rectangle"))));
+    shortcuts.push_back(std::make_pair(ctrl+"A",                    _(L("Select all points"))));
+    shortcuts.push_back(std::make_pair("Delete",                    _(L("Remove selected points"))));
+    shortcuts.push_back(std::make_pair(ctrl+_(L("Mouse wheel")),    _(L("Move clipping plane"))));
+    shortcuts.push_back(std::make_pair("R",                         _(L("Reset clipping plane"))));
+    shortcuts.push_back(std::make_pair("Enter",                     _(L("Apply changes"))));
+    shortcuts.push_back(std::make_pair("Esc",                       _(L("Discard changes"))));
+    shortcuts.push_back(std::make_pair("M",                         _(L("Switch to editing mode"))));
+    shortcuts.push_back(std::make_pair("A",                         _(L("Auto-generate points"))));
+
+    for (const auto& pair : shortcuts) {
+        auto shortcut = new wxStaticText(this, wxID_ANY, pair.first);
+        auto desc = new wxStaticText(this, wxID_ANY, pair.second);
+        shortcut->SetFont(bold_font);
+        desc->SetFont(font);
+        gridsizer->Add(shortcut, -1, wxALIGN_CENTRE_VERTICAL);
+        gridsizer->Add(desc, -1, wxALIGN_CENTRE_VERTICAL);
+    }
+
+    SetSizer(hsizer);
+    hsizer->SetSizeHints(this);
+}
+
+
+
 } // namespace GUI
-} // namespace Slic3r
+} // namespace Slic3r
\ No newline at end of file
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp
index 993ab06bf..7e09b04ac 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.hpp
@@ -2,6 +2,8 @@
 #define slic3r_GLGizmoSlaSupports_hpp_
 
 #include "GLGizmoBase.hpp"
+#include "GLGizmos.hpp"
+#include "slic3r/GUI/GLSelectionRectangle.hpp"
 
 // There is an L function in igl that would be overridden by our localization macro - let's undefine it...
 #undef L
@@ -10,19 +12,24 @@
 
 #include "libslic3r/SLA/SLACommon.hpp"
 #include "libslic3r/SLAPrint.hpp"
+#include <wx/dialog.h>
 
 
 namespace Slic3r {
 namespace GUI {
 
 
+class ClippingPlane;
+
+
 class GLGizmoSlaSupports : public GLGizmoBase
 {
 private:
     ModelObject* m_model_object = nullptr;
-    ModelObject* m_old_model_object = nullptr;
+    ModelID m_current_mesh_model_id = 0;
     int m_active_instance = -1;
-    int m_old_instance_id = -1;
+    float m_active_instance_bb_radius; // to cache the bb
+    mutable float m_z_shift = 0.f;
     std::pair<Vec3f, Vec3f> unproject_on_mesh(const Vec2d& mouse_pos);
 
     const float RenderPointScale = 1.f;
@@ -31,10 +38,13 @@ private:
     Eigen::MatrixXf m_V; // vertices
     Eigen::MatrixXi m_F; // facets indices
     igl::AABB<Eigen::MatrixXf,3> m_AABB;
-
-    struct SourceDataSummary {
-        Geometry::Transformation transformation;
-    };
+    const TriangleMesh* m_mesh;
+    mutable const TriangleMesh* m_supports_mesh;
+    mutable std::vector<Vec2f> m_triangles;
+    mutable std::vector<Vec2f> m_supports_triangles;
+    mutable int m_old_timestamp = -1;
+    mutable int m_print_object_idx = -1;
+    mutable int m_print_objects_count = -1;
 
     class CacheEntry {
     public:
@@ -46,11 +56,6 @@ private:
         Vec3f normal;
     };
 
-    // This holds information to decide whether recalculation is necessary:
-    SourceDataSummary m_source_data;
-
-    mutable Vec3d m_starting_center;
-
 public:
 #if ENABLE_SVG_ICONS
     GLGizmoSlaSupports(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
@@ -59,9 +64,12 @@ public:
 #endif // ENABLE_SVG_ICONS
     virtual ~GLGizmoSlaSupports();
     void set_sla_support_data(ModelObject* model_object, const Selection& selection);
-    bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down);
+    bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down);
     void delete_selected_points(bool force = false);
-    std::pair<float, float> get_sla_clipping_plane() const;
+    ClippingPlane get_sla_clipping_plane() const;
+
+    bool is_in_editing_mode() const { return m_editing_mode; }
+    bool is_selection_rectangle_dragging() const { return m_selection_rectangle.is_dragging(); }
 
 private:
     bool on_init();
@@ -69,8 +77,9 @@ private:
     virtual void on_render(const Selection& selection) const;
     virtual void on_render_for_picking(const Selection& selection) const;
 
-    void render_selection_rectangle() const;
+    //void render_selection_rectangle() const;
     void render_points(const Selection& selection, bool picking = false) const;
+    void render_clipping_plane(const Selection& selection) const;
     bool is_mesh_update_necessary() const;
     void update_mesh();
     void update_cache_entry_normal(unsigned int i) const;
@@ -80,21 +89,25 @@ private:
     bool m_old_editing_state = false;       // To keep track of whether the user toggled between the modes (needed for imgui refreshes).
     float m_new_point_head_diameter;        // Size of a new point.
     float m_minimal_point_distance = 20.f;
-    float m_density = 100.f;
     mutable std::vector<CacheEntry> m_editing_mode_cache; // a support point and whether it is currently selected
     float m_clipping_plane_distance = 0.f;
+    mutable float m_old_clipping_plane_distance = 0.f;
+    mutable Vec3d m_old_clipping_plane_normal;
+    mutable Vec3d m_clipping_plane_normal = Vec3d::Zero();
+
+    GLSelectionRectangle m_selection_rectangle;
 
-    bool m_selection_rectangle_active = false;
-    Vec2d m_selection_rectangle_start_corner;
-    Vec2d m_selection_rectangle_end_corner;
     bool m_wait_for_up_event = false;
     bool m_unsaved_changes = false; // Are there unsaved changes in manual mode?
     bool m_selection_empty = true;
     EState m_old_state = Off; // to be able to see that the gizmo has just been closed (see on_set_state)
-    int m_canvas_width;
-    int m_canvas_height;
+
+    mutable std::unique_ptr<TriangleMeshSlicer> m_tms;
+    mutable std::unique_ptr<TriangleMeshSlicer> m_supports_tms;
 
     std::vector<const ConfigOption*> get_config_options(const std::vector<std::string>& keys) const;
+    bool is_point_clipped(const Vec3d& point) const;
+    //void find_intersecting_facets(const igl::AABB<Eigen::MatrixXf, 3>* aabb, const Vec3f& normal, double offset, std::vector<unsigned int>& out) const;
 
     // Methods that do the model_object and editing cache synchronization,
     // editing mode selection, etc:
@@ -103,12 +116,14 @@ private:
         NoPoints,
     };
     void select_point(int i);
+    void unselect_point(int i);
     void editing_mode_apply_changes();
     void editing_mode_discard_changes();
     void editing_mode_reload_cache();
     void get_data_from_backend();
     void auto_generate();
     void switch_to_editing_mode();
+    void reset_clipping_plane_normal() const;
 
 protected:
     void on_set_state() override;
@@ -121,6 +136,12 @@ protected:
 };
 
 
+class SlaGizmoHelpDialog : public wxDialog
+{
+public:
+    SlaGizmoHelpDialog();
+};
+
 } // namespace GUI
 } // namespace Slic3r
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmos.hpp b/src/slic3r/GUI/Gizmos/GLGizmos.hpp
index 8c5e25669..2e98899be 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmos.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmos.hpp
@@ -1,6 +1,25 @@
 #ifndef slic3r_GLGizmos_hpp_
 #define slic3r_GLGizmos_hpp_
 
+// this describes events being passed from GLCanvas3D to SlaSupport gizmo
+enum class SLAGizmoEventType {
+    LeftDown = 1,
+    LeftUp,
+    RightDown,
+    Dragging,
+    Delete,
+    SelectAll,
+    ShiftUp,
+    AltUp,
+    ApplyChanges,
+    DiscardChanges,
+    AutomaticGeneration,
+    ManualEditing,
+    MouseWheelUp,
+    MouseWheelDown,
+    ResetClippingPlane
+};
+
 #include "slic3r/GUI/Gizmos/GLGizmoMove.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoScale.hpp"
 #include "slic3r/GUI/Gizmos/GLGizmoRotate.hpp"
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
new file mode 100644
index 000000000..478bd1fa7
--- /dev/null
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -0,0 +1,1313 @@
+#include "libslic3r/libslic3r.h"
+#include "GLGizmosManager.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/3DScene.hpp"
+#include "slic3r/GUI/GUI_App.hpp"
+#include "slic3r/GUI/GUI_ObjectManipulation.hpp"
+#include "slic3r/GUI/PresetBundle.hpp"
+
+#include <GL/glew.h>
+#include <wx/glcanvas.h>
+
+namespace Slic3r {
+namespace GUI {
+
+#if ENABLE_SVG_ICONS
+    const float GLGizmosManager::Default_Icons_Size = 64;
+#endif // ENABLE_SVG_ICONS
+
+GLGizmosManager::GLGizmosManager()
+    : m_enabled(false)
+#if ENABLE_SVG_ICONS
+    , m_icons_texture_dirty(true)
+#endif // ENABLE_SVG_ICONS
+    , m_current(Undefined)
+#if ENABLE_SVG_ICONS
+    , m_overlay_icons_size(Default_Icons_Size)
+    , m_overlay_scale(1.0f)
+    , m_overlay_border(5.0f)
+    , m_overlay_gap_y(5.0f)
+    , m_tooltip("")
+{
+}
+#else
+{
+    set_overlay_scale(1.0);
+}
+#endif // ENABLE_SVG_ICONS
+
+GLGizmosManager::~GLGizmosManager()
+{
+    reset();
+}
+
+bool GLGizmosManager::init(GLCanvas3D& parent)
+{
+#if !ENABLE_SVG_ICONS
+    m_icons_texture.metadata.filename = "gizmos.png";
+    m_icons_texture.metadata.icon_size = 64;
+
+    if (!m_icons_texture.metadata.filename.empty())
+    {
+        if (!m_icons_texture.texture.load_from_file(resources_dir() + "/icons/" + m_icons_texture.metadata.filename, false))
+        {
+            reset();
+            return false;
+        }
+    }
+#endif // !ENABLE_SVG_ICONS
+
+    m_background_texture.metadata.filename = "toolbar_background.png";
+    m_background_texture.metadata.left = 16;
+    m_background_texture.metadata.top = 16;
+    m_background_texture.metadata.right = 16;
+    m_background_texture.metadata.bottom = 16;
+
+    if (!m_background_texture.metadata.filename.empty())
+    {
+        if (!m_background_texture.texture.load_from_file(resources_dir() + "/icons/" + m_background_texture.metadata.filename, false))
+        {
+            reset();
+            return false;
+        }
+    }
+
+#if ENABLE_SVG_ICONS
+    GLGizmoBase* gizmo = new GLGizmoMove3D(parent, "move.svg", 0);
+#else
+    GLGizmoBase* gizmo = new GLGizmoMove3D(parent, 0);
+#endif // ENABLE_SVG_ICONS
+    if (gizmo == nullptr)
+        return false;
+
+    if (!gizmo->init())
+        return false;
+
+    m_gizmos.insert(GizmosMap::value_type(Move, gizmo));
+
+#if ENABLE_SVG_ICONS
+    gizmo = new GLGizmoScale3D(parent, "scale.svg", 1);
+#else
+    gizmo = new GLGizmoScale3D(parent, 1);
+#endif // ENABLE_SVG_ICONS
+    if (gizmo == nullptr)
+        return false;
+
+    if (!gizmo->init())
+        return false;
+
+    m_gizmos.insert(GizmosMap::value_type(Scale, gizmo));
+
+#if ENABLE_SVG_ICONS
+    gizmo = new GLGizmoRotate3D(parent, "rotate.svg", 2);
+#else
+    gizmo = new GLGizmoRotate3D(parent, 2);
+#endif // ENABLE_SVG_ICONS
+    if (gizmo == nullptr)
+    {
+        reset();
+        return false;
+    }
+
+    if (!gizmo->init())
+    {
+        reset();
+        return false;
+    }
+
+    m_gizmos.insert(GizmosMap::value_type(Rotate, gizmo));
+
+#if ENABLE_SVG_ICONS
+    gizmo = new GLGizmoFlatten(parent, "place.svg", 3);
+#else
+    gizmo = new GLGizmoFlatten(parent, 3);
+#endif // ENABLE_SVG_ICONS
+    if (gizmo == nullptr)
+        return false;
+
+    if (!gizmo->init()) {
+        reset();
+        return false;
+    }
+
+    m_gizmos.insert(GizmosMap::value_type(Flatten, gizmo));
+
+#if ENABLE_SVG_ICONS
+    gizmo = new GLGizmoCut(parent, "cut.svg", 4);
+#else
+    gizmo = new GLGizmoCut(parent, 4);
+#endif // ENABLE_SVG_ICONS
+    if (gizmo == nullptr)
+        return false;
+
+    if (!gizmo->init()) {
+        reset();
+        return false;
+    }
+
+    m_gizmos.insert(GizmosMap::value_type(Cut, gizmo));
+
+#if ENABLE_SVG_ICONS
+    gizmo = new GLGizmoSlaSupports(parent, "sla_supports.svg", 5);
+#else
+    gizmo = new GLGizmoSlaSupports(parent, 5);
+#endif // ENABLE_SVG_ICONS
+    if (gizmo == nullptr)
+        return false;
+
+    if (!gizmo->init()) {
+        reset();
+        return false;
+    }
+
+    m_gizmos.insert(GizmosMap::value_type(SlaSupports, gizmo));
+
+    return true;
+}
+
+#if ENABLE_SVG_ICONS
+void GLGizmosManager::set_overlay_icon_size(float size)
+{
+    if (m_overlay_icons_size != size)
+    {
+        m_overlay_icons_size = size;
+        m_icons_texture_dirty = true;
+    }
+}
+#endif // ENABLE_SVG_ICONS
+
+void GLGizmosManager::set_overlay_scale(float scale)
+{
+#if ENABLE_SVG_ICONS
+    if (m_overlay_scale != scale)
+    {
+        m_overlay_scale = scale;
+        m_icons_texture_dirty = true;
+    }
+#else
+    m_overlay_icons_scale = scale;
+    m_overlay_border = 5.0f * scale;
+    m_overlay_gap_y = 5.0f * scale;
+#endif // ENABLE_SVG_ICONS
+}
+
+void GLGizmosManager::refresh_on_off_state(const Selection& selection)
+{
+    GizmosMap::iterator it = m_gizmos.find(m_current);
+    if ((it != m_gizmos.end()) && (it->second != nullptr))
+    {
+        if (!it->second->is_activable(selection))
+        {
+            it->second->set_state(GLGizmoBase::Off);
+            m_current = Undefined;
+        }
+    }
+}
+
+void GLGizmosManager::reset_all_states()
+{
+    if (!m_enabled)
+        return;
+
+    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if (it->second != nullptr)
+        {
+            it->second->set_state(GLGizmoBase::Off);
+            it->second->set_hover_id(-1);
+        }
+    }
+
+    m_current = Undefined;
+}
+
+void GLGizmosManager::set_hover_id(int id)
+{
+    if (!m_enabled)
+        return;
+
+    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if ((it->second != nullptr) && (it->second->get_state() == GLGizmoBase::On))
+            it->second->set_hover_id(id);
+    }
+}
+
+void GLGizmosManager::enable_grabber(EType type, unsigned int id, bool enable)
+{
+    if (!m_enabled)
+        return;
+
+    GizmosMap::const_iterator it = m_gizmos.find(type);
+    if (it != m_gizmos.end())
+    {
+        if (enable)
+            it->second->enable_grabber(id);
+        else
+            it->second->disable_grabber(id);
+    }
+}
+
+void GLGizmosManager::update(const Linef3& mouse_ray, const Selection& selection, const Point* mouse_pos)
+{
+    if (!m_enabled)
+        return;
+
+    GLGizmoBase* curr = get_current();
+    if (curr != nullptr)
+        curr->update(GLGizmoBase::UpdateData(mouse_ray, mouse_pos), selection);
+}
+
+void GLGizmosManager::update_data(GLCanvas3D& canvas)
+{
+    if (!m_enabled)
+        return;
+
+    const Selection& selection = canvas.get_selection();
+
+    bool is_wipe_tower = selection.is_wipe_tower();
+    enable_grabber(Move, 2, !is_wipe_tower);
+    enable_grabber(Rotate, 0, !is_wipe_tower);
+    enable_grabber(Rotate, 1, !is_wipe_tower);
+
+    bool enable_scale_xyz = selection.is_single_full_instance() || selection.is_single_volume() || selection.is_single_modifier();
+    for (int i = 0; i < 6; ++i)
+    {
+        enable_grabber(Scale, i, enable_scale_xyz);
+    }
+
+    if (selection.is_single_full_instance())
+    {
+        // all volumes in the selection belongs to the same instance, any of them contains the needed data, so we take the first
+        const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
+        set_scale(volume->get_instance_scaling_factor());
+        set_rotation(Vec3d::Zero());
+        ModelObject* model_object = selection.get_model()->objects[selection.get_object_idx()];
+        set_flattening_data(model_object);
+        set_sla_support_data(model_object, selection);
+    }
+    else if (selection.is_single_volume() || selection.is_single_modifier())
+    {
+        const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
+        set_scale(volume->get_volume_scaling_factor());
+        set_rotation(Vec3d::Zero());
+        set_flattening_data(nullptr);
+        set_sla_support_data(nullptr, selection);
+    }
+    else if (is_wipe_tower)
+    {
+        DynamicPrintConfig& config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
+        set_scale(Vec3d::Ones());
+        set_rotation(Vec3d(0., 0., (M_PI/180.) * dynamic_cast<const ConfigOptionFloat*>(config.option("wipe_tower_rotation_angle"))->value));
+        set_flattening_data(nullptr);
+        set_sla_support_data(nullptr, selection);
+    }
+    else
+    {
+        set_scale(Vec3d::Ones());
+        set_rotation(Vec3d::Zero());
+        set_flattening_data(selection.is_from_single_object() ? selection.get_model()->objects[selection.get_object_idx()] : nullptr);
+        set_sla_support_data(nullptr, selection);
+    }
+}
+
+bool GLGizmosManager::is_running() const
+{
+    if (!m_enabled)
+        return false;
+
+    GLGizmoBase* curr = get_current();
+    return (curr != nullptr) ? (curr->get_state() == GLGizmoBase::On) : false;
+}
+
+bool GLGizmosManager::handle_shortcut(int key, const Selection& selection)
+{
+    if (!m_enabled || selection.is_empty())
+        return false;
+
+    EType old_current = m_current;
+    bool handled = false;
+    for (GizmosMap::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if ((it->second == nullptr) || !it->second->is_selectable())
+            continue;
+
+        int it_key = it->second->get_shortcut_key();
+
+        if (it->second->is_activable(selection) && ((it_key == key - 64) || (it_key == key - 96)))
+        {
+            if ((it->second->get_state() == GLGizmoBase::On))
+            {
+                it->second->set_state(GLGizmoBase::Off);
+                m_current = Undefined;
+                handled = true;
+            }
+            else if ((it->second->get_state() == GLGizmoBase::Off))
+            {
+                it->second->set_state(GLGizmoBase::On);
+                m_current = it->first;
+                handled = true;
+            }
+        }
+    }
+
+    if (handled && (old_current != Undefined) && (old_current != m_current))
+    {
+        GizmosMap::const_iterator it = m_gizmos.find(old_current);
+        if (it != m_gizmos.end())
+            it->second->set_state(GLGizmoBase::Off);
+    }
+
+    return handled;
+}
+
+bool GLGizmosManager::is_dragging() const
+{
+    if (!m_enabled)
+        return false;
+
+    GLGizmoBase* curr = get_current();
+    return (curr != nullptr) ? curr->is_dragging() : false;
+}
+
+void GLGizmosManager::start_dragging(const Selection& selection)
+{
+    if (!m_enabled)
+        return;
+
+    GLGizmoBase* curr = get_current();
+    if (curr != nullptr)
+        curr->start_dragging(selection);
+}
+
+void GLGizmosManager::stop_dragging()
+{
+    if (!m_enabled)
+        return;
+
+    GLGizmoBase* curr = get_current();
+    if (curr != nullptr)
+        curr->stop_dragging();
+}
+
+Vec3d GLGizmosManager::get_displacement() const
+{
+    if (!m_enabled)
+        return Vec3d::Zero();
+
+    GizmosMap::const_iterator it = m_gizmos.find(Move);
+    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoMove3D*>(it->second)->get_displacement() : Vec3d::Zero();
+}
+
+Vec3d GLGizmosManager::get_scale() const
+{
+    if (!m_enabled)
+        return Vec3d::Ones();
+
+    GizmosMap::const_iterator it = m_gizmos.find(Scale);
+    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoScale3D*>(it->second)->get_scale() : Vec3d::Ones();
+}
+
+void GLGizmosManager::set_scale(const Vec3d& scale)
+{
+    if (!m_enabled)
+        return;
+
+    GizmosMap::const_iterator it = m_gizmos.find(Scale);
+    if (it != m_gizmos.end())
+        reinterpret_cast<GLGizmoScale3D*>(it->second)->set_scale(scale);
+}
+
+Vec3d GLGizmosManager::get_scale_offset() const
+{
+    if (!m_enabled)
+        return Vec3d::Zero();
+
+    GizmosMap::const_iterator it = m_gizmos.find(Scale);
+    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoScale3D*>(it->second)->get_offset() : Vec3d::Zero();
+}
+
+Vec3d GLGizmosManager::get_rotation() const
+{
+    if (!m_enabled)
+        return Vec3d::Zero();
+
+    GizmosMap::const_iterator it = m_gizmos.find(Rotate);
+    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoRotate3D*>(it->second)->get_rotation() : Vec3d::Zero();
+}
+
+void GLGizmosManager::set_rotation(const Vec3d& rotation)
+{
+    if (!m_enabled)
+        return;
+
+    GizmosMap::const_iterator it = m_gizmos.find(Rotate);
+    if (it != m_gizmos.end())
+        reinterpret_cast<GLGizmoRotate3D*>(it->second)->set_rotation(rotation);
+}
+
+Vec3d GLGizmosManager::get_flattening_normal() const
+{
+    if (!m_enabled)
+        return Vec3d::Zero();
+
+    GizmosMap::const_iterator it = m_gizmos.find(Flatten);
+    return (it != m_gizmos.end()) ? reinterpret_cast<GLGizmoFlatten*>(it->second)->get_flattening_normal() : Vec3d::Zero();
+}
+
+void GLGizmosManager::set_flattening_data(const ModelObject* model_object)
+{
+    if (!m_enabled)
+        return;
+
+    GizmosMap::const_iterator it = m_gizmos.find(Flatten);
+    if (it != m_gizmos.end())
+        reinterpret_cast<GLGizmoFlatten*>(it->second)->set_flattening_data(model_object);
+}
+
+void GLGizmosManager::set_sla_support_data(ModelObject* model_object, const Selection& selection)
+{
+    if (!m_enabled)
+        return;
+
+    GizmosMap::const_iterator it = m_gizmos.find(SlaSupports);
+    if (it != m_gizmos.end())
+        reinterpret_cast<GLGizmoSlaSupports*>(it->second)->set_sla_support_data(model_object, selection);
+}
+
+// Returns true if the gizmo used the event to do something, false otherwise.
+bool GLGizmosManager::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down)
+{
+    if (!m_enabled)
+        return false;
+
+    GizmosMap::const_iterator it = m_gizmos.find(SlaSupports);
+    if (it != m_gizmos.end())
+        return reinterpret_cast<GLGizmoSlaSupports*>(it->second)->gizmo_event(action, mouse_position, shift_down, alt_down, control_down);
+
+    return false;
+}
+
+ClippingPlane GLGizmosManager::get_sla_clipping_plane() const
+{
+    if (!m_enabled || m_current != SlaSupports)
+        return ClippingPlane::ClipsNothing();
+
+    GizmosMap::const_iterator it = m_gizmos.find(SlaSupports);
+    if (it != m_gizmos.end())
+        return reinterpret_cast<GLGizmoSlaSupports*>(it->second)->get_sla_clipping_plane();
+
+    return ClippingPlane::ClipsNothing();
+}
+
+
+void GLGizmosManager::render_current_gizmo(const Selection& selection) const
+{
+    if (!m_enabled)
+        return;
+
+    GLGizmoBase* curr = get_current();
+    if (curr != nullptr)
+        curr->render(selection);
+}
+
+void GLGizmosManager::render_current_gizmo_for_picking_pass(const Selection& selection) const
+{
+    if (!m_enabled)
+        return;
+
+    GLGizmoBase* curr = get_current();
+    if (curr != nullptr)
+        curr->render_for_picking(selection);
+}
+
+void GLGizmosManager::render_overlay(const GLCanvas3D& canvas, const Selection& selection) const
+{
+    if (!m_enabled)
+        return;
+
+#if ENABLE_SVG_ICONS
+    if (m_icons_texture_dirty)
+        generate_icons_texture();
+#endif // ENABLE_SVG_ICONS
+
+    glsafe(::glDisable(GL_DEPTH_TEST));
+
+    glsafe(::glPushMatrix());
+    glsafe(::glLoadIdentity());
+
+    do_render_overlay(canvas, selection);
+
+    glsafe(::glPopMatrix());
+}
+
+
+
+bool GLGizmosManager::on_mouse_wheel(wxMouseEvent& evt, GLCanvas3D& canvas)
+{
+    bool processed = false;
+
+    if (m_current == SlaSupports) {
+        float rot = (float)evt.GetWheelRotation() / (float)evt.GetWheelDelta();
+        if (gizmo_event((rot > 0.f ? SLAGizmoEventType::MouseWheelUp : SLAGizmoEventType::MouseWheelDown), Vec2d::Zero(), evt.ShiftDown(), evt.AltDown(), evt.ControlDown()))
+            processed = true;
+    }
+
+    return processed;
+}
+
+
+
+bool GLGizmosManager::on_mouse(wxMouseEvent& evt, GLCanvas3D& canvas)
+{
+    Point pos(evt.GetX(), evt.GetY());
+    Vec2d mouse_pos((double)evt.GetX(), (double)evt.GetY());
+
+    Selection& selection = canvas.get_selection();
+    int selected_object_idx = selection.get_object_idx();
+    bool processed = false;
+
+    // mouse anywhere
+    if (!evt.Dragging() && !evt.Leaving() && !evt.Entering() && (m_mouse_capture.parent != nullptr))
+    {
+        if (m_mouse_capture.any() && (evt.LeftUp() || evt.MiddleUp() || evt.RightUp()))
+            // prevents loosing selection into the scene if mouse down was done inside the toolbar and mouse up was down outside it
+            processed = true;
+
+        m_mouse_capture.reset();
+    }
+
+    // mouse anywhere
+    if (evt.Moving())
+        m_tooltip = update_hover_state(canvas, mouse_pos);
+    else if (evt.LeftUp())
+        m_mouse_capture.left = false;
+    else if (evt.MiddleUp())
+        m_mouse_capture.middle = false;
+    else if (evt.RightUp())
+        m_mouse_capture.right = false;
+    else if (evt.Dragging() && m_mouse_capture.any())
+        // if the button down was done on this toolbar, prevent from dragging into the scene
+        processed = true;
+
+    if (!overlay_contains_mouse(canvas, mouse_pos))
+    {
+        // mouse is outside the toolbar
+        m_tooltip = "";
+
+        if (evt.LeftDown())
+        {
+            if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::LeftDown, mouse_pos, evt.ShiftDown(), evt.AltDown(), evt.ControlDown()))
+                // the gizmo got the event and took some action, there is no need to do anything more
+                processed = true;
+            else if (!selection.is_empty() && grabber_contains_mouse())
+            {
+                update_data(canvas);
+                selection.start_dragging();
+                start_dragging(selection);
+
+                if (m_current == Flatten)
+                {
+                    // Rotate the object so the normal points downward:
+                    selection.flattening_rotate(get_flattening_normal());
+                    canvas.do_flatten();
+                    wxGetApp().obj_manipul()->set_dirty();
+                }
+
+                canvas.set_as_dirty();
+                processed = true;
+            }
+        }
+        else if (evt.RightDown() && (selected_object_idx != -1) && (m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::RightDown))
+            // event was taken care of by the SlaSupports gizmo
+            processed = true;
+        else if (evt.Dragging() && (canvas.get_move_volume_id() != -1) && (m_current == SlaSupports))
+            // don't allow dragging objects with the Sla gizmo on
+            processed = true;
+        else if (evt.Dragging() && (m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::Dragging, mouse_pos, evt.ShiftDown(), evt.AltDown(), evt.ControlDown()))
+        {
+            // the gizmo got the event and took some action, no need to do anything more here
+            canvas.set_as_dirty();
+            processed = true;
+        }
+        else if (evt.Dragging() && is_dragging())
+        {
+            if (!canvas.get_wxglcanvas()->HasCapture())
+                canvas.get_wxglcanvas()->CaptureMouse();
+
+            canvas.set_mouse_as_dragging();
+            update(canvas.mouse_ray(pos), selection, &pos);
+
+            switch (m_current)
+            {
+            case Move:
+            {
+                // Apply new temporary offset
+                selection.translate(get_displacement());
+                wxGetApp().obj_manipul()->set_dirty();
+                break;
+            }
+            case Scale:
+            {
+                // Apply new temporary scale factors
+				TransformationType transformation_type(TransformationType::Local_Absolute_Joint);
+				if (evt.AltDown())
+					transformation_type.set_independent();
+				selection.scale(get_scale(), transformation_type);
+                selection.translate(get_scale_offset(), true);
+                wxGetApp().obj_manipul()->set_dirty();
+                break;
+            }
+            case Rotate:
+            {
+                // Apply new temporary rotations
+                TransformationType transformation_type(TransformationType::World_Relative_Joint);
+                if (evt.AltDown())
+                    transformation_type.set_independent();
+                selection.rotate(get_rotation(), transformation_type);
+                wxGetApp().obj_manipul()->set_dirty();
+                break;
+            }
+            default:
+                break;
+            }
+
+            canvas.set_as_dirty();
+            processed = true;
+        }
+        else if (evt.LeftUp() && is_dragging())
+        {
+            switch (m_current)
+            {
+            case Move:
+            {
+                canvas.disable_regenerate_volumes();
+                canvas.do_move();
+                break;
+            }
+            case Scale:
+            {
+                canvas.do_scale();
+                break;
+            }
+            case Rotate:
+            {
+                canvas.do_rotate();
+                break;
+            }
+            default:
+                break;
+            }
+
+            stop_dragging();
+            update_data(canvas);
+
+            wxGetApp().obj_manipul()->set_dirty();
+            // Let the platter know that the dragging finished, so a delayed refresh
+            // of the scene with the background processing data should be performed.
+            canvas.post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED));
+            // updates camera target constraints
+            canvas.refresh_camera_scene_box();
+
+            processed = true;
+        }
+        else if (evt.LeftUp() && (m_current == SlaSupports) && !canvas.is_mouse_dragging())
+        {
+            // in case SLA gizmo is selected, we just pass the LeftUp event and stop processing - neither
+            // object moving or selecting is suppressed in that case
+            gizmo_event(SLAGizmoEventType::LeftUp, mouse_pos, evt.ShiftDown(), evt.AltDown(), evt.ControlDown());
+            processed = true;
+        }
+        else if (evt.LeftUp() && (m_current == Flatten) && ((canvas.get_first_hover_volume_idx() != -1) || grabber_contains_mouse()))
+        {
+            // to avoid to loose the selection when user clicks an object while the Flatten gizmo is active
+            processed = true;
+        }
+    }
+    else
+    {
+        // mouse inside toolbar
+        if (evt.LeftDown() || evt.LeftDClick())
+        {
+            m_mouse_capture.left = true;
+            m_mouse_capture.parent = &canvas;
+            processed = true;
+            if (!selection.is_empty())
+            {
+                update_on_off_state(canvas, mouse_pos, selection);
+                update_data(canvas);
+                canvas.set_as_dirty();
+            }
+        }
+        else if (evt.MiddleDown())
+        {
+            m_mouse_capture.middle = true;
+            m_mouse_capture.parent = &canvas;
+        }
+        else if (evt.RightDown())
+        {
+            m_mouse_capture.right = true;
+            m_mouse_capture.parent = &canvas;
+        }
+        else if (evt.LeftUp())
+            processed = true;
+    }
+
+    return processed;
+}
+
+bool GLGizmosManager::on_char(wxKeyEvent& evt, GLCanvas3D& canvas)
+{
+    // see include/wx/defs.h enum wxKeyCode
+    int keyCode = evt.GetKeyCode();
+    int ctrlMask = wxMOD_CONTROL;
+
+    bool processed = false;
+
+    if ((evt.GetModifiers() & ctrlMask) != 0)
+    {
+        switch (keyCode)
+        {
+#ifdef __APPLE__
+        case 'a':
+        case 'A':
+#else /* __APPLE__ */
+        case WXK_CONTROL_A:
+#endif /* __APPLE__ */
+        {
+            // Sla gizmo selects all support points
+            if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::SelectAll))
+                processed = true;
+
+            break;
+        }
+        }
+    }
+    else if (!evt.HasModifiers())
+    {
+        switch (keyCode)
+        {
+        // key ESC
+        case WXK_ESCAPE:
+        {
+            if (m_current != Undefined)
+            {
+                if ((m_current != SlaSupports) || !gizmo_event(SLAGizmoEventType::DiscardChanges))
+                    reset_all_states();
+
+                processed = true;
+            }
+            break;
+        }
+        case WXK_RETURN:
+        {
+            if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::ApplyChanges))
+                processed = true;
+
+            break;
+        }
+
+        case 'r' :
+        case 'R' :
+        {
+            if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::ResetClippingPlane))
+                processed = true;
+
+            break;
+        }
+
+#ifdef __APPLE__
+        case WXK_BACK: // the low cost Apple solutions are not equipped with a Delete key, use Backspace instead.
+#else /* __APPLE__ */
+        case WXK_DELETE:
+#endif /* __APPLE__ */
+        {
+            if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::Delete))
+                processed = true;
+
+            break;
+        }
+        case 'A':
+        case 'a':
+        {
+            if (m_current == SlaSupports)
+            {
+                gizmo_event(SLAGizmoEventType::AutomaticGeneration);
+                // set as processed no matter what's returned by gizmo_event() to avoid the calling canvas to process 'A' as arrange
+                processed = true;
+            }
+            break;
+        }
+        case 'M':
+        case 'm':
+        {
+            if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::ManualEditing))
+                processed = true;
+                
+            break;
+        }
+        }
+    }
+
+    if (!processed && !evt.HasModifiers())
+    {
+        if (handle_shortcut(keyCode, canvas.get_selection()))
+        {
+            update_data(canvas);
+            processed = true;
+        }
+    }
+
+    if (processed)
+        canvas.set_as_dirty();
+
+    return processed;
+}
+
+bool GLGizmosManager::on_key(wxKeyEvent& evt, GLCanvas3D& canvas)
+{
+    const int keyCode = evt.GetKeyCode();
+    bool processed = false;
+
+    if (evt.GetEventType() == wxEVT_KEY_UP)
+    {
+        if (m_current == SlaSupports)
+        {
+            GLGizmoSlaSupports* gizmo = reinterpret_cast<GLGizmoSlaSupports*>(get_current());
+
+            if (keyCode == WXK_SHIFT)
+            {
+                // shift has been just released - SLA gizmo might want to close rectangular selection.
+                if (gizmo_event(SLAGizmoEventType::ShiftUp) || (gizmo->is_in_editing_mode() && gizmo->is_selection_rectangle_dragging()))
+                    processed = true;
+            }
+            else if (keyCode == WXK_ALT)
+            {
+                // alt has been just released - SLA gizmo might want to close rectangular selection.
+                if (gizmo_event(SLAGizmoEventType::AltUp) || (gizmo->is_in_editing_mode() && gizmo->is_selection_rectangle_dragging()))
+                    processed = true;
+            }
+        }
+
+//        if (processed)
+//            canvas.set_cursor(GLCanvas3D::Standard);
+    }
+    else if (evt.GetEventType() == wxEVT_KEY_DOWN)
+    {
+        if ((m_current == SlaSupports) && ((keyCode == WXK_SHIFT) || (keyCode == WXK_ALT)) && reinterpret_cast<GLGizmoSlaSupports*>(get_current())->is_in_editing_mode())
+        {
+//            canvas.set_cursor(GLCanvas3D::Cross);
+            processed = true;
+        }
+    }
+
+    if (processed)
+        canvas.set_as_dirty();
+
+    return processed;
+}
+
+void GLGizmosManager::reset()
+{
+    for (GizmosMap::value_type& gizmo : m_gizmos)
+    {
+        delete gizmo.second;
+        gizmo.second = nullptr;
+    }
+
+    m_gizmos.clear();
+}
+
+void GLGizmosManager::do_render_overlay(const GLCanvas3D& canvas, const Selection& selection) const
+{
+    if (m_gizmos.empty())
+        return;
+
+    float cnv_w = (float)canvas.get_canvas_size().get_width();
+    float cnv_h = (float)canvas.get_canvas_size().get_height();
+    float zoom = canvas.get_camera().zoom;
+    float inv_zoom = (zoom != 0.0f) ? 1.0f / zoom : 0.0f;
+
+    float height = get_total_overlay_height();
+    float width = get_total_overlay_width();
+#if ENABLE_SVG_ICONS
+    float scaled_border = m_overlay_border * m_overlay_scale * inv_zoom;
+#else
+    float scaled_border = m_overlay_border * inv_zoom;
+#endif // ENABLE_SVG_ICONS
+
+    float top_x = (-0.5f * cnv_w) * inv_zoom;
+    float top_y = (0.5f * height) * inv_zoom;
+
+    float left = top_x;
+    float top = top_y;
+    float right = left + width * inv_zoom;
+    float bottom = top - height * inv_zoom;
+
+    // renders background
+    unsigned int bg_tex_id = m_background_texture.texture.get_id();
+    float bg_tex_width = (float)m_background_texture.texture.get_width();
+    float bg_tex_height = (float)m_background_texture.texture.get_height();
+    if ((bg_tex_id != 0) && (bg_tex_width > 0) && (bg_tex_height > 0))
+    {
+        float inv_bg_tex_width = (bg_tex_width != 0.0f) ? 1.0f / bg_tex_width : 0.0f;
+        float inv_bg_tex_height = (bg_tex_height != 0.0f) ? 1.0f / bg_tex_height : 0.0f;
+
+        float bg_uv_left = 0.0f;
+        float bg_uv_right = 1.0f;
+        float bg_uv_top = 1.0f;
+        float bg_uv_bottom = 0.0f;
+
+        float bg_left = left;
+        float bg_right = right;
+        float bg_top = top;
+        float bg_bottom = bottom;
+        float bg_width = right - left;
+        float bg_height = top - bottom;
+        float bg_min_size = std::min(bg_width, bg_height);
+
+        float bg_uv_i_left = (float)m_background_texture.metadata.left * inv_bg_tex_width;
+        float bg_uv_i_right = 1.0f - (float)m_background_texture.metadata.right * inv_bg_tex_width;
+        float bg_uv_i_top = 1.0f - (float)m_background_texture.metadata.top * inv_bg_tex_height;
+        float bg_uv_i_bottom = (float)m_background_texture.metadata.bottom * inv_bg_tex_height;
+
+        float bg_i_left = bg_left + scaled_border;
+        float bg_i_right = bg_right - scaled_border;
+        float bg_i_top = bg_top - scaled_border;
+        float bg_i_bottom = bg_bottom + scaled_border;
+
+        bg_uv_left = bg_uv_i_left;
+        bg_i_left = bg_left;
+
+        if ((m_overlay_border > 0) && (bg_uv_top != bg_uv_i_top))
+        {
+            if (bg_uv_left != bg_uv_i_left)
+                GLTexture::render_sub_texture(bg_tex_id, bg_left, bg_i_left, bg_i_top, bg_top, { { bg_uv_left, bg_uv_i_top }, { bg_uv_i_left, bg_uv_i_top }, { bg_uv_i_left, bg_uv_top }, { bg_uv_left, bg_uv_top } });
+
+            GLTexture::render_sub_texture(bg_tex_id, bg_i_left, bg_i_right, bg_i_top, bg_top, { { bg_uv_i_left, bg_uv_i_top }, { bg_uv_i_right, bg_uv_i_top }, { bg_uv_i_right, bg_uv_top }, { bg_uv_i_left, bg_uv_top } });
+
+            if (bg_uv_right != bg_uv_i_right)
+                GLTexture::render_sub_texture(bg_tex_id, bg_i_right, bg_right, bg_i_top, bg_top, { { bg_uv_i_right, bg_uv_i_top }, { bg_uv_right, bg_uv_i_top }, { bg_uv_right, bg_uv_top }, { bg_uv_i_right, bg_uv_top } });
+        }
+
+        if ((m_overlay_border > 0) && (bg_uv_left != bg_uv_i_left))
+            GLTexture::render_sub_texture(bg_tex_id, bg_left, bg_i_left, bg_i_bottom, bg_i_top, { { bg_uv_left, bg_uv_i_bottom }, { bg_uv_i_left, bg_uv_i_bottom }, { bg_uv_i_left, bg_uv_i_top }, { bg_uv_left, bg_uv_i_top } });
+
+        GLTexture::render_sub_texture(bg_tex_id, bg_i_left, bg_i_right, bg_i_bottom, bg_i_top, { { bg_uv_i_left, bg_uv_i_bottom }, { bg_uv_i_right, bg_uv_i_bottom }, { bg_uv_i_right, bg_uv_i_top }, { bg_uv_i_left, bg_uv_i_top } });
+
+        if ((m_overlay_border > 0) && (bg_uv_right != bg_uv_i_right))
+            GLTexture::render_sub_texture(bg_tex_id, bg_i_right, bg_right, bg_i_bottom, bg_i_top, { { bg_uv_i_right, bg_uv_i_bottom }, { bg_uv_right, bg_uv_i_bottom }, { bg_uv_right, bg_uv_i_top }, { bg_uv_i_right, bg_uv_i_top } });
+
+        if ((m_overlay_border > 0) && (bg_uv_bottom != bg_uv_i_bottom))
+        {
+            if (bg_uv_left != bg_uv_i_left)
+                GLTexture::render_sub_texture(bg_tex_id, bg_left, bg_i_left, bg_bottom, bg_i_bottom, { { bg_uv_left, bg_uv_bottom }, { bg_uv_i_left, bg_uv_bottom }, { bg_uv_i_left, bg_uv_i_bottom }, { bg_uv_left, bg_uv_i_bottom } });
+
+            GLTexture::render_sub_texture(bg_tex_id, bg_i_left, bg_i_right, bg_bottom, bg_i_bottom, { { bg_uv_i_left, bg_uv_bottom }, { bg_uv_i_right, bg_uv_bottom }, { bg_uv_i_right, bg_uv_i_bottom }, { bg_uv_i_left, bg_uv_i_bottom } });
+
+            if (bg_uv_right != bg_uv_i_right)
+                GLTexture::render_sub_texture(bg_tex_id, bg_i_right, bg_right, bg_bottom, bg_i_bottom, { { bg_uv_i_right, bg_uv_bottom }, { bg_uv_right, bg_uv_bottom }, { bg_uv_right, bg_uv_i_bottom }, { bg_uv_i_right, bg_uv_i_bottom } });
+        }
+    }
+
+#if ENABLE_SVG_ICONS
+    top_x += scaled_border;
+    top_y -= scaled_border;
+    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale * inv_zoom;
+
+    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale * inv_zoom;
+    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
+    unsigned int icons_texture_id = m_icons_texture.get_id();
+    unsigned int tex_width = m_icons_texture.get_width();
+    unsigned int tex_height = m_icons_texture.get_height();
+    float inv_tex_width = (tex_width != 0) ? 1.0f / (float)tex_width : 0.0f;
+    float inv_tex_height = (tex_height != 0) ? 1.0f / (float)tex_height : 0.0f;
+#else
+    top_x += m_overlay_border * inv_zoom;
+    top_y -= m_overlay_border * inv_zoom;
+    float scaled_gap_y = m_overlay_gap_y * inv_zoom;
+
+    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale * inv_zoom;
+    unsigned int icons_texture_id = m_icons_texture.texture.get_id();
+    unsigned int texture_size = m_icons_texture.texture.get_width();
+    float inv_texture_size = (texture_size != 0) ? 1.0f / (float)texture_size : 0.0f;
+#endif // ENABLE_SVG_ICONS
+
+#if ENABLE_SVG_ICONS
+    if ((icons_texture_id == 0) || (tex_width <= 0) || (tex_height <= 0))
+        return;
+#endif // ENABLE_SVG_ICONS
+
+    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if ((it->second == nullptr) || !it->second->is_selectable())
+            continue;
+
+        unsigned int sprite_id = it->second->get_sprite_id();
+        GLGizmoBase::EState state = it->second->get_state();
+
+#if ENABLE_SVG_ICONS
+        float u_icon_size = m_overlay_icons_size * m_overlay_scale * inv_tex_width;
+        float v_icon_size = m_overlay_icons_size * m_overlay_scale * inv_tex_height;
+        float v_top = sprite_id * v_icon_size;
+        float u_left = state * u_icon_size;
+        float v_bottom = v_top + v_icon_size;
+        float u_right = u_left + u_icon_size;
+#else
+        float uv_icon_size = (float)m_icons_texture.metadata.icon_size * inv_texture_size;
+        float v_top = sprite_id * uv_icon_size;
+        float u_left = state * uv_icon_size;
+        float v_bottom = v_top + uv_icon_size;
+        float u_right = u_left + uv_icon_size;
+#endif // ENABLE_SVG_ICONS
+
+        GLTexture::render_sub_texture(icons_texture_id, top_x, top_x + scaled_icons_size, top_y - scaled_icons_size, top_y, { { u_left, v_bottom }, { u_right, v_bottom }, { u_right, v_top }, { u_left, v_top } });
+        if (it->second->get_state() == GLGizmoBase::On) {
+            float toolbar_top = (float)cnv_h - canvas.get_view_toolbar_height();
+#if ENABLE_SVG_ICONS
+            it->second->render_input_window(width, 0.5f * cnv_h - top_y * zoom, toolbar_top, selection);
+#else
+            it->second->render_input_window(2.0f * m_overlay_border + icon_size * zoom, 0.5f * cnv_h - top_y * zoom, toolbar_top, selection);
+#endif // ENABLE_SVG_ICONS
+        }
+#if ENABLE_SVG_ICONS
+        top_y -= scaled_stride_y;
+#else
+        top_y -= (scaled_icons_size + scaled_gap_y);
+#endif // ENABLE_SVG_ICONS
+    }
+}
+
+float GLGizmosManager::get_total_overlay_height() const
+{
+#if ENABLE_SVG_ICONS
+    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
+    float scaled_border = m_overlay_border * m_overlay_scale;
+    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
+    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
+    float height = 2.0f * scaled_border;
+#else
+    float height = 2.0f * m_overlay_border;
+
+    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
+#endif // ENABLE_SVG_ICONS
+
+    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if ((it->second == nullptr) || !it->second->is_selectable())
+            continue;
+
+#if ENABLE_SVG_ICONS
+        height += scaled_stride_y;
+#else
+        height += (scaled_icons_size + m_overlay_gap_y);
+#endif // ENABLE_SVG_ICONS
+    }
+
+#if ENABLE_SVG_ICONS
+    return height - scaled_gap_y;
+#else
+    return height - m_overlay_gap_y;
+#endif // ENABLE_SVG_ICONS
+}
+
+float GLGizmosManager::get_total_overlay_width() const
+{
+#if ENABLE_SVG_ICONS
+    return (2.0f * m_overlay_border + m_overlay_icons_size) * m_overlay_scale;
+#else
+    return (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale + 2.0f * m_overlay_border;
+#endif // ENABLE_SVG_ICONS
+}
+
+GLGizmoBase* GLGizmosManager::get_current() const
+{
+    GizmosMap::const_iterator it = m_gizmos.find(m_current);
+    return (it != m_gizmos.end()) ? it->second : nullptr;
+}
+
+#if ENABLE_SVG_ICONS
+bool GLGizmosManager::generate_icons_texture() const
+{
+    std::string path = resources_dir() + "/icons/";
+    std::vector<std::string> filenames;
+    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if (it->second != nullptr)
+        {
+            const std::string& icon_filename = it->second->get_icon_filename();
+            if (!icon_filename.empty())
+                filenames.push_back(path + icon_filename);
+        }
+    }
+
+    std::vector<std::pair<int, bool>> states;
+    states.push_back(std::make_pair(1, false));
+    states.push_back(std::make_pair(0, false));
+    states.push_back(std::make_pair(0, true));
+
+    bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, (unsigned int)(m_overlay_icons_size * m_overlay_scale));
+    if (res)
+        m_icons_texture_dirty = false;
+
+    return res;
+}
+#endif // ENABLE_SVG_ICONS
+
+void GLGizmosManager::update_on_off_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos, const Selection& selection)
+{
+    if (!m_enabled)
+        return;
+
+    float cnv_h = (float)canvas.get_canvas_size().get_height();
+    float height = get_total_overlay_height();
+
+#if ENABLE_SVG_ICONS
+    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
+    float scaled_border = m_overlay_border * m_overlay_scale;
+    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
+    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
+    float top_y = 0.5f * (cnv_h - height) + scaled_border;
+#else
+    float top_y = 0.5f * (cnv_h - height) + m_overlay_border;
+    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
+#endif // ENABLE_SVG_ICONS
+
+    for (GizmosMap::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if ((it->second == nullptr) || !it->second->is_selectable())
+            continue;
+
+#if ENABLE_SVG_ICONS
+        bool inside = (scaled_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= scaled_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
+#else
+        bool inside = (m_overlay_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= m_overlay_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
+#endif // ENABLE_SVG_ICONS
+        if (it->second->is_activable(selection) && inside)
+        {
+            if ((it->second->get_state() == GLGizmoBase::On))
+            {
+                it->second->set_state(GLGizmoBase::Hover);
+                m_current = Undefined;
+            }
+            else if ((it->second->get_state() == GLGizmoBase::Hover))
+            {
+                it->second->set_state(GLGizmoBase::On);
+                m_current = it->first;
+            }
+        }
+        else
+            it->second->set_state(GLGizmoBase::Off);
+
+#if ENABLE_SVG_ICONS
+        top_y += scaled_stride_y;
+#else
+        top_y += (scaled_icons_size + m_overlay_gap_y);
+#endif // ENABLE_SVG_ICONS
+    }
+
+    GizmosMap::iterator it = m_gizmos.find(m_current);
+    if ((it != m_gizmos.end()) && (it->second != nullptr) && (it->second->get_state() != GLGizmoBase::On))
+        it->second->set_state(GLGizmoBase::On);
+}
+
+std::string GLGizmosManager::update_hover_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos)
+{
+    std::string name = "";
+
+    if (!m_enabled)
+        return name;
+
+    const Selection& selection = canvas.get_selection();
+
+    float cnv_h = (float)canvas.get_canvas_size().get_height();
+    float height = get_total_overlay_height();
+#if ENABLE_SVG_ICONS
+    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
+    float scaled_border = m_overlay_border * m_overlay_scale;
+    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
+    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
+    float top_y = 0.5f * (cnv_h - height) + scaled_border;
+#else
+    float top_y = 0.5f * (cnv_h - height) + m_overlay_border;
+    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
+#endif // ENABLE_SVG_ICONS
+
+    for (GizmosMap::iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if ((it->second == nullptr) || !it->second->is_selectable())
+            continue;
+
+#if ENABLE_SVG_ICONS
+        bool inside = (scaled_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= scaled_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
+#else
+        bool inside = (m_overlay_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= m_overlay_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size);
+#endif // ENABLE_SVG_ICONS
+        if (inside)
+            name = it->second->get_name();
+
+        if (it->second->is_activable(selection) && (it->second->get_state() != GLGizmoBase::On))
+            it->second->set_state(inside ? GLGizmoBase::Hover : GLGizmoBase::Off);
+
+#if ENABLE_SVG_ICONS
+        top_y += scaled_stride_y;
+#else
+        top_y += (scaled_icons_size + m_overlay_gap_y);
+#endif // ENABLE_SVG_ICONS
+    }
+
+    return name;
+}
+
+bool GLGizmosManager::overlay_contains_mouse(const GLCanvas3D& canvas, const Vec2d& mouse_pos) const
+{
+    if (!m_enabled)
+        return false;
+
+    float cnv_h = (float)canvas.get_canvas_size().get_height();
+    float height = get_total_overlay_height();
+
+#if ENABLE_SVG_ICONS
+    float scaled_icons_size = m_overlay_icons_size * m_overlay_scale;
+    float scaled_border = m_overlay_border * m_overlay_scale;
+    float scaled_gap_y = m_overlay_gap_y * m_overlay_scale;
+    float scaled_stride_y = scaled_icons_size + scaled_gap_y;
+    float top_y = 0.5f * (cnv_h - height) + scaled_border;
+#else
+    float top_y = 0.5f * (cnv_h - height) + m_overlay_border;
+    float scaled_icons_size = (float)m_icons_texture.metadata.icon_size * m_overlay_icons_scale;
+#endif // ENABLE_SVG_ICONS
+
+    for (GizmosMap::const_iterator it = m_gizmos.begin(); it != m_gizmos.end(); ++it)
+    {
+        if ((it->second == nullptr) || !it->second->is_selectable())
+            continue;
+
+#if ENABLE_SVG_ICONS
+        if ((scaled_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= scaled_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size))
+#else
+        if ((m_overlay_border <= (float)mouse_pos(0)) && ((float)mouse_pos(0) <= m_overlay_border + scaled_icons_size) && (top_y <= (float)mouse_pos(1)) && ((float)mouse_pos(1) <= top_y + scaled_icons_size))
+#endif // ENABLE_SVG_ICONS
+            return true;
+
+#if ENABLE_SVG_ICONS
+        top_y += scaled_stride_y;
+#else
+        top_y += (scaled_icons_size + m_overlay_gap_y);
+#endif // ENABLE_SVG_ICONS
+    }
+
+    return false;
+}
+
+bool GLGizmosManager::grabber_contains_mouse() const
+{
+    if (!m_enabled)
+        return false;
+
+    GLGizmoBase* curr = get_current();
+    return (curr != nullptr) ? (curr->get_hover_id() != -1) : false;
+}
+
+} // namespace GUI
+} // namespace Slic3r
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
new file mode 100644
index 000000000..1e42a29e6
--- /dev/null
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
@@ -0,0 +1,189 @@
+#ifndef slic3r_GUI_GLGizmosManager_hpp_
+#define slic3r_GUI_GLGizmosManager_hpp_
+
+#include "slic3r/GUI/GLTexture.hpp"
+#include "slic3r/GUI/GLToolbar.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmos.hpp"
+
+#include <map>
+
+namespace Slic3r {
+namespace GUI {
+
+class Selection;
+class GLGizmoBase;
+class GLCanvas3D;
+class ClippingPlane;
+
+class Rect
+{
+    float m_left;
+    float m_top;
+    float m_right;
+    float m_bottom;
+
+public:
+    Rect() : m_left(0.0f) , m_top(0.0f) , m_right(0.0f) , m_bottom(0.0f) {}
+
+    Rect(float left, float top, float right, float bottom) : m_left(left) , m_top(top) , m_right(right) , m_bottom(bottom) {}
+
+    float get_left() const { return m_left; }
+    void set_left(float left) { m_left = left; }
+
+    float get_top() const { return m_top; }
+    void set_top(float top) { m_top = top; }
+
+    float get_right() const { return m_right; }
+    void set_right(float right) { m_right = right; }
+
+    float get_bottom() const { return m_bottom; }
+    void set_bottom(float bottom) { m_bottom = bottom; }
+
+    float get_width() const { return m_right - m_left; }
+    float get_height() const { return m_top - m_bottom; }
+};
+
+class GLGizmosManager
+{
+public:
+#if ENABLE_SVG_ICONS
+    static const float Default_Icons_Size;
+#endif // ENABLE_SVG_ICONS
+
+    enum EType : unsigned char
+    {
+        Undefined,
+        Move,
+        Scale,
+        Rotate,
+        Flatten,
+        Cut,
+        SlaSupports,
+        Num_Types
+    };
+
+private:
+    bool m_enabled;
+    typedef std::map<EType, GLGizmoBase*> GizmosMap;
+    GizmosMap m_gizmos;
+#if ENABLE_SVG_ICONS
+    mutable GLTexture m_icons_texture;
+    mutable bool m_icons_texture_dirty;
+#else
+    ItemsIconsTexture m_icons_texture;
+#endif // ENABLE_SVG_ICONS
+    BackgroundTexture m_background_texture;
+    EType m_current;
+
+#if ENABLE_SVG_ICONS
+    float m_overlay_icons_size;
+    float m_overlay_scale;
+#else
+    float m_overlay_icons_scale;
+#endif // ENABLE_SVG_ICONS
+    float m_overlay_border;
+    float m_overlay_gap_y;
+
+    struct MouseCapture
+    {
+        bool left;
+        bool middle;
+        bool right;
+        GLCanvas3D* parent;
+
+        MouseCapture() { reset(); }
+
+        bool any() const { return left || middle || right; }
+        void reset() { left = middle = right = false; parent = nullptr; }
+    };
+
+    MouseCapture m_mouse_capture;
+    std::string m_tooltip;
+
+public:
+    GLGizmosManager();
+    ~GLGizmosManager();
+
+    bool init(GLCanvas3D& parent);
+
+    bool is_enabled() const { return m_enabled; }
+    void set_enabled(bool enable) { m_enabled = enable; }
+
+#if ENABLE_SVG_ICONS
+    void set_overlay_icon_size(float size);
+#endif // ENABLE_SVG_ICONS
+    void set_overlay_scale(float scale);
+
+    void refresh_on_off_state(const Selection& selection);
+    void reset_all_states();
+
+    void set_hover_id(int id);
+    void enable_grabber(EType type, unsigned int id, bool enable);
+
+    void update(const Linef3& mouse_ray, const Selection& selection, const Point* mouse_pos = nullptr);
+    void update_data(GLCanvas3D& canvas);
+
+    Rect get_reset_rect_viewport(const GLCanvas3D& canvas) const;
+    EType get_current_type() const { return m_current; }
+
+    bool is_running() const;
+    bool handle_shortcut(int key, const Selection& selection);
+
+    bool is_dragging() const;
+    void start_dragging(const Selection& selection);
+    void stop_dragging();
+
+    Vec3d get_displacement() const;
+
+    Vec3d get_scale() const;
+    void set_scale(const Vec3d& scale);
+
+    Vec3d get_scale_offset() const;
+
+    Vec3d get_rotation() const;
+    void set_rotation(const Vec3d& rotation);
+
+    Vec3d get_flattening_normal() const;
+
+    void set_flattening_data(const ModelObject* model_object);
+
+    void set_sla_support_data(ModelObject* model_object, const Selection& selection);
+    bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position = Vec2d::Zero(), bool shift_down = false, bool alt_down = false, bool control_down = false);
+    ClippingPlane get_sla_clipping_plane() const;
+
+    void render_current_gizmo(const Selection& selection) const;
+    void render_current_gizmo_for_picking_pass(const Selection& selection) const;
+
+    void render_overlay(const GLCanvas3D& canvas, const Selection& selection) const;
+
+    const std::string& get_tooltip() const { return m_tooltip; }
+
+    bool on_mouse(wxMouseEvent& evt, GLCanvas3D& canvas);
+    bool on_mouse_wheel(wxMouseEvent& evt, GLCanvas3D& canvas);
+    bool on_char(wxKeyEvent& evt, GLCanvas3D& canvas);
+    bool on_key(wxKeyEvent& evt, GLCanvas3D& canvas);
+
+private:
+    void reset();
+
+    void do_render_overlay(const GLCanvas3D& canvas, const Selection& selection) const;
+
+    float get_total_overlay_height() const;
+    float get_total_overlay_width() const;
+
+    GLGizmoBase* get_current() const;
+
+#if ENABLE_SVG_ICONS
+    bool generate_icons_texture() const;
+#endif // ENABLE_SVG_ICONS
+
+    void update_on_off_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos, const Selection& selection);
+    std::string update_hover_state(const GLCanvas3D& canvas, const Vec2d& mouse_pos);
+    bool overlay_contains_mouse(const GLCanvas3D& canvas, const Vec2d& mouse_pos) const;
+    bool grabber_contains_mouse() const;
+};
+
+} // namespace GUI
+} // namespace Slic3r
+
+#endif // slic3r_GUI_GLGizmosManager_hpp_
diff --git a/src/slic3r/GUI/I18N.hpp b/src/slic3r/GUI/I18N.hpp
index a899eaa59..cf85f7410 100644
--- a/src/slic3r/GUI/I18N.hpp
+++ b/src/slic3r/GUI/I18N.hpp
@@ -1,9 +1,11 @@
 #ifndef _
 #define _(s)    Slic3r::GUI::I18N::translate((s))
+#define _utf8(s)    Slic3r::GUI::I18N::translate_utf8((s))
 #endif /* _ */
 
 #ifndef _CTX
 #define _CTX(s, ctx) Slic3r::GUI::I18N::translate((s), (ctx))
+#define _CTX_utf8(s, ctx) Slic3r::GUI::I18N::translate_utf8((s), (ctx))
 #endif /* _ */
 
 #ifndef L
@@ -35,6 +37,11 @@ namespace I18N {
 	inline wxString translate(const std::string &s)  { return wxGetTranslation(wxString(s.c_str(), wxConvUTF8)); }
 	inline wxString translate(const std::wstring &s) { return wxGetTranslation(s.c_str()); }
 
+	inline std::string translate_utf8(const char *s)    	 { return wxGetTranslation(wxString(s, wxConvUTF8)).ToUTF8().data(); }
+	inline std::string translate_utf8(const wchar_t *s) 	 { return wxGetTranslation(s).ToUTF8().data(); }
+	inline std::string translate_utf8(const std::string &s)  { return wxGetTranslation(wxString(s.c_str(), wxConvUTF8)).ToUTF8().data(); }
+	inline std::string translate_utf8(const std::wstring &s) { return wxGetTranslation(s.c_str()).ToUTF8().data(); }
+
 #if wxCHECK_VERSION(3, 1, 1)
 	#define _wxGetTranslation_ctx(S, CTX) wxGetTranslation((S), wxEmptyString, (CTX))
 #else
@@ -46,6 +53,11 @@ namespace I18N {
 	inline wxString translate(const std::string &s, const char* ctx)  { return _wxGetTranslation_ctx(wxString(s.c_str(), wxConvUTF8), ctx); }
 	inline wxString translate(const std::wstring &s, const char* ctx) { return _wxGetTranslation_ctx(s.c_str(), ctx); }
 
+	inline wxString translate_utf8(const char *s, const char* ctx)         { return _wxGetTranslation_ctx(wxString(s, wxConvUTF8), ctx).ToUTF8().data(); }
+	inline wxString translate_utf8(const wchar_t *s, const char* ctx)      { return _wxGetTranslation_ctx(s, ctx).ToUTF8().data(); }
+	inline wxString translate_utf8(const std::string &s, const char* ctx)  { return _wxGetTranslation_ctx(wxString(s.c_str(), wxConvUTF8), ctx).ToUTF8().data(); }
+	inline wxString translate_utf8(const std::wstring &s, const char* ctx) { return _wxGetTranslation_ctx(s.c_str(), ctx).ToUTF8().data(); }
+
 #undef _wxGetTranslation_ctx
 }
 
diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
index 0050b6463..8221a45cf 100644
--- a/src/slic3r/GUI/ImGuiWrapper.cpp
+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
@@ -19,6 +19,7 @@
 
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/Utils.hpp"
+#include "3DScene.hpp"
 #include "GUI.hpp"
 
 namespace Slic3r {
@@ -27,35 +28,37 @@ namespace GUI {
 
 ImGuiWrapper::ImGuiWrapper()
     : m_glyph_ranges(nullptr)
+    , m_font_size(18.0)
     , m_font_texture(0)
     , m_style_scaling(1.0)
     , m_mouse_buttons(0)
     , m_disabled(false)
     , m_new_frame_open(false)
-{
-}
-
-ImGuiWrapper::~ImGuiWrapper()
-{
-    destroy_device_objects();
-    ImGui::DestroyContext();
-}
-
-bool ImGuiWrapper::init()
 {
     ImGui::CreateContext();
 
-    init_default_font(m_style_scaling);
     init_input();
     init_style();
 
     ImGui::GetIO().IniFilename = nullptr;
+}
 
-    return true;
+ImGuiWrapper::~ImGuiWrapper()
+{
+    destroy_font();
+    ImGui::DestroyContext();
 }
 
 void ImGuiWrapper::set_language(const std::string &language)
 {
+    if (m_new_frame_open) {
+        // ImGUI internally locks the font between NewFrame() and EndFrame()
+        // NewFrame() might've been called here because of input from the 3D scene;
+        // call EndFrame()
+        ImGui::EndFrame();
+        m_new_frame_open = false;
+    }
+
     const ImWchar *ranges = nullptr;
     size_t idx = language.find('_');
     std::string lang = (idx == std::string::npos) ? language : language.substr(0, idx);
@@ -79,7 +82,7 @@ void ImGuiWrapper::set_language(const std::string &language)
 
     if (ranges != m_glyph_ranges) {
         m_glyph_ranges = ranges;
-        init_default_font(m_style_scaling);
+        destroy_font();
     }
 }
 
@@ -90,13 +93,21 @@ void ImGuiWrapper::set_display_size(float w, float h)
     io.DisplayFramebufferScale = ImVec2(1.0f, 1.0f);
 }
 
-void ImGuiWrapper::set_style_scaling(float scaling)
+void ImGuiWrapper::set_scaling(float font_size, float scale_style, float scale_both)
 {
-    if (!std::isnan(scaling) && !std::isinf(scaling) && scaling != m_style_scaling) {
-        ImGui::GetStyle().ScaleAllSizes(scaling / m_style_scaling);
-        init_default_font(scaling);
-        m_style_scaling = scaling;
+    font_size *= scale_both;
+    scale_style *= scale_both;
+
+    if (m_font_size == font_size && m_style_scaling == scale_style) {
+        return;
     }
+
+    m_font_size = font_size;
+
+    ImGui::GetStyle().ScaleAllSizes(scale_style / m_style_scaling);
+    m_style_scaling = scale_style;
+
+    destroy_font();
 }
 
 bool ImGuiWrapper::update_mouse_data(wxMouseEvent& evt)
@@ -157,8 +168,9 @@ void ImGuiWrapper::new_frame()
         return;
     }
 
-    if (m_font_texture == 0)
-        create_device_objects();
+    if (m_font_texture == 0) {
+        init_font();
+    }
 
     ImGui::NewFrame();
     m_new_frame_open = true;
@@ -171,6 +183,19 @@ void ImGuiWrapper::render()
     m_new_frame_open = false;
 }
 
+ImVec2 ImGuiWrapper::calc_text_size(const wxString &text)
+{
+    auto text_utf8 = into_u8(text);
+    ImVec2 size = ImGui::CalcTextSize(text_utf8.c_str());
+
+#ifndef __APPLE__
+    size.x *= m_style_scaling;
+    size.y *= m_style_scaling;
+#endif
+
+    return size;
+}
+
 void ImGuiWrapper::set_next_window_pos(float x, float y, int flag)
 {
     ImGui::SetNextWindowPos(ImVec2(x, y), (ImGuiCond)flag);
@@ -251,7 +276,8 @@ void ImGuiWrapper::text(const std::string &label)
 
 void ImGuiWrapper::text(const wxString &label)
 {
-    this->text(into_u8(label).c_str());
+    auto label_utf8 = into_u8(label);
+    this->text(label_utf8.c_str());
 }
 
 bool ImGuiWrapper::combo(const wxString& label, const std::vector<std::string>& options, int& selection)
@@ -320,51 +346,40 @@ bool ImGuiWrapper::want_any_input() const
     return io.WantCaptureMouse || io.WantCaptureKeyboard || io.WantTextInput;
 }
 
-void ImGuiWrapper::init_default_font(float scaling)
+void ImGuiWrapper::init_font()
 {
-    static const float font_size = 18.0f;
-
-    destroy_fonts_texture();
+    destroy_font();
 
     ImGuiIO& io = ImGui::GetIO();
     io.Fonts->Clear();
-    ImFont* font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/NotoSans-Regular.ttf").c_str(), font_size * scaling, nullptr, m_glyph_ranges);
+    ImFont* font = io.Fonts->AddFontFromFileTTF((Slic3r::resources_dir() + "/fonts/NotoSans-Regular.ttf").c_str(), m_font_size, nullptr, m_glyph_ranges);
     if (font == nullptr) {
         font = io.Fonts->AddFontDefault();
         if (font == nullptr) {
             throw std::runtime_error("ImGui: Could not load deafult font");
         }
     }
-}
 
-void ImGuiWrapper::create_device_objects()
-{
-    create_fonts_texture();
-}
-
-void ImGuiWrapper::create_fonts_texture()
-{
     // Build texture atlas
-    ImGuiIO& io = ImGui::GetIO();
     unsigned char* pixels;
     int width, height;
     io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);   // Load as RGBA 32-bits (75% of the memory is wasted, but default font is so small) because it is more likely to be compatible with user's existing shaders. If your ImTextureId represent a higher-level concept than just a GL texture id, consider calling GetTexDataAsAlpha8() instead to save on GPU memory.
 
     // Upload texture to graphics system
     GLint last_texture;
-    glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture);
-    glGenTextures(1, &m_font_texture);
-    glBindTexture(GL_TEXTURE_2D, m_font_texture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+    glsafe(::glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture));
+    glsafe(::glGenTextures(1, &m_font_texture));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, m_font_texture));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+    glsafe(::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+    glsafe(::glPixelStorei(GL_UNPACK_ROW_LENGTH, 0));
+    glsafe(::glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels));
 
     // Store our identifier
     io.Fonts->TexID = (ImTextureID)(intptr_t)m_font_texture;
 
     // Restore state
-    glBindTexture(GL_TEXTURE_2D, last_texture);
+    glsafe(::glBindTexture(GL_TEXTURE_2D, last_texture));
 }
 
 void ImGuiWrapper::init_input()
@@ -459,39 +474,39 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
 
     // We are using the OpenGL fixed pipeline to make the example code simpler to read!
     // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled, vertex/texcoord/color pointers, polygon fill.
-    GLint last_texture; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture);
-    GLint last_polygon_mode[2]; glGetIntegerv(GL_POLYGON_MODE, last_polygon_mode);
-    GLint last_viewport[4]; glGetIntegerv(GL_VIEWPORT, last_viewport);
-    GLint last_scissor_box[4]; glGetIntegerv(GL_SCISSOR_BOX, last_scissor_box); 
-    glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TRANSFORM_BIT);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_DEPTH_TEST);
-    glDisable(GL_LIGHTING);
-    glDisable(GL_COLOR_MATERIAL);
-    glEnable(GL_SCISSOR_TEST);
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-    glEnableClientState(GL_COLOR_ARRAY);
-    glEnable(GL_TEXTURE_2D);
-    glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    GLint last_texture; glsafe(::glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture));
+    GLint last_polygon_mode[2]; glsafe(::glGetIntegerv(GL_POLYGON_MODE, last_polygon_mode));
+    GLint last_viewport[4]; glsafe(::glGetIntegerv(GL_VIEWPORT, last_viewport));
+    GLint last_scissor_box[4]; glsafe(::glGetIntegerv(GL_SCISSOR_BOX, last_scissor_box));
+    glsafe(::glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TRANSFORM_BIT));
+    glsafe(::glEnable(GL_BLEND));
+    glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+    glsafe(::glDisable(GL_CULL_FACE));
+    glsafe(::glDisable(GL_DEPTH_TEST));
+    glsafe(::glDisable(GL_LIGHTING));
+    glsafe(::glDisable(GL_COLOR_MATERIAL));
+    glsafe(::glEnable(GL_SCISSOR_TEST));
+    glsafe(::glEnableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glEnableClientState(GL_TEXTURE_COORD_ARRAY));
+    glsafe(::glEnableClientState(GL_COLOR_ARRAY));
+    glsafe(::glEnable(GL_TEXTURE_2D));
+    glsafe(::glPolygonMode(GL_FRONT_AND_BACK, GL_FILL));
+    glsafe(::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE));
     GLint texture_env_mode = GL_MODULATE;
-    glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texture_env_mode);
-    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glsafe(::glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texture_env_mode));
+    glsafe(::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE));
     //glUseProgram(0); // You may want this if using this code in an OpenGL 3+ context where shaders may be bound
 
     // Setup viewport, orthographic projection matrix
     // Our visible imgui space lies from draw_data->DisplayPps (top left) to draw_data->DisplayPos+data_data->DisplaySize (bottom right). DisplayMin is typically (0,0) for single viewport apps.
-    glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height);
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadIdentity();
-    glOrtho(draw_data->DisplayPos.x, draw_data->DisplayPos.x + draw_data->DisplaySize.x, draw_data->DisplayPos.y + draw_data->DisplaySize.y, draw_data->DisplayPos.y, -1.0f, +1.0f);
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
+    glsafe(::glViewport(0, 0, (GLsizei)fb_width, (GLsizei)fb_height));
+    glsafe(::glMatrixMode(GL_PROJECTION));
+    glsafe(::glPushMatrix());
+    glsafe(::glLoadIdentity());
+    glsafe(::glOrtho(draw_data->DisplayPos.x, draw_data->DisplayPos.x + draw_data->DisplaySize.x, draw_data->DisplayPos.y + draw_data->DisplaySize.y, draw_data->DisplayPos.y, -1.0f, +1.0f));
+    glsafe(::glMatrixMode(GL_MODELVIEW));
+    glsafe(::glPushMatrix());
+    glsafe(::glLoadIdentity());
 
     // Render command lists
     ImVec2 pos = draw_data->DisplayPos;
@@ -500,9 +515,9 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
         const ImDrawList* cmd_list = draw_data->CmdLists[n];
         const ImDrawVert* vtx_buffer = cmd_list->VtxBuffer.Data;
         const ImDrawIdx* idx_buffer = cmd_list->IdxBuffer.Data;
-        glVertexPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, pos)));
-        glTexCoordPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, uv)));
-        glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, col)));
+        glsafe(::glVertexPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, pos))));
+        glsafe(::glTexCoordPointer(2, GL_FLOAT, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, uv))));
+        glsafe(::glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(ImDrawVert), (const GLvoid*)((const char*)vtx_buffer + IM_OFFSETOF(ImDrawVert, col))));
 
         for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
         {
@@ -518,11 +533,11 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
                 if (clip_rect.x < fb_width && clip_rect.y < fb_height && clip_rect.z >= 0.0f && clip_rect.w >= 0.0f)
                 {
                     // Apply scissor/clipping rectangle
-                    glScissor((int)clip_rect.x, (int)(fb_height - clip_rect.w), (int)(clip_rect.z - clip_rect.x), (int)(clip_rect.w - clip_rect.y));
+                    glsafe(::glScissor((int)clip_rect.x, (int)(fb_height - clip_rect.w), (int)(clip_rect.z - clip_rect.x), (int)(clip_rect.w - clip_rect.y)));
 
                     // Bind texture, Draw
-                    glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->TextureId);
-                    glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer);
+                    glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->TextureId));
+                    glsafe(::glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer));
                 }
             }
             idx_buffer += pcmd->ElemCount;
@@ -530,19 +545,19 @@ void ImGuiWrapper::render_draw_data(ImDrawData *draw_data)
     }
 
     // Restore modified state
-    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texture_env_mode);
-    glDisableClientState(GL_COLOR_ARRAY);
-    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    glDisableClientState(GL_VERTEX_ARRAY);
-    glBindTexture(GL_TEXTURE_2D, (GLuint)last_texture);
-    glMatrixMode(GL_MODELVIEW);
-    glPopMatrix();
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-    glPopAttrib();
-    glPolygonMode(GL_FRONT, (GLenum)last_polygon_mode[0]); glPolygonMode(GL_BACK, (GLenum)last_polygon_mode[1]);
-    glViewport(last_viewport[0], last_viewport[1], (GLsizei)last_viewport[2], (GLsizei)last_viewport[3]);
-    glScissor(last_scissor_box[0], last_scissor_box[1], (GLsizei)last_scissor_box[2], (GLsizei)last_scissor_box[3]);
+    glsafe(::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texture_env_mode));
+    glsafe(::glDisableClientState(GL_COLOR_ARRAY));
+    glsafe(::glDisableClientState(GL_TEXTURE_COORD_ARRAY));
+    glsafe(::glDisableClientState(GL_VERTEX_ARRAY));
+    glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)last_texture));
+    glsafe(::glMatrixMode(GL_MODELVIEW));
+    glsafe(::glPopMatrix());
+    glsafe(::glMatrixMode(GL_PROJECTION));
+    glsafe(::glPopMatrix());
+    glsafe(::glPopAttrib());
+    glsafe(::glPolygonMode(GL_FRONT, (GLenum)last_polygon_mode[0]); glPolygonMode(GL_BACK, (GLenum)last_polygon_mode[1]));
+    glsafe(::glViewport(last_viewport[0], last_viewport[1], (GLsizei)last_viewport[2], (GLsizei)last_viewport[3]));
+    glsafe(::glScissor(last_scissor_box[0], last_scissor_box[1], (GLsizei)last_scissor_box[2], (GLsizei)last_scissor_box[3]));
 }
 
 bool ImGuiWrapper::display_initialized() const
@@ -551,17 +566,12 @@ bool ImGuiWrapper::display_initialized() const
     return io.DisplaySize.x >= 0.0f && io.DisplaySize.y >= 0.0f;
 }
 
-void ImGuiWrapper::destroy_device_objects()
+void ImGuiWrapper::destroy_font()
 {
-    destroy_fonts_texture();
-}
-
-void ImGuiWrapper::destroy_fonts_texture()
-{
-    if (m_font_texture) {
+    if (m_font_texture != 0) {
         ImGuiIO& io = ImGui::GetIO();
         io.Fonts->TexID = 0;
-        glDeleteTextures(1, &m_font_texture);
+        glsafe(::glDeleteTextures(1, &m_font_texture));
         m_font_texture = 0;
     }
 }
diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp
index 35d0b5636..b593054c4 100644
--- a/src/slic3r/GUI/ImGuiWrapper.hpp
+++ b/src/slic3r/GUI/ImGuiWrapper.hpp
@@ -18,10 +18,8 @@ namespace GUI {
 
 class ImGuiWrapper
 {
-    typedef std::map<std::string, ImFont*> FontsMap;
-
-    FontsMap m_fonts;
     const ImWchar *m_glyph_ranges;
+    float m_font_size;
     unsigned m_font_texture;
     float m_style_scaling;
     unsigned m_mouse_buttons;
@@ -33,20 +31,24 @@ public:
     ImGuiWrapper();
     ~ImGuiWrapper();
 
-    bool init();
     void read_glsl_version();
 
     void set_language(const std::string &language);
     void set_display_size(float w, float h);
-    void set_style_scaling(float scaling);
+    void set_scaling(float font_size, float scale_style, float scale_both);
     bool update_mouse_data(wxMouseEvent &evt);
     bool update_key_data(wxKeyEvent &evt);
 
+    float get_font_size() const { return m_font_size; }
     float get_style_scaling() const { return m_style_scaling; }
 
     void new_frame();
     void render();
 
+    float scaled(float x) const { return x * m_font_size; }
+    ImVec2 scaled(float x, float y) const { return ImVec2(x * m_font_size, y * m_font_size); }
+    ImVec2 calc_text_size(const wxString &text);
+
     void set_next_window_pos(float x, float y, int flag);
     void set_next_window_bg_alpha(float alpha);
 
@@ -73,15 +75,12 @@ public:
     bool want_any_input() const;
 
 private:
-    void init_default_font(float scaling);
-    void create_device_objects();
-    void create_fonts_texture();
+    void init_font();
     void init_input();
     void init_style();
     void render_draw_data(ImDrawData *draw_data);
     bool display_initialized() const;
-    void destroy_device_objects();
-    void destroy_fonts_texture();
+    void destroy_font();
 
     static const char* clipboard_get(void* user_data);
     static void clipboard_set(void* user_data, const char* text);
diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index 7fde92a42..4c2030236 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -10,27 +10,28 @@ namespace Slic3r {
 namespace GUI {
 
 KBShortcutsDialog::KBShortcutsDialog()
-    : wxDialog(NULL, wxID_ANY, _(L("Slic3r++ - Keyboard Shortcuts")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+    : DPIDialog(NULL, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _(L("Keyboard Shortcuts")), 
+     wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
-	SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));    
+	SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
 	auto main_sizer = new wxBoxSizer(wxVERTICAL);
 
     // logo
-// 	wxBitmap logo_bmp = wxBitmap(from_u8(Slic3r::var("Slic3r_32px.png")), wxBITMAP_TYPE_PNG);
-	const wxBitmap logo_bmp = create_scaled_bitmap("Slic3r_32px.png");
+    m_logo_bmp = ScalableBitmap(this, "Slic3r_32px.png", 32);
 
     // fonts
-    wxFont head_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold();
+    const wxFont& font = wxGetApp().normal_font();
+    const wxFont& bold_font = wxGetApp().bold_font();   
+    SetFont(font);
+
+    wxFont head_font = bold_font;
 #ifdef __WXOSX__
     head_font.SetPointSize(14);
 #else
-    head_font.SetPointSize(12);
+    head_font.SetPointSize(bold_font.GetPointSize() + 2);
 #endif // __WXOSX__
 
-    const wxFont& font = wxGetApp().small_font();
-    const wxFont& bold_font = wxGetApp().bold_font();
-
     fill_shortcuts();
 
     auto panel = new wxPanel(this);
@@ -44,27 +45,29 @@ KBShortcutsDialog::KBShortcutsDialog()
     wxBoxSizer* r_sizer = new wxBoxSizer(wxVERTICAL);
     main_grid_sizer->Add(r_sizer, 0);
 
-    for (auto& sc : m_full_shortcuts)
+    m_head_bitmaps.reserve(m_full_shortcuts.size());
+
+    for (auto& shortcut : m_full_shortcuts)
     {
-//         auto sizer = sc.first == _(L("Main Shortcuts")) ? l_sizer : r_sizer;
-        auto sizer = sc.second.second == 0 ? l_sizer : r_sizer;
+        auto sizer = shortcut.second.second == szLeft ? l_sizer : r_sizer;
         wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL);
         sizer->Add(hsizer, 0, wxEXPAND | wxTOP | wxBOTTOM, 10);
 
         // logo
-        auto *logo = new wxStaticBitmap(panel, wxID_ANY, logo_bmp);
-        hsizer->Add(logo, 0, wxEXPAND | wxLEFT | wxRIGHT, 15);
+        m_head_bitmaps.push_back(new wxStaticBitmap(panel, wxID_ANY, m_logo_bmp.bmp()));
+        hsizer->Add(m_head_bitmaps.back(), 0, wxEXPAND | wxLEFT | wxRIGHT, 15);
 
         // head
-        wxStaticText* head = new wxStaticText(panel, wxID_ANY, sc.first, wxDefaultPosition, wxSize(20 * wxGetApp().em_unit(), -1));
+        wxStaticText* head = new wxStaticText(panel, wxID_ANY, shortcut.first);
         head->SetFont(head_font);
         hsizer->Add(head, 0, wxALIGN_CENTER_VERTICAL);
 
+
         // Shortcuts list
         auto grid_sizer = new wxFlexGridSizer(2, 5, 15);
         sizer->Add(grid_sizer, 0, wxEXPAND | wxLEFT| wxRIGHT, 15);
 
-        for (auto pair : sc.second.first)
+        for (auto pair : shortcut.second.first)
         {
             auto shortcut = new wxStaticText(panel, wxID_ANY, _(pair.first));
             shortcut->SetFont(bold_font);
@@ -105,10 +108,10 @@ void KBShortcutsDialog::fill_shortcuts()
     main_shortcuts.push_back(Shortcut(ctrl+"S"          ,L("Save project (3MF)")));
     main_shortcuts.push_back(Shortcut(ctrl+alt+"L"      ,L("Load Config from .ini/amf/3mf/gcode and merge")));
     main_shortcuts.push_back(Shortcut(ctrl+"R"          ,L("(Re)slice")));
-    main_shortcuts.push_back(Shortcut(ctrl+"U"          ,L("Quick slice")));
-    main_shortcuts.push_back(Shortcut(ctrl+"Shift+U"    ,L("Repeat last quick slice")));
+//    main_shortcuts.push_back(Shortcut(ctrl+"U"          ,L("Quick slice")));
+//    main_shortcuts.push_back(Shortcut(ctrl+"Shift+U"    ,L("Repeat last quick slice")));
     main_shortcuts.push_back(Shortcut(ctrl+"1"          ,L("Select Plater Tab")));
-    main_shortcuts.push_back(Shortcut(ctrl+alt+"U"      ,L("Quick slice and Save as")));
+//    main_shortcuts.push_back(Shortcut(ctrl+alt+"U"      ,L("Quick slice and Save as")));
     main_shortcuts.push_back(Shortcut(ctrl+"2"          ,L("Select Print Settings Tab")));
     main_shortcuts.push_back(Shortcut(ctrl+"3"          ,L("Select Filament Settings Tab")));
     main_shortcuts.push_back(Shortcut(ctrl+"4"          ,L("Select Printer Settings Tab")));
@@ -116,13 +119,13 @@ void KBShortcutsDialog::fill_shortcuts()
     main_shortcuts.push_back(Shortcut(ctrl+"6"          ,L("Switch to Preview")));
     main_shortcuts.push_back(Shortcut(ctrl+"P"          ,L("Preferences")));
     main_shortcuts.push_back(Shortcut(ctrl+"J"          ,L("Print host upload queue")));
-    main_shortcuts.push_back(Shortcut("0-6"             ,L("Camera view ")));
-    main_shortcuts.push_back(Shortcut("+"               ,L("Add Instance to selected object ")));
-    main_shortcuts.push_back(Shortcut("-"               ,L("Remove Instance from selected object")));
+    main_shortcuts.push_back(Shortcut("0-6"             ,L("Camera view")));
+    main_shortcuts.push_back(Shortcut("+"               ,L("Add Instance of the selected object")));
+    main_shortcuts.push_back(Shortcut("-"               ,L("Remove Instance of the selected object")));
     main_shortcuts.push_back(Shortcut("?"               ,L("Show keyboard shortcuts list")));
-    main_shortcuts.push_back(Shortcut("Shift+LeftMouse", L("Select multiple object/Move multiple object")));
+    main_shortcuts.push_back(Shortcut(ctrl/*+"LeftMouse"*/,L("Press to select multiple object or move multiple object with mouse")));
 
-    m_full_shortcuts.push_back(std::make_pair( _(L("Main Shortcuts")), std::make_pair(main_shortcuts, 0) ));
+    m_full_shortcuts.push_back(std::make_pair(_(L("Main Shortcuts")), std::make_pair(main_shortcuts, szLeft)));
 
 
     Shortcuts plater_shortcuts;
@@ -132,22 +135,25 @@ void KBShortcutsDialog::fill_shortcuts()
     plater_shortcuts.push_back(Shortcut(ctrl+"A",   L("Select All objects")));
     plater_shortcuts.push_back(Shortcut("Del",      L("Delete selected")));
     plater_shortcuts.push_back(Shortcut(ctrl+"Del", L("Delete All")));
+    plater_shortcuts.push_back(Shortcut(ctrl+"C",   L("Copy to clipboard")));
+    plater_shortcuts.push_back(Shortcut(ctrl+"V",   L("Paste from clipboard")));
     plater_shortcuts.push_back(Shortcut("M",        L("Gizmo move")));
     plater_shortcuts.push_back(Shortcut("S",        L("Gizmo scale")));
     plater_shortcuts.push_back(Shortcut("R",        L("Gizmo rotate")));
     plater_shortcuts.push_back(Shortcut("C",        L("Gizmo cut")));
     plater_shortcuts.push_back(Shortcut("F",        L("Gizmo Place face on bed")));
     plater_shortcuts.push_back(Shortcut("L",        L("Gizmo SLA support points")));
-    plater_shortcuts.push_back(Shortcut("Shift+",   L("Press to snap by 5% in Gizmo scale\nor by 1mm in Gizmo move")));
-    plater_shortcuts.push_back(Shortcut(alt,        L("Press to scale or rotate selected objects\naround their own center")));
+    plater_shortcuts.push_back(Shortcut("Shift+",   L("Press to activate selection rectangle\nor to snap by 5% in Gizmo scale\nor to snap by 1mm in Gizmo move")));
+    plater_shortcuts.push_back(Shortcut(alt,        L("Press to activate deselection rectangle\nor to scale or rotate selected objects\naround their own center")));
+    plater_shortcuts.push_back(Shortcut(ctrl,       L("Press to activate one direction scaling in Gizmo scale")));
     plater_shortcuts.push_back(Shortcut("B",        L("Zoom to Bed")));
     plater_shortcuts.push_back(Shortcut("Z",        L("Zoom to all objects in scene, if none selected")));
     plater_shortcuts.push_back(Shortcut("Z",        L("Zoom to selected object")));
     plater_shortcuts.push_back(Shortcut("I",        L("Zoom in")));
     plater_shortcuts.push_back(Shortcut("O",        L("Zoom out")));
-    plater_shortcuts.push_back(Shortcut("ESC",      L("Unselect gizmo, keep object selection")));
+    plater_shortcuts.push_back(Shortcut("ESC",      L("Unselect gizmo / Clear selection")));
 
-    m_full_shortcuts.push_back(std::make_pair(_(L("Plater Shortcuts")), std::make_pair(plater_shortcuts, 1)));
+    m_full_shortcuts.push_back(std::make_pair(_(L("Plater Shortcuts")), std::make_pair(plater_shortcuts, szRight)));
 
 
 //     Shortcuts gizmo_shortcuts;
@@ -167,20 +173,39 @@ void KBShortcutsDialog::fill_shortcuts()
     preview_shortcuts.push_back(Shortcut("U",               L("Upper Layer")));
     preview_shortcuts.push_back(Shortcut("D",               L("Lower Layer")));
 
-    m_full_shortcuts.push_back(std::make_pair( _(L("Preview Shortcuts")), std::make_pair(preview_shortcuts, 0) ));
+    m_full_shortcuts.push_back(std::make_pair(_(L("Preview Shortcuts")), std::make_pair(preview_shortcuts, szLeft)));
 
 
     Shortcuts layers_slider_shortcuts;
     layers_slider_shortcuts.reserve(6);
 
-    layers_slider_shortcuts.push_back(Shortcut(L("Arrow Up"),   L("Move current slider thump Up")));
-    layers_slider_shortcuts.push_back(Shortcut(L("Arrow Down"), L("Move current slider thump Down")));
+    layers_slider_shortcuts.push_back(Shortcut(L("Arrow Up"),   L("Move current slider thumb Up")));
+    layers_slider_shortcuts.push_back(Shortcut(L("Arrow Down"), L("Move current slider thumb Down")));
     layers_slider_shortcuts.push_back(Shortcut(L("Arrow Left"), L("Set upper thumb to current slider thumb")));
     layers_slider_shortcuts.push_back(Shortcut(L("Arrow Right"),L("Set lower thumb to current slider thumb")));
     layers_slider_shortcuts.push_back(Shortcut("+",             L("Add color change marker for current layer")));
     layers_slider_shortcuts.push_back(Shortcut("-",             L("Delete color change marker for current layer")));
 
-    m_full_shortcuts.push_back(std::make_pair( _(L("Layers Slider Shortcuts")), std::make_pair(layers_slider_shortcuts, 1) ));
+    m_full_shortcuts.push_back(std::make_pair(_(L("Layers Slider Shortcuts")), std::make_pair(layers_slider_shortcuts, szRight)));
+}
+
+void KBShortcutsDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    m_logo_bmp.msw_rescale();
+
+    for (wxStaticBitmap* bmp : m_head_bitmaps)
+        bmp->SetBitmap(m_logo_bmp.bmp());
+
+    const int em = em_unit();
+
+    msw_buttons_rescale(this, em, { wxID_OK });
+
+    const wxSize& size = wxSize(85 * em, 75 * em);
+
+    SetMinSize(size);
+    Fit();
+
+    Refresh();
 }
 
 void KBShortcutsDialog::onCloseDialog(wxEvent &)
diff --git a/src/slic3r/GUI/KBShortcutsDialog.hpp b/src/slic3r/GUI/KBShortcutsDialog.hpp
index d8905e1ce..66fe7c399 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.hpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.hpp
@@ -5,24 +5,38 @@
 #include <map>
 #include <vector>
 
+#include "GUI_Utils.hpp"
+#include "wxExtensions.hpp"
+
 namespace Slic3r { 
 namespace GUI {
 
-class KBShortcutsDialog : public wxDialog
+class KBShortcutsDialog : public DPIDialog
 {
+    enum PLACED_SIZER_ID
+    {
+        szLeft = 0,
+        szRight
+    };
+
     typedef std::pair<std::string, std::string> Shortcut;
     typedef std::vector< Shortcut >             Shortcuts;
-    typedef std::vector< std::pair<wxString, std::pair<Shortcuts, int>> >   ShortcutsVec;
+    typedef std::vector< std::pair<wxString, std::pair<Shortcuts, PLACED_SIZER_ID>> >   ShortcutsVec;
 
     wxString text_info {wxEmptyString};
 
-    ShortcutsVec m_full_shortcuts;
+    ShortcutsVec    m_full_shortcuts;
+    ScalableBitmap  m_logo_bmp;
+    std::vector<wxStaticBitmap*>    m_head_bitmaps;
 
 public:
     KBShortcutsDialog();
     
     void fill_shortcuts();
 
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
+
 private:
     void onCloseDialog(wxEvent &);
 };
diff --git a/src/slic3r/GUI/LambdaObjectDialog.cpp b/src/slic3r/GUI/LambdaObjectDialog.cpp
index 0146db5f6..4d1cb0658 100644
--- a/src/slic3r/GUI/LambdaObjectDialog.cpp
+++ b/src/slic3r/GUI/LambdaObjectDialog.cpp
@@ -49,7 +49,7 @@ LambdaObjectDialog::LambdaObjectDialog(wxWindow* parent,
 		};
 
 		def.type = coFloat;
-		def.default_value = new ConfigOptionFloat{ 1.0 };
+		def.set_default_value(new ConfigOptionFloat{ 1.0 });
 		def.label = L("Length");
 		Option option(def, "l");
 		optgroup->append_single_option_line(option);
@@ -75,7 +75,7 @@ LambdaObjectDialog::LambdaObjectDialog(wxWindow* parent,
 		};
 
 		def.type = coInt;
-		def.default_value = new ConfigOptionInt{ 1 };
+		def.set_default_value(new ConfigOptionInt{ 1 });
 		def.label = L("Radius");
 		auto option = Option(def, "cyl_r");
 		optgroup->append_single_option_line(option);
@@ -94,7 +94,7 @@ LambdaObjectDialog::LambdaObjectDialog(wxWindow* parent,
 		};
 
 		def.type = coFloat;
-		def.default_value = new ConfigOptionFloat{ 1.0 };
+		def.set_default_value(new ConfigOptionFloat{ 1.0 });
 		def.label = L("Rho");
 		auto option = Option(def, "sph_rho");
 		optgroup->append_single_option_line(option);
@@ -112,7 +112,7 @@ LambdaObjectDialog::LambdaObjectDialog(wxWindow* parent,
 		};
 
 		def.type = coFloat;
-		def.default_value = new ConfigOptionFloat{ 1.0 };
+		def.set_default_value(new ConfigOptionFloat{ 1.0 });
 		def.label = L("Height");
 		auto option = Option(def, "slab_h");
 		optgroup->append_single_option_line(option);
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 6dae35352..e5a3e9dfc 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -14,6 +14,7 @@
 
 #include "libslic3r/Print.hpp"
 #include "libslic3r/Polygon.hpp"
+#include "libslic3r/SLAPrint.hpp"
 
 #include "Tab.hpp"
 #include "PresetBundle.hpp"
@@ -32,9 +33,17 @@ namespace Slic3r {
 namespace GUI {
 
 MainFrame::MainFrame() :
-wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, "mainframe"),
-        m_printhost_queue_dlg(new PrintHostQueueDialog(this))
+DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, "mainframe"),
+    m_printhost_queue_dlg(new PrintHostQueueDialog(this))
 {
+    // Fonts were created by the DPIFrame constructor for the monitor, on which the window opened.
+    wxGetApp().update_fonts(this);
+#ifndef __WXOSX__ // Don't call SetFont under OSX to avoid name cutting in ObjectList 
+    this->SetFont(this->normal_font());
+#endif
+    // initialize default width_unit according to the width of the one symbol ("m") of the currently active font of this window.
+    wxGetApp().set_em_unit(std::max<size_t>(10, GetTextExtent("m").x - 1));
+
     // Load the icon either from the exe, or from the ico file.
 #if _WIN32
     {
@@ -53,11 +62,10 @@ wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAUL
 		SLIC3R_VERSION +
 		_(L(" - Remember to check for updates at http://github.com/supermerill/slic3r/releases")));
 
-
-    // initialize default width_unit according to the width of the one symbol ("x") of the current system font
-    const wxSize size = GetTextExtent("m");
-//     wxGetApp().set_em_unit(size.x-1);
-    wxGetApp().set_em_unit(std::max<size_t>(10, size.x - 1));
+    /* Load default preset bitmaps before a tabpanel initialization,
+     * but after filling of an em_unit value 
+     */
+    wxGetApp().preset_bundle->load_default_preset_bitmaps(this);
 
     // initialize tabpanel and menubar
     init_tabpanel();
@@ -89,6 +97,8 @@ wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAUL
 #endif
     Layout();
 
+    update_title();
+
     // declare events
     Bind(wxEVT_CLOSE_WINDOW, [this](wxCloseEvent& event) {
         if (event.CanVeto() && !wxGetApp().check_unsaved_changes()) {
@@ -125,17 +135,33 @@ wxFrame(NULL, wxID_ANY, SLIC3R_BUILD, wxDefaultPosition, wxDefaultSize, wxDEFAUL
         event.Skip();
     });
 
-    wxGetApp().persist_window_geometry(this);
+    wxGetApp().persist_window_geometry(this, true);
 
     update_ui_from_settings();    // FIXME (?)
 }
 
+void MainFrame::update_title()
+{
+    wxString title = wxEmptyString;
+    if (m_plater != nullptr)
+    {
+        wxString project = from_path(into_path(m_plater->get_project_filename()).stem());
+        if (!project.empty())
+            title += (project + " - ");
+    }
+    title += (wxString(SLIC3R_BUILD_ID) + " " + _(L("based on Slic3r")));
+
+    SetTitle(title);
+}
 
 void MainFrame::init_tabpanel()
 {
     // wxNB_NOPAGETHEME: Disable Windows Vista theme for the Notebook background. The theme performance is terrible on Windows 10
     // with multiple high resolution displays connected.
     m_tabpanel = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL | wxNB_NOPAGETHEME);
+#ifndef __WXOSX__ // Don't call SetFont under OSX to avoid name cutting in ObjectList
+    m_tabpanel->SetFont(Slic3r::GUI::wxGetApp().normal_font());
+#endif
 
     m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [this](wxEvent&) {
         auto panel = m_tabpanel->GetCurrentPage();
@@ -199,14 +225,37 @@ void MainFrame::add_created_tab(Tab* panel)
         m_tabpanel->AddPage(panel, panel->title());
 }
 
+bool MainFrame::can_start_new_project() const
+{
+    return (m_plater != nullptr) && !m_plater->model().objects.empty();
+}
+
 bool MainFrame::can_save() const
 {
-    return (m_plater != nullptr) ? !m_plater->model().objects.empty() : false;
+    return (m_plater != nullptr) && !m_plater->model().objects.empty();
 }
 
 bool MainFrame::can_export_model() const
 {
-    return (m_plater != nullptr) ? !m_plater->model().objects.empty() : false;
+    return (m_plater != nullptr) && !m_plater->model().objects.empty();
+}
+
+bool MainFrame::can_export_supports() const
+{
+    if ((m_plater == nullptr) || (m_plater->printer_technology() != ptSLA) || m_plater->model().objects.empty())
+        return false;
+
+    bool can_export = false;
+    const PrintObjects& objects = m_plater->sla_print().objects();
+    for (const SLAPrintObject* object : objects)
+    {
+        if (object->has_mesh(slaposBasePool) || object->has_mesh(slaposSupportTree))
+        {
+            can_export = true;
+            break;
+        }
+    }
+    return can_export;
 }
 
 bool MainFrame::can_export_gcode() const
@@ -239,17 +288,82 @@ bool MainFrame::can_change_view() const
 
 bool MainFrame::can_select() const
 {
-    return (m_plater != nullptr) ? !m_plater->model().objects.empty() : false;
+    return (m_plater != nullptr) && !m_plater->model().objects.empty();
+}
+
+bool MainFrame::can_deselect() const
+{
+    return (m_plater != nullptr) && !m_plater->is_selection_empty();
 }
 
 bool MainFrame::can_delete() const
 {
-    return (m_plater != nullptr) ? !m_plater->is_selection_empty() : false;
+    return (m_plater != nullptr) && !m_plater->is_selection_empty();
 }
 
 bool MainFrame::can_delete_all() const
 {
-    return (m_plater != nullptr) ? !m_plater->model().objects.empty() : false;
+    return (m_plater != nullptr) && !m_plater->model().objects.empty();
+}
+
+bool MainFrame::can_reslice() const
+{
+    return (m_plater != nullptr) && !m_plater->model().objects.empty();
+}
+
+void MainFrame::on_dpi_changed(const wxRect &suggested_rect)
+{
+    wxGetApp().update_fonts();
+    this->SetFont(this->normal_font());
+    // initialize default width_unit according to the width of the one symbol ("m") of the currently active font of this window.
+    wxGetApp().set_em_unit(std::max<size_t>(10, GetTextExtent("m").x - 1));
+
+    /* Load default preset bitmaps before a tabpanel initialization,
+     * but after filling of an em_unit value
+     */
+    wxGetApp().preset_bundle->load_default_preset_bitmaps(this);
+
+    // update Plater
+    wxGetApp().plater()->msw_rescale();
+
+    // update Tabs
+    for (auto tab : wxGetApp().tabs_list)
+        tab->msw_rescale();
+
+    wxMenuBar* menu_bar = this->GetMenuBar();
+    for (size_t id = 0; id < menu_bar->GetMenuCount(); id++)
+        msw_rescale_menu(menu_bar->GetMenu(id));
+
+    // Workarounds for correct Window rendering after rescale
+
+    /* Even if Window is maximized during moving, 
+     * first of all we should imitate Window resizing. So:
+     * 1. cancel maximization, if it was set
+     * 2. imitate resizing
+     * 3. set maximization, if it was set
+     */
+    const bool is_maximized = this->IsMaximized();
+    if (is_maximized)
+        this->Maximize(false);
+
+    /* To correct window rendering (especially redraw of a status bar)
+     * we should imitate window resizing.
+     */
+    const wxSize& sz = this->GetSize();
+    this->SetSize(sz.x + 1, sz.y + 1);
+    this->SetSize(sz);
+
+    this->Maximize(is_maximized);
+}
+
+static std::string menu_icon(const std::string& icon_name)
+{
+#ifdef __WXMSW__
+    const std::string folder = "white\\";
+#else
+    const std::string folder = "white/";
+#endif
+    return wxGetApp().dark_mode_menus() ? folder+icon_name : icon_name;
 }
 
 void MainFrame::init_menubar()
@@ -261,41 +375,55 @@ void MainFrame::init_menubar()
     // File menu
     wxMenu* fileMenu = new wxMenu;
     {
-        wxMenuItem* item_open = append_menu_item(fileMenu, wxID_ANY, _(L("&Open Project")) + dots + "\tCtrl+O", _(L("Open a project file")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->load_project(); }, "brick_add.png");
-        wxMenuItem* item_save = append_menu_item(fileMenu, wxID_ANY, _(L("&Save Project")) + "\tCtrl+S", _(L("Save current project file")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->export_3mf(into_path(m_plater->get_project_filename())); }, "disk.png");
-        wxMenuItem* item_save_as = append_menu_item(fileMenu, wxID_ANY, _(L("Save Project &as")) + dots + "\tCtrl+Alt+S", _(L("Save current project file as")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->export_3mf(); }, "disk.png");
+        append_menu_item(fileMenu, wxID_ANY, _(L("&New Project")) + "\tCtrl+N", _(L("Start a new project")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->new_project(); }, "", nullptr,
+            [this](){return m_plater != nullptr && can_start_new_project(); }, this);
+        append_menu_item(fileMenu, wxID_ANY, _(L("&Open Project")) + dots + "\tCtrl+O", _(L("Open a project file")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->load_project(); }, menu_icon("open"), nullptr,
+            [this](){return m_plater != nullptr; }, this);
+        append_menu_item(fileMenu, wxID_ANY, _(L("&Save Project")) + "\tCtrl+S", _(L("Save current project file")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->export_3mf(into_path(m_plater->get_project_filename(".3mf"))); }, menu_icon("save"), nullptr,
+            [this](){return m_plater != nullptr && can_save(); }, this);
+        append_menu_item(fileMenu, wxID_ANY, _(L("Save Project &as")) + dots + "\tCtrl+Alt+S", _(L("Save current project file as")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->export_3mf(); }, menu_icon("save"), nullptr,
+            [this](){return m_plater != nullptr && can_save(); }, this);
 
         fileMenu->AppendSeparator();
 
         wxMenu* import_menu = new wxMenu();
-        wxMenuItem* item_import_model = append_menu_item(import_menu, wxID_ANY, _(L("Import STL/OBJ/AM&F/3MF")) + dots + "\tCtrl+I", _(L("Load a model")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->add_model(); }, "brick_add.png");
+        append_menu_item(import_menu, wxID_ANY, _(L("Import STL/OBJ/AM&F/3MF")) + dots + "\tCtrl+I", _(L("Load a model")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->add_model(); }, menu_icon("import_plater"), nullptr,
+            [this](){return m_plater != nullptr; }, this);
         import_menu->AppendSeparator();
         append_menu_item(import_menu, wxID_ANY, _(L("Import &Config")) + dots + "\tCtrl+L", _(L("Load exported configuration file")),
-            [this](wxCommandEvent&) { load_config_file(); }, "plugin_add.png");
+            [this](wxCommandEvent&) { load_config_file(); }, menu_icon("import_config"));
         append_menu_item(import_menu, wxID_ANY, _(L("Import Config from &project")) + dots +"\tCtrl+Alt+L", _(L("Load configuration from project file")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->extract_config_from_project(); }, "plugin_add.png");
+            [this](wxCommandEvent&) { if (m_plater) m_plater->extract_config_from_project(); }, menu_icon("import_config"));
         import_menu->AppendSeparator();
         append_menu_item(import_menu, wxID_ANY, _(L("Import Config &Bundle")) + dots, _(L("Load presets from a bundle")),
-            [this](wxCommandEvent&) { load_configbundle(); }, "lorry_add.png");
+            [this](wxCommandEvent&) { load_configbundle(); }, menu_icon("import_config_bundle"));
         append_submenu(fileMenu, import_menu, wxID_ANY, _(L("&Import")), "");
 
         wxMenu* export_menu = new wxMenu();
         wxMenuItem* item_export_gcode = append_menu_item(export_menu, wxID_ANY, _(L("Export &G-code")) + dots +"\tCtrl+G", _(L("Export current plate as G-code")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->export_gcode(); }, "cog_go.png");
+            [this](wxCommandEvent&) { if (m_plater) m_plater->export_gcode(); }, menu_icon("export_gcode"), nullptr,
+            [this](){return can_export_gcode(); }, this);
+        m_changeable_menu_items.push_back(item_export_gcode);
         export_menu->AppendSeparator();
-        wxMenuItem* item_export_stl = append_menu_item(export_menu, wxID_ANY, _(L("Export plate as &STL")) + dots, _(L("Export current plate as STL")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->export_stl(); }, "brick_go.png");
-        wxMenuItem* item_export_amf = append_menu_item(export_menu, wxID_ANY, _(L("Export plate as &AMF")) + dots, _(L("Export current plate as AMF")),
-            [this](wxCommandEvent&) { if (m_plater) m_plater->export_amf(); }, "brick_go.png");
+        append_menu_item(export_menu, wxID_ANY, _(L("Export plate as &STL")) + dots, _(L("Export current plate as STL")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->export_stl(); }, menu_icon("export_plater"), nullptr,
+            [this](){return can_export_model(); }, this);
+        append_menu_item(export_menu, wxID_ANY, _(L("Export plate as STL including supports")) + dots, _(L("Export current plate as STL including supports")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->export_stl(true); }, menu_icon("export_plater"), nullptr,
+            [this](){return can_export_supports(); }, this);
+        append_menu_item(export_menu, wxID_ANY, _(L("Export plate as &AMF")) + dots, _(L("Export current plate as AMF")),
+            [this](wxCommandEvent&) { if (m_plater) m_plater->export_amf(); }, menu_icon("export_plater"), nullptr,
+            [this](){return can_export_model(); }, this);
         export_menu->AppendSeparator();
         append_menu_item(export_menu, wxID_ANY, _(L("Export &Config")) +dots +"\tCtrl+E", _(L("Export current configuration to file")),
-            [this](wxCommandEvent&) { export_config(); }, "plugin_go.png");
+            [this](wxCommandEvent&) { export_config(); }, menu_icon("export_config"));
         append_menu_item(export_menu, wxID_ANY, _(L("Export Config &Bundle")) + dots, _(L("Export all presets to file")),
-            [this](wxCommandEvent&) { export_configbundle(); }, "lorry_go.png");
+            [this](wxCommandEvent&) { export_configbundle(); }, menu_icon("export_config_bundle"));
         append_submenu(fileMenu, export_menu, wxID_ANY, _(L("&Export")), "");
 
         fileMenu->AppendSeparator();
@@ -322,23 +450,15 @@ void MainFrame::init_menubar()
         m_menu_item_repeat->Enable(false);
         fileMenu->AppendSeparator();
 #endif
-        m_menu_item_reslice_now = append_menu_item(fileMenu, wxID_ANY, _(L("(Re)Slice &Now")) + "\tCtrl+R", _(L("Start new slicing process")),
-            [this](wxCommandEvent&) { reslice_now(); }, "shape_handles.png");
+        m_menu_item_reslice_now = append_menu_item(fileMenu, wxID_ANY, _(L("(Re)Slice No&w")) + "\tCtrl+R", _(L("Start new slicing process")),
+            [this](wxCommandEvent&) { reslice_now(); }, menu_icon("re_slice"), nullptr,
+            [this](){return m_plater != nullptr && can_reslice(); }, this);
         fileMenu->AppendSeparator();
         append_menu_item(fileMenu, wxID_ANY, _(L("&Repair STL file")) + dots, _(L("Automatically repair an STL file")),
-            [this](wxCommandEvent&) { repair_stl(); }, "wrench.png");
+            [this](wxCommandEvent&) { repair_stl(); }, menu_icon("wrench"));
         fileMenu->AppendSeparator();
-        append_menu_item(fileMenu, wxID_EXIT, _(L("&Quit")), _(L("Quit Slic3r")),
+        append_menu_item(fileMenu, wxID_EXIT, _(L("&Quit")), wxString::Format(_(L("Quit %s")), SLIC3R_APP_NAME),
             [this](wxCommandEvent&) { Close(false); });
-
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(m_plater != nullptr); }, item_open->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable((m_plater != nullptr) && can_save()); }, item_save->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable((m_plater != nullptr) && can_save()); }, item_save_as->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(m_plater != nullptr); }, item_import_model->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable((m_plater != nullptr) && can_export_gcode()); }, item_export_gcode->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable((m_plater != nullptr) && can_export_model()); }, item_export_stl->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable((m_plater != nullptr) && can_export_model()); }, item_export_amf->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable((m_plater != nullptr) && can_slice()); }, m_menu_item_reslice_now->GetId());
     }
 
 #ifdef _MSC_VER
@@ -362,17 +482,29 @@ void MainFrame::init_menubar()
     #else
         wxString hotkey_delete = "Del";
     #endif
-        wxMenuItem* item_select_all = append_menu_item(editMenu, wxID_ANY, _(L("&Select all")) + sep + GUI::shortkey_ctrl_prefix() + sep_space + "A", _(L("Selects all objects")),
-            [this](wxCommandEvent&) { m_plater->select_all(); }, "");
+        append_menu_item(editMenu, wxID_ANY, _(L("&Select all")) + sep + GUI::shortkey_ctrl_prefix() + sep_space + "A",
+            _(L("Selects all objects")), [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->select_all(); },
+            "", nullptr, [this](){return can_select(); }, this);
+#if !DISABLE_DESELECT_ALL_MENU_ITEM
+        append_menu_item(editMenu, wxID_ANY, _(L("D&eselect all")) + sep + GUI::shortkey_ctrl_prefix() + sep + "Esc",
+            _(L("Deselects all objects")), [this](wxCommandEvent&) { if (m_plater != nullptr) m_plater->deselect_all(); },
+            "", nullptr, [this](){return can_deselect(); }, this);
+#endif // !DISABLE_DESELECT_ALL_MENU_ITEM
         editMenu->AppendSeparator();
-        wxMenuItem* item_delete_sel = append_menu_item(editMenu, wxID_ANY, _(L("&Delete selected")) + sep + hotkey_delete, _(L("Deletes the current selection")),
-            [this](wxCommandEvent&) { m_plater->remove_selected(); }, "");
-        wxMenuItem* item_delete_all = append_menu_item(editMenu, wxID_ANY, _(L("Delete &all")) + sep + GUI::shortkey_ctrl_prefix() + sep_space + hotkey_delete, _(L("Deletes all objects")),
-            [this](wxCommandEvent&) { m_plater->reset(); }, "");
+        append_menu_item(editMenu, wxID_ANY, _(L("&Delete selected")) + sep + hotkey_delete,
+            _(L("Deletes the current selection")),[this](wxCommandEvent&) { m_plater->remove_selected(); },
+            menu_icon("remove_menu"), nullptr, [this](){return can_delete(); }, this);
+        append_menu_item(editMenu, wxID_ANY, _(L("Delete &all")) + sep + GUI::shortkey_ctrl_prefix() + sep_space + hotkey_delete,
+            _(L("Deletes all objects")), [this](wxCommandEvent&) { m_plater->reset_with_confirm(); },
+            menu_icon("delete_all_menu"), nullptr, [this](){return can_delete_all(); }, this);
 
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_select()); }, item_select_all->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_delete()); }, item_delete_sel->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_delete_all()); }, item_delete_all->GetId());
+        editMenu->AppendSeparator();
+        append_menu_item(editMenu, wxID_ANY, _(L("&Copy")) + sep + GUI::shortkey_ctrl_prefix() + sep_space + "C",
+            _(L("Copy selection to clipboard")), [this](wxCommandEvent&) { m_plater->copy_selection_to_clipboard(); },
+            menu_icon("copy_menu"), nullptr, [this](){return m_plater->can_copy(); }, this);
+        append_menu_item(editMenu, wxID_ANY, _(L("&Paste")) + sep + GUI::shortkey_ctrl_prefix() + sep_space + "V",
+            _(L("Paste clipboard")), [this](wxCommandEvent&) { m_plater->paste_from_clipboard(); },
+            menu_icon("paste_menu"), nullptr, [this](){return m_plater->can_paste(); }, this);
     }
 
     // Window menu
@@ -381,27 +513,27 @@ void MainFrame::init_menubar()
         size_t tab_offset = 0;
         if (m_plater) {
             append_menu_item(windowMenu, wxID_HIGHEST + 1, _(L("&Plater Tab")) + "\tCtrl+1", _(L("Show the plater")),
-                [this](wxCommandEvent&) { select_tab(0); }, "application_view_tile.png");
+                [this](wxCommandEvent&) { select_tab(0); }, menu_icon("plater"));
             tab_offset += 1;
         }
         if (tab_offset > 0) {
             windowMenu->AppendSeparator();
         }
         append_menu_item(windowMenu, wxID_HIGHEST + 2, _(L("P&rint Settings Tab")) + "\tCtrl+2", _(L("Show the print settings")),
-            [this, tab_offset](wxCommandEvent&) { select_tab(tab_offset + 0); }, "cog.png");
-        append_menu_item(windowMenu, wxID_HIGHEST + 3, _(L("&Filament Settings Tab")) + "\tCtrl+3", _(L("Show the filament settings")),
-            [this, tab_offset](wxCommandEvent&) { select_tab(tab_offset + 1); }, "spool.png");
+            [this, tab_offset](wxCommandEvent&) { select_tab(tab_offset + 0); }, menu_icon("cog"));
+        wxMenuItem* item_material_tab = append_menu_item(windowMenu, wxID_HIGHEST + 3, _(L("&Filament Settings Tab")) + "\tCtrl+3", _(L("Show the filament settings")),
+            [this, tab_offset](wxCommandEvent&) { select_tab(tab_offset + 1); }, menu_icon("spool"));
+        m_changeable_menu_items.push_back(item_material_tab);
         append_menu_item(windowMenu, wxID_HIGHEST + 4, _(L("Print&er Settings Tab")) + "\tCtrl+4", _(L("Show the printer settings")),
-            [this, tab_offset](wxCommandEvent&) { select_tab(tab_offset + 2); }, "printer_empty.png");
+            [this, tab_offset](wxCommandEvent&) { select_tab(tab_offset + 2); }, menu_icon("printer"));
         if (m_plater) {
             windowMenu->AppendSeparator();
-            wxMenuItem* item_3d = append_menu_item(windowMenu, wxID_HIGHEST + 5, _(L("3&D")) + "\tCtrl+5", _(L("Show the 3D editing view")),
-                [this](wxCommandEvent&) { m_plater->select_view_3D("3D"); }, "");
-            wxMenuItem* item_preview = append_menu_item(windowMenu, wxID_HIGHEST + 6, _(L("Pre&view")) + "\tCtrl+6", _(L("Show the 3D slices preview")),
-                [this](wxCommandEvent&) { m_plater->select_view_3D("Preview"); }, "");
-
-            Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_3d->GetId());
-            Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_preview->GetId());
+            append_menu_item(windowMenu, wxID_HIGHEST + 5, _(L("3&D")) + "\tCtrl+5", _(L("Show the 3D editing view")),
+                [this](wxCommandEvent&) { m_plater->select_view_3D("3D"); }, menu_icon("editor_menu"), nullptr,
+                [this](){return can_change_view(); }, this);
+            append_menu_item(windowMenu, wxID_HIGHEST + 6, _(L("Pre&view")) + "\tCtrl+6", _(L("Show the 3D slices preview")),
+                [this](wxCommandEvent&) { m_plater->select_view_3D("Preview"); }, menu_icon("preview_menu"), nullptr,
+                [this](){return can_change_view(); }, this);
         }
 
 #if _WIN32
@@ -419,7 +551,7 @@ void MainFrame::init_menubar()
 
         windowMenu->AppendSeparator();
         append_menu_item(windowMenu, wxID_ANY, _(L("Print &Host Upload Queue")) + "\tCtrl+J", _(L("Display the Print Host Upload Queue window")),
-            [this](wxCommandEvent&) { m_printhost_queue_dlg->Show(); }, "arrow_up.png");
+            [this](wxCommandEvent&) { m_printhost_queue_dlg->Show(); }, menu_icon("upload_queue"));
     }
 
     // View menu
@@ -427,22 +559,23 @@ void MainFrame::init_menubar()
     if (m_plater) {
         viewMenu = new wxMenu();
         // The camera control accelerators are captured by GLCanvas3D::on_char().
-		wxMenuItem* item_iso = append_menu_item(viewMenu, wxID_ANY, _(L("Iso")) + sep + "&0", _(L("Iso View")), [this](wxCommandEvent&) { select_view("iso"); });
+        append_menu_item(viewMenu, wxID_ANY, _(L("Iso")) + sep + "&0", _(L("Iso View")),[this](wxCommandEvent&) { select_view("iso"); }, 
+            "", nullptr, [this](){return can_change_view(); }, this);
         viewMenu->AppendSeparator();
-		wxMenuItem* item_top = append_menu_item(viewMenu, wxID_ANY, _(L("Top")) + sep + "&1", _(L("Top View")), [this](wxCommandEvent&) { select_view("top"); });
-		wxMenuItem* item_bottom = append_menu_item(viewMenu, wxID_ANY, _(L("Bottom")) + sep + "&2", _(L("Bottom View")), [this](wxCommandEvent&) { select_view("bottom"); });
-		wxMenuItem* item_front = append_menu_item(viewMenu, wxID_ANY, _(L("Front")) + sep + "&3", _(L("Front View")), [this](wxCommandEvent&) { select_view("front"); });
-		wxMenuItem* item_rear = append_menu_item(viewMenu, wxID_ANY, _(L("Rear")) + sep + "&4", _(L("Rear View")), [this](wxCommandEvent&) { select_view("rear"); });
-		wxMenuItem* item_left = append_menu_item(viewMenu, wxID_ANY, _(L("Left")) + sep + "&5", _(L("Left View")), [this](wxCommandEvent&) { select_view("left"); });
-		wxMenuItem* item_right = append_menu_item(viewMenu, wxID_ANY, _(L("Right")) + sep + "&6", _(L("Right View")), [this](wxCommandEvent&) { select_view("right"); });
-
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_iso->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_top->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_bottom->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_front->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_rear->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_left->GetId());
-        Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_change_view()); }, item_right->GetId());
+        //TRN To be shown in the main menu View->Top 
+        append_menu_item(viewMenu, wxID_ANY, _(L("Top")) + sep + "&1", _(L("Top View")), [this](wxCommandEvent&) { select_view("top"); },
+            "", nullptr, [this](){return can_change_view(); }, this);
+		//TRN To be shown in the main menu View->Bottom 
+        append_menu_item(viewMenu, wxID_ANY, _(L("Bottom")) + sep + "&2", _(L("Bottom View")), [this](wxCommandEvent&) { select_view("bottom"); },
+            "", nullptr, [this](){return can_change_view(); }, this);
+        append_menu_item(viewMenu, wxID_ANY, _(L("Front")) + sep + "&3", _(L("Front View")), [this](wxCommandEvent&) { select_view("front"); },
+            "", nullptr, [this](){return can_change_view(); }, this);
+        append_menu_item(viewMenu, wxID_ANY, _(L("Rear")) + sep + "&4", _(L("Rear View")), [this](wxCommandEvent&) { select_view("rear"); },
+            "", nullptr, [this](){return can_change_view(); }, this);
+        append_menu_item(viewMenu, wxID_ANY, _(L("Left")) + sep + "&5", _(L("Left View")), [this](wxCommandEvent&) { select_view("left"); },
+            "", nullptr, [this](){return can_change_view(); }, this);
+        append_menu_item(viewMenu, wxID_ANY, _(L("Right")) + sep + "&6", _(L("Right View")), [this](wxCommandEvent&) { select_view("right"); },
+            "", nullptr, [this](){return can_change_view(); }, this);
     }
 
     // Help menu
@@ -455,23 +588,25 @@ void MainFrame::init_menubar()
         append_menu_item(helpMenu, wxID_ANY, _(L("Slic3r++ website")), _(L("Open the slic3r++ website in your browser")),
             [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/slic3r"); });
         append_menu_item(helpMenu, wxID_ANY, _(L("Prusa Edition website")), _(L("Open the Prusa Edition website in your browser")), 
-            [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/slic3r"); });
+            [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/PrusaSlicer"); });
 //#        my $versioncheck = $self->_append_menu_item($helpMenu, "Check for &Updates...", "Check for new Slic3r versions", sub{
 //#            wxTheApp->check_version(1);
 //#        });
 //#        $versioncheck->Enable(wxTheApp->have_version_check);
-        append_menu_item(helpMenu, wxID_ANY, _(L("Slic3r &Website")), _(L("Open the Slic3r website in your browser")),
-            [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://slic3r.org/"); });
-        append_menu_item(helpMenu, wxID_ANY, _(L("Slic3r &Manual")), _(L("Open the Slic3r manual in your browser")),
-            [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://manual.slic3r.org/"); });
+        append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("%s &Website")), SLIC3R_APP_NAME), 
+                                             wxString::Format(_(L("Open the %s website in your browser")), SLIC3R_APP_NAME),
+            [this](wxCommandEvent&) { wxGetApp().open_web_page_localized("https://www.prusa3d.com/slicerweb"); });
+//        append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("%s &Manual")), SLIC3R_APP_NAME),
+//                                             wxString::Format(_(L("Open the %s manual in your browser")), SLIC3R_APP_NAME),
+//            [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://manual.slic3r.org/"); });
         helpMenu->AppendSeparator();
         append_menu_item(helpMenu, wxID_ANY, _(L("System &Info")), _(L("Show system information")), 
             [this](wxCommandEvent&) { wxGetApp().system_info(); });
         append_menu_item(helpMenu, wxID_ANY, _(L("Show &Configuration Folder")), _(L("Show user configuration folder (datadir)")),
             [this](wxCommandEvent&) { Slic3r::GUI::desktop_open_datadir_folder(); });
-        append_menu_item(helpMenu, wxID_ANY, _(L("Report an Issue")), _(L("Report an issue on Slic3r++")), 
+        append_menu_item(helpMenu, wxID_ANY, _(L("Report an I&ssue")), wxString::Format(_(L("Report an issue on %s")), SLIC3R_APP_NAME), 
             [this](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/Slic3r/issues/new"); });
-        append_menu_item(helpMenu, wxID_ANY, _(L("&About Slic3r")), _(L("Show about dialog")),
+        append_menu_item(helpMenu, wxID_ANY, wxString::Format(_(L("&About %s")), SLIC3R_APP_NAME), _(L("Show about dialog")),
             [this](wxCommandEvent&) { Slic3r::GUI::about(); });
         helpMenu->AppendSeparator();
         append_menu_item(helpMenu, wxID_ANY, _(L("Keyboard Shortcuts")) + sep + "&?", _(L("Show the list of the keyboard shortcuts")),
@@ -501,6 +636,19 @@ void MainFrame::init_menubar()
         }, wxID_EXIT);
     }
 #endif
+
+    if (plater()->printer_technology() == ptSLA)
+        update_menubar();
+}
+
+void MainFrame::update_menubar()
+{
+    const bool is_fff = plater()->printer_technology() == ptFFF;
+
+    m_changeable_menu_items[miExport]       ->SetItemLabel((is_fff ? _(L("Export &G-code"))         : _(L("Export"))                    )   + dots + "\tCtrl+G");
+
+    m_changeable_menu_items[miMaterialTab]  ->SetItemLabel((is_fff ? _(L("&Filament Settings Tab")) : _(L("Mate&rial Settings Tab")))   + "\tCtrl+3");
+    m_changeable_menu_items[miMaterialTab]  ->SetBitmap(create_scaled_bitmap(this, menu_icon(is_fff ? "spool": "resin")));
 }
 
 // To perform the "Quck Slice", "Quick Slice and Save As", "Repeat last Quick Slice" and "Slice to SVG".
@@ -512,7 +660,11 @@ void MainFrame::quick_slice(const int qs)
 //     {
     // validate configuration
     auto config = wxGetApp().preset_bundle->full_config();
-    config.validate();
+    auto valid = config.validate();
+    if (! valid.empty()) {
+        show_error(this, valid);
+        return;
+    }
 
     // select input file
     if (!(qs & qsReslice)) {
@@ -535,7 +687,7 @@ void MainFrame::quick_slice(const int qs)
             dlg->ShowModal();
             return;
         }
-        if (std::ifstream(m_qs_last_input_file.char_str())) {
+        if (std::ifstream(m_qs_last_input_file.ToUTF8().data())) {
             auto dlg = new wxMessageDialog(this, _(L("Previously sliced file ("))+m_qs_last_input_file+_(L(") not found.")),
                 _(L("File Not Found")), wxICON_ERROR | wxOK);
             dlg->ShowModal();
@@ -572,7 +724,7 @@ void MainFrame::quick_slice(const int qs)
     } 
     else if (qs & qsSaveAs) {
         // The following line may die if the output_filename_format template substitution fails.
-        auto dlg = new wxFileDialog(this, _(L("Save ")) + (qs & qsExportSVG ? _(L("SVG")) : _(L("G-code"))) + _(L(" file as:")),
+        auto dlg = new wxFileDialog(this, wxString::Format(_(L("Save %s file as:")) , qs & qsExportSVG ? _(L("SVG")) : _(L("G-code")) ),
             wxGetApp().app_config->get_last_output_dir(get_dir_name(output_file)), get_base_name(input_file), 
             qs & qsExportSVG ? file_wildcards(FT_SVG) : file_wildcards(FT_GCODE),
             wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
@@ -599,7 +751,9 @@ void MainFrame::quick_slice(const int qs)
     }
 
     // show processbar dialog
-    m_progress_dialog = new wxProgressDialog(_(L("Slicing")) + dots, _(L("Processing ")) + input_file_basename + "…",
+    m_progress_dialog = new wxProgressDialog(_(L("Slicing")) + dots, 
+    // TRN "Processing input_file_basename"
+                                             wxString::Format(_(L("Processing %s")), input_file_basename + dots),
         100, this, 4);
     m_progress_dialog->Pulse();
     {
@@ -650,24 +804,23 @@ void MainFrame::repair_stl()
         dlg->Destroy();
     }
 
-    auto output_file = input_file;
+    wxString output_file = input_file;
     {
-//         output_file = ~s / \.[sS][tT][lL]$ / _fixed.obj / ;
         auto dlg = new wxFileDialog( this, L("Save OBJ file (less prone to coordinate errors than STL) as:"), 
-                                        get_dir_name(output_file), get_base_name(output_file), 
+                                        get_dir_name(output_file), get_base_name(output_file, ".obj"),
                                         file_wildcards(FT_OBJ), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
         if (dlg->ShowModal() != wxID_OK) {
             dlg->Destroy();
-            return /*undef*/;
+            return;
         }
         output_file = dlg->GetPath();
         dlg->Destroy();
     }
 
     auto tmesh = new Slic3r::TriangleMesh();
-    tmesh->ReadSTLFile(input_file.char_str());
+    tmesh->ReadSTLFile(input_file.ToUTF8().data());
     tmesh->repair();
-    tmesh->WriteOBJFile(output_file.char_str());
+    tmesh->WriteOBJFile(output_file.ToUTF8().data());
     Slic3r::GUI::show_info(this, L("Your file was repaired."), L("Repair"));
 }
 
@@ -677,8 +830,8 @@ void MainFrame::export_config()
     auto config = wxGetApp().preset_bundle->full_config();
     // Validate the cummulative configuration.
     auto valid = config.validate();
-    if (!valid.empty()) {
-//         Slic3r::GUI::catch_error(this);
+    if (! valid.empty()) {
+        show_error(this, valid);
         return;
     }
     // Ask user for the file name for the config file.
@@ -741,7 +894,7 @@ void MainFrame::export_configbundle()
     // Ask user for a file name.
     auto dlg = new wxFileDialog(this, _(L("Save presets bundle as:")),
         !m_last_config.IsEmpty() ? get_dir_name(m_last_config) : wxGetApp().app_config->get_last_dir(),
-        "Slic3r_config_bundle.ini",
+        SLIC3R_APP_KEY "_config_bundle.ini",
         file_wildcards(FT_INI), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
     wxString file;
     if (dlg->ShowModal() == wxID_OK)
@@ -807,7 +960,7 @@ void MainFrame::load_config(const DynamicPrintConfig& config)
 #if 0
     for (auto tab : wxGetApp().tabs_list)
 		if (tab->supports_printer_technology(printer_technology)) {
-			if (tab->name() == "printer")
+			if (tab->type() == Slic3r::Preset::TYPE_PRINTER)
 				static_cast<TabPrinter*>(tab)->update_pages();
         tab->load_config(config);
 		}
@@ -907,9 +1060,12 @@ void MainFrame::update_ui_from_settings()
         tab->update_ui_from_settings();
 }
 
-std::string MainFrame::get_base_name(const wxString &full_name) const 
+std::string MainFrame::get_base_name(const wxString &full_name, const char *extension) const 
 {
-    return boost::filesystem::path(full_name.wx_str()).filename().string();
+    boost::filesystem::path filename = boost::filesystem::path(full_name.wx_str()).filename();
+    if (extension != nullptr)
+		filename = filename.replace_extension(extension);
+    return filename.string();
 }
 
 std::string MainFrame::get_dir_name(const wxString &full_name) const 
@@ -917,6 +1073,5 @@ std::string MainFrame::get_dir_name(const wxString &full_name) const
     return boost::filesystem::path(full_name.wx_str()).parent_path().string();
 }
 
-
 } // GUI
 } // Slic3r
diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp
index b44c73f91..a5de94738 100644
--- a/src/slic3r/GUI/MainFrame.hpp
+++ b/src/slic3r/GUI/MainFrame.hpp
@@ -4,11 +4,13 @@
 #include "libslic3r/PrintConfig.hpp"
 
 #include <wx/frame.h>
+#include <wx/settings.h>
 #include <wx/string.h>
 
 #include <string>
 #include <map>
 
+#include "GUI_Utils.hpp"
 #include "Plater.hpp"
 #include "Event.hpp"
 
@@ -40,7 +42,7 @@ struct PresetTab {
     PrinterTechnology technology;
 };
 
-class MainFrame : public wxFrame
+class MainFrame : public DPIFrame
 {
     bool        m_loaded {false};
 
@@ -53,20 +55,37 @@ class MainFrame : public wxFrame
 
     PrintHostQueueDialog *m_printhost_queue_dlg;
 
-    std::string     get_base_name(const wxString &full_name) const;
+    std::string     get_base_name(const wxString &full_name, const char *extension = nullptr) const;
     std::string     get_dir_name(const wxString &full_name) const;
 
     void on_presets_changed(SimpleEvent&);
     void on_value_changed(wxCommandEvent&);
 
+    bool can_start_new_project() const;
     bool can_save() const;
     bool can_export_model() const;
+    bool can_export_supports() const;
     bool can_export_gcode() const;
     bool can_slice() const;
     bool can_change_view() const;
     bool can_select() const;
+    bool can_deselect() const;
     bool can_delete() const;
     bool can_delete_all() const;
+    bool can_reslice() const;
+
+    // MenuBar items changeable in respect to printer technology 
+    enum MenuItems
+    {                   //   FFF                  SLA
+        miExport = 0,   // Export G-code        Export
+        miMaterialTab,  // Filament Settings    Material Settings
+    };
+
+    // vector of a MenuBar items changeable in respect to printer technology 
+    std::vector<wxMenuItem*> m_changeable_menu_items;
+
+protected:
+    virtual void on_dpi_changed(const wxRect &suggested_rect);
 
 public:
     MainFrame();
@@ -74,10 +93,13 @@ public:
 
     Plater*     plater() { return m_plater; }
 
+    void        update_title();
+
     void        init_tabpanel();
     void        create_preset_tabs();
     void        add_created_tab(Tab* panel);
     void        init_menubar();
+    void        update_menubar();
 
     void        update_ui_from_settings();
     bool        is_loaded() const { return m_loaded; }
diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp
index 961888455..ba2c5ed0c 100644
--- a/src/slic3r/GUI/MsgDialog.cpp
+++ b/src/slic3r/GUI/MsgDialog.cpp
@@ -23,18 +23,16 @@ namespace Slic3r {
 namespace GUI {
 
 
-MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxWindowID button_id) :
-	MsgDialog(parent, title, headline, create_scaled_bitmap("Slic3r_192px.png"), button_id)
-{}
-
-MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxBitmap bitmap, wxWindowID button_id) :
-	wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER),
-	boldfont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)),
-	content_sizer(new wxBoxSizer(wxVERTICAL)),
-	btn_sizer(new wxBoxSizer(wxHORIZONTAL))
+MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxWindowID button_id, wxBitmap bitmap)
+	: wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	, boldfont(wxGetApp().normal_font()/*wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)*/)
+	, content_sizer(new wxBoxSizer(wxVERTICAL))
+	, btn_sizer(new wxBoxSizer(wxHORIZONTAL))
 {
 	boldfont.SetWeight(wxFONTWEIGHT_BOLD);
 
+    this->SetFont(wxGetApp().normal_font());
+
 	auto *topsizer = new wxBoxSizer(wxHORIZONTAL);
 	auto *rightsizer = new wxBoxSizer(wxVERTICAL);
 
@@ -54,7 +52,11 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he
 
 	rightsizer->Add(btn_sizer, 0, wxALIGN_RIGHT);
 
-	auto *logo = new wxStaticBitmap(this, wxID_ANY, std::move(bitmap));
+	if (! bitmap.IsOk()) {
+		bitmap = create_scaled_bitmap(this, "Slic3r_192px.png", 192);
+	}
+
+	logo = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
 
 	topsizer->Add(logo, 0, wxALL, BORDER);
 	topsizer->Add(rightsizer, 1, wxALL | wxEXPAND, BORDER);
@@ -68,8 +70,8 @@ MsgDialog::~MsgDialog() {}
 // ErrorDialog
 
 ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg)
-	: MsgDialog(parent, _(L("Slic3r error")), _(L("Slic3r has encountered an error")),
-        create_scaled_bitmap("Slic3r_192px_grayscale.png"),
+    : MsgDialog(parent, wxString::Format(_(L("%s error")), SLIC3R_APP_NAME), 
+                        wxString::Format(_(L("%s has encountered an error")), SLIC3R_APP_NAME),
 		wxID_NONE)
 	, msg(msg)
 {
@@ -97,6 +99,8 @@ ErrorDialog::ErrorDialog(wxWindow *parent, const wxString &msg)
 	btn_ok->SetFocus();
 	btn_sizer->Add(btn_ok, 0, wxRIGHT, HORIZ_SPACING);
 
+	logo->SetBitmap(create_scaled_bitmap(this, "Slic3r_192px_grayscale.png", 192));
+
     SetMaxSize(wxSize(-1, CONTENT_MAX_HEIGHT*wxGetApp().em_unit()));
 	Fit();
 }
diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp
index 09bb89e4f..ad4bbcc97 100644
--- a/src/slic3r/GUI/MsgDialog.hpp
+++ b/src/slic3r/GUI/MsgDialog.hpp
@@ -12,6 +12,7 @@
 
 class wxBoxSizer;
 class wxCheckBox;
+class wxStaticBitmap;
 
 namespace Slic3r {
 
@@ -40,12 +41,12 @@ protected:
 	};
 
 	// button_id is an id of a button that can be added by default, use wxID_NONE to disable
-	MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxWindowID button_id = wxID_OK);
-	MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxBitmap bitmap, wxWindowID button_id = wxID_OK);
+	MsgDialog(wxWindow *parent, const wxString &title, const wxString &headline, wxWindowID button_id = wxID_OK, wxBitmap bitmap = wxNullBitmap);
 
 	wxFont boldfont;
 	wxBoxSizer *content_sizer;
 	wxBoxSizer *btn_sizer;
+	wxStaticBitmap *logo;
 };
 
 
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index 68414fb9a..8e712cf00 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -166,37 +166,47 @@ void OptionsGroup::append_line(const Line& line, wxStaticText**	full_Label/* = n
 #endif /* __WXGTK__ */
 
 	// if we have an extra column, build it
-	if (extra_column)
-		grid_sizer->Add(extra_column(this->ctrl_parent(), line), 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3);
+        if (extra_column)
+        {
+            m_extra_column_item_ptrs.push_back(extra_column(this->ctrl_parent(), line));
+            grid_sizer->Add(m_extra_column_item_ptrs.back(), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 3);
+        }
 
     // Build a label if we have it
 	wxStaticText* label=nullptr;
     if (label_width != 0) {
-		long label_style = staticbox ? 0 : wxALIGN_RIGHT;
+    	if (! line.near_label_widget || ! line.label.IsEmpty()) {
+    		// Only create the label if it is going to be displayed.
+			long label_style = staticbox ? 0 : wxALIGN_RIGHT;
 #ifdef __WXGTK__
-		// workaround for correct text align of the StaticBox on Linux
-		// flags wxALIGN_RIGHT and wxALIGN_CENTRE don't work when Ellipsize flags are _not_ given.
-		// Text is properly aligned only when Ellipsize is checked.
-		label_style |= staticbox ? 0 : wxST_ELLIPSIZE_END;
+			// workaround for correct text align of the StaticBox on Linux
+			// flags wxALIGN_RIGHT and wxALIGN_CENTRE don't work when Ellipsize flags are _not_ given.
+			// Text is properly aligned only when Ellipsize is checked.
+			label_style |= staticbox ? 0 : wxST_ELLIPSIZE_END;
 #endif /* __WXGTK__ */
-		label = new wxStaticText(this->ctrl_parent(), wxID_ANY, line.label + (line.label.IsEmpty() ? "" : ":"), 
-							wxDefaultPosition, wxSize(label_width, -1), label_style);
-		label->SetBackgroundStyle(wxBG_STYLE_PAINT);
-        label->SetFont(label_font);
-        label->Wrap(label_width); // avoid a Linux/GTK bug
+			label = new wxStaticText(this->ctrl_parent(), wxID_ANY, line.label + (line.label.IsEmpty() ? "" : ": "), 
+								wxDefaultPosition, wxSize(label_width*wxGetApp().em_unit(), -1), label_style);
+			label->SetBackgroundStyle(wxBG_STYLE_PAINT);
+	        label->SetFont(wxGetApp().normal_font());
+	        label->Wrap(label_width*wxGetApp().em_unit()); // avoid a Linux/GTK bug
+	    }
         if (!line.near_label_widget)
             grid_sizer->Add(label, 0, (staticbox ? 0 : wxALIGN_RIGHT | wxRIGHT) | wxALIGN_CENTER_VERTICAL, line.label.IsEmpty() ? 0 : 5);
-        else if (line.near_label_widget && line.label.IsEmpty())
-            grid_sizer->Add(line.near_label_widget(this->ctrl_parent()), 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 7);
         else {
-            // If we're here, we have some widget near the label
-            // so we need a horizontal sizer to arrange these things
-            auto sizer = new wxBoxSizer(wxHORIZONTAL);
-            grid_sizer->Add(sizer, 0, wxEXPAND | (staticbox ? wxALL : wxBOTTOM | wxTOP | wxLEFT), staticbox ? 0 : 1);
-            sizer->Add(line.near_label_widget(this->ctrl_parent()), 0, wxRIGHT, 7);
-            sizer->Add(label, 0, (staticbox ? 0 : wxALIGN_RIGHT | wxRIGHT) | wxALIGN_CENTER_VERTICAL, 5);
+            m_near_label_widget_ptrs.push_back(line.near_label_widget(this->ctrl_parent()));
+
+            if (line.label.IsEmpty())
+                grid_sizer->Add(m_near_label_widget_ptrs.back(), 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 7);
+            else {
+                // If we're here, we have some widget near the label
+                // so we need a horizontal sizer to arrange these things
+                auto sizer = new wxBoxSizer(wxHORIZONTAL);
+                grid_sizer->Add(sizer, 0, wxEXPAND | (staticbox ? wxALL : wxBOTTOM | wxTOP | wxLEFT), staticbox ? 0 : 1);
+                sizer->Add(m_near_label_widget_ptrs.back(), 0, wxRIGHT, 7);
+                sizer->Add(label, 0, (staticbox ? 0 : wxALIGN_RIGHT | wxRIGHT) | wxALIGN_CENTER_VERTICAL, 5);
+            }
         }
-		if (line.label_tooltip.compare("") != 0)
+		if (label != nullptr && line.label_tooltip != "")
 			label->SetToolTip(line.label_tooltip);
     }
 
@@ -235,14 +245,13 @@ void OptionsGroup::append_line(const Line& line, wxStaticText**	full_Label/* = n
 		wxSizer* sizer_tmp = sizer;
 		// add label if any
 		if (option.label != "") {
-// 			wxString str_label = _(option.label);
 //!			To correct translation by context have to use wxGETTEXT_IN_CONTEXT macro from wxWidget 3.1.1
 			wxString str_label = (option.label == "Top" || option.label == "Bottom") ?
 								_CTX(option.label, "Layers") :
 								_(option.label);
 			label = new wxStaticText(this->ctrl_parent(), wxID_ANY, str_label + ":", wxDefaultPosition, wxDefaultSize);
 			label->SetBackgroundStyle(wxBG_STYLE_PAINT);
-			label->SetFont(label_font);
+            label->SetFont(wxGetApp().normal_font());
 			sizer_tmp->Add(label, 0, /*wxALIGN_RIGHT |*/ wxALIGN_CENTER_VERTICAL, 0);
 		}
 
@@ -267,9 +276,9 @@ void OptionsGroup::append_line(const Line& line, wxStaticText**	full_Label/* = n
 		// add sidetext if any
 		if (option.sidetext != "") {
 			auto sidetext = new wxStaticText(	this->ctrl_parent(), wxID_ANY, _(option.sidetext), wxDefaultPosition, 
-												wxSize(sidetext_width, -1)/*wxDefaultSize*/, wxALIGN_LEFT);
+												/*wxSize(sidetext_width*wxGetApp().em_unit(), -1)*/wxDefaultSize, wxALIGN_LEFT);
 			sidetext->SetBackgroundStyle(wxBG_STYLE_PAINT);
-			sidetext->SetFont(sidetext_font);
+            sidetext->SetFont(wxGetApp().normal_font());
 			sizer_tmp->Add(sidetext, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, 4);
 			field->set_side_text_ptr(sidetext);
 		}
@@ -301,7 +310,10 @@ void OptionsGroup::append_line(const Line& line, wxStaticText**	full_Label/* = n
 }
 
 Line OptionsGroup::create_single_option_line(const Option& option) const {
-	Line retval{ _(option.opt.label), _(option.opt.tooltip) };
+// 	Line retval{ _(option.opt.label), _(option.opt.tooltip) };
+    wxString tooltip = _(option.opt.tooltip);
+    edit_tooltip(tooltip);
+	Line retval{ _(option.opt.label), tooltip };
     Option tmp(option);
     tmp.opt.label = std::string("");
     retval.append_option(tmp);
@@ -398,18 +410,18 @@ void ConfigOptionsGroup::back_to_config_value(const DynamicPrintConfig& config,
 		auto   *nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(config.option("nozzle_diameter"));
 		value = int(nozzle_diameter->values.size());
 	}
-	else if (m_opt_map.find(opt_key) != m_opt_map.end())
+    else if (m_opt_map.find(opt_key) == m_opt_map.end() || opt_key == "bed_shape") {
+        value = get_config_value(config, opt_key);
+        change_opt_value(*m_config, opt_key, value);
+        return;
+    }
+	else
 	{
 		auto opt_id = m_opt_map.find(opt_key)->first;
 		std::string opt_short_key = m_opt_map.at(opt_id).first;
 		int opt_index = m_opt_map.at(opt_id).second;
 		value = get_config_value(config, opt_short_key, opt_index);
 	}
-	else{
-		value = get_config_value(config, opt_key);
-		change_opt_value(*m_config, opt_key, value);
-		return;
-	}
 
 	set_value(opt_key, value);
 	on_change_OG(opt_key, get_value(opt_key));
@@ -417,22 +429,24 @@ void ConfigOptionsGroup::back_to_config_value(const DynamicPrintConfig& config,
 
 void ConfigOptionsGroup::on_kill_focus(const std::string& opt_key)
 {
-    if (m_fill_empty_value) {
+    if (m_fill_empty_value)
         m_fill_empty_value(opt_key);
-        return;
-    }
-    reload_config();
+    else
+	    reload_config();
 }
 
-void ConfigOptionsGroup::reload_config() {
-	for (t_opt_map::iterator it = m_opt_map.begin(); it != m_opt_map.end(); ++it) {
-		auto opt_id = it->first;
-		std::string opt_key = m_opt_map.at(opt_id).first;
-		int opt_index = m_opt_map.at(opt_id).second;
-		auto option = m_options.at(opt_id).opt;
-		set_value(opt_id, config_value(opt_key, opt_index, option.gui_flags.compare("serialized") == 0 ));
+void ConfigOptionsGroup::reload_config()
+{
+	for (auto &kvp : m_opt_map) {
+		// Name of the option field (name of the configuration key, possibly suffixed with '#' and the index of a scalar inside a vector.
+		const std::string &opt_id    = kvp.first;
+		// option key (may be scalar or vector)
+		const std::string &opt_key   = kvp.second.first;
+		// index in the vector option, zero for scalars
+		int 			   opt_index = kvp.second.second;
+		const ConfigOptionDef &option = m_options.at(opt_id).opt;
+		this->set_value(opt_id, config_value(opt_key, opt_index, option.gui_flags == "serialized"));
 	}
-
 }
 
 void ConfigOptionsGroup::Hide()
@@ -478,6 +492,57 @@ bool ConfigOptionsGroup::update_visibility(ConfigOptionMode mode) {
     return true;
 }
 
+void ConfigOptionsGroup::msw_rescale()
+{
+    // update bitmaps for extra column items (like "mode markers" or buttons on settings panel)
+    if (rescale_extra_column_item)
+        for (auto extra_col : m_extra_column_item_ptrs)
+            rescale_extra_column_item(extra_col);
+
+    // update bitmaps for near label widgets (like "Set uniform scale" button on settings panel)
+    if (rescale_near_label_widget)
+        for (auto near_label_widget : m_near_label_widget_ptrs)
+            rescale_near_label_widget(near_label_widget);
+
+    // update undo buttons : rescale bitmaps
+    for (const auto& field : m_fields)
+        field.second->msw_rescale();
+
+    const int em = em_unit(parent());
+
+    // rescale width of label column
+    if (!m_options_mode.empty() && label_width > 1)
+    {
+        const int cols = m_grid_sizer->GetCols();
+        const int rows = m_grid_sizer->GetEffectiveRowsCount();
+        const int label_col = extra_column == nullptr ? 0 : 1;
+
+        for (int i = 0; i < rows; i++)
+        {
+            const wxSizerItem* label_item = m_grid_sizer->GetItem(i*cols+label_col);
+            if (label_item->IsWindow())
+            {
+                auto label = dynamic_cast<wxStaticText*>(label_item->GetWindow());
+                if (label != nullptr) {
+                    label->SetMinSize(wxSize(label_width*em, -1));
+                }
+            }
+            else if (label_item->IsSizer()) // case when we have near_label_widget
+            {
+                const wxSizerItem* l_item = label_item->GetSizer()->GetItem(1);
+                if (l_item->IsWindow())
+                {
+                    auto label = dynamic_cast<wxStaticText*>(l_item->GetWindow());
+                    if (label != nullptr) {
+                        label->SetMinSize(wxSize(label_width*em, -1));
+                    }
+                }
+            }
+        }
+        m_grid_sizer->Layout();
+    }
+}
+
 boost::any ConfigOptionsGroup::config_value(const std::string& opt_key, int opt_index, bool deserialize) {
 
 	if (deserialize) {
diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp
index dbe1ea1a2..73b2c5110 100644
--- a/src/slic3r/GUI/OptionsGroup.hpp
+++ b/src/slic3r/GUI/OptionsGroup.hpp
@@ -1,17 +1,14 @@
 #ifndef slic3r_OptionsGroup_hpp_
 #define slic3r_OptionsGroup_hpp_
 
-//#include <wx/wx.h>
 #include <wx/stattext.h>
 #include <wx/settings.h>
-//#include <wx/window.h>
 
 #include <map>
 #include <functional>
 
 #include "libslic3r/Config.hpp"
 #include "libslic3r/PrintConfig.hpp"
-// #include "libslic3r/libslic3r.h"
 
 #include "Field.hpp"
 #include "GUI_App.hpp"
@@ -72,7 +69,7 @@ private:
     std::vector<widget_t>	m_extra_widgets;//! {std::vector<widget_t>()};
 };
 
-using column_t = std::function<wxWindow*(wxWindow* parent, const Line&)>;//std::function<wxSizer*(const Line&)>;
+using column_t = std::function<wxWindow*(wxWindow* parent, const Line&)>;
 
 using t_optionfield_map = std::map<t_config_option_key, t_field>;
 using t_opt_map = std::map< std::string, std::pair<std::string, int> >;
@@ -82,16 +79,21 @@ class OptionsGroup {
 public:
     const bool		staticbox {true};
     const wxString	title {wxString("")};
-    size_t			label_width = 20 * wxGetApp().em_unit();// {200};
+    size_t			label_width = 20 ;// {200};
     wxSizer*		sizer {nullptr};
     column_t		extra_column {nullptr};
     t_change		m_on_change { nullptr };
+	// To be called when the field loses focus, to assign a new initial value to the field.
+	// Used by the relative position / rotation / scale manipulation fields of the Object Manipulation UI.
     t_kill_focus    m_fill_empty_value { nullptr };
     t_kill_focus    m_set_focus { nullptr };
 	std::function<DynamicPrintConfig()>	m_get_initial_config{ nullptr };
 	std::function<DynamicPrintConfig()>	m_get_sys_config{ nullptr };
 	std::function<bool()>	have_sys_config{ nullptr };
 
+    std::function<void(wxWindow* win)> rescale_extra_column_item { nullptr };
+    std::function<void(wxWindow* win)> rescale_near_label_widget { nullptr };
+    
     wxFont			sidetext_font {wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
     wxFont			label_font {wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
 	int				sidetext_width{ -1 };
@@ -191,6 +193,8 @@ protected:
 	std::map<t_config_option_key, Option>	m_options;
     wxWindow*				m_parent {nullptr};
     std::vector<ConfigOptionMode>           m_options_mode;
+    std::vector<wxWindow*>                  m_extra_column_item_ptrs;
+    std::vector<wxWindow*>                  m_near_label_widget_ptrs;
 
     /// Field list, contains unique_ptrs of the derived type.
     /// using types that need to know what it is beyond the public interface 
@@ -253,12 +257,13 @@ public:
 	void		back_to_initial_value(const std::string& opt_key) override;
 	void		back_to_sys_value(const std::string& opt_key) override;
 	void		back_to_config_value(const DynamicPrintConfig& config, const std::string& opt_key);
-    void		on_kill_focus(const std::string& opt_key) override;// { reload_config(); }
+    void		on_kill_focus(const std::string& opt_key) override;
 	void		reload_config();
     // return value shows visibility : false => all options are hidden
     void        Hide();
     void        Show(const bool show);
     bool        update_visibility(ConfigOptionMode mode);
+    void        msw_rescale();
 	boost::any	config_value(const std::string& opt_key, int opt_index, bool deserialize);
 	// return option value from config 
 	boost::any	get_config_value(const DynamicPrintConfig& config, const std::string& opt_key, int opt_index = -1);
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index f062aed36..5097f578c 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -7,6 +7,7 @@
 #include <regex>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem/path.hpp>
 
@@ -38,6 +39,8 @@
 #include "libslic3r/SLA/SLARotfinder.hpp"
 #include "libslic3r/Utils.hpp"
 
+#include "libnest2d/optimizers/nlopt/genetic.hpp"
+
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"
@@ -109,6 +112,7 @@ public:
 
     bool        showing_manifold_warning_icon;
     void        show_sizer(bool show);
+    void        msw_rescale();
 };
 
 ObjectInfo::ObjectInfo(wxWindow *parent) :
@@ -116,10 +120,10 @@ ObjectInfo::ObjectInfo(wxWindow *parent) :
 {
     GetStaticBox()->SetFont(wxGetApp().bold_font());
 
-    auto *grid_sizer = new wxFlexGridSizer(4, 5, 5);
+    auto *grid_sizer = new wxFlexGridSizer(4, 5, 15);
     grid_sizer->SetFlexibleDirection(wxHORIZONTAL);
-    grid_sizer->AddGrowableCol(1, 1);
-    grid_sizer->AddGrowableCol(3, 1);
+//     grid_sizer->AddGrowableCol(1, 1);
+//     grid_sizer->AddGrowableCol(3, 1);
 
     auto init_info_label = [parent, grid_sizer](wxStaticText **info_label, wxString text_label) {
         auto *text = new wxStaticText(parent, wxID_ANY, text_label+":");
@@ -141,8 +145,7 @@ ObjectInfo::ObjectInfo(wxWindow *parent) :
     info_manifold_text->SetFont(wxGetApp().small_font());
     info_manifold = new wxStaticText(parent, wxID_ANY, "");
     info_manifold->SetFont(wxGetApp().small_font());
-    wxBitmap bitmap(GUI::from_u8(Slic3r::var("error.png")), wxBITMAP_TYPE_PNG);
-    manifold_warning_icon = new wxStaticBitmap(parent, wxID_ANY, bitmap);
+    manifold_warning_icon = new wxStaticBitmap(parent, wxID_ANY, create_scaled_bitmap(parent, "exclamation"));
     auto *sizer_manifold = new wxBoxSizer(wxHORIZONTAL);
     sizer_manifold->Add(info_manifold_text, 0);
     sizer_manifold->Add(manifold_warning_icon, 0, wxLEFT, 2);
@@ -159,6 +162,11 @@ void ObjectInfo::show_sizer(bool show)
         manifold_warning_icon->Show(showing_manifold_warning_icon && show);
 }
 
+void ObjectInfo::msw_rescale()
+{
+    manifold_warning_icon->SetBitmap(create_scaled_bitmap(nullptr, "exclamation"));
+}
+
 enum SlisedInfoIdx
 {
     siFilament_m,
@@ -228,7 +236,8 @@ void SlicedInfo::SetTextAndShow(SlisedInfoIdx idx, const wxString& text, const w
 PresetComboBox::PresetComboBox(wxWindow *parent, Preset::Type preset_type) :
 wxBitmapComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(15 * wxGetApp().em_unit(), -1), 0, nullptr, wxCB_READONLY),
     preset_type(preset_type),
-    last_selected(wxNOT_FOUND)
+    last_selected(wxNOT_FOUND),
+    m_em_unit(wxGetApp().em_unit())
 {
     Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &evt) {
         auto selected_item = this->GetSelection();
@@ -280,11 +289,7 @@ wxBitmapComboBox(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(15 *
         });
     }
 
-    edit_btn = new wxButton(parent, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT | wxNO_BORDER);
-#ifdef __WINDOWS__
-    edit_btn->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-#endif
-    edit_btn->SetBitmap(create_scaled_bitmap("cog.png"));
+    edit_btn = new ScalableButton(parent, wxID_ANY, "cog");
     edit_btn->SetToolTip(_(L("Click to edit preset")));
 
     edit_btn->Bind(wxEVT_BUTTON, ([preset_type, this](wxCommandEvent)
@@ -330,6 +335,12 @@ void PresetComboBox::check_selection()
     this->last_selected = GetSelection();
 }
 
+void PresetComboBox::msw_rescale()
+{
+    m_em_unit = wxGetApp().em_unit();
+    edit_btn->msw_rescale();
+}
+
 // Frequently changed parameters
 
 class FreqChangedParams : public OG_Settings
@@ -384,16 +395,27 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent, const int label_width) :
                 }
                 new_conf.set_key_value("brim_width", new ConfigOptionFloat(new_val));
             }
-            else { //(opt_key == "support")
+            else {
+                assert(opt_key == "support");
                 const wxString& selection = boost::any_cast<wxString>(value);
+                PrinterTechnology printer_technology = wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology();
 
                 auto support_material = selection == _("None") ? false : true;
                 new_conf.set_key_value("support_material", new ConfigOptionBool(support_material));
 
-                if (selection == _("Everywhere"))
+                if (selection == _("Everywhere")) {
                     new_conf.set_key_value("support_material_buildplate_only", new ConfigOptionBool(false));
-                else if (selection == _("Support on build plate only"))
+                    if (printer_technology == ptFFF)
+                        new_conf.set_key_value("support_material_auto", new ConfigOptionBool(true));
+                } else if (selection == _("Support on build plate only")) {
                     new_conf.set_key_value("support_material_buildplate_only", new ConfigOptionBool(true));
+                    if (printer_technology == ptFFF)
+                        new_conf.set_key_value("support_material_auto", new ConfigOptionBool(true));
+                } else if (selection == _("For support enforcers only")) {
+                    assert(printer_technology == ptFFF);
+                    new_conf.set_key_value("support_material_buildplate_only", new ConfigOptionBool(false));
+                    new_conf.set_key_value("support_material_auto", new ConfigOptionBool(false));
+                }
             }
             tab_print->load_config(new_conf);
         }
@@ -411,12 +433,9 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent, const int label_width) :
     support_def.tooltip = L("Select what kind of support do you need");
     support_def.enum_labels.push_back(L("None"));
     support_def.enum_labels.push_back(L("Support on build plate only"));
+    support_def.enum_labels.push_back(L("For support enforcers only"));
     support_def.enum_labels.push_back(L("Everywhere"));
-    std::string selection = !config->opt_bool("support_material") ?
-                            "None" : config->opt_bool("support_material_buildplate_only") ?
-                            "Support on build plate only" :
-                            "Everywhere";
-    support_def.default_value = new ConfigOptionStrings{ selection };
+    support_def.set_default_value(new ConfigOptionStrings{ "None" });
     Option option = Option(support_def, "support");
     option.opt.full_width = true;
     line.append_option(option);
@@ -427,7 +446,7 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent, const int label_width) :
 
     option = m_og->get_option("fill_density");
     option.opt.label = L("Infill");
-    option.opt.width = 7 * wxGetApp().em_unit();
+    option.opt.width = 7/*6*/;
     option.opt.sidetext = "     ";
     line.append_option(option);
 
@@ -437,7 +456,7 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent, const int label_width) :
     def.type = coBool;
     def.tooltip = L("This flag enables the brim that will be printed around each object on the first layer.");
     def.gui_type = "";
-    def.default_value = new ConfigOptionBool{ m_brim_width > 0.0 ? true : false };
+    def.set_default_value(new ConfigOptionBool{ m_brim_width > 0.0 ? true : false });
     option = Option(def, "brim");
     option.opt.sidetext = "     ";
     line.append_option(option);
@@ -483,8 +502,9 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent, const int label_width) :
             tab->set_value(opt_key, value);
             tab->update();
         }
-        else //(opt_key == "support")
+        else
         {
+            assert(opt_key == "support");
             DynamicPrintConfig new_conf = *config_sla;
             const wxString& selection = boost::any_cast<wxString>(value);
 
@@ -504,17 +524,15 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent, const int label_width) :
 
     line = Line{ "", "" };
 
-    selection = !config_sla->opt_bool("supports_enable") ?
-                "None" : config_sla->opt_bool("support_buildplate_only") ?
-                "Support on build plate only" :
-                "Everywhere";
-    support_def.default_value = new ConfigOptionStrings{ selection };
-    option = Option(support_def, "support");
+    ConfigOptionDef support_def_sla = support_def;
+    support_def_sla.set_default_value(new ConfigOptionStrings{ "None" });
+    assert(support_def_sla.enum_labels[2] == L("For support enforcers only"));
+    support_def_sla.enum_labels.erase(support_def_sla.enum_labels.begin() + 2);
+    option = Option(support_def_sla, "support");
     option.opt.full_width = true;
     line.append_option(option);
     m_og_sla->append_line(line);
 
-
     line = Line{ "", "" };
 
     option = m_og_sla->get_option("pad_enable");
@@ -565,7 +583,7 @@ struct Sidebar::priv
     wxScrolledWindow *scrolled;
     wxPanel* presets_panel; // Used for MSW better layouts
 
-    PrusaModeSizer  *mode_sizer;
+    ModeSizer  *mode_sizer;
     wxFlexGridSizer *sizer_presets;
     PresetComboBox *combo_print;
     std::vector<PresetComboBox*> combos_filament;
@@ -613,9 +631,9 @@ void Sidebar::priv::show_preset_comboboxes()
 // Sidebar / public
 
 Sidebar::Sidebar(Plater *parent)
-    : wxPanel(parent), p(new priv(parent))
+    : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(40 * wxGetApp().em_unit(), -1)), p(new priv(parent))
 {
-    p->scrolled = new wxScrolledWindow(this, wxID_ANY, wxDefaultPosition, wxSize(40 * wxGetApp().em_unit(), -1));
+    p->scrolled = new wxScrolledWindow(this, wxID_ANY/*, wxDefaultPosition, wxSize(40 * wxGetApp().em_unit(), -1)*/);
     p->scrolled->SetScrollbars(0, 20, 1, 2);
 
 
@@ -624,7 +642,7 @@ Sidebar::Sidebar(Plater *parent)
     p->scrolled->SetSizer(scrolled_sizer);
 
     // Sizer with buttons for mode changing
-    p->mode_sizer = new PrusaModeSizer(p->scrolled, 2 * wxGetApp().em_unit());
+    p->mode_sizer = new ModeSizer(p->scrolled, 2 * wxGetApp().em_unit());
 
     // The preset chooser
     p->sizer_presets = new wxFlexGridSizer(10, 1, 1, 2);
@@ -669,19 +687,14 @@ Sidebar::Sidebar(Plater *parent)
     };
 
     p->combos_filament.push_back(nullptr);
-    init_combo(&p->combo_print,         _(L("Print settings")), Preset::TYPE_PRINT,         false);
-    init_combo(&p->combos_filament[0],  _(L("Filament")),       Preset::TYPE_FILAMENT,      true);
-    init_combo(&p->combo_sla_print,     _(L("SLA print")),      Preset::TYPE_SLA_PRINT,     false);
-    init_combo(&p->combo_sla_material,  _(L("SLA material")),   Preset::TYPE_SLA_MATERIAL,  false);
-    init_combo(&p->combo_printer,       _(L("Printer")),        Preset::TYPE_PRINTER,       false);
-
-    // calculate width of the preset labels 
-//     p->sizer_presets->Layout();
-//     const wxArrayInt& ar = p->sizer_presets->GetColWidths();
-//     const int label_width = ar.IsEmpty() ? 10*wxGetApp().em_unit() : ar.front()-4;
+    init_combo(&p->combo_print,         _(L("Print settings")),     Preset::TYPE_PRINT,         false);
+    init_combo(&p->combos_filament[0],  _(L("Filament")),           Preset::TYPE_FILAMENT,      true);
+    init_combo(&p->combo_sla_print,     _(L("SLA print settings")), Preset::TYPE_SLA_PRINT,     false);
+    init_combo(&p->combo_sla_material,  _(L("SLA material")),       Preset::TYPE_SLA_MATERIAL,  false);
+    init_combo(&p->combo_printer,       _(L("Printer")),            Preset::TYPE_PRINTER,       false);
 
     const int margin_5  = int(0.5*wxGetApp().em_unit());// 5;
-    const int margin_10 = int(1.5*wxGetApp().em_unit());// 15;
+    const int margin_10 = 10;//int(1.5*wxGetApp().em_unit());// 15;
 
     p->sizer_params = new wxBoxSizer(wxVERTICAL);
 
@@ -703,10 +716,6 @@ Sidebar::Sidebar(Plater *parent)
     p->object_settings->Hide();
     p->sizer_params->Add(p->object_settings->get_sizer(), 0, wxEXPAND | wxTOP, margin_5);
 
-    p->btn_send_gcode = new wxButton(this, wxID_ANY, _(L("Send to printer")));
-    p->btn_send_gcode->SetFont(wxGetApp().bold_font());
-    p->btn_send_gcode->Hide();
-
     // Info boxes
     p->object_info = new ObjectInfo(p->scrolled);
     p->sliced_info = new SlicedInfo(p->scrolled);
@@ -721,10 +730,17 @@ Sidebar::Sidebar(Plater *parent)
     scrolled_sizer->Add(p->sliced_info, 0, wxEXPAND | wxTOP | wxLEFT, margin_5);
 
     // Buttons underneath the scrolled area
-    p->btn_export_gcode = new wxButton(this, wxID_ANY, _(L("Export G-code")) + dots);
-    p->btn_export_gcode->SetFont(wxGetApp().bold_font());
-    p->btn_reslice = new wxButton(this, wxID_ANY, _(L("Slice now")));
-    p->btn_reslice->SetFont(wxGetApp().bold_font());
+
+    auto init_btn = [this](wxButton **btn, wxString label) {
+        *btn = new wxButton(this, wxID_ANY, label, wxDefaultPosition, 
+                            wxDefaultSize, wxBU_EXACTFIT);
+        (*btn)->SetFont(wxGetApp().bold_font());
+    };
+
+    init_btn(&p->btn_send_gcode,   _(L("Send to printer")));
+    p->btn_send_gcode->Hide();
+    init_btn(&p->btn_export_gcode, _(L("Export G-code")) + dots);
+    init_btn(&p->btn_reslice,      _(L("Slice now")));
     enable_buttons(false);
 
     auto *btns_sizer = new wxBoxSizer(wxVERTICAL);
@@ -746,6 +762,7 @@ Sidebar::Sidebar(Plater *parent)
             p->plater->export_gcode();
         else
             p->plater->reslice();
+		p->plater->select_view_3D("Preview");
     });
     p->btn_send_gcode->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { p->plater->send_gcode(); });
 }
@@ -780,6 +797,28 @@ void Sidebar::remove_unused_filament_combos(const int current_extruder_count)
     }
 }
 
+void Sidebar::update_all_preset_comboboxes()
+{
+    PresetBundle &preset_bundle = *wxGetApp().preset_bundle;
+    const auto print_tech = preset_bundle.printers.get_edited_preset().printer_technology();
+
+    // Update the print choosers to only contain the compatible presets, update the dirty flags.
+    if (print_tech == ptFFF)
+        preset_bundle.prints.update_platter_ui(p->combo_print);
+    else {
+        preset_bundle.sla_prints.update_platter_ui(p->combo_sla_print);
+        preset_bundle.sla_materials.update_platter_ui(p->combo_sla_material);
+    }
+    // Update the printer choosers, update the dirty flags.
+    preset_bundle.printers.update_platter_ui(p->combo_printer);
+    // Update the filament choosers to only contain the compatible presets, update the color preview,
+    // update the dirty flags.
+    if (print_tech == ptFFF) {
+        for (size_t i = 0; i < p->combos_filament.size(); ++i)
+            preset_bundle.update_platter_filament_ui(i, p->combos_filament[i]);
+    }
+}
+
 void Sidebar::update_presets(Preset::Type preset_type)
 {
 	PresetBundle &preset_bundle = *wxGetApp().preset_bundle;
@@ -819,23 +858,7 @@ void Sidebar::update_presets(Preset::Type preset_type)
 
 	case Preset::TYPE_PRINTER:
 	{
-//         wxWindowUpdateLocker noUpdates_scrolled(p->scrolled);
-
-		// Update the print choosers to only contain the compatible presets, update the dirty flags.
-        if (print_tech == ptFFF)
-			preset_bundle.prints.update_platter_ui(p->combo_print);
-        else {
-            preset_bundle.sla_prints.update_platter_ui(p->combo_sla_print);
-            preset_bundle.sla_materials.update_platter_ui(p->combo_sla_material);
-        }
-		// Update the printer choosers, update the dirty flags.
-		preset_bundle.printers.update_platter_ui(p->combo_printer);
-		// Update the filament choosers to only contain the compatible presets, update the color preview,
-		// update the dirty flags.
-        if (print_tech == ptFFF) {
-            for (size_t i = 0; i < p->combos_filament.size(); ++ i)
-                preset_bundle.update_platter_filament_ui(i, p->combos_filament[i]);
-		}
+        update_all_preset_comboboxes();
 		p->show_preset_comboboxes();
 		break;
 	}
@@ -854,10 +877,42 @@ void Sidebar::update_mode_sizer() const
 
 void Sidebar::update_reslice_btn_tooltip() const
 {
-    const wxString tooltip = m_mode == comSimple ? wxString("") : _(L("Hold Shift to Slice & Export G-code"));
+    wxString tooltip = wxString("Slice") + " [" + GUI::shortkey_ctrl_prefix() + "R]";
+    if (m_mode != comSimple)
+		tooltip += wxString("\n") + _(L("Hold Shift to Slice & Export G-code"));
     p->btn_reslice->SetToolTip(tooltip);
 }
 
+void Sidebar::msw_rescale() 
+{
+    SetMinSize(wxSize(40 * wxGetApp().em_unit(), -1));
+
+    p->mode_sizer->msw_rescale();
+
+    // Rescale preset comboboxes in respect to the current  em_unit ...
+    for (PresetComboBox* combo : std::vector<PresetComboBox*> { p->combo_print,
+                                                                p->combo_sla_print,
+                                                                p->combo_sla_material,
+                                                                p->combo_printer } )
+        combo->msw_rescale();
+    for (PresetComboBox* combo : p->combos_filament)
+        combo->msw_rescale();
+
+    // ... then refill them and set min size to correct layout of the sidebar
+    update_all_preset_comboboxes();
+
+    p->frequently_changed_parameters->get_og(true)->msw_rescale();
+    p->frequently_changed_parameters->get_og(false)->msw_rescale();
+
+    p->object_list->msw_rescale();
+    p->object_manipulation->msw_rescale();
+    p->object_settings->msw_rescale();
+
+    p->object_info->msw_rescale();
+
+    p->scrolled->Layout();
+}
+
 ObjectManipulation* Sidebar::obj_manipul()
 {
     return p->object_manipulation;
@@ -923,7 +978,7 @@ void Sidebar::show_info_sizer()
     p->object_info->info_size->SetLabel(wxString::Format("%.2f x %.2f x %.2f",size(0), size(1), size(2)));
     p->object_info->info_materials->SetLabel(wxString::Format("%d", static_cast<int>(model_object->materials_count())));
 
-    auto& stats = model_object->volumes.front()->mesh.stl.stats;
+    const auto& stats = model_object->get_object_stl_stats();//model_object->volumes.front()->mesh.stl.stats;
     p->object_info->info_volume->SetLabel(wxString::Format("%.2f", stats.volume));
     p->object_info->info_facets->SetLabel(wxString::Format(_(L("%d (%d shells)")), static_cast<int>(model_object->facets_count()), stats.number_of_parts));
 
@@ -943,7 +998,7 @@ void Sidebar::show_info_sizer()
         p->object_info->manifold_warning_icon->SetToolTip(tooltip);
     } 
     else {
-        p->object_info->info_manifold->SetLabel(L("Yes"));
+        p->object_info->info_manifold->SetLabel(_(L("Yes")));
         p->object_info->showing_manifold_warning_icon = false;
         p->object_info->info_manifold->SetToolTip("");
         p->object_info->manifold_warning_icon->SetToolTip("");
@@ -1028,7 +1083,7 @@ void Sidebar::show_sliced_info_sizer(const bool show)
                     info_text += wxString::Format("\n%s", ps.estimated_normal_print_time);
                 }
                 if (ps.estimated_silent_print_time != "N/A") {
-                    new_label += wxString::Format("\n    - %s", _(L("silent mode")));
+                    new_label += wxString::Format("\n    - %s", _(L("stealth mode")));
                     info_text += wxString::Format("\n%s", ps.estimated_silent_print_time);
                 }
                 p->sliced_info->SetTextAndShow(siEstimatedTime,  info_text,      new_label);
@@ -1053,9 +1108,9 @@ void Sidebar::enable_buttons(bool enable)
     p->btn_send_gcode->Enable(enable);
 }
 
-void Sidebar::show_reslice(bool show)   const { p->btn_reslice->Show(show); }
-void Sidebar::show_export(bool show)    const { p->btn_export_gcode->Show(show); }
-void Sidebar::show_send(bool show)      const { p->btn_send_gcode->Show(show); }
+bool Sidebar::show_reslice(bool show)   const { return p->btn_reslice->Show(show); }
+bool Sidebar::show_export(bool show)    const { return p->btn_export_gcode->Show(show); }
+bool Sidebar::show_send(bool show)      const { return p->btn_send_gcode->Show(show); }
 
 bool Sidebar::is_multifilament()
 {
@@ -1117,7 +1172,26 @@ bool PlaterDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString &fi
         }
     }
 
+    // FIXME: when drag and drop is done on a .3mf or a .amf file we should clear the plater for consistence with the open project command
+    // (the following call to plater->load_files() will load the config data, if present)
+
     plater->load_files(paths);
+
+    // because right now the plater is not cleared, we set the project file (from the latest imported .3mf or .amf file)
+    // only if not set yet
+    if (plater->get_project_filename().empty())
+    {
+        for (std::vector<fs::path>::const_reverse_iterator it = paths.rbegin(); it != paths.rend(); ++it)
+        {
+            std::string filename = (*it).filename().string();
+            if (boost::algorithm::iends_with(filename, ".3mf") || boost::algorithm::iends_with(filename, ".amf"))
+            {
+                plater->set_project_filename(from_path(*it));
+                break;
+            }
+        }
+    }
+
     return true;
 }
 
@@ -1129,11 +1203,11 @@ struct Plater::priv
     MainFrame *main_frame;
 
     // Object popup menu
-    PrusaMenu object_menu;
+    MenuWithSeparators object_menu;
     // Part popup menu
-    PrusaMenu part_menu;
+    MenuWithSeparators part_menu;
     // SLA-Object popup menu
-    PrusaMenu sla_object_menu;
+    MenuWithSeparators sla_object_menu;
 
     // Removed/Prepended Items according to the view mode
     std::vector<wxMenuItem*> items_increase;
@@ -1163,11 +1237,9 @@ struct Plater::priv
     GLToolbar view_toolbar;
     Preview *preview;
 
-    wxString project_filename;
-
     BackgroundSlicingProcess    background_process;
-    std::atomic<bool>           arranging;
-    std::atomic<bool>           rotoptimizing;
+    bool                        arranging;
+    bool                        rotoptimizing;
     bool                        delayed_scene_refresh;
     std::string                 delayed_error_message;
 
@@ -1190,6 +1262,7 @@ struct Plater::priv
     void select_view(const std::string& direction);
     void select_view_3D(const std::string& name);
     void select_next_view_3D();
+    void reset_all_gizmos();
     void update_ui_from_settings();
     ProgressStatusBar* statusbar();
     std::string get_config(const std::string &key) const;
@@ -1197,7 +1270,7 @@ struct Plater::priv
     BoundingBox scaled_bed_shape_bb() const;
     std::vector<size_t> load_files(const std::vector<fs::path>& input_files, bool load_model, bool load_config);
     std::vector<size_t> load_model_objects(const ModelObjectPtrs &model_objects);
-    std::unique_ptr<CheckboxFileDialog> get_export_file(GUI::FileType file_type);
+    wxString get_export_file(GUI::FileType file_type);
 
     const Selection& get_selection() const;
     Selection& get_selection();
@@ -1207,6 +1280,7 @@ struct Plater::priv
     void object_list_changed();
 
     void select_all();
+    void deselect_all();
     void remove(size_t obj_idx);
     void delete_object_from_model(size_t obj_idx);
     void reset();
@@ -1260,6 +1334,7 @@ struct Plater::priv
     void on_object_select(SimpleEvent&);
     void on_right_click(Vec2dEvent&);
     void on_wipetower_moved(Vec3dEvent&);
+    void on_wipetower_rotated(Vec3dEvent&);
     void on_update_geometry(Vec3dsEvent<2>&);
     void on_3dcanvas_mouse_dragging_finished(SimpleEvent&);
 
@@ -1280,6 +1355,16 @@ struct Plater::priv
     bool can_split_to_volumes() const;
     bool can_arrange() const;
     bool can_layers_editing() const;
+    bool can_fix_through_netfabb() const;
+    bool can_set_instance_to_object() const;
+    bool can_mirror() const;
+
+    void msw_rescale_object_menu();
+
+    // returns the path to project file with the given extension (none if extension == wxEmptyString)
+    // extension should contain the leading dot, i.e.: ".3mf"
+    wxString get_project_filename(const wxString& extension = wxEmptyString) const;
+    void set_project_filename(const wxString& filename);
 
 private:
     bool init_object_menu();
@@ -1289,13 +1374,14 @@ private:
     bool complit_init_part_menu();
     void init_view_toolbar();
 
-    bool can_set_instance_to_object() const;
     bool can_split() const;
     bool layers_height_allowed() const;
-    bool can_mirror() const;
 
     void update_fff_scene();
     void update_sla_scene();
+
+    // path to project file stored with no extension
+    wxString m_project_filename;
 };
 
 const std::regex Plater::priv::pattern_bundle(".*[.](amf|amf[.]xml|zip[.]amf|3mf|prusa)", std::regex::icase);
@@ -1322,15 +1408,17 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
         }))
     , sidebar(new Sidebar(q))
     , delayed_scene_refresh(false)
-    , project_filename(wxEmptyString)
 #if ENABLE_SVG_ICONS
     , view_toolbar(GLToolbar::Radio, "View")
 #else
     , view_toolbar(GLToolbar::Radio)
 #endif // ENABLE_SVG_ICONS
+    , m_project_filename(wxEmptyString)
 {
-    arranging.store(false);
-    rotoptimizing.store(false);
+	this->q->SetFont(Slic3r::GUI::wxGetApp().normal_font());
+
+    arranging = false;
+    rotoptimizing = false;
     background_process.set_fff_print(&fff_print);
 	background_process.set_sla_print(&sla_print);
     background_process.set_gcode_preview_data(&gcode_preview_data);
@@ -1348,7 +1436,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
     this->q->Bind(EVT_SLICING_UPDATE, &priv::on_slicing_update, this);
 
     view3D = new View3D(q, bed, camera, view_toolbar, &model, config, &background_process);
-    preview = new Preview(q, bed, camera, view_toolbar, config, &background_process, &gcode_preview_data, [this](){ schedule_background_process(); });
+    preview = new Preview(q, bed, camera, view_toolbar, &model, config, &background_process, &gcode_preview_data, [this](){ schedule_background_process(); });
 
     panels.push_back(view3D);
     panels.push_back(preview);
@@ -1389,17 +1477,22 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
         { if (evt.data == 1) this->q->increase_instances(); else if (this->can_decrease_instances()) this->q->decrease_instances(); });
     view3D_canvas->Bind(EVT_GLCANVAS_INSTANCE_MOVED, [this](SimpleEvent&) { update(); });
     view3D_canvas->Bind(EVT_GLCANVAS_WIPETOWER_MOVED, &priv::on_wipetower_moved, this);
+    view3D_canvas->Bind(EVT_GLCANVAS_WIPETOWER_ROTATED, &priv::on_wipetower_rotated, this);
     view3D_canvas->Bind(EVT_GLCANVAS_INSTANCE_ROTATED, [this](SimpleEvent&) { update(); });
     view3D_canvas->Bind(EVT_GLCANVAS_INSTANCE_SCALED, [this](SimpleEvent&) { update(); });
     view3D_canvas->Bind(EVT_GLCANVAS_ENABLE_ACTION_BUTTONS, [this](Event<bool> &evt) { this->sidebar->enable_buttons(evt.data); });
     view3D_canvas->Bind(EVT_GLCANVAS_UPDATE_GEOMETRY, &priv::on_update_geometry, this);
     view3D_canvas->Bind(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED, &priv::on_3dcanvas_mouse_dragging_finished, this);
     view3D_canvas->Bind(EVT_GLCANVAS_TAB, [this](SimpleEvent&) { select_next_view_3D(); });
+    view3D_canvas->Bind(EVT_GLCANVAS_RESETGIZMOS, [this](SimpleEvent&) { reset_all_gizmos(); });
+
     // 3DScene/Toolbar:
     view3D_canvas->Bind(EVT_GLTOOLBAR_ADD, &priv::on_action_add, this);
     view3D_canvas->Bind(EVT_GLTOOLBAR_DELETE, [q](SimpleEvent&) { q->remove_selected(); });
-    view3D_canvas->Bind(EVT_GLTOOLBAR_DELETE_ALL, [this](SimpleEvent&) { reset(); });
+    view3D_canvas->Bind(EVT_GLTOOLBAR_DELETE_ALL, [q](SimpleEvent&) { q->reset_with_confirm(); });
     view3D_canvas->Bind(EVT_GLTOOLBAR_ARRANGE, [this](SimpleEvent&) { arrange(); });
+    view3D_canvas->Bind(EVT_GLTOOLBAR_COPY, [q](SimpleEvent&) { q->copy_selection_to_clipboard(); });
+    view3D_canvas->Bind(EVT_GLTOOLBAR_PASTE, [q](SimpleEvent&) { q->paste_from_clipboard(); });
     view3D_canvas->Bind(EVT_GLTOOLBAR_MORE, [q](SimpleEvent&) { q->increase_instances(); });
     view3D_canvas->Bind(EVT_GLTOOLBAR_FEWER, [q](SimpleEvent&) { q->decrease_instances(); });
     view3D_canvas->Bind(EVT_GLTOOLBAR_SPLIT_OBJECTS, &priv::on_action_split_objects, this);
@@ -1413,8 +1506,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
     preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_UPDATE_BED_SHAPE, [this](SimpleEvent&) { set_bed_shape(config->option<ConfigOptionPoints>("bed_shape")->values); });
     preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_TAB, [this](SimpleEvent&) { select_next_view_3D(); });
 
-    view3D_canvas->Bind(EVT_GLCANVAS_INIT, [this](SimpleEvent&) { init_view_toolbar(); });
-
     q->Bind(EVT_SLICING_COMPLETED, &priv::on_slicing_completed, this);
     q->Bind(EVT_PROCESS_COMPLETED, &priv::on_process_completed, this);
     q->Bind(EVT_GLVIEWTOOLBAR_3D, [q](SimpleEvent&) { q->select_view_3D("3D"); });
@@ -1477,6 +1568,11 @@ void Plater::priv::select_next_view_3D()
         set_current_panel(view3D);
 }
 
+void Plater::priv::reset_all_gizmos()
+{
+    view3D->get_canvas3d()->reset_all_gizmos();
+}
+
 // Called after the Preferences dialog is closed and the program settings are saved.
 // Update the UI based on the current preferences.
 void Plater::priv::update_ui_from_settings()
@@ -1611,6 +1707,61 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
                 }
 #if ENABLE_VOLUMES_CENTERING_FIXES
             }
+            else if ((wxGetApp().get_mode() == comSimple) && (type_3mf || type_any_amf))
+            {
+                bool advanced = false;
+                for (const ModelObject* model_object : model.objects)
+                {
+                    // is there more than one instance ?
+                    if (model_object->instances.size() > 1)
+                    {
+                        advanced = true;
+                        break;
+                    }
+
+                    // is there any advanced config data ?
+                    auto opt_keys = model_object->config.keys();
+                    if (!opt_keys.empty() && !((opt_keys.size() == 1) && (opt_keys[0] == "extruder")))
+                    {
+                        advanced = true;
+                        break;
+                    }
+
+                    // is there any modifier ?
+                    for (const ModelVolume* model_volume : model_object->volumes)
+                    {
+                        if (!model_volume->is_model_part())
+                        {
+                            advanced = true;
+                            break;
+                        }
+
+                        // is there any advanced config data ?
+                        opt_keys = model_volume->config.keys();
+                        if (!opt_keys.empty() && !((opt_keys.size() == 1) && (opt_keys[0] == "extruder")))
+                        {
+                            advanced = true;
+                            break;
+                        }
+                    }
+
+                    if (advanced)
+                        break;
+                }
+
+                if (advanced)
+                {
+                    wxMessageDialog dlg(q, _(L("This file cannot be loaded in a simple mode. Do you want to switch to an advanced mode?\n")),
+                        _(L("Detected advanced data")), wxICON_WARNING | wxYES | wxNO);
+                    if (dlg.ShowModal() == wxID_YES)
+                    {
+                        Slic3r::GUI::wxGetApp().save_mode(comAdvanced);
+                        view3D->set_as_dirty();
+                    }
+                    else
+                        return obj_idxs;
+                }
+            }
 #endif // ENABLE_VOLUMES_CENTERING_FIXES
 
 #if !ENABLE_VOLUMES_CENTERING_FIXES
@@ -1636,7 +1787,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
                         Slic3r::GUI::show_error(nullptr, 
                             wxString::Format(_(L("You can't to add the object(s) from %s because of one or some of them is(are) multi-part")), 
                                              from_path(filename)));
-                        return std::vector<size_t>();
+                        return obj_idxs;
                     }
             }
 
@@ -1757,7 +1908,13 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs &mode
     Polyline bed; bed.points.reserve(bedpoints.size());
     for(auto& v : bedpoints) bed.append(Point::new_scale(v(0), v(1)));
 
-    arr::find_new_position(model, new_instances, min_obj_distance, bed);
+    arr::WipeTowerInfo wti = view3D->get_canvas3d()->get_wipe_tower_info();
+
+    arr::find_new_position(model, new_instances, min_obj_distance, bed, wti);
+
+    // it remains to move the wipe tower:
+    view3D->get_canvas3d()->arrange_wipe_tower(wti);
+
 #endif /* AUTOPLACEMENT_ON_LOAD */
 
     if (scaled_down) {
@@ -1778,7 +1935,7 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs &mode
     return obj_idxs;
 }
 
-std::unique_ptr<CheckboxFileDialog> Plater::priv::get_export_file(GUI::FileType file_type)
+wxString Plater::priv::get_export_file(GUI::FileType file_type)
 {
     wxString wildcard;
     switch (file_type) {
@@ -1795,34 +1952,63 @@ std::unique_ptr<CheckboxFileDialog> Plater::priv::get_export_file(GUI::FileType
 
     // Update printbility state of each of the ModelInstances.
     this->update_print_volume_state();
-    // Find the file name of the first printable object.
-	fs::path output_file = this->model.propose_export_file_name_and_path();
 
+    const Selection& selection = get_selection();
+    int obj_idx = selection.get_object_idx();
+
+    fs::path output_file;
+    if (file_type == FT_3MF)
+        // for 3mf take the path from the project filename, if any
+        output_file = into_path(get_project_filename(".3mf"));
+
+    if (output_file.empty())
+    {
+        // first try to get the file name from the current selection
+        if ((0 <= obj_idx) && (obj_idx < (int)this->model.objects.size()))
+            output_file = this->model.objects[obj_idx]->get_export_filename();
+
+        if (output_file.empty())
+            // Find the file name of the first printable object.
+            output_file = this->model.propose_export_file_name_and_path();
+    }
+
+    wxString dlg_title;
     switch (file_type) {
-        case FT_STL: output_file.replace_extension("stl"); break;
-        case FT_AMF: output_file.replace_extension("zip.amf"); break;   // XXX: Problem on OS X with double extension?
-        case FT_3MF: output_file.replace_extension("3mf"); break;
+        case FT_STL:
+        {
+            output_file.replace_extension("stl");
+            dlg_title = _(L("Export STL file:"));
+            break;
+        }
+        case FT_AMF:
+        {
+            // XXX: Problem on OS X with double extension?
+            output_file.replace_extension("zip.amf");
+            dlg_title = _(L("Export AMF file:"));
+            break;
+        }
+        case FT_3MF:
+        {
+            output_file.replace_extension("3mf");
+            dlg_title = _(L("Save file as:"));
+            break;
+        }
         default: break;
     }
 
-    auto dlg = Slic3r::make_unique<CheckboxFileDialog>(q,
-        ((file_type == FT_AMF) || (file_type == FT_3MF)) ? _(L("Export print config")) : "",
-        true,
-        _(L("Save file as:")),
-        from_path(output_file.parent_path()),
-        from_path(output_file.filename()),
-        wildcard,
-        wxFD_SAVE | wxFD_OVERWRITE_PROMPT
-    );
+    wxFileDialog* dlg = new wxFileDialog(q, dlg_title,
+        from_path(output_file.parent_path()), from_path(output_file.filename()),
+        wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
 
     if (dlg->ShowModal() != wxID_OK) {
-        return nullptr;
+        return wxEmptyString;
     }
 
-    fs::path path(into_path(dlg->GetPath()));
+    wxString out_path = dlg->GetPath();
+    fs::path path(into_path(out_path));
     wxGetApp().app_config->update_last_output_dir(path.parent_path().string());
 
-    return dlg;
+    return out_path;
 }
 
 const Selection& Plater::priv::get_selection() const
@@ -1881,6 +2067,11 @@ void Plater::priv::select_all()
     this->sidebar->obj_list()->update_selections();
 }
 
+void Plater::priv::deselect_all()
+{
+    view3D->deselect_all();
+}
+
 void Plater::priv::remove(size_t obj_idx)
 {
     // Prevent toolpaths preview from rendering while we modify the Print object
@@ -1890,24 +2081,23 @@ void Plater::priv::remove(size_t obj_idx)
         view3D->enable_layers_editing(false);
 
     model.delete_object(obj_idx);
-    // Delete object from Sidebar list
-    sidebar->obj_list()->delete_object_from_list(obj_idx);
-
-    object_list_changed();
     update();
+    // Delete object from Sidebar list. Do it after update, so that the GLScene selection is updated with the modified model.
+    sidebar->obj_list()->delete_object_from_list(obj_idx);
+    object_list_changed();
 }
 
 
 void Plater::priv::delete_object_from_model(size_t obj_idx)
 {
     model.delete_object(obj_idx);
-    object_list_changed();
     update();
+    object_list_changed();
 }
 
 void Plater::priv::reset()
 {
-    project_filename.Clear();
+    set_project_filename(wxEmptyString);
 
     // Prevent toolpaths preview from rendering while we modify the Print object
     preview->set_enabled(false);
@@ -1918,11 +2108,10 @@ void Plater::priv::reset()
     // Stop and reset the Print content.
     this->background_process.reset();
     model.clear_objects();
-
-    // Delete all objects from list on c++ side
+    update();
+    // Delete object from Sidebar list. Do it after update, so that the GLScene selection is updated with the modified model.
     sidebar->obj_list()->delete_all_objects_from_list();
     object_list_changed();
-    update();
 
     // The hiding of the slicing results, if shown, is not taken care by the background process, so we do it here
     this->sidebar->show_sliced_info_sizer(false);
@@ -1938,15 +2127,14 @@ void Plater::priv::mirror(Axis axis)
 
 void Plater::priv::arrange()
 {
-    // don't do anything if currently arranging. Then this is a re-entrance
-    if(arranging.load()) return;
-
-    // Guard the arrange process
-    arranging.store(true);
+    if (arranging) { return; }
+    arranging = true;
+    Slic3r::ScopeGuard arranging_guard([this]() { arranging = false; });
 
     wxBusyCursor wait;
 
     this->background_process.stop();
+
     unsigned count = 0;
     for(auto obj : model.objects) count += obj->instances.size();
 
@@ -1960,16 +2148,16 @@ void Plater::priv::arrange()
         event.SetString(msg);
         wxQueueEvent(this->q, event.Clone()); */
         statusbar()->set_progress(count - st);
-        statusbar()->set_status_text(msg);
+        statusbar()->set_status_text(_(msg));
 
-        // ok, this is dangerous, but we are protected by the atomic flag
+        // ok, this is dangerous, but we are protected by the flag
         // 'arranging' and the arrange button is also disabled.
         // This call is needed for the cancel button to work.
         wxYieldIfNeeded();
     };
 
     statusbar()->set_cancel_callback([this, statusfn](){
-        arranging.store(false);
+        arranging = false;
         statusfn(0, L("Arranging canceled"));
     });
 
@@ -2001,6 +2189,8 @@ void Plater::priv::arrange()
 
     statusfn(0, arrangestr);
 
+    arr::WipeTowerInfo wti = view3D->get_canvas3d()->get_wipe_tower_info();
+
     try {
         arr::BedShapeHint hint;
 
@@ -2008,21 +2198,24 @@ void Plater::priv::arrange()
         hint.type = arr::BedShapeType::WHO_KNOWS;
 
         arr::arrange(model,
+                     wti,
                      min_obj_distance,
                      bed,
                      hint,
                      false, // create many piles not just one pile
                      [statusfn](unsigned st) { statusfn(st, arrangestr); },
-                     [this] () { return !arranging.load(); });
+                     [this] () { return !arranging; });
     } catch(std::exception& /*e*/) {
         GUI::show_error(this->q, L("Could not arrange model objects! "
                                    "Some geometries may be invalid."));
     }
 
+    // it remains to move the wipe tower:
+    view3D->get_canvas3d()->arrange_wipe_tower(wti);
+
     statusfn(0, L("Arranging done."));
     statusbar()->set_range(prev_range);
     statusbar()->set_cancel_callback(); // remove cancel button
-    arranging.store(false);
 
     // Do a full refresh of scene tree, including regenerating all the GLVolumes.
     //FIXME The update function shall just reload the modified matrices.
@@ -2037,11 +2230,14 @@ void Plater::priv::sla_optimize_rotation() {
     // running we should probably disable explicit slicing and background
     // processing
 
-    if(rotoptimizing.load()) return;
-    rotoptimizing.store(true);
+    if (rotoptimizing) { return; }
+    rotoptimizing = true;
+    Slic3r::ScopeGuard rotoptimizing_guard([this]() { rotoptimizing = false; });
 
     int obj_idx = get_selected_object_idx();
-    ModelObject * o = model.objects[obj_idx];
+    if (obj_idx < 0) { return; }
+
+    ModelObject * o = model.objects[size_t(obj_idx)];
 
     background_process.stop();
 
@@ -2049,7 +2245,7 @@ void Plater::priv::sla_optimize_rotation() {
     statusbar()->set_range(100);
 
     auto stfn = [this] (unsigned st, const std::string& msg) {
-        statusbar()->set_progress(st);
+        statusbar()->set_progress(int(st));
         statusbar()->set_status_text(msg);
 
         // could be problematic, but we need the cancel button.
@@ -2057,18 +2253,70 @@ void Plater::priv::sla_optimize_rotation() {
     };
 
     statusbar()->set_cancel_callback([this, stfn](){
-        rotoptimizing.store(false);
+        rotoptimizing = false;
         stfn(0, L("Orientation search canceled"));
     });
 
     auto r = sla::find_best_rotation(
                 *o, .005f,
                 [stfn](unsigned s) { stfn(s, L("Searching for optimal orientation")); },
-                [this](){ return !rotoptimizing.load(); }
+                [this](){ return !rotoptimizing; }
     );
 
-    if(rotoptimizing.load()) // wasn't canceled
-    for(ModelInstance * oi : o->instances) oi->set_rotation({r[X], r[Y], r[Z]});
+    const auto *bed_shape_opt = config->opt<ConfigOptionPoints>("bed_shape");
+    assert(bed_shape_opt);
+
+    auto& bedpoints = bed_shape_opt->values;
+    Polyline bed; bed.points.reserve(bedpoints.size());
+    for(auto& v : bedpoints) bed.append(Point::new_scale(v(0), v(1)));
+
+    double mindist = 6.0; // FIXME
+    double offs = mindist / 2.0 - EPSILON;
+
+    if(rotoptimizing) // wasn't canceled
+    for(ModelInstance * oi : o->instances) {
+        oi->set_rotation({r[X], r[Y], r[Z]});
+
+        auto trchull = o->convex_hull_2d(oi->get_transformation().get_matrix());
+
+        namespace opt = libnest2d::opt;
+        opt::StopCriteria stopcr;
+        stopcr.relative_score_difference = 0.01;
+        stopcr.max_iterations = 10000;
+        stopcr.stop_score = 0.0;
+        opt::GeneticOptimizer solver(stopcr);
+        Polygon pbed(bed);
+
+        auto bin = pbed.bounding_box();
+        double binw = bin.size()(X) * SCALING_FACTOR - offs;
+        double binh = bin.size()(Y) * SCALING_FACTOR - offs;
+
+        auto result = solver.optimize_min([&trchull, binw, binh](double rot){
+            auto chull = trchull;
+            chull.rotate(rot);
+
+            auto bb = chull.bounding_box();
+            double bbw = bb.size()(X) * SCALING_FACTOR;
+            double bbh = bb.size()(Y) * SCALING_FACTOR;
+
+            auto wdiff = bbw - binw;
+            auto hdiff = bbh - binh;
+            double diff = 0;
+            if(wdiff < 0 && hdiff < 0) diff = wdiff + hdiff;
+            if(wdiff > 0) diff += wdiff;
+            if(hdiff > 0) diff += hdiff;
+
+            return diff;
+        }, opt::initvals(0.0), opt::bound(-PI/2, PI/2));
+
+        double r = std::get<0>(result.optimum);
+
+        Vec3d rt = oi->get_rotation(); rt(Z) += r;
+        oi->set_rotation(rt);
+    }
+
+    arr::WipeTowerInfo wti; // useless in SLA context
+    arr::find_new_position(model, o->instances, coord_t(mindist/SCALING_FACTOR), bed, wti);
 
     // Correct the z offset of the object which was corrupted be the rotation
     o->ensure_on_bed();
@@ -2076,7 +2324,6 @@ void Plater::priv::sla_optimize_rotation() {
     stfn(0, L("Orientation found."));
     statusbar()->set_range(prev_range);
     statusbar()->set_cancel_callback();
-    rotoptimizing.store(false);
 
     update(true);
 }
@@ -2174,20 +2421,14 @@ unsigned int Plater::priv::update_background_process(bool force_validation)
         this->sidebar->show_sliced_info_sizer(false);
         // Reset preview canvases. If the print has been invalidated, the preview canvases will be cleared.
         // Otherwise they will be just refreshed.
-        switch (this->printer_technology) {
-        case ptFFF:
-            if (this->preview != nullptr)
-                // If the preview is not visible, the following line just invalidates the preview,
-                // but the G-code paths are calculated first once the preview is made visible.
-                this->preview->reload_print();
-            // We also need to reload 3D scene because of the wipe tower preview box
-            if (this->config->opt_bool("wipe_tower"))
-                return_state |= UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE;
-            break;
-        case ptSLA:
-            return_state |= UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE;
-            break;
-        }
+		if (this->preview != nullptr)
+			// If the preview is not visible, the following line just invalidates the preview,
+			// but the G-code paths or SLA preview are calculated first once the preview is made visible.
+			this->preview->reload_print();
+		// In FDM mode, we need to reload the 3D scene because of the wipe tower preview box.
+		// In SLA mode, we need to reload the 3D scene every time to show the support structures.
+		if (this->printer_technology == ptSLA || (this->printer_technology == ptFFF && this->config->opt_bool("wipe_tower")))
+			return_state |= UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE;
     }
 
     if ((invalidated != Print::APPLY_STATUS_UNCHANGED || force_validation) && ! this->background_process.empty()) {
@@ -2235,7 +2476,7 @@ unsigned int Plater::priv::update_background_process(bool force_validation)
         // Background data is valid.
         if ((return_state & UPDATE_BACKGROUND_PROCESS_RESTART) != 0 ||
             (return_state & UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE) != 0 )
-            this->statusbar()->set_status_text(L("Ready to slice"));
+            this->statusbar()->set_status_text(_(L("Ready to slice")));
 
         sidebar->set_btn_label(ActionButtonType::abExport, _(label_btn_export));
         sidebar->set_btn_label(ActionButtonType::abSendGCode, _(label_btn_send));
@@ -2260,6 +2501,11 @@ unsigned int Plater::priv::update_background_process(bool force_validation)
 // Restart background processing thread based on a bitmask of UpdateBackgroundProcessReturnState.
 bool Plater::priv::restart_background_process(unsigned int state)
 {
+    if (arranging || rotoptimizing) {
+        // Avoid a race condition
+        return false;
+    }
+
 	if ( ! this->background_process.empty() &&
 		 (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID) == 0 &&
 		 ( ((state & UPDATE_BACKGROUND_PROCESS_FORCE_RESTART) != 0 && ! this->background_process.finished()) ||
@@ -2268,7 +2514,7 @@ bool Plater::priv::restart_background_process(unsigned int state)
         // The print is valid and it can be started.
         if (this->background_process.start()) {
             this->statusbar()->set_cancel_callback([this]() {
-                this->statusbar()->set_status_text(L("Cancelling"));
+                this->statusbar()->set_status_text(_(L("Cancelling")));
                 this->background_process.stop();
             });
             return true;
@@ -2373,8 +2619,8 @@ void Plater::priv::fix_through_netfabb(const int obj_idx, const int vol_idx/* =
     if (obj_idx < 0)
         return;
     fix_model_by_win10_sdk_gui(*model.objects[obj_idx], vol_idx);
-    this->object_list_changed();
     this->update();
+    this->object_list_changed();
     this->schedule_background_process();
 }
 
@@ -2486,28 +2732,29 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt)
 void Plater::priv::on_slicing_update(SlicingStatusEvent &evt)
 {
     if (evt.status.percent >= -1) {
+        if (arranging || rotoptimizing) {
+            // Avoid a race condition
+            return;
+        }
+
         this->statusbar()->set_progress(evt.status.percent);
-        this->statusbar()->set_status_text(_(L(evt.status.text)) + wxString::FromUTF8("…"));
+        this->statusbar()->set_status_text(_(evt.status.text) + wxString::FromUTF8("…"));
     }
-    if (evt.status.flags & PrintBase::SlicingStatus::RELOAD_SCENE) {
+    if (evt.status.flags & (PrintBase::SlicingStatus::RELOAD_SCENE || PrintBase::SlicingStatus::RELOAD_SLA_SUPPORT_POINTS)) {
         switch (this->printer_technology) {
         case ptFFF:
             this->update_fff_scene();
             break;
         case ptSLA:
+            // If RELOAD_SLA_SUPPORT_POINTS, then the SLA gizmo is updated (reload_scene calls update_gizmos_data)
             if (view3D->is_dragging())
                 delayed_scene_refresh = true;
             else
                 this->update_sla_scene();
             break;
         }
-    }
-    if (evt.status.flags & PrintBase::SlicingStatus::RELOAD_SLA_SUPPORT_POINTS) {
-        // Update SLA gizmo  (reload_scene calls update_gizmos_data)
-        q->canvas3D()->reload_scene(true);
-    }
-    if (evt.status.flags & PrintBase::SlicingStatus::RELOAD_SLA_PREVIEW) {
-        // Update the SLA preview
+    } else if (evt.status.flags & PrintBase::SlicingStatus::RELOAD_SLA_PREVIEW) {
+        // Update the SLA preview. Only called if not RELOAD_SLA_SUPPORT_POINTS, as the block above will refresh the preview anyways.
         this->preview->reload_print();
     }
 }
@@ -2550,7 +2797,7 @@ void Plater::priv::on_process_completed(wxCommandEvent &evt)
         this->statusbar()->set_status_text(message);
     }
 	if (canceled)
-		this->statusbar()->set_status_text(L("Cancelled"));
+		this->statusbar()->set_status_text(_(L("Cancelled")));
 
     this->sidebar->show_sliced_info_sizer(success);
 
@@ -2626,29 +2873,35 @@ void Plater::priv::on_right_click(Vec2dEvent& evt)
 
     sidebar->obj_list()->append_menu_item_settings(menu);
 
-    /* Remove/Prepend "increase/decrease instances" menu items according to the view mode.
-     * Suppress to show those items for a Simple mode
-     */
-    const MenuIdentifier id = printer_technology == ptSLA ? miObjectSLA : miObjectFFF;
-    if (wxGetApp().get_mode() == comSimple) {
-        if (menu->FindItem(_(L("Increase copies"))) != wxNOT_FOUND)
-        {
-            /* Detach an items from the menu, but don't delete them 
-             * so that they can be added back later
-             * (after switching to the Advanced/Expert mode)
-             */
-            menu->Remove(items_increase[id]);
-            menu->Remove(items_decrease[id]);
-            menu->Remove(items_set_number_of_copies[id]);
+    if (printer_technology != ptSLA)
+        sidebar->obj_list()->append_menu_item_change_extruder(menu);
+
+    if (menu != &part_menu)
+    {
+        /* Remove/Prepend "increase/decrease instances" menu items according to the view mode.
+         * Suppress to show those items for a Simple mode
+         */
+        const MenuIdentifier id = printer_technology == ptSLA ? miObjectSLA : miObjectFFF;
+        if (wxGetApp().get_mode() == comSimple) {
+            if (menu->FindItem(_(L("Increase copies"))) != wxNOT_FOUND)
+            {
+                /* Detach an items from the menu, but don't delete them
+                 * so that they can be added back later
+                 * (after switching to the Advanced/Expert mode)
+                 */
+                menu->Remove(items_increase[id]);
+                menu->Remove(items_decrease[id]);
+                menu->Remove(items_set_number_of_copies[id]);
+            }
         }
-    }
-    else {
-        if (menu->FindItem(_(L("Increase copies"))) == wxNOT_FOUND)
-        {
-            // Prepend items to the menu, if those aren't not there
-            menu->Prepend(items_set_number_of_copies[id]);
-            menu->Prepend(items_decrease[id]);
-            menu->Prepend(items_increase[id]);
+        else {
+            if (menu->FindItem(_(L("Increase copies"))) == wxNOT_FOUND)
+            {
+                // Prepend items to the menu, if those aren't not there
+                menu->Prepend(items_set_number_of_copies[id]);
+                menu->Prepend(items_decrease[id]);
+                menu->Prepend(items_increase[id]);
+            }
         }
     }
 
@@ -2671,6 +2924,15 @@ void Plater::priv::on_wipetower_moved(Vec3dEvent &evt)
     wxGetApp().get_tab(Preset::TYPE_PRINT)->load_config(cfg);
 }
 
+void Plater::priv::on_wipetower_rotated(Vec3dEvent& evt)
+{
+    DynamicPrintConfig cfg;
+    cfg.opt<ConfigOptionFloat>("wipe_tower_x", true)->value = evt.data(0);
+    cfg.opt<ConfigOptionFloat>("wipe_tower_y", true)->value = evt.data(1);
+    cfg.opt<ConfigOptionFloat>("wipe_tower_rotation_angle", true)->value = Geometry::rad2deg(evt.data(2));
+    wxGetApp().get_tab(Preset::TYPE_PRINT)->load_config(cfg);
+}
+
 void Plater::priv::on_update_geometry(Vec3dsEvent<2>&)
 {
     // TODO
@@ -2704,47 +2966,67 @@ bool Plater::priv::init_object_menu()
     return true;
 }
 
+void Plater::priv::msw_rescale_object_menu()
+{
+    for (MenuWithSeparators* menu : { &object_menu, &sla_object_menu, &part_menu })
+        msw_rescale_menu(dynamic_cast<wxMenu*>(menu));
+}
+
+wxString Plater::priv::get_project_filename(const wxString& extension) const
+{
+    return m_project_filename.empty() ? "" : m_project_filename + extension;
+}
+
+void Plater::priv::set_project_filename(const wxString& filename)
+{
+    boost::filesystem::path full_path = into_path(filename);
+    // remove extension
+    while (full_path.has_extension())
+    {
+        full_path.replace_extension("");
+    }
+
+    m_project_filename = from_path(full_path);
+    wxGetApp().mainframe->update_title();
+}
+
 bool Plater::priv::init_common_menu(wxMenu* menu, const bool is_part/* = false*/)
 {
-    wxMenuItem* item_delete = nullptr;
     if (is_part) {
-        item_delete = append_menu_item(menu, wxID_ANY, _(L("Delete")) + "\tDel", _(L("Remove the selected object")),
-            [this](wxCommandEvent&) { q->remove_selected(); }, "brick_delete.png");
-    } else {
+        append_menu_item(menu, wxID_ANY, _(L("Delete")) + "\tDel", _(L("Remove the selected object")),
+            [this](wxCommandEvent&) { q->remove_selected();         }, "delete",            nullptr, [this]() { return can_delete(); }, q);
+
+        sidebar->obj_list()->append_menu_item_export_stl(menu);
+    }
+    else {
         wxMenuItem* item_increase = append_menu_item(menu, wxID_ANY, _(L("Increase copies")) + "\t+", _(L("Place one more copy of the selected object")),
-            [this](wxCommandEvent&) { q->increase_instances(); }, "add.png");
+            [this](wxCommandEvent&) { q->increase_instances();      }, "add_copies",        nullptr, [this]() { return can_increase_instances(); }, q);
         wxMenuItem* item_decrease = append_menu_item(menu, wxID_ANY, _(L("Decrease copies")) + "\t-", _(L("Remove one copy of the selected object")),
-            [this](wxCommandEvent&) { q->decrease_instances(); }, "delete.png");
+            [this](wxCommandEvent&) { q->decrease_instances();      }, "remove_copies",     nullptr, [this]() { return can_decrease_instances(); }, q);
         wxMenuItem* item_set_number_of_copies = append_menu_item(menu, wxID_ANY, _(L("Set number of copies")) + dots, _(L("Change the number of copies of the selected object")),
-            [this](wxCommandEvent&) { q->set_number_of_copies(); }, "textfield.png");
+            [this](wxCommandEvent&) { q->set_number_of_copies();    }, "number_of_copies",  nullptr, [this]() { return can_increase_instances(); }, q);
+
 
         items_increase.push_back(item_increase);
         items_decrease.push_back(item_decrease);
         items_set_number_of_copies.push_back(item_set_number_of_copies);
 
         // Delete menu was moved to be after +/- instace to make it more difficult to be selected by mistake.
-        item_delete = append_menu_item(menu, wxID_ANY, _(L("Delete")) + "\tDel", _(L("Remove the selected object")),
-            [this](wxCommandEvent&) { q->remove_selected(); }, "brick_delete.png");
+        append_menu_item(menu, wxID_ANY, _(L("Delete")) + "\tDel", _(L("Remove the selected object")),
+            [this](wxCommandEvent&) { q->remove_selected(); }, "delete",            nullptr, [this]() { return can_delete(); }, q);
 
         menu->AppendSeparator();
-        wxMenuItem* item_instance_to_object = sidebar->obj_list()->append_menu_item_instance_to_object(menu);
-
-        if (q != nullptr)
-        {
-            q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_increase_instances()); }, item_increase->GetId());
-            q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_decrease_instances()); }, item_decrease->GetId());
-            q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_increase_instances()); }, item_set_number_of_copies->GetId());
-            q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_set_instance_to_object()); }, item_instance_to_object->GetId());
-        }
+        sidebar->obj_list()->append_menu_item_instance_to_object(menu, q);
         menu->AppendSeparator();
 
         append_menu_item(menu, wxID_ANY, _(L("Reload from Disk")), _(L("Reload the selected file from Disk")),
             [this](wxCommandEvent&) { reload_from_disk(); });
 
-        append_menu_item(menu, wxID_ANY, _(L("Export object as STL")) + dots, _(L("Export this single object as STL file")),
-            [this](wxCommandEvent&) { q->export_stl(true); });
+        append_menu_item(menu, wxID_ANY, _(L("Export as STL")) + dots, _(L("Export the selected object as STL file")),
+            [this](wxCommandEvent&) { q->export_stl(false, true); });
+
+        menu->AppendSeparator();
     }
-    menu->AppendSeparator();
 
     sidebar->obj_list()->append_menu_item_fix_through_netfabb(menu);
 
@@ -2753,20 +3035,14 @@ bool Plater::priv::init_common_menu(wxMenu* menu, const bool is_part/* = false*/
         return false;
 
     append_menu_item(mirror_menu, wxID_ANY, _(L("Along X axis")), _(L("Mirror the selected object along the X axis")),
-        [this](wxCommandEvent&) { mirror(X); }, "bullet_red.png", menu);
+        [this](wxCommandEvent&) { mirror(X); }, "mark_X", menu);
     append_menu_item(mirror_menu, wxID_ANY, _(L("Along Y axis")), _(L("Mirror the selected object along the Y axis")),
-        [this](wxCommandEvent&) { mirror(Y); }, "bullet_green.png", menu);
+        [this](wxCommandEvent&) { mirror(Y); }, "mark_Y", menu);
     append_menu_item(mirror_menu, wxID_ANY, _(L("Along Z axis")), _(L("Mirror the selected object along the Z axis")),
-        [this](wxCommandEvent&) { mirror(Z); }, "bullet_blue.png", menu);
+        [this](wxCommandEvent&) { mirror(Z); }, "mark_Z", menu);
 
-    wxMenuItem* item_mirror = append_submenu(menu, mirror_menu, wxID_ANY, _(L("Mirror")), _(L("Mirror the selected object")));
-
-    // ui updates needs to be bound to the parent panel
-    if (q != nullptr)
-    {
-        q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_mirror()); }, item_mirror->GetId());
-        q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_delete()); }, item_delete->GetId());
-    }
+    append_submenu(menu, mirror_menu, wxID_ANY, _(L("Mirror")), _(L("Mirror the selected object")), "",
+        [this]() { return can_mirror(); }, q);
 
     return true;
 }
@@ -2777,30 +3053,24 @@ bool Plater::priv::complit_init_object_menu()
     if (split_menu == nullptr)
         return false;
 
-    wxMenuItem* item_split_objects = append_menu_item(split_menu, wxID_ANY, _(L("To objects")), _(L("Split the selected object into individual objects")),
-        [this](wxCommandEvent&) { split_object(); }, "shape_ungroup_o.png", &object_menu);
-    wxMenuItem* item_split_volumes = append_menu_item(split_menu, wxID_ANY, _(L("To parts")), _(L("Split the selected object into individual sub-parts")),
-        [this](wxCommandEvent&) { split_volume(); }, "shape_ungroup_p.png", &object_menu);
+    append_menu_item(split_menu, wxID_ANY, _(L("To objects")), _(L("Split the selected object into individual objects")),
+        [this](wxCommandEvent&) { split_object(); }, "split_object_SMALL",  &object_menu, [this]() { return can_split(); }, q);
+    append_menu_item(split_menu, wxID_ANY, _(L("To parts")), _(L("Split the selected object into individual sub-parts")),
+        [this](wxCommandEvent&) { split_volume(); }, "split_parts_SMALL",   &object_menu, [this]() { return can_split(); }, q);
 
-    wxMenuItem* item_split = append_submenu(&object_menu, split_menu, wxID_ANY, _(L("Split")), _(L("Split the selected object")), "shape_ungroup.png");
+    append_submenu(&object_menu, split_menu, wxID_ANY, _(L("Split")), _(L("Split the selected object")), "", 
+        [this]() { return can_split() && wxGetApp().get_mode() > comSimple; }, q);
     object_menu.AppendSeparator();
 
     // "Add (volumes)" popupmenu will be added later in append_menu_items_add_volume()
 
-    // ui updates needs to be binded to the parent panel
-    if (q != nullptr)
-    {
-        q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_split()); }, item_split->GetId());
-        q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_split()); }, item_split_objects->GetId());
-        q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_split() && wxGetApp().get_mode() > comSimple); }, item_split_volumes->GetId());
-    }
     return true;
 }
 
 bool Plater::priv::complit_init_sla_object_menu()
 {
-    wxMenuItem* item_split = append_menu_item(&sla_object_menu, wxID_ANY, _(L("Split")), _(L("Split the selected object into individual objects")),
-        [this](wxCommandEvent&) { split_object(); }, "shape_ungroup_o.png");
+    append_menu_item(&sla_object_menu, wxID_ANY, _(L("Split")), _(L("Split the selected object into individual objects")),
+        [this](wxCommandEvent&) { split_object(); }, "split_object_SMALL", nullptr, [this]() { return can_split(); }, q);
 
     sla_object_menu.AppendSeparator();
 
@@ -2808,31 +3078,19 @@ bool Plater::priv::complit_init_sla_object_menu()
     append_menu_item(&sla_object_menu, wxID_ANY, _(L("Optimize orientation")), _(L("Optimize the rotation of the object for better print results.")),
         [this](wxCommandEvent&) { sla_optimize_rotation(); });
 
-    // ui updates needs to be binded to the parent panel
-    if (q != nullptr)
-    {
-        q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_split()); }, item_split->GetId());
-    }
-
     return true;
 }
 
 bool Plater::priv::complit_init_part_menu()
 {
-    wxMenuItem* item_split = append_menu_item(&part_menu, wxID_ANY, _(L("Split")), _(L("Split the selected object into individual sub-parts")),
-        [this](wxCommandEvent&) { split_volume(); }, "shape_ungroup_p.png");
+    append_menu_item(&part_menu, wxID_ANY, _(L("Split")), _(L("Split the selected object into individual sub-parts")),
+        [this](wxCommandEvent&) { split_volume(); }, "split_parts_SMALL", nullptr, [this]() { return can_split(); }, q);
 
     part_menu.AppendSeparator();
 
     auto obj_list = sidebar->obj_list();
     obj_list->append_menu_item_change_type(&part_menu);
 
-    // ui updates needs to be binded to the parent panel
-    if (q != nullptr)
-    {
-        q->Bind(wxEVT_UPDATE_UI, [this](wxUpdateUIEvent& evt) { evt.Enable(can_split()); },  item_split->GetId());
-    }
-
     return true;
 }
 
@@ -2868,7 +3126,7 @@ void Plater::priv::init_view_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "editor.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("3D editor view") + " [" + GUI::shortkey_ctrl_prefix() + "5]";
+    item.tooltip = _utf8(L("3D editor view")) + " [" + GUI::shortkey_ctrl_prefix() + "5]";
     item.sprite_id = 0;
     item.action_callback = [this]() { if (this->q != nullptr) wxPostEvent(this->q, SimpleEvent(EVT_GLVIEWTOOLBAR_3D)); };
     item.is_toggable = false;
@@ -2879,7 +3137,7 @@ void Plater::priv::init_view_toolbar()
 #if ENABLE_SVG_ICONS
     item.icon_filename = "preview.svg";
 #endif // ENABLE_SVG_ICONS
-    item.tooltip = GUI::L_str("Preview") + " [" + GUI::shortkey_ctrl_prefix() + "6]";
+    item.tooltip = _utf8(L("Preview")) + " [" + GUI::shortkey_ctrl_prefix() + "6]";
     item.sprite_id = 1;
     item.action_callback = [this]() { if (this->q != nullptr) wxPostEvent(this->q, SimpleEvent(EVT_GLVIEWTOOLBAR_PREVIEW)); };
     item.is_toggable = false;
@@ -2903,6 +3161,9 @@ bool Plater::priv::can_split() const
 
 bool Plater::priv::layers_height_allowed() const
 {
+    if (printer_technology != ptFFF)
+        return false;
+
     int obj_idx = get_selected_object_idx();
     return (0 <= obj_idx) && (obj_idx < (int)model.objects.size()) && config->opt_bool("variable_layer_height") && view3D->is_layers_editing_allowed();
 }
@@ -2924,7 +3185,7 @@ void Plater::priv::set_bed_shape(const Pointfs& shape)
 
 bool Plater::priv::can_delete() const
 {
-    return !get_selection().is_empty();
+    return !get_selection().is_empty() && !get_selection().is_wipe_tower();
 }
 
 bool Plater::priv::can_delete_all() const
@@ -2932,14 +3193,31 @@ bool Plater::priv::can_delete_all() const
     return !model.objects.empty();
 }
 
+bool Plater::priv::can_fix_through_netfabb() const
+{
+    int obj_idx = get_selected_object_idx();
+    if (obj_idx < 0)
+        return false;
+
+    return model.objects[obj_idx]->get_mesh_errors_count() > 0;
+}
+
 bool Plater::priv::can_increase_instances() const
 {
+    if (arranging || rotoptimizing) {
+        return false;
+    }
+
     int obj_idx = get_selected_object_idx();
     return (0 <= obj_idx) && (obj_idx < (int)model.objects.size());
 }
 
 bool Plater::priv::can_decrease_instances() const
 {
+    if (arranging || rotoptimizing) {
+        return false;
+    }
+
     int obj_idx = get_selected_object_idx();
     return (0 <= obj_idx) && (obj_idx < (int)model.objects.size()) && (model.objects[obj_idx]->instances.size() > 1);
 }
@@ -2956,7 +3234,7 @@ bool Plater::priv::can_split_to_volumes() const
 
 bool Plater::priv::can_arrange() const
 {
-    return !model.objects.empty() && !arranging.load();
+    return !model.objects.empty() && !arranging;
 }
 
 bool Plater::priv::can_layers_editing() const
@@ -2978,17 +3256,18 @@ void Plater::priv::show_action_buttons(const bool is_ready_to_slice) const
     // when a background processing is ON, export_btn and/or send_btn are showing 
     if (wxGetApp().app_config->get("background_processing") == "1")
     {
-        sidebar->show_reslice(false);
-        sidebar->show_export(true);
-        sidebar->show_send(send_gcode_shown);
-    }
+        if (sidebar->show_reslice(false) |
+			sidebar->show_export(true) |
+			sidebar->show_send(send_gcode_shown))
+			sidebar->Layout();
+	}
     else
     {
-        sidebar->show_reslice(is_ready_to_slice);
-        sidebar->show_export(!is_ready_to_slice);
-        sidebar->show_send(send_gcode_shown && !is_ready_to_slice);
-    }
-    sidebar->Layout();
+		if (sidebar->show_reslice(is_ready_to_slice) |
+			sidebar->show_export(!is_ready_to_slice) |
+			sidebar->show_send(send_gcode_shown && !is_ready_to_slice))
+			sidebar->Layout();
+	}
 }
 
 void Sidebar::set_btn_label(const ActionButtonType btn_type, const wxString& label) const
@@ -3020,6 +3299,11 @@ Print&          Plater::fff_print()         { return p->fff_print; }
 const SLAPrint& Plater::sla_print() const   { return p->sla_print; }
 SLAPrint&       Plater::sla_print()         { return p->sla_print; }
 
+void Plater::new_project()
+{
+    wxPostEvent(p->view3D->get_wxglcanvas(), SimpleEvent(EVT_GLTOOLBAR_DELETE_ALL));
+}
+
 void Plater::load_project()
 {
     wxString input_file;
@@ -3029,7 +3313,7 @@ void Plater::load_project()
         return;
 
     p->reset();
-    p->project_filename = input_file;
+    p->set_project_filename(input_file);
 
     std::vector<fs::path> input_paths;
     input_paths.push_back(into_path(input_file));
@@ -3084,9 +3368,15 @@ void Plater::select_view(const std::string& direction) { p->select_view(directio
 void Plater::select_view_3D(const std::string& name) { p->select_view_3D(name); }
 
 void Plater::select_all() { p->select_all(); }
+void Plater::deselect_all() { p->deselect_all(); }
 
 void Plater::remove(size_t obj_idx) { p->remove(obj_idx); }
 void Plater::reset() { p->reset(); }
+void Plater::reset_with_confirm()
+{
+	if (wxMessageDialog((wxWindow*)this, _(L("All objects will be removed, continue ?")), wxString(SLIC3R_APP_NAME) + " - " + _(L("Delete all")), wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxCENTRE).ShowModal() == wxID_YES)
+        reset();
+}
 
 void Plater::delete_object_from_model(size_t obj_idx) { p->delete_object_from_model(obj_idx); }
 
@@ -3097,17 +3387,18 @@ void Plater::remove_selected()
 
 void Plater::increase_instances(size_t num)
 {
+    if (! can_increase_instances()) { return; }
+
     int obj_idx = p->get_selected_object_idx();
-    if (obj_idx == -1)
-        return;
 
     ModelObject* model_object = p->model.objects[obj_idx];
     ModelInstance* model_instance = model_object->instances.back();
 
     bool was_one_instance = model_object->instances.size()==1;
         
-    float offset = 10.0;
-    for (size_t i = 0; i < num; i++, offset += 10.0) {
+    double offset_base = canvas3D()->get_size_proportional_to_max_bed_size(0.05);
+    double offset = offset_base;
+    for (size_t i = 0; i < num; i++, offset += offset_base) {
         Vec3d offset_vec = model_instance->get_offset() + Vec3d(offset, offset, 0.0);
         model_object->add_instance(offset_vec, model_instance->get_scaling_factor(), model_instance->get_rotation(), model_instance->get_mirror());
 //        p->print.get_object(obj_idx)->add_copy(Slic3r::to_2d(offset_vec));
@@ -3130,22 +3421,22 @@ void Plater::increase_instances(size_t num)
 
 void Plater::decrease_instances(size_t num)
 {
+    if (! can_decrease_instances()) { return; }
+
     int obj_idx = p->get_selected_object_idx();
-    if (obj_idx == -1)
-        return;
 
     ModelObject* model_object = p->model.objects[obj_idx];
     if (model_object->instances.size() > num) {
         for (size_t i = 0; i < num; ++ i)
             model_object->delete_last_instance();
+        p->update();
+        // Delete object from Sidebar list. Do it after update, so that the GLScene selection is updated with the modified model.
         sidebar().obj_list()->decrease_object_instances(obj_idx, num);
     }
     else {
         remove(obj_idx);
     }
 
-    p->update();
-
     if (!model_object->instances.empty())
         p->get_selection().add_instance(obj_idx, (int)model_object->instances.size() - 1);
 
@@ -3175,7 +3466,7 @@ void Plater::set_number_of_copies(/*size_t num*/)
 
 bool Plater::is_selection_empty() const
 {
-    return p->get_selection().is_empty();
+    return p->get_selection().is_empty() || p->get_selection().is_wipe_tower();
 }
 
 void Plater::cut(size_t obj_idx, size_t instance_idx, coordf_t z, bool keep_upper, bool keep_lower, bool rotate_lower)
@@ -3210,8 +3501,9 @@ void Plater::export_gcode()
 		unsigned int state = this->p->update_restart_background_process(false, false);
 		if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
 			return;
-		default_output_file = this->p->background_process.current_print()->output_filepath("");
-    } catch (const std::exception &ex) {
+        default_output_file = this->p->background_process.current_print()->output_filepath(into_path(get_project_filename()).string());
+    }
+    catch (const std::exception &ex) {
         show_error(this, ex.what());
         return;
     }
@@ -3235,15 +3527,12 @@ void Plater::export_gcode()
         p->export_gcode(std::move(output_path), PrintHostJob());
 }
 
-void Plater::export_stl(bool selection_only)
+void Plater::export_stl(bool extended, bool selection_only)
 {
     if (p->model.objects.empty()) { return; }
 
-    auto dialog = p->get_export_file(FT_STL);
-    if (! dialog) { return; }
-
-    // Store a binary STL
-    const wxString path = dialog->GetPath();
+    wxString path = p->get_export_file(FT_STL);
+    if (path.empty()) { return; }
     const std::string path_u8 = into_u8(path);
 
     wxBusyCursor wait;
@@ -3255,9 +3544,81 @@ void Plater::export_stl(bool selection_only)
 
         const auto obj_idx = selection.get_object_idx();
         if (obj_idx == -1) { return; }
-        mesh = p->model.objects[obj_idx]->mesh();
-    } else {
+
+        const ModelObject* model_object = p->model.objects[obj_idx];
+        if (selection.get_mode() == Selection::Instance)
+        {
+            if (selection.is_single_full_object())
+                mesh = model_object->mesh();
+            else
+                mesh = model_object->full_raw_mesh();
+        }
+        else
+        {
+            const GLVolume* volume = selection.get_volume(*selection.get_volume_idxs().begin());
+            mesh = model_object->volumes[volume->volume_idx()]->mesh;
+            mesh.transform(volume->get_volume_transformation().get_matrix());
+            mesh.translate(-model_object->origin_translation.cast<float>());
+        }
+    }
+    else
+    {
         mesh = p->model.mesh();
+
+        if (extended && (p->printer_technology == ptSLA))
+        {
+            const PrintObjects& objects = p->sla_print.objects();
+            for (const SLAPrintObject* object : objects)
+            {
+                const ModelObject* model_object = object->model_object();
+                Transform3d mesh_trafo_inv = object->trafo().inverse();
+                bool is_left_handed = object->is_left_handed();
+
+                TriangleMesh pad_mesh;
+                bool has_pad_mesh = object->has_mesh(slaposBasePool);
+                if (has_pad_mesh)
+                {
+                    pad_mesh = object->get_mesh(slaposBasePool);
+                    pad_mesh.transform(mesh_trafo_inv);
+                }
+
+                TriangleMesh supports_mesh;
+                bool has_supports_mesh = object->has_mesh(slaposSupportTree);
+                if (has_supports_mesh)
+                {
+                    supports_mesh = object->get_mesh(slaposSupportTree);
+                    supports_mesh.transform(mesh_trafo_inv);
+                }
+
+                const std::vector<SLAPrintObject::Instance>& obj_instances = object->instances();
+                for (const SLAPrintObject::Instance& obj_instance : obj_instances)
+                {
+                    auto it = std::find_if(model_object->instances.begin(), model_object->instances.end(),
+                        [&obj_instance](const ModelInstance *mi) { return mi->id() == obj_instance.instance_id; });
+                    assert(it != model_object->instances.end());
+
+                    if (it != model_object->instances.end())
+                    {
+                        int instance_idx = it - model_object->instances.begin();
+                        const Transform3d& inst_transform = object->model_object()->instances[instance_idx]->get_transformation().get_matrix();
+
+                        if (has_pad_mesh)
+                        {
+                            TriangleMesh inst_pad_mesh = pad_mesh;
+                            inst_pad_mesh.transform(inst_transform, is_left_handed);
+                            mesh.merge(inst_pad_mesh);
+                        }
+
+                        if (has_supports_mesh)
+                        {
+                            TriangleMesh inst_supports_mesh = supports_mesh;
+                            inst_supports_mesh.transform(inst_transform, is_left_handed);
+                            mesh.merge(inst_supports_mesh);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     Slic3r::store_stl(path_u8.c_str(), &mesh, true);
@@ -3268,15 +3629,14 @@ void Plater::export_amf()
 {
     if (p->model.objects.empty()) { return; }
 
-    auto dialog = p->get_export_file(FT_AMF);
-    if (! dialog) { return; }
-
-    const wxString path = dialog->GetPath();
+    wxString path = p->get_export_file(FT_AMF);
+    if (path.empty()) { return; }
     std::string path_u8 = into_u8(path);
 
-    DynamicPrintConfig cfg = wxGetApp().preset_bundle->full_config_secure();
     wxBusyCursor wait;
-    if (Slic3r::store_amf(path_u8, &p->model, dialog->get_checkbox_value() ? &cfg : nullptr)) {
+    bool export_config = true;
+    DynamicPrintConfig cfg = wxGetApp().preset_bundle->full_config_secure();
+    if (Slic3r::store_amf(path_u8, &p->model, export_config ? &cfg : nullptr)) {
         // Success
         p->statusbar()->set_status_text(wxString::Format(_(L("AMF file exported to %s")), path));
     } else {
@@ -3293,10 +3653,8 @@ void Plater::export_3mf(const boost::filesystem::path& output_path)
     bool export_config = true;
     if (output_path.empty())
     {
-        auto dialog = p->get_export_file(FT_3MF);
-        if (!dialog) { return; }
-        path = dialog->GetPath();
-        export_config = dialog->get_checkbox_value();
+        path = p->get_export_file(FT_3MF);
+        if (path.empty()) { return; }
     }
     else
         path = from_path(output_path);
@@ -3310,7 +3668,9 @@ void Plater::export_3mf(const boost::filesystem::path& output_path)
     if (Slic3r::store_3mf(path_u8.c_str(), &p->model, export_config ? &cfg : nullptr)) {
         // Success
         p->statusbar()->set_status_text(wxString::Format(_(L("3MF file exported to %s")), path));
-    } else {
+        p->set_project_filename(path);
+    }
+    else {
         // Failure
         p->statusbar()->set_status_text(wxString::Format(_(L("Error exporting 3MF file %s")), path));
     }
@@ -3386,8 +3746,9 @@ void Plater::send_gcode()
 		unsigned int state = this->p->update_restart_background_process(false, false);
 		if (state & priv::UPDATE_BACKGROUND_PROCESS_INVALID)
 			return;
-		default_output_file = this->p->background_process.current_print()->output_filepath("");
-    } catch (const std::exception &ex) {
+        default_output_file = this->p->background_process.current_print()->output_filepath(into_path(get_project_filename(".3mf")).string());
+    }
+    catch (const std::exception &ex) {
         show_error(this, ex.what());
         return;
     }
@@ -3501,9 +3862,14 @@ void Plater::on_activate()
 	}
 }
 
-const wxString& Plater::get_project_filename() const
+wxString Plater::get_project_filename(const wxString& extension) const
 {
-    return p->project_filename;
+    return p->get_project_filename(extension);
+}
+
+void Plater::set_project_filename(const wxString& filename)
+{
+    return p->set_project_filename(filename);
 }
 
 bool Plater::is_export_gcode_scheduled() const
@@ -3542,44 +3908,115 @@ void Plater::set_printer_technology(PrinterTechnology printer_technology)
 
     p->label_btn_export = printer_technology == ptFFF ? L("Export G-code") : L("Export");
     p->label_btn_send   = printer_technology == ptFFF ? L("Send G-code")   : L("Send to printer");
+
+    if (wxGetApp().mainframe)
+        wxGetApp().mainframe->update_menubar();
 }
 
 void Plater::changed_object(int obj_idx)
 {
     if (obj_idx < 0)
         return;
-    auto list = wxGetApp().obj_list();
-    wxASSERT(list != nullptr);
-    if (list == nullptr)
-        return;
-
-    if (list->is_parts_changed()) {
-        // recenter and re - align to Z = 0
-        auto model_object = p->model.objects[obj_idx];
-        model_object->ensure_on_bed();
-        if (this->p->printer_technology == ptSLA) {
-            // Update the SLAPrint from the current Model, so that the reload_scene()
-            // pulls the correct data, update the 3D scene.
-            this->p->update_restart_background_process(true, false);
-        } else
-            p->view3D->reload_scene(false);
+    // recenter and re - align to Z = 0
+    auto model_object = p->model.objects[obj_idx];
+    model_object->ensure_on_bed();
+    if (this->p->printer_technology == ptSLA) {
+        // Update the SLAPrint from the current Model, so that the reload_scene()
+        // pulls the correct data, update the 3D scene.
+        this->p->update_restart_background_process(true, false);
     }
+    else
+        p->view3D->reload_scene(false);
 
     // update print
     this->p->schedule_background_process();
 }
 
+void Plater::changed_objects(const std::vector<size_t>& object_idxs)
+{
+    if (object_idxs.empty())
+        return;
+
+    for (int obj_idx : object_idxs)
+    {
+        if (obj_idx < p->model.objects.size())
+            // recenter and re - align to Z = 0
+            p->model.objects[obj_idx]->ensure_on_bed();
+    }
+    if (this->p->printer_technology == ptSLA) {
+        // Update the SLAPrint from the current Model, so that the reload_scene()
+        // pulls the correct data, update the 3D scene.
+        this->p->update_restart_background_process(true, false);
+    }
+    else
+        p->view3D->reload_scene(false);
+
+    // update print
+    this->p->schedule_background_process();
+}
+
+void Plater::schedule_background_process()
+{
+    this->p->schedule_background_process();    
+}
+
 void Plater::fix_through_netfabb(const int obj_idx, const int vol_idx/* = -1*/) { p->fix_through_netfabb(obj_idx, vol_idx); }
 
 void Plater::update_object_menu() { p->update_object_menu(); }
 
+void Plater::copy_selection_to_clipboard()
+{
+    p->view3D->get_canvas3d()->get_selection().copy_to_clipboard();
+}
+
+void Plater::paste_from_clipboard()
+{
+    p->view3D->get_canvas3d()->get_selection().paste_from_clipboard();
+}
+
+bool Plater::can_paste_from_clipboard() const
+{
+    const Selection& selection = p->view3D->get_canvas3d()->get_selection();
+    const Selection::Clipboard& clipboard = selection.get_clipboard();
+    Selection::EMode mode = clipboard.get_mode();
+
+    if (clipboard.is_empty())
+        return false;
+
+    if ((mode == Selection::Volume) && !selection.is_from_single_instance())
+        return false;
+
+    if ((mode == Selection::Instance) && (selection.get_mode() != Selection::Instance))
+        return false;
+
+    return true;
+}
+
+void Plater::msw_rescale()
+{
+    p->preview->msw_rescale();
+
+    p->view3D->get_canvas3d()->msw_rescale();
+
+    p->sidebar->msw_rescale();
+
+    p->msw_rescale_object_menu();
+
+    Layout();
+    GetParent()->Layout();
+}
+
 bool Plater::can_delete() const { return p->can_delete(); }
 bool Plater::can_delete_all() const { return p->can_delete_all(); }
 bool Plater::can_increase_instances() const { return p->can_increase_instances(); }
 bool Plater::can_decrease_instances() const { return p->can_decrease_instances(); }
+bool Plater::can_set_instance_to_object() const { return p->can_set_instance_to_object(); }
+bool Plater::can_fix_through_netfabb() const { return p->can_fix_through_netfabb(); }
 bool Plater::can_split_to_objects() const { return p->can_split_to_objects(); }
 bool Plater::can_split_to_volumes() const { return p->can_split_to_volumes(); }
 bool Plater::can_arrange() const { return p->can_arrange(); }
 bool Plater::can_layers_editing() const { return p->can_layers_editing(); }
+bool Plater::can_copy() const { return !is_selection_empty(); }
+bool Plater::can_paste() const { return can_paste_from_clipboard(); }
 
 }}    // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp
index f830edce3..bc6d4b942 100644
--- a/src/slic3r/GUI/Plater.hpp
+++ b/src/slic3r/GUI/Plater.hpp
@@ -14,6 +14,7 @@
 #include "GLTexture.hpp"
 
 class wxButton;
+class ScalableButton;
 class wxBoxSizer;
 class wxGLCanvas;
 class wxScrolledWindow;
@@ -46,7 +47,7 @@ public:
     PresetComboBox(wxWindow *parent, Preset::Type preset_type);
     ~PresetComboBox();
 
-    wxButton* edit_btn { nullptr };
+    ScalableButton* edit_btn { nullptr };
 
 	enum LabelItemType {
 		LABEL_ITEM_MARKER = 0x4d,
@@ -56,14 +57,18 @@ public:
     void set_label_marker(int item, LabelItemType label_item_type = LABEL_ITEM_MARKER);
     void set_extruder_idx(const int extr_idx)   { extruder_idx = extr_idx; }
     int  get_extruder_idx() const               { return extruder_idx; }
+    int  em_unit() const                        { return m_em_unit; }
     void check_selection();
 
+    void msw_rescale();
+
 private:
     typedef std::size_t Marker;
 
     Preset::Type preset_type;
     int last_selected;
     int extruder_idx = -1;
+    int m_em_unit;
 };
 
 class Sidebar : public wxPanel
@@ -79,9 +84,11 @@ public:
 
     void init_filament_combo(PresetComboBox **combo, const int extr_idx);
     void remove_unused_filament_combos(const int current_extruder_count);
+    void update_all_preset_comboboxes();
     void update_presets(Slic3r::Preset::Type preset_type);
     void update_mode_sizer() const;
     void update_reslice_btn_tooltip() const;
+    void msw_rescale();
 
     ObjectManipulation*     obj_manipul();
     ObjectList*             obj_list();
@@ -96,9 +103,9 @@ public:
     void                    show_sliced_info_sizer(const bool show);
     void                    enable_buttons(bool enable);
     void                    set_btn_label(const ActionButtonType btn_type, const wxString& label) const;
-    void                    show_reslice(bool show) const;
-    void                    show_export(bool show) const;
-    void                    show_send(bool show) const;
+    bool                    show_reslice(bool show) const;
+	bool                    show_export(bool show) const;
+	bool                    show_send(bool show) const;
     bool                    is_multifilament();
     void                    update_mode();
 
@@ -127,6 +134,7 @@ public:
     const SLAPrint& sla_print() const;
     SLAPrint& sla_print();
 
+    void new_project();
     void load_project();
     void add_model();
     void extract_config_from_project();
@@ -144,8 +152,10 @@ public:
     void update_ui_from_settings();
 
     void select_all();
+    void deselect_all();
     void remove(size_t obj_idx);
     void reset();
+    void reset_with_confirm();
     void delete_object_from_model(size_t obj_idx);
     void remove_selected();
     void increase_instances(size_t num = 1);
@@ -156,12 +166,14 @@ public:
     void cut(size_t obj_idx, size_t instance_idx, coordf_t z, bool keep_upper = true, bool keep_lower = true, bool rotate_lower = false);
 
     void export_gcode();
-    void export_stl(bool selection_only = false);
+    void export_stl(bool extended = false, bool selection_only = false);
     void export_amf();
     void export_3mf(const boost::filesystem::path& output_path = boost::filesystem::path());
     void reslice();
     void reslice_SLA_supports(const ModelObject &object);
     void changed_object(int obj_idx);
+    void changed_objects(const std::vector<size_t>& object_idxs);
+    void schedule_background_process();
     void fix_through_netfabb(const int obj_idx, const int vol_idx = -1);
     void send_gcode();
 
@@ -172,7 +184,9 @@ public:
 
     void update_object_menu();
 
-    const wxString& get_project_filename() const;
+    wxString get_project_filename(const wxString& extension = wxEmptyString) const;
+    void set_project_filename(const wxString& filename);
+
     bool is_export_gcode_scheduled() const;
 
     int get_selected_object_idx();
@@ -182,14 +196,24 @@ public:
     PrinterTechnology   printer_technology() const;
     void                set_printer_technology(PrinterTechnology printer_technology);
 
+    void copy_selection_to_clipboard();
+    void paste_from_clipboard();
+    bool can_paste_from_clipboard() const;
+
     bool can_delete() const;
     bool can_delete_all() const;
     bool can_increase_instances() const;
     bool can_decrease_instances() const;
+    bool can_set_instance_to_object() const;
+    bool can_fix_through_netfabb() const;
     bool can_split_to_objects() const;
     bool can_split_to_volumes() const;
     bool can_arrange() const;
     bool can_layers_editing() const;
+    bool can_copy() const;
+    bool can_paste() const;
+
+    void msw_rescale();
 
 private:
     struct priv;
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 5ce65b669..03f80bd5c 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -7,7 +7,9 @@ namespace Slic3r {
 namespace GUI {
 
 PreferencesDialog::PreferencesDialog(wxWindow* parent) : 
-	wxDialog(parent, wxID_ANY, _(L("Preferences")), wxDefaultPosition, wxDefaultSize) {
+    DPIDialog(parent, wxID_ANY, _(L("Preferences")), wxDefaultPosition, 
+              wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+{
 	build();
 }
 
@@ -15,7 +17,7 @@ void PreferencesDialog::build()
 {
 	auto app_config = get_app_config();
 	m_optgroup = std::make_shared<ConfigOptionsGroup>(this, _(L("General")));
-    m_optgroup->label_width = 40 * wxGetApp().em_unit(); //400;
+    m_optgroup->label_width = 40;
 	m_optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value){
 		m_values[opt_key] = boost::any_cast<bool>(value) ? "1" : "0";
 	};
@@ -35,7 +37,7 @@ void PreferencesDialog::build()
 	def.type = coBool;
 	def.tooltip = L("If this is enabled, Slic3r will prompt the last output directory "
 					  "instead of the one containing the input files.");
-    def.default_value = new ConfigOptionBool{ app_config->has("remember_output_path") ? app_config->get("remember_output_path")[0] == '1' : true }; // 1;
+    def.set_default_value(new ConfigOptionBool{ app_config->has("remember_output_path") ? app_config->get("remember_output_path") == "1" : true });
     Option option(def, "remember_output_path");
 	m_optgroup->append_single_option_line(option);
 
@@ -43,7 +45,7 @@ void PreferencesDialog::build()
 	def.type = coBool;
 	def.tooltip = L("If this is enabled, Slic3r will auto-center objects "
 					  "around the print bed center.");
-	def.default_value = new ConfigOptionBool{ app_config->get("autocenter")[0] == '1' }; // 1;
+	def.set_default_value(new ConfigOptionBool{ app_config->get("autocenter") == "1" });
 	option = Option (def,"autocenter");
 	m_optgroup->append_single_option_line(option);
 
@@ -51,15 +53,15 @@ void PreferencesDialog::build()
 	def.type = coBool;
 	def.tooltip = L("If this is enabled, Slic3r will pre-process objects as soon "
 					  "as they\'re loaded in order to save time when exporting G-code.");
-	def.default_value = new ConfigOptionBool{ app_config->get("background_processing")[0] == '1' }; // 1;
+	def.set_default_value(new ConfigOptionBool{ app_config->get("background_processing") == "1" });
 	option = Option (def,"background_processing");
 	m_optgroup->append_single_option_line(option);
 
 	// Please keep in sync with ConfigWizard
 	def.label = L("Check for application updates");
 	def.type = coBool;
-	def.tooltip = L("If enabled, Slic3r checks for new versions of Slic3r PE 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.");
-	def.default_value = new ConfigOptionBool(app_config->get("version_check") == "1");
+	def.tooltip = L("If enabled, Slic3r++ 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.");
+	def.set_default_value(new ConfigOptionBool(app_config->get("version_check") == "0"));
 	option = Option (def, "version_check");
 	m_optgroup->append_single_option_line(option);
 
@@ -67,7 +69,7 @@ void PreferencesDialog::build()
 	def.label = L("Update built-in Presets automatically");
 	def.type = coBool;
 	def.tooltip = L("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.");
-	def.default_value = new ConfigOptionBool(app_config->get("preset_update") == "1");
+	def.set_default_value(new ConfigOptionBool(app_config->get("preset_update") == "0"));
 	option = Option (def, "preset_update");
 	m_optgroup->append_single_option_line(option);
 
@@ -75,7 +77,7 @@ void PreferencesDialog::build()
 	def.type = coBool;
 	def.tooltip = L("Suppress \" - default - \" presets in the Print / Filament / Printer "
 					  "selections once there are any other valid presets available.");
-	def.default_value = new ConfigOptionBool{ app_config->get("no_defaults")[0] == '1' }; // 1;
+	def.set_default_value(new ConfigOptionBool{ app_config->get("no_defaults") == "1" });
 	option = Option (def,"no_defaults");
 	m_optgroup->append_single_option_line(option);
 
@@ -83,7 +85,7 @@ void PreferencesDialog::build()
 	def.type = coBool;
 	def.tooltip = L("When checked, the print and filament presets are shown in the preset editor "
 					  "even if they are marked as incompatible with the active printer");
-	def.default_value = new ConfigOptionBool{ app_config->get("show_incompatible_presets")[0] == '1' }; // 1;
+	def.set_default_value(new ConfigOptionBool{ app_config->get("show_incompatible_presets") == "1" });
 	option = Option (def,"show_incompatible_presets");
 	m_optgroup->append_single_option_line(option);
 
@@ -93,7 +95,7 @@ void PreferencesDialog::build()
 	def.tooltip = L("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.");
-	def.default_value = new ConfigOptionBool{ app_config->get("use_legacy_opengl")[0] == '1' }; // 1;
+	def.set_default_value(new ConfigOptionBool{ app_config->get("use_legacy_opengl") == "1" });
 	option = Option (def,"use_legacy_opengl");
 	m_optgroup->append_single_option_line(option);
 
@@ -102,7 +104,7 @@ void PreferencesDialog::build()
 	def.type = coBool;
 	def.tooltip = L("If enabled, the 3D scene will be rendered in Retina resolution. "
 	                "If you are experiencing 3D performance problems, disabling this option may help.");
-	def.default_value = new ConfigOptionBool{ app_config->get("use_retina_opengl") == "1" };
+	def.set_default_value(new ConfigOptionBool{ app_config->get("use_retina_opengl") == "1" });
 	option = Option (def, "use_retina_opengl");
 	m_optgroup->append_single_option_line(option);
 #endif
@@ -110,6 +112,8 @@ void PreferencesDialog::build()
 	auto sizer = new wxBoxSizer(wxVERTICAL);
 	sizer->Add(m_optgroup->sizer, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10);
 
+    SetFont(wxGetApp().normal_font());
+
 	auto buttons = CreateStdDialogButtonSizer(wxOK | wxCANCEL);
 	wxButton* btn = static_cast<wxButton*>(FindWindowById(wxID_OK, this));
 	btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { accept(); });
@@ -123,7 +127,7 @@ void PreferencesDialog::accept()
 {
 	if (m_values.find("no_defaults")       != m_values.end() ||
 		m_values.find("use_legacy_opengl") != m_values.end()) {
-		warning_catcher(this, _(L("You need to restart Slic3r to make the changes effective.")));
+        warning_catcher(this, wxString::Format(_(L("You need to restart %s to make the changes effective.")), SLIC3R_APP_NAME));
 	}
 
 	auto app_config = get_app_config();
@@ -138,5 +142,21 @@ void PreferencesDialog::accept()
     wxGetApp().update_ui_from_settings();
 }
 
+void PreferencesDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    m_optgroup->msw_rescale();
+
+    const int em = em_unit();
+
+    msw_buttons_rescale(this, em, { wxID_OK, wxID_CANCEL });
+
+    const wxSize& size = wxSize(47 * em, 28 * em);
+
+    SetMinSize(size);
+    Fit();
+
+    Refresh();
+}
+
 } // GUI
 } // Slic3r
\ No newline at end of file
diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp
index 363daebbc..096a2c906 100644
--- a/src/slic3r/GUI/Preferences.hpp
+++ b/src/slic3r/GUI/Preferences.hpp
@@ -2,6 +2,7 @@
 #define slic3r_Preferences_hpp_
 
 #include "GUI.hpp"
+#include "GUI_Utils.hpp"
 
 #include <wx/dialog.h>
 #include <map>
@@ -11,7 +12,7 @@ namespace GUI {
 
 class ConfigOptionsGroup;
 
-class PreferencesDialog : public wxDialog
+class PreferencesDialog : public DPIDialog
 {
 	std::map<std::string, std::string>	m_values;
 	std::shared_ptr<ConfigOptionsGroup>	m_optgroup;
@@ -21,6 +22,9 @@ public:
 
 	void	build();
 	void	accept();
+
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
 };
 
 } // GUI
diff --git a/src/slic3r/GUI/Preset.cpp b/src/slic3r/GUI/Preset.cpp
index 1aba82ef6..d240d64dc 100644
--- a/src/slic3r/GUI/Preset.cpp
+++ b/src/slic3r/GUI/Preset.cpp
@@ -4,6 +4,7 @@
 #include "AppConfig.hpp"
 #include "BitmapCache.hpp"
 #include "I18N.hpp"
+#include "wxExtensions.hpp"
 
 #ifdef _MSC_VER
     #define WIN32_LEAN_AND_MEAN
@@ -145,11 +146,16 @@ VendorProfile VendorProfile::from_ini(const ptree &tree, const boost::filesystem
         res.config_version = std::move(*config_version);
     }
 
-    auto config_update_url = vendor_section.find("config_update_url");
+    const auto config_update_url = vendor_section.find("config_update_url");
     if (config_update_url != vendor_section.not_found()) {
         res.config_update_url = config_update_url->second.data();
     }
 
+    const auto changelog_url = vendor_section.find("changelog_url");
+    if (changelog_url != vendor_section.not_found()) {
+        res.changelog_url = changelog_url->second.data();
+    }
+
     if (! load_all) {
         return res;
     }
@@ -539,7 +545,7 @@ const std::vector<std::string>& Preset::sla_material_options()
         s_opts = {
             "initial_layer_height",
             "exposure_time", "initial_exposure_time",
-            "material_correction_printing", "material_correction_curing",
+            "material_correction",
             "material_notes",
             "default_sla_material_profile",
             "compatible_prints", "compatible_prints_condition", 
@@ -559,7 +565,9 @@ const std::vector<std::string>& Preset::sla_printer_options()
             "display_width", "display_height", "display_pixels_x", "display_pixels_y",
             "display_orientation",
             "fast_tilt_time", "slow_tilt_time", "area_fill",
-            "printer_correction",
+            "relative_correction",
+            "absolute_correction",
+            "gamma_correction",
             "print_host", "printhost_apikey", "printhost_cafile",
             "printer_notes",
             "inherits"
@@ -850,18 +858,25 @@ bool PresetCollection::delete_current_preset()
 	return true;
 }
 
-bool PresetCollection::load_bitmap_default(const std::string &file_name)
+void PresetCollection::load_bitmap_default(wxWindow *window, const std::string &file_name)
 {
-    return m_bitmap_main_frame->LoadFile(wxString::FromUTF8(Slic3r::var(file_name).c_str()), wxBITMAP_TYPE_PNG);
+    // XXX: See note in PresetBundle::load_compatible_bitmaps()
+    (void)window;
+    *m_bitmap_main_frame = create_scaled_bitmap(nullptr, file_name);
 }
 
-bool PresetCollection::load_bitmap_add(const std::string &file_name)
+void PresetCollection::load_bitmap_add(wxWindow *window, const std::string &file_name)
 {
-	return m_bitmap_add->LoadFile(wxString::FromUTF8(Slic3r::var(file_name).c_str()), wxBITMAP_TYPE_PNG);
+    // XXX: See note in PresetBundle::load_compatible_bitmaps()
+    (void)window;
+    *m_bitmap_add = create_scaled_bitmap(nullptr, file_name);
 }
 
 const Preset* PresetCollection::get_selected_preset_parent() const
 {
+    if (this->get_selected_idx() == -1)
+        // This preset collection has no preset activated yet. Only the get_edited_preset() is valid.
+        return nullptr;
     const std::string &inherits = this->get_edited_preset().inherits();
     if (inherits.empty())
 		return this->get_selected_preset().is_system ? &this->get_selected_preset() : nullptr; 
@@ -961,6 +976,16 @@ void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui)
 	// and draw a red flag in front of the selected preset.
 	bool wide_icons = ! selected_preset.is_compatible && m_bitmap_incompatible != nullptr;
 
+    /* It's supposed that standard size of an icon is 16px*16px for 100% scaled display.
+    * So set sizes for solid_colored icons used for filament preset
+    * and scale them in respect to em_unit value
+    */
+    const float scale_f = ui->em_unit() * 0.1f;
+    const int icon_height           = 16 * scale_f + 0.5f;
+    const int icon_width            = 16 * scale_f + 0.5f;
+    const int thin_space_icon_width = 4 * scale_f + 0.5f;
+    const int wide_space_icon_width = 6 * scale_f + 0.5f;
+
 	std::map<wxString, wxBitmap*> nonsys_presets;
 	wxString selected = "";
 	if (!this->m_presets.front().is_visible)
@@ -981,13 +1006,13 @@ void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui)
 			std::vector<wxBitmap> bmps;
 			if (wide_icons)
 				// Paint a red flag for incompatible presets.
-				bmps.emplace_back(preset.is_compatible ? m_bitmap_cache->mkclear(16, 16) : *m_bitmap_incompatible);
+				bmps.emplace_back(preset.is_compatible ? m_bitmap_cache->mkclear(icon_width, icon_height) : *m_bitmap_incompatible);
 			// Paint the color bars.
-			bmps.emplace_back(m_bitmap_cache->mkclear(4, 16));
+			bmps.emplace_back(m_bitmap_cache->mkclear(thin_space_icon_width, icon_height));
 			bmps.emplace_back(*m_bitmap_main_frame);
 			// Paint a lock at the system presets.
- 			bmps.emplace_back(m_bitmap_cache->mkclear(6, 16));
-			bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmap_lock : m_bitmap_cache->mkclear(16, 16));
+			bmps.emplace_back(m_bitmap_cache->mkclear(wide_space_icon_width, icon_height));
+			bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmap_lock : m_bitmap_cache->mkclear(icon_width, icon_height));
 			bmp = m_bitmap_cache->insert(bitmap_key, bmps);
 		}
 
@@ -1028,12 +1053,12 @@ void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui)
 			std::vector<wxBitmap> bmps;
 			if (wide_icons)
 				// Paint a red flag for incompatible presets.
-				bmps.emplace_back(m_bitmap_cache->mkclear(16, 16));
+				bmps.emplace_back(m_bitmap_cache->mkclear(icon_width, icon_height));
 			// Paint the color bars.
-			bmps.emplace_back(m_bitmap_cache->mkclear(4, 16));
+			bmps.emplace_back(m_bitmap_cache->mkclear(thin_space_icon_width, icon_height));
 			bmps.emplace_back(*m_bitmap_main_frame);
 			// Paint a lock at the system presets.
-			bmps.emplace_back(m_bitmap_cache->mkclear(6, 16));
+			bmps.emplace_back(m_bitmap_cache->mkclear(wide_space_icon_width, icon_height));
 			bmps.emplace_back(m_bitmap_add ? *m_bitmap_add : wxNullBitmap);
 			bmp = m_bitmap_cache->insert(bitmap_key, bmps);
 		}
@@ -1044,9 +1069,13 @@ void PresetCollection::update_platter_ui(GUI::PresetComboBox *ui)
 	ui->SetToolTip(ui->GetString(selected_preset_item));
     ui->check_selection();
     ui->Thaw();
+
+    // Update control min size after rescale (changed Display DPI under MSW)
+    if (ui->GetMinWidth() != 20 * ui->em_unit())
+        ui->SetMinSize(wxSize(20 * ui->em_unit(), ui->GetSize().GetHeight()));
 }
 
-size_t PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompatible)
+size_t PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompatible, const int em/* = 10*/)
 {
     if (ui == nullptr)
         return 0;
@@ -1054,6 +1083,14 @@ size_t PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompati
     ui->Clear();
 	size_t selected_preset_item = 0;
 
+    /* It's supposed that standard size of an icon is 16px*16px for 100% scaled display.
+    * So set sizes for solid_colored(empty) icons used for preset
+    * and scale them in respect to em_unit value
+    */
+    const float scale_f = em * 0.1f;
+    const int icon_height = 16 * scale_f + 0.5f;
+    const int icon_width  = 16 * scale_f + 0.5f;
+
 	std::map<wxString, wxBitmap*> nonsys_presets;
 	wxString selected = "";
 	if (!this->m_presets.front().is_visible)
@@ -1072,7 +1109,7 @@ size_t PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompati
 			const wxBitmap* tmp_bmp = preset.is_compatible ? m_bitmap_compatible : m_bitmap_incompatible;
 			bmps.emplace_back((tmp_bmp == 0) ? (m_bitmap_main_frame ? *m_bitmap_main_frame : wxNullBitmap) : *tmp_bmp);
 			// Paint a lock at the system presets.
-			bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmap_lock : m_bitmap_cache->mkclear(16, 16));
+			bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmap_lock : m_bitmap_cache->mkclear(icon_width, icon_height));
 			bmp = m_bitmap_cache->insert(bitmap_key, bmps);
 		}
 
@@ -1339,6 +1376,11 @@ std::string PresetCollection::path_from_name(const std::string &new_name) const
     return (boost::filesystem::path(m_dir_path) / file_name).make_preferred().string();
 }
 
+void PresetCollection::clear_bitmap_cache()
+{
+    m_bitmap_cache->clear();
+}
+
 wxString PresetCollection::separator(const std::string &label)
 {
 	return wxString::FromUTF8(PresetCollection::separator_head()) + _(label) + wxString::FromUTF8(PresetCollection::separator_tail());
@@ -1350,4 +1392,15 @@ const Preset& PrinterPresetCollection::default_preset_for(const DynamicPrintConf
 	return this->default_preset((opt_printer_technology == nullptr || opt_printer_technology->value == ptFFF) ? 0 : 1);
 }
 
+const Preset* PrinterPresetCollection::find_by_model_id(const std::string &model_id) const
+{
+    if (model_id.empty()) { return nullptr; }
+
+    const auto it = std::find_if(cbegin(), cend(), [&](const Preset &preset) {
+        return preset.config.opt_string("printer_model") == model_id;
+    });
+
+    return it != cend() ? &*it : nullptr;
+}
+
 } // namespace Slic3r
diff --git a/src/slic3r/GUI/Preset.hpp b/src/slic3r/GUI/Preset.hpp
index 716ca7854..b61bf100c 100644
--- a/src/slic3r/GUI/Preset.hpp
+++ b/src/slic3r/GUI/Preset.hpp
@@ -15,6 +15,7 @@ class wxBitmapComboBox;
 class wxChoice;
 class wxItemContainer;
 class wxString;
+class wxWindow;
 
 namespace Slic3r {
 
@@ -45,6 +46,7 @@ public:
     std::string                     id;
     Semver                          config_version;
     std::string                     config_update_url;
+    std::string                     changelog_url;
 
     struct PrinterVariant {
         PrinterVariant() {}
@@ -278,10 +280,10 @@ public:
     bool            delete_current_preset();
 
     // Load default bitmap to be placed at the wxBitmapComboBox of a MainFrame.
-    bool            load_bitmap_default(const std::string &file_name);
+    void            load_bitmap_default(wxWindow *window, const std::string &file_name);
 
     // Load "add new printer" bitmap to be placed at the wxBitmapComboBox of a MainFrame.
-    bool            load_bitmap_add(const std::string &file_name);
+    void            load_bitmap_add(wxWindow *window, const std::string &file_name);
 
     // Compatible & incompatible marks, to be placed at the wxBitmapComboBox items.
     void            set_bitmap_compatible  (const wxBitmap *bmp) { m_bitmap_compatible   = bmp; }
@@ -313,7 +315,7 @@ public:
     const Preset&   get_edited_preset() const   { return m_edited_preset; }
 
 	// used to update preset_choice from Tab
-	const std::deque<Preset>&	get_presets()	{ return m_presets; }
+	const std::deque<Preset>&	get_presets() const	{ return m_presets; }
 	int						get_idx_selected()	{ return m_idx_selected; }
 	static const std::string&	get_suffix_modified();
 
@@ -395,7 +397,7 @@ public:
     // Update the choice UI from the list of presets.
     // If show_incompatible, all presets are shown, otherwise only the compatible presets are shown.
     // If an incompatible preset is selected, it is shown as well.
-    size_t          update_tab_ui(wxBitmapComboBox *ui, bool show_incompatible);
+    size_t          update_tab_ui(wxBitmapComboBox *ui, bool show_incompatible, const int em = 10);
     // Update the choice UI from the list of presets.
     // Only the compatible presets are shown.
     // If an incompatible preset is selected, it is shown as well.
@@ -413,6 +415,8 @@ public:
     // Generate a file path from a profile name. Add the ".ini" suffix if it is missing.
     std::string     path_from_name(const std::string &new_name) const;
 
+    void            clear_bitmap_cache();
+
 #ifdef __linux__
 	static const char* separator_head() { return "------- "; }
 	static const char* separator_tail() { return " -------"; }
@@ -502,6 +506,8 @@ public:
     PrinterPresetCollection(Preset::Type type, const std::vector<std::string> &keys, const Slic3r::StaticPrintConfig &defaults, const std::string &default_name = "- default -") :
 		PresetCollection(type, keys, defaults, default_name) {}
     const Preset&   default_preset_for(const DynamicPrintConfig &config) const override;
+
+    const Preset*   find_by_model_id(const std::string &model_id) const;
 };
 
 } // namespace Slic3r
diff --git a/src/slic3r/GUI/PresetBundle.cpp b/src/slic3r/GUI/PresetBundle.cpp
index c81d4425e..030228d62 100644
--- a/src/slic3r/GUI/PresetBundle.cpp
+++ b/src/slic3r/GUI/PresetBundle.cpp
@@ -4,6 +4,7 @@
 #include "BitmapCache.hpp"
 #include "Plater.hpp"
 #include "I18N.hpp"
+#include "wxExtensions.hpp"
 
 #include <algorithm>
 #include <fstream>
@@ -102,13 +103,14 @@ PresetBundle::PresetBundle() :
     }
 
 	// Load the default preset bitmaps.
-    this->prints       .load_bitmap_default("cog.png");
-    this->sla_prints   .load_bitmap_default("package_green.png");
-    this->filaments    .load_bitmap_default("spool.png");
-    this->sla_materials.load_bitmap_default("package_green.png");
-    this->printers     .load_bitmap_default("printer_empty.png");
-    this->printers     .load_bitmap_add("add.png");
-    this->load_compatible_bitmaps();
+	// #ys_FIXME_to_delete we'll load them later, using em_unit()
+//     this->prints       .load_bitmap_default("cog");
+//     this->sla_prints   .load_bitmap_default("package_green.png");
+//     this->filaments    .load_bitmap_default("spool.png");
+//     this->sla_materials.load_bitmap_default("package_green.png");
+//     this->printers     .load_bitmap_default("printer_empty.png");
+//     this->printers     .load_bitmap_add("add.png");
+//     this->load_compatible_bitmaps();
 
     // Re-activate the default presets, so their "edited" preset copies will be updated with the additional configuration values above.
     this->prints       .select_preset(0);
@@ -189,7 +191,7 @@ void PresetBundle::setup_directories()
     }
 }
 
-void PresetBundle::load_presets(const AppConfig &config)
+void PresetBundle::load_presets(const AppConfig &config, const std::string &preferred_model_id)
 {
     // First load the vendor specific system presets.
     std::string errors_cummulative = this->load_system_presets();
@@ -232,7 +234,7 @@ void PresetBundle::load_presets(const AppConfig &config)
     if (! errors_cummulative.empty())
         throw std::runtime_error(errors_cummulative);
 
-    this->load_selections(config);
+    this->load_selections(config, preferred_model_id);
 }
 
 // Load system presets into this PresetBundle.
@@ -322,7 +324,7 @@ void PresetBundle::load_installed_printers(const AppConfig &config)
 
 // Load selections (current print, current filaments, current printer) from config.ini
 // This is done on application start up or after updates are applied.
-void PresetBundle::load_selections(const AppConfig &config)
+void PresetBundle::load_selections(const AppConfig &config, const std::string &preferred_model_id)
 {
 	// Update visibility of presets based on application vendor / model / variant configuration.
 	this->load_installed_printers(config);
@@ -334,38 +336,37 @@ void PresetBundle::load_selections(const AppConfig &config)
     std::string initial_sla_material_profile_name = remove_ini_suffix(config.get("presets", "sla_material"));
 	std::string initial_printer_profile_name      = remove_ini_suffix(config.get("presets", "printer"));
 
-	// Activate print / filament / printer profiles from the config.
-	// If the printer profile enumerated by the config are not visible, select an alternate preset.
+    // Activate print / filament / printer profiles from either the config,
+    // or from the preferred_model_id suggestion passed in by ConfigWizard.
+    // If the printer profile enumerated by the config are not visible, select an alternate preset.
     // Do not select alternate profiles for the print / filament profiles as those presets
     // will be selected by the following call of this->update_compatible(true).
-    printers.select_preset_by_name(initial_printer_profile_name, true);
-    PrinterTechnology printer_technology = printers.get_selected_preset().printer_technology();
-    if (printer_technology == ptFFF) {
-        prints.select_preset_by_name_strict(initial_print_profile_name);
-        filaments.select_preset_by_name_strict(initial_filament_profile_name);
-        sla_prints.select_preset_by_name(initial_sla_material_profile_name, true);
-        sla_materials.select_preset_by_name(initial_sla_material_profile_name, true);
-    } else {
-        prints.select_preset_by_name(initial_print_profile_name, true);
-        filaments.select_preset_by_name(initial_filament_profile_name, true);
-        sla_prints.select_preset_by_name_strict(initial_sla_material_profile_name);
-        sla_materials.select_preset_by_name_strict(initial_sla_material_profile_name);
-    }
 
-    if (printers.get_selected_preset().printer_technology() == ptFFF) {
-        // Load the names of the other filament profiles selected for a multi-material printer.
-        auto   *nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(printers.get_selected_preset().config.option("nozzle_diameter"));
-        size_t  num_extruders = nozzle_diameter->values.size();
-        this->filament_presets = { initial_filament_profile_name };
-        for (unsigned int i = 1; i < (unsigned int)num_extruders; ++i) {
-            char name[64];
-            sprintf(name, "filament_%d", i);
-            if (!config.has("presets", name))
-                break;
-            this->filament_presets.emplace_back(remove_ini_suffix(config.get("presets", name)));
-        }
-        // Do not define the missing filaments, so that the update_compatible() will use the preferred filaments.
-        this->filament_presets.resize(num_extruders, "");
+    const Preset *initial_printer = printers.find_preset(initial_printer_profile_name);
+    const Preset *preferred_printer = printers.find_by_model_id(preferred_model_id);
+    printers.select_preset_by_name(
+        (preferred_printer != nullptr && (initial_printer == nullptr || !initial_printer->is_visible)) ? 
+            preferred_printer->name : 
+            initial_printer_profile_name,
+        true);
+
+    // Selects the profile, leaves it to -1 if the initial profile name is empty or if it was not found.
+    prints.select_preset_by_name_strict(initial_print_profile_name);
+    filaments.select_preset_by_name_strict(initial_filament_profile_name);
+	sla_prints.select_preset_by_name_strict(initial_sla_print_profile_name);
+    sla_materials.select_preset_by_name_strict(initial_sla_material_profile_name);
+
+    // Load the names of the other filament profiles selected for a multi-material printer.
+    // Load it even if the current printer technology is SLA.
+    // The possibly excessive filament names will be later removed with this->update_multi_material_filament_presets()
+    // once the FFF technology gets selected.
+    this->filament_presets = { filaments.get_selected_preset_name() };
+    for (unsigned int i = 1; i < 1000; ++ i) {
+        char name[64];
+        sprintf(name, "filament_%d", i);
+        if (! config.has("presets", name))
+            break;
+        this->filament_presets.emplace_back(remove_ini_suffix(config.get("presets", name)));
     }
 
     // Update visibility of presets based on their compatibility with the active printer.
@@ -394,49 +395,41 @@ void PresetBundle::export_selections(AppConfig &config)
     config.set("presets", "printer",      printers.get_selected_preset_name());
 }
 
-bool PresetBundle::load_compatible_bitmaps()
+void PresetBundle::load_compatible_bitmaps(wxWindow *window)
 {
-    const std::string path_bitmap_compatible   = "flag-green-icon.png";
-    const std::string path_bitmap_incompatible = "flag-red-icon.png";
-    const std::string path_bitmap_lock         = "sys_lock.png";//"lock.png";
-	const std::string path_bitmap_lock_open    = "sys_unlock.png";//"lock_open.png";
-    bool loaded_compatible   = m_bitmapCompatible  ->LoadFile(
-        wxString::FromUTF8(Slic3r::var(path_bitmap_compatible).c_str()), wxBITMAP_TYPE_PNG);
-    bool loaded_incompatible = m_bitmapIncompatible->LoadFile(
-        wxString::FromUTF8(Slic3r::var(path_bitmap_incompatible).c_str()), wxBITMAP_TYPE_PNG);
-    bool loaded_lock = m_bitmapLock->LoadFile(
-        wxString::FromUTF8(Slic3r::var(path_bitmap_lock).c_str()), wxBITMAP_TYPE_PNG);
-    bool loaded_lock_open = m_bitmapLockOpen->LoadFile(
-        wxString::FromUTF8(Slic3r::var(path_bitmap_lock_open).c_str()), wxBITMAP_TYPE_PNG);
-    if (loaded_compatible) {
-        prints       .set_bitmap_compatible(m_bitmapCompatible);
-        filaments    .set_bitmap_compatible(m_bitmapCompatible);
-        sla_prints   .set_bitmap_compatible(m_bitmapCompatible);
-        sla_materials.set_bitmap_compatible(m_bitmapCompatible);
-//        printers .set_bitmap_compatible(m_bitmapCompatible);
-    }
-    if (loaded_incompatible) {
-        prints       .set_bitmap_incompatible(m_bitmapIncompatible);
-        filaments    .set_bitmap_incompatible(m_bitmapIncompatible);
-        sla_prints   .set_bitmap_incompatible(m_bitmapIncompatible);
-        sla_materials.set_bitmap_incompatible(m_bitmapIncompatible);
-//        printers .set_bitmap_incompatible(m_bitmapIncompatible);
-    }
-    if (loaded_lock) {
-        prints       .set_bitmap_lock(m_bitmapLock);
-        filaments    .set_bitmap_lock(m_bitmapLock);
-        sla_prints   .set_bitmap_lock(m_bitmapLock);
-        sla_materials.set_bitmap_lock(m_bitmapLock);
-        printers     .set_bitmap_lock(m_bitmapLock);
-    }
-    if (loaded_lock_open) {
-        prints       .set_bitmap_lock_open(m_bitmapLock);
-        filaments    .set_bitmap_lock_open(m_bitmapLock);
-        sla_prints   .set_bitmap_lock_open(m_bitmapLock);
-        sla_materials.set_bitmap_lock_open(m_bitmapLock);
-        printers     .set_bitmap_lock_open(m_bitmapLock);
-    }
-    return loaded_compatible && loaded_incompatible && loaded_lock && loaded_lock_open;
+    // We don't actually pass the window pointer here and instead generate
+    // a low DPI bitmap, because the wxBitmapComboBox and wxDataViewCtrl don't support
+    // high DPI bitmaps very well, they compute their dimensions wrong.
+    // TODO: Update this when fixed in wxWidgets
+    // See also PresetCollection::load_bitmap_default() and PresetCollection::load_bitmap_add()
+
+    (void)window;
+    *m_bitmapCompatible     = create_scaled_bitmap(nullptr, "flag_green");
+    *m_bitmapIncompatible   = create_scaled_bitmap(nullptr, "flag_red");
+    *m_bitmapLock           = create_scaled_bitmap(nullptr, "lock_closed");
+    *m_bitmapLockOpen       = create_scaled_bitmap(nullptr, "lock_open");
+
+    prints       .set_bitmap_compatible(m_bitmapCompatible);
+    filaments    .set_bitmap_compatible(m_bitmapCompatible);
+    sla_prints   .set_bitmap_compatible(m_bitmapCompatible);
+    sla_materials.set_bitmap_compatible(m_bitmapCompatible);
+
+    prints       .set_bitmap_incompatible(m_bitmapIncompatible);
+    filaments    .set_bitmap_incompatible(m_bitmapIncompatible);
+    sla_prints   .set_bitmap_incompatible(m_bitmapIncompatible);
+    sla_materials.set_bitmap_incompatible(m_bitmapIncompatible);
+
+    prints       .set_bitmap_lock(m_bitmapLock);
+    filaments    .set_bitmap_lock(m_bitmapLock);
+    sla_prints   .set_bitmap_lock(m_bitmapLock);
+    sla_materials.set_bitmap_lock(m_bitmapLock);
+    printers     .set_bitmap_lock(m_bitmapLock);
+
+    prints       .set_bitmap_lock_open(m_bitmapLock);
+    filaments    .set_bitmap_lock_open(m_bitmapLock);
+    sla_prints   .set_bitmap_lock_open(m_bitmapLock);
+    sla_materials.set_bitmap_lock_open(m_bitmapLock);
+    printers     .set_bitmap_lock_open(m_bitmapLock);
 }
 
 DynamicPrintConfig PresetBundle::full_config() const
@@ -1438,6 +1431,25 @@ bool PresetBundle::parse_color(const std::string &scolor, unsigned char *rgb_out
     return true;
 }
 
+void PresetBundle::load_default_preset_bitmaps(wxWindow *window)
+{
+    // Clear bitmap cache, before load new scaled default preset bitmaps 
+    m_bitmapCache->clear();
+    this->prints.clear_bitmap_cache();
+    this->sla_prints.clear_bitmap_cache();
+    this->filaments.clear_bitmap_cache();
+    this->sla_materials.clear_bitmap_cache();
+    this->printers.clear_bitmap_cache();
+
+    this->prints.load_bitmap_default(window, "cog");
+    this->sla_prints.load_bitmap_default(window, "cog");
+    this->filaments.load_bitmap_default(window, "spool.png");
+    this->sla_materials.load_bitmap_default(window, "resin");
+    this->printers.load_bitmap_default(window, "printer");
+    this->printers.load_bitmap_add(window, "add.png");
+    this->load_compatible_bitmaps(window);
+}
+
 void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::PresetComboBox *ui)
 {
     if (ui == nullptr || this->printers.get_edited_preset().printer_technology() == ptSLA ||
@@ -1463,6 +1475,18 @@ void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::Pr
 	wxString selected_str = "";
 	if (!this->filaments().front().is_visible)
         ui->set_label_marker(ui->Append(PresetCollection::separator(L("System presets")), wxNullBitmap));
+
+    /* It's supposed that standard size of an icon is 16px*16px for 100% scaled display.
+     * So set sizes for solid_colored icons used for filament preset 
+     * and scale them in respect to em_unit value
+     */
+    const float scale_f = ui->em_unit() * 0.1f;
+    const int icon_height       = 16 * scale_f + 0.5f;
+    const int normal_icon_width = 16 * scale_f + 0.5f;
+    const int space_icon_width  = 2  * scale_f + 0.5f;
+    const int wide_icon_width   = 24 * scale_f + 0.5f;
+    const int thin_icon_width   = 8  * scale_f + 0.5f;
+
 	for (int i = this->filaments().front().is_visible ? 0 : 1; i < int(this->filaments().size()); ++i) {
         const Preset &preset    = this->filaments.preset(i);
         bool          selected  = this->filament_presets[idx_extruder] == preset.name;
@@ -1486,17 +1510,17 @@ void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::Pr
             std::vector<wxBitmap> bmps;
             if (wide_icons)
                 // Paint a red flag for incompatible presets.
-                bmps.emplace_back(preset.is_compatible ? m_bitmapCache->mkclear(16, 16) : *m_bitmapIncompatible);
+                bmps.emplace_back(preset.is_compatible ? m_bitmapCache->mkclear(normal_icon_width, icon_height) : *m_bitmapIncompatible);
             // Paint the color bars.
             parse_color(filament_rgb, rgb);
-            bmps.emplace_back(m_bitmapCache->mksolid(single_bar ? 24 : 16, 16, rgb));
+            bmps.emplace_back(m_bitmapCache->mksolid(single_bar ? wide_icon_width : normal_icon_width, icon_height, rgb));
             if (! single_bar) {
                 parse_color(extruder_rgb, rgb);
-                bmps.emplace_back(m_bitmapCache->mksolid(8,  16, rgb));
+                bmps.emplace_back(m_bitmapCache->mksolid(thin_icon_width, icon_height, rgb));
             }
             // Paint a lock at the system presets.
-            bmps.emplace_back(m_bitmapCache->mkclear(2, 16));
-			bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmapLock : m_bitmapCache->mkclear(16, 16));
+            bmps.emplace_back(m_bitmapCache->mkclear(space_icon_width, icon_height));
+            bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmapLock : m_bitmapCache->mkclear(normal_icon_width, icon_height));
 //                 (preset.is_dirty ? *m_bitmapLockOpen : *m_bitmapLock) : m_bitmapCache->mkclear(16, 16));
             bitmap = m_bitmapCache->insert(bitmap_key, bmps);
 		}
@@ -1531,6 +1555,10 @@ void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::Pr
 	ui->SetToolTip(ui->GetString(selected_preset_item));
     ui->check_selection();
     ui->Thaw();
+
+    // Update control min size after rescale (changed Display DPI under MSW)
+    if (ui->GetMinWidth() != 20 * ui->em_unit())
+        ui->SetMinSize(wxSize(20 * ui->em_unit(), ui->GetSize().GetHeight()));
 }
 
 void PresetBundle::set_default_suppressed(bool default_suppressed)
diff --git a/src/slic3r/GUI/PresetBundle.hpp b/src/slic3r/GUI/PresetBundle.hpp
index 9f289f1e9..f351f66ac 100644
--- a/src/slic3r/GUI/PresetBundle.hpp
+++ b/src/slic3r/GUI/PresetBundle.hpp
@@ -7,6 +7,8 @@
 #include <set>
 #include <boost/filesystem/path.hpp>
 
+class wxWindow;
+
 namespace Slic3r {
 
 namespace GUI {
@@ -29,7 +31,7 @@ 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
     // This is done just once on application start up.
-    void            load_presets(const AppConfig &config);
+    void            load_presets(const AppConfig &config, const std::string &preferred_model_id = "");
 
     // Export selections (current print, current filaments, current printer) into config.ini
     void            export_selections(AppConfig &config);
@@ -127,6 +129,8 @@ public:
 
     static bool                 parse_color(const std::string &scolor, unsigned char *rgb_out);
 
+    void                        load_default_preset_bitmaps(wxWindow *window);
+
 private:
     std::string                 load_system_presets();
     // Merge one vendor's presets with the other vendor's presets, report duplicates.
@@ -139,14 +143,14 @@ private:
 
     // Load selections (current print, current filaments, current printer) from config.ini
     // This is done just once on application start up.
-    void                        load_selections(const AppConfig &config);
+    void                        load_selections(const AppConfig &config, const std::string &preferred_model_id = "");
 
     // Load print, filament & printer presets from a config. If it is an external config, then the name is extracted from the external path.
     // and the external config is just referenced, not stored into user profile directory.
     // If it is not an external config, then the config will be stored into the user profile directory.
     void                        load_config_file_config(const std::string &name_or_path, bool is_external, DynamicPrintConfig &&config);
     void                        load_config_file_config_bundle(const std::string &path, const boost::property_tree::ptree &tree);
-    bool                        load_compatible_bitmaps();
+    void                        load_compatible_bitmaps(wxWindow *window);
 
     DynamicPrintConfig          full_fff_config() const;
     DynamicPrintConfig          full_sla_config() const;
diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp
index 01f240975..f8df3c457 100644
--- a/src/slic3r/GUI/PresetHints.cpp
+++ b/src/slic3r/GUI/PresetHints.cpp
@@ -6,7 +6,6 @@
 #include "PresetBundle.hpp"
 #include "PresetHints.hpp"
 
-#include <boost/algorithm/string/predicate.hpp>
 #include <wx/intl.h> 
 
 #include "GUI.hpp"
@@ -18,38 +17,41 @@ namespace Slic3r {
 std::string PresetHints::cooling_description(const Preset &preset)
 {
 	std::string out;
-	char buf[MIN_BUF_LENGTH/*4096*/];
-	if (preset.config.opt_bool("cooling", 0)) {
+
+    if (preset.config.opt_bool("cooling", 0)) {
 		int 	slowdown_below_layer_time 	= preset.config.opt_int("slowdown_below_layer_time", 0);
 		int 	min_fan_speed 				= preset.config.opt_int("min_fan_speed", 0);
 		int 	max_fan_speed 				= preset.config.opt_int("max_fan_speed", 0);
 		int 	min_print_speed				= int(preset.config.opt_float("min_print_speed", 0) + 0.5);
 		int 	fan_below_layer_time		= preset.config.opt_int("fan_below_layer_time", 0);
-		sprintf(buf, _CHB(L("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).")),
-            slowdown_below_layer_time, max_fan_speed, slowdown_below_layer_time, min_print_speed);
-		out += buf;
+
+        out += (boost::format(_utf8(L("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)."))) 
+                                      % slowdown_below_layer_time % max_fan_speed % slowdown_below_layer_time % min_print_speed).str();
+
         if (fan_below_layer_time > slowdown_below_layer_time) {
-			sprintf(buf, _CHB(L("\nIf estimated layer time is greater, but still below ~%ds, fan will run at a proportionally decreasing speed between %d%% and %d%%.")),
-                fan_below_layer_time, max_fan_speed, min_fan_speed);
-            out += buf;
+            out += (boost::format(_utf8(L("\nIf estimated layer time is greater, but still below ~%1%s, "
+                                          "fan will run at a proportionally decreasing speed between %2%%% and %3%%%."))) 
+                                          % fan_below_layer_time % max_fan_speed % min_fan_speed).str();
         }
-		out += _CHB(L("\nDuring the other layers, fan "));
+        out += _utf8(L("\nDuring the other layers, fan")) + " ";
     } else {
-        out = _CHB(L("Fan "));
+        out = _utf8(L("Fan")) + " ";
     }
 	if (preset.config.opt_bool("fan_always_on", 0)) {
 		int 	disable_fan_first_layers 	= preset.config.opt_int("disable_fan_first_layers", 0);
 		int 	min_fan_speed 				= preset.config.opt_int("min_fan_speed", 0);
-        sprintf(buf, _CHB(L("will always run at %d%% ")), min_fan_speed);
-        out += buf;
-        if (disable_fan_first_layers > 1) {
-        	sprintf(buf, _CHB(L("except for the first %d layers")), disable_fan_first_layers);
-	        out += buf;
-        }
+
+	    out += (boost::format(_utf8(L("will always run at %1%%%"))) % min_fan_speed).str() + " ";
+
+        if (disable_fan_first_layers > 1)
+            out += (boost::format(_utf8(L("except for the first %1% layers."))) % disable_fan_first_layers).str();
         else if (disable_fan_first_layers == 1)
-        	out += _CHB(L("except for the first layer"));
+        	out += _utf8(L("except for the first layer."));
     } else
-    	out += _CHB(L("will be turned off."));
+       out += _utf8(L("will be turned off."));
 
     return out;
 }
@@ -158,7 +160,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
                     limit_by_first_layer_speed(std::max(external_perimeter_speed, small_perimeter_speed), max_print_speed));
             if (max_flow < external_perimeter_rate) {
                 max_flow = external_perimeter_rate;
-                max_flow_extrusion_type = _CHB(L("external perimeters"));
+                max_flow_extrusion_type = _utf8(L("external perimeters"));
             }
             double perimeter_rate = Flow::new_from_config_width(frPerimeter, 
                 first_positive(first_layer_extrusion_width_ptr, perimeter_extrusion_width, extrusion_width), 
@@ -167,7 +169,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
                     limit_by_first_layer_speed(std::max(perimeter_speed, small_perimeter_speed), max_print_speed));
             if (max_flow < perimeter_rate) {
                 max_flow = perimeter_rate;
-                max_flow_extrusion_type = _CHB(L("perimeters"));
+                max_flow_extrusion_type = _utf8(L("perimeters"));
             }
         }
         if (! bridging && infill_extruder_active) {
@@ -176,7 +178,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
                 nozzle_diameter, lh, bfr).mm3_per_mm() * limit_infill_by_first_layer_speed(infill_speed, max_print_speed);
             if (max_flow < infill_rate) {
                 max_flow = infill_rate;
-                max_flow_extrusion_type = _CHB(L("infill"));
+                max_flow_extrusion_type = _utf8(L("infill"));
             }
         }
         if (solid_infill_extruder_active) {
@@ -186,7 +188,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
                 (bridging ? bridge_speed : limit_infill_by_first_layer_speed(solid_infill_speed, max_print_speed));
             if (max_flow < solid_infill_rate) {
                 max_flow = solid_infill_rate;
-                max_flow_extrusion_type = _CHB(L("solid infill"));
+                max_flow_extrusion_type = _utf8(L("solid infill"));
             }
             if (! bridging) {
                 double top_solid_infill_rate = Flow::new_from_config_width(frInfill, 
@@ -194,7 +196,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
                     nozzle_diameter, lh, bfr).mm3_per_mm() * limit_infill_by_first_layer_speed(top_solid_infill_speed, max_print_speed);
                 if (max_flow < top_solid_infill_rate) {
                     max_flow = top_solid_infill_rate;
-                    max_flow_extrusion_type = _CHB(L("top solid infill"));
+                    max_flow_extrusion_type = _utf8(L("top solid infill"));
                 }
             }
         }
@@ -205,7 +207,7 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
                 (bridging ? bridge_speed : limit_by_first_layer_speed(support_material_speed, max_print_speed));
             if (max_flow < support_material_rate) {
                 max_flow = support_material_rate;
-                max_flow_extrusion_type = _CHB(L("support"));
+                max_flow_extrusion_type = _utf8(L("support"));
             }
         }
         if (support_material_interface_extruder_active) {
@@ -215,26 +217,23 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
                 (bridging ? bridge_speed : limit_by_first_layer_speed(support_material_interface_speed, max_print_speed));
             if (max_flow < support_material_interface_rate) {
                 max_flow = support_material_interface_rate;
-                max_flow_extrusion_type = _CHB(L("support interface"));
+                max_flow_extrusion_type = _utf8(L("support interface"));
             }
         }
         //FIXME handle gap_fill_speed
         if (! out.empty())
             out += "\n";
-        out += (first_layer ? _CHB(L("First layer volumetric")) : (bridging ? _CHB(L("Bridging volumetric")) : _CHB(L("Volumetric"))));
-        out += _CHB(L(" flow rate is maximized "));
+        out += (first_layer ? _utf8(L("First layer volumetric")) : (bridging ? _utf8(L("Bridging volumetric")) : _utf8(L("Volumetric"))));
+        out += " " + _utf8(L("flow rate is maximized")) + " ";
         bool limited_by_max_volumetric_speed = max_volumetric_speed > 0 && max_volumetric_speed < max_flow;
         out += (limited_by_max_volumetric_speed ? 
-            _CHB(L("by the print profile maximum")) : 
-            (_CHB(L("when printing ")) + max_flow_extrusion_type))
-            + _CHB(L(" with a volumetric rate "));
+            _utf8(L("by the print profile maximum")) :
+            (_utf8(L("when printing"))+ " " + max_flow_extrusion_type))
+            + " " + _utf8(L("with a volumetric rate"))+ " ";
         if (limited_by_max_volumetric_speed)
             max_flow = max_volumetric_speed;
-		char buf[MIN_BUF_LENGTH/*2048*/];
-        sprintf(buf, _CHB(L("%3.2f mm³/s")), max_flow);
-        out += buf;
-        sprintf(buf, _CHB(L(" at filament speed %3.2f mm/s.")), max_flow / filament_crossection);
-        out += buf;
+
+        out += (boost::format(_utf8(L("%3.2f mm³/s at filament speed %3.2f mm/s."))) % max_flow % (max_flow / filament_crossection)).str();
     }
 
  	return out;
@@ -252,7 +251,7 @@ std::string PresetHints::recommended_thin_wall_thickness(const PresetBundle &pre
     
     std::string out;
 	if (layer_height <= 0.f){
-		out += _CHB(L("Recommended object min wall thickness: Not available due to invalid layer height."));
+		out += _utf8(L("Recommended object min thin wall thickness: Not available due to invalid layer height."));
 		return out;
 	}
 
@@ -268,16 +267,13 @@ std::string PresetHints::recommended_thin_wall_thickness(const PresetBundle &pre
     
     if (num_perimeters > 0) {
         int num_lines = std::min(num_perimeters * 2, 10);
-		char buf[MIN_BUF_LENGTH/*256*/];
-        sprintf(buf, _CHB(L("Recommended object min wall thickness for layer height %.2f and ")), layer_height);
-        out += buf;
+        out += (boost::format(_utf8(L("Recommended object min thin wall thickness for layer height %.2f and"))) % layer_height).str() + " ";
         // Start with the width of two closely spaced 
         double width = external_perimeter_flow.width + external_perimeter_flow.spacing();
         for (int i = 2; i <= num_lines; thin_walls ? ++ i : i += 2) {
             if (i > 2)
                 out += ", ";
-            sprintf(buf, _CHB(L("%d perimeter: %.2lf mm")), i/2, width);
-            out += buf;
+            out += (boost::format(_utf8(L("%d perimeter: %.2f mm"))) % i %  width).str() + " ";
             width += perimeter_flow.spacing() * (thin_walls ? 1.f : 2.f);
         }
     }
diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp
index 76185b1ba..09bd65682 100644
--- a/src/slic3r/GUI/PrintHostDialogs.cpp
+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
@@ -19,6 +19,7 @@
 #include "MsgDialog.hpp"
 #include "I18N.hpp"
 #include "../Utils/PrintHost.hpp"
+#include "wxExtensions.hpp"
 
 namespace fs = boost::filesystem;
 
@@ -91,12 +92,13 @@ void PrintHostSendDialog::EndModal(int ret)
         // Persist path and print settings
         wxString path = txt_filename->GetValue();
         int last_slash = path.Find('/', true);
-        if (last_slash != wxNOT_FOUND) {
+		if (last_slash == wxNOT_FOUND)
+			path.clear();
+		else
             path = path.SubString(0, last_slash);
-            wxGetApp().app_config->set("recent", CONFIG_KEY_PATH, into_u8(path));
-        }
-
-        GUI::get_app_config()->set("recent", CONFIG_KEY_PRINT, start_print() ? "1" : "0");
+		AppConfig *app_config = wxGetApp().app_config;
+		app_config->set("recent", CONFIG_KEY_PATH, into_u8(path));
+        app_config->set("recent", CONFIG_KEY_PRINT, start_print() ? "1" : "0");
     }
 
     MsgDialog::EndModal(ret);
@@ -131,13 +133,11 @@ wxEvent *PrintHostQueueDialog::Event::Clone() const
 }
 
 PrintHostQueueDialog::PrintHostQueueDialog(wxWindow *parent)
-    : wxDialog(parent, wxID_ANY, _(L("Print host upload queue")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+    : DPIDialog(parent, wxID_ANY, _(L("Print host upload queue")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
     , on_progress_evt(this, EVT_PRINTHOST_PROGRESS, &PrintHostQueueDialog::on_progress, this)
     , on_error_evt(this, EVT_PRINTHOST_ERROR, &PrintHostQueueDialog::on_error, this)
     , on_cancel_evt(this, EVT_PRINTHOST_CANCEL, &PrintHostQueueDialog::on_cancel, this)
 {
-    enum { HEIGHT = 60, WIDTH = 30, SPACING = 5 };
-
     const auto em = GetTextExtent("m").x;
 
     SetSize(wxSize(HEIGHT * em, WIDTH * em));
@@ -146,12 +146,12 @@ PrintHostQueueDialog::PrintHostQueueDialog(wxWindow *parent)
 
     job_list = new wxDataViewListCtrl(this, wxID_ANY);
     // Note: Keep these in sync with Column
-    job_list->AppendTextColumn("ID", wxDATAVIEW_CELL_INERT);
-    job_list->AppendProgressColumn("Progress", wxDATAVIEW_CELL_INERT);
-    job_list->AppendTextColumn("Status", wxDATAVIEW_CELL_INERT);
-    job_list->AppendTextColumn("Host", wxDATAVIEW_CELL_INERT);
-    job_list->AppendTextColumn("Filename", wxDATAVIEW_CELL_INERT);
-    job_list->AppendTextColumn("error_message", wxDATAVIEW_CELL_INERT, -1, wxALIGN_CENTER, wxDATAVIEW_COL_HIDDEN);
+    job_list->AppendTextColumn(_(L("ID")), wxDATAVIEW_CELL_INERT);
+    job_list->AppendProgressColumn(_(L("Progress")), wxDATAVIEW_CELL_INERT);
+    job_list->AppendTextColumn(_(L("Status")), wxDATAVIEW_CELL_INERT);
+    job_list->AppendTextColumn(_(L("Host")), wxDATAVIEW_CELL_INERT);
+    job_list->AppendTextColumn(_(L("Filename")), wxDATAVIEW_CELL_INERT);
+    job_list->AppendTextColumn(_(L("Error Message")), wxDATAVIEW_CELL_INERT, -1, wxALIGN_CENTER, wxDATAVIEW_COL_HIDDEN);
 
     auto *btnsizer = new wxBoxSizer(wxHORIZONTAL);
     btn_cancel = new wxButton(this, wxID_DELETE, _(L("Cancel selected")));
@@ -202,6 +202,18 @@ void PrintHostQueueDialog::append_job(const PrintHostJob &job)
     job_list->AppendItem(fields, static_cast<wxUIntPtr>(ST_NEW));
 }
 
+void PrintHostQueueDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    const int& em = em_unit();
+
+    msw_buttons_rescale(this, em, { wxID_DELETE, wxID_CANCEL, btn_error->GetId() });
+
+    SetMinSize(wxSize(HEIGHT * em, WIDTH * em));
+
+    Fit();
+    Refresh();
+}
+
 PrintHostQueueDialog::JobState PrintHostQueueDialog::get_state(int idx)
 {
     wxCHECK_MSG(idx >= 0 && idx < job_list->GetItemCount(), ST_ERROR, "Out of bounds access to job list");
diff --git a/src/slic3r/GUI/PrintHostDialogs.hpp b/src/slic3r/GUI/PrintHostDialogs.hpp
index 105899cf0..427c4f6bf 100644
--- a/src/slic3r/GUI/PrintHostDialogs.hpp
+++ b/src/slic3r/GUI/PrintHostDialogs.hpp
@@ -41,7 +41,7 @@ private:
 };
 
 
-class PrintHostQueueDialog : public wxDialog
+class PrintHostQueueDialog : public DPIDialog
 {
 public:
     class Event : public wxEvent
@@ -62,6 +62,10 @@ public:
     PrintHostQueueDialog(wxWindow *parent);
 
     void append_job(const PrintHostJob &job);
+
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
+
 private:
     enum Column {
         COL_ID,
@@ -81,6 +85,8 @@ private:
         ST_COMPLETED,
     };
 
+    enum { HEIGHT = 60, WIDTH = 30, SPACING = 5 };
+
     wxButton *btn_cancel;
     wxButton *btn_error;
     wxDataViewListCtrl *job_list;
diff --git a/src/slic3r/GUI/ProgressStatusBar.cpp b/src/slic3r/GUI/ProgressStatusBar.cpp
index 83c5e5b24..b48c5732b 100644
--- a/src/slic3r/GUI/ProgressStatusBar.cpp
+++ b/src/slic3r/GUI/ProgressStatusBar.cpp
@@ -32,6 +32,7 @@ ProgressStatusBar::ProgressStatusBar(wxWindow *parent, int id):
     m_prog->Hide();
     m_cancelbutton->Hide();
 
+	self->SetFont(GUI::wxGetApp().normal_font());
     self->SetFieldsCount(3);
     int w[] = {-1, 150, 155};
     self->SetStatusWidths(3, w);
@@ -66,16 +67,18 @@ ProgressStatusBar::ProgressStatusBar(wxWindow *parent, int id):
 }
 
 ProgressStatusBar::~ProgressStatusBar() {
-    if(m_timer->IsRunning()) m_timer->Stop();
+    if(m_timer && m_timer->IsRunning()) m_timer->Stop();
 }
 
 int ProgressStatusBar::get_progress() const
 {
-    return m_prog->GetValue();
+    return m_prog ? m_prog->GetValue() : 0;
 }
 
 void ProgressStatusBar::set_progress(int val)
 {
+    if(!m_prog) return;
+    
     if(!m_prog->IsShown()) show_progress(true);
     if(val < 0) return;
 
@@ -90,24 +93,28 @@ void ProgressStatusBar::set_progress(int val)
 
 int ProgressStatusBar::get_range() const
 {
-    return m_prog->GetRange();
+    return m_prog ? m_prog->GetRange() : 0;
 }
 
 void ProgressStatusBar::set_range(int val)
 {
-    if(val != m_prog->GetRange()) {
+    if(m_prog && val != m_prog->GetRange()) {
         m_prog->SetRange(val);
     }
 }
 
 void ProgressStatusBar::show_progress(bool show)
 {
-    m_prog->Show(show);
-    m_prog->Pulse();
+    if(m_prog) {
+        m_prog->Show(show);
+        m_prog->Pulse();
+    }
 }
 
 void ProgressStatusBar::start_busy(int rate)
 {
+    if(!m_prog) return;
+    
     m_busy = true;
     show_progress(true);
     if (!m_timer->IsRunning()) {
@@ -117,6 +124,8 @@ void ProgressStatusBar::start_busy(int rate)
 
 void ProgressStatusBar::stop_busy()
 {
+    if(!m_timer || !m_prog) return;
+    
     m_timer->Stop();
     show_progress(false);
     m_prog->SetValue(0);
@@ -125,13 +134,15 @@ void ProgressStatusBar::stop_busy()
 
 void ProgressStatusBar::set_cancel_callback(ProgressStatusBar::CancelFn ccb) {
     m_cancel_cb = ccb;
-    if(ccb) m_cancelbutton->Show();
-    else m_cancelbutton->Hide();
+    if(m_cancelbutton) {
+        if(ccb) m_cancelbutton->Show();
+        else m_cancelbutton->Hide();
+    }
 }
 
 void ProgressStatusBar::run(int rate)
 {
-    if(!m_timer->IsRunning()) {
+    if(m_timer && !m_timer->IsRunning()) {
         m_timer->Start(rate);
     }
 }
@@ -139,12 +150,12 @@ void ProgressStatusBar::run(int rate)
 void ProgressStatusBar::embed(wxFrame *frame)
 {
     wxFrame* mf = frame ? frame : GUI::wxGetApp().mainframe;
-    mf->SetStatusBar(self);
+    if(mf) mf->SetStatusBar(self);
 }
 
 void ProgressStatusBar::set_status_text(const wxString& txt)
 {
-	self->SetStatusText(txt);
+	if(self) self->SetStatusText(txt);
 }
 
 void ProgressStatusBar::set_status_text(const std::string& txt)
@@ -159,12 +170,12 @@ void ProgressStatusBar::set_status_text(const char *txt)
 
 void ProgressStatusBar::show_cancel_button()
 {
-    m_cancelbutton->Show();
+    if(m_cancelbutton) m_cancelbutton->Show();
 }
 
 void ProgressStatusBar::hide_cancel_button()
 {
-    m_cancelbutton->Hide();
+    if(m_cancelbutton) m_cancelbutton->Hide();
 }
 
 }
diff --git a/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp
index 41e5cdfe7..dbd6bfad6 100644
--- a/src/slic3r/GUI/RammingChart.cpp
+++ b/src/slic3r/GUI/RammingChart.cpp
@@ -78,7 +78,7 @@ void Chart::draw() {
     int text_height = 0;
     dc.GetTextExtent(label,&text_width,&text_height);
     dc.DrawText(label,wxPoint(0.5*(m_rect.GetRight()+m_rect.GetLeft())-text_width/2.f, m_rect.GetBottom()+0.5*legend_side));
-    label = _(L("Volumetric speed")) + " (" + _(L("mm")) + wxString("³/", wxConvUTF8) + _(L("s")) + ")";
+    label = _(L("Volumetric speed")) + " (" + _(L("mm³/s")) + ")";
     dc.GetTextExtent(label,&text_width,&text_height);
     dc.DrawRotatedText(label,wxPoint(0,0.5*(m_rect.GetBottom()+m_rect.GetTop())+text_width/2.f),90);
 }
@@ -141,6 +141,9 @@ void Chart::mouse_double_clicked(wxMouseEvent& event) {
 
 
 void Chart::recalculate_line() {
+    m_line_to_draw.clear();
+    m_total_volume = 0.f;
+
     std::vector<wxPoint> points;
     for (auto& but : m_buttons) {
         points.push_back(wxPoint(math_to_screen(but.get_pos())));
@@ -150,92 +153,88 @@ void Chart::recalculate_line() {
             break;
         }
     }
-    std::sort(points.begin(),points.end(),[](wxPoint& a,wxPoint& b) { return a.x < b.x; });
-    
-    m_line_to_draw.clear();
-    m_total_volume = 0.f;
-   
-   
-    // Cubic spline interpolation: see https://en.wikiversity.org/wiki/Cubic_Spline_Interpolation#Methods
-    const bool boundary_first_derivative = true; // true - first derivative is 0 at the leftmost and rightmost point
-                                                 // false - second ---- || -------
-    const int N = points.size()-1; // last point can be accessed as N, we have N+1 total points
-    std::vector<float> diag(N+1);
-    std::vector<float> mu(N+1);
-    std::vector<float> lambda(N+1);
-    std::vector<float> h(N+1);
-    std::vector<float> rhs(N+1);
-    
-    // let's fill in inner equations
-    for (int i=1;i<=N;++i) h[i] = points[i].x-points[i-1].x;
-    std::fill(diag.begin(),diag.end(),2.f);
-    for (int i=1;i<=N-1;++i) {
-        mu[i] = h[i]/(h[i]+h[i+1]);
-        lambda[i] = 1.f - mu[i];
-        rhs[i] = 6 * ( float(points[i+1].y-points[i].y  )/(h[i+1]*(points[i+1].x-points[i-1].x)) -  
-                       float(points[i].y  -points[i-1].y)/(h[i]  *(points[i+1].x-points[i-1].x))   );                       
-    }
-    
-    // now fill in the first and last equations, according to boundary conditions:
-    if (boundary_first_derivative) {
-        const float endpoints_derivative = 0;
-        lambda[0] = 1;
-        mu[N]     = 1;
-        rhs[0] = (6.f/h[1]) * (float(points[0].y-points[1].y)/(points[0].x-points[1].x) - endpoints_derivative);
-        rhs[N] = (6.f/h[N]) * (endpoints_derivative - float(points[N-1].y-points[N].y)/(points[N-1].x-points[N].x));        
-    }
-    else {
-        lambda[0] = 0;
-        mu[N]     = 0;
-        rhs[0]    = 0;
-        rhs[N]    = 0;
-    }
+
+    // The calculation wouldn't work in case the ramming is to be turned off completely.
+    if (points.size()>1) {
+        std::sort(points.begin(),points.end(),[](wxPoint& a,wxPoint& b) { return a.x < b.x; });
+
+        // Cubic spline interpolation: see https://en.wikiversity.org/wiki/Cubic_Spline_Interpolation#Methods
+        const bool boundary_first_derivative = true; // true - first derivative is 0 at the leftmost and rightmost point
+                                                     // false - second ---- || -------
+        const int N = points.size()-1; // last point can be accessed as N, we have N+1 total points
+        std::vector<float> diag(N+1);
+        std::vector<float> mu(N+1);
+        std::vector<float> lambda(N+1);
+        std::vector<float> h(N+1);
+        std::vector<float> rhs(N+1);
         
-    // the trilinear system is ready to be solved:
-    for (int i=1;i<=N;++i) {
-        float multiple = mu[i]/diag[i-1];    // let's subtract proper multiple of above equation
-        diag[i]-= multiple * lambda[i-1];
-        rhs[i] -= multiple * rhs[i-1];        
-    }
-    // now the back substitution (vector mu contains invalid values from now on):
-    rhs[N] = rhs[N]/diag[N];
-    for (int i=N-1;i>=0;--i)
-        rhs[i] = (rhs[i]-lambda[i]*rhs[i+1])/diag[i];
-    
-    
-    
-    
-    unsigned int i=1;
-    float y=0.f;
-    for (int x=m_rect.GetLeft(); x<=m_rect.GetRight() ; ++x) {        
-        if (splines) {
-            if (i<points.size()-1 && points[i].x < x ) {
-                ++i; 
+        // let's fill in inner equations
+        for (int i=1;i<=N;++i) h[i] = points[i].x-points[i-1].x;
+        std::fill(diag.begin(),diag.end(),2.f);
+        for (int i=1;i<=N-1;++i) {
+            mu[i] = h[i]/(h[i]+h[i+1]);
+            lambda[i] = 1.f - mu[i];
+            rhs[i] = 6 * ( float(points[i+1].y-points[i].y  )/(h[i+1]*(points[i+1].x-points[i-1].x)) -
+                           float(points[i].y  -points[i-1].y)/(h[i]  *(points[i+1].x-points[i-1].x))   );
+        }
+
+        // now fill in the first and last equations, according to boundary conditions:
+        if (boundary_first_derivative) {
+            const float endpoints_derivative = 0;
+            lambda[0] = 1;
+            mu[N]     = 1;
+            rhs[0] = (6.f/h[1]) * (float(points[0].y-points[1].y)/(points[0].x-points[1].x) - endpoints_derivative);
+            rhs[N] = (6.f/h[N]) * (endpoints_derivative - float(points[N-1].y-points[N].y)/(points[N-1].x-points[N].x));
+        }
+        else {
+            lambda[0] = 0;
+            mu[N]     = 0;
+            rhs[0]    = 0;
+            rhs[N]    = 0;
+        }
+
+        // the trilinear system is ready to be solved:
+        for (int i=1;i<=N;++i) {
+            float multiple = mu[i]/diag[i-1];    // let's subtract proper multiple of above equation
+            diag[i]-= multiple * lambda[i-1];
+            rhs[i] -= multiple * rhs[i-1];
+        }
+        // now the back substitution (vector mu contains invalid values from now on):
+        rhs[N] = rhs[N]/diag[N];
+        for (int i=N-1;i>=0;--i)
+            rhs[i] = (rhs[i]-lambda[i]*rhs[i+1])/diag[i];
+
+        unsigned int i=1;
+        float y=0.f;
+        for (int x=m_rect.GetLeft(); x<=m_rect.GetRight() ; ++x) {
+            if (splines) {
+                if (i<points.size()-1 && points[i].x < x ) {
+                    ++i;
+                }
+                if (points[0].x > x)
+                    y = points[0].y;
+                else
+                    if (points[N].x < x)
+                        y = points[N].y;
+                    else
+                        y = (rhs[i-1]*pow(points[i].x-x,3)+rhs[i]*pow(x-points[i-1].x,3)) / (6*h[i]) +
+                            (points[i-1].y-rhs[i-1]*h[i]*h[i]/6.f) * (points[i].x-x)/h[i] +
+                            (points[i].y  -rhs[i]  *h[i]*h[i]/6.f) * (x-points[i-1].x)/h[i];
+                m_line_to_draw.push_back(y);
             }
-            if (points[0].x > x)
-                y = points[0].y;
-            else
-                if (points[N].x < x)
-                    y = points[N].y;
-                else 
-                    y = (rhs[i-1]*pow(points[i].x-x,3)+rhs[i]*pow(x-points[i-1].x,3)) / (6*h[i]) +
-                        (points[i-1].y-rhs[i-1]*h[i]*h[i]/6.f) * (points[i].x-x)/h[i] +
-                        (points[i].y  -rhs[i]  *h[i]*h[i]/6.f) * (x-points[i-1].x)/h[i];
-            m_line_to_draw.push_back(y);
+            else {
+                float x_math = screen_to_math(wxPoint(x,0)).m_x;
+                if (i+2<=points.size() && m_buttons[i+1].get_pos().m_x-0.125 < x_math)
+                    ++i;
+                m_line_to_draw.push_back(math_to_screen(wxPoint2DDouble(x_math,m_buttons[i].get_pos().m_y)).y);
+            }
+
+            m_line_to_draw.back() = std::max(m_line_to_draw.back(), m_rect.GetTop()-1);
+            m_line_to_draw.back() = std::min(m_line_to_draw.back(), m_rect.GetBottom()-1);
+            m_total_volume += (m_rect.GetBottom() - m_line_to_draw.back()) * (visible_area.m_width / m_rect.GetWidth()) * (visible_area.m_height / m_rect.GetHeight());
         }
-        else {            
-            float x_math = screen_to_math(wxPoint(x,0)).m_x;
-            if (i+2<=points.size() && m_buttons[i+1].get_pos().m_x-0.125 < x_math)
-                ++i;
-            m_line_to_draw.push_back(math_to_screen(wxPoint2DDouble(x_math,m_buttons[i].get_pos().m_y)).y);
-        }
-            
-                    
-        m_line_to_draw.back() = std::max(m_line_to_draw.back(), m_rect.GetTop()-1);
-        m_line_to_draw.back() = std::min(m_line_to_draw.back(), m_rect.GetBottom()-1);
-        m_total_volume += (m_rect.GetBottom() - m_line_to_draw.back()) * (visible_area.m_width / m_rect.GetWidth()) * (visible_area.m_height / m_rect.GetHeight());
     }
-    
+
     wxPostEvent(this->GetParent(), wxCommandEvent(EVT_WIPE_TOWER_CHART_CHANGED));
     Refresh();
 }
diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp
index e5d221a5f..77890f9e7 100644
--- a/src/slic3r/GUI/Selection.cpp
+++ b/src/slic3r/GUI/Selection.cpp
@@ -6,6 +6,7 @@
 #include "GUI_ObjectManipulation.hpp"
 #include "GUI_ObjectList.hpp"
 #include "Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/3DScene.hpp"
 
 #include <GL/glew.h>
 
@@ -49,13 +50,14 @@ Selection::VolumeCache::VolumeCache(const Geometry::Transformation& volume_trans
 Selection::Selection()
     : m_volumes(nullptr)
     , m_model(nullptr)
+    , m_enabled(false)
     , m_mode(Instance)
     , m_type(Empty)
     , m_valid(false)
-    , m_bounding_box_dirty(true)
     , m_curved_arrow(16)
     , m_scale_factor(1.0f)
 {
+    this->set_bounding_boxes_dirty();
 #if ENABLE_RENDER_SELECTION_CENTER
     m_quadric = ::gluNewQuadric();
     if (m_quadric != nullptr)
@@ -74,7 +76,7 @@ Selection::~Selection()
 void Selection::set_volumes(GLVolumePtrs* volumes)
 {
     m_volumes = volumes;
-    _update_valid();
+    update_valid();
 }
 
 bool Selection::init(bool useVBOs)
@@ -94,10 +96,10 @@ bool Selection::init(bool useVBOs)
 void Selection::set_model(Model* model)
 {
     m_model = model;
-    _update_valid();
+    update_valid();
 }
 
-void Selection::add(unsigned int volume_idx, bool as_single_selection)
+void Selection::add(unsigned int volume_idx, bool as_single_selection, bool check_for_already_contained)
 {
     if (!m_valid || ((unsigned int)m_volumes->size() <= volume_idx))
         return;
@@ -107,40 +109,46 @@ void Selection::add(unsigned int volume_idx, bool as_single_selection)
     if (is_wipe_tower() && volume->is_wipe_tower)
         return;
 
+    bool keep_instance_mode = (m_mode == Instance) && !as_single_selection;
+    bool already_contained = check_for_already_contained && contains_volume(volume_idx);
+
     // resets the current list if needed
-    bool needs_reset = as_single_selection;
+    bool needs_reset = as_single_selection && !already_contained;
     needs_reset |= volume->is_wipe_tower;
     needs_reset |= is_wipe_tower() && !volume->is_wipe_tower;
-    needs_reset |= !is_modifier() && volume->is_modifier;
-    needs_reset |= is_modifier() && !volume->is_modifier;
+    needs_reset |= as_single_selection && !is_any_modifier() && volume->is_modifier;
+    needs_reset |= is_any_modifier() && !volume->is_modifier;
 
     if (needs_reset)
         clear();
 
-    if (volume->is_modifier)
-        m_mode = Volume;
-    else if (!contains_volume(volume_idx))
-        m_mode = Instance;
-    // else -> keep current mode
+    if (!already_contained || needs_reset)
+    {
+        if (!keep_instance_mode)
+            m_mode = volume->is_modifier ? Volume : Instance;
+    }
+    else
+      // keep current mode
+      return;
 
     switch (m_mode)
     {
     case Volume:
     {
-        if (volume->volume_idx() >= 0 && (is_empty() || (volume->instance_idx() == get_instance_idx())))
-            _add_volume(volume_idx);
+        if ((volume->volume_idx() >= 0) && (is_empty() || (volume->instance_idx() == get_instance_idx())))
+            do_add_volume(volume_idx);
 
         break;
     }
     case Instance:
     {
-        _add_instance(volume->object_idx(), volume->instance_idx());
+        do_add_instance(volume->object_idx(), volume->instance_idx());
         break;
     }
     }
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::remove(unsigned int volume_idx)
@@ -154,18 +162,18 @@ void Selection::remove(unsigned int volume_idx)
     {
     case Volume:
     {
-        _remove_volume(volume_idx);
+        do_remove_volume(volume_idx);
         break;
     }
     case Instance:
     {
-        _remove_instance(volume->object_idx(), volume->instance_idx());
+        do_remove_instance(volume->object_idx(), volume->instance_idx());
         break;
     }
     }
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::add_object(unsigned int object_idx, bool as_single_selection)
@@ -179,10 +187,10 @@ void Selection::add_object(unsigned int object_idx, bool as_single_selection)
 
     m_mode = Instance;
 
-    _add_object(object_idx);
+    do_add_object(object_idx);
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::remove_object(unsigned int object_idx)
@@ -190,10 +198,10 @@ void Selection::remove_object(unsigned int object_idx)
     if (!m_valid)
         return;
 
-    _remove_object(object_idx);
+    do_remove_object(object_idx);
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::add_instance(unsigned int object_idx, unsigned int instance_idx, bool as_single_selection)
@@ -207,10 +215,10 @@ void Selection::add_instance(unsigned int object_idx, unsigned int instance_idx,
 
     m_mode = Instance;
 
-    _add_instance(object_idx, instance_idx);
+    do_add_instance(object_idx, instance_idx);
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::remove_instance(unsigned int object_idx, unsigned int instance_idx)
@@ -218,10 +226,10 @@ void Selection::remove_instance(unsigned int object_idx, unsigned int instance_i
     if (!m_valid)
         return;
 
-    _remove_instance(object_idx, instance_idx);
+    do_remove_instance(object_idx, instance_idx);
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::add_volume(unsigned int object_idx, unsigned int volume_idx, int instance_idx, bool as_single_selection)
@@ -241,12 +249,12 @@ void Selection::add_volume(unsigned int object_idx, unsigned int volume_idx, int
         if ((v->object_idx() == object_idx) && (v->volume_idx() == volume_idx))
         {
             if ((instance_idx != -1) && (v->instance_idx() == instance_idx))
-                _add_volume(i);
+                do_add_volume(i);
         }
     }
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::remove_volume(unsigned int object_idx, unsigned int volume_idx)
@@ -258,11 +266,11 @@ void Selection::remove_volume(unsigned int object_idx, unsigned int volume_idx)
     {
         GLVolume* v = (*m_volumes)[i];
         if ((v->object_idx() == object_idx) && (v->volume_idx() == volume_idx))
-            _remove_volume(i);
+            do_remove_volume(i);
     }
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::add_all()
@@ -276,11 +284,11 @@ void Selection::add_all()
     for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i)
     {
         if (!(*m_volumes)[i]->is_wipe_tower)
-            _add_volume(i);
+            do_add_volume(i);
     }
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::clear()
@@ -295,52 +303,45 @@ void Selection::clear()
 
     m_list.clear();
 
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 
     // resets the cache in the sidebar
     wxGetApp().obj_manipul()->reset_cache();
 }
 
+// Update the selection based on the new instance IDs.
+void Selection::instances_changed(const std::vector<size_t> &instance_ids_selected)
+{
+    assert(m_valid);
+    assert(m_mode == Instance);
+    m_list.clear();
+    for (unsigned int volume_idx = 0; volume_idx < (unsigned int)m_volumes->size(); ++ volume_idx) {
+        const GLVolume *volume = (*m_volumes)[volume_idx];
+        auto it = std::lower_bound(instance_ids_selected.begin(), instance_ids_selected.end(), volume->geometry_id.second);
+		if (it != instance_ids_selected.end() && *it == volume->geometry_id.second)
+            this->do_add_volume(volume_idx);
+    }
+    update_type();
+    this->set_bounding_boxes_dirty();
+}
+
 // Update the selection based on the map from old indices to new indices after m_volumes changed.
 // If the current selection is by instance, this call may select newly added volumes, if they belong to already selected instances.
 void Selection::volumes_changed(const std::vector<size_t> &map_volume_old_to_new)
 {
     assert(m_valid);
-
-    // 1) Update the selection set.
+    assert(m_mode == Volume);
     IndicesList list_new;
-    std::vector<std::pair<unsigned int, unsigned int>> model_instances;
-    for (unsigned int idx : m_list) {
+    for (unsigned int idx : m_list)
         if (map_volume_old_to_new[idx] != size_t(-1)) {
             unsigned int new_idx = (unsigned int)map_volume_old_to_new[idx];
+            assert((*m_volumes)[new_idx]->selected);
             list_new.insert(new_idx);
-            if (m_mode == Instance) {
-                // Save the object_idx / instance_idx pair of selected old volumes,
-                // so we may add the newly added volumes of the same object_idx / instance_idx pair
-                // to the selection.
-                const GLVolume *volume = (*m_volumes)[new_idx];
-                model_instances.emplace_back(volume->object_idx(), volume->instance_idx());
-            }
         }
-    }
     m_list = std::move(list_new);
-
-    if (!model_instances.empty()) {
-        // Instance selection mode. Add the newly added volumes of the same object_idx / instance_idx pair
-        // to the selection.
-        assert(m_mode == Instance);
-        sort_remove_duplicates(model_instances);
-        for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i) {
-            const GLVolume* volume = (*m_volumes)[i];
-            for (const std::pair<int, int> &model_instance : model_instances)
-                if (volume->object_idx() == model_instance.first && volume->instance_idx() == model_instance.second)
-                    this->_add_volume(i);
-        }
-    }
-
-    _update_type();
-    m_bounding_box_dirty = true;
+    update_type();
+    this->set_bounding_boxes_dirty();
 }
 
 bool Selection::is_single_full_instance() const
@@ -420,17 +421,31 @@ const GLVolume* Selection::get_volume(unsigned int volume_idx) const
 const BoundingBoxf3& Selection::get_bounding_box() const
 {
     if (m_bounding_box_dirty)
-        _calc_bounding_box();
+        calc_bounding_box();
 
     return m_bounding_box;
 }
 
+const BoundingBoxf3& Selection::get_unscaled_instance_bounding_box() const
+{
+    if (m_unscaled_instance_bounding_box_dirty)
+        calc_unscaled_instance_bounding_box();
+    return m_unscaled_instance_bounding_box;
+}
+
+const BoundingBoxf3& Selection::get_scaled_instance_bounding_box() const
+{
+    if (m_scaled_instance_bounding_box_dirty)
+        calc_scaled_instance_bounding_box();
+    return m_scaled_instance_bounding_box;
+}
+
 void Selection::start_dragging()
 {
     if (!m_valid)
         return;
 
-    _set_caches();
+    set_caches();
 }
 
 void Selection::translate(const Vec3d& displacement, bool local)
@@ -438,6 +453,8 @@ void Selection::translate(const Vec3d& displacement, bool local)
     if (!m_valid)
         return;
 
+    EMode translation_type = m_mode;
+
     for (unsigned int i : m_list)
     {
         if ((m_mode == Volume) || (*m_volumes)[i]->is_wipe_tower)
@@ -451,41 +468,26 @@ void Selection::translate(const Vec3d& displacement, bool local)
             }
         }
         else if (m_mode == Instance)
-            (*m_volumes)[i]->set_instance_offset(m_cache.volumes_data[i].get_instance_position() + displacement);
+        {
+            if (is_from_fully_selected_instance(i))
+                (*m_volumes)[i]->set_instance_offset(m_cache.volumes_data[i].get_instance_position() + displacement);
+            else
+            {
+                Vec3d local_displacement = (m_cache.volumes_data[i].get_instance_rotation_matrix() * m_cache.volumes_data[i].get_instance_scale_matrix() * m_cache.volumes_data[i].get_instance_mirror_matrix()).inverse() * displacement;
+                (*m_volumes)[i]->set_volume_offset(m_cache.volumes_data[i].get_volume_position() + local_displacement);
+                translation_type = Volume;
+            }
+        }
     }
 
 #if !DISABLE_INSTANCES_SYNCH
-    if (m_mode == Instance)
-        _synchronize_unselected_instances(SYNC_ROTATION_NONE);
-    else if (m_mode == Volume)
-        _synchronize_unselected_volumes();
+    if (translation_type == Instance)
+        synchronize_unselected_instances(SYNC_ROTATION_NONE);
+    else if (translation_type == Volume)
+        synchronize_unselected_volumes();
 #endif // !DISABLE_INSTANCES_SYNCH
 
-    m_bounding_box_dirty = true;
-}
-
-static Eigen::Quaterniond rotation_xyz_diff(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to)
-{
-    return
-        // From the current coordinate system to world.
-        Eigen::AngleAxisd(rot_xyz_to(2), Vec3d::UnitZ()) * Eigen::AngleAxisd(rot_xyz_to(1), Vec3d::UnitY()) * Eigen::AngleAxisd(rot_xyz_to(0), Vec3d::UnitX()) *
-        // From world to the initial coordinate system.
-        Eigen::AngleAxisd(-rot_xyz_from(0), Vec3d::UnitX()) * Eigen::AngleAxisd(-rot_xyz_from(1), Vec3d::UnitY()) * Eigen::AngleAxisd(-rot_xyz_from(2), Vec3d::UnitZ());
-}
-
-// This should only be called if it is known, that the two rotations only differ in rotation around the Z axis.
-static double rotation_diff_z(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to)
-{
-    Eigen::AngleAxisd angle_axis(rotation_xyz_diff(rot_xyz_from, rot_xyz_to));
-    Vec3d  axis = angle_axis.axis();
-    double angle = angle_axis.angle();
-#ifndef NDEBUG
-    if (std::abs(angle) > 1e-8) {
-        assert(std::abs(axis.x()) < 1e-8);
-        assert(std::abs(axis.y()) < 1e-8);
-    }
-#endif /* NDEBUG */
-    return (axis.z() < 0) ? -angle : angle;
+    this->set_bounding_boxes_dirty();
 }
 
 // Rotate an object around one of the axes. Only one rotation component is expected to be changing.
@@ -497,102 +499,117 @@ void Selection::rotate(const Vec3d& rotation, TransformationType transformation_
     // Only relative rotation values are allowed in the world coordinate system.
     assert(!transformation_type.world() || transformation_type.relative());
 
-    int rot_axis_max = 0;
-    if (rotation.isApprox(Vec3d::Zero()))
-    {
-        for (unsigned int i : m_list)
+    if (!is_wipe_tower()) {
+        int rot_axis_max = 0;
+        if (rotation.isApprox(Vec3d::Zero()))
         {
-            GLVolume &volume = *(*m_volumes)[i];
-            if (m_mode == Instance)
-            {
-                volume.set_instance_rotation(m_cache.volumes_data[i].get_instance_rotation());
-                volume.set_instance_offset(m_cache.volumes_data[i].get_instance_position());
-            }
-            else if (m_mode == Volume)
-            {
-                volume.set_volume_rotation(m_cache.volumes_data[i].get_volume_rotation());
-                volume.set_volume_offset(m_cache.volumes_data[i].get_volume_position());
-            }
-        }
-    }
-    else
-    {
-        //FIXME this does not work for absolute rotations (transformation_type.absolute() is true)
-        rotation.cwiseAbs().maxCoeff(&rot_axis_max);
-
-        // For generic rotation, we want to rotate the first volume in selection, and then to synchronize the other volumes with it.
-        std::vector<int> object_instance_first(m_model->objects.size(), -1);
-        auto rotate_instance = [this, &rotation, &object_instance_first, rot_axis_max, transformation_type](GLVolume &volume, int i) {
-            int first_volume_idx = object_instance_first[volume.object_idx()];
-            if (rot_axis_max != 2 && first_volume_idx != -1) {
-                // Generic rotation, but no rotation around the Z axis.
-                // Always do a local rotation (do not consider the selection to be a rigid body).
-                assert(is_approx(rotation.z(), 0.0));
-                const GLVolume &first_volume = *(*m_volumes)[first_volume_idx];
-                const Vec3d    &rotation = first_volume.get_instance_rotation();
-                double z_diff = rotation_diff_z(m_cache.volumes_data[first_volume_idx].get_instance_rotation(), m_cache.volumes_data[i].get_instance_rotation());
-                volume.set_instance_rotation(Vec3d(rotation(0), rotation(1), rotation(2) + z_diff));
-            }
-            else {
-                // extracts rotations from the composed transformation
-                Vec3d new_rotation = transformation_type.world() ?
-                    Geometry::extract_euler_angles(Geometry::assemble_transform(Vec3d::Zero(), rotation) * m_cache.volumes_data[i].get_instance_rotation_matrix()) :
-                    transformation_type.absolute() ? rotation : rotation + m_cache.volumes_data[i].get_instance_rotation();
-                if (rot_axis_max == 2 && transformation_type.joint()) {
-                    // Only allow rotation of multiple instances as a single rigid body when rotating around the Z axis.
-                    Vec3d offset = Geometry::assemble_transform(Vec3d::Zero(), Vec3d(0.0, 0.0, new_rotation(2) - m_cache.volumes_data[i].get_instance_rotation()(2))) * (m_cache.volumes_data[i].get_instance_position() - m_cache.dragging_center);
-                    volume.set_instance_offset(m_cache.dragging_center + offset);
-                }
-                volume.set_instance_rotation(new_rotation);
-                object_instance_first[volume.object_idx()] = i;
-            }
-        };
-
-        for (unsigned int i : m_list)
-        {
-            GLVolume &volume = *(*m_volumes)[i];
-            if (is_single_full_instance())
-                rotate_instance(volume, i);
-            else if (is_single_volume() || is_single_modifier())
-            {
-                if (transformation_type.independent())
-                    volume.set_volume_rotation(volume.get_volume_rotation() + rotation);
-                else
-                {
-                    Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), rotation);
-                    Vec3d new_rotation = Geometry::extract_euler_angles(m * m_cache.volumes_data[i].get_volume_rotation_matrix());
-                    volume.set_volume_rotation(new_rotation);
-                }
-            }
-            else
+            for (unsigned int i : m_list)
             {
+                GLVolume &volume = *(*m_volumes)[i];
                 if (m_mode == Instance)
-                    rotate_instance(volume, i);
+                {
+                    volume.set_instance_rotation(m_cache.volumes_data[i].get_instance_rotation());
+                    volume.set_instance_offset(m_cache.volumes_data[i].get_instance_position());
+                }
                 else if (m_mode == Volume)
                 {
-                    // extracts rotations from the composed transformation
-                    Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), rotation);
-                    Vec3d new_rotation = Geometry::extract_euler_angles(m * m_cache.volumes_data[i].get_volume_rotation_matrix());
-                    if (transformation_type.joint())
-                    {
-                        Vec3d local_pivot = m_cache.volumes_data[i].get_instance_full_matrix().inverse() * m_cache.dragging_center;
-                        Vec3d offset = m * (m_cache.volumes_data[i].get_volume_position() - local_pivot);
-                        volume.set_volume_offset(local_pivot + offset);
-                    }
-                    volume.set_volume_rotation(new_rotation);
+                    volume.set_volume_rotation(m_cache.volumes_data[i].get_volume_rotation());
+                    volume.set_volume_offset(m_cache.volumes_data[i].get_volume_position());
                 }
             }
         }
+        else { // this is not the wipe tower
+            //FIXME this does not work for absolute rotations (transformation_type.absolute() is true)
+            rotation.cwiseAbs().maxCoeff(&rot_axis_max);
+
+//            if ( single instance or single volume )
+                // Rotate around center , if only a single object or volume
+//                transformation_type.set_independent();
+
+            // For generic rotation, we want to rotate the first volume in selection, and then to synchronize the other volumes with it.
+            std::vector<int> object_instance_first(m_model->objects.size(), -1);
+            auto rotate_instance = [this, &rotation, &object_instance_first, rot_axis_max, transformation_type](GLVolume &volume, int i) {
+                int first_volume_idx = object_instance_first[volume.object_idx()];
+                if (rot_axis_max != 2 && first_volume_idx != -1) {
+                    // Generic rotation, but no rotation around the Z axis.
+                    // Always do a local rotation (do not consider the selection to be a rigid body).
+                    assert(is_approx(rotation.z(), 0.0));
+                    const GLVolume &first_volume = *(*m_volumes)[first_volume_idx];
+                    const Vec3d    &rotation = first_volume.get_instance_rotation();
+                    double z_diff = Geometry::rotation_diff_z(m_cache.volumes_data[first_volume_idx].get_instance_rotation(), m_cache.volumes_data[i].get_instance_rotation());
+                    volume.set_instance_rotation(Vec3d(rotation(0), rotation(1), rotation(2) + z_diff));
+                }
+                else {
+                    // extracts rotations from the composed transformation
+                    Vec3d new_rotation = transformation_type.world() ?
+                        Geometry::extract_euler_angles(Geometry::assemble_transform(Vec3d::Zero(), rotation) * m_cache.volumes_data[i].get_instance_rotation_matrix()) :
+                        transformation_type.absolute() ? rotation : rotation + m_cache.volumes_data[i].get_instance_rotation();
+                    if (rot_axis_max == 2 && transformation_type.joint()) {
+                        // Only allow rotation of multiple instances as a single rigid body when rotating around the Z axis.
+						double z_diff = Geometry::rotation_diff_z(m_cache.volumes_data[i].get_instance_rotation(), new_rotation);
+                        volume.set_instance_offset(m_cache.dragging_center + Eigen::AngleAxisd(z_diff, Vec3d::UnitZ()) * (m_cache.volumes_data[i].get_instance_position() - m_cache.dragging_center));
+                    }
+                    volume.set_instance_rotation(new_rotation);
+                    object_instance_first[volume.object_idx()] = i;
+                }
+            };
+
+            for (unsigned int i : m_list)
+            {
+                GLVolume &volume = *(*m_volumes)[i];
+                if (is_single_full_instance())
+                    rotate_instance(volume, i);
+                else if (is_single_volume() || is_single_modifier())
+                {
+                    if (transformation_type.independent())
+                        volume.set_volume_rotation(volume.get_volume_rotation() + rotation);
+                    else
+                    {
+                        Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), rotation);
+                        Vec3d new_rotation = Geometry::extract_euler_angles(m * m_cache.volumes_data[i].get_volume_rotation_matrix());
+                        volume.set_volume_rotation(new_rotation);
+                    }
+                }
+                else
+                {
+                    if (m_mode == Instance)
+                        rotate_instance(volume, i);
+                    else if (m_mode == Volume)
+                    {
+                        // extracts rotations from the composed transformation
+                        Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), rotation);
+                        Vec3d new_rotation = Geometry::extract_euler_angles(m * m_cache.volumes_data[i].get_volume_rotation_matrix());
+                        if (transformation_type.joint())
+                        {
+                            Vec3d local_pivot = m_cache.volumes_data[i].get_instance_full_matrix().inverse() * m_cache.dragging_center;
+                            Vec3d offset = m * (m_cache.volumes_data[i].get_volume_position() - local_pivot);
+                            volume.set_volume_offset(local_pivot + offset);
+                        }
+                        volume.set_volume_rotation(new_rotation);
+                    }
+                }
+            }
+        }
+
+    #if !DISABLE_INSTANCES_SYNCH
+        if (m_mode == Instance)
+            synchronize_unselected_instances((rot_axis_max == 2) ? SYNC_ROTATION_NONE : SYNC_ROTATION_GENERAL);
+        else if (m_mode == Volume)
+            synchronize_unselected_volumes();
+    #endif // !DISABLE_INSTANCES_SYNCH
+    }
+    else { // it's the wipe tower that's selected and being rotated
+        GLVolume& volume = *((*m_volumes)[*m_list.begin()]); // the wipe tower is always alone in the selection
+
+        // make sure the wipe tower rotates around its center, not origin
+        // we can assume that only Z rotation changes
+        Vec3d center_local = volume.transformed_bounding_box().center() - volume.get_volume_offset();
+        Vec3d center_local_new = Eigen::AngleAxisd(rotation(2)-volume.get_volume_rotation()(2), Vec3d(0, 0, 1)) * center_local;
+        volume.set_volume_rotation(rotation);
+        volume.set_volume_offset(volume.get_volume_offset() + center_local - center_local_new);
     }
 
-#if !DISABLE_INSTANCES_SYNCH
-    if (m_mode == Instance)
-        _synchronize_unselected_instances((rot_axis_max == 2) ? SYNC_ROTATION_NONE : SYNC_ROTATION_GENERAL);
-    else if (m_mode == Volume)
-        _synchronize_unselected_volumes();
-#endif // !DISABLE_INSTANCES_SYNCH
-
-    m_bounding_box_dirty = true;
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::flattening_rotate(const Vec3d& normal)
@@ -630,23 +647,32 @@ void Selection::flattening_rotate(const Vec3d& normal)
     // we want to synchronize z-rotation as well, otherwise the flattening behaves funny
     // when applied on one of several identical instances
     if (m_mode == Instance)
-        _synchronize_unselected_instances(SYNC_ROTATION_FULL);
+        synchronize_unselected_instances(SYNC_ROTATION_FULL);
 #endif // !DISABLE_INSTANCES_SYNCH
 
-    m_bounding_box_dirty = true;
+    this->set_bounding_boxes_dirty();
 }
 
-void Selection::scale(const Vec3d& scale, bool local)
+void Selection::scale(const Vec3d& scale, TransformationType transformation_type)
 {
     if (!m_valid)
         return;
 
     for (unsigned int i : m_list)
     {
-        if (is_single_full_instance())
-            (*m_volumes)[i]->set_instance_scaling_factor(scale);
+        GLVolume &volume = *(*m_volumes)[i];
+        if (is_single_full_instance()) {
+            assert(transformation_type.absolute());
+			if (transformation_type.world() && (std::abs(scale.x() - scale.y()) > EPSILON || std::abs(scale.x() - scale.z()) > EPSILON)) {
+                // Non-uniform scaling. Transform the scaling factors into the local coordinate system.
+                // This is only possible, if the instance rotation is mulitples of ninety degrees.
+                assert(Geometry::is_rotation_ninety_degrees(volume.get_instance_rotation()));
+				volume.set_instance_scaling_factor((volume.get_instance_transformation().get_matrix(true, false, true, true).matrix().block<3, 3>(0, 0).transpose() * scale).cwiseAbs());
+            } else
+				volume.set_instance_scaling_factor(scale);
+        }
         else if (is_single_volume() || is_single_modifier())
-            (*m_volumes)[i]->set_volume_scaling_factor(scale);
+            volume.set_volume_scaling_factor(scale);
         else
         {
             Transform3d m = Geometry::assemble_transform(Vec3d::Zero(), Vec3d::Zero(), scale);
@@ -655,36 +681,36 @@ void Selection::scale(const Vec3d& scale, bool local)
                 Eigen::Matrix<double, 3, 3, Eigen::DontAlign> new_matrix = (m * m_cache.volumes_data[i].get_instance_scale_matrix()).matrix().block(0, 0, 3, 3);
                 // extracts scaling factors from the composed transformation
                 Vec3d new_scale(new_matrix.col(0).norm(), new_matrix.col(1).norm(), new_matrix.col(2).norm());
-                if (!local)
-                    (*m_volumes)[i]->set_instance_offset(m_cache.dragging_center + m * (m_cache.volumes_data[i].get_instance_position() - m_cache.dragging_center));
+                if (transformation_type.joint())
+                    volume.set_instance_offset(m_cache.dragging_center + m * (m_cache.volumes_data[i].get_instance_position() - m_cache.dragging_center));
 
-                (*m_volumes)[i]->set_instance_scaling_factor(new_scale);
+                volume.set_instance_scaling_factor(new_scale);
             }
             else if (m_mode == Volume)
             {
                 Eigen::Matrix<double, 3, 3, Eigen::DontAlign> new_matrix = (m * m_cache.volumes_data[i].get_volume_scale_matrix()).matrix().block(0, 0, 3, 3);
                 // extracts scaling factors from the composed transformation
                 Vec3d new_scale(new_matrix.col(0).norm(), new_matrix.col(1).norm(), new_matrix.col(2).norm());
-                if (!local)
+                if (transformation_type.joint())
                 {
                     Vec3d offset = m * (m_cache.volumes_data[i].get_volume_position() + m_cache.volumes_data[i].get_instance_position() - m_cache.dragging_center);
-                    (*m_volumes)[i]->set_volume_offset(m_cache.dragging_center - m_cache.volumes_data[i].get_instance_position() + offset);
+                    volume.set_volume_offset(m_cache.dragging_center - m_cache.volumes_data[i].get_instance_position() + offset);
                 }
-                (*m_volumes)[i]->set_volume_scaling_factor(new_scale);
+                volume.set_volume_scaling_factor(new_scale);
             }
         }
     }
 
 #if !DISABLE_INSTANCES_SYNCH
     if (m_mode == Instance)
-        _synchronize_unselected_instances(SYNC_ROTATION_NONE);
+        synchronize_unselected_instances(SYNC_ROTATION_NONE);
     else if (m_mode == Volume)
-        _synchronize_unselected_volumes();
+        synchronize_unselected_volumes();
 #endif // !DISABLE_INSTANCES_SYNCH
 
-    _ensure_on_bed();
+    ensure_on_bed();
 
-    m_bounding_box_dirty = true;
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::mirror(Axis axis)
@@ -704,12 +730,12 @@ void Selection::mirror(Axis axis)
 
 #if !DISABLE_INSTANCES_SYNCH
     if (m_mode == Instance)
-        _synchronize_unselected_instances(SYNC_ROTATION_NONE);
+        synchronize_unselected_instances(SYNC_ROTATION_NONE);
     else if (m_mode == Volume)
-        _synchronize_unselected_volumes();
+        synchronize_unselected_volumes();
 #endif // !DISABLE_INSTANCES_SYNCH
 
-    m_bounding_box_dirty = true;
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::translate(unsigned int object_idx, const Vec3d& displacement)
@@ -754,7 +780,7 @@ void Selection::translate(unsigned int object_idx, const Vec3d& displacement)
         }
     }
 
-    m_bounding_box_dirty = true;
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::translate(unsigned int object_idx, unsigned int instance_idx, const Vec3d& displacement)
@@ -799,7 +825,7 @@ void Selection::translate(unsigned int object_idx, unsigned int instance_idx, co
         }
     }
 
-    m_bounding_box_dirty = true;
+    this->set_bounding_boxes_dirty();
 }
 
 void Selection::erase()
@@ -924,8 +950,8 @@ void Selection::render(float scale_factor) const
     m_scale_factor = scale_factor;
 
     // render cumulative bounding box of selected volumes
-    _render_selected_volumes();
-    _render_synchronized_volumes();
+    render_selected_volumes();
+    render_synchronized_volumes();
 }
 
 #if ENABLE_RENDER_SELECTION_CENTER
@@ -936,17 +962,17 @@ void Selection::render_center() const
 
     const Vec3d& center = get_bounding_box().center();
 
-    ::glDisable(GL_DEPTH_TEST);
+    glsafe(::glDisable(GL_DEPTH_TEST)));
 
-    ::glEnable(GL_LIGHTING);
+    glsafe(::glEnable(GL_LIGHTING));
 
-    ::glColor3f(1.0f, 1.0f, 1.0f);
-    ::glPushMatrix();
-    ::glTranslated(center(0), center(1), center(2));
-    ::gluSphere(m_quadric, 0.75, 32, 32);
-    ::glPopMatrix();
+    glsafe(::glColor3f(1.0f, 1.0f, 1.0f));
+    glsafe(::glPushMatrix());
+    glsafe(::glTranslated(center(0), center(1), center(2)));
+    glsafe(::gluSphere(m_quadric, 0.75, 32, 32));
+    glsafe(::glPopMatrix());
 
-    ::glDisable(GL_LIGHTING);
+    glsafe(::glDisable(GL_LIGHTING));
 }
 #endif // ENABLE_RENDER_SELECTION_CENTER
 
@@ -955,55 +981,71 @@ void Selection::render_sidebar_hints(const std::string& sidebar_field) const
     if (sidebar_field.empty())
         return;
 
-    ::glClear(GL_DEPTH_BUFFER_BIT);
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
+    glsafe(::glEnable(GL_DEPTH_TEST));
 
-    ::glEnable(GL_LIGHTING);
+    glsafe(::glEnable(GL_LIGHTING));
 
-    ::glPushMatrix();
+    glsafe(::glPushMatrix());
 
     const Vec3d& center = get_bounding_box().center();
 
-    if (is_single_full_instance())
+    if (is_single_full_instance() && ! wxGetApp().obj_manipul()->get_world_coordinates())
     {
-        ::glTranslated(center(0), center(1), center(2));
+        glsafe(::glTranslated(center(0), center(1), center(2)));
         if (!boost::starts_with(sidebar_field, "position"))
         {
-            Transform3d orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
-            ::glMultMatrixd(orient_matrix.data());
+            Transform3d orient_matrix = Transform3d::Identity();
+            if (boost::starts_with(sidebar_field, "scale"))
+                orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
+            else if (boost::starts_with(sidebar_field, "rotation"))
+            {
+                if (boost::ends_with(sidebar_field, "x"))
+                    orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
+                else if (boost::ends_with(sidebar_field, "y"))
+                {
+                    const Vec3d& rotation = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_rotation();
+                    if (rotation(0) == 0.0)
+                        orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
+                    else
+                        orient_matrix.rotate(Eigen::AngleAxisd(rotation(2), Vec3d::UnitZ()));
+                }
+            }
+
+            glsafe(::glMultMatrixd(orient_matrix.data()));
         }
     }
     else if (is_single_volume() || is_single_modifier())
     {
-        ::glTranslated(center(0), center(1), center(2));
+        glsafe(::glTranslated(center(0), center(1), center(2)));
         Transform3d orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
         if (!boost::starts_with(sidebar_field, "position"))
             orient_matrix = orient_matrix * (*m_volumes)[*m_list.begin()]->get_volume_transformation().get_matrix(true, false, true, true);
 
-        ::glMultMatrixd(orient_matrix.data());
+        glsafe(::glMultMatrixd(orient_matrix.data()));
     }
     else
     {
-        ::glTranslated(center(0), center(1), center(2));
+        glsafe(::glTranslated(center(0), center(1), center(2)));
         if (requires_local_axes())
         {
             Transform3d orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
-            ::glMultMatrixd(orient_matrix.data());
+            glsafe(::glMultMatrixd(orient_matrix.data()));
         }
     }
 
     if (boost::starts_with(sidebar_field, "position"))
-        _render_sidebar_position_hints(sidebar_field);
+        render_sidebar_position_hints(sidebar_field);
     else if (boost::starts_with(sidebar_field, "rotation"))
-        _render_sidebar_rotation_hints(sidebar_field);
+        render_sidebar_rotation_hints(sidebar_field);
     else if (boost::starts_with(sidebar_field, "scale"))
-        _render_sidebar_scale_hints(sidebar_field);
+        render_sidebar_scale_hints(sidebar_field);
     else if (boost::starts_with(sidebar_field, "size"))
-        _render_sidebar_size_hints(sidebar_field);
+        render_sidebar_size_hints(sidebar_field);
 
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 
-    ::glDisable(GL_LIGHTING);
+    glsafe(::glDisable(GL_LIGHTING));
 }
 
 bool Selection::requires_local_axes() const
@@ -1011,12 +1053,83 @@ bool Selection::requires_local_axes() const
     return (m_mode == Volume) && is_from_single_instance();
 }
 
-void Selection::_update_valid()
+void Selection::copy_to_clipboard()
+{
+    if (!m_valid)
+        return;
+
+    m_clipboard.reset();
+
+    for (const ObjectIdxsToInstanceIdxsMap::value_type& object : m_cache.content)
+    {
+        ModelObject* src_object = m_model->objects[object.first];
+        ModelObject* dst_object = m_clipboard.add_object();
+        dst_object->name                 = src_object->name;
+        dst_object->input_file           = src_object->input_file;
+        dst_object->config               = src_object->config;
+        dst_object->sla_support_points   = src_object->sla_support_points;
+        dst_object->sla_points_status    = src_object->sla_points_status;
+        dst_object->layer_height_ranges  = src_object->layer_height_ranges;
+        dst_object->layer_height_profile = src_object->layer_height_profile;
+        dst_object->origin_translation   = src_object->origin_translation;
+
+        for (int i : object.second)
+        {
+            dst_object->add_instance(*src_object->instances[i]);
+        }
+
+        for (unsigned int i : m_list)
+        {
+            // Copy the ModelVolumes only for the selected GLVolumes of the 1st selected instance.
+            const GLVolume* volume = (*m_volumes)[i];
+            if ((volume->object_idx() == object.first) && (volume->instance_idx() == *object.second.begin()))
+            {
+                int volume_idx = volume->volume_idx();
+                if ((0 <= volume_idx) && (volume_idx < (int)src_object->volumes.size()))
+                {
+                    ModelVolume* src_volume = src_object->volumes[volume_idx];
+                    ModelVolume* dst_volume = dst_object->add_volume(*src_volume);
+                    dst_volume->set_new_unique_id();
+                } else {
+                    assert(false);
+                }
+            }
+        }
+    }
+
+    m_clipboard.set_mode(m_mode);
+}
+
+void Selection::paste_from_clipboard()
+{
+    if (!m_valid || m_clipboard.is_empty())
+        return;
+
+    switch (m_clipboard.get_mode())
+    {
+    case Volume:
+    {
+        if (is_from_single_instance())
+            paste_volumes_from_clipboard();
+
+        break;
+    }
+    case Instance:
+    {
+        if (m_mode == Instance)
+            paste_objects_from_clipboard();
+
+        break;
+    }
+    }
+}
+
+void Selection::update_valid()
 {
     m_valid = (m_volumes != nullptr) && (m_model != nullptr);
 }
 
-void Selection::_update_type()
+void Selection::update_type()
 {
     m_cache.content.clear();
     m_type = Mixed;
@@ -1114,15 +1227,11 @@ void Selection::_update_type()
                         }
 
                         if (modifiers_count == 0)
-                        {
                             m_type = MultipleVolume;
-                            requires_disable = true;
-                        }
                         else if (modifiers_count == (unsigned int)m_list.size())
-                        {
                             m_type = MultipleModifier;
-                            requires_disable = true;
-                        }
+
+                        requires_disable = true;
                     }
                 }
                 else if ((selected_instances_count > 1) && (selected_instances_count * volumes_count == (unsigned int)m_list.size()))
@@ -1244,7 +1353,7 @@ void Selection::_update_type()
 #endif // ENABLE_SELECTION_DEBUG_OUTPUT
 }
 
-void Selection::_set_caches()
+void Selection::set_caches()
 {
     m_cache.volumes_data.clear();
     for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i)
@@ -1255,33 +1364,33 @@ void Selection::_set_caches()
     m_cache.dragging_center = get_bounding_box().center();
 }
 
-void Selection::_add_volume(unsigned int volume_idx)
+void Selection::do_add_volume(unsigned int volume_idx)
 {
     m_list.insert(volume_idx);
     (*m_volumes)[volume_idx]->selected = true;
 }
 
-void Selection::_add_instance(unsigned int object_idx, unsigned int instance_idx)
+void Selection::do_add_instance(unsigned int object_idx, unsigned int instance_idx)
 {
     for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i)
     {
         GLVolume* v = (*m_volumes)[i];
         if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx))
-            _add_volume(i);
+            do_add_volume(i);
     }
 }
 
-void Selection::_add_object(unsigned int object_idx)
+void Selection::do_add_object(unsigned int object_idx)
 {
     for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i)
     {
         GLVolume* v = (*m_volumes)[i];
         if (v->object_idx() == object_idx)
-            _add_volume(i);
+            do_add_volume(i);
     }
 }
 
-void Selection::_remove_volume(unsigned int volume_idx)
+void Selection::do_remove_volume(unsigned int volume_idx)
 {
     IndicesList::iterator v_it = m_list.find(volume_idx);
     if (v_it == m_list.end())
@@ -1292,27 +1401,27 @@ void Selection::_remove_volume(unsigned int volume_idx)
     (*m_volumes)[volume_idx]->selected = false;
 }
 
-void Selection::_remove_instance(unsigned int object_idx, unsigned int instance_idx)
+void Selection::do_remove_instance(unsigned int object_idx, unsigned int instance_idx)
 {
     for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i)
     {
         GLVolume* v = (*m_volumes)[i];
         if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx))
-            _remove_volume(i);
+            do_remove_volume(i);
     }
 }
 
-void Selection::_remove_object(unsigned int object_idx)
+void Selection::do_remove_object(unsigned int object_idx)
 {
     for (unsigned int i = 0; i < (unsigned int)m_volumes->size(); ++i)
     {
         GLVolume* v = (*m_volumes)[i];
         if (v->object_idx() == object_idx)
-            _remove_volume(i);
+            do_remove_volume(i);
     }
 }
 
-void Selection::_calc_bounding_box() const
+void Selection::calc_bounding_box() const
 {
     m_bounding_box = BoundingBoxf3();
     if (m_valid)
@@ -1322,16 +1431,48 @@ void Selection::_calc_bounding_box() const
             m_bounding_box.merge((*m_volumes)[i]->transformed_convex_hull_bounding_box());
         }
     }
-    m_bounding_box_dirty = false;
+	m_bounding_box_dirty = false;
 }
 
-void Selection::_render_selected_volumes() const
+void Selection::calc_unscaled_instance_bounding_box() const
+{
+	m_unscaled_instance_bounding_box = BoundingBoxf3();
+	if (m_valid) {
+		for (unsigned int i : m_list) {
+			const GLVolume &volume = *(*m_volumes)[i];
+            if (volume.is_modifier)
+                continue;
+			Transform3d trafo = volume.get_instance_transformation().get_matrix(false, false, true, false) * volume.get_volume_transformation().get_matrix();
+			trafo.translation()(2) += volume.get_sla_shift_z();
+			m_unscaled_instance_bounding_box.merge(volume.transformed_convex_hull_bounding_box(trafo));
+		}
+	}
+	m_unscaled_instance_bounding_box_dirty = false;
+}
+
+void Selection::calc_scaled_instance_bounding_box() const
+{
+    m_scaled_instance_bounding_box = BoundingBoxf3();
+    if (m_valid) {
+        for (unsigned int i : m_list) {
+            const GLVolume &volume = *(*m_volumes)[i];
+            if (volume.is_modifier)
+                continue;
+            Transform3d trafo = volume.get_instance_transformation().get_matrix(false, false, false, false) * volume.get_volume_transformation().get_matrix();
+            trafo.translation()(2) += volume.get_sla_shift_z();
+            m_scaled_instance_bounding_box.merge(volume.transformed_convex_hull_bounding_box(trafo));
+        }
+    }
+    m_scaled_instance_bounding_box_dirty = false;
+}
+
+void Selection::render_selected_volumes() const
 {
     float color[3] = { 1.0f, 1.0f, 1.0f };
-    _render_bounding_box(get_bounding_box(), color);
+    render_bounding_box(get_bounding_box(), color);
 }
 
-void Selection::_render_synchronized_volumes() const
+void Selection::render_synchronized_volumes() const
 {
     if (m_mode == Instance)
         return;
@@ -1353,12 +1494,12 @@ void Selection::_render_synchronized_volumes() const
             if ((v->object_idx() != object_idx) || (v->volume_idx() != volume_idx))
                 continue;
 
-            _render_bounding_box(v->transformed_convex_hull_bounding_box(), color);
+            render_bounding_box(v->transformed_convex_hull_bounding_box(), color);
         }
     }
 }
 
-void Selection::_render_bounding_box(const BoundingBoxf3& box, float* color) const
+void Selection::render_bounding_box(const BoundingBoxf3& box, float* color) const
 {
     if (color == nullptr)
         return;
@@ -1367,10 +1508,10 @@ void Selection::_render_bounding_box(const BoundingBoxf3& box, float* color) con
     Vec3f b_max = box.max.cast<float>();
     Vec3f size = 0.2f * box.size().cast<float>();
 
-    ::glEnable(GL_DEPTH_TEST);
+    glsafe(::glEnable(GL_DEPTH_TEST));
 
-    ::glColor3fv(color);
-    ::glLineWidth(2.0f * m_scale_factor);
+    glsafe(::glColor3fv(color));
+    glsafe(::glLineWidth(2.0f * m_scale_factor));
 
     ::glBegin(GL_LINES);
 
@@ -1406,109 +1547,109 @@ void Selection::_render_bounding_box(const BoundingBoxf3& box, float* color) con
     ::glVertex3f(b_min(0), b_max(1), b_max(2)); ::glVertex3f(b_min(0), b_max(1) - size(1), b_max(2));
     ::glVertex3f(b_min(0), b_max(1), b_max(2)); ::glVertex3f(b_min(0), b_max(1), b_max(2) - size(2));
 
-    ::glEnd();
+    glsafe(::glEnd());
 }
 
-void Selection::_render_sidebar_position_hints(const std::string& sidebar_field) const
+void Selection::render_sidebar_position_hints(const std::string& sidebar_field) const
 {
     if (boost::ends_with(sidebar_field, "x"))
     {
-        ::glRotated(-90.0, 0.0, 0.0, 1.0);
-        _render_sidebar_position_hint(X);
+        glsafe(::glRotated(-90.0, 0.0, 0.0, 1.0));
+        render_sidebar_position_hint(X);
     }
     else if (boost::ends_with(sidebar_field, "y"))
-        _render_sidebar_position_hint(Y);
+        render_sidebar_position_hint(Y);
     else if (boost::ends_with(sidebar_field, "z"))
     {
-        ::glRotated(90.0, 1.0, 0.0, 0.0);
-        _render_sidebar_position_hint(Z);
+        glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
+        render_sidebar_position_hint(Z);
     }
 }
 
-void Selection::_render_sidebar_rotation_hints(const std::string& sidebar_field) const
+void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field) const
 {
     if (boost::ends_with(sidebar_field, "x"))
     {
-        ::glRotated(90.0, 0.0, 1.0, 0.0);
-        _render_sidebar_rotation_hint(X);
+        glsafe(::glRotated(90.0, 0.0, 1.0, 0.0));
+        render_sidebar_rotation_hint(X);
     }
     else if (boost::ends_with(sidebar_field, "y"))
     {
-        ::glRotated(-90.0, 1.0, 0.0, 0.0);
-        _render_sidebar_rotation_hint(Y);
+        glsafe(::glRotated(-90.0, 1.0, 0.0, 0.0));
+        render_sidebar_rotation_hint(Y);
     }
     else if (boost::ends_with(sidebar_field, "z"))
-        _render_sidebar_rotation_hint(Z);
+        render_sidebar_rotation_hint(Z);
 }
 
-void Selection::_render_sidebar_scale_hints(const std::string& sidebar_field) const
+void Selection::render_sidebar_scale_hints(const std::string& sidebar_field) const
 {
     bool uniform_scale = requires_uniform_scale() || wxGetApp().obj_manipul()->get_uniform_scaling();
 
     if (boost::ends_with(sidebar_field, "x") || uniform_scale)
     {
-        ::glPushMatrix();
-        ::glRotated(-90.0, 0.0, 0.0, 1.0);
-        _render_sidebar_scale_hint(X);
-        ::glPopMatrix();
+        glsafe(::glPushMatrix());
+        glsafe(::glRotated(-90.0, 0.0, 0.0, 1.0));
+        render_sidebar_scale_hint(X);
+        glsafe(::glPopMatrix());
     }
 
     if (boost::ends_with(sidebar_field, "y") || uniform_scale)
     {
-        ::glPushMatrix();
-        _render_sidebar_scale_hint(Y);
-        ::glPopMatrix();
+        glsafe(::glPushMatrix());
+        render_sidebar_scale_hint(Y);
+        glsafe(::glPopMatrix());
     }
 
     if (boost::ends_with(sidebar_field, "z") || uniform_scale)
     {
-        ::glPushMatrix();
-        ::glRotated(90.0, 1.0, 0.0, 0.0);
-        _render_sidebar_scale_hint(Z);
-        ::glPopMatrix();
+        glsafe(::glPushMatrix());
+        glsafe(::glRotated(90.0, 1.0, 0.0, 0.0));
+        render_sidebar_scale_hint(Z);
+        glsafe(::glPopMatrix());
     }
 }
 
-void Selection::_render_sidebar_size_hints(const std::string& sidebar_field) const
+void Selection::render_sidebar_size_hints(const std::string& sidebar_field) const
 {
-    _render_sidebar_scale_hints(sidebar_field);
+    render_sidebar_scale_hints(sidebar_field);
 }
 
-void Selection::_render_sidebar_position_hint(Axis axis) const
+void Selection::render_sidebar_position_hint(Axis axis) const
 {
     m_arrow.set_color(AXES_COLOR[axis], 3);
     m_arrow.render();
 }
 
-void Selection::_render_sidebar_rotation_hint(Axis axis) const
+void Selection::render_sidebar_rotation_hint(Axis axis) const
 {
     m_curved_arrow.set_color(AXES_COLOR[axis], 3);
     m_curved_arrow.render();
 
-    ::glRotated(180.0, 0.0, 0.0, 1.0);
+    glsafe(::glRotated(180.0, 0.0, 0.0, 1.0));
     m_curved_arrow.render();
 }
 
-void Selection::_render_sidebar_scale_hint(Axis axis) const
+void Selection::render_sidebar_scale_hint(Axis axis) const
 {
     m_arrow.set_color(((requires_uniform_scale() || wxGetApp().obj_manipul()->get_uniform_scaling()) ? UNIFORM_SCALE_COLOR : AXES_COLOR[axis]), 3);
 
-    ::glTranslated(0.0, 5.0, 0.0);
+    glsafe(::glTranslated(0.0, 5.0, 0.0));
     m_arrow.render();
 
-    ::glTranslated(0.0, -10.0, 0.0);
-    ::glRotated(180.0, 0.0, 0.0, 1.0);
+    glsafe(::glTranslated(0.0, -10.0, 0.0));
+    glsafe(::glRotated(180.0, 0.0, 0.0, 1.0));
     m_arrow.render();
 }
 
-void Selection::_render_sidebar_size_hint(Axis axis, double length) const
+void Selection::render_sidebar_size_hint(Axis axis, double length) const
 {
 }
 
 #ifndef NDEBUG
 static bool is_rotation_xy_synchronized(const Vec3d &rot_xyz_from, const Vec3d &rot_xyz_to)
 {
-    Eigen::AngleAxisd angle_axis(rotation_xyz_diff(rot_xyz_from, rot_xyz_to));
+    Eigen::AngleAxisd angle_axis(Geometry::rotation_xyz_diff(rot_xyz_from, rot_xyz_to));
     Vec3d  axis = angle_axis.axis();
     double angle = angle_axis.angle();
     if (std::abs(angle) < 1e-8)
@@ -1542,7 +1683,7 @@ static void verify_instances_rotation_synchronized(const Model &model, const GLV
 }
 #endif /* NDEBUG */
 
-void Selection::_synchronize_unselected_instances(SyncRotationType sync_rotation_type)
+void Selection::synchronize_unselected_instances(SyncRotationType sync_rotation_type)
 {
     std::set<unsigned int> done;  // prevent processing volumes twice
     done.insert(m_list.begin(), m_list.end());
@@ -1588,7 +1729,7 @@ void Selection::_synchronize_unselected_instances(SyncRotationType sync_rotation
                 break;
             case SYNC_ROTATION_GENERAL:
                 // generic rotation -> update instance z with the delta of the rotation.
-                double z_diff = rotation_diff_z(m_cache.volumes_data[i].get_instance_rotation(), m_cache.volumes_data[j].get_instance_rotation());
+                double z_diff = Geometry::rotation_diff_z(m_cache.volumes_data[i].get_instance_rotation(), m_cache.volumes_data[j].get_instance_rotation());
                 v->set_instance_rotation(Vec3d(rotation(0), rotation(1), rotation(2) + z_diff));
                 break;
             }
@@ -1605,7 +1746,7 @@ void Selection::_synchronize_unselected_instances(SyncRotationType sync_rotation
 #endif /* NDEBUG */
 }
 
-void Selection::_synchronize_unselected_volumes()
+void Selection::synchronize_unselected_volumes()
 {
     for (unsigned int i : m_list)
     {
@@ -1638,7 +1779,7 @@ void Selection::_synchronize_unselected_volumes()
     }
 }
 
-void Selection::_ensure_on_bed()
+void Selection::ensure_on_bed()
 {
     typedef std::map<std::pair<int, int>, double> InstancesToZMap;
     InstancesToZMap instances_min_z;
@@ -1666,5 +1807,68 @@ void Selection::_ensure_on_bed()
     }
 }
 
+bool Selection::is_from_fully_selected_instance(unsigned int volume_idx) const
+{
+    struct SameInstance
+    {
+        int obj_idx;
+        int inst_idx;
+        GLVolumePtrs& volumes;
+
+        SameInstance(int obj_idx, int inst_idx, GLVolumePtrs& volumes) : obj_idx(obj_idx), inst_idx(inst_idx), volumes(volumes) {}
+        bool operator () (unsigned int i) { return (volumes[i]->volume_idx() >= 0) && (volumes[i]->object_idx() == obj_idx) && (volumes[i]->instance_idx() == inst_idx); }
+    };
+
+    if ((unsigned int)m_volumes->size() <= volume_idx)
+        return false;
+
+    GLVolume* volume = (*m_volumes)[volume_idx];
+    int object_idx = volume->object_idx();
+    if ((int)m_model->objects.size() <= object_idx)
+        return false;
+
+    unsigned int count = (unsigned int)std::count_if(m_list.begin(), m_list.end(), SameInstance(object_idx, volume->instance_idx(), *m_volumes));
+    return count == (unsigned int)m_model->objects[object_idx]->volumes.size();
+}
+
+void Selection::paste_volumes_from_clipboard()
+{
+    int obj_idx = get_object_idx();
+    if ((obj_idx < 0) || ((int)m_model->objects.size() <= obj_idx))
+        return;
+
+    ModelObject* src_object = m_clipboard.get_object(0);
+    if (src_object != nullptr)
+    {
+        ModelObject* dst_object = m_model->objects[obj_idx];
+
+        ModelVolumePtrs volumes;
+        for (ModelVolume* src_volume : src_object->volumes)
+        {
+            ModelVolume* dst_volume = dst_object->add_volume(*src_volume);
+            dst_volume->set_new_unique_id();
+            double offset = wxGetApp().plater()->canvas3D()->get_size_proportional_to_max_bed_size(0.05);
+            dst_volume->translate(offset, offset, 0.0);
+            volumes.push_back(dst_volume);
+        }
+        wxGetApp().obj_list()->paste_volumes_into_list(obj_idx, volumes);
+    }
+}
+
+void Selection::paste_objects_from_clipboard()
+{
+    std::vector<size_t> object_idxs;
+    const ModelObjectPtrs& src_objects = m_clipboard.get_objects();
+    for (const ModelObject* src_object : src_objects)
+    {
+        ModelObject* dst_object = m_model->add_object(*src_object);
+        double offset = wxGetApp().plater()->canvas3D()->get_size_proportional_to_max_bed_size(0.05);
+        dst_object->translate(offset, offset, 0.0);
+        object_idxs.push_back(m_model->objects.size() - 1);
+    }
+
+    wxGetApp().obj_list()->paste_objects_into_list(object_idxs);
+}
+
 } // namespace GUI
 } // namespace Slic3r
diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp
index 3a21122df..4e5da3685 100644
--- a/src/slic3r/GUI/Selection.hpp
+++ b/src/slic3r/GUI/Selection.hpp
@@ -133,10 +133,29 @@ private:
         const Transform3d& get_instance_full_matrix() const { return m_instance.full_matrix; }
     };
 
+public:
     typedef std::map<unsigned int, VolumeCache> VolumesCache;
     typedef std::set<int> InstanceIdxsList;
     typedef std::map<int, InstanceIdxsList> ObjectIdxsToInstanceIdxsMap;
 
+    class Clipboard
+    {
+        Model m_model;
+        Selection::EMode m_mode;
+
+    public:
+        void reset() { m_model.clear_objects(); }
+        bool is_empty() const { return m_model.objects.empty(); }
+
+        ModelObject* add_object() { return m_model.add_object(); }
+        ModelObject* get_object(unsigned int id) { return (id < (unsigned int)m_model.objects.size()) ? m_model.objects[id] : nullptr; }
+        const ModelObjectPtrs& get_objects() const { return m_model.objects; }
+
+        Selection::EMode get_mode() const { return m_mode; }
+        void set_mode(Selection::EMode mode) { m_mode = mode; }
+    };
+
+private:
     struct Cache
     {
         // Cache of GLVolume derived transformation matrices, valid during mouse dragging.
@@ -154,14 +173,22 @@ private:
     // Model, not owned.
     Model* m_model;
 
+    bool m_enabled;
     bool m_valid;
     EMode m_mode;
     EType m_type;
     // set of indices to m_volumes
     IndicesList m_list;
     Cache m_cache;
+    Clipboard m_clipboard;
     mutable BoundingBoxf3 m_bounding_box;
     mutable bool m_bounding_box_dirty;
+    // Bounding box of a selection, with no instance scaling applied. This bounding box
+    // is useful for absolute scaling of tilted objects in world coordinate space.
+    mutable BoundingBoxf3 m_unscaled_instance_bounding_box;
+    mutable bool m_unscaled_instance_bounding_box_dirty;
+    mutable BoundingBoxf3 m_scaled_instance_bounding_box;
+    mutable bool m_scaled_instance_bounding_box_dirty;
 
 #if ENABLE_RENDER_SELECTION_CENTER
     GLUquadricObj* m_quadric;
@@ -180,13 +207,16 @@ public:
     void set_volumes(GLVolumePtrs* volumes);
     bool init(bool useVBOs);
 
+    bool is_enabled() const { return m_enabled; }
+    void set_enabled(bool enable) { m_enabled = enable; }
+
     Model* get_model() const { return m_model; }
     void set_model(Model* model);
 
     EMode get_mode() const { return m_mode; }
     void set_mode(EMode mode) { m_mode = mode; }
 
-    void add(unsigned int volume_idx, bool as_single_selection = true);
+    void add(unsigned int volume_idx, bool as_single_selection = true, bool check_for_already_contained = false);
     void remove(unsigned int volume_idx);
 
     void add_object(unsigned int object_idx, bool as_single_selection = true);
@@ -200,6 +230,8 @@ public:
 
     void add_all();
 
+    // Update the selection based on the new instance IDs.
+	void instances_changed(const std::vector<size_t> &instance_ids_selected);
     // Update the selection based on the map from old indices to new indices after m_volumes changed.
     // If the current selection is by instance, this call may select newly added volumes, if they belong to already selected instances.
     void volumes_changed(const std::vector<size_t> &map_volume_old_to_new);
@@ -207,7 +239,7 @@ public:
 
     bool is_empty() const { return m_type == Empty; }
     bool is_wipe_tower() const { return m_type == WipeTower; }
-    bool is_modifier() const { return (m_type == SingleModifier) || (m_type == MultipleModifier); }
+    bool is_any_modifier() const { return is_single_modifier() || is_multiple_modifier(); }
     bool is_single_modifier() const { return m_type == SingleModifier; }
     bool is_multiple_modifier() const { return m_type == MultipleModifier; }
     bool is_single_full_instance() const;
@@ -216,11 +248,12 @@ public:
     bool is_multiple_full_object() const { return m_type == MultipleFullObject; }
     bool is_single_volume() const { return m_type == SingleVolume; }
     bool is_multiple_volume() const { return m_type == MultipleVolume; }
+    bool is_any_volume() const { return is_single_volume() || is_multiple_volume(); }
     bool is_mixed() const { return m_type == Mixed; }
     bool is_from_single_instance() const { return get_instance_idx() != -1; }
     bool is_from_single_object() const;
 
-    bool contains_volume(unsigned int volume_idx) const { return std::find(m_list.begin(), m_list.end(), volume_idx) != m_list.end(); }
+    bool contains_volume(unsigned int volume_idx) const { return m_list.find(volume_idx) != m_list.end(); }
     bool requires_uniform_scale() const;
 
     // Returns the the object id if the selection is from a single object, otherwise is -1
@@ -238,13 +271,17 @@ public:
 
     unsigned int volumes_count() const { return (unsigned int)m_list.size(); }
     const BoundingBoxf3& get_bounding_box() const;
+    // Bounding box of a selection, with no instance scaling applied. This bounding box
+    // is useful for absolute scaling of tilted objects in world coordinate space.
+    const BoundingBoxf3& get_unscaled_instance_bounding_box() const;
+    const BoundingBoxf3& get_scaled_instance_bounding_box() const;
 
     void start_dragging();
 
     void translate(const Vec3d& displacement, bool local = false);
     void rotate(const Vec3d& rotation, TransformationType transformation_type);
     void flattening_rotate(const Vec3d& normal);
-    void scale(const Vec3d& scale, bool local);
+    void scale(const Vec3d& scale, TransformationType transformation_type);
     void mirror(Axis axis);
 
     void translate(unsigned int object_idx, const Vec3d& displacement);
@@ -260,28 +297,36 @@ public:
 
     bool requires_local_axes() const;
 
+    void copy_to_clipboard();
+    void paste_from_clipboard();
+
+    const Clipboard& get_clipboard() const { return m_clipboard; }
+
 private:
-    void _update_valid();
-    void _update_type();
-    void _set_caches();
-    void _add_volume(unsigned int volume_idx);
-    void _add_instance(unsigned int object_idx, unsigned int instance_idx);
-    void _add_object(unsigned int object_idx);
-    void _remove_volume(unsigned int volume_idx);
-    void _remove_instance(unsigned int object_idx, unsigned int instance_idx);
-    void _remove_object(unsigned int object_idx);
-    void _calc_bounding_box() const;
-    void _render_selected_volumes() const;
-    void _render_synchronized_volumes() const;
-    void _render_bounding_box(const BoundingBoxf3& box, float* color) const;
-    void _render_sidebar_position_hints(const std::string& sidebar_field) const;
-    void _render_sidebar_rotation_hints(const std::string& sidebar_field) const;
-    void _render_sidebar_scale_hints(const std::string& sidebar_field) const;
-    void _render_sidebar_size_hints(const std::string& sidebar_field) const;
-    void _render_sidebar_position_hint(Axis axis) const;
-    void _render_sidebar_rotation_hint(Axis axis) const;
-    void _render_sidebar_scale_hint(Axis axis) const;
-    void _render_sidebar_size_hint(Axis axis, double length) const;
+    void update_valid();
+    void update_type();
+    void set_caches();
+    void do_add_volume(unsigned int volume_idx);
+    void do_add_instance(unsigned int object_idx, unsigned int instance_idx);
+    void do_add_object(unsigned int object_idx);
+    void do_remove_volume(unsigned int volume_idx);
+    void do_remove_instance(unsigned int object_idx, unsigned int instance_idx);
+    void do_remove_object(unsigned int object_idx);
+    void calc_bounding_box() const;
+    void calc_unscaled_instance_bounding_box() const;
+    void calc_scaled_instance_bounding_box() const;
+    void set_bounding_boxes_dirty() { m_bounding_box_dirty = true; m_unscaled_instance_bounding_box_dirty = true; m_scaled_instance_bounding_box_dirty = true; }
+    void render_selected_volumes() const;
+    void render_synchronized_volumes() const;
+    void render_bounding_box(const BoundingBoxf3& box, float* color) const;
+    void render_sidebar_position_hints(const std::string& sidebar_field) const;
+    void render_sidebar_rotation_hints(const std::string& sidebar_field) const;
+    void render_sidebar_scale_hints(const std::string& sidebar_field) const;
+    void render_sidebar_size_hints(const std::string& sidebar_field) const;
+    void render_sidebar_position_hint(Axis axis) const;
+    void render_sidebar_rotation_hint(Axis axis) const;
+    void render_sidebar_scale_hint(Axis axis) const;
+    void render_sidebar_size_hint(Axis axis, double length) const;
     enum SyncRotationType {
         // Do not synchronize rotation. Either not rotating at all, or rotating by world Z axis.
         SYNC_ROTATION_NONE = 0,
@@ -290,9 +335,13 @@ private:
         // Synchronize after rotation by an axis not parallel with Z.
         SYNC_ROTATION_GENERAL = 2,
     };
-    void _synchronize_unselected_instances(SyncRotationType sync_rotation_type);
-    void _synchronize_unselected_volumes();
-    void _ensure_on_bed();
+    void synchronize_unselected_instances(SyncRotationType sync_rotation_type);
+    void synchronize_unselected_volumes();
+    void ensure_on_bed();
+    bool is_from_fully_selected_instance(unsigned int volume_idx) const;
+
+    void paste_volumes_from_clipboard();
+    void paste_objects_from_clipboard();
 };
 
 } // namespace GUI
diff --git a/src/slic3r/GUI/SysInfoDialog.cpp b/src/slic3r/GUI/SysInfoDialog.cpp
index 372191715..e0bdc26d6 100644
--- a/src/slic3r/GUI/SysInfoDialog.cpp
+++ b/src/slic3r/GUI/SysInfoDialog.cpp
@@ -22,9 +22,9 @@ std::string get_main_info(bool format_as_html)
     std::string line_end = format_as_html ? "<br>" : "\n";
 
     if (!format_as_html)
-        out << b_start << SLIC3R_FORK_NAME << b_end << line_end;
+        out << b_start << SLIC3R_APP_NAME << b_end << line_end;
     out << b_start << "Version:   "             << b_end << SLIC3R_VERSION << line_end;
-    out << b_start << "Build:     "             << b_end << SLIC3R_BUILD << line_end;
+    out << b_start << "Build:     "             << b_end << SLIC3R_BUILD_ID << line_end;
     out << line_end;
     out << b_start << "Operating System:    "   << b_end << wxPlatformInfo::Get().GetOperatingSystemFamilyName() << line_end;
     out << b_start << "System Architecture: "   << b_end << wxPlatformInfo::Get().GetArchName() << line_end;
@@ -41,10 +41,12 @@ std::string get_main_info(bool format_as_html)
 }
 
 SysInfoDialog::SysInfoDialog()
-    : wxDialog(NULL, wxID_ANY, _(L("Slic3r++ - System Information")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+    : DPIDialog(NULL, wxID_ANY, wxString(SLIC3R_APP_NAME) + " - " + _(L("System Information")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 {
 	wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 	SetBackgroundColour(bgr_clr);
+    SetFont(wxGetApp().normal_font());
+
     wxBoxSizer* hsizer = new wxBoxSizer(wxHORIZONTAL);
     hsizer->SetMinSize(wxSize(50 * wxGetApp().em_unit(), -1));
 
@@ -52,19 +54,17 @@ SysInfoDialog::SysInfoDialog()
 	main_sizer->Add(hsizer, 1, wxEXPAND | wxALL, 10);
 
     // logo
-// 	wxBitmap logo_bmp = wxBitmap(from_u8(Slic3r::var("Slic3r_192px.png")), wxBITMAP_TYPE_PNG);
-//     auto *logo = new wxStaticBitmap(this, wxID_ANY, std::move(logo_bmp));
-    auto *logo = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("Slic3r_192px.png"));
-	hsizer->Add(logo, 0, wxALIGN_CENTER_VERTICAL);
+    m_logo_bmp = ScalableBitmap(this, "Slic3r_192px.png", 192);
+    m_logo = new wxStaticBitmap(this, wxID_ANY, m_logo_bmp.bmp());
+	hsizer->Add(m_logo, 0, wxALIGN_CENTER_VERTICAL);
     
     wxBoxSizer* vsizer = new wxBoxSizer(wxVERTICAL);
     hsizer->Add(vsizer, 1, wxEXPAND|wxLEFT, 20);
 
     // title
     {
-        wxStaticText* title = new wxStaticText(this, wxID_ANY, SLIC3R_FORK_NAME, wxDefaultPosition, wxDefaultSize);
-        wxFont title_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-        title_font.SetWeight(wxFONTWEIGHT_BOLD);
+        wxStaticText* title = new wxStaticText(this, wxID_ANY, SLIC3R_APP_NAME, wxDefaultPosition, wxDefaultSize);
+        wxFont title_font = wxGetApp().bold_font();
         title_font.SetFamily(wxFONTFAMILY_ROMAN);
         title_font.SetPointSize(22);
         title->SetFont(title_font);
@@ -72,7 +72,7 @@ SysInfoDialog::SysInfoDialog()
     }
 
     // main_info_text
-    wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    wxFont font = wxGetApp().normal_font();
     const auto text_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
     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());
@@ -80,10 +80,10 @@ SysInfoDialog::SysInfoDialog()
     const int fs = font.GetPointSize() - 1;
     int size[] = { static_cast<int>(fs*1.5), static_cast<int>(fs*1.4), static_cast<int>(fs*1.3), fs, fs, fs, fs };
 
-    wxHtmlWindow* html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER);
+    m_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER);
     {
-        html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
-        html->SetBorders(2);
+        m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
+        m_html->SetBorders(2);
 		const auto text = wxString::Format(
             "<html>"
             "<body bgcolor= %s link= %s>"
@@ -93,16 +93,16 @@ SysInfoDialog::SysInfoDialog()
             "</body>"
             "</html>", bgr_clr_str, text_clr_str, text_clr_str,
             get_main_info(true));
-        html->SetPage(text);
-        vsizer->Add(html, 1, wxEXPAND | wxBOTTOM, wxGetApp().em_unit());
+        m_html->SetPage(text);
+        vsizer->Add(m_html, 1, wxEXPAND | wxBOTTOM, wxGetApp().em_unit());
     }
 
     // opengl_info
-    wxHtmlWindow* opengl_info_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
+    m_opengl_info_html = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO);
     {
-        opengl_info_html->SetMinSize(wxSize(-1, 16 * wxGetApp().em_unit()));
-        opengl_info_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
-        opengl_info_html->SetBorders(10);
+        m_opengl_info_html->SetMinSize(wxSize(-1, 16 * wxGetApp().em_unit()));
+        m_opengl_info_html->SetFonts(font.GetFaceName(), font.GetFaceName(), size);
+        m_opengl_info_html->SetBorders(10);
         const auto text = wxString::Format(
             "<html>"
             "<body bgcolor= %s link= %s>"
@@ -112,14 +112,15 @@ SysInfoDialog::SysInfoDialog()
             "</body>"
             "</html>", bgr_clr_str, text_clr_str, text_clr_str,
             _3DScene::get_gl_info(true, true));
-        opengl_info_html->SetPage(text);
-        main_sizer->Add(opengl_info_html, 1, wxEXPAND | wxBOTTOM, 15);
+        m_opengl_info_html->SetPage(text);
+        main_sizer->Add(m_opengl_info_html, 1, wxEXPAND | wxBOTTOM, 15);
     }
     
     wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK);
-    auto btn_copy_to_clipboard = new wxButton(this, wxID_ANY, "Copy to Clipboard", wxDefaultPosition, wxDefaultSize);
-    buttons->Insert(0, btn_copy_to_clipboard, 0, wxLEFT, 5);
-    btn_copy_to_clipboard->Bind(wxEVT_BUTTON, &SysInfoDialog::onCopyToClipboard, this);
+    m_btn_copy_to_clipboard = new wxButton(this, wxID_ANY, "Copy to Clipboard", wxDefaultPosition, wxDefaultSize);
+
+    buttons->Insert(0, m_btn_copy_to_clipboard, 0, wxLEFT, 5);
+    m_btn_copy_to_clipboard->Bind(wxEVT_BUTTON, &SysInfoDialog::onCopyToClipboard, this);
 
     this->SetEscapeId(wxID_OK);
     this->Bind(wxEVT_BUTTON, &SysInfoDialog::onCloseDialog, this, wxID_OK);
@@ -132,6 +133,34 @@ SysInfoDialog::SysInfoDialog()
 	main_sizer->SetSizeHints(this);
 }
 
+void SysInfoDialog::on_dpi_changed(const wxRect &suggested_rect)
+{
+    m_logo_bmp.msw_rescale();
+    m_logo->SetBitmap(m_logo_bmp.bmp());
+
+    wxFont font = GetFont();
+    const int fs = font.GetPointSize() - 1;
+    int font_size[] = { static_cast<int>(fs*1.5), static_cast<int>(fs*1.4), static_cast<int>(fs*1.3), fs, fs, fs, fs };
+
+    m_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
+    m_html->Refresh();
+
+    const int& em = em_unit();
+
+    msw_buttons_rescale(this, em, { wxID_OK, m_btn_copy_to_clipboard->GetId() });
+
+    m_opengl_info_html->SetMinSize(wxSize(-1, 16 * em));
+    m_opengl_info_html->SetFonts(font.GetFaceName(), font.GetFaceName(), font_size);
+    m_opengl_info_html->Refresh();
+
+    const wxSize& size = wxSize(65 * em, 55 * em);
+
+    SetMinSize(size);
+    Fit();
+
+    Refresh();
+}
+
 void SysInfoDialog::onCopyToClipboard(wxEvent &)
 {
     wxTheClipboard->Open();
diff --git a/src/slic3r/GUI/SysInfoDialog.hpp b/src/slic3r/GUI/SysInfoDialog.hpp
index ee1b85ce6..3b1459648 100644
--- a/src/slic3r/GUI/SysInfoDialog.hpp
+++ b/src/slic3r/GUI/SysInfoDialog.hpp
@@ -4,14 +4,26 @@
 #include <wx/wx.h>
 #include <wx/html/htmlwin.h>
 
+#include "GUI_Utils.hpp"
+#include "wxExtensions.hpp"
+
 namespace Slic3r { 
 namespace GUI {
 
-class SysInfoDialog : public wxDialog
+class SysInfoDialog : public DPIDialog
 {
-    wxString text_info {wxEmptyString};
+    ScalableBitmap  m_logo_bmp;
+    wxStaticBitmap* m_logo;
+    wxHtmlWindow*   m_opengl_info_html;
+    wxHtmlWindow*   m_html;
+
+    wxButton*       m_btn_copy_to_clipboard;
+
 public:
     SysInfoDialog();
+
+protected:
+    void on_dpi_changed(const wxRect &suggested_rect) override;
     
 private:
     void onCopyToClipboard(wxEvent &);
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index af3b358d3..56b16eda2 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1,4 +1,5 @@
 // #include "libslic3r/GCodeSender.hpp"
+#include "slic3r/Utils/Serial.hpp"
 #include "Tab.hpp"
 #include "PresetBundle.hpp"
 #include "PresetHints.hpp"
@@ -6,7 +7,6 @@
 
 #include "slic3r/Utils/Http.hpp"
 #include "slic3r/Utils/PrintHost.hpp"
-#include "slic3r/Utils/Serial.hpp"
 #include "BonjourDialog.hpp"
 #include "WipeTowerDialog.hpp"
 #include "ButtonsDescription.hpp"
@@ -38,11 +38,13 @@ namespace GUI {
 wxDEFINE_EVENT(EVT_TAB_VALUE_CHANGED, wxCommandEvent);
 wxDEFINE_EVENT(EVT_TAB_PRESETS_CHANGED, SimpleEvent);
 
-Tab::Tab(wxNotebook* parent, const wxString& title, const char* name) : 
-	m_parent(parent), m_title(title), m_name(name)
+// Tab::Tab(wxNotebook* parent, const wxString& title, const char* name) : 
+// 	m_parent(parent), m_title(title), m_name(name)
+Tab::Tab(wxNotebook* parent, const wxString& title, Preset::Type type) :
+	m_parent(parent), m_title(title), m_type(type)
 {
-	Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL, name);
-    set_type();
+	Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL/*, name*/);
+	this->SetFont(Slic3r::GUI::wxGetApp().normal_font());
 
 	m_compatible_printers.type			= Preset::TYPE_PRINTER;
 	m_compatible_printers.key_list		= "compatible_printers";
@@ -110,41 +112,29 @@ void Tab::create_preset_tab()
 #endif //__WXOSX__
 
 	// preset chooser
-    m_presets_choice = new wxBitmapComboBox(panel, wxID_ANY, "", wxDefaultPosition, wxSize(25 * m_em_unit, -1), 0, 0, wxCB_READONLY);
+    m_presets_choice = new wxBitmapComboBox(panel, wxID_ANY, "", wxDefaultPosition, wxSize(35 * m_em_unit, -1), 0, 0, wxCB_READONLY);
 
 	auto color = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 
 	//buttons
-	wxBitmap bmpMenu;
-// 	bmpMenu = wxBitmap(from_u8(Slic3r::var("disk.png")), wxBITMAP_TYPE_PNG);
-    bmpMenu = create_scaled_bitmap("disk.png");
-	m_btn_save_preset = new wxBitmapButton(panel, wxID_ANY, bmpMenu, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
-	if (wxMSW) m_btn_save_preset->SetBackgroundColour(color);
-// 	bmpMenu = wxBitmap(from_u8(Slic3r::var("delete.png")), wxBITMAP_TYPE_PNG);
-    bmpMenu = create_scaled_bitmap("delete.png");
-	m_btn_delete_preset = new wxBitmapButton(panel, wxID_ANY, bmpMenu, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
-	if (wxMSW) m_btn_delete_preset->SetBackgroundColour(color);
+    m_scaled_buttons.reserve(6);
+    m_scaled_buttons.reserve(2);
+
+    add_scaled_button(panel, &m_btn_save_preset, "save");
+    add_scaled_button(panel, &m_btn_delete_preset, "cross");
 
 	m_show_incompatible_presets = false;
-// 	m_bmp_show_incompatible_presets.LoadFile(from_u8(Slic3r::var("flag-red-icon.png")), wxBITMAP_TYPE_PNG);
-// 	m_bmp_hide_incompatible_presets.LoadFile(from_u8(Slic3r::var("flag-green-icon.png")), wxBITMAP_TYPE_PNG);
-	m_bmp_show_incompatible_presets = create_scaled_bitmap("flag-red-icon.png");
-	m_bmp_hide_incompatible_presets = create_scaled_bitmap("flag-green-icon.png");
-	m_btn_hide_incompatible_presets = new wxBitmapButton(panel, wxID_ANY, m_bmp_hide_incompatible_presets, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
-	if (wxMSW) m_btn_hide_incompatible_presets->SetBackgroundColour(color);
+	add_scaled_bitmap(this, m_bmp_show_incompatible_presets, "flag_red");
+	add_scaled_bitmap(this, m_bmp_hide_incompatible_presets, "flag_green");
 
-	m_btn_save_preset->SetToolTip(_(L("Save current ")) + m_title);
+    add_scaled_button(panel, &m_btn_hide_incompatible_presets, m_bmp_hide_incompatible_presets.name());
+
+    // TRN "Save current Settings"
+	m_btn_save_preset->SetToolTip(wxString::Format(_(L("Save current %s")),m_title));
 	m_btn_delete_preset->SetToolTip(_(L("Delete this preset")));
 	m_btn_delete_preset->Disable();
 
-	m_undo_btn = new wxButton(panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT | wxNO_BORDER);
-	m_undo_to_sys_btn = new wxButton(panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT | wxNO_BORDER);
-	m_question_btn = new wxButton(panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT | wxNO_BORDER);
-	if (wxMSW) {
-		m_undo_btn->SetBackgroundColour(color);
-		m_undo_to_sys_btn->SetBackgroundColour(color);
-		m_question_btn->SetBackgroundColour(color);
-	}
+    add_scaled_button(panel, &m_question_btn, "question");
 
 	m_question_btn->SetToolTip(_(L("Hover the cursor over buttons to find more information \n"
 								   "or click this button.")));
@@ -152,30 +142,24 @@ void Tab::create_preset_tab()
 	// Determine the theme color of OS (dark or light)
     auto luma = wxGetApp().get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 	// Bitmaps to be shown on the "Revert to system" aka "Lock to system" button next to each input field.
-// 	m_bmp_value_lock  	  .LoadFile(from_u8(var("sys_lock.png")),     wxBITMAP_TYPE_PNG);
-// 	m_bmp_value_unlock    .LoadFile(from_u8(var(luma >= 128 ? "sys_unlock.png" : "sys_unlock_grey.png")), wxBITMAP_TYPE_PNG);
-	m_bmp_value_lock  	   = create_scaled_bitmap("sys_lock.png");
-	m_bmp_value_unlock     = create_scaled_bitmap(luma >= 128 ? "sys_unlock.png" : "sys_unlock_grey.png");
+	add_scaled_bitmap(this, m_bmp_value_lock  , luma >= 128 ? "lock_closed" : "lock_closed_white");
+	add_scaled_bitmap(this, m_bmp_value_unlock, "lock_open");
 	m_bmp_non_system = &m_bmp_white_bullet;
 	// Bitmaps to be shown on the "Undo user changes" button next to each input field.
-// 	m_bmp_value_revert    .LoadFile(from_u8(var(luma >= 128 ? "action_undo.png" : "action_undo_grey.png")), wxBITMAP_TYPE_PNG);
-// 	m_bmp_white_bullet    .LoadFile(from_u8(var("bullet_white.png")), wxBITMAP_TYPE_PNG);
-// 	m_bmp_question        .LoadFile(from_u8(var("question_mark_01.png")), wxBITMAP_TYPE_PNG);
-	m_bmp_value_revert    = create_scaled_bitmap(luma >= 128 ? "action_undo.png" : "action_undo_grey.png");
-	m_bmp_white_bullet    = create_scaled_bitmap("bullet_white.png");
-	m_bmp_question        = create_scaled_bitmap("question_mark_01.png");
+	add_scaled_bitmap(this, m_bmp_value_revert, "undo");
+	add_scaled_bitmap(this, m_bmp_white_bullet, luma >= 128 ? "dot" : "dot_white");
 
 	fill_icon_descriptions();
 	set_tooltips_text();
 
-	m_undo_btn->SetBitmap(m_bmp_white_bullet);
+    add_scaled_button(panel, &m_undo_btn,        m_bmp_white_bullet.name());
+    add_scaled_button(panel, &m_undo_to_sys_btn, m_bmp_white_bullet.name());
+
 	m_undo_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_roll_back_value(); }));
-	m_undo_to_sys_btn->SetBitmap(m_bmp_white_bullet);
 	m_undo_to_sys_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent) { on_roll_back_value(true); }));
-	m_question_btn->SetBitmap(m_bmp_question);
 	m_question_btn->Bind(wxEVT_BUTTON, ([this](wxCommandEvent)
 	{
-		auto dlg = new ButtonsDescription(this, &m_icon_descriptions);
+		auto dlg = new ButtonsDescription(this, m_icon_descriptions);
 		if (dlg->ShowModal() == wxID_OK) {
 			// Colors for ui "decoration"
             for (Tab *tab : wxGetApp().tabs_list) {
@@ -192,7 +176,7 @@ void Tab::create_preset_tab()
 	m_default_text_clr		= wxGetApp().get_label_clr_default();
 
     // Sizer with buttons for mode changing
-    m_mode_sizer = new PrusaModeSizer(panel);
+    m_mode_sizer = new ModeSizer(panel);
 
     const float scale_factor = wxGetApp().em_unit()*0.1;// GetContentScaleFactor();
 	m_hsizer = new wxBoxSizer(wxHORIZONTAL);
@@ -268,18 +252,43 @@ void Tab::create_preset_tab()
 		toggle_show_hide_incompatible();
 	}));
 
+    // Fill cache for mode bitmaps
+    m_mode_bitmap_cache.reserve(3);
+    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_simple_.png"));
+    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_advanced_.png"));
+    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_expert_.png"));
+
 	// Initialize the DynamicPrintConfig by default keys/values.
 	build();
 	rebuild_page_tree();
     m_complited = true;
 }
 
+void Tab::add_scaled_button(wxWindow* parent, 
+                            ScalableButton** btn, 
+                            const std::string& icon_name, 
+                            const wxString& label/* = wxEmptyString*/, 
+                            long style /*= wxBU_EXACTFIT | wxNO_BORDER*/)
+{
+    *btn = new ScalableButton(parent, wxID_ANY, icon_name, label, wxDefaultSize, wxDefaultPosition, style);
+    m_scaled_buttons.push_back(*btn);
+}
+
+void Tab::add_scaled_bitmap(wxWindow* parent, 
+                            ScalableBitmap& bmp, 
+                            const std::string& icon_name)
+{
+    bmp = ScalableBitmap(parent, icon_name);
+    m_scaled_bitmaps.push_back(&bmp);
+}
+
 void Tab::load_initial_data()
 {
 	m_config = &m_presets->get_edited_preset().config;
-	m_bmp_non_system = m_presets->get_selected_preset_parent() ? &m_bmp_value_unlock : &m_bmp_white_bullet;
-	m_ttg_non_system = m_presets->get_selected_preset_parent() ? &m_ttg_value_unlock : &m_ttg_white_bullet_ns;
-	m_tt_non_system = m_presets->get_selected_preset_parent() ? &m_tt_value_unlock : &m_ttg_white_bullet_ns;
+	bool has_parent = m_presets->get_selected_preset_parent() != nullptr;
+	m_bmp_non_system = has_parent ? &m_bmp_value_unlock : &m_bmp_white_bullet;
+	m_ttg_non_system = has_parent ? &m_ttg_value_unlock : &m_ttg_white_bullet_ns;
+	m_tt_non_system  = has_parent ? &m_tt_value_unlock  : &m_ttg_white_bullet_ns;
 }
 
 Slic3r::GUI::PageShp Tab::add_options_page(const wxString& title, const std::string& icon, bool is_extruder_pages /*= false*/)
@@ -290,9 +299,8 @@ Slic3r::GUI::PageShp Tab::add_options_page(const wxString& title, const std::str
 		icon_idx = (m_icon_index.find(icon) == m_icon_index.end()) ? -1 : m_icon_index.at(icon);
 		if (icon_idx == -1) {
 			// Add a new icon to the icon list.
-//             wxIcon img_icon(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG);
-//             m_icons->Add(img_icon);
-            m_icons->Add(create_scaled_bitmap(icon));
+            m_scaled_icons_list.push_back(ScalableBitmap(this, icon));
+            m_icons->Add(m_scaled_icons_list.back().bmp());
             icon_idx = ++m_icon_count;
 			m_icon_index[icon] = icon_idx;
 		}
@@ -303,7 +311,7 @@ Slic3r::GUI::PageShp Tab::add_options_page(const wxString& title, const std::str
 #else
 	auto panel = this;
 #endif
-	PageShp page(new Page(panel, title, icon_idx));
+	PageShp page(new Page(panel, title, icon_idx, m_mode_bitmap_cache));
 //	page->SetBackgroundStyle(wxBG_STYLE_SYSTEM);
 #ifdef __WINDOWS__
 //	page->SetDoubleBuffered(true);
@@ -411,8 +419,8 @@ void Tab::update_changed_ui()
 	{
 		bool is_nonsys_value = false;
 		bool is_modified_value = true;
-		const wxBitmap *sys_icon =	&m_bmp_value_lock;
-		const wxBitmap *icon =		&m_bmp_value_revert;
+		const ScalableBitmap *sys_icon =	&m_bmp_value_lock;
+		const ScalableBitmap *icon =		&m_bmp_value_revert;
 
 		const wxColour *color =		&m_sys_label_clr;
 
@@ -458,6 +466,7 @@ void Tab::update_changed_ui()
 //	Thaw();
 
 	wxTheApp->CallAfter([this]() {
+        if (parent()) //To avoid a crash, parent should be exist for a moment of a tree updating
 		update_changed_tree_ui();
 	});
 }
@@ -544,7 +553,10 @@ void Tab::update_changed_tree_ui()
 	auto cur_item = m_treectrl->GetFirstVisibleItem();
     if (!cur_item || !m_treectrl->IsVisible(cur_item))
         return;
-	auto selection = m_treectrl->GetItemText(m_treectrl->GetSelection());
+
+	auto selected_item = m_treectrl->GetSelection();
+	auto selection = selected_item ? m_treectrl->GetItemText(selected_item) : "";
+
 	while (cur_item) {
 		auto title = m_treectrl->GetItemText(cur_item);
 		for (auto page : m_pages)
@@ -603,8 +615,8 @@ void Tab::update_changed_tree_ui()
 
 void Tab::update_undo_buttons()
 {
-	m_undo_btn->SetBitmap(m_is_modified_values ? m_bmp_value_revert : m_bmp_white_bullet);
-	m_undo_to_sys_btn->SetBitmap(m_is_nonsys_values ? *m_bmp_non_system : m_bmp_value_lock);
+	m_undo_btn->        SetBitmap_(m_is_modified_values ? m_bmp_value_revert: m_bmp_white_bullet);
+	m_undo_to_sys_btn-> SetBitmap_(m_is_nonsys_values   ? *m_bmp_non_system : m_bmp_value_lock);
 
 	m_undo_btn->SetToolTip(m_is_modified_values ? m_ttg_value_revert : m_ttg_white_bullet);
 	m_undo_to_sys_btn->SetToolTip(m_is_nonsys_values ? *m_ttg_non_system : m_ttg_value_lock);
@@ -681,7 +693,7 @@ void Tab::update_dirty()
 
 void Tab::update_tab_ui()
 {
-	m_selected_preset_item = m_presets->update_tab_ui(m_presets_choice, m_show_incompatible_presets);
+	m_selected_preset_item = m_presets->update_tab_ui(m_presets_choice, m_show_incompatible_presets, m_em_unit);
 }
 
 // Load a provied DynamicConfig into the tab, modifying the active preset.
@@ -734,6 +746,42 @@ void Tab::update_visibility()
     update_changed_tree_ui();
 }
 
+void Tab::msw_rescale()
+{
+    m_em_unit = wxGetApp().em_unit();
+
+    m_mode_sizer->msw_rescale();
+
+    m_presets_choice->SetSize(35 * m_em_unit, -1);
+    m_treectrl->SetMinSize(wxSize(20 * m_em_unit, -1));
+
+    update_tab_ui();
+
+    // rescale buttons and cached bitmaps
+    for (const auto btn : m_scaled_buttons)
+        btn->msw_rescale();
+    for (const auto bmp : m_scaled_bitmaps)
+        bmp->msw_rescale();
+    for (ScalableBitmap& bmp : m_mode_bitmap_cache)
+        bmp.msw_rescale();
+
+    // rescale icons for tree_ctrl
+    for (ScalableBitmap& bmp : m_scaled_icons_list)
+        bmp.msw_rescale();
+    // recreate and set new ImageList for tree_ctrl
+    m_icons->RemoveAll();
+    m_icons = new wxImageList(m_scaled_icons_list.front().bmp().GetWidth(), m_scaled_icons_list.front().bmp().GetHeight());
+    for (ScalableBitmap& bmp : m_scaled_icons_list)
+        m_icons->Add(bmp.bmp());
+    m_treectrl->AssignImageList(m_icons);
+
+    // rescale options_groups
+    for (auto page : m_pages)
+        page->msw_rescale();
+
+    Layout();
+}
+
 Field* Tab::get_field(const t_config_option_key& opt_key, int opt_index/* = -1*/) const
 {
 	Field* field = nullptr;
@@ -774,6 +822,19 @@ void Tab::load_key_value(const std::string& opt_key, const boost::any& value, bo
 	update();
 }
 
+static wxString support_combo_value_for_config(const DynamicPrintConfig &config, bool is_fff)
+{
+    const std::string support         = is_fff ? "support_material"                 : "supports_enable";
+    const std::string buildplate_only = is_fff ? "support_material_buildplate_only" : "support_buildplate_only";
+	return
+		! config.opt_bool(support) ?
+        	_("None") :
+			(is_fff && !config.opt_bool("support_material_auto")) ?
+				_("For support enforcers only") :
+                (config.opt_bool(buildplate_only) ? _("Support on build plate only") :
+				                                    _("Everywhere"));
+}
+
 void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
 {
 	if (wxGetApp().plater() == nullptr) {
@@ -788,16 +849,10 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
         og_freq_chng_params->set_value(opt_key, val);
 	}
 
-	if ( is_fff && (opt_key == "support_material" || opt_key == "support_material_buildplate_only") || 
-        !is_fff && (opt_key == "supports_enable"  || opt_key == "support_buildplate_only"))
-	{
-        const std::string support         = is_fff ? "support_material"                 : "supports_enable";
-        const std::string buildplate_only = is_fff ? "support_material_buildplate_only" : "support_buildplate_only";
-        wxString new_selection = !m_config->opt_bool(support)         ? _("None") :
-                                  m_config->opt_bool(buildplate_only) ? _("Support on build plate only") :
-									                                    _("Everywhere");
-        og_freq_chng_params->set_value("support", new_selection);
-	}
+	if (is_fff ?
+			(opt_key == "support_material" || opt_key == "support_material_auto" || opt_key == "support_material_buildplate_only") :
+        	(opt_key == "supports_enable"  || opt_key == "support_buildplate_only"))
+		og_freq_chng_params->set_value("support", support_combo_value_for_config(*m_config, is_fff));
 
 	if (opt_key == "brim_width")
 	{
@@ -865,9 +920,9 @@ void Tab::update_preset_description_line()
 	wxString description_line = preset.is_default ?
 		_(L("It's a default preset.")) : preset.is_system ?
 		_(L("It's a system preset.")) : 
-		_(L("Current preset is inherited from ")) + (parent == nullptr ? 
-													"default preset." : 
-													":\n\t" + parent->name);
+		wxString::Format(_(L("Current preset is inherited from %s")), (parent == nullptr ? 
+													_(L("default preset"))+"." : 
+													":\n\t" + parent->name));
 	
 	if (preset.is_default || preset.is_system)
 		description_line += "\n\t" + _(L("It can't be deleted or modified. ")) + 
@@ -923,35 +978,23 @@ void Tab::update_preset_description_line()
 
 void Tab::update_frequently_changed_parameters()
 {
-    auto og_freq_chng_params = wxGetApp().sidebar().og_freq_chng_params(supports_printer_technology(ptFFF));
+	const bool is_fff = supports_printer_technology(ptFFF);
+	auto og_freq_chng_params = wxGetApp().sidebar().og_freq_chng_params(is_fff);
     if (!og_freq_chng_params) return;
 
-    if (m_type == Preset::TYPE_SLA_PRINT)
+	og_freq_chng_params->set_value("support", support_combo_value_for_config(*m_config, is_fff));
+
+    const std::string updated_value_key = is_fff ? "fill_density" : "pad_enable";
+
+    const boost::any val = og_freq_chng_params->get_config_value(*m_config, updated_value_key);
+    og_freq_chng_params->set_value(updated_value_key, val);
+
+    if (is_fff)
     {
-        for (auto opt_key : { "supports_enable", "pad_enable" })
-        {
-            boost::any val = og_freq_chng_params->get_config_value(*m_config, opt_key);
-            og_freq_chng_params->set_value(opt_key, val);
-        }
-        return;
-    }
-
-    // for m_type == Preset::TYPE_PRINT
-    boost::any value = og_freq_chng_params->get_config_value(*m_config, "fill_density");
-    og_freq_chng_params->set_value("fill_density", value);
-
-	wxString new_selection = !m_config->opt_bool("support_material") ?
-							_("None") :
-							m_config->opt_bool("support_material_buildplate_only") ?
-								_("Support on build plate only") :
-								_("Everywhere");
-    og_freq_chng_params->set_value("support", new_selection);
-
-	bool val = m_config->opt_float("brim_width") > 0.0 ? true : false;
-    og_freq_chng_params->set_value("brim", val);
-
+        og_freq_chng_params->set_value("brim", bool(m_config->opt_float("brim_width") > 0.0));
 	update_wiping_button_visibility();
 }
+}
 
 void TabPrint::build()
 {
@@ -1003,7 +1046,7 @@ void TabPrint::build()
         line.append_option(optgroup->get_option("perimeter_loop_seam"));
         optgroup->append_line(line);
 
-    page = add_options_page(_(L("Slicing")), "layers.png");
+    page = add_options_page(_(L("Slicing")), "layers");
 
         optgroup = page->new_optgroup(_(L("Layer height")));
         optgroup->append_single_option_line("layer_height");
@@ -1029,7 +1072,7 @@ void TabPrint::build()
         optgroup = page->new_optgroup(_(L("Other")));
         optgroup->append_single_option_line("clip_multipart_objects");
 
-    page = add_options_page(_(L("Infill")), "infill.png");
+    page = add_options_page(_(L("Infill")), "infill");
         optgroup = page->new_optgroup(_(L("Infill")));
         optgroup->append_single_option_line("fill_density");
         optgroup->append_single_option_line("fill_pattern");
@@ -1062,7 +1105,7 @@ void TabPrint::build()
 		optgroup->append_single_option_line("only_retract_when_crossing_perimeters");
         optgroup->append_single_option_line("infill_first");
 
-	page = add_options_page(_(L("Skirt and brim")), "box.png");
+	page = add_options_page(_(L("Skirt and brim")), "skirt+brim");
 		optgroup = page->new_optgroup(_(L("Skirt")));
 		optgroup->append_single_option_line("skirts");
 		optgroup->append_single_option_line("skirt_distance");
@@ -1076,7 +1119,7 @@ void TabPrint::build()
         line.append_option(optgroup->get_option("brim_ears_max_angle"));
         optgroup->append_line(line);
 
-	page = add_options_page(_(L("Support material")), "building.png");
+	page = add_options_page(_(L("Support material")), "support");
 		optgroup = page->new_optgroup(_(L("Support material")));
 		optgroup->append_single_option_line("support_material");
 		optgroup->append_single_option_line("support_material_auto");
@@ -1109,7 +1152,7 @@ void TabPrint::build()
 		optgroup->append_single_option_line("support_material_interface_spacing");
 		optgroup->append_single_option_line("support_material_interface_contact_loops");
 
-	page = add_options_page(_(L("Speed")), "time.png");
+	page = add_options_page(_(L("Speed")), "time");
         optgroup = page->new_optgroup(_(L("Speed for print moves")));
         line = { _(L("Perimeter speed")), "" };
         line.append_option(optgroup->get_option("perimeter_speed"));
@@ -1172,7 +1215,7 @@ void TabPrint::build()
         line.append_option(optgroup->get_option("over_bridge_flow_ratio"));
         optgroup->append_line(line);
 
-    page = add_options_page(_(L("Multiple extruders")), "funnel.png");
+    page = add_options_page(_(L("Multiple extruders")), "funnel");
         optgroup = page->new_optgroup(_(L("Extruders")));
         optgroup->append_single_option_line("perimeter_extruder");
         optgroup->append_single_option_line("infill_extruder");
@@ -1198,15 +1241,15 @@ void TabPrint::build()
         optgroup = page->new_optgroup(_(L("Advanced")));
         optgroup->append_single_option_line("interface_shells");
 
-	page = add_options_page(_(L("Output options")), "page_white_go.png");
+	page = add_options_page(_(L("Output options")), "output+page_white");
 		optgroup = page->new_optgroup(_(L("Sequential printing")));
 		optgroup->append_single_option_line("complete_objects");
 		line = { _(L("Extruder clearance (mm)")), "" };
 		Option option = optgroup->get_option("extruder_clearance_radius");
-		option.opt.width = 60;
+		option.opt.width = 6;
 		line.append_option(option);
 		option = optgroup->get_option("extruder_clearance_height");
-		option.opt.width = 60;
+		option.opt.width = 6;
 		line.append_option(option);
 		optgroup->append_line(line);
 
@@ -1220,17 +1263,17 @@ void TabPrint::build()
 		optgroup = page->new_optgroup(_(L("Post-processing scripts")), 0);	
 		option = optgroup->get_option("post_process");
 		option.opt.full_width = true;
-        option.opt.height = 5 * m_em_unit;//50;
+        option.opt.height = 5;//50;
 		optgroup->append_single_option_line(option);
 
-	page = add_options_page(_(L("Notes")), "note.png");
+	page = add_options_page(_(L("Notes")), "note");
 		optgroup = page->new_optgroup(_(L("Notes")), 0);						
 		option = optgroup->get_option("notes");
 		option.opt.full_width = true;
-        option.opt.height = 25 * m_em_unit;//250;
+        option.opt.height = 25;//250;
 		optgroup->append_single_option_line(option);
 
-	page = add_options_page(_(L("Dependencies")), "wrench.png");
+	page = add_options_page(_(L("Dependencies")), "wrench");
 		optgroup = page->new_optgroup(_(L("Profile dependencies")));
         line = optgroup->create_single_option_line("compatible_printers");
         line.widget = [this](wxWindow* parent) {
@@ -1405,10 +1448,10 @@ void TabPrint::update()
                     correct_100p_fill = true;
             }
 			// get fill_pattern name from enum_labels for using this one at dialog_msg
-			str_fill_pattern = m_config->def()->get("fill_pattern")->enum_labels[fill_pattern];
+			str_fill_pattern = _utf8(m_config->def()->get("fill_pattern")->enum_labels[fill_pattern]);
 			if (!correct_100p_fill) {
-				wxString msg_text = _(L("The ")) + str_fill_pattern + _(L(" infill pattern is not supposed to work at 100% density.\n"
-					"\nShall I switch to rectilinear fill pattern?"));
+				wxString msg_text = GUI::from_u8((boost::format(_utf8(L("The %1% infill pattern is not supposed to work at 100%% density.\n\n"
+					                                           "Shall I switch to rectilinear fill pattern?"))) % str_fill_pattern).str());
 				auto dialog = new wxMessageDialog(parent(), msg_text, _(L("Infill")), wxICON_WARNING | wxYES | wxNO);
 				DynamicPrintConfig new_conf = *m_config;
 				if (dialog->ShowModal() == wxID_YES) {
@@ -1516,6 +1559,7 @@ void TabPrint::update()
 
 	m_recommended_thin_wall_thickness_description_line->SetText(
 		from_u8(PresetHints::recommended_thin_wall_thickness(*m_preset_bundle)));
+    Layout();
 
 //	Thaw();
     m_update_cnt--;
@@ -1536,7 +1580,7 @@ void TabFilament::build()
 	m_presets = &m_preset_bundle->filaments;
 	load_initial_data();
 
-	auto page = add_options_page(_(L("Filament")), "spool.png");
+	auto page = add_options_page(_(L("Filament")), "spool");
 		auto optgroup = page->new_optgroup(_(L("Filament")));
 		optgroup->append_single_option_line("filament_colour");
 		optgroup->append_single_option_line("filament_diameter");
@@ -1557,7 +1601,7 @@ void TabFilament::build()
 		
 		optgroup->append_single_option_line("chamber_temperature");
 
-	page = add_options_page(_(L("Cooling")), "hourglass.png");
+	page = add_options_page(_(L("Cooling")), "time");
 		optgroup = page->new_optgroup(_(L("Enable")));
 		optgroup->append_single_option_line("fan_always_on");
 		optgroup->append_single_option_line("cooling");
@@ -1579,12 +1623,12 @@ void TabFilament::build()
         optgroup->append_single_option_line("top_fan_speed");
 		optgroup->append_single_option_line("disable_fan_first_layers");
 
-		optgroup = page->new_optgroup(_(L("Cooling thresholds")), 250);
+		optgroup = page->new_optgroup(_(L("Cooling thresholds")), 25);
 		optgroup->append_single_option_line("fan_below_layer_time");
 		optgroup->append_single_option_line("slowdown_below_layer_time");
 		optgroup->append_single_option_line("min_print_speed");
 
-	page = add_options_page(_(L("Advanced")), "wrench.png");
+	page = add_options_page(_(L("Advanced")), "wrench");
 		optgroup = page->new_optgroup(_(L("Filament properties")));
 		optgroup->append_single_option_line("filament_type");
 		optgroup->append_single_option_line("filament_soluble");
@@ -1631,10 +1675,10 @@ void TabFilament::build()
 		};
         optgroup->append_line(line);
 
-        const int gcode_field_height = 15 * m_em_unit; // 150
-        const int notes_field_height = 25 * m_em_unit; // 250
+        const int gcode_field_height = 15; // 150
+        const int notes_field_height = 25; // 250
 
-        page = add_options_page(_(L("Custom G-code")), "cog.png");
+        page = add_options_page(_(L("Custom G-code")), "cog");
 		optgroup = page->new_optgroup(_(L("Start G-code")), 0);
 		Option option = optgroup->get_option("start_filament_gcode");
 		option.opt.full_width = true;
@@ -1703,6 +1747,7 @@ void TabFilament::update()
 	m_cooling_description_line->SetText(text);
 	text = from_u8(PresetHints::maximum_volumetric_flow_description(*m_preset_bundle));
 	m_volumetric_speed_description_line->SetText(text);
+    Layout();
 
 	bool cooling = m_config->opt_bool("cooling", 0);
 	bool fan_always_on = cooling || m_config->opt_bool("fan_always_on", 0);
@@ -1729,8 +1774,8 @@ wxSizer* Tab::description_line_widget(wxWindow* parent, ogStaticText* *StaticTex
 {
 	*StaticText = new ogStaticText(parent, "");
 
-	auto font = (new wxSystemSettings)->GetFont(wxSYS_DEFAULT_GUI_FONT);
-	(*StaticText)->SetFont(font);
+//	auto font = (new wxSystemSettings)->GetFont(wxSYS_DEFAULT_GUI_FONT);
+	(*StaticText)->SetFont(wxGetApp().normal_font());
 
 	auto sizer = new wxBoxSizer(wxHORIZONTAL);
 	sizer->Add(*StaticText, 1, wxEXPAND|wxALL, 0);
@@ -1752,9 +1797,10 @@ void TabPrinter::build_printhost(ConfigOptionsGroup *optgroup)
 	}
 
 	auto printhost_browse = [=](wxWindow* parent) {
-		auto btn = m_printhost_browse_btn = new wxButton(parent, wxID_ANY, _(L(" Browse "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
+        add_scaled_button(parent, &m_printhost_browse_btn, "browse", _(L("Browse")) + " "+ dots, wxBU_LEFT | wxBU_EXACTFIT);
+        ScalableButton* btn = m_printhost_browse_btn;
 		btn->SetFont(Slic3r::GUI::wxGetApp().normal_font());
-        btn->SetBitmap(create_scaled_bitmap("zoom.png"));
+
 		auto sizer = new wxBoxSizer(wxHORIZONTAL);
 		sizer->Add(btn);
 
@@ -1770,10 +1816,9 @@ void TabPrinter::build_printhost(ConfigOptionsGroup *optgroup)
 	};
 
 	auto print_host_test = [this](wxWindow* parent) {
-		auto btn = m_print_host_test_btn = new wxButton(parent, wxID_ANY, _(L("Test")), 
-			wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
+        add_scaled_button(parent, &m_print_host_test_btn, "test", _(L("Test")), wxBU_LEFT | wxBU_EXACTFIT);
+        ScalableButton* btn = m_print_host_test_btn;
 		btn->SetFont(Slic3r::GUI::wxGetApp().normal_font());
-        btn->SetBitmap(create_scaled_bitmap("wrench.png"));
 		auto sizer = new wxBoxSizer(wxHORIZONTAL);
 		sizer->Add(btn);
 
@@ -1808,10 +1853,9 @@ void TabPrinter::build_printhost(ConfigOptionsGroup *optgroup)
 		Line cafile_line = optgroup->create_single_option_line("printhost_cafile");
 
 		auto printhost_cafile_browse = [this, optgroup] (wxWindow* parent) {
-			auto btn = new wxButton(parent, wxID_ANY, _(L(" Browse "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
-// 			btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("zoom.png")), wxBITMAP_TYPE_PNG));
+			auto btn = new wxButton(parent, wxID_ANY, " " + _(L("Browse"))+" " +dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
 			btn->SetFont(Slic3r::GUI::wxGetApp().normal_font());
-			btn->SetBitmap(create_scaled_bitmap("zoom.png"));
+			btn->SetBitmap(create_scaled_bitmap(this, "browse"));
 			auto sizer = new wxBoxSizer(wxHORIZONTAL);
 			sizer->Add(btn);
 
@@ -1845,9 +1889,9 @@ void TabPrinter::build_printhost(ConfigOptionsGroup *optgroup)
 
 		line.widget = [this, ca_file_hint] (wxWindow* parent) {
 			auto txt = new wxStaticText(parent, wxID_ANY, wxString::Format("%s\n\n\t%s",
-				_(L("HTTPS CA File:\n\
-\tOn this system, Slic3r uses HTTPS certificates from the system Certificate Store or Keychain.\n\
-\tTo use a custom CA file, please import your CA file into Certificate Store / Keychain.")),
+	wxString::Format(_(L("HTTPS CA File:\n\
+    \tOn this system, %s uses HTTPS certificates from the system Certificate Store or Keychain.\n\
+    \tTo use a custom CA file, please import your CA file into Certificate Store / Keychain.")), SLIC3R_APP_NAME),
 				ca_file_hint));
 			txt->SetFont(Slic3r::GUI::wxGetApp().normal_font());
 			auto sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -1878,19 +1922,20 @@ void TabPrinter::build_fff()
 
 	auto   *nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(m_config->option("nozzle_diameter"));
 	m_initial_extruders_count = m_extruders_count = nozzle_diameter->values.size();
+    wxGetApp().sidebar().update_objects_list_extruder_column(m_initial_extruders_count);
+
 	const Preset* parent_preset = m_presets->get_selected_preset_parent();
 	m_sys_extruders_count = parent_preset == nullptr ? 0 :
 			static_cast<const ConfigOptionFloats*>(parent_preset->config.option("nozzle_diameter"))->values.size();
 
-	auto page = add_options_page(_(L("General")), "printer_empty.png");
+	auto page = add_options_page(_(L("General")), "printer");
 		auto optgroup = page->new_optgroup(_(L("Size and coordinates")));
 
         Line line = optgroup->create_single_option_line("bed_shape");//{ _(L("Bed shape")), "" };
 		line.widget = [this](wxWindow* parent) {
-			auto btn = new wxButton(parent, wxID_ANY, _(L(" Set "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
-            btn->SetFont(wxGetApp().small_font());
-// 			btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("printer_empty.png")), wxBITMAP_TYPE_PNG));
-            btn->SetBitmap(create_scaled_bitmap("printer_empty.png"));
+            ScalableButton* btn;
+            add_scaled_button(parent, &btn, "printer_white",  " " + _(L("Set")) + " " + dots, wxBU_LEFT | wxBU_EXACTFIT);
+            btn->SetFont(wxGetApp().normal_font());
 
 			auto sizer = new wxBoxSizer(wxHORIZONTAL);
 			sizer->Add(btn);
@@ -1914,7 +1959,7 @@ void TabPrinter::build_fff()
 		optgroup = page->new_optgroup(_(L("Capabilities")));
 		ConfigOptionDef def;
 			def.type =  coInt,
-			def.default_value = new ConfigOptionInt(1); 
+			def.set_default_value(new ConfigOptionInt(1)); 
 			def.label = L("Extruders");
 			def.tooltip = L("Number of extruders of the printer.");
 			def.min = 1;
@@ -2006,7 +2051,7 @@ void TabPrinter::build_fff()
 						m_use_silent_mode = val;
 					}
 				}
-				build_extruder_pages();
+				build_unregular_pages();
 				update_dirty();
 				on_value_change(opt_key, value);
 			});
@@ -2018,9 +2063,9 @@ void TabPrinter::build_fff()
 		optgroup->append_single_option_line("use_volumetric_e");
 		optgroup->append_single_option_line("variable_layer_height");
 
-    const int gcode_field_height = 15 * m_em_unit; // 150
-    const int notes_field_height = 25 * m_em_unit; // 250
-	page = add_options_page(_(L("Custom G-code")), "cog.png");
+    const int gcode_field_height = 15; // 150
+    const int notes_field_height = 25; // 250
+	page = add_options_page(_(L("Custom G-code")), "cog");
 		optgroup = page->new_optgroup(_(L("Start G-code")), 0);
 		option = optgroup->get_option("start_gcode");
 		option.opt.full_width = true;
@@ -2073,7 +2118,7 @@ void TabPrinter::build_fff()
 		};
 		optgroup->append_line(line);
 
-	build_extruder_pages();
+	build_unregular_pages();
 
 #if 0
 	if (!m_no_controller)
@@ -2085,15 +2130,15 @@ void TabPrinter::build_sla()
 {
     if (!m_pages.empty())
         m_pages.resize(0);
-    auto page = add_options_page(_(L("General")), "printer_empty.png");
+    auto page = add_options_page(_(L("General")), "printer");
     auto optgroup = page->new_optgroup(_(L("Size and coordinates")));
 
     Line line = optgroup->create_single_option_line("bed_shape");//{ _(L("Bed shape")), "" };
     line.widget = [this](wxWindow* parent) {
-        auto btn = new wxButton(parent, wxID_ANY, _(L(" Set ")) + dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
-        btn->SetFont(wxGetApp().small_font());
-//         btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("printer_empty.png")), wxBITMAP_TYPE_PNG));
-        btn->SetBitmap(create_scaled_bitmap("printer_empty.png"));
+        ScalableButton* btn;
+        add_scaled_button(parent, &btn, "printer_white", " " + _(L("Set")) + " " + dots, wxBU_LEFT | wxBU_EXACTFIT);
+        btn->SetFont(wxGetApp().normal_font());
+
 
         auto sizer = new wxBoxSizer(wxHORIZONTAL);
         sizer->Add(btn);
@@ -2132,21 +2177,24 @@ void TabPrinter::build_sla()
     optgroup->append_single_option_line("area_fill");
 
     optgroup = page->new_optgroup(_(L("Corrections")));
-    line = Line{ m_config->def()->get("printer_correction")->full_label, "" };
-    std::vector<std::string> axes{ "X", "Y", "Z" };
+    line = Line{ _(m_config->def()->get("relative_correction")->full_label), "" };
+//    std::vector<std::string> axes{ "X", "Y", "Z" };
+    std::vector<std::string> axes{ "XY", "Z" };
     int id = 0;
     for (auto& axis : axes) {
-        auto opt = optgroup->get_option("printer_correction", id);
+        auto opt = optgroup->get_option("relative_correction", id);
         opt.opt.label = axis;
         line.append_option(opt);
         ++id;
     }
     optgroup->append_line(line);
+    optgroup->append_single_option_line("absolute_correction");
+    optgroup->append_single_option_line("gamma_correction");
 
     optgroup = page->new_optgroup(_(L("Print Host upload")));
     build_printhost(optgroup.get());
 
-    const int notes_field_height = 25 * m_em_unit; // 250
+    const int notes_field_height = 25; // 250
 
     page = add_options_page(_(L("Notes")), "note.png");
     optgroup = page->new_optgroup(_(L("Notes")), 0);
@@ -2174,19 +2222,29 @@ void TabPrinter::update_serial_ports()
 
 void TabPrinter::extruders_count_changed(size_t extruders_count)
 {
+    bool is_count_changed = false;
+    if (m_extruders_count != extruders_count) {
 	m_extruders_count = extruders_count;
 	m_preset_bundle->printers.get_edited_preset().set_num_extruders(extruders_count);
 	m_preset_bundle->update_multi_material_filament_presets();
-	build_extruder_pages();
-	reload_config();
+        is_count_changed = true;
+    }
+
+    /* This function should be call in any case because of correct updating/rebuilding 
+     * of unregular pages of a Printer Settings
+     */
+	build_unregular_pages();
+
+    if (is_count_changed) {
 	on_value_change("extruders_count", extruders_count);
     wxGetApp().sidebar().update_objects_list_extruder_column(extruders_count);
 }
+}
 
 void TabPrinter::append_option_line(ConfigOptionsGroupShp optgroup, const std::string opt_key)
 {
 	auto option = optgroup->get_option(opt_key, 0);
-	auto line = Line{ option.opt.full_label, "" };
+	auto line = Line{ _(option.opt.full_label), "" };
 	line.append_option(option);
 	if (m_use_silent_mode)
 		line.append_option(optgroup->get_option(opt_key, 1));
@@ -2195,28 +2253,28 @@ void TabPrinter::append_option_line(ConfigOptionsGroupShp optgroup, const std::s
 
 PageShp TabPrinter::build_kinematics_page()
 {
-	auto page = add_options_page(_(L("Machine limits")), "cog.png", true);
+	auto page = add_options_page(_(L("Machine limits")), "cog", true);
 
 	if (m_use_silent_mode)	{
 		// Legend for OptionsGroups
 		auto optgroup = page->new_optgroup("");
 		optgroup->set_show_modified_btns_val(false);
-        optgroup->label_width = 23 * m_em_unit;// 230;
+        optgroup->label_width = 23;// 230;
 		auto line = Line{ "", "" };
 
 		ConfigOptionDef def;
 		def.type = coString;
-		def.width = 150;
+		def.width = 15;
 		def.gui_type = "legend";
         def.mode = comAdvanced;
-		def.tooltip = L("Values in this column are for Full Power mode");
-		def.default_value = new ConfigOptionString{ L("Full Power") };
+		def.tooltip = L("Values in this column are for Normal mode");
+		def.set_default_value(new ConfigOptionString{ _(L("Normal")).ToUTF8().data() });
 
 		auto option = Option(def, "full_power_legend");
 		line.append_option(option);
 
-		def.tooltip = L("Values in this column are for Silent mode");
-		def.default_value = new ConfigOptionString{ L("Silent") };
+		def.tooltip = L("Values in this column are for Stealth mode");
+		def.set_default_value(new ConfigOptionString{ _(L("Stealth")).ToUTF8().data() });
 		option = Option(def, "silent_legend");
 		line.append_option(option);
 
@@ -2248,12 +2306,23 @@ PageShp TabPrinter::build_kinematics_page()
 	return page;
 }
 
-
-void TabPrinter::build_extruder_pages()
+/* Previous name build_extruder_pages().
+ * 
+ * This function was renamed because of now it implements not just an extruder pages building, 
+ * but "Machine limits" and "Single extruder MM setup" too 
+ * (These pages can changes according to the another values of a current preset)
+ * */
+void TabPrinter::build_unregular_pages()
 {
 	size_t		n_before_extruders = 2;			//	Count of pages before Extruder pages
 	bool		is_marlin_flavor = m_config->option<ConfigOptionEnum<GCodeFlavor>>("gcode_flavor")->value == gcfMarlin;
 
+    /* ! Freeze/Thaw in this function is needed to avoid call OnPaint() for erased pages 
+     * and be cause of application crash, when try to change Preset in moment,
+     * when one of unregular pages is selected.
+     *  */
+    Freeze();
+
 	// Add/delete Kinematics page according to is_marlin_flavor
 	size_t existed_page = 0;
 	for (int i = n_before_extruders; i < m_pages.size(); ++i) // first make sure it's not there already
@@ -2287,7 +2356,7 @@ void TabPrinter::build_extruder_pages()
 	}
 	if (m_extruders_count > 1 && m_config->opt_bool("single_extruder_multi_material") && !m_has_single_extruder_MM_page) {
 		// create a page, but pretend it's an extruder page, so we can add it to m_pages ourselves
-		auto page = add_options_page(_(L("Single extruder MM setup")), "printer_empty.png", true);
+		auto page = add_options_page(_(L("Single extruder MM setup")), "printer", true);
 		auto optgroup = page->new_optgroup(_(L("Single extruder multimaterial parameters")));
 		optgroup->append_single_option_line("cooling_tube_retraction");
 		optgroup->append_single_option_line("cooling_tube_length");
@@ -2303,12 +2372,11 @@ void TabPrinter::build_extruder_pages()
 		m_has_single_extruder_MM_page = true;
 	}
 	
-
+    // Build missed extruder pages
 	for (auto extruder_idx = m_extruders_count_old; extruder_idx < m_extruders_count; ++extruder_idx) {
 		//# build page
-		char buf[512];
-		sprintf(buf, _CHB(L("Extruder %d")), extruder_idx + 1);
-		auto page = add_options_page(from_u8(buf), "funnel.png", true);
+        const wxString& page_name = wxString::Format(_(L("Extruder %d")), int(extruder_idx + 1));
+        auto page = add_options_page(page_name, "funnel", true);
 		m_pages.insert(m_pages.begin() + n_before_extruders + extruder_idx, page);
 			
 			auto optgroup = page->new_optgroup(_(L("Size")));
@@ -2352,8 +2420,13 @@ void TabPrinter::build_extruder_pages()
 		m_pages.erase(	m_pages.begin() + n_before_extruders + m_extruders_count, 
 						m_pages.begin() + n_before_extruders + m_extruders_count_old);
 
+    Thaw();
+
 	m_extruders_count_old = m_extruders_count;
 	rebuild_page_tree();
+
+    // Reload preset pages with current configuration values
+    reload_config();
 }
 
 // this gets executed after preset is loaded and before GUI fields are updated
@@ -2385,7 +2458,21 @@ void TabPrinter::update_pages()
     // set m_pages_(technology after changing) to m_pages
     // m_printer_technology will be set by Tab::load_current_preset()
     if (new_printer_technology == ptFFF)
-        m_pages_fff.empty() ? build_fff() : m_pages.swap(m_pages_fff);
+    {
+        if (m_pages_fff.empty())
+        {
+            build_fff();
+            if (m_extruders_count > 1)
+            {
+                m_preset_bundle->update_multi_material_filament_presets();
+                on_value_change("extruders_count", m_extruders_count);
+            }
+        }
+    else 
+            m_pages.swap(m_pages_fff);
+
+         wxGetApp().sidebar().update_objects_list_extruder_column(m_extruders_count);
+    }
     else 
         m_pages_sla.empty() ? build_sla() : m_pages.swap(m_pages_sla);
 
@@ -2620,9 +2707,11 @@ void Tab::rebuild_page_tree()
 
 	if (!have_selection) {
 		// this is triggered on first load, so we don't disable the sel change event
-		m_treectrl->SelectItem(m_treectrl->GetFirstVisibleItem());//! (treectrl->GetFirstChild(rootItem));
+		auto item = m_treectrl->GetFirstVisibleItem();
+		if (item) {
+			m_treectrl->SelectItem(item);
 	}
-// 	Thaw();
+}
 }
 
 void Tab::update_page_tree_visibility()
@@ -2647,7 +2736,10 @@ void Tab::update_page_tree_visibility()
 
     if (!have_selection) {
         // this is triggered on first load, so we don't disable the sel change event
-        m_treectrl->SelectItem(m_treectrl->GetFirstVisibleItem());//! (treectrl->GetFirstChild(rootItem));
+        auto item = m_treectrl->GetFirstVisibleItem();
+        if (item) {
+            m_treectrl->SelectItem(item);
+    }
     }
 
 }
@@ -2806,8 +2898,8 @@ bool Tab::may_discard_current_dirty_preset(PresetCollection* presets /*= nullptr
 	std::string   type_name  = presets->name();
 	wxString      tab        = "          ";
 	wxString      name       = old_preset.is_default ?
-		wxString::Format(_(L("Default preset (%s)")), _(type_name)) :                       //_(L("Default ")) + type_name + _(L(" preset")) :                
-		wxString::Format(_(L("Preset (%s)")), _(type_name)) + "\n" + tab + old_preset.name; //type_name + _(L(" preset\n")) + tab + old_preset.name;
+		wxString::Format(_(L("Default preset (%s)")), _(type_name)) :
+		wxString::Format(_(L("Preset (%s)")), _(type_name)) + "\n" + tab + old_preset.name;
 
 	// Collect descriptions of the dirty options.
 	wxString changes;
@@ -2855,9 +2947,10 @@ bool Tab::may_switch_to_SLA_preset()
 
 void Tab::OnTreeSelChange(wxTreeEvent& event)
 {
-	if (m_disable_tree_sel_changed_event) return;
+	if (m_disable_tree_sel_changed_event)         
+        return;
 
-// There is a bug related to Ubuntu overlay scrollbars, see https://github.com/prusa3d/Slic3r/issues/898 and https://github.com/prusa3d/Slic3r/issues/952.
+// There is a bug related to Ubuntu overlay scrollbars, see https://github.com/prusa3d/PrusaSlicer/issues/898 and https://github.com/prusa3d/PrusaSlicer/issues/952.
 // The issue apparently manifests when Show()ing a window with overlay scrollbars while the UI is frozen. For this reason,
 // we will Thaw the UI prematurely on Linux. This means destroing the no_updates object prematurely.
 #ifdef __linux__	
@@ -2923,11 +3016,10 @@ void Tab::save_preset(std::string name /*= ""*/)
 
 	if (name.empty()) {
 		const Preset &preset = m_presets->get_selected_preset();
-		auto default_name = preset.is_default ? "Untitled" : preset.name;
-		if (preset.is_system) {
-			default_name += " - ";
-			default_name += _(L("Copy")).ToUTF8().data();
-		}
+        auto default_name = preset.is_default ? "Untitled" :
+                            preset.is_system ? (boost::format(_utf8(L("%1% - Copy"))) % preset.name).str() : 
+	                        preset.name;
+
  		bool have_extention = boost::iends_with(default_name, ".ini");
 		if (have_extention) {
 			size_t len = default_name.length()-4;
@@ -2983,10 +3075,12 @@ void Tab::delete_preset()
 {
 	auto current_preset = m_presets->get_selected_preset();
 	// Don't let the user delete the ' - default - ' configuration.
-	wxString action = current_preset.is_external ? _(L("remove")) : _(L("delete"));
-	wxString msg = _(L("Are you sure you want to ")) + action + _(L(" the selected preset?"));
-	action = current_preset.is_external ? _(L("Remove")) : _(L("Delete"));
-	wxString title = action + _(L(" Preset"));
+    std::string action = current_preset.is_external ? _utf8(L("remove")) : _utf8(L("delete"));
+    // TRN  remove/delete
+    const wxString msg = from_u8((boost::format(_utf8(L("Are you sure you want to %1% the selected preset?"))) % action).str());
+	action = current_preset.is_external ? _utf8(L("Remove")) : _utf8(L("Delete"));
+	// TRN  Remove/Delete
+    wxString title = from_u8((boost::format(_utf8(L("%1% Preset"))) % action).str());  //action + _(L(" Preset"));
 	if (current_preset.is_default ||
 		wxID_YES != wxMessageDialog(parent(), msg, title, wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION).ShowModal())
 		return;
@@ -3004,7 +3098,7 @@ void Tab::toggle_show_hide_incompatible()
 
 void Tab::update_show_hide_incompatible_button()
 {
-	m_btn_hide_incompatible_presets->SetBitmap(m_show_incompatible_presets ?
+	m_btn_hide_incompatible_presets->SetBitmap_(m_show_incompatible_presets ?
 		m_bmp_show_incompatible_presets : m_bmp_hide_incompatible_presets);
 	m_btn_hide_incompatible_presets->SetToolTip(m_show_incompatible_presets ?
 		"Both compatible an incompatible presets are shown. Click to hide presets not compatible with the current printer." :
@@ -3036,12 +3130,9 @@ wxSizer* Tab::compatible_widget_create(wxWindow* parent, PresetDependencies &dep
 {
 	deps.checkbox = new wxCheckBox(parent, wxID_ANY, _(L("All")));
 	deps.checkbox->SetFont(Slic3r::GUI::wxGetApp().normal_font());
-	deps.btn = new wxButton(parent, wxID_ANY, _(L(" Set "))+dots, wxDefaultPosition, wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
+    add_scaled_button(parent, &deps.btn, "printer_white", wxString::Format(" %s %s", _(L("Set")), dots), wxBU_LEFT | wxBU_EXACTFIT);
 	deps.btn->SetFont(Slic3r::GUI::wxGetApp().normal_font());
 
-// 	deps.btn->SetBitmap(wxBitmap(from_u8(Slic3r::var("printer_empty.png")), wxBITMAP_TYPE_PNG));
-    deps.btn->SetBitmap(create_scaled_bitmap("printer_empty.png"));
-
 	auto sizer = new wxBoxSizer(wxHORIZONTAL);
 	sizer->Add((deps.checkbox), 0, wxALIGN_CENTER_VERTICAL);
 	sizer->Add((deps.btn), 0, wxALIGN_CENTER_VERTICAL);
@@ -3115,24 +3206,28 @@ void Tab::compatible_widget_reload(PresetDependencies &deps)
 
 void Tab::fill_icon_descriptions()
 {
-	m_icon_descriptions.push_back(t_icon_description(&m_bmp_value_lock, L("LOCKED LOCK;"
-		"indicates that the settings are the same as the system values for the current option group")));
+	m_icon_descriptions.emplace_back(&m_bmp_value_lock, L("LOCKED LOCK"),
+        // TRN Description for "LOCKED LOCK"
+		L("indicates that the settings are the same as the system values for the current option group"));
 
-	m_icon_descriptions.push_back(t_icon_description(&m_bmp_value_unlock, L("UNLOCKED LOCK;"
-		"indicates that some settings were changed and are not equal to the system values for "
+    m_icon_descriptions.emplace_back(&m_bmp_value_unlock, L("UNLOCKED LOCK"),
+        // TRN Description for "UNLOCKED LOCK"
+		L("indicates that some settings were changed and are not equal to the system values for "
 		"the current option group.\n"
 		"Click the UNLOCKED LOCK icon to reset all settings for current option group to "
-		"the system values.")));
+		"the system values."));
 
-	m_icon_descriptions.push_back(t_icon_description(&m_bmp_white_bullet, L("WHITE BULLET;"
-		"for the left button: \tindicates a non-system preset,\n"
-		"for the right button: \tindicates that the settings hasn't been modified.")));
+    m_icon_descriptions.emplace_back(&m_bmp_white_bullet, L("WHITE BULLET"),
+        // TRN Description for "WHITE BULLET"
+        L("for the left button: \tindicates a non-system preset,\n"
+		"for the right button: \tindicates that the settings hasn't been modified."));
 
-	m_icon_descriptions.push_back(t_icon_description(&m_bmp_value_revert, L("BACK ARROW;"
-		"indicates that the settings were changed and are not equal to the last saved preset for "
+    m_icon_descriptions.emplace_back(&m_bmp_value_revert, L("BACK ARROW"),
+        // TRN Description for "BACK ARROW"
+        L("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.")));
+		"the last saved preset."));
 }
 
 void Tab::set_tooltips_text()
@@ -3197,6 +3292,12 @@ void Page::update_visibility(ConfigOptionMode mode)
     m_show = ret_val;
 }
 
+void Page::msw_rescale()
+{
+    for (auto group : m_optgroups)
+        group->msw_rescale();
+}
+
 Field* Page::get_field(const t_config_option_key& opt_key, int opt_index /*= -1*/) const
 {
 	Field* field = nullptr;
@@ -3220,19 +3321,16 @@ bool Page::set_value(const t_config_option_key& opt_key, const boost::any& value
 // package Slic3r::GUI::Tab::Page;
 ConfigOptionsGroupShp Page::new_optgroup(const wxString& title, int noncommon_label_width /*= -1*/)
 {
-    auto extra_column = [](wxWindow* parent, const Line& line)
+    auto extra_column = [this](wxWindow* parent, const Line& line)
     {
         std::string bmp_name;
         const std::vector<Option>& options = line.get_options();
-        if (options.size() == 0 || options[0].opt.gui_type == "legend")
-            bmp_name = "";// "error.png";
-        else {
-            auto mode = options[0].opt.mode;  //we assume that we have one option per line
-            bmp_name = mode == comExpert   ? "mode_expert_.png" :
-                       mode == comAdvanced ? "mode_middle_.png" : "mode_simple_.png";
-        }                               
-//         auto bmp = new wxStaticBitmap(parent, wxID_ANY, bmp_name.empty() ? wxNullBitmap : wxBitmap(from_u8(var(bmp_name)), wxBITMAP_TYPE_PNG));
-        auto bmp = new wxStaticBitmap(parent, wxID_ANY, bmp_name.empty() ? wxNullBitmap : create_scaled_bitmap(bmp_name));
+        int mode_id = int(options[0].opt.mode);
+        const wxBitmap& bitmap = options.size() == 0 || options[0].opt.gui_type == "legend" ? wxNullBitmap :
+                                 m_mode_bitmap_cache[mode_id].bmp();
+        auto bmp = new wxStaticBitmap(parent, wxID_ANY, bitmap);
+        bmp->SetClientData((void*)&m_mode_bitmap_cache[mode_id]);
+
         bmp->SetBackgroundStyle(wxBG_STYLE_PAINT);
         return bmp;
     };
@@ -3271,6 +3369,14 @@ ConfigOptionsGroupShp Page::new_optgroup(const wxString& title, int noncommon_la
 		return static_cast<Tab*>(tab)->m_presets->get_selected_preset_parent() != nullptr;
 	};
 
+    optgroup->rescale_extra_column_item = [this](wxWindow* win) {
+        auto *ctrl = dynamic_cast<wxStaticBitmap*>(win);
+        if (ctrl == nullptr)
+            return;
+
+        ctrl->SetBitmap(reinterpret_cast<ScalableBitmap*>(ctrl->GetClientData())->bmp());
+    };
+
 	vsizer()->Add(optgroup->sizer, 0, wxEXPAND | wxALL, 10);
 	m_optgroups.push_back(optgroup);
 
@@ -3279,7 +3385,8 @@ ConfigOptionsGroupShp Page::new_optgroup(const wxString& title, int noncommon_la
 
 void SavePresetWindow::build(const wxString& title, const std::string& default_name, std::vector<std::string> &values)
 {
-	auto text = new wxStaticText(this, wxID_ANY, _(L("Save ")) + title + _(L(" as:")), 
+    // TRN Preset
+	auto text = new wxStaticText(this, wxID_ANY, wxString::Format(_(L("Save %s as:")), title), 
 									wxDefaultPosition, wxDefaultSize);
 	m_combo = new wxComboBox(this, wxID_ANY, from_u8(default_name), 
 							wxDefaultPosition, wxDefaultSize, 0, 0, wxTE_PROCESS_ENTER);
@@ -3304,27 +3411,27 @@ void SavePresetWindow::accept()
 {
 	m_chosen_name = normalize_utf8_nfc(m_combo->GetValue().ToUTF8());
 	if (!m_chosen_name.empty()) {
-		const char* unusable_symbols = "<>:/\\|?*\"";
+		const char* unusable_symbols = "<>[]:/\\|?*\"";
 		bool is_unusable_symbol = false;
-		bool is_unusable_postfix = false;
-		const std::string unusable_postfix = PresetCollection::get_suffix_modified();//"(modified)";
+		bool is_unusable_suffix = false;
+		const std::string unusable_suffix = PresetCollection::get_suffix_modified();//"(modified)";
 		for (size_t i = 0; i < std::strlen(unusable_symbols); i++) {
 			if (m_chosen_name.find_first_of(unusable_symbols[i]) != std::string::npos) {
 				is_unusable_symbol = true;
 				break;
 			}
 		}
-		if (m_chosen_name.find(unusable_postfix) != std::string::npos)
-			is_unusable_postfix = true;
+		if (m_chosen_name.find(unusable_suffix) != std::string::npos)
+			is_unusable_suffix = true;
 
 		if (is_unusable_symbol) {
 			show_error(this,_(L("The supplied name is not valid;")) + "\n" +
-							_(L("the following characters are not allowed:")) + " <>:/\\|?*\"");
+							_(L("the following characters are not allowed:")) + " " + unusable_symbols);
 		}
-		else if (is_unusable_postfix) {
+		else if (is_unusable_suffix) {
 			show_error(this,_(L("The supplied name is not valid;")) + "\n" +
-							_(L("the following postfix are not allowed:")) + "\n\t" + //unusable_postfix);
-							wxString::FromUTF8(unusable_postfix.c_str()));
+							_(L("the following suffix is not allowed:")) + "\n\t" +
+							wxString::FromUTF8(unusable_suffix.c_str()));
 		}
 		else if (m_chosen_name == "- default -") {
 			show_error(this, _(L("The supplied name is not available.")));
@@ -3340,7 +3447,7 @@ void TabSLAMaterial::build()
     m_presets = &m_preset_bundle->sla_materials;
     load_initial_data();
 
-    auto page = add_options_page(_(L("Material")), "package_green.png");
+    auto page = add_options_page(_(L("Material")), "resin");
 
     auto optgroup = page->new_optgroup(_(L("Layers")));
 //     optgroup->append_single_option_line("layer_height");
@@ -3351,31 +3458,32 @@ void TabSLAMaterial::build()
     optgroup->append_single_option_line("initial_exposure_time");
 
     optgroup = page->new_optgroup(_(L("Corrections")));
-    optgroup->label_width = 19 * m_em_unit;//190;
-    std::vector<std::string> corrections = { "material_correction_printing", "material_correction_curing" };
-    std::vector<std::string> axes{ "X", "Y", "Z" };
+    optgroup->label_width = 19;//190;
+    std::vector<std::string> corrections = {"material_correction"};
+//    std::vector<std::string> axes{ "X", "Y", "Z" };
+    std::vector<std::string> axes{ "XY", "Z" };
     for (auto& opt_key : corrections) {
-        auto line = Line{ m_config->def()->get(opt_key)->full_label, "" };
+        auto line = Line{ _(m_config->def()->get(opt_key)->full_label), "" };
         int id = 0;
         for (auto& axis : axes) {
             auto opt = optgroup->get_option(opt_key, id);
             opt.opt.label = axis;
-            opt.opt.width = 60;
+            opt.opt.width = 6;
             line.append_option(opt);
             ++id;
         }
         optgroup->append_line(line);
     }
 
-    page = add_options_page(_(L("Notes")), "note.png");
+    page = add_options_page(_(L("Notes")), "note");
     optgroup = page->new_optgroup(_(L("Notes")), 0);
     optgroup->label_width = 0;
     Option option = optgroup->get_option("material_notes");
     option.opt.full_width = true;
-    option.opt.height = 25 * m_em_unit;//250;
+    option.opt.height = 25;//250;
     optgroup->append_single_option_line(option);
 
-    page = add_options_page(_(L("Dependencies")), "wrench.png");
+    page = add_options_page(_(L("Dependencies")), "wrench");
     optgroup = page->new_optgroup(_(L("Profile dependencies")));
     Line line = optgroup->create_single_option_line("compatible_printers");
     line.widget = [this](wxWindow* parent) {
@@ -3430,13 +3538,13 @@ void TabSLAPrint::build()
     m_presets = &m_preset_bundle->sla_prints;
     load_initial_data();
 
-    auto page = add_options_page(_(L("Layers and perimeters")), "package_green.png");
+    auto page = add_options_page(_(L("Layers and perimeters")), "layers");
 
     auto optgroup = page->new_optgroup(_(L("Layers")));
     optgroup->append_single_option_line("layer_height");
     optgroup->append_single_option_line("faded_layers");
 
-    page = add_options_page(_(L("Supports")), "building.png");
+    page = add_options_page(_(L("Supports")), "support"/*"sla_supports"*/);
     optgroup = page->new_optgroup(_(L("Supports")));
     optgroup->append_single_option_line("supports_enable");
 
@@ -3464,7 +3572,7 @@ void TabSLAPrint::build()
     optgroup->append_single_option_line("support_points_density_relative");
     optgroup->append_single_option_line("support_points_minimal_distance");
 
-    page = add_options_page(_(L("Pad")), "brick.png");
+    page = add_options_page(_(L("Pad")), "pad");
     optgroup = page->new_optgroup(_(L("Pad")));
     optgroup->append_single_option_line("pad_enable");
     optgroup->append_single_option_line("pad_wall_thickness");
@@ -3474,17 +3582,17 @@ void TabSLAPrint::build()
 //    optgroup->append_single_option_line("pad_edge_radius");
     optgroup->append_single_option_line("pad_wall_slope");
 
-	page = add_options_page(_(L("Advanced")), "wrench.png");
+	page = add_options_page(_(L("Advanced")), "wrench");
 	optgroup = page->new_optgroup(_(L("Slicing")));
 	optgroup->append_single_option_line("slice_closing_radius");
 
-	page = add_options_page(_(L("Output options")), "page_white_go.png");
+	page = add_options_page(_(L("Output options")), "output+page_white");
 	optgroup = page->new_optgroup(_(L("Output file")));
 	Option option = optgroup->get_option("output_filename_format");
 	option.opt.full_width = true;
 	optgroup->append_single_option_line(option);
 
-    page = add_options_page(_(L("Dependencies")), "wrench.png");
+    page = add_options_page(_(L("Dependencies")), "wrench");
     optgroup = page->new_optgroup(_(L("Profile dependencies")));
     Line line = optgroup->create_single_option_line("compatible_printers");//Line { _(L("Compatible printers")), "" };
     line.widget = [this](wxWindow* parent) {
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 1412d398c..6bbe15f7f 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -29,15 +29,13 @@
 #include <memory>
 
 #include "BedShapeDialog.hpp"
+#include "ButtonsDescription.hpp"
 #include "Event.hpp"
-
-class PrusaModeSizer;
+#include "wxExtensions.hpp"
 
 namespace Slic3r {
 namespace GUI {
 
-typedef std::pair<wxBitmap*, std::string>				t_icon_description;
-typedef std::vector<std::pair<wxBitmap*, std::string>>	t_icon_descriptions;
 
 // Single Tab page containing a{ vsizer } of{ optgroups }
 // package Slic3r::GUI::Tab::Page;
@@ -50,10 +48,11 @@ class Page : public wxScrolledWindow
 	wxBoxSizer*		m_vsizer;
     bool            m_show = true;
 public:
-	Page(wxWindow* parent, const wxString title, const int iconID) :
+    Page(wxWindow* parent, const wxString title, const int iconID, const std::vector<ScalableBitmap>& mode_bmp_cache) :
 			m_parent(parent),
 			m_title(title),
-			m_iconID(iconID)
+			m_iconID(iconID),
+            m_mode_bitmap_cache(mode_bmp_cache)
 	{
 		Create(m_parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
 		m_vsizer = new wxBoxSizer(wxVERTICAL);
@@ -67,6 +66,7 @@ public:
 
     // Delayed layout after resizing the main window.
     bool 				layout_valid = false;
+    const std::vector<ScalableBitmap>&   m_mode_bitmap_cache;
 
 public:
 	std::vector <ConfigOptionsGroupShp> m_optgroups;
@@ -79,6 +79,7 @@ public:
 	void		set_config(DynamicPrintConfig* config_in) { m_config = config_in; }
 	void		reload_config();
     void        update_visibility(ConfigOptionMode mode);
+    void        msw_rescale();
 	Field*		get_field(const t_config_option_key& opt_key, int opt_index = -1) const;
 	bool		set_value(const t_config_option_key& opt_key, const boost::any& value);
 	ConfigOptionsGroupShp	new_optgroup(const wxString& title, int noncommon_label_width = -1);
@@ -119,20 +120,20 @@ protected:
 	std::string			m_name;
 	const wxString		m_title;
 	wxBitmapComboBox*	m_presets_choice;
-	wxBitmapButton*		m_btn_save_preset;
-	wxBitmapButton*		m_btn_delete_preset;
-	wxBitmapButton*		m_btn_hide_incompatible_presets;
+	ScalableButton*		m_btn_save_preset;
+	ScalableButton*		m_btn_delete_preset;
+	ScalableButton*		m_btn_hide_incompatible_presets;
 	wxBoxSizer*			m_hsizer;
 	wxBoxSizer*			m_left_sizer;
 	wxTreeCtrl*			m_treectrl;
 	wxImageList*		m_icons;
 
-    PrusaModeSizer*     m_mode_sizer;
+    ModeSizer*     m_mode_sizer;
 
    	struct PresetDependencies {
 		Preset::Type type	  = Preset::TYPE_INVALID;
 		wxCheckBox 	*checkbox = nullptr;
-		wxButton 	*btn   	  = nullptr;
+		ScalableButton 	*btn  = nullptr;
 		std::string  key_list; // "compatible_printers"
 		std::string  key_condition;
 		std::string  dialog_title;
@@ -141,25 +142,27 @@ protected:
 	PresetDependencies 	m_compatible_printers;
 	PresetDependencies 	m_compatible_prints;
 
-	wxButton*			m_undo_btn;
-	wxButton*			m_undo_to_sys_btn;
-	wxButton*			m_question_btn;
-	wxImageList*		m_preset_icons;
+	ScalableButton*			m_undo_btn;
+	ScalableButton*			m_undo_to_sys_btn;
+	ScalableButton*			m_question_btn;
 
 	// Cached bitmaps.
 	// A "flag" icon to be displayned next to the preset name in the Tab's combo box.
-	wxBitmap			m_bmp_show_incompatible_presets;
-	wxBitmap			m_bmp_hide_incompatible_presets;
+	ScalableBitmap			m_bmp_show_incompatible_presets;
+	ScalableBitmap			m_bmp_hide_incompatible_presets;
 	// Bitmaps to be shown on the "Revert to system" aka "Lock to system" button next to each input field.
-	wxBitmap 			m_bmp_value_lock;
-	wxBitmap 			m_bmp_value_unlock;
-	wxBitmap 			m_bmp_white_bullet;
+	ScalableBitmap 			m_bmp_value_lock;
+	ScalableBitmap 			m_bmp_value_unlock;
+	ScalableBitmap 			m_bmp_white_bullet;
 	// The following bitmap points to either m_bmp_value_unlock or m_bmp_white_bullet, depending on whether the current preset has a parent preset.
-	wxBitmap 		   *m_bmp_non_system;
+	ScalableBitmap 		   *m_bmp_non_system;
 	// Bitmaps to be shown on the "Undo user changes" button next to each input field.
-	wxBitmap 			m_bmp_value_revert;
-// 	wxBitmap 			m_bmp_value_unmodified;
-	wxBitmap			m_bmp_question;
+	ScalableBitmap 			m_bmp_value_revert;
+    
+    std::vector<ScalableButton*>	m_scaled_buttons = {};    
+    std::vector<ScalableBitmap*>	m_scaled_bitmaps = {};    
+    std::vector<ScalableBitmap>     m_scaled_icons_list = {};
+    std::vector<ScalableBitmap>     m_mode_bitmap_cache = {};
 
 	// Colors for ui "decoration"
 	wxColour			m_sys_label_clr;
@@ -196,7 +199,7 @@ protected:
 	std::map<std::string, int>	m_options_list;
 	int							m_opt_status_value = 0;
 
-	t_icon_descriptions	m_icon_descriptions = {};
+	std::vector<ButtonsDescription::Entry>	m_icon_descriptions = {};
 
 	bool				m_is_modified_values{ false };
 	bool				m_is_nonsys_values{ true };
@@ -225,18 +228,24 @@ public:
     int                 m_update_cnt = 0;
 
 public:
-	Tab(wxNotebook* parent, const wxString& title, const char* name); 
-	~Tab() {}
+// 	Tab(wxNotebook* parent, const wxString& title, const char* name); 
+    Tab(wxNotebook* parent, const wxString& title, Preset::Type type);
+    ~Tab() {}
 
 	wxWindow*	parent() const { return m_parent; }
 	wxString	title()	 const { return m_title; }
-	std::string	name()	 const { return m_name; }
+// 	std::string	name()	 const { return m_name; }
+	std::string	name()	 const { return m_presets->name(); }
     Preset::Type type()  const { return m_type; }
     bool complited()     const { return m_complited; }
     virtual bool supports_printer_technology(const PrinterTechnology tech) = 0;
 
 	void		create_preset_tab();
-	void		load_current_preset();
+    void        add_scaled_button(wxWindow* parent, ScalableButton** btn, const std::string& icon_name, 
+                                  const wxString& label = wxEmptyString, 
+                                  long style = wxBU_EXACTFIT | wxNO_BORDER);
+    void        add_scaled_bitmap(wxWindow* parent, ScalableBitmap& btn, const std::string& icon_name);
+    void		load_current_preset();
 	void        rebuild_page_tree();
 	void        update_page_tree_visibility();
 	// Select a new preset, possibly delete the current one.
@@ -274,6 +283,7 @@ public:
 	virtual void	reload_config();
     void            update_mode();
     void            update_visibility();
+    void            msw_rescale();
 	Field*			get_field(const t_config_option_key& opt_key, int opt_index = -1) const;
 	bool			set_value(const t_config_option_key& opt_key, const boost::any& value);
 	wxSizer*		description_line_widget(wxWindow* parent, ogStaticText** StaticText);
@@ -304,7 +314,8 @@ class TabPrint : public Tab
     bool is_msg_dlg_already_exist {false};
 public:
 	TabPrint(wxNotebook* parent) : 
-		Tab(parent, _(L("Print Settings")), "print") {}
+// 		Tab(parent, _(L("Print Settings")), L("print")) {}
+        Tab(parent, _(L("Print Settings")), Slic3r::Preset::TYPE_PRINT) {}
 	~TabPrint() {}
 
 	ogStaticText*	m_recommended_thin_wall_thickness_description_line;
@@ -322,7 +333,8 @@ class TabFilament : public Tab
 	ogStaticText*	m_cooling_description_line;
 public:
 	TabFilament(wxNotebook* parent) : 
-		Tab(parent, _(L("Filament Settings")), "filament") {}
+// 		Tab(parent, _(L("Filament Settings")), L("filament")) {}
+		Tab(parent, _(L("Filament Settings")), Slic3r::Preset::TYPE_FILAMENT) {}
 	~TabFilament() {}
 
 	void		build() override;
@@ -345,8 +357,8 @@ class TabPrinter : public Tab
     void build_printhost(ConfigOptionsGroup *optgroup);
 public:
 	wxButton*	m_serial_test_btn = nullptr;
-	wxButton*	m_print_host_test_btn = nullptr;
-	wxButton*	m_printhost_browse_btn = nullptr;
+	ScalableButton*	m_print_host_test_btn = nullptr;
+	ScalableButton*	m_printhost_browse_btn = nullptr;
 
 	size_t		m_extruders_count;
 	size_t		m_extruders_count_old = 0;
@@ -355,7 +367,9 @@ public:
 
     PrinterTechnology               m_printer_technology = ptFFF;
 
-	TabPrinter(wxNotebook* parent) : Tab(parent, _(L("Hardware Settings")), "printer") {}
+// 	TabPrinter(wxNotebook* parent) : Tab(parent, _(L("Printer Settings")), L("printer")) {}
+    TabPrinter(wxNotebook* parent) : 
+        Tab(parent, _(L("Printer Settings")), Slic3r::Preset::TYPE_PRINTER) {}
 	~TabPrinter() {}
 
 	void		build() override;
@@ -368,7 +382,7 @@ public:
 	void		update_serial_ports();
 	void		extruders_count_changed(size_t extruders_count);
 	PageShp		build_kinematics_page();
-	void		build_extruder_pages();
+	void		build_unregular_pages();
 	void		on_preset_loaded() override;
 	void		init_options_list() override;
     bool 		supports_printer_technology(const PrinterTechnology /* tech */) override { return true; }
@@ -378,7 +392,8 @@ class TabSLAMaterial : public Tab
 {
 public:
     TabSLAMaterial(wxNotebook* parent) :
-		Tab(parent, _(L("Material Settings")), "sla_material") {}
+// 		Tab(parent, _(L("Material Settings")), L("sla_material")) {}
+		Tab(parent, _(L("Material Settings")), Slic3r::Preset::TYPE_SLA_MATERIAL) {}
     ~TabSLAMaterial() {}
 
 	void		build() override;
@@ -392,7 +407,8 @@ class TabSLAPrint : public Tab
 {
 public:
     TabSLAPrint(wxNotebook* parent) :
-        Tab(parent, _(L("Print Settings")), "sla_print") {}
+//         Tab(parent, _(L("Print Settings")), L("sla_print")) {}
+        Tab(parent, _(L("Print Settings")), Slic3r::Preset::TYPE_SLA_PRINT) {}
     ~TabSLAPrint() {}
     void		build() override;
 	void		reload_config() override;
diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp
index c4b78eb1a..c92037732 100644
--- a/src/slic3r/GUI/UpdateDialogs.cpp
+++ b/src/slic3r/GUI/UpdateDialogs.cpp
@@ -1,5 +1,9 @@
 #include "UpdateDialogs.hpp"
 
+#include <cstring>
+#include <boost/format.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
 #include <wx/settings.h>
 #include <wx/sizer.h>
 #include <wx/event.h>
@@ -15,30 +19,28 @@
 #include "GUI_App.hpp"
 #include "I18N.hpp"
 #include "ConfigWizard.hpp"
+#include "wxExtensions.hpp"
 
 namespace Slic3r {
 namespace GUI {
 
 
-static const std::string CONFIG_UPDATE_WIKI_URL("https://github.com/prusa3d/Slic3r/wiki/Slic3r-PE-1.40-configuration-update");
+static const char* URL_CHANGELOG = "http://files.prusa3d.com/file/?type=slicerstable&lng=%1%";
+static const char* URL_DOWNLOAD = "https://www.prusa3d.com/downloads&lng=%1%";
+static const char* URL_DEV = "https://github.com/supermerill/Slic3r++/releases/tag/version_%1%";
+
+static const std::string CONFIG_UPDATE_WIKI_URL("https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-PE-1.40-configuration-update");
 
 
 // MsgUpdateSlic3r
 
 MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_online) :
-	MsgDialog(nullptr, _(L("Update available")), _(L("New version of Slic3r PE is available"))),
+	MsgDialog(nullptr, _(L("Update available")), wxString::Format(_(L("New version of %s is available")), SLIC3R_APP_NAME)),
 	ver_current(ver_current),
 	ver_online(ver_online)
 {
-	const auto url = wxString::Format("https://github.com/prusa3d/Slic3r/releases/tag/version_%s", ver_online.to_string());
-	auto *link = new wxHyperlinkCtrl(this, wxID_ANY, url, url);
-
-	auto *text = new wxStaticText(this, wxID_ANY, _(L("To download, follow the link below.")));
-	const auto link_width = link->GetSize().GetWidth();
-	const int content_width = CONTENT_WIDTH * wxGetApp().em_unit();
-	text->Wrap(content_width > link_width ? content_width : link_width);
-	content_sizer->Add(text);
-	content_sizer->AddSpacer(VERT_SPACING);
+	const auto version = Semver::parse(SLIC3R_VERSION);
+	const bool dev_version = version->prerelease() != nullptr || boost::algorithm::ends_with(SLIC3R_BUILD_ID, "UNKNOWN");
 
 	auto *versions = new wxFlexGridSizer(2, 0, VERT_SPACING);
 	versions->Add(new wxStaticText(this, wxID_ANY, _(L("Current version:"))));
@@ -48,7 +50,25 @@ MsgUpdateSlic3r::MsgUpdateSlic3r(const Semver &ver_current, const Semver &ver_on
 	content_sizer->Add(versions);
 	content_sizer->AddSpacer(VERT_SPACING);
 
-	content_sizer->Add(link);
+	if (dev_version) {
+		const std::string url = (boost::format(URL_DEV) % ver_online.to_string()).str();
+		const wxString url_wx = from_u8(url);
+		auto *link = new wxHyperlinkCtrl(this, wxID_ANY, _(L("Changelog && Download")), url_wx);
+		content_sizer->Add(link);
+	} else {
+		const auto lang_code = wxGetApp().current_language_code().ToStdString();
+
+		const std::string url_log = (boost::format(URL_CHANGELOG) % lang_code).str();
+		const wxString url_log_wx = from_u8(url_log);
+		auto *link_log = new wxHyperlinkCtrl(this, wxID_ANY, _(L("Open changelog page")), url_log_wx);
+		content_sizer->Add(link_log);
+
+		const std::string url_dw = (boost::format(URL_DOWNLOAD) % lang_code).str();
+		const wxString url_dw_wx = from_u8(url_dw);
+		auto *link_dw = new wxHyperlinkCtrl(this, wxID_ANY, _(L("Open download page")), url_dw_wx);
+		content_sizer->Add(link_dw);
+	}
+
 	content_sizer->AddSpacer(2*VERT_SPACING);
 
 	cbox = new wxCheckBox(this, wxID_ANY, _(L("Don't notify about new releases any more")));
@@ -68,7 +88,7 @@ bool MsgUpdateSlic3r::disable_version_check() const
 
 // MsgUpdateConfig
 
-MsgUpdateConfig::MsgUpdateConfig(const std::unordered_map<std::string, std::string> &updates) :
+MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates) :
 	MsgDialog(nullptr, _(L("Configuration update")), _(L("Configuration update is available")), wxID_NONE)
 {
 	auto *text = new wxStaticText(this, wxID_ANY, _(L(
@@ -81,12 +101,31 @@ MsgUpdateConfig::MsgUpdateConfig(const std::unordered_map<std::string, std::stri
 	content_sizer->Add(text);
 	content_sizer->AddSpacer(VERT_SPACING);
 
-	auto *versions = new wxFlexGridSizer(2, 0, VERT_SPACING);
+	const auto lang_code = wxGetApp().current_language_code().ToStdString();
+
+	auto *versions = new wxBoxSizer(wxVERTICAL);
 	for (const auto &update : updates) {
-		auto *text_vendor = new wxStaticText(this, wxID_ANY, update.first);
+		auto *flex = new wxFlexGridSizer(2, 0, VERT_SPACING);
+
+		auto *text_vendor = new wxStaticText(this, wxID_ANY, update.vendor);
 		text_vendor->SetFont(boldfont);
-		versions->Add(text_vendor);
-		versions->Add(new wxStaticText(this, wxID_ANY, update.second));
+		flex->Add(text_vendor);
+		flex->Add(new wxStaticText(this, wxID_ANY, update.version.to_string()));
+
+		if (! update.comment.empty()) {
+			flex->Add(new wxStaticText(this, wxID_ANY, _(L("Comment:"))), 0, wxALIGN_RIGHT);
+			flex->Add(new wxStaticText(this, wxID_ANY, from_u8(update.comment)));
+		}
+
+		versions->Add(flex);
+
+		if (! update.changelog_url.empty()) {
+			auto *line = new wxBoxSizer(wxHORIZONTAL);
+			auto changelog_url = (boost::format(update.changelog_url) % lang_code).str();
+			line->AddSpacer(3*VERT_SPACING);
+			line->Add(new wxHyperlinkCtrl(this, wxID_ANY, _(L("Open changelog page")), changelog_url));
+			versions->Add(line);
+		}
 	}
 
 	content_sizer->Add(versions);
@@ -108,19 +147,22 @@ MsgUpdateConfig::~MsgUpdateConfig() {}
 // MsgDataIncompatible
 
 MsgDataIncompatible::MsgDataIncompatible(const std::unordered_map<std::string, wxString> &incompats) :
-	MsgDialog(nullptr, _(L("Slic3r incompatibility")), _(L("Slic3r configuration is incompatible")), wxBitmap(from_u8(Slic3r::var("Slic3r_192px_grayscale.png")), wxBITMAP_TYPE_PNG), wxID_NONE)
+    MsgDialog(nullptr, wxString::Format(_(L("%s incompatibility")), SLIC3R_APP_NAME), 
+                       wxString::Format(_(L("%s configuration is incompatible")), SLIC3R_APP_NAME), wxID_NONE)
 {
-	auto *text = new wxStaticText(this, wxID_ANY, _(L(
-		"This version of Slic3r PE is not compatible with currently installed configuration bundles.\n"
-		"This probably happened as a result of running an older Slic3r PE after using a newer one.\n\n"
+	logo->SetBitmap(create_scaled_bitmap(this, "Slic3r_192px_grayscale.png", 192));
 
-		"You may either exit Slic3r 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 Slic3r.\n"
-	)));
+	auto *text = new wxStaticText(this, wxID_ANY, wxString::Format(_(L(
+		"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.\n"
+		)), SLIC3R_APP_NAME, SLIC3R_APP_NAME, SLIC3R_APP_NAME, SLIC3R_APP_NAME));
 	text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
 	content_sizer->Add(text);
 
-	auto *text2 = new wxStaticText(this, wxID_ANY, wxString::Format(_(L("This Slic3r PE version: %s")), SLIC3R_VERSION));
+	auto *text2 = new wxStaticText(this, wxID_ANY, wxString::Format(_(L("This %s version: %s")), SLIC3R_APP_NAME, SLIC3R_VERSION));
 	text2->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
 	content_sizer->Add(text2);
 	content_sizer->AddSpacer(VERT_SPACING);
@@ -141,7 +183,7 @@ MsgDataIncompatible::MsgDataIncompatible(const std::unordered_map<std::string, w
 	content_sizer->Add(versions);
 	content_sizer->AddSpacer(2*VERT_SPACING);
 
-	auto *btn_exit = new wxButton(this, wxID_EXIT, _(L("Exit Slic3r")));
+    auto *btn_exit = new wxButton(this, wxID_EXIT, wxString::Format(_(L("Exit %s")), SLIC3R_APP_NAME));
 	btn_sizer->Add(btn_exit);
 	btn_sizer->AddSpacer(HORIZ_SPACING);
 	auto *btn_reconf = new wxButton(this, wxID_REPLACE, _(L("Re-configure")));
@@ -165,7 +207,7 @@ MsgDataLegacy::MsgDataLegacy() :
 {
 	auto *text = new wxStaticText(this, wxID_ANY, wxString::Format(
 		_(L(
-			"Slic3r PE now uses an updated configuration structure.\n\n"
+			"%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 "
@@ -175,16 +217,16 @@ MsgDataLegacy::MsgDataLegacy() :
 			"Please proceed with the %s that follows to set up the new presets "
 			"and to choose whether to enable automatic preset updates."
 		)),
-		ConfigWizard::name()
+		SLIC3R_APP_NAME, ConfigWizard::name()
 	));
 	text->Wrap(CONTENT_WIDTH * wxGetApp().em_unit());
 	content_sizer->Add(text);
 	content_sizer->AddSpacer(VERT_SPACING);
 
 	auto *text2 = new wxStaticText(this, wxID_ANY, _(L("For more information please visit our wiki page:")));
-	static const wxString url("https://github.com/prusa3d/Slic3r/wiki/Slic3r-PE-1.40-configuration-update");
+	static const wxString url("https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-PE-1.40-configuration-update");
 	// The wiki page name is intentionally not localized:
-	auto *link = new wxHyperlinkCtrl(this, wxID_ANY, "Slic3r PE 1.40 configuration update", CONFIG_UPDATE_WIKI_URL);
+	auto *link = new wxHyperlinkCtrl(this, wxID_ANY, wxString::Format("%s 1.40 configuration update", SLIC3R_APP_NAME), CONFIG_UPDATE_WIKI_URL);
 	content_sizer->Add(text2);
 	content_sizer->Add(link);
 	content_sizer->AddSpacer(VERT_SPACING);
diff --git a/src/slic3r/GUI/UpdateDialogs.hpp b/src/slic3r/GUI/UpdateDialogs.hpp
index 62548b98b..2a580e251 100644
--- a/src/slic3r/GUI/UpdateDialogs.hpp
+++ b/src/slic3r/GUI/UpdateDialogs.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 #include "slic3r/Utils/Semver.hpp"
 #include "MsgDialog.hpp"
@@ -40,8 +41,22 @@ private:
 class MsgUpdateConfig : public MsgDialog
 {
 public:
-	// updates is a map of "vendor name" -> "version (comment)"
-	MsgUpdateConfig(const std::unordered_map<std::string, std::string> &updates);
+	struct Update
+	{
+		std::string vendor;
+		Semver version;
+		std::string comment;
+		std::string changelog_url;
+
+		Update(std::string vendor, Semver version, std::string comment, std::string changelog_url)
+			: vendor(std::move(vendor))
+			, version(std::move(version))
+			, comment(std::move(comment))
+			, changelog_url(std::move(changelog_url))
+		{}
+	};
+
+	MsgUpdateConfig(const std::vector<Update> &updates);
 	MsgUpdateConfig(MsgUpdateConfig &&) = delete;
 	MsgUpdateConfig(const MsgUpdateConfig &) = delete;
 	MsgUpdateConfig &operator=(MsgUpdateConfig &&) = delete;
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index dee18ad43..24fe778c9 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -1,5 +1,7 @@
 #include "wxExtensions.hpp"
 
+#include <stdexcept>
+
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Model.hpp"
 
@@ -8,26 +10,74 @@
 #include <wx/dcclient.h>
 #include <wx/numformatter.h>
 
+#include <boost/algorithm/string/replace.hpp>
+
 #include "BitmapCache.hpp"
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "GUI_ObjectList.hpp"
 #include "libslic3r/GCode/PreviewData.hpp"
 #include "I18N.hpp"
+#include "GUI_Utils.hpp"
 
 using Slic3r::GUI::from_u8;
 
 wxDEFINE_EVENT(wxCUSTOMEVT_TICKSCHANGED, wxEvent);
 wxDEFINE_EVENT(wxCUSTOMEVT_LAST_VOLUME_IS_DELETED, wxCommandEvent);
 
+#ifndef __WXGTK__// msw_menuitem_bitmaps is used for MSW and OSX
+static std::map<int, std::string> msw_menuitem_bitmaps;
+#ifdef __WXMSW__
+void msw_rescale_menu(wxMenu* menu)
+{
+	struct update_icons {
+		static void run(wxMenuItem* item) {
+			const auto it = msw_menuitem_bitmaps.find(item->GetId());
+			if (it != msw_menuitem_bitmaps.end()) {
+				const wxBitmap& item_icon = create_scaled_bitmap(nullptr, it->second);
+				if (item_icon.IsOk())
+					item->SetBitmap(item_icon);
+			}
+			if (item->IsSubMenu())
+				for (wxMenuItem *sub_item : item->GetSubMenu()->GetMenuItems())
+					update_icons::run(sub_item);
+		}
+	};
+
+	for (wxMenuItem *item : menu->GetMenuItems())
+		update_icons::run(item);
+}
+#endif /* __WXMSW__ */
+#endif /* no __WXGTK__ */
+
+void enable_menu_item(wxUpdateUIEvent& evt, std::function<bool()> const cb_condition, wxMenuItem* item)
+{
+    const bool enable = cb_condition();
+    evt.Enable(enable);
+
+#ifdef __WXOSX__
+    const auto it = msw_menuitem_bitmaps.find(item->GetId());
+    if (it != msw_menuitem_bitmaps.end())
+    {
+        const wxBitmap& item_icon = create_scaled_bitmap(nullptr, it->second, 16, false, !enable);
+        if (item_icon.IsOk())
+            item->SetBitmap(item_icon);
+    }
+#endif // __WXOSX__
+}
+
 wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description,
-    std::function<void(wxCommandEvent& event)> cb, const wxBitmap& icon, wxEvtHandler* event_handler)
+    std::function<void(wxCommandEvent& event)> cb, const wxBitmap& icon, wxEvtHandler* event_handler,
+    std::function<bool()> const cb_condition, wxWindow* parent)
 {
     if (id == wxID_ANY)
         id = wxNewId();
 
-    wxMenuItem* item = menu->Append(id, string, description);
-    item->SetBitmap(icon);
+    auto *item = new wxMenuItem(menu, id, string, description);
+    if (icon.IsOk()) {
+        item->SetBitmap(icon);
+    }
+    menu->Append(item);
 
 #ifdef __WXMSW__
     if (event_handler != nullptr && event_handler != menu)
@@ -36,28 +86,72 @@ wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const
 #endif // __WXMSW__
         menu->Bind(wxEVT_MENU, cb, id);
 
+    if (parent) {
+        parent->Bind(wxEVT_UPDATE_UI, [cb_condition, item](wxUpdateUIEvent& evt) {
+            enable_menu_item(evt, cb_condition, item); }, id);
+    }
+
     return item;
 }
 
 wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description,
-    std::function<void(wxCommandEvent& event)> cb, const std::string& icon, wxEvtHandler* event_handler)
+    std::function<void(wxCommandEvent& event)> cb, const std::string& icon, wxEvtHandler* event_handler,
+    std::function<bool()> const cb_condition, wxWindow* parent)
 {
-    const wxBitmap& bmp = !icon.empty() ? create_scaled_bitmap(icon) : wxNullBitmap;
-    return append_menu_item(menu, id, string, description, cb, bmp, event_handler);
+    if (id == wxID_ANY)
+        id = wxNewId();
+
+    const wxBitmap& bmp = !icon.empty() ? create_scaled_bitmap(nullptr, icon) : wxNullBitmap;   // FIXME: pass window ptr
+//#ifdef __WXMSW__
+#ifndef __WXGTK__
+    if (bmp.IsOk())
+        msw_menuitem_bitmaps[id] = icon;
+#endif /* __WXMSW__ */
+
+    return append_menu_item(menu, id, string, description, cb, bmp, event_handler, cb_condition, parent);
 }
 
-wxMenuItem* append_submenu(wxMenu* menu, wxMenu* sub_menu, int id, const wxString& string, const wxString& description, const std::string& icon)
+wxMenuItem* append_submenu(wxMenu* menu, wxMenu* sub_menu, int id, const wxString& string, const wxString& description, const std::string& icon,
+    std::function<bool()> const cb_condition, wxWindow* parent)
 {
     if (id == wxID_ANY)
         id = wxNewId();
 
     wxMenuItem* item = new wxMenuItem(menu, id, string, description);
-    if (!icon.empty())
-        item->SetBitmap(create_scaled_bitmap(icon));
+    if (!icon.empty()) {
+        item->SetBitmap(create_scaled_bitmap(nullptr, icon));    // FIXME: pass window ptr
+//#ifdef __WXMSW__
+#ifndef __WXGTK__
+        msw_menuitem_bitmaps[id] = icon;
+#endif /* __WXMSW__ */
+    }
 
     item->SetSubMenu(sub_menu);
     menu->Append(item);
 
+    if (parent) {
+        parent->Bind(wxEVT_UPDATE_UI, [cb_condition, item](wxUpdateUIEvent& evt) {
+            enable_menu_item(evt, cb_condition, item); }, id);
+    }
+
+    return item;
+}
+
+wxMenuItem* append_menu_radio_item(wxMenu* menu, int id, const wxString& string, const wxString& description,
+    std::function<void(wxCommandEvent& event)> cb, wxEvtHandler* event_handler)
+{
+    if (id == wxID_ANY)
+        id = wxNewId();
+
+    wxMenuItem* item = menu->AppendRadioItem(id, string, description);
+
+#ifdef __WXMSW__
+    if (event_handler != nullptr && event_handler != menu)
+        event_handler->Bind(wxEVT_MENU, cb, id);
+    else
+#endif // __WXMSW__
+        menu->Bind(wxEVT_MENU, cb, id);
+
     return item;
 }
 
@@ -244,229 +338,187 @@ void wxDataViewTreeCtrlComboPopup::OnDataViewTreeCtrlSelection(wxCommandEvent& e
 	cmb->SetText(selected);
 }
 
-// ----------------------------------------------------------------------------
-// ***  PrusaCollapsiblePane  ***    
-// ----------------------------------------------------------------------------
-void PrusaCollapsiblePane::OnStateChange(const wxSize& sz)
+// edit tooltip : change Slic3r to SLIC3R_APP_KEY
+// Temporary workaround for localization
+void edit_tooltip(wxString& tooltip)
 {
-#ifdef __WXOSX__
-	wxCollapsiblePane::OnStateChange(sz);
+    tooltip.Replace("Slic3r", SLIC3R_APP_KEY, true);
+}
+
+/* Function for rescale of buttons in Dialog under MSW if dpi is changed.
+ * btn_ids - vector of buttons identifiers
+ */
+void msw_buttons_rescale(wxDialog* dlg, const int em_unit, const std::vector<int>& btn_ids)
+{
+    const wxSize& btn_size = wxSize(-1, int(2.5f * em_unit + 0.5f));
+
+    for (int btn_id : btn_ids) {
+        // There is a case [FirmwareDialog], when we have wxControl instead of wxButton
+        // so let casting everything to the wxControl
+        wxControl* btn = static_cast<wxControl*>(dlg->FindWindowById(btn_id, dlg));
+        if (btn)
+            btn->SetMinSize(btn_size);
+    }
+}
+
+/* Function for getting of em_unit value from correct parent.
+ * In most of cases it is m_em_unit value from GUI_App,
+ * but for DPIDialogs it's its own value. 
+ * This value will be used to correct rescale after moving between 
+ * Displays with different HDPI */
+int em_unit(wxWindow* win)
+{
+    if (win)
+    {
+        wxTopLevelWindow *toplevel = Slic3r::GUI::find_toplevel_parent(win);
+        Slic3r::GUI::DPIDialog* dlg = dynamic_cast<Slic3r::GUI::DPIDialog*>(toplevel);
+        if (dlg)
+            return dlg->em_unit();
+        Slic3r::GUI::DPIFrame* frame = dynamic_cast<Slic3r::GUI::DPIFrame*>(toplevel);
+        if (frame)
+            return frame->em_unit();
+    }
+    
+    return Slic3r::GUI::wxGetApp().em_unit();
+}
+
+// If an icon has horizontal orientation (width > height) call this function with is_horizontal = true
+wxBitmap create_scaled_bitmap(wxWindow *win, const std::string& bmp_name_in, 
+    const int px_cnt/* = 16*/, const bool is_horizontal /* = false*/, const bool grayscale/* = false*/)
+{
+    static Slic3r::GUI::BitmapCache cache;
+
+#ifdef __APPLE__
+    const float scale_factor = win != nullptr ? win->GetContentScaleFactor() : 1.0f;
 #else
-	SetSize(sz);
+    (void)(win);
+    const float scale_factor = 1.0f;
+#endif
 
-	if (this->HasFlag(wxCP_NO_TLW_RESIZE))
-	{
-		// the user asked to explicitly handle the resizing itself...
-		return;
-	}
+    unsigned int height, width = height = 0;
+    unsigned int& scale_base = is_horizontal ? width : height;
 
-	auto top = GetParent(); //right_panel
-	if (!top)
-		return;
+    scale_base = (unsigned int)(em_unit(win) * px_cnt * 0.1f + 0.5f);
 
-	wxSizer *sizer = top->GetSizer();
-	if (!sizer)
-		return;
+    std::string bmp_name = bmp_name_in;
+    boost::replace_last(bmp_name, ".png", "");
 
-	const wxSize newBestSize = sizer->ComputeFittingClientSize(top);
-	top->SetMinClientSize(newBestSize);
+    // Try loading an SVG first, then PNG if SVG is not found:
+    wxBitmap *bmp = cache.load_svg(bmp_name, width, height, scale_factor, grayscale);
+    if (bmp == nullptr) {
+        bmp = cache.load_png(bmp_name, width, height, grayscale);
+    }
 
-	wxWindowUpdateLocker noUpdates_p(top->GetParent());
-	// we shouldn't attempt to resize a maximized window, whatever happens
-	// 	if (!top->IsMaximized())
-	// 		top->SetClientSize(newBestSize);
-	top->GetParent()->Layout();
-	top->Refresh();
-#endif //__WXOSX__
+    if (bmp == nullptr) {
+        // Neither SVG nor PNG has been found, raise error
+        throw std::runtime_error("Could not load bitmap: " + bmp_name);
+    }
+
+    return *bmp;
 }
 
-// ----------------------------------------------------------------------------
-// ***  PrusaCollapsiblePaneMSW  ***    used only #ifdef __WXMSW__
-// ----------------------------------------------------------------------------
-#ifdef __WXMSW__
-bool PrusaCollapsiblePaneMSW::Create(wxWindow *parent, wxWindowID id, const wxString& label, 
-	const wxPoint& pos, const wxSize& size, long style, const wxValidator& val, const wxString& name)
-{
-	if (!wxControl::Create(parent, id, pos, size, style, val, name))
-		return false;
-	// m_pStaticLine = NULL;
-	m_strLabel = label;
-
-	// sizer containing the expand button and possibly a static line
-	m_sz = new wxBoxSizer(wxHORIZONTAL);
-
-	m_bmp_close.LoadFile(Slic3r::GUI::from_u8(Slic3r::var("disclosure_triangle_close.png")), wxBITMAP_TYPE_PNG);
-	m_bmp_open.LoadFile(Slic3r::GUI::from_u8(Slic3r::var("disclosure_triangle_open.png")), wxBITMAP_TYPE_PNG);
-
-	m_pDisclosureTriangleButton = new wxButton(this, wxID_ANY, m_strLabel, wxPoint(0, 0),
-		wxDefaultSize, wxBU_EXACTFIT | wxNO_BORDER);
-	UpdateBtnBmp();
-	m_pDisclosureTriangleButton->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event)
-	{
-		if (event.GetEventObject() != m_pDisclosureTriangleButton)
-		{
-			event.Skip();
-			return;
-		}
-
-		Collapse(!IsCollapsed());
-
-		// this change was generated by the user - send the event
-		wxCollapsiblePaneEvent ev(this, GetId(), IsCollapsed());
-		GetEventHandler()->ProcessEvent(ev);
-	});
-
-	m_sz->Add(m_pDisclosureTriangleButton, 0, wxLEFT | wxTOP | wxBOTTOM, GetBorder());
-
-	// do not set sz as our sizers since we handle the pane window without using sizers
-	m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-		wxTAB_TRAVERSAL | wxNO_BORDER, wxT("wxCollapsiblePanePane"));
-
-    wxColour&& clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-	m_pDisclosureTriangleButton->SetBackgroundColour(clr);
-	this->SetBackgroundColour(clr);
-	m_pPane->SetBackgroundColour(clr);
-
-	// start as collapsed:
-	m_pPane->Hide();
-
-	return true;
-}
-
-void PrusaCollapsiblePaneMSW::UpdateBtnBmp()
-{
-	if (IsCollapsed())
-		m_pDisclosureTriangleButton->SetBitmap(m_bmp_close);
-	else{
-		m_pDisclosureTriangleButton->SetBitmap(m_bmp_open);
-		// To updating button bitmap it's needed to lost focus on this button, so
-		// we set focus to mainframe 
-		//GetParent()->GetParent()->GetParent()->SetFocus();
-		//or to pane
-		GetPane()->SetFocus();
-	}
-	Layout();
-}
-
-void PrusaCollapsiblePaneMSW::SetLabel(const wxString &label)
-{
-	m_strLabel = label;
-	m_pDisclosureTriangleButton->SetLabel(m_strLabel);
-	Layout();
-}
-
-bool PrusaCollapsiblePaneMSW::Layout()
-{
-	if (!m_pDisclosureTriangleButton || !m_pPane || !m_sz)
-		return false;     // we need to complete the creation first!
-
-	wxSize oursz(GetSize());
-
-	// move & resize the button and the static line
-	m_sz->SetDimension(0, 0, oursz.GetWidth(), m_sz->GetMinSize().GetHeight());
-	m_sz->Layout();
-
-	if (IsExpanded())
-	{
-		// move & resize the container window
-		int yoffset = m_sz->GetSize().GetHeight() + GetBorder();
-		m_pPane->SetSize(0, yoffset,
-			oursz.x, oursz.y - yoffset);
-
-		// this is very important to make the pane window layout show correctly
-		m_pPane->Layout();
-	}
-
-	return true;
-}
-
-void PrusaCollapsiblePaneMSW::Collapse(bool collapse)
-{
-	// optimization
-	if (IsCollapsed() == collapse)
-		return;
-
-	InvalidateBestSize();
-
-	// update our state
-	m_pPane->Show(!collapse);
-
-	// update button bitmap
-	UpdateBtnBmp();
-
-	OnStateChange(GetBestSize());
-}
-#endif //__WXMSW__
-
 // *****************************************************************************
 // ----------------------------------------------------------------------------
-// PrusaObjectDataViewModelNode
+// ObjectDataViewModelNode
 // ----------------------------------------------------------------------------
 
-wxBitmap create_scaled_bitmap(const std::string& bmp_name)
+ObjectDataViewModelNode::ObjectDataViewModelNode(ObjectDataViewModelNode* parent, const ItemType type) :
+    m_parent(parent),
+    m_type(type),
+    m_extruder(wxEmptyString)
 {
-    const double scale_f = Slic3r::GUI::wxGetApp().em_unit()* 0.1;//GetContentScaleFactor();
-    if (scale_f == 1.0)
-        return wxBitmap(Slic3r::GUI::from_u8(Slic3r::var(bmp_name)), wxBITMAP_TYPE_PNG);
-//     else if (scale_f == 2.0) // use biger icon
-//         return wxBitmap(Slic3r::GUI::from_u8(Slic3r::var(bmp_name_X2)), wxBITMAP_TYPE_PNG);
+    if (type == itSettings) {
+        m_name = "Settings to modified";
+    }
+    else if (type == itInstanceRoot) {
+        m_name = _(L("Instances"));
+#ifdef __WXGTK__
+        m_container = true;
+#endif  //__WXGTK__
+    }
+    else if (type == itInstance) {
+        m_idx = parent->GetChildCount();
+        m_name = wxString::Format(_(L("Instance %d")), m_idx + 1);
 
-    wxImage img = wxImage(Slic3r::GUI::from_u8(Slic3r::var(bmp_name)), wxBITMAP_TYPE_PNG);
-    const int sz_w = int(img.GetWidth()*scale_f);
-    const int sz_h = int(img.GetHeight()*scale_f);
-    img.Rescale(sz_w, sz_h, wxIMAGE_QUALITY_BILINEAR);
-    return wxBitmap(img);
+        set_action_icon();
+    }
 }
 
-void PrusaObjectDataViewModelNode::set_object_action_icon() {
-    m_action_icon = create_scaled_bitmap("add_object.png");
-}
-void  PrusaObjectDataViewModelNode::set_part_action_icon() {
-    m_action_icon = create_scaled_bitmap(m_type == itVolume ? "cog.png" : "brick_go.png");
+void ObjectDataViewModelNode::set_action_icon()
+{
+    m_action_icon_name = m_type == itObject ? "advanced_plus" : 
+                         m_type == itVolume ? "cog"           : "set_separate_obj";
+    m_action_icon = create_scaled_bitmap(nullptr, m_action_icon_name);    // FIXME: pass window ptr
 }
 
 Slic3r::GUI::BitmapCache *m_bitmap_cache = nullptr;
-bool PrusaObjectDataViewModelNode::update_settings_digest(const std::vector<std::string>& categories)
+void ObjectDataViewModelNode::update_settings_digest_bitmaps()
+{
+    m_bmp = m_empty_bmp;
+
+    std::map<std::string, wxBitmap>& categories_icon = Slic3r::GUI::wxGetApp().obj_list()->CATEGORY_ICON;
+
+    std::string scaled_bitmap_name = m_name.ToUTF8().data();
+    scaled_bitmap_name += "-em" + std::to_string(Slic3r::GUI::wxGetApp().em_unit());
+
+    wxBitmap *bmp = m_bitmap_cache->find(scaled_bitmap_name);
+    if (bmp == nullptr) {
+        std::vector<wxBitmap> bmps;
+        for (auto& cat : m_opt_categories)
+            bmps.emplace_back(  categories_icon.find(cat) == categories_icon.end() ?
+                                wxNullBitmap : categories_icon.at(cat));
+        bmp = m_bitmap_cache->insert(scaled_bitmap_name, bmps);
+    }
+
+    m_bmp = *bmp;
+}
+
+bool ObjectDataViewModelNode::update_settings_digest(const std::vector<std::string>& categories)
 {
     if (m_type != itSettings || m_opt_categories == categories)
         return false;
 
     m_opt_categories = categories;
     m_name = wxEmptyString;
-    m_bmp = m_empty_bmp;
-
-    std::map<std::string, wxBitmap>& categories_icon = Slic3r::GUI::wxGetApp().obj_list()->CATEGORY_ICON;
 
     for (auto& cat : m_opt_categories)
-        m_name += cat + "; ";
+        m_name += _(cat) + "; ";
     if (!m_name.IsEmpty())
         m_name.erase(m_name.Length()-2, 2); // Delete last "; "
 
-    wxBitmap *bmp = m_bitmap_cache->find(m_name.ToUTF8().data());
-    if (bmp == nullptr) {
-        std::vector<wxBitmap> bmps;
-        for (auto& cat : m_opt_categories)
-            bmps.emplace_back(categories_icon.find(cat) == categories_icon.end() ?
-                              wxNullBitmap : categories_icon.at(cat));
-        bmp = m_bitmap_cache->insert(m_name.ToUTF8().data(), bmps);
-    }
-
-    m_bmp = *bmp;
+    update_settings_digest_bitmaps();
 
     return true;
 }
 
+void ObjectDataViewModelNode::msw_rescale()
+{
+    if (!m_action_icon_name.empty())
+        m_action_icon = create_scaled_bitmap(nullptr, m_action_icon_name);
+
+    if (!m_opt_categories.empty())
+        update_settings_digest_bitmaps();
+}
+
+void ObjectDataViewModelNode::SetIdx(const int& idx)
+{
+    m_idx = idx;
+    // update name if this node is instance
+    if (m_type == itInstance)
+        m_name = wxString::Format(_(L("Instance %d")), m_idx + 1);
+}
+
 // *****************************************************************************
 // ----------------------------------------------------------------------------
-// PrusaObjectDataViewModel
+// ObjectDataViewModel
 // ----------------------------------------------------------------------------
 
-PrusaObjectDataViewModel::PrusaObjectDataViewModel()
+ObjectDataViewModel::ObjectDataViewModel()
 {
     m_bitmap_cache = new Slic3r::GUI::BitmapCache;
 }
 
-PrusaObjectDataViewModel::~PrusaObjectDataViewModel()
+ObjectDataViewModel::~ObjectDataViewModel()
 {
     for (auto object : m_objects)
 			delete object;
@@ -474,37 +526,50 @@ PrusaObjectDataViewModel::~PrusaObjectDataViewModel()
     m_bitmap_cache = nullptr;
 }
 
-wxDataViewItem PrusaObjectDataViewModel::Add(const wxString &name, const int extruder)
+wxDataViewItem ObjectDataViewModel::Add(const wxString &name, 
+                                        const int extruder,
+                                        const bool has_errors/* = false*/)
 {
-    const wxString extruder_str = extruder == 0 ? "default" : wxString::Format("%d", extruder);
-	auto root = new PrusaObjectDataViewModelNode(name, extruder_str);
+    const wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder);
+	auto root = new ObjectDataViewModelNode(name, extruder_str);
+    // Add error icon if detected auto-repaire
+    if (has_errors)
+        root->m_bmp = *m_warning_bmp;
+
 	m_objects.push_back(root);
 	// notify control
 	wxDataViewItem child((void*)root);
 	wxDataViewItem parent((void*)NULL);
+
 	ItemAdded(parent, child);
 	return child;
 }
 
-wxDataViewItem PrusaObjectDataViewModel::AddVolumeChild(const wxDataViewItem &parent_item,
-													const wxString &name,
+wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent_item,
+                                                    const wxString &name,
                                                     const Slic3r::ModelVolumeType volume_type,
+                                                    const bool has_errors/* = false*/,
                                                     const int extruder/* = 0*/,
                                                     const bool create_frst_child/* = true*/)
 {
-	PrusaObjectDataViewModelNode *root = (PrusaObjectDataViewModelNode*)parent_item.GetID();
+	ObjectDataViewModelNode *root = (ObjectDataViewModelNode*)parent_item.GetID();
 	if (!root) return wxDataViewItem(0);
 
-    wxString extruder_str = extruder == 0 ? "default" : wxString::Format("%d", extruder);
+    wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder);
 
     // because of istance_root is a last item of the object
     int insert_position = root->GetChildCount() - 1;
     if (insert_position < 0 || root->GetNthChild(insert_position)->m_type != itInstanceRoot)
         insert_position = -1;
 
+    const bool obj_errors = root->m_bmp.IsOk();
+
     if (create_frst_child && root->m_volumes_cnt == 0)
-	{
-		const auto node = new PrusaObjectDataViewModelNode(root, root->m_name, *m_volume_bmps[0], extruder_str, 0);
+    {
+        const Slic3r::ModelVolumeType type = Slic3r::ModelVolumeType::MODEL_PART;
+        const auto node = new ObjectDataViewModelNode(root, root->m_name, GetVolumeIcon(type, obj_errors), extruder_str, 0);
+        node->m_volume_type = type;
+
         insert_position < 0 ? root->Append(node) : root->Insert(node, insert_position);
 		// notify control
 		const wxDataViewItem child((void*)node);
@@ -514,22 +579,29 @@ wxDataViewItem PrusaObjectDataViewModel::AddVolumeChild(const wxDataViewItem &pa
         if (insert_position > 0) insert_position++;
 	}
 
-    const auto node = new PrusaObjectDataViewModelNode(root, name, *m_volume_bmps[int(volume_type)], extruder_str, root->m_volumes_cnt);
+    const auto node = new ObjectDataViewModelNode(root, name, GetVolumeIcon(volume_type, has_errors), extruder_str, root->m_volumes_cnt);
     insert_position < 0 ? root->Append(node) : root->Insert(node, insert_position);
+
+    // if part with errors is added, but object wasn't marked, then mark it
+    if (!obj_errors && has_errors)
+        root->SetBitmap(*m_warning_bmp);
+
 	// notify control
 	const wxDataViewItem child((void*)node);
     ItemAdded(parent_item, child);
     root->m_volumes_cnt++;
 
+    node->m_volume_type = volume_type;
+
 	return child;
 }
 
-wxDataViewItem PrusaObjectDataViewModel::AddSettingsChild(const wxDataViewItem &parent_item)
+wxDataViewItem ObjectDataViewModel::AddSettingsChild(const wxDataViewItem &parent_item)
 {
-    PrusaObjectDataViewModelNode *root = (PrusaObjectDataViewModelNode*)parent_item.GetID();
+    ObjectDataViewModelNode *root = (ObjectDataViewModelNode*)parent_item.GetID();
     if (!root) return wxDataViewItem(0);
 
-    const auto node = new PrusaObjectDataViewModelNode(root, itSettings);
+    const auto node = new ObjectDataViewModelNode(root, itSettings);
     root->Insert(node, 0);
     // notify control
     const wxDataViewItem child((void*)node);
@@ -537,27 +609,27 @@ wxDataViewItem PrusaObjectDataViewModel::AddSettingsChild(const wxDataViewItem &
     return child;
 }
 
-int get_istances_root_idx(PrusaObjectDataViewModelNode *parent_node)
+int get_istances_root_idx(ObjectDataViewModelNode *parent_node)
 {
     // because of istance_root is a last item of the object
     const int inst_root_idx = parent_node->GetChildCount()-1;
 
-    if (inst_root_idx < 0 || parent_node->GetNthChild(inst_root_idx)->m_type == itInstanceRoot) 
+    if (inst_root_idx < 0 || parent_node->GetNthChild(inst_root_idx)->GetType() == itInstanceRoot) 
         return inst_root_idx;
     
     return -1;
 }
 
-wxDataViewItem PrusaObjectDataViewModel::AddInstanceChild(const wxDataViewItem &parent_item, size_t num)
+wxDataViewItem ObjectDataViewModel::AddInstanceChild(const wxDataViewItem &parent_item, size_t num)
 {
-    PrusaObjectDataViewModelNode *parent_node = (PrusaObjectDataViewModelNode*)parent_item.GetID();
+    ObjectDataViewModelNode *parent_node = (ObjectDataViewModelNode*)parent_item.GetID();
     if (!parent_node) return wxDataViewItem(0);
 
     // Check and create/get instances root node
     const int inst_root_id = get_istances_root_idx(parent_node);
 
-    PrusaObjectDataViewModelNode *inst_root_node = inst_root_id < 0 ? 
-                                                   new PrusaObjectDataViewModelNode(parent_node, itInstanceRoot) :
+    ObjectDataViewModelNode *inst_root_node = inst_root_id < 0 ? 
+                                                   new ObjectDataViewModelNode(parent_node, itInstanceRoot) :
                                                    parent_node->GetNthChild(inst_root_id);
     const wxDataViewItem inst_root_item((void*)inst_root_node);
 
@@ -569,10 +641,10 @@ wxDataViewItem PrusaObjectDataViewModel::AddInstanceChild(const wxDataViewItem &
     }
 
     // Add instance nodes
-    PrusaObjectDataViewModelNode *instance_node = nullptr;    
+    ObjectDataViewModelNode *instance_node = nullptr;    
     size_t counter = 0;
     while (counter < num) {
-        instance_node = new PrusaObjectDataViewModelNode(inst_root_node, itInstance);
+        instance_node = new ObjectDataViewModelNode(inst_root_node, itInstance);
         inst_root_node->Append(instance_node);
         // notify control
         const wxDataViewItem instance_item((void*)instance_node);
@@ -583,10 +655,10 @@ wxDataViewItem PrusaObjectDataViewModel::AddInstanceChild(const wxDataViewItem &
     return wxDataViewItem((void*)instance_node);
 }
 
-wxDataViewItem PrusaObjectDataViewModel::Delete(const wxDataViewItem &item)
+wxDataViewItem ObjectDataViewModel::Delete(const wxDataViewItem &item)
 {
 	auto ret_item = wxDataViewItem(0);
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 	if (!node)      // happens if item.IsOk()==false
 		return ret_item;
 
@@ -634,12 +706,12 @@ wxDataViewItem PrusaObjectDataViewModel::Delete(const wxDataViewItem &item)
             delete node;
             ItemDeleted(parent, item);
 
-            PrusaObjectDataViewModelNode *last_instance_node = node_parent->GetNthChild(0);
+            ObjectDataViewModelNode *last_instance_node = node_parent->GetNthChild(0);
             node_parent->GetChildren().Remove(last_instance_node);
             delete last_instance_node;
             ItemDeleted(parent, wxDataViewItem(last_instance_node));
 
-            PrusaObjectDataViewModelNode *obj_node = node_parent->GetParent();
+            ObjectDataViewModelNode *obj_node = node_parent->GetParent();
             obj_node->GetChildren().Remove(node_parent);
             delete node_parent;
             ret_item = wxDataViewItem(obj_node);
@@ -670,7 +742,7 @@ wxDataViewItem PrusaObjectDataViewModel::Delete(const wxDataViewItem &item)
                 delete node;
                 ItemDeleted(parent, item);
 
-                PrusaObjectDataViewModelNode *last_child_node = node_parent->GetNthChild(vol_idx);
+                ObjectDataViewModelNode *last_child_node = node_parent->GetNthChild(vol_idx);
                 DeleteSettings(wxDataViewItem(last_child_node));
                 node_parent->GetChildren().Remove(last_child_node);
                 node_parent->m_volumes_cnt = 0;
@@ -729,17 +801,17 @@ wxDataViewItem PrusaObjectDataViewModel::Delete(const wxDataViewItem &item)
 	return ret_item;
 }
 
-wxDataViewItem PrusaObjectDataViewModel::DeleteLastInstance(const wxDataViewItem &parent_item, size_t num)
+wxDataViewItem ObjectDataViewModel::DeleteLastInstance(const wxDataViewItem &parent_item, size_t num)
 {
     auto ret_item = wxDataViewItem(0);
-    PrusaObjectDataViewModelNode *parent_node = (PrusaObjectDataViewModelNode*)parent_item.GetID();
+    ObjectDataViewModelNode *parent_node = (ObjectDataViewModelNode*)parent_item.GetID();
     if (!parent_node) return ret_item;
 
     const int inst_root_id = get_istances_root_idx(parent_node);
     if (inst_root_id < 0) return ret_item;
 
     wxDataViewItemArray items;
-    PrusaObjectDataViewModelNode *inst_root_node = parent_node->GetNthChild(inst_root_id);
+    ObjectDataViewModelNode *inst_root_node = parent_node->GetNthChild(inst_root_id);
     const wxDataViewItem inst_root_item((void*)inst_root_node);
 
     const int inst_cnt = inst_root_node->GetChildCount();
@@ -747,7 +819,7 @@ wxDataViewItem PrusaObjectDataViewModel::DeleteLastInstance(const wxDataViewItem
 
     int stop = delete_inst_root_item ? 0 : inst_cnt - num;
     for (int i = inst_cnt - 1; i >= stop;--i) {
-        PrusaObjectDataViewModelNode *last_instance_node = inst_root_node->GetNthChild(i);
+        ObjectDataViewModelNode *last_instance_node = inst_root_node->GetNthChild(i);
         inst_root_node->GetChildren().Remove(last_instance_node);
         delete last_instance_node;
         ItemDeleted(inst_root_item, wxDataViewItem(last_instance_node));
@@ -766,7 +838,7 @@ wxDataViewItem PrusaObjectDataViewModel::DeleteLastInstance(const wxDataViewItem
     return ret_item;
 }
 
-void PrusaObjectDataViewModel::DeleteAll()
+void ObjectDataViewModel::DeleteAll()
 {
 	while (!m_objects.empty())
 	{
@@ -776,9 +848,9 @@ void PrusaObjectDataViewModel::DeleteAll()
 	}
 }
 
-void PrusaObjectDataViewModel::DeleteChildren(wxDataViewItem& parent)
+void ObjectDataViewModel::DeleteChildren(wxDataViewItem& parent)
 {
-    PrusaObjectDataViewModelNode *root = (PrusaObjectDataViewModelNode*)parent.GetID();
+    ObjectDataViewModelNode *root = (ObjectDataViewModelNode*)parent.GetID();
     if (!root)      // happens if item.IsOk()==false
         return;
 
@@ -808,9 +880,9 @@ void PrusaObjectDataViewModel::DeleteChildren(wxDataViewItem& parent)
 #endif //__WXGTK__
 }
 
-void PrusaObjectDataViewModel::DeleteVolumeChildren(wxDataViewItem& parent)
+void ObjectDataViewModel::DeleteVolumeChildren(wxDataViewItem& parent)
 {
-    PrusaObjectDataViewModelNode *root = (PrusaObjectDataViewModelNode*)parent.GetID();
+    ObjectDataViewModelNode *root = (ObjectDataViewModelNode*)parent.GetID();
     if (!root)      // happens if item.IsOk()==false
         return;
 
@@ -842,9 +914,9 @@ void PrusaObjectDataViewModel::DeleteVolumeChildren(wxDataViewItem& parent)
 #endif //__WXGTK__
 }
 
-void PrusaObjectDataViewModel::DeleteSettings(const wxDataViewItem& parent)
+void ObjectDataViewModel::DeleteSettings(const wxDataViewItem& parent)
 {
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)parent.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)parent.GetID();
     if (!node) return;
 
     // if volume has a "settings"item, than delete it before volume deleting
@@ -857,7 +929,7 @@ void PrusaObjectDataViewModel::DeleteSettings(const wxDataViewItem& parent)
     }
 }
 
-wxDataViewItem PrusaObjectDataViewModel::GetItemById(int obj_idx)
+wxDataViewItem ObjectDataViewModel::GetItemById(int obj_idx)
 {
 	if (obj_idx >= m_objects.size())
 	{
@@ -868,7 +940,7 @@ wxDataViewItem PrusaObjectDataViewModel::GetItemById(int obj_idx)
 }
 
 
-wxDataViewItem PrusaObjectDataViewModel::GetItemByVolumeId(int obj_idx, int volume_idx)
+wxDataViewItem ObjectDataViewModel::GetItemByVolumeId(int obj_idx, int volume_idx)
 {
 	if (obj_idx >= m_objects.size() || obj_idx < 0) {
 		printf("Error! Out of objects range.\n");
@@ -892,7 +964,7 @@ wxDataViewItem PrusaObjectDataViewModel::GetItemByVolumeId(int obj_idx, int volu
     return wxDataViewItem(0);
 }
 
-wxDataViewItem PrusaObjectDataViewModel::GetItemByInstanceId(int obj_idx, int inst_idx)
+wxDataViewItem ObjectDataViewModel::GetItemByInstanceId(int obj_idx, int inst_idx)
 {
     if (obj_idx >= m_objects.size() || obj_idx < 0) {
         printf("Error! Out of objects range.\n");
@@ -903,7 +975,7 @@ wxDataViewItem PrusaObjectDataViewModel::GetItemByInstanceId(int obj_idx, int in
     if (!instances_item)
         return wxDataViewItem(0);
 
-    auto parent = (PrusaObjectDataViewModelNode*)instances_item.GetID();;
+    auto parent = (ObjectDataViewModelNode*)instances_item.GetID();;
     for (size_t i = 0; i < parent->GetChildCount(); i++)
         if (parent->GetNthChild(i)->m_idx == inst_idx)
             return wxDataViewItem(parent->GetNthChild(i));
@@ -911,11 +983,11 @@ wxDataViewItem PrusaObjectDataViewModel::GetItemByInstanceId(int obj_idx, int in
     return wxDataViewItem(0);
 }
 
-int PrusaObjectDataViewModel::GetIdByItem(const wxDataViewItem& item) const
+int ObjectDataViewModel::GetIdByItem(const wxDataViewItem& item) const
 {
 	wxASSERT(item.IsOk());
 
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 	auto it = find(m_objects.begin(), m_objects.end(), node);
 	if (it == m_objects.end())
 		return -1;
@@ -923,44 +995,44 @@ int PrusaObjectDataViewModel::GetIdByItem(const wxDataViewItem& item) const
 	return it - m_objects.begin();
 }
 
-int PrusaObjectDataViewModel::GetIdByItemAndType(const wxDataViewItem& item, const ItemType type) const
+int ObjectDataViewModel::GetIdByItemAndType(const wxDataViewItem& item, const ItemType type) const
 {
 	wxASSERT(item.IsOk());
 
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 	if (!node || node->m_type != type)
 		return -1;
 	return node->GetIdx();
 }
 
-int PrusaObjectDataViewModel::GetObjectIdByItem(const wxDataViewItem& item) const
+int ObjectDataViewModel::GetObjectIdByItem(const wxDataViewItem& item) const
 {
     return GetIdByItem(GetTopParent(item));
 }
 
-int PrusaObjectDataViewModel::GetVolumeIdByItem(const wxDataViewItem& item) const
+int ObjectDataViewModel::GetVolumeIdByItem(const wxDataViewItem& item) const
 {
     return GetIdByItemAndType(item, itVolume);
 }
 
-int PrusaObjectDataViewModel::GetInstanceIdByItem(const wxDataViewItem& item) const 
+int ObjectDataViewModel::GetInstanceIdByItem(const wxDataViewItem& item) const 
 {
     return GetIdByItemAndType(item, itInstance);
 }
 
-void PrusaObjectDataViewModel::GetItemInfo(const wxDataViewItem& item, ItemType& type, int& obj_idx, int& idx)
+void ObjectDataViewModel::GetItemInfo(const wxDataViewItem& item, ItemType& type, int& obj_idx, int& idx)
 {
     wxASSERT(item.IsOk());
     type = itUndef;
 
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
     if (!node || node->GetIdx() <-1 || node->GetIdx() ==-1 && !(node->GetType() & (itObject | itSettings | itInstanceRoot)))
         return;
 
     idx = node->GetIdx();
     type = node->GetType();
 
-    PrusaObjectDataViewModelNode *parent_node = node->GetParent();
+    ObjectDataViewModelNode *parent_node = node->GetParent();
     if (!parent_node) return;
     if (type == itInstance)
         parent_node = node->GetParent()->GetParent();
@@ -973,7 +1045,7 @@ void PrusaObjectDataViewModel::GetItemInfo(const wxDataViewItem& item, ItemType&
         type = itUndef;
 }
 
-int PrusaObjectDataViewModel::GetRowByItem(const wxDataViewItem& item) const
+int ObjectDataViewModel::GetRowByItem(const wxDataViewItem& item) const
 {
     if (m_objects.empty())
         return -1;
@@ -989,7 +1061,7 @@ int PrusaObjectDataViewModel::GetRowByItem(const wxDataViewItem& item) const
         for (int j = 0; j < m_objects[i]->GetChildCount(); j++)
         {
             row_num++;
-            PrusaObjectDataViewModelNode* cur_node = m_objects[i]->GetNthChild(j);
+            ObjectDataViewModelNode* cur_node = m_objects[i]->GetNthChild(j);
             if (item == wxDataViewItem(cur_node))
                 return row_num;
 
@@ -1011,30 +1083,30 @@ int PrusaObjectDataViewModel::GetRowByItem(const wxDataViewItem& item) const
     return -1;
 }
 
-wxString PrusaObjectDataViewModel::GetName(const wxDataViewItem &item) const
+wxString ObjectDataViewModel::GetName(const wxDataViewItem &item) const
 {
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 	if (!node)      // happens if item.IsOk()==false
 		return wxEmptyString;
 
 	return node->m_name;
 }
 
-wxBitmap& PrusaObjectDataViewModel::GetBitmap(const wxDataViewItem &item) const
+wxBitmap& ObjectDataViewModel::GetBitmap(const wxDataViewItem &item) const
 {
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
     return node->m_bmp;
 }
 
-void PrusaObjectDataViewModel::GetValue(wxVariant &variant, const wxDataViewItem &item, unsigned int col) const
+void ObjectDataViewModel::GetValue(wxVariant &variant, const wxDataViewItem &item, unsigned int col) const
 {
 	wxASSERT(item.IsOk());
 
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 	switch (col)
 	{
 	case 0:
-        variant << PrusaDataViewBitmapText(node->m_name, node->m_bmp);
+        variant << DataViewBitmapText(node->m_name, node->m_bmp);
 		break;
 	case 1:
 		variant = node->m_extruder;
@@ -1047,83 +1119,37 @@ void PrusaObjectDataViewModel::GetValue(wxVariant &variant, const wxDataViewItem
 	}
 }
 
-bool PrusaObjectDataViewModel::SetValue(const wxVariant &variant, const wxDataViewItem &item, unsigned int col)
+bool ObjectDataViewModel::SetValue(const wxVariant &variant, const wxDataViewItem &item, unsigned int col)
 {
 	wxASSERT(item.IsOk());
 
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 	return node->SetValue(variant, col);
 }
 
-bool PrusaObjectDataViewModel::SetValue(const wxVariant &variant, const int item_idx, unsigned int col)
+bool ObjectDataViewModel::SetValue(const wxVariant &variant, const int item_idx, unsigned int col)
 {
 	if (item_idx < 0 || item_idx >= m_objects.size())
 		return false;
 
 	return m_objects[item_idx]->SetValue(variant, col);
 }
-/*
-wxDataViewItem PrusaObjectDataViewModel::MoveChildUp(const wxDataViewItem &item)
-{
-	auto ret_item = wxDataViewItem(0);
-	wxASSERT(item.IsOk());
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
-	if (!node)      // happens if item.IsOk()==false
-		return ret_item;
 
-	auto node_parent = node->GetParent();
-	if (!node_parent) // If isn't part, but object
-		return ret_item;
-
-	auto volume_id = node->GetVolumeId();
-	if (0 < volume_id && volume_id < node_parent->GetChildCount()) {
-		node_parent->SwapChildrens(volume_id - 1, volume_id);
-		ret_item = wxDataViewItem(node_parent->GetNthChild(volume_id - 1));
-		ItemChanged(item);
-		ItemChanged(ret_item);
-	}
-	else
-		ret_item = wxDataViewItem(node_parent->GetNthChild(0));
-	return ret_item;
-}
-
-wxDataViewItem PrusaObjectDataViewModel::MoveChildDown(const wxDataViewItem &item)
-{
-	auto ret_item = wxDataViewItem(0);
-	wxASSERT(item.IsOk());
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
-	if (!node)      // happens if item.IsOk()==false
-		return ret_item;
-
-	auto node_parent = node->GetParent();
-	if (!node_parent) // If isn't part, but object
-		return ret_item;
-
-	auto volume_id = node->GetVolumeId();
-	if (0 <= volume_id && volume_id+1 < node_parent->GetChildCount()) {
-		node_parent->SwapChildrens(volume_id + 1, volume_id);
-		ret_item = wxDataViewItem(node_parent->GetNthChild(volume_id + 1));
-		ItemChanged(item);
-		ItemChanged(ret_item);
-	}
-	else
-		ret_item = wxDataViewItem(node_parent->GetNthChild(node_parent->GetChildCount()-1));
-	return ret_item;
-}
-*/
-wxDataViewItem PrusaObjectDataViewModel::ReorganizeChildren(int current_volume_id, int new_volume_id, const wxDataViewItem &parent)
+wxDataViewItem ObjectDataViewModel::ReorganizeChildren( const int current_volume_id, 
+                                                        const int new_volume_id, 
+                                                        const wxDataViewItem &parent)
 {
     auto ret_item = wxDataViewItem(0);
     if (current_volume_id == new_volume_id)
         return ret_item;
     wxASSERT(parent.IsOk());
-    PrusaObjectDataViewModelNode *node_parent = (PrusaObjectDataViewModelNode*)parent.GetID();
+    ObjectDataViewModelNode *node_parent = (ObjectDataViewModelNode*)parent.GetID();
     if (!node_parent)      // happens if item.IsOk()==false
         return ret_item;
 
     const size_t shift = node_parent->GetChildren().Item(0)->m_type == itSettings ? 1 : 0;
 
-    PrusaObjectDataViewModelNode *deleted_node = node_parent->GetNthChild(current_volume_id+shift);
+    ObjectDataViewModelNode *deleted_node = node_parent->GetNthChild(current_volume_id+shift);
     node_parent->GetChildren().Remove(deleted_node);
     ItemDeleted(parent, wxDataViewItem(deleted_node));
     node_parent->Insert(deleted_node, new_volume_id+shift);
@@ -1142,22 +1168,22 @@ wxDataViewItem PrusaObjectDataViewModel::ReorganizeChildren(int current_volume_i
     return wxDataViewItem(node_parent->GetNthChild(new_volume_id+shift));
 }
 
-bool PrusaObjectDataViewModel::IsEnabled(const wxDataViewItem &item, unsigned int col) const
+bool ObjectDataViewModel::IsEnabled(const wxDataViewItem &item, unsigned int col) const
 {
     wxASSERT(item.IsOk());
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 
     // disable extruder selection for the non "itObject|itVolume" item
     return !(col == 1 && node->m_extruder.IsEmpty());
 }
 
-wxDataViewItem PrusaObjectDataViewModel::GetParent(const wxDataViewItem &item) const
+wxDataViewItem ObjectDataViewModel::GetParent(const wxDataViewItem &item) const
 {
 	// the invisible root node has no parent
 	if (!item.IsOk())
 		return wxDataViewItem(0);
 
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 
 	// objects nodes has no parent too
     if (node->m_type == itObject)
@@ -1166,17 +1192,17 @@ wxDataViewItem PrusaObjectDataViewModel::GetParent(const wxDataViewItem &item) c
 	return wxDataViewItem((void*)node->GetParent());
 }
 
-wxDataViewItem PrusaObjectDataViewModel::GetTopParent(const wxDataViewItem &item) const
+wxDataViewItem ObjectDataViewModel::GetTopParent(const wxDataViewItem &item) const
 {
 	// the invisible root node has no parent
 	if (!item.IsOk())
 		return wxDataViewItem(0);
 
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
     if (node->m_type == itObject)
         return item;
 
-    PrusaObjectDataViewModelNode *parent_node = node->GetParent();
+    ObjectDataViewModelNode *parent_node = node->GetParent();
     while (parent_node->m_type != itObject)
     {
         node = parent_node;
@@ -1186,19 +1212,19 @@ wxDataViewItem PrusaObjectDataViewModel::GetTopParent(const wxDataViewItem &item
     return wxDataViewItem((void*)parent_node);
 }
 
-bool PrusaObjectDataViewModel::IsContainer(const wxDataViewItem &item) const
+bool ObjectDataViewModel::IsContainer(const wxDataViewItem &item) const
 {
 	// the invisible root node can have children
 	if (!item.IsOk())
 		return true;
 
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
 	return node->IsContainer();
 }
 
-unsigned int PrusaObjectDataViewModel::GetChildren(const wxDataViewItem &parent, wxDataViewItemArray &array) const
+unsigned int ObjectDataViewModel::GetChildren(const wxDataViewItem &parent, wxDataViewItemArray &array) const
 {
-	PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)parent.GetID();
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)parent.GetID();
 	if (!node)
 	{
 		for (auto object : m_objects)
@@ -1214,27 +1240,53 @@ unsigned int PrusaObjectDataViewModel::GetChildren(const wxDataViewItem &parent,
 	unsigned int count = node->GetChildren().GetCount();
 	for (unsigned int pos = 0; pos < count; pos++)
 	{
-		PrusaObjectDataViewModelNode *child = node->GetChildren().Item(pos);
+		ObjectDataViewModelNode *child = node->GetChildren().Item(pos);
 		array.Add(wxDataViewItem((void*)child));
 	}
 
 	return count;
 }
 
-ItemType PrusaObjectDataViewModel::GetItemType(const wxDataViewItem &item) const 
+void ObjectDataViewModel::GetAllChildren(const wxDataViewItem &parent, wxDataViewItemArray &array) const
+{
+	ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)parent.GetID();
+	if (!node) {
+		for (auto object : m_objects)
+			array.Add(wxDataViewItem((void*)object));
+	}
+	else if (node->GetChildCount() == 0)
+		return;
+    else {
+        const size_t count = node->GetChildren().GetCount();
+        for (size_t pos = 0; pos < count; pos++) {
+            ObjectDataViewModelNode *child = node->GetChildren().Item(pos);
+            array.Add(wxDataViewItem((void*)child));
+        }
+    }
+
+    wxDataViewItemArray new_array = array;
+    for (const auto item : new_array)
+    {
+        wxDataViewItemArray children;
+        GetAllChildren(item, children);
+        WX_APPEND_ARRAY(array, children);
+    }
+}
+
+ItemType ObjectDataViewModel::GetItemType(const wxDataViewItem &item) const 
 {
     if (!item.IsOk())
         return itUndef;
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
     return node->m_type;
 }
 
-wxDataViewItem PrusaObjectDataViewModel::GetItemByType(const wxDataViewItem &parent_item, ItemType type) const 
+wxDataViewItem ObjectDataViewModel::GetItemByType(const wxDataViewItem &parent_item, ItemType type) const 
 {
     if (!parent_item.IsOk())
         return wxDataViewItem(0);
 
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)parent_item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)parent_item.GetID();
     if (node->GetChildCount() == 0)
         return wxDataViewItem(0);
 
@@ -1246,60 +1298,127 @@ wxDataViewItem PrusaObjectDataViewModel::GetItemByType(const wxDataViewItem &par
     return wxDataViewItem(0);
 }
 
-wxDataViewItem PrusaObjectDataViewModel::GetSettingsItem(const wxDataViewItem &item) const
+wxDataViewItem ObjectDataViewModel::GetSettingsItem(const wxDataViewItem &item) const
 {
     return GetItemByType(item, itSettings);
 }
 
-wxDataViewItem PrusaObjectDataViewModel::GetInstanceRootItem(const wxDataViewItem &item) const
+wxDataViewItem ObjectDataViewModel::GetInstanceRootItem(const wxDataViewItem &item) const
 {
     return GetItemByType(item, itInstanceRoot);
 }
 
-bool PrusaObjectDataViewModel::IsSettingsItem(const wxDataViewItem &item) const
+bool ObjectDataViewModel::IsSettingsItem(const wxDataViewItem &item) const
 {
     if (!item.IsOk())
         return false;
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
     return node->m_type == itSettings;
 }
 
-
-
-void PrusaObjectDataViewModel::UpdateSettingsDigest(const wxDataViewItem &item, 
+void ObjectDataViewModel::UpdateSettingsDigest(const wxDataViewItem &item, 
                                                     const std::vector<std::string>& categories)
 {
     if (!item.IsOk()) return;
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
     if (!node->update_settings_digest(categories))
         return;
     ItemChanged(item);
 }
 
-void PrusaObjectDataViewModel::SetVolumeType(const wxDataViewItem &item, const Slic3r::ModelVolumeType type)
+void ObjectDataViewModel::SetVolumeType(const wxDataViewItem &item, const Slic3r::ModelVolumeType type)
 {
     if (!item.IsOk() || GetItemType(item) != itVolume) 
         return;
 
-    PrusaObjectDataViewModelNode *node = (PrusaObjectDataViewModelNode*)item.GetID();
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
     node->SetBitmap(*m_volume_bmps[int(type)]);
     ItemChanged(item);
 }
 
+void ObjectDataViewModel::Rescale()
+{
+    wxDataViewItemArray all_items;
+    GetAllChildren(wxDataViewItem(0), all_items);
+
+    for (wxDataViewItem item : all_items)
+    {
+        if (!item.IsOk())
+            continue;
+
+        ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
+        node->msw_rescale();
+
+        if (node->m_type & itVolume)
+            node->m_bmp = GetVolumeIcon(node->m_volume_type, node->m_bmp.GetWidth() != node->m_bmp.GetHeight());
+
+        if (node->m_type & itObject && node->m_bmp.IsOk())
+            node->m_bmp = *m_warning_bmp;
+
+        ItemChanged(item);
+    }
+}
+
+wxBitmap ObjectDataViewModel::GetVolumeIcon(const Slic3r::ModelVolumeType vol_type, const bool is_marked/* = false*/)
+{
+    if (!is_marked)
+        return *m_volume_bmps[static_cast<int>(vol_type)];
+
+    std::string scaled_bitmap_name = "warning" + std::to_string(static_cast<int>(vol_type));
+    scaled_bitmap_name += "-em" + std::to_string(Slic3r::GUI::wxGetApp().em_unit());
+
+    wxBitmap *bmp = m_bitmap_cache->find(scaled_bitmap_name);
+    if (bmp == nullptr) {
+        std::vector<wxBitmap> bmps;
+
+        bmps.emplace_back(*m_warning_bmp);
+        bmps.emplace_back(*m_volume_bmps[static_cast<int>(vol_type)]);
+
+        bmp = m_bitmap_cache->insert(scaled_bitmap_name, bmps);
+    }
+
+    return *bmp;
+}
+
+void ObjectDataViewModel::DeleteWarningIcon(const wxDataViewItem& item, const bool unmark_object/* = false*/)
+{
+    if (!item.IsOk())
+        return;
+
+    ObjectDataViewModelNode *node = (ObjectDataViewModelNode*)item.GetID();
+
+    if (!node->GetBitmap().IsOk() || !(node->GetType() & (itVolume | itObject)))
+        return;
+
+    if (node->GetType() & itVolume) {
+        node->SetBitmap(*m_volume_bmps[static_cast<int>(node->volume_type())]);
+        return;
+    }
+
+    node->SetBitmap(wxNullBitmap);
+    if (unmark_object)
+    {
+        wxDataViewItemArray children;
+        GetChildren(item, children);
+        for (const wxDataViewItem& child : children)
+            DeleteWarningIcon(child);
+    }
+}
+
 //-----------------------------------------------------------------------------
 // PrusaDataViewBitmapText
 //-----------------------------------------------------------------------------
 
-wxIMPLEMENT_DYNAMIC_CLASS(PrusaDataViewBitmapText, wxObject)
+wxIMPLEMENT_DYNAMIC_CLASS(DataViewBitmapText, wxObject)
 
-IMPLEMENT_VARIANT_OBJECT(PrusaDataViewBitmapText)
+IMPLEMENT_VARIANT_OBJECT(DataViewBitmapText)
 
 // ---------------------------------------------------------
-// PrusaIconTextRenderer
+// BitmapTextRenderer
 // ---------------------------------------------------------
 
 #if ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
-PrusaBitmapTextRenderer::PrusaBitmapTextRenderer(wxDataViewCellMode mode /*= wxDATAVIEW_CELL_EDITABLE*/, 
+BitmapTextRenderer::BitmapTextRenderer(wxDataViewCellMode mode /*= wxDATAVIEW_CELL_EDITABLE*/, 
                                                  int align /*= wxDVR_DEFAULT_ALIGNMENT*/): 
 wxDataViewRenderer(wxT("PrusaDataViewBitmapText"), mode, align)
 {
@@ -1308,25 +1427,25 @@ wxDataViewRenderer(wxT("PrusaDataViewBitmapText"), mode, align)
 }
 #endif // ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
 
-bool PrusaBitmapTextRenderer::SetValue(const wxVariant &value)
+bool BitmapTextRenderer::SetValue(const wxVariant &value)
 {
     m_value << value;
     return true;
 }
 
-bool PrusaBitmapTextRenderer::GetValue(wxVariant& WXUNUSED(value)) const
+bool BitmapTextRenderer::GetValue(wxVariant& WXUNUSED(value)) const
 {
     return false;
 }
 
 #if ENABLE_NONCUSTOM_DATA_VIEW_RENDERING && wxUSE_ACCESSIBILITY
-wxString PrusaBitmapTextRenderer::GetAccessibleDescription() const
+wxString BitmapTextRenderer::GetAccessibleDescription() const
 {
     return m_value.GetText();
 }
 #endif // wxUSE_ACCESSIBILITY && ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
 
-bool PrusaBitmapTextRenderer::Render(wxRect rect, wxDC *dc, int state)
+bool BitmapTextRenderer::Render(wxRect rect, wxDC *dc, int state)
 {
     int xoffset = 0;
 
@@ -1342,7 +1461,7 @@ bool PrusaBitmapTextRenderer::Render(wxRect rect, wxDC *dc, int state)
     return true;
 }
 
-wxSize PrusaBitmapTextRenderer::GetSize() const
+wxSize BitmapTextRenderer::GetSize() const
 {
     if (!m_value.GetText().empty())
     {
@@ -1356,15 +1475,15 @@ wxSize PrusaBitmapTextRenderer::GetSize() const
 }
 
 
-wxWindow* PrusaBitmapTextRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelRect, const wxVariant& value)
+wxWindow* BitmapTextRenderer::CreateEditorCtrl(wxWindow* parent, wxRect labelRect, const wxVariant& value)
 {
     wxDataViewCtrl* const dv_ctrl = GetOwner()->GetOwner();
-    PrusaObjectDataViewModel* const model = dynamic_cast<PrusaObjectDataViewModel*>(dv_ctrl->GetModel());
+    ObjectDataViewModel* const model = dynamic_cast<ObjectDataViewModel*>(dv_ctrl->GetModel());
 
     if ( !(model->GetItemType(dv_ctrl->GetSelection()) & (itVolume | itObject)) )
         return nullptr;
 
-    PrusaDataViewBitmapText data;
+    DataViewBitmapText data;
     data << value;
 
     m_was_unusable_symbol = false;
@@ -1384,7 +1503,7 @@ wxWindow* PrusaBitmapTextRenderer::CreateEditorCtrl(wxWindow* parent, wxRect lab
     return text_editor;
 }
 
-bool PrusaBitmapTextRenderer::GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value)
+bool BitmapTextRenderer::GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant& value)
 {
     wxTextCtrl* text_editor = wxDynamicCast(ctrl, wxTextCtrl);
     if (!text_editor || text_editor->GetValue().IsEmpty())
@@ -1403,7 +1522,7 @@ bool PrusaBitmapTextRenderer::GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant&
     wxVariant valueOld;
     GetView()->GetModel()->GetValue(valueOld, m_item, 0); 
     
-    PrusaDataViewBitmapText bmpText;
+    DataViewBitmapText bmpText;
     bmpText << valueOld;
 
     // But replace the text with the value entered by user.
@@ -1414,19 +1533,19 @@ bool PrusaBitmapTextRenderer::GetValueFromEditorCtrl(wxWindow* ctrl, wxVariant&
 }
 
 // ----------------------------------------------------------------------------
-// PrusaDoubleSlider
+// DoubleSlider
 // ----------------------------------------------------------------------------
-PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent,
-                                        wxWindowID id,
-                                        int lowerValue, 
-                                        int higherValue, 
-                                        int minValue, 
-                                        int maxValue,
-                                        const wxPoint& pos,
-                                        const wxSize& size,
-                                        long style,
-                                        const wxValidator& val,
-                                        const wxString& name) : 
+DoubleSlider::DoubleSlider( wxWindow *parent,
+                            wxWindowID id,
+                            int lowerValue, 
+                            int higherValue, 
+                            int minValue, 
+                            int maxValue,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& val,
+                            const wxString& name) : 
     wxControl(parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE),
     m_lower_value(lowerValue), m_higher_value (higherValue), 
     m_min_value(minValue), m_max_value(maxValue),
@@ -1438,39 +1557,39 @@ PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent,
     if (!is_osx)
         SetDoubleBuffered(true);// SetDoubleBuffered exists on Win and Linux/GTK, but is missing on OSX
 
-    m_bmp_thumb_higher = wxBitmap(create_scaled_bitmap(style == wxSL_HORIZONTAL ? "right_half_circle.png"   : "up_half_circle.png"));
-    m_bmp_thumb_lower  = wxBitmap(create_scaled_bitmap(style == wxSL_HORIZONTAL ? "left_half_circle.png"    : "down_half_circle.png"));
-    m_thumb_size = m_bmp_thumb_lower.GetSize();
+    m_bmp_thumb_higher = (style == wxSL_HORIZONTAL ? ScalableBitmap(this, "right_half_circle.png") : ScalableBitmap(this, "up_half_circle.png",   16, true));
+    m_bmp_thumb_lower  = (style == wxSL_HORIZONTAL ? ScalableBitmap(this, "left_half_circle.png" ) : ScalableBitmap(this, "down_half_circle.png", 16, true));
+    m_thumb_size = m_bmp_thumb_lower.bmp().GetSize();
 
-    m_bmp_add_tick_on  = create_scaled_bitmap("colorchange_add_on.png");
-    m_bmp_add_tick_off = create_scaled_bitmap("colorchange_add_off.png");
-    m_bmp_del_tick_on  = create_scaled_bitmap("colorchange_delete_on.png");
-    m_bmp_del_tick_off = create_scaled_bitmap("colorchange_delete_off.png");
-    m_tick_icon_dim = m_bmp_add_tick_on.GetSize().x;
+    m_bmp_add_tick_on  = ScalableBitmap(this, "colorchange_add_on.png");
+    m_bmp_add_tick_off = ScalableBitmap(this, "colorchange_add_off.png");
+    m_bmp_del_tick_on  = ScalableBitmap(this, "colorchange_delete_on.png");
+    m_bmp_del_tick_off = ScalableBitmap(this, "colorchange_delete_off.png");
+    m_tick_icon_dim = m_bmp_add_tick_on.bmp().GetSize().x;
 
-    m_bmp_one_layer_lock_on    = create_scaled_bitmap("one_layer_lock_on.png");
-    m_bmp_one_layer_lock_off   = create_scaled_bitmap("one_layer_lock_off.png");
-    m_bmp_one_layer_unlock_on  = create_scaled_bitmap("one_layer_unlock_on.png");
-    m_bmp_one_layer_unlock_off = create_scaled_bitmap("one_layer_unlock_off.png");
-    m_lock_icon_dim = m_bmp_one_layer_lock_on.GetSize().x;
+    m_bmp_one_layer_lock_on    = ScalableBitmap(this, "one_layer_lock_on.png");
+    m_bmp_one_layer_lock_off   = ScalableBitmap(this, "one_layer_lock_off.png");
+    m_bmp_one_layer_unlock_on  = ScalableBitmap(this, "one_layer_unlock_on.png");
+    m_bmp_one_layer_unlock_off = ScalableBitmap(this, "one_layer_unlock_off.png");
+    m_lock_icon_dim = m_bmp_one_layer_lock_on.bmp().GetSize().x;
 
     m_selection = ssUndef;
 
     // slider events
-    Bind(wxEVT_PAINT,       &PrusaDoubleSlider::OnPaint,    this);
-    Bind(wxEVT_LEFT_DOWN,   &PrusaDoubleSlider::OnLeftDown, this);
-    Bind(wxEVT_MOTION,      &PrusaDoubleSlider::OnMotion,   this);
-    Bind(wxEVT_LEFT_UP,     &PrusaDoubleSlider::OnLeftUp,   this);
-    Bind(wxEVT_MOUSEWHEEL,  &PrusaDoubleSlider::OnWheel,    this);
-    Bind(wxEVT_ENTER_WINDOW,&PrusaDoubleSlider::OnEnterWin, this);
-    Bind(wxEVT_LEAVE_WINDOW,&PrusaDoubleSlider::OnLeaveWin, this);
-    Bind(wxEVT_KEY_DOWN,    &PrusaDoubleSlider::OnKeyDown,  this);
-    Bind(wxEVT_KEY_UP,      &PrusaDoubleSlider::OnKeyUp,    this);
-    Bind(wxEVT_RIGHT_DOWN,  &PrusaDoubleSlider::OnRightDown,this);
-    Bind(wxEVT_RIGHT_UP,    &PrusaDoubleSlider::OnRightUp,  this);
+    Bind(wxEVT_PAINT,       &DoubleSlider::OnPaint,    this);
+    Bind(wxEVT_LEFT_DOWN,   &DoubleSlider::OnLeftDown, this);
+    Bind(wxEVT_MOTION,      &DoubleSlider::OnMotion,   this);
+    Bind(wxEVT_LEFT_UP,     &DoubleSlider::OnLeftUp,   this);
+    Bind(wxEVT_MOUSEWHEEL,  &DoubleSlider::OnWheel,    this);
+    Bind(wxEVT_ENTER_WINDOW,&DoubleSlider::OnEnterWin, this);
+    Bind(wxEVT_LEAVE_WINDOW,&DoubleSlider::OnLeaveWin, this);
+    Bind(wxEVT_KEY_DOWN,    &DoubleSlider::OnKeyDown,  this);
+    Bind(wxEVT_KEY_UP,      &DoubleSlider::OnKeyUp,    this);
+    Bind(wxEVT_RIGHT_DOWN,  &DoubleSlider::OnRightDown,this);
+    Bind(wxEVT_RIGHT_UP,    &DoubleSlider::OnRightUp,  this);
 
     // control's view variables
-    SLIDER_MARGIN     = 4 + Slic3r::GUI::wxGetApp().em_unit();//(style == wxSL_HORIZONTAL ? m_bmp_thumb_higher.GetWidth() : m_bmp_thumb_higher.GetHeight());
+    SLIDER_MARGIN     = 4 + Slic3r::GUI::wxGetApp().em_unit();
 
     DARK_ORANGE_PEN   = wxPen(wxColour(253, 84, 2));
     ORANGE_PEN        = wxPen(wxColour(253, 126, 66));
@@ -1480,32 +1599,65 @@ PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent,
     GREY_PEN          = wxPen(wxColour(164, 164, 164));
     LIGHT_GREY_PEN    = wxPen(wxColour(204, 204, 204));
 
-    line_pens = { &DARK_GREY_PEN, &GREY_PEN, &LIGHT_GREY_PEN };
-    segm_pens = { &DARK_ORANGE_PEN, &ORANGE_PEN, &LIGHT_ORANGE_PEN };
+    m_line_pens = { &DARK_GREY_PEN, &GREY_PEN, &LIGHT_GREY_PEN };
+    m_segm_pens = { &DARK_ORANGE_PEN, &ORANGE_PEN, &LIGHT_ORANGE_PEN };
 
     const wxFont& font = GetFont();
     m_font = is_osx ? font.Smaller().Smaller() : font.Smaller();
 }
 
-int PrusaDoubleSlider::GetActiveValue() const
+void DoubleSlider::msw_rescale()
+{
+    const wxFont& font = Slic3r::GUI::wxGetApp().normal_font();
+    m_font = is_osx ? font.Smaller().Smaller() : font.Smaller();
+
+    m_bmp_thumb_higher.msw_rescale();
+    m_bmp_thumb_lower .msw_rescale();
+    m_thumb_size = m_bmp_thumb_lower.bmp().GetSize();
+
+    m_bmp_add_tick_on .msw_rescale();
+    m_bmp_add_tick_off.msw_rescale();
+    m_bmp_del_tick_on .msw_rescale();
+    m_bmp_del_tick_off.msw_rescale();
+    m_tick_icon_dim = m_bmp_add_tick_on.bmp().GetSize().x;
+
+    m_bmp_one_layer_lock_on   .msw_rescale();
+    m_bmp_one_layer_lock_off  .msw_rescale();
+    m_bmp_one_layer_unlock_on .msw_rescale();
+    m_bmp_one_layer_unlock_off.msw_rescale();
+    m_lock_icon_dim = m_bmp_one_layer_lock_on.bmp().GetSize().x;
+
+    SLIDER_MARGIN = 4 + Slic3r::GUI::wxGetApp().em_unit();
+
+    SetMinSize(get_min_size());
+    GetParent()->Layout();
+}
+
+int DoubleSlider::GetActiveValue() const
 {
     return m_selection == ssLower ?
     m_lower_value : m_selection == ssHigher ?
                 m_higher_value : -1;
 }
 
-wxSize PrusaDoubleSlider::DoGetBestSize() const
+wxSize DoubleSlider::get_min_size() const 
+{
+    const int min_side = is_horizontal() ?
+        (is_osx ? 8 : 6) * Slic3r::GUI::wxGetApp().em_unit() :
+        /*(is_osx ? 10 : 8)*/10 * Slic3r::GUI::wxGetApp().em_unit();
+
+    return wxSize(min_side, min_side);
+}
+
+wxSize DoubleSlider::DoGetBestSize() const
 {
     const wxSize size = wxControl::DoGetBestSize();
     if (size.x > 1 && size.y > 1)
         return size;
-    const int new_size = is_horizontal() ? 
-                         (is_osx ? 8 : 6) * Slic3r::GUI::wxGetApp().em_unit() :
-                         (is_osx ? 10 : 8) * Slic3r::GUI::wxGetApp().em_unit();
-    return wxSize(new_size, new_size);
+    return get_min_size();
 }
 
-void PrusaDoubleSlider::SetLowerValue(const int lower_val)
+void DoubleSlider::SetLowerValue(const int lower_val)
 {
     m_selection = ssLower;
     m_lower_value = lower_val;
@@ -1518,7 +1670,7 @@ void PrusaDoubleSlider::SetLowerValue(const int lower_val)
     ProcessWindowEvent(e);
 }
 
-void PrusaDoubleSlider::SetHigherValue(const int higher_val)
+void DoubleSlider::SetHigherValue(const int higher_val)
 {
     m_selection = ssHigher;
     m_higher_value = higher_val;
@@ -1531,7 +1683,7 @@ void PrusaDoubleSlider::SetHigherValue(const int higher_val)
     ProcessWindowEvent(e);
 }
 
-void PrusaDoubleSlider::SetSelectionSpan(const int lower_val, const int higher_val)
+void DoubleSlider::SetSelectionSpan(const int lower_val, const int higher_val)
 {
     m_lower_value  = std::max(lower_val, m_min_value);
     m_higher_value = std::max(std::min(higher_val, m_max_value), m_lower_value);
@@ -1546,14 +1698,14 @@ void PrusaDoubleSlider::SetSelectionSpan(const int lower_val, const int higher_v
     ProcessWindowEvent(e);
 }
 
-void PrusaDoubleSlider::SetMaxValue(const int max_value)
+void DoubleSlider::SetMaxValue(const int max_value)
 {
     m_max_value = max_value;
     Refresh();
     Update();
 }
 
-void PrusaDoubleSlider::draw_scroll_line(wxDC& dc, const int lower_pos, const int higher_pos)
+void DoubleSlider::draw_scroll_line(wxDC& dc, const int lower_pos, const int higher_pos)
 {
     int width;
     int height;
@@ -1569,11 +1721,11 @@ void PrusaDoubleSlider::draw_scroll_line(wxDC& dc, const int lower_pos, const in
     wxCoord segm_end_x = is_horizontal() ? higher_pos : width*0.5 - 1;
     wxCoord segm_end_y = is_horizontal() ? height*0.5 - 1 : higher_pos-1;
 
-    for (int id = 0; id < line_pens.size(); id++)
+    for (int id = 0; id < m_line_pens.size(); id++)
     {
-        dc.SetPen(*line_pens[id]);
+        dc.SetPen(*m_line_pens[id]);
         dc.DrawLine(line_beg_x, line_beg_y, line_end_x, line_end_y);
-        dc.SetPen(*segm_pens[id]);
+        dc.SetPen(*m_segm_pens[id]);
         dc.DrawLine(segm_beg_x, segm_beg_y, segm_end_x, segm_end_y);
         if (is_horizontal())
             line_beg_y = line_end_y = segm_beg_y = segm_end_y += 1;
@@ -1582,7 +1734,7 @@ void PrusaDoubleSlider::draw_scroll_line(wxDC& dc, const int lower_pos, const in
     }
 }
 
-double PrusaDoubleSlider::get_scroll_step()
+double DoubleSlider::get_scroll_step()
 {
     const wxSize sz = get_size();
     const int& slider_len = m_style == wxSL_HORIZONTAL ? sz.x : sz.y;
@@ -1590,27 +1742,27 @@ double PrusaDoubleSlider::get_scroll_step()
 }
 
 // get position on the slider line from entered value
-wxCoord PrusaDoubleSlider::get_position_from_value(const int value)
+wxCoord DoubleSlider::get_position_from_value(const int value)
 {
     const double step = get_scroll_step();
     const int val = is_horizontal() ? value : m_max_value - value;
     return wxCoord(SLIDER_MARGIN + int(val*step + 0.5));
 }
 
-wxSize PrusaDoubleSlider::get_size()
+wxSize DoubleSlider::get_size()
 {
     int w, h;
     get_size(&w, &h);
     return wxSize(w, h);
 }
 
-void PrusaDoubleSlider::get_size(int *w, int *h)
+void DoubleSlider::get_size(int *w, int *h)
 {
     GetSize(w, h);
     is_horizontal() ? *w -= m_lock_icon_dim : *h -= m_lock_icon_dim;
 }
 
-double PrusaDoubleSlider::get_double_value(const SelectedSlider& selection)
+double DoubleSlider::get_double_value(const SelectedSlider& selection)
 {
     if (m_values.empty() || m_lower_value<0)
         return 0.0;
@@ -1621,7 +1773,7 @@ double PrusaDoubleSlider::get_double_value(const SelectedSlider& selection)
     return m_values[selection == ssLower ? m_lower_value : m_higher_value].second;
 }
 
-std::vector<double> PrusaDoubleSlider::GetTicksValues() const
+std::vector<double> DoubleSlider::GetTicksValues() const
 {
     std::vector<double> values;
 
@@ -1635,7 +1787,7 @@ std::vector<double> PrusaDoubleSlider::GetTicksValues() const
     return values;
 }
 
-void PrusaDoubleSlider::SetTicksValues(const std::vector<double>& heights)
+void DoubleSlider::SetTicksValues(const std::vector<double>& heights)
 {
     if (m_values.empty())
         return;
@@ -1657,7 +1809,7 @@ void PrusaDoubleSlider::SetTicksValues(const std::vector<double>& heights)
         wxPostEvent(this->GetParent(), wxCommandEvent(wxCUSTOMEVT_TICKSCHANGED));
 }
 
-void PrusaDoubleSlider::get_lower_and_higher_position(int& lower_pos, int& higher_pos)
+void DoubleSlider::get_lower_and_higher_position(int& lower_pos, int& higher_pos)
 {
     const double step = get_scroll_step();
     if (is_horizontal()) {
@@ -1670,7 +1822,7 @@ void PrusaDoubleSlider::get_lower_and_higher_position(int& lower_pos, int& highe
     }
 }
 
-void PrusaDoubleSlider::draw_focus_rect()
+void DoubleSlider::draw_focus_rect()
 {
     if (!m_is_focused) 
         return;
@@ -1682,7 +1834,7 @@ void PrusaDoubleSlider::draw_focus_rect()
     dc.DrawRectangle(1, 1, sz.x - 2, sz.y - 2);
 }
 
-void PrusaDoubleSlider::render()
+void DoubleSlider::render()
 {
     SetBackgroundColour(GetParent()->GetBackgroundColour());
     draw_focus_rect();
@@ -1715,12 +1867,13 @@ void PrusaDoubleSlider::render()
     draw_one_layer_icon(dc);
 }
 
-void PrusaDoubleSlider::draw_action_icon(wxDC& dc, const wxPoint pt_beg, const wxPoint pt_end)
+void DoubleSlider::draw_action_icon(wxDC& dc, const wxPoint pt_beg, const wxPoint pt_end)
 {
     const int tick = m_selection == ssLower ? m_lower_value : m_higher_value;
-    wxBitmap* icon = m_is_action_icon_focesed ? &m_bmp_add_tick_off : &m_bmp_add_tick_on;
+
+    wxBitmap& icon = m_is_action_icon_focesed ? m_bmp_add_tick_off.bmp() : m_bmp_add_tick_on.bmp();
     if (m_ticks.find(tick) != m_ticks.end())
-        icon = m_is_action_icon_focesed ? &m_bmp_del_tick_off : &m_bmp_del_tick_on;
+        icon = m_is_action_icon_focesed ? m_bmp_del_tick_off.bmp() : m_bmp_del_tick_on.bmp();
 
     wxCoord x_draw, y_draw;
     is_horizontal() ? x_draw = pt_beg.x - 0.5*m_tick_icon_dim : y_draw = pt_beg.y - 0.5*m_tick_icon_dim;
@@ -1729,13 +1882,13 @@ void PrusaDoubleSlider::draw_action_icon(wxDC& dc, const wxPoint pt_beg, const w
     else
         is_horizontal() ? y_draw = pt_beg.y - m_tick_icon_dim-2 : x_draw = pt_end.x + 3;
 
-    dc.DrawBitmap(*icon, x_draw, y_draw);
+    dc.DrawBitmap(icon, x_draw, y_draw);
 
     //update rect of the tick action icon
     m_rect_tick_action = wxRect(x_draw, y_draw, m_tick_icon_dim, m_tick_icon_dim);
 }
 
-void PrusaDoubleSlider::draw_info_line_with_icon(wxDC& dc, const wxPoint& pos, const SelectedSlider selection)
+void DoubleSlider::draw_info_line_with_icon(wxDC& dc, const wxPoint& pos, const SelectedSlider selection)
 {
     if (m_selection == selection) {
         //draw info line
@@ -1750,7 +1903,7 @@ void PrusaDoubleSlider::draw_info_line_with_icon(wxDC& dc, const wxPoint& pos, c
     }
 }
 
-wxString PrusaDoubleSlider::get_label(const SelectedSlider& selection) const
+wxString DoubleSlider::get_label(const SelectedSlider& selection) const
 {
     const int value = selection == ssLower ? m_lower_value : m_higher_value;
 
@@ -1765,7 +1918,7 @@ wxString PrusaDoubleSlider::get_label(const SelectedSlider& selection) const
     return wxString::Format("%s\n(%d)", str, m_values.empty() ? value : m_values[value].first);
 }
 
-void PrusaDoubleSlider::draw_thumb_text(wxDC& dc, const wxPoint& pos, const SelectedSlider& selection) const
+void DoubleSlider::draw_thumb_text(wxDC& dc, const wxPoint& pos, const SelectedSlider& selection) const
 {
     if ((m_is_one_layer || m_higher_value==m_lower_value) && selection != m_selection || !selection) 
         return;
@@ -1782,7 +1935,7 @@ void PrusaDoubleSlider::draw_thumb_text(wxDC& dc, const wxPoint& pos, const Sele
     dc.DrawText(label, text_pos);
 }
 
-void PrusaDoubleSlider::draw_thumb_item(wxDC& dc, const wxPoint& pos, const SelectedSlider& selection)
+void DoubleSlider::draw_thumb_item(wxDC& dc, const wxPoint& pos, const SelectedSlider& selection)
 {
     wxCoord x_draw, y_draw;
     if (selection == ssLower) {
@@ -1805,13 +1958,13 @@ void PrusaDoubleSlider::draw_thumb_item(wxDC& dc, const wxPoint& pos, const Sele
             y_draw = pos.y - m_thumb_size.y;
         }
     }
-    dc.DrawBitmap(selection == ssLower ? m_bmp_thumb_lower : m_bmp_thumb_higher, x_draw, y_draw);
+    dc.DrawBitmap(selection == ssLower ? m_bmp_thumb_lower.bmp() : m_bmp_thumb_higher.bmp(), x_draw, y_draw);
 
     // Update thumb rect
     update_thumb_rect(x_draw, y_draw, selection);
 }
 
-void PrusaDoubleSlider::draw_thumb(wxDC& dc, const wxCoord& pos_coord, const SelectedSlider& selection)
+void DoubleSlider::draw_thumb(wxDC& dc, const wxCoord& pos_coord, const SelectedSlider& selection)
 {
     //calculate thumb position on slider line
     int width, height;
@@ -1828,7 +1981,7 @@ void PrusaDoubleSlider::draw_thumb(wxDC& dc, const wxCoord& pos_coord, const Sel
     draw_thumb_text(dc, pos, selection);
 }
 
-void PrusaDoubleSlider::draw_thumbs(wxDC& dc, const wxCoord& lower_pos, const wxCoord& higher_pos)
+void DoubleSlider::draw_thumbs(wxDC& dc, const wxCoord& lower_pos, const wxCoord& higher_pos)
 {
     //calculate thumb position on slider line
     int width, height;
@@ -1852,7 +2005,7 @@ void PrusaDoubleSlider::draw_thumbs(wxDC& dc, const wxCoord& lower_pos, const wx
     draw_thumb_text(dc, pos_l, ssLower);
 }
 
-void PrusaDoubleSlider::draw_ticks(wxDC& dc)
+void DoubleSlider::draw_ticks(wxDC& dc)
 {
     dc.SetPen(m_is_enabled_tick_manipulation ? DARK_GREY_PEN : LIGHT_GREY_PEN );
     int height, width;
@@ -1869,7 +2022,7 @@ void PrusaDoubleSlider::draw_ticks(wxDC& dc)
     }
 }
 
-void PrusaDoubleSlider::draw_colored_band(wxDC& dc)
+void DoubleSlider::draw_colored_band(wxDC& dc)
 {
     int height, width;
     get_size(&width, &height);
@@ -1919,11 +2072,11 @@ void PrusaDoubleSlider::draw_colored_band(wxDC& dc)
     }
 }
 
-void PrusaDoubleSlider::draw_one_layer_icon(wxDC& dc)
+void DoubleSlider::draw_one_layer_icon(wxDC& dc)
 {
-    wxBitmap* icon = m_is_one_layer ?
-                     m_is_one_layer_icon_focesed ? &m_bmp_one_layer_lock_off : &m_bmp_one_layer_lock_on :
-                     m_is_one_layer_icon_focesed ? &m_bmp_one_layer_unlock_off : &m_bmp_one_layer_unlock_on;
+    const wxBitmap& icon = m_is_one_layer ?
+                     m_is_one_layer_icon_focesed ? m_bmp_one_layer_lock_off.bmp()   : m_bmp_one_layer_lock_on.bmp() :
+                     m_is_one_layer_icon_focesed ? m_bmp_one_layer_unlock_off.bmp() : m_bmp_one_layer_unlock_on.bmp();
 
     int width, height;
     get_size(&width, &height);
@@ -1932,13 +2085,13 @@ void PrusaDoubleSlider::draw_one_layer_icon(wxDC& dc)
     is_horizontal() ? x_draw = width-2 : x_draw = 0.5*width - 0.5*m_lock_icon_dim;
     is_horizontal() ? y_draw = 0.5*height - 0.5*m_lock_icon_dim : y_draw = height-2;
 
-    dc.DrawBitmap(*icon, x_draw, y_draw);
+    dc.DrawBitmap(icon, x_draw, y_draw);
 
     //update rect of the lock/unlock icon
     m_rect_one_layer_icon = wxRect(x_draw, y_draw, m_lock_icon_dim, m_lock_icon_dim);
 }
 
-void PrusaDoubleSlider::update_thumb_rect(const wxCoord& begin_x, const wxCoord& begin_y, const SelectedSlider& selection)
+void DoubleSlider::update_thumb_rect(const wxCoord& begin_x, const wxCoord& begin_y, const SelectedSlider& selection)
 {
     const wxRect& rect = wxRect(begin_x, begin_y, m_thumb_size.x, m_thumb_size.y);
     if (selection == ssLower)
@@ -1947,7 +2100,7 @@ void PrusaDoubleSlider::update_thumb_rect(const wxCoord& begin_x, const wxCoord&
         m_rect_higher_thumb = rect;
 }
 
-int PrusaDoubleSlider::get_value_from_position(const wxCoord x, const wxCoord y)
+int DoubleSlider::get_value_from_position(const wxCoord x, const wxCoord y)
 {
     const int height = get_size().y;
     const double step = get_scroll_step();
@@ -1958,13 +2111,13 @@ int PrusaDoubleSlider::get_value_from_position(const wxCoord x, const wxCoord y)
         return int(m_min_value + double(height - SLIDER_MARGIN - y) / step + 0.5);
 }
 
-void PrusaDoubleSlider::detect_selected_slider(const wxPoint& pt)
+void DoubleSlider::detect_selected_slider(const wxPoint& pt)
 {
     m_selection = is_point_in_rect(pt, m_rect_lower_thumb) ? ssLower :
                   is_point_in_rect(pt, m_rect_higher_thumb) ? ssHigher : ssUndef;
 }
 
-bool PrusaDoubleSlider::is_point_in_rect(const wxPoint& pt, const wxRect& rect)
+bool DoubleSlider::is_point_in_rect(const wxPoint& pt, const wxRect& rect)
 {
     if (rect.GetLeft() <= pt.x && pt.x <= rect.GetRight() && 
         rect.GetTop()  <= pt.y && pt.y <= rect.GetBottom())
@@ -1972,7 +2125,7 @@ bool PrusaDoubleSlider::is_point_in_rect(const wxPoint& pt, const wxRect& rect)
     return false;
 }
 
-int PrusaDoubleSlider::is_point_near_tick(const wxPoint& pt)
+int DoubleSlider::is_point_near_tick(const wxPoint& pt)
 {
     for (auto tick : m_ticks) {
         const wxCoord pos = get_position_from_value(tick);
@@ -1989,7 +2142,7 @@ int PrusaDoubleSlider::is_point_near_tick(const wxPoint& pt)
     return -1;
 }
 
-void PrusaDoubleSlider::ChangeOneLayerLock()
+void DoubleSlider::ChangeOneLayerLock()
 {
     m_is_one_layer = !m_is_one_layer;
     m_selection == ssLower ? correct_lower_value() : correct_higher_value();
@@ -2003,7 +2156,7 @@ void PrusaDoubleSlider::ChangeOneLayerLock()
     ProcessWindowEvent(e);
 }
 
-void PrusaDoubleSlider::OnLeftDown(wxMouseEvent& event)
+void DoubleSlider::OnLeftDown(wxMouseEvent& event)
 {
     this->CaptureMouse();
     wxClientDC dc(this);
@@ -2048,7 +2201,7 @@ void PrusaDoubleSlider::OnLeftDown(wxMouseEvent& event)
     event.Skip();
 }
 
-void PrusaDoubleSlider::correct_lower_value()
+void DoubleSlider::correct_lower_value()
 {
     if (m_lower_value < m_min_value)
         m_lower_value = m_min_value;
@@ -2059,7 +2212,7 @@ void PrusaDoubleSlider::correct_lower_value()
         m_higher_value = m_lower_value;
 }
 
-void PrusaDoubleSlider::correct_higher_value()
+void DoubleSlider::correct_higher_value()
 {
     if (m_higher_value > m_max_value)
         m_higher_value = m_max_value;
@@ -2070,7 +2223,7 @@ void PrusaDoubleSlider::correct_higher_value()
         m_lower_value = m_higher_value;
 }
 
-void PrusaDoubleSlider::OnMotion(wxMouseEvent& event)
+void DoubleSlider::OnMotion(wxMouseEvent& event)
 {
     bool action = false;
 
@@ -2104,7 +2257,7 @@ void PrusaDoubleSlider::OnMotion(wxMouseEvent& event)
     }
 }
 
-void PrusaDoubleSlider::OnLeftUp(wxMouseEvent& event)
+void DoubleSlider::OnLeftUp(wxMouseEvent& event)
 {
     if (!HasCapture())
         return;
@@ -2119,7 +2272,7 @@ void PrusaDoubleSlider::OnLeftUp(wxMouseEvent& event)
     ProcessWindowEvent(e);
 }
 
-void PrusaDoubleSlider::enter_window(wxMouseEvent& event, const bool enter)
+void DoubleSlider::enter_window(wxMouseEvent& event, const bool enter)
 {
     m_is_focused = enter;
     Refresh();
@@ -2130,7 +2283,7 @@ void PrusaDoubleSlider::enter_window(wxMouseEvent& event, const bool enter)
 // "condition" have to be true for:
 //    -  value increase (if wxSL_VERTICAL)
 //    -  value decrease (if wxSL_HORIZONTAL) 
-void PrusaDoubleSlider::move_current_thumb(const bool condition)
+void DoubleSlider::move_current_thumb(const bool condition)
 {
 //     m_is_one_layer = wxGetKeyState(WXK_CONTROL);
     int delta = condition ? -1 : 1;
@@ -2153,7 +2306,7 @@ void PrusaDoubleSlider::move_current_thumb(const bool condition)
     ProcessWindowEvent(e);
 }
 
-void PrusaDoubleSlider::action_tick(const TicksAction action)
+void DoubleSlider::action_tick(const TicksAction action)
 {
     if (m_selection == ssUndef)
         return;
@@ -2177,7 +2330,7 @@ void PrusaDoubleSlider::action_tick(const TicksAction action)
     Update();
 }
 
-void PrusaDoubleSlider::OnWheel(wxMouseEvent& event)
+void DoubleSlider::OnWheel(wxMouseEvent& event)
 {
     // Set nearest to the mouse thumb as a selected, if there is not selected thumb
     if (m_selection == ssUndef) 
@@ -2197,7 +2350,7 @@ void PrusaDoubleSlider::OnWheel(wxMouseEvent& event)
     move_current_thumb(event.GetWheelRotation() > 0);
 }
 
-void PrusaDoubleSlider::OnKeyDown(wxKeyEvent &event)
+void DoubleSlider::OnKeyDown(wxKeyEvent &event)
 {
     const int key = event.GetKeyCode();
     if (key == '+' || key == WXK_NUMPAD_ADD)
@@ -2223,7 +2376,7 @@ void PrusaDoubleSlider::OnKeyDown(wxKeyEvent &event)
     }
 }
 
-void PrusaDoubleSlider::OnKeyUp(wxKeyEvent &event)
+void DoubleSlider::OnKeyUp(wxKeyEvent &event)
 {
     if (event.GetKeyCode() == WXK_CONTROL)
         m_is_one_layer = false;
@@ -2232,7 +2385,7 @@ void PrusaDoubleSlider::OnKeyUp(wxKeyEvent &event)
     event.Skip();
 }
 
-void PrusaDoubleSlider::OnRightDown(wxMouseEvent& event)
+void DoubleSlider::OnRightDown(wxMouseEvent& event)
 {
     this->CaptureMouse();
     const wxClientDC dc(this);
@@ -2252,7 +2405,7 @@ void PrusaDoubleSlider::OnRightDown(wxMouseEvent& event)
     event.Skip();
 }
 
-void PrusaDoubleSlider::OnRightUp(wxMouseEvent& event)
+void DoubleSlider::OnRightUp(wxMouseEvent& event)
 {
     if (!HasCapture())
         return;
@@ -2266,34 +2419,33 @@ void PrusaDoubleSlider::OnRightUp(wxMouseEvent& event)
 
 
 // ----------------------------------------------------------------------------
-// PrusaLockButton
+// LockButton
 // ----------------------------------------------------------------------------
 
-PrusaLockButton::PrusaLockButton(   wxWindow *parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos /*= wxDefaultPosition*/, 
-                                    const wxSize& size /*= wxDefaultSize*/):
-                                    wxButton(parent, id, wxEmptyString, pos, size, wxBU_EXACTFIT | wxNO_BORDER)
+LockButton::LockButton( wxWindow *parent, 
+                        wxWindowID id, 
+                        const wxPoint& pos /*= wxDefaultPosition*/, 
+                        const wxSize& size /*= wxDefaultSize*/):
+                        wxButton(parent, id, wxEmptyString, pos, size, wxBU_EXACTFIT | wxNO_BORDER)
 {
-    m_bmp_lock_on      = create_scaled_bitmap("one_layer_lock_on.png");
-    m_bmp_lock_off     = create_scaled_bitmap("one_layer_lock_off.png");
-    m_bmp_unlock_on    = create_scaled_bitmap("one_layer_unlock_on.png");
-    m_bmp_unlock_off   = create_scaled_bitmap("one_layer_unlock_off.png");
-
+    m_bmp_lock_on      = ScalableBitmap(this, "one_layer_lock_on.png");
+    m_bmp_lock_off     = ScalableBitmap(this, "one_layer_lock_off.png");
+    m_bmp_unlock_on    = ScalableBitmap(this, "one_layer_unlock_on.png");
+    m_bmp_unlock_off   = ScalableBitmap(this, "one_layer_unlock_off.png");
 
 #ifdef __WXMSW__
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 #endif // __WXMSW__
-    SetBitmap(m_bmp_unlock_on);
-    SetBitmapDisabled(m_bmp_lock_on);
+    SetBitmap(m_bmp_unlock_on.bmp());
+    SetBitmapDisabled(m_bmp_lock_on.bmp());
 
     //button events
-    Bind(wxEVT_BUTTON,          &PrusaLockButton::OnButton, this);
-    Bind(wxEVT_ENTER_WINDOW,    &PrusaLockButton::OnEnterBtn, this);
-    Bind(wxEVT_LEAVE_WINDOW,    &PrusaLockButton::OnLeaveBtn, this);
+    Bind(wxEVT_BUTTON,          &LockButton::OnButton, this);
+    Bind(wxEVT_ENTER_WINDOW,    &LockButton::OnEnterBtn, this);
+    Bind(wxEVT_LEAVE_WINDOW,    &LockButton::OnLeaveBtn, this);
 }
 
-void PrusaLockButton::OnButton(wxCommandEvent& event)
+void LockButton::OnButton(wxCommandEvent& event)
 {
     m_is_pushed = !m_is_pushed;
     enter_button(true);
@@ -2301,18 +2453,26 @@ void PrusaLockButton::OnButton(wxCommandEvent& event)
     event.Skip();
 }
 
-void PrusaLockButton::SetLock(bool lock)
+void LockButton::SetLock(bool lock)
 {
     m_is_pushed = lock;
     enter_button(true);
 }
 
-void PrusaLockButton::enter_button(const bool enter)
+void LockButton::msw_rescale()
 {
-    wxBitmap* icon = m_is_pushed ?
-        enter ? &m_bmp_lock_off     : &m_bmp_lock_on :
-        enter ? &m_bmp_unlock_off   : &m_bmp_unlock_on;
-    SetBitmap(*icon);
+    m_bmp_lock_on   .msw_rescale();
+    m_bmp_lock_off  .msw_rescale();
+    m_bmp_unlock_on .msw_rescale();
+    m_bmp_unlock_off.msw_rescale();
+}
+
+void LockButton::enter_button(const bool enter)
+{
+    const wxBitmap& icon = m_is_pushed ?
+        enter ? m_bmp_lock_off.bmp() : m_bmp_lock_on.bmp() :
+        enter ? m_bmp_unlock_off.bmp() : m_bmp_unlock_on.bmp();
+    SetBitmap(icon);
 
     Refresh();
     Update();
@@ -2321,35 +2481,27 @@ void PrusaLockButton::enter_button(const bool enter)
 
 
 // ----------------------------------------------------------------------------
-// PrusaModeButton
+// ModeButton
 // ----------------------------------------------------------------------------
 
-PrusaModeButton::PrusaModeButton(   wxWindow *parent,
-                                    wxWindowID id,
-                                    const wxString& mode/* = wxEmptyString*/,
-                                    const wxBitmap& bmp_on/* = wxNullBitmap*/,
-                                    const wxSize& size/* = wxDefaultSize*/,
-                                    const wxPoint& pos/* = wxDefaultPosition*/) :
-    wxButton(parent, id, mode, pos, size, /*wxBU_EXACTFIT | */wxNO_BORDER),
-    m_bmp_on(bmp_on)
+ModeButton::ModeButton( wxWindow *          parent,
+                        wxWindowID          id,
+                        const std::string&  icon_name   /* = ""*/,
+                        const wxString&     mode        /* = wxEmptyString*/,
+                        const wxSize&       size        /* = wxDefaultSize*/,
+                        const wxPoint&      pos         /* = wxDefaultPosition*/) :
+    ScalableButton(parent, id, icon_name, mode, size, pos)
 {
-#ifdef __WXMSW__
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-#endif // __WXMSW__
-    m_bmp_off = create_scaled_bitmap("mode_off_sq.png");
-
     m_tt_focused = wxString::Format(_(L("Switch to the %s mode")), mode);
     m_tt_selected = wxString::Format(_(L("Current mode is %s")), mode);
 
-    SetBitmap(m_bmp_on);
-
     //button events
-    Bind(wxEVT_BUTTON,          &PrusaModeButton::OnButton, this);
-    Bind(wxEVT_ENTER_WINDOW,    &PrusaModeButton::OnEnterBtn, this);
-    Bind(wxEVT_LEAVE_WINDOW,    &PrusaModeButton::OnLeaveBtn, this);
+    Bind(wxEVT_BUTTON,          &ModeButton::OnButton, this);
+    Bind(wxEVT_ENTER_WINDOW,    &ModeButton::OnEnterBtn, this);
+    Bind(wxEVT_LEAVE_WINDOW,    &ModeButton::OnLeaveBtn, this);
 }
 
-void PrusaModeButton::OnButton(wxCommandEvent& event)
+void ModeButton::OnButton(wxCommandEvent& event)
 {
     m_is_selected = true;
     focus_button(m_is_selected);
@@ -2357,18 +2509,19 @@ void PrusaModeButton::OnButton(wxCommandEvent& event)
     event.Skip();
 }
 
-void PrusaModeButton::SetState(const bool state)
+void ModeButton::SetState(const bool state)
 {
     m_is_selected = state;
     focus_button(m_is_selected);
     SetToolTip(state ? m_tt_selected : m_tt_focused);
 }
 
-void PrusaModeButton::focus_button(const bool focus)
+void ModeButton::focus_button(const bool focus)
 {
-//     const wxBitmap& bmp = focus ? m_bmp_on : m_bmp_off;
-//     SetBitmap(bmp);
-    const wxFont& new_font = focus ? Slic3r::GUI::wxGetApp().bold_font() : Slic3r::GUI::wxGetApp().small_font();
+    const wxFont& new_font = focus ? 
+                             Slic3r::GUI::wxGetApp().bold_font() : 
+                             Slic3r::GUI::wxGetApp().normal_font();
+
     SetFont(new_font);
 
     Refresh();
@@ -2377,35 +2530,38 @@ void PrusaModeButton::focus_button(const bool focus)
 
 
 // ----------------------------------------------------------------------------
-// PrusaModeSizer
+// ModeSizer
 // ----------------------------------------------------------------------------
 
-PrusaModeSizer::PrusaModeSizer(wxWindow *parent, int hgap/* = 10*/) :
+ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 10*/) :
     wxFlexGridSizer(3, 0, hgap)
 {
     SetFlexibleDirection(wxHORIZONTAL);
 
-    std::vector<std::pair<wxString, wxBitmap>> buttons = {
-        {_(L("Simple")),    create_scaled_bitmap("mode_simple_sq.png")},
-        {_(L("Advanced")),  create_scaled_bitmap("mode_middle_sq.png")},
-        {_(L("Expert")),    create_scaled_bitmap("mode_expert_sq.png")}
+    std::vector < std::pair < wxString, std::string >> buttons = {
+        {_(L("Simple")),    "mode_simple_sq.png"},
+        {_(L("Advanced")),  "mode_advanced_sq.png"},
+        {_(L("Expert")),    "mode_expert_sq.png"}
     };
 
-    mode_btns.reserve(3);
+    m_mode_btns.reserve(3);
     for (const auto& button : buttons) {
-        int x, y;
-        parent->GetTextExtent(button.first, &x, &y, nullptr, nullptr, &Slic3r::GUI::wxGetApp().bold_font());
-        const wxSize size = wxSize(x + button.second.GetWidth() + Slic3r::GUI::wxGetApp().em_unit(), 
-                                   y + Slic3r::GUI::wxGetApp().em_unit());
-        mode_btns.push_back(new PrusaModeButton(parent, wxID_ANY, button.first, button.second, size));
+#ifdef __WXOSX__
+        wxSize sz = parent->GetTextExtent(button.first);
+        // set default width for ModeButtons to correct rendering on OnFocus under OSX
+        sz.x += 2 * em_unit(parent);
+        m_mode_btns.push_back(new ModeButton(parent, wxID_ANY, button.second, button.first, sz));
+#else
+        m_mode_btns.push_back(new ModeButton(parent, wxID_ANY, button.second, button.first));;
+#endif // __WXOSX__
     }
 
-    for (auto btn : mode_btns)
+    for (auto btn : m_mode_btns)
     {
         btn->Bind(wxEVT_BUTTON, [btn, this](wxCommandEvent &event) {
             event.Skip();
             int mode_id = 0;
-            for (auto cur_btn : mode_btns) {
+            for (auto cur_btn : m_mode_btns) {
                 if (cur_btn == btn)
                     break;
                 else
@@ -2419,18 +2575,24 @@ PrusaModeSizer::PrusaModeSizer(wxWindow *parent, int hgap/* = 10*/) :
 
 }
 
-void PrusaModeSizer::SetMode(const int mode)
+void ModeSizer::SetMode(const int mode)
 {
-    for (int m = 0; m < mode_btns.size(); m++)
-        mode_btns[m]->SetState(m == mode);
+    for (int m = 0; m < m_mode_btns.size(); m++)
+        m_mode_btns[m]->SetState(m == mode);
 }
 
 
+void ModeSizer::msw_rescale()
+{
+    for (int m = 0; m < m_mode_btns.size(); m++)
+        m_mode_btns[m]->msw_rescale();
+}
+
 // ----------------------------------------------------------------------------
-// PrusaMenu
+// MenuWithSeparators
 // ----------------------------------------------------------------------------
 
-void PrusaMenu::DestroySeparators()
+void MenuWithSeparators::DestroySeparators()
 {
     if (m_separator_frst) {
         Destroy(m_separator_frst);
@@ -2443,10 +2605,89 @@ void PrusaMenu::DestroySeparators()
     }
 }
 
+void MenuWithSeparators::SetFirstSeparator()
+{
+    m_separator_frst = this->AppendSeparator();
+}
 
-// ************************************** EXPERIMENTS ***************************************
+void MenuWithSeparators::SetSecondSeparator()
+{
+    m_separator_scnd = this->AppendSeparator();
+}
+
+// ----------------------------------------------------------------------------
+// PrusaBitmap
+// ----------------------------------------------------------------------------
+ScalableBitmap::ScalableBitmap( wxWindow *parent, 
+                                const std::string& icon_name/* = ""*/,
+                                const int px_cnt/* = 16*/, 
+                                const bool is_horizontal/*  = false*/):
+    m_parent(parent), m_icon_name(icon_name),
+    m_px_cnt(px_cnt), m_is_horizontal(is_horizontal)
+{
+    m_bmp = create_scaled_bitmap(parent, icon_name, px_cnt, is_horizontal);
+}
+
+
+void ScalableBitmap::msw_rescale()
+{
+    m_bmp = create_scaled_bitmap(m_parent, m_icon_name, m_px_cnt, m_is_horizontal);
+}
+
+// ----------------------------------------------------------------------------
+// PrusaButton
+// ----------------------------------------------------------------------------
+
+ScalableButton::ScalableButton( wxWindow *          parent,
+                                wxWindowID          id,
+                                const std::string&  icon_name /*= ""*/,
+                                const wxString&     label /* = wxEmptyString*/,
+                                const wxSize&       size /* = wxDefaultSize*/,
+                                const wxPoint&      pos /* = wxDefaultPosition*/,
+                                long                style /*= wxBU_EXACTFIT | wxNO_BORDER*/) :
+    m_current_icon_name(icon_name),
+    m_parent(parent)
+{
+    Create(parent, id, label, pos, size, style);
+#ifdef __WXMSW__
+    if (style & wxNO_BORDER)
+        SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif // __WXMSW__
+ 
+    SetBitmap(create_scaled_bitmap(parent, icon_name));
+}
+
+
+ScalableButton::ScalableButton( wxWindow *          parent, 
+                                wxWindowID          id,
+                                const ScalableBitmap&  bitmap,
+                                const wxString&     label /*= wxEmptyString*/, 
+                                long                style /*= wxBU_EXACTFIT | wxNO_BORDER*/) :
+    m_current_icon_name(bitmap.name()),
+    m_parent(parent)
+{
+    Create(parent, id, label, wxDefaultPosition, wxDefaultSize, style);
+#ifdef __WXMSW__
+    if (style & wxNO_BORDER)
+        SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif // __WXMSW__
+
+    SetBitmap(bitmap.bmp());
+}
+
+void ScalableButton::SetBitmap_(const ScalableBitmap& bmp)
+{
+    SetBitmap(bmp.bmp());
+    m_current_icon_name = bmp.name();
+}
+
+void ScalableButton::msw_rescale()
+{
+    const wxBitmap bmp = create_scaled_bitmap(m_parent, m_current_icon_name);
+
+    SetBitmap(bmp);
+}
 
-// *****************************************************************************
 
 
 
diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp
index a15bee256..78fb7be55 100644
--- a/src/slic3r/GUI/wxExtensions.hpp
+++ b/src/slic3r/GUI/wxExtensions.hpp
@@ -20,14 +20,33 @@ namespace Slic3r {
 	enum class ModelVolumeType : int;
 };
 
-wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description, 
-    std::function<void(wxCommandEvent& event)> cb, const wxBitmap& icon, wxEvtHandler* event_handler = nullptr);
+#ifdef __WXMSW__
+void                msw_rescale_menu(wxMenu* menu);
+#else /* __WXMSW__ */
+inline void         msw_rescale_menu(wxMenu* /* menu */) {}
+#endif /* __WXMSW__ */
+
 wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description,
-    std::function<void(wxCommandEvent& event)> cb, const std::string& icon = "", wxEvtHandler* event_handler = nullptr);
+    std::function<void(wxCommandEvent& event)> cb, const wxBitmap& icon, wxEvtHandler* event_handler = nullptr,
+    std::function<bool()> const cb_condition = []() { return true;}, wxWindow* parent = nullptr);
+wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description,
+    std::function<void(wxCommandEvent& event)> cb, const std::string& icon = "", wxEvtHandler* event_handler = nullptr,
+    std::function<bool()> const cb_condition = []() { return true; }, wxWindow* parent = nullptr);
 
-wxMenuItem* append_submenu(wxMenu* menu, wxMenu* sub_menu, int id, const wxString& string, const wxString& description, const std::string& icon = "");
+wxMenuItem* append_submenu(wxMenu* menu, wxMenu* sub_menu, int id, const wxString& string, const wxString& description, 
+    const std::string& icon = "",
+    std::function<bool()> const cb_condition = []() { return true; }, wxWindow* parent = nullptr);
 
-wxBitmap create_scaled_bitmap(const std::string& bmp_name);
+wxMenuItem* append_menu_radio_item(wxMenu* menu, int id, const wxString& string, const wxString& description, 
+    std::function<void(wxCommandEvent& event)> cb, wxEvtHandler* event_handler);
+
+class wxDialog;
+void    edit_tooltip(wxString& tooltip);
+void    msw_buttons_rescale(wxDialog* dlg, const int em_unit, const std::vector<int>& btn_ids);
+int     em_unit(wxWindow* win);
+
+wxBitmap create_scaled_bitmap(wxWindow *win, const std::string& bmp_name, 
+    const int px_cnt = 16, const bool is_horizontal = false, const bool grayscale = false);
 
 class wxCheckListBoxComboPopup : public wxCheckListBox, public wxComboPopup
 {
@@ -90,91 +109,20 @@ public:
 };
 
 
-
-// ***  PrusaCollapsiblePane  *** 
 // ----------------------------------------------------------------------------
-class PrusaCollapsiblePane : public wxCollapsiblePane
+// DataViewBitmapText: helper class used by PrusaBitmapTextRenderer
+// ----------------------------------------------------------------------------
+
+class DataViewBitmapText : public wxObject
 {
 public:
-	PrusaCollapsiblePane() {}
-	PrusaCollapsiblePane(wxWindow *parent,
-		wxWindowID winid,
-		const wxString& label,
-		const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize,
-		long style = wxCP_DEFAULT_STYLE,
-		const wxValidator& val = wxDefaultValidator,
-		const wxString& name = wxCollapsiblePaneNameStr)
-	{
-		Create(parent, winid, label, pos, size, style, val, name);
-	}
-	~PrusaCollapsiblePane() {}
-
-	void OnStateChange(const wxSize& sz); //override/hide of OnStateChange from wxCollapsiblePane
-	virtual bool Show(bool show = true) override {
-		wxCollapsiblePane::Show(show);
-		OnStateChange(GetBestSize());
-		return true;
-	}
-};
-
-
-// ***  PrusaCollapsiblePaneMSW  ***  used only #ifdef __WXMSW__
-// ----------------------------------------------------------------------------
-#ifdef __WXMSW__
-class PrusaCollapsiblePaneMSW : public PrusaCollapsiblePane//wxCollapsiblePane
-{
-	wxButton*	m_pDisclosureTriangleButton = nullptr;
-	wxBitmap	m_bmp_close;
-	wxBitmap	m_bmp_open;
-	wxString    m_strLabel;
-public:
-	PrusaCollapsiblePaneMSW() {}
-	PrusaCollapsiblePaneMSW(	wxWindow *parent,
-							wxWindowID winid,
-							const wxString& label,
-							const wxPoint& pos = wxDefaultPosition,
-							const wxSize& size = wxDefaultSize,
-							long style = wxCP_DEFAULT_STYLE,
-							const wxValidator& val = wxDefaultValidator,
-							const wxString& name = wxCollapsiblePaneNameStr)
-	{
-		Create(parent, winid, label, pos, size, style, val, name);
-	}
-
-	~PrusaCollapsiblePaneMSW() {}
-
-	bool Create(wxWindow *parent,
-				wxWindowID id,
-				const wxString& label,
-				const wxPoint& pos,
-				const wxSize& size,
-				long style,
-				const wxValidator& val,
-				const wxString& name);
-
-	void UpdateBtnBmp();
-	void SetLabel(const wxString &label) override;
-	bool Layout() override;
-	void Collapse(bool collapse) override;
-};
-#endif //__WXMSW__
-
-// *****************************************************************************
-
-// ----------------------------------------------------------------------------
-// PrusaDataViewBitmapText: helper class used by PrusaBitmapTextRenderer
-// ----------------------------------------------------------------------------
-
-class PrusaDataViewBitmapText : public wxObject
-{
-public:
-    PrusaDataViewBitmapText(const wxString &text = wxEmptyString,
-        const wxBitmap& bmp = wxNullBitmap) :
-        m_text(text), m_bmp(bmp)
+    DataViewBitmapText( const wxString &text = wxEmptyString,
+                        const wxBitmap& bmp = wxNullBitmap) :
+        m_text(text), 
+        m_bmp(bmp)
     { }
 
-    PrusaDataViewBitmapText(const PrusaDataViewBitmapText &other)
+    DataViewBitmapText(const DataViewBitmapText &other)
         : wxObject(),
         m_text(other.m_text),
         m_bmp(other.m_bmp)
@@ -182,18 +130,18 @@ public:
 
     void SetText(const wxString &text)      { m_text = text; }
     wxString GetText() const                { return m_text; }
-    void SetBitmap(const wxBitmap &bmp)      { m_bmp = bmp; }
+    void SetBitmap(const wxBitmap &bmp)     { m_bmp = bmp; }
     const wxBitmap &GetBitmap() const       { return m_bmp; }
 
-    bool IsSameAs(const PrusaDataViewBitmapText& other) const {
+    bool IsSameAs(const DataViewBitmapText& other) const {
         return m_text == other.m_text && m_bmp.IsSameAs(other.m_bmp);
     }
 
-    bool operator==(const PrusaDataViewBitmapText& other) const {
+    bool operator==(const DataViewBitmapText& other) const {
         return IsSameAs(other);
     }
 
-    bool operator!=(const PrusaDataViewBitmapText& other) const {
+    bool operator!=(const DataViewBitmapText& other) const {
         return !IsSameAs(other);
     }
 
@@ -201,13 +149,13 @@ private:
     wxString    m_text;
     wxBitmap    m_bmp;
 
-    wxDECLARE_DYNAMIC_CLASS(PrusaDataViewBitmapText);
+    wxDECLARE_DYNAMIC_CLASS(DataViewBitmapText);
 };
-DECLARE_VARIANT_OBJECT(PrusaDataViewBitmapText)
+DECLARE_VARIANT_OBJECT(DataViewBitmapText)
 
 
 // ----------------------------------------------------------------------------
-// PrusaObjectDataViewModelNode: a node inside PrusaObjectDataViewModel
+// ObjectDataViewModelNode: a node inside PrusaObjectDataViewModel
 // ----------------------------------------------------------------------------
 
 enum ItemType {
@@ -219,98 +167,87 @@ enum ItemType {
     itSettings = 16
 };
 
-class PrusaObjectDataViewModelNode;
-WX_DEFINE_ARRAY_PTR(PrusaObjectDataViewModelNode*, MyObjectTreeModelNodePtrArray);
+class ObjectDataViewModelNode;
+WX_DEFINE_ARRAY_PTR(ObjectDataViewModelNode*, MyObjectTreeModelNodePtrArray);
 
-class PrusaObjectDataViewModelNode
+class ObjectDataViewModelNode
 {
-	PrusaObjectDataViewModelNode*	m_parent;
+	ObjectDataViewModelNode*	    m_parent;
 	MyObjectTreeModelNodePtrArray   m_children;
     wxBitmap                        m_empty_bmp;
     size_t                          m_volumes_cnt = 0;
     std::vector< std::string >      m_opt_categories;
+
+    wxString				        m_name;
+    wxBitmap&                       m_bmp = m_empty_bmp;
+    ItemType				        m_type;
+    int                             m_idx = -1;
+    bool					        m_container = false;
+    wxString				        m_extruder = "default";
+    wxBitmap				        m_action_icon;
+
+    std::string                     m_action_icon_name = "";
+    Slic3r::ModelVolumeType         m_volume_type;
+
 public:
-    PrusaObjectDataViewModelNode(const wxString &name, 
-                                 const wxString& extruder) {
-		m_parent	= NULL;
-		m_name		= name;
-		m_type		= itObject;
+    ObjectDataViewModelNode(const wxString &name, 
+                            const wxString& extruder):
+        m_parent(NULL),
+        m_name(name),
+        m_type(itObject),
+        m_extruder(extruder)
+    {
 #ifdef __WXGTK__
         // it's necessary on GTK because of control have to know if this item will be container
         // in another case you couldn't to add subitem for this item
         // it will be produce "segmentation fault"
         m_container = true;
 #endif  //__WXGTK__
-        m_extruder = extruder;
-		set_object_action_icon();
+
+        set_action_icon();
 	}
 
-	PrusaObjectDataViewModelNode(	PrusaObjectDataViewModelNode* parent,
-									const wxString& sub_obj_name, 
-									const wxBitmap& bmp, 
-                                    const wxString& extruder, 
-                                    const int idx = -1 ) {
-		m_parent	= parent;
-		m_name		= sub_obj_name;
-		m_bmp		= bmp;
-		m_type		= itVolume;
-        m_idx       = idx;
-        m_extruder = extruder;
+	ObjectDataViewModelNode(ObjectDataViewModelNode* parent,
+							const wxString& sub_obj_name, 
+							const wxBitmap& bmp, 
+                            const wxString& extruder, 
+                            const int idx = -1 ) :
+        m_parent	(parent),
+		m_name		(sub_obj_name),
+		m_type		(itVolume),
+        m_idx       (idx),
+        m_extruder  (extruder)
+    {
+        m_bmp = bmp;		
 #ifdef __WXGTK__
         // it's necessary on GTK because of control have to know if this item will be container
         // in another case you couldn't to add subitem for this item
         // it will be produce "segmentation fault"
         m_container = true;
 #endif  //__WXGTK__
-		set_part_action_icon();
+
+        set_action_icon();
     }
 
-    PrusaObjectDataViewModelNode(   PrusaObjectDataViewModelNode* parent, const ItemType type) :
-                                    m_parent(parent),
-                                    m_type(type),
-                                    m_extruder(wxEmptyString)
-	{
-        if (type == itSettings) {
-            m_name = "Settings to modified";
-        }
-        else if (type == itInstanceRoot) {
-            m_name = "Instances"; 
-#ifdef __WXGTK__
-            m_container = true;
-#endif  //__WXGTK__
-        }
-        else if (type == itInstance) {
-            m_idx = parent->GetChildCount();
-            m_name = wxString::Format("Instance_%d", m_idx+1);
-            set_part_action_icon();
-        }
-	}
+    ObjectDataViewModelNode(ObjectDataViewModelNode* parent, const ItemType type);
 
-	~PrusaObjectDataViewModelNode()
+	~ObjectDataViewModelNode()
 	{
 		// free all our children nodes
 		size_t count = m_children.GetCount();
 		for (size_t i = 0; i < count; i++)
 		{
-			PrusaObjectDataViewModelNode *child = m_children[i];
+			ObjectDataViewModelNode *child = m_children[i];
 			delete child;
 		}
 	}
-	
-	wxString				m_name;
-    wxBitmap&               m_bmp = m_empty_bmp;
-    ItemType				m_type;
-    int                     m_idx = -1;
-	bool					m_container = false;
-	wxString				m_extruder = "default";
-	wxBitmap				m_action_icon;
 
 	bool IsContainer() const
 	{
 		return m_container;
 	}
 
-	PrusaObjectDataViewModelNode* GetParent()
+	ObjectDataViewModelNode* GetParent()
 	{
 		return m_parent;
 	}
@@ -318,17 +255,17 @@ public:
 	{
 		return m_children;
 	}
-	PrusaObjectDataViewModelNode* GetNthChild(unsigned int n)
+	ObjectDataViewModelNode* GetNthChild(unsigned int n)
 	{
 		return m_children.Item(n);
 	}
-	void Insert(PrusaObjectDataViewModelNode* child, unsigned int n)
+	void Insert(ObjectDataViewModelNode* child, unsigned int n)
 	{
 		if (!m_container)
 			m_container = true;
 		m_children.Insert(child, n);
 	}
-	void Append(PrusaObjectDataViewModelNode* child)
+	void Append(ObjectDataViewModelNode* child)
 	{
 		if (!m_container)
 			m_container = true;
@@ -358,7 +295,7 @@ public:
 		switch (col)
 		{
 		case 0:{
-            PrusaDataViewBitmapText data;
+            DataViewBitmapText data;
 			data << variant;
             m_bmp = data.GetBitmap();
 			m_name = data.GetText();
@@ -375,28 +312,15 @@ public:
 		return false;
 	}
 
-	void SetBitmap(const wxBitmap &icon)
-	{
-		m_bmp = icon;
-	}
-
-    ItemType GetType() const {
-        return m_type;
-    }
-
-	void SetIdx(const int& idx) {
-		m_idx = idx;
-        // update name if this node is instance
-        if (m_type == itInstance)
-            m_name = wxString::Format("Instance_%d", m_idx + 1);
-	}
-
-	int GetIdx() const {
-		return m_idx;
-	}
+	void            SetBitmap(const wxBitmap &icon) { m_bmp = icon; }
+    const wxBitmap& GetBitmap() const               { return m_bmp; }
+    const wxString& GetName() const                 { return m_name; }
+    ItemType        GetType() const                 { return m_type; }
+	void			SetIdx(const int& idx);
+	int             GetIdx() const                  { return m_idx; }
 
 	// use this function only for childrens
-	void AssignAllVal(PrusaObjectDataViewModelNode& from_node)
+	void AssignAllVal(ObjectDataViewModelNode& from_node)
 	{
 		// ! Don't overwrite other values because of equality of this values for all children --
 		m_name = from_node.m_name;
@@ -412,8 +336,8 @@ public:
 			scnd_id < 0 || scnd_id >= GetChildCount())
 			return false;
 
-		PrusaObjectDataViewModelNode new_scnd = *GetNthChild(frst_id);
-		PrusaObjectDataViewModelNode new_frst = *GetNthChild(scnd_id);
+		ObjectDataViewModelNode new_scnd = *GetNthChild(frst_id);
+		ObjectDataViewModelNode new_frst = *GetNthChild(scnd_id);
 
         new_scnd.m_idx = m_children.Item(scnd_id)->m_idx;
         new_frst.m_idx = m_children.Item(frst_id)->m_idx;
@@ -424,38 +348,45 @@ public:
 	}
 
 	// Set action icons for node
-	void set_object_action_icon();
-	void set_part_action_icon();
-    bool update_settings_digest(const std::vector<std::string>& categories);
+    void set_action_icon();
+
+    void        update_settings_digest_bitmaps();
+	bool        update_settings_digest(const std::vector<std::string>& categories);
+    int         volume_type() const { return int(m_volume_type); }
+    void        msw_rescale();
 private:
-    friend class PrusaObjectDataViewModel;
+    friend class ObjectDataViewModel;
 };
 
 // ----------------------------------------------------------------------------
-// PrusaObjectDataViewModel
+// ObjectDataViewModel
 // ----------------------------------------------------------------------------
 
 // custom message the model sends to associated control to notify a last volume deleted from the object:
 wxDECLARE_EVENT(wxCUSTOMEVT_LAST_VOLUME_IS_DELETED, wxCommandEvent);
 
-class PrusaObjectDataViewModel :public wxDataViewModel
+class ObjectDataViewModel :public wxDataViewModel
 {
-	std::vector<PrusaObjectDataViewModelNode*>  m_objects;
+	std::vector<ObjectDataViewModelNode*>       m_objects;
     std::vector<wxBitmap*>                      m_volume_bmps;
+    wxBitmap*                                   m_warning_bmp;
 
     wxDataViewCtrl*                             m_ctrl{ nullptr };
 
 public:
-    PrusaObjectDataViewModel();
-    ~PrusaObjectDataViewModel();
+    ObjectDataViewModel();
+    ~ObjectDataViewModel();
 
-	wxDataViewItem Add(const wxString &name, const int extruder);
-	wxDataViewItem AddVolumeChild(const wxDataViewItem &parent_item, 
-							const wxString &name, 
-                            const Slic3r::ModelVolumeType volume_type,
-                            const int extruder = 0,
-                            const bool create_frst_child = true);
-	wxDataViewItem AddSettingsChild(const wxDataViewItem &parent_item);
+	wxDataViewItem Add( const wxString &name, 
+                        const int extruder,
+                        const bool has_errors = false);
+    wxDataViewItem AddVolumeChild(  const wxDataViewItem &parent_item,
+                                    const wxString &name,
+                                    const Slic3r::ModelVolumeType volume_type,
+                                    const bool has_errors = false,
+                                    const int extruder = 0,
+                                    const bool create_frst_child = true);
+    wxDataViewItem AddSettingsChild(const wxDataViewItem &parent_item);
     wxDataViewItem AddInstanceChild(const wxDataViewItem &parent_item, size_t num);
 	wxDataViewItem Delete(const wxDataViewItem &item);
 	wxDataViewItem DeleteLastInstance(const wxDataViewItem &parent_item, size_t num);
@@ -466,76 +397,87 @@ public:
 	wxDataViewItem GetItemById(int obj_idx);
 	wxDataViewItem GetItemByVolumeId(int obj_idx, int volume_idx);
 	wxDataViewItem GetItemByInstanceId(int obj_idx, int inst_idx);
-	int GetIdByItem(const wxDataViewItem& item) const;
-    int GetIdByItemAndType(const wxDataViewItem& item, const ItemType type) const;
-    int GetObjectIdByItem(const wxDataViewItem& item) const;
-    int GetVolumeIdByItem(const wxDataViewItem& item) const;
-    int GetInstanceIdByItem(const wxDataViewItem& item) const;
+	int  GetIdByItem(const wxDataViewItem& item) const;
+    int  GetIdByItemAndType(const wxDataViewItem& item, const ItemType type) const;
+    int  GetObjectIdByItem(const wxDataViewItem& item) const;
+    int  GetVolumeIdByItem(const wxDataViewItem& item) const;
+    int  GetInstanceIdByItem(const wxDataViewItem& item) const;
     void GetItemInfo(const wxDataViewItem& item, ItemType& type, int& obj_idx, int& idx);
-    int GetRowByItem(const wxDataViewItem& item) const;
+    int  GetRowByItem(const wxDataViewItem& item) const;
     bool IsEmpty() { return m_objects.empty(); }
 
 	// helper method for wxLog
 
-	wxString GetName(const wxDataViewItem &item) const;
-    wxBitmap& GetBitmap(const wxDataViewItem &item) const;
+	wxString    GetName(const wxDataViewItem &item) const;
+    wxBitmap&   GetBitmap(const wxDataViewItem &item) const;
 
 	// helper methods to change the model
 
-	virtual unsigned int GetColumnCount() const override { return 3;}
-	virtual wxString GetColumnType(unsigned int col) const override{ return wxT("string"); }
+	virtual unsigned int    GetColumnCount() const override { return 3;}
+	virtual wxString        GetColumnType(unsigned int col) const override{ return wxT("string"); }
 
-	virtual void GetValue(wxVariant &variant,
-		const wxDataViewItem &item, unsigned int col) const override;
-	virtual bool SetValue(const wxVariant &variant,
-		const wxDataViewItem &item, unsigned int col) override;
-	bool SetValue(const wxVariant &variant, const int item_idx, unsigned int col);
+	virtual void GetValue(  wxVariant &variant,
+		                    const wxDataViewItem &item, 
+                            unsigned int col) const override;
+	virtual bool SetValue(  const wxVariant &variant,
+		                    const wxDataViewItem &item, 
+                            unsigned int col) override;
+	bool SetValue(  const wxVariant &variant, 
+                    const int item_idx, 
+                    unsigned int col);
 
-// 	wxDataViewItem MoveChildUp(const wxDataViewItem &item);
-// 	wxDataViewItem MoveChildDown(const wxDataViewItem &item);
     // For parent move child from cur_volume_id place to new_volume_id 
     // Remaining items will moved up/down accordingly
-    wxDataViewItem ReorganizeChildren(int cur_volume_id, 
-                                      int new_volume_id,
-                                      const wxDataViewItem &parent);
+    wxDataViewItem  ReorganizeChildren( const int cur_volume_id, 
+                                        const int new_volume_id,
+                                        const wxDataViewItem &parent);
 
-	virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const override;
+	virtual bool    IsEnabled(const wxDataViewItem &item, unsigned int col) const override;
 
-	virtual wxDataViewItem GetParent(const wxDataViewItem &item) const override;
+	virtual wxDataViewItem  GetParent(const wxDataViewItem &item) const override;
     // get object item
-    wxDataViewItem GetTopParent(const wxDataViewItem &item) const;
-	virtual bool IsContainer(const wxDataViewItem &item) const override;
-	virtual unsigned int GetChildren(const wxDataViewItem &parent,
-		wxDataViewItemArray &array) const override;
-
+    wxDataViewItem          GetTopParent(const wxDataViewItem &item) const;
+	virtual bool            IsContainer(const wxDataViewItem &item) const override;
+	virtual unsigned int    GetChildren(const wxDataViewItem &parent,
+		                                wxDataViewItemArray &array) const override;
+    void GetAllChildren(const wxDataViewItem &parent,wxDataViewItemArray &array) const;
 	// Is the container just a header or an item with all columns
 	// In our case it is an item with all columns 
-	virtual bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const override {	return true; }
+	virtual bool    HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const override {	return true; }
 
-    ItemType GetItemType(const wxDataViewItem &item) const ;
-    wxDataViewItem    GetItemByType(const wxDataViewItem &parent_item, ItemType type) const;
-    wxDataViewItem    GetSettingsItem(const wxDataViewItem &item) const;
-    wxDataViewItem    GetInstanceRootItem(const wxDataViewItem &item) const;
+    ItemType        GetItemType(const wxDataViewItem &item) const ;
+    wxDataViewItem  GetItemByType(  const wxDataViewItem &parent_item, 
+                                    ItemType type) const;
+    wxDataViewItem  GetSettingsItem(const wxDataViewItem &item) const;
+    wxDataViewItem  GetInstanceRootItem(const wxDataViewItem &item) const;
     bool    IsSettingsItem(const wxDataViewItem &item) const;
-    void    UpdateSettingsDigest(const wxDataViewItem &item, const std::vector<std::string>& categories);
+    void    UpdateSettingsDigest(   const wxDataViewItem &item, 
+                                    const std::vector<std::string>& categories);
 
     void    SetVolumeBitmaps(const std::vector<wxBitmap*>& volume_bmps) { m_volume_bmps = volume_bmps; }
+    void    SetWarningBitmap(wxBitmap* bitmap)                          { m_warning_bmp = bitmap; }
     void    SetVolumeType(const wxDataViewItem &item, const Slic3r::ModelVolumeType type);
 
     void    SetAssociatedControl(wxDataViewCtrl* ctrl) { m_ctrl = ctrl; }
+    // Rescale bitmaps for existing Items
+    void    Rescale();
+
+    wxBitmap    GetVolumeIcon(const Slic3r::ModelVolumeType vol_type, 
+                              const bool is_marked = false);
+    void        DeleteWarningIcon(const wxDataViewItem& item, const bool unmark_object = false);
 };
 
 // ----------------------------------------------------------------------------
-// PrusaBitmapTextRenderer
+// BitmapTextRenderer
 // ----------------------------------------------------------------------------
 #if ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
-class PrusaBitmapTextRenderer : public wxDataViewRenderer
+class BitmapTextRenderer : public wxDataViewRenderer
 #else
-class PrusaBitmapTextRenderer : public wxDataViewCustomRenderer
+class BitmapTextRenderer : public wxDataViewCustomRenderer
 #endif //ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
 {
 public:
-    PrusaBitmapTextRenderer(wxDataViewCellMode mode =
+    BitmapTextRenderer(wxDataViewCellMode mode =
 #ifdef __WXOSX__
                                                         wxDATAVIEW_CELL_INERT
 #else
@@ -546,7 +488,7 @@ public:
 #if ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
                             );
 #else
-                            ) : wxDataViewCustomRenderer(wxT("PrusaDataViewBitmapText"), mode, align) {}
+                            ) : wxDataViewCustomRenderer(wxT("DataViewBitmapText"), mode, align) {}
 #endif //ENABLE_NONCUSTOM_DATA_VIEW_RENDERING
 
     bool SetValue(const wxVariant &value);
@@ -574,7 +516,7 @@ public:
     bool        WasCanceled() const { return m_was_unusable_symbol; }
 
 private:
-    PrusaDataViewBitmapText m_value;
+    DataViewBitmapText m_value;
     bool                    m_was_unusable_symbol {false};
 };
 
@@ -672,7 +614,37 @@ private:
 
 
 // ----------------------------------------------------------------------------
-// PrusaDoubleSlider
+// ScalableBitmap
+// ----------------------------------------------------------------------------
+
+class ScalableBitmap
+{
+public:
+    ScalableBitmap() {};
+    ScalableBitmap( wxWindow *parent, 
+                    const std::string& icon_name = "",
+                    const int px_cnt = 16,
+                    const bool is_horizontal = false);
+
+    ~ScalableBitmap() {}
+
+    void                msw_rescale();
+
+    const wxBitmap&     bmp() const { return m_bmp; }
+    wxBitmap&           bmp()       { return m_bmp; }
+    const std::string&  name() const{ return m_icon_name; }
+
+private:
+    wxWindow*       m_parent{ nullptr };
+    wxBitmap        m_bmp = wxBitmap();
+    std::string     m_icon_name = "";
+    int             m_px_cnt {16};
+    bool            m_is_horizontal {false};
+};
+
+
+// ----------------------------------------------------------------------------
+// DoubleSlider
 // ----------------------------------------------------------------------------
 
 // custom message the slider sends to its parent to notify a tick-change:
@@ -689,10 +661,10 @@ enum TicksAction{
     taDel
 };
 
-class PrusaDoubleSlider : public wxControl
+class DoubleSlider : public wxControl
 {
 public:
-    PrusaDoubleSlider(
+    DoubleSlider(
         wxWindow *parent,
         wxWindowID id,
         int lowerValue, 
@@ -704,7 +676,9 @@ public:
         long style = wxSL_VERTICAL,
         const wxValidator& val = wxDefaultValidator,
         const wxString& name = wxEmptyString);
-    ~PrusaDoubleSlider() {}
+    ~DoubleSlider() {}
+
+    void    msw_rescale();
 
     int GetMinValue() const { return m_min_value; }
     int GetMaxValue() const { return m_max_value; }
@@ -713,6 +687,7 @@ public:
     int GetLowerValue() const { return m_lower_value; }
     int GetHigherValue() const { return m_higher_value; }
     int GetActiveValue() const;
+    wxSize get_min_size() const ;
     double GetLowerValueD()  { return get_double_value(ssLower); }
     double GetHigherValueD() { return get_double_value(ssHigher); }
     wxSize DoGetBestSize() const override;
@@ -797,16 +772,16 @@ private:
     int         m_max_value;
     int         m_lower_value;
     int         m_higher_value;
-    wxBitmap    m_bmp_thumb_higher;
-    wxBitmap    m_bmp_thumb_lower;
-    wxBitmap    m_bmp_add_tick_on;
-    wxBitmap    m_bmp_add_tick_off;
-    wxBitmap    m_bmp_del_tick_on;
-    wxBitmap    m_bmp_del_tick_off;
-    wxBitmap    m_bmp_one_layer_lock_on;
-    wxBitmap    m_bmp_one_layer_lock_off;
-    wxBitmap    m_bmp_one_layer_unlock_on;
-    wxBitmap    m_bmp_one_layer_unlock_off;
+    ScalableBitmap    m_bmp_thumb_higher;
+    ScalableBitmap    m_bmp_thumb_lower;
+    ScalableBitmap    m_bmp_add_tick_on;
+    ScalableBitmap    m_bmp_add_tick_off;
+    ScalableBitmap    m_bmp_del_tick_on;
+    ScalableBitmap    m_bmp_del_tick_off;
+    ScalableBitmap    m_bmp_one_layer_lock_on;
+    ScalableBitmap    m_bmp_one_layer_lock_off;
+    ScalableBitmap    m_bmp_one_layer_unlock_on;
+    ScalableBitmap    m_bmp_one_layer_unlock_off;
     SelectedSlider  m_selection;
     bool        m_is_left_down = false;
     bool        m_is_right_down = false;
@@ -837,26 +812,26 @@ private:
     wxPen   GREY_PEN;
     wxPen   LIGHT_GREY_PEN;
 
-    std::vector<wxPen*> line_pens;
-    std::vector<wxPen*> segm_pens;
+    std::vector<wxPen*> m_line_pens;
+    std::vector<wxPen*> m_segm_pens;
     std::set<int>       m_ticks;
     std::vector<std::pair<int,double>> m_values;
 };
 
 
 // ----------------------------------------------------------------------------
-// PrusaLockButton
+// LockButton
 // ----------------------------------------------------------------------------
 
-class PrusaLockButton : public wxButton
+class LockButton : public wxButton
 {
 public:
-    PrusaLockButton(
+    LockButton(
         wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize);
-    ~PrusaLockButton() {}
+    ~LockButton() {}
 
     void    OnButton(wxCommandEvent& event);
     void    OnEnterBtn(wxMouseEvent& event) { enter_button(true); event.Skip(); }
@@ -865,34 +840,72 @@ public:
     bool    IsLocked() const { return m_is_pushed; }
     void    SetLock(bool lock);
 
+    void    msw_rescale();
+
 protected:
     void    enter_button(const bool enter);
 
 private:
     bool        m_is_pushed = false;
 
-    wxBitmap    m_bmp_lock_on;
-    wxBitmap    m_bmp_lock_off;
-    wxBitmap    m_bmp_unlock_on;
-    wxBitmap    m_bmp_unlock_off;
+    ScalableBitmap    m_bmp_lock_on;
+    ScalableBitmap    m_bmp_lock_off;
+    ScalableBitmap    m_bmp_unlock_on;
+    ScalableBitmap    m_bmp_unlock_off;
 };
 
 
 // ----------------------------------------------------------------------------
-// PrusaModeButton
+// ScalableButton
 // ----------------------------------------------------------------------------
 
-class PrusaModeButton : public wxButton
+class ScalableButton : public wxButton
 {
 public:
-    PrusaModeButton(
-        wxWindow *parent,
-        wxWindowID id,
-        const wxString& mode = wxEmptyString,
-        const wxBitmap& bmp_on = wxNullBitmap,
-        const wxSize& size = wxDefaultSize,
-        const wxPoint& pos = wxDefaultPosition);
-    ~PrusaModeButton() {}
+    ScalableButton(){}
+    ScalableButton(
+        wxWindow *          parent,
+        wxWindowID          id,
+        const std::string&  icon_name = "",
+        const wxString&     label = wxEmptyString,
+        const wxSize&       size = wxDefaultSize,
+        const wxPoint&      pos = wxDefaultPosition,
+        long                style = wxBU_EXACTFIT | wxNO_BORDER);
+
+    ScalableButton(
+        wxWindow *          parent,
+        wxWindowID          id,
+        const ScalableBitmap&  bitmap,
+        const wxString&     label = wxEmptyString,
+        long                style = wxBU_EXACTFIT | wxNO_BORDER);
+
+    ~ScalableButton() {}
+
+    void SetBitmap_(const ScalableBitmap& bmp);
+
+    void    msw_rescale();
+
+private:
+    wxWindow*       m_parent;
+    std::string     m_current_icon_name = "";
+};
+
+
+// ----------------------------------------------------------------------------
+// ModeButton
+// ----------------------------------------------------------------------------
+
+class ModeButton : public ScalableButton
+{
+public:
+    ModeButton(
+        wxWindow*           parent,
+        wxWindowID          id,
+        const std::string&  icon_name = "",
+        const wxString&     mode = wxEmptyString,
+        const wxSize&       size = wxDefaultSize,
+        const wxPoint&      pos = wxDefaultPosition);
+    ~ModeButton() {}
 
     void    OnButton(wxCommandEvent& event);
     void    OnEnterBtn(wxMouseEvent& event) { focus_button(true); event.Skip(); }
@@ -906,8 +919,6 @@ protected:
 private:
     bool        m_is_selected = false;
 
-    wxBitmap    m_bmp_on;
-    wxBitmap    m_bmp_off;
     wxString    m_tt_selected;
     wxString    m_tt_focused;
 };
@@ -915,47 +926,49 @@ private:
 
 
 // ----------------------------------------------------------------------------
-// PrusaModeSizer
+// ModeSizer
 // ----------------------------------------------------------------------------
 
-class PrusaModeSizer : public wxFlexGridSizer
+class ModeSizer : public wxFlexGridSizer
 {
 public:
-    PrusaModeSizer( wxWindow *parent, int hgap = 10);
-    ~PrusaModeSizer() {}
+    ModeSizer( wxWindow *parent, int hgap = 10);
+    ~ModeSizer() {}
 
     void SetMode(const /*ConfigOptionMode*/int mode);
 
+    void msw_rescale();
+
 private:
-    std::vector<PrusaModeButton*> mode_btns;
+    std::vector<ModeButton*> m_mode_btns;
 };
 
 
 
 // ----------------------------------------------------------------------------
-// PrusaMenu
+// MenuWithSeparators
 // ----------------------------------------------------------------------------
 
-class PrusaMenu : public wxMenu
+class MenuWithSeparators : public wxMenu
 {
 public:
-    PrusaMenu(const wxString& title, long style = 0)
+    MenuWithSeparators(const wxString& title, long style = 0)
         : wxMenu(title, style) {}
 
-    PrusaMenu(long style = 0)
+    MenuWithSeparators(long style = 0)
         : wxMenu(style) {}
 
-    ~PrusaMenu() {}
+    ~MenuWithSeparators() {}
 
     void DestroySeparators();
+    void SetFirstSeparator();
+    void SetSecondSeparator();
 
+private:
     wxMenuItem* m_separator_frst { nullptr };    // use like separator before settings item
     wxMenuItem* m_separator_scnd { nullptr };   // use like separator between settings items
 };
 
 
-// ******************************* EXPERIMENTS **********************************************
-// ******************************************************************************************
-
 
 #endif // slic3r_GUI_wxExtensions_hpp_
diff --git a/src/slic3r/Utils/HexFile.cpp b/src/slic3r/Utils/HexFile.cpp
index 9e0803325..26596f629 100644
--- a/src/slic3r/Utils/HexFile.cpp
+++ b/src/slic3r/Utils/HexFile.cpp
@@ -18,6 +18,7 @@ static HexFile::DeviceKind parse_device_kind(const std::string &str)
 	     if (str == "mk2") { return HexFile::DEV_MK2; }
 	else if (str == "mk3") { return HexFile::DEV_MK3; }
 	else if (str == "mm-control") { return HexFile::DEV_MM_CONTROL; }
+	else if (str == "cw1") { return HexFile::DEV_CW1; }
 	else { return HexFile::DEV_GENERIC; }
 }
 
diff --git a/src/slic3r/Utils/HexFile.hpp b/src/slic3r/Utils/HexFile.hpp
index 1201d23a4..742ae00e6 100644
--- a/src/slic3r/Utils/HexFile.hpp
+++ b/src/slic3r/Utils/HexFile.hpp
@@ -16,6 +16,7 @@ struct HexFile
 		DEV_MK2,
 		DEV_MK3,
 		DEV_MM_CONTROL,
+		DEV_CW1,
 	};
 
 	boost::filesystem::path path;
diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
index 02bbc087e..79c4ecfa9 100644
--- a/src/slic3r/Utils/Http.cpp
+++ b/src/slic3r/Utils/Http.cpp
@@ -88,7 +88,7 @@ Http::priv::priv(const std::string &url)
 
 	set_timeout_connect(DEFAULT_TIMEOUT_CONNECT);
 	::curl_easy_setopt(curl, CURLOPT_URL, url.c_str());   // curl makes a copy internally
-	::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_FORK_NAME "/" SLIC3R_VERSION);
+	::curl_easy_setopt(curl, CURLOPT_USERAGENT, SLIC3R_APP_NAME "/" SLIC3R_VERSION);
 	::curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer.front());
 }
 
@@ -228,6 +228,7 @@ std::string Http::priv::body_size_error()
 void Http::priv::http_perform()
 {
 	::curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+	::curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
 	::curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writecb);
 	::curl_easy_setopt(curl, CURLOPT_WRITEDATA, static_cast<void*>(this));
 	::curl_easy_setopt(curl, CURLOPT_READFUNCTION, form_file_read_cb);
diff --git a/src/slic3r/Utils/MacDarkMode.hpp b/src/slic3r/Utils/MacDarkMode.hpp
new file mode 100644
index 000000000..cfdc02888
--- /dev/null
+++ b/src/slic3r/Utils/MacDarkMode.hpp
@@ -0,0 +1,15 @@
+#ifndef slic3r_MacDarkMode_hpp_
+#define slic3r_MacDarkMode_hpp_
+
+namespace Slic3r {
+namespace GUI {
+
+#if __APPLE__
+extern bool mac_dark_mode();
+#endif
+
+
+} // namespace GUI
+} // namespace Slic3r
+
+#endif // MacDarkMode_h
diff --git a/src/slic3r/Utils/MacDarkMode.mm b/src/slic3r/Utils/MacDarkMode.mm
new file mode 100644
index 000000000..4177ee371
--- /dev/null
+++ b/src/slic3r/Utils/MacDarkMode.mm
@@ -0,0 +1,22 @@
+#import "MacDarkMode.hpp"
+
+#import <Foundation/Foundation.h>
+
+
+@implementation MacDarkMode
+
+namespace Slic3r {
+namespace GUI {
+
+bool mac_dark_mode()
+{
+    NSString *style = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+    return style && [style isEqualToString:@"Dark"];
+
+}
+
+
+}
+}
+
+@end
diff --git a/src/slic3r/Utils/OctoPrint.cpp b/src/slic3r/Utils/OctoPrint.cpp
index 7cea198bf..cafa69c55 100644
--- a/src/slic3r/Utils/OctoPrint.cpp
+++ b/src/slic3r/Utils/OctoPrint.cpp
@@ -192,7 +192,7 @@ const char* SL1Host::get_name() const { return "SL1Host"; }
 
 wxString SL1Host::get_test_ok_msg () const
 {
-    return _(L("Connection to Prusa SLA works correctly."));
+    return _(L("Connection to Prusa SL1 works correctly."));
 }
 
 wxString SL1Host::get_test_failed_msg (wxString &msg) const
diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp
index 6924f86de..dbed76492 100644
--- a/src/slic3r/Utils/PresetUpdater.cpp
+++ b/src/slic3r/Utils/PresetUpdater.cpp
@@ -50,15 +50,17 @@ struct Update
 	fs::path source;
 	fs::path target;
 	Version version;
+	std::string vendor;
+	std::string changelog_url;
 
-	Update(fs::path &&source, fs::path &&target, const Version &version) :
-		source(std::move(source)),
-		target(std::move(target)),
-		version(version)
+	Update(fs::path &&source, fs::path &&target, const Version &version, std::string vendor, std::string changelog_url)
+		: source(std::move(source))
+		, target(std::move(target))
+		, version(version)
+		, vendor(std::move(vendor))
+		, changelog_url(std::move(changelog_url))
 	{}
 
-	std::string name() const { return source.stem().string(); }
-
 	friend std::ostream& operator<<(std::ostream& os , const Update &self) {
 		os << "Update(" << self.source.string() << " -> " << self.target.string() << ')';
 		return os;
@@ -69,14 +71,14 @@ struct Incompat
 {
 	fs::path bundle;
 	Version version;
+	std::string vendor;
 
-	Incompat(fs::path &&bundle, const Version &version) :
-		bundle(std::move(bundle)),
-		version(version)
+	Incompat(fs::path &&bundle, const Version &version, std::string vendor)
+		: bundle(std::move(bundle))
+		, version(version)
+		, vendor(std::move(vendor))
 	{}
 
-	std::string name() const { return bundle.stem().string(); }
-
 	friend std::ostream& operator<<(std::ostream& os , const Incompat &self) {
 		os << "Incompat(" << self.bundle.string() << ')';
 		return os;
@@ -208,7 +210,7 @@ void PresetUpdater::priv::sync_version() const
 {
 	if (! enabled_version_check) { return; }
 
-	BOOST_LOG_TRIVIAL(info) << boost::format("Downloading Slic3rPE online version from: `%1%`") % version_check_url;
+	BOOST_LOG_TRIVIAL(info) << boost::format("Downloading %1% online version from: `%2%`") % SLIC3R_APP_NAME % version_check_url;
 
 	Http::get(version_check_url)
 		.size_limit(SLIC3R_VERSION_BODY_MAX)
@@ -224,7 +226,7 @@ void PresetUpdater::priv::sync_version() const
 		})
 		.on_complete([&](std::string body, unsigned /* http_status */) {
 			boost::trim(body);
-			BOOST_LOG_TRIVIAL(info) << boost::format("Got Slic3rPE online version: `%1%`. Sending to GUI thread...") % body;
+			BOOST_LOG_TRIVIAL(info) << boost::format("Got %1% online version: `%2%`. Sending to GUI thread...") % SLIC3R_APP_NAME % body;
 
 			wxCommandEvent* evt = new wxCommandEvent(EVT_SLIC3R_VERSION_ONLINE);
 			evt->SetString(GUI::from_u8(body));
@@ -351,7 +353,7 @@ Updates PresetUpdater::priv::get_config_updates() const
 		}
 
 		// Perform a basic load and check the version
-		const auto vp = VendorProfile::from_ini(bundle_path, false);
+		auto vp = VendorProfile::from_ini(bundle_path, false);
 
 		// Getting a recommended version from the latest index, wich may have been downloaded
 		// from the internet, or installed / updated from the installation resources.
@@ -376,7 +378,7 @@ Updates PresetUpdater::priv::get_config_updates() const
 
 		if (ver_current_found && !ver_current->is_current_slic3r_supported()) {
 			BOOST_LOG_TRIVIAL(warning) << "Current Slic3r incompatible with installed bundle: " << bundle_path.string();
-			updates.incompats.emplace_back(std::move(bundle_path), *ver_current);
+			updates.incompats.emplace_back(std::move(bundle_path), *ver_current, vp.name);
 		} else if (recommended->config_version > vp.config_version) {
 			// Config bundle update situation
 
@@ -406,12 +408,12 @@ Updates PresetUpdater::priv::get_config_updates() const
 			auto new_vp = VendorProfile::from_ini(path_src, false);
 			bool found = false;
 			if (new_vp.config_version == recommended->config_version) {
-				updates.updates.emplace_back(std::move(path_src), std::move(bundle_path), *recommended);
+				updates.updates.emplace_back(std::move(path_src), std::move(bundle_path), *recommended, vp.name, vp.changelog_url);
 				found = true;
 			} else if (! path_in_rsrc.empty() && fs::exists(path_in_rsrc)) {
 				new_vp = VendorProfile::from_ini(path_in_rsrc, false);
 				if (new_vp.config_version == recommended->config_version) {
-					updates.updates.emplace_back(std::move(path_in_rsrc), std::move(bundle_path), *recommended);
+					updates.updates.emplace_back(std::move(path_in_rsrc), std::move(bundle_path), *recommended, vp.name, vp.changelog_url);
 					found = true;
 				}
 			}
@@ -560,6 +562,7 @@ void PresetUpdater::slic3r_update_notify()
 				p->enabled_version_check = false;
 			}
 		}
+
 		app_config->set("version_online_seen", ver_online_str);
 	}
 }
@@ -574,8 +577,6 @@ bool PresetUpdater::config_update() const
 
 		std::unordered_map<std::string, wxString> incompats_map;
 		for (const auto &incompat : updates.incompats) {
-			auto vendor = incompat.name();
-
 			const auto min_slic3r = incompat.version.min_slic3r_version;
 			const auto max_slic3r = incompat.version.max_slic3r_version;
 			wxString restrictions;
@@ -590,7 +591,7 @@ bool PresetUpdater::config_update() const
 				restrictions = wxString::Format(_(L("requires max. %s")), max_slic3r.to_string());
 			}
 
-			incompats_map.emplace(std::make_pair(std::move(vendor), std::move(restrictions)));
+			incompats_map.emplace(std::make_pair(incompat.vendor, std::move(restrictions)));
 		}
 
 		p->had_config_update = true;   // This needs to be done before a dialog is shown because of OnIdle() + CallAfter() in Perl
@@ -613,19 +614,15 @@ bool PresetUpdater::config_update() const
 	else if (updates.updates.size() > 0) {
 		BOOST_LOG_TRIVIAL(info) << boost::format("Update of %1% bundles available. Asking for confirmation ...") % updates.updates.size();
 
-		std::unordered_map<std::string, std::string> updates_map;
+		std::vector<GUI::MsgUpdateConfig::Update> updates_msg;
 		for (const auto &update : updates.updates) {
-			auto vendor = update.name();
-			auto ver_str = update.version.config_version.to_string();
-			if (! update.version.comment.empty()) {
-				ver_str += std::string(" (") + update.version.comment + ")";
-			}
-			updates_map.emplace(std::make_pair(std::move(vendor), std::move(ver_str)));
+			std::string changelog_url = update.version.config_version.prerelease() == nullptr ? update.changelog_url : std::string();
+			updates_msg.emplace_back(update.vendor, update.version.config_version, update.version.comment, std::move(changelog_url));
 		}
 
 		p->had_config_update = true;   // Ditto, see above
 
-		GUI::MsgUpdateConfig dlg(std::move(updates_map));
+		GUI::MsgUpdateConfig dlg(updates_msg);
 
 		const auto res = dlg.ShowModal();
 		if (res == wxID_OK) {
@@ -655,7 +652,7 @@ void PresetUpdater::install_bundles_rsrc(std::vector<std::string> bundles, bool
 	for (const auto &bundle : bundles) {
 		auto path_in_rsrc = p->rsrc_path / bundle;
 		auto path_in_vendors = p->vendor_path / bundle;
-		updates.updates.emplace_back(std::move(path_in_rsrc), std::move(path_in_vendors), Version());
+		updates.updates.emplace_back(std::move(path_in_rsrc), std::move(path_in_vendors), Version(), "", "");
 	}
 
 	p->perform_updates(std::move(updates), snapshot);
diff --git a/t/flow.t b/t/flow.t
index e2de6542a..a8c954641 100644
--- a/t/flow.t
+++ b/t/flow.t
@@ -22,6 +22,8 @@ use Slic3r::Test;
     $config->set('bottom_solid_layers', 1);
     $config->set('first_layer_extrusion_width', 2);
     $config->set('first_layer_height', '100%');
+    $config->set('filament_diameter', [ 3.0 ]);
+    $config->set('nozzle_diameter', [ 0.5 ]);
     
     my $print = Slic3r::Test::init_print('20mm_cube', config => $config);
     my @E_per_mm = ();
diff --git a/t/shells.t b/t/shells.t
index eac95aa32..dc38ff4aa 100644
--- a/t/shells.t
+++ b/t/shells.t
@@ -148,7 +148,9 @@ use Slic3r::Test;
     $config->set('solid_infill_speed', 99);
     $config->set('top_solid_infill_speed', 99);
     $config->set('bridge_speed', 99);
-    
+    $config->set('filament_diameter', [ 3.0 ]);
+    $config->set('nozzle_diameter', [ 0.5 ]);
+
     my $print = Slic3r::Test::init_print('sloping_hole', config => $config);
     my %solid_layers = ();  # Z => 1
     Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
diff --git a/version.inc b/version.inc
index 833c11d5c..85ae95247 100644
--- a/version.inc
+++ b/version.inc
@@ -1,9 +1,9 @@
 # Included by CMakeLists, edited by the build script
 # (the version numbers are generated by the build script from the git current label)
 
-set(SLIC3R_FORK_NAME "Slic3r++")
-set(SLIC3R_VERSION "1.42.0-beta1.0")
-set(SLIC3R_BUILD "${SLIC3R_VERSION}+UNKNOWN")
-set(SLIC3R_BUILD_ID "${SLIC3R_BUILD_ID}")
-set(SLIC3R_RC_VERSION "1,42,0,0")
-set(SLIC3R_RC_VERSION_DOTS "1.42.0.0")
+set(SLIC3R_APP_NAME "Slic3r++")
+set(SLIC3R_APP_KEY "Slic3r++")
+set(SLIC3R_VERSION "2.0.0-rc_1.0")
+set(SLIC3R_BUILD_ID "slic3r++_${SLIC3R_VERSION}+UNKNOWN")
+set(SLIC3R_RC_VERSION "2,0,0,0")
+set(SLIC3R_RC_VERSION_DOTS "2.0.0.0")
diff --git a/xs/xsp/Config.xsp b/xs/xsp/Config.xsp
index f9482bd3b..4d48a2c6f 100644
--- a/xs/xsp/Config.xsp
+++ b/xs/xsp/Config.xsp
@@ -223,8 +223,8 @@ print_config_def()
                 (void)hv_stores( hv, "labels", newRV_noinc((SV*)av) );
             }
             
-            if (optdef->default_value != NULL)
-                (void)hv_stores( hv, "default", ConfigOption_to_SV(*optdef->default_value, *optdef) );
+            if (optdef->default_value)
+                (void)hv_stores( hv, "default", ConfigOption_to_SV(*optdef->default_value.get(), *optdef) );
             (void)hv_store( options_hv, opt_key.c_str(), opt_key.length(), newRV_noinc((SV*)hv), 0 );
         }
         
diff --git a/xs/xsp/TriangleMesh.xsp b/xs/xsp/TriangleMesh.xsp
index edfb4a198..e519f9210 100644
--- a/xs/xsp/TriangleMesh.xsp
+++ b/xs/xsp/TriangleMesh.xsp
@@ -180,6 +180,8 @@ SV*
 TriangleMesh::slice(z)
     std::vector<double> z
     CODE:
+        THIS->require_shared_vertices(); // TriangleMeshSlicer needs this
+
         // convert doubles to floats
         std::vector<float> z_f = cast<float>(z);
         
@@ -210,6 +212,7 @@ TriangleMesh::cut(z, upper, lower)
     TriangleMesh*   upper;
     TriangleMesh*   lower;
     CODE:
+        THIS->require_shared_vertices(); // TriangleMeshSlicer needs this
         TriangleMeshSlicer mslicer(THIS);
         mslicer.cut(z, upper, lower);
 
diff --git a/xs/xsp/XS.xsp b/xs/xsp/XS.xsp
index 04969a7f9..083d21d38 100644
--- a/xs/xsp/XS.xsp
+++ b/xs/xsp/XS.xsp
@@ -20,7 +20,7 @@ VERSION()
 SV*
 BUILD()
     CODE:
-        RETVAL = newSVpv(SLIC3R_BUILD, 0);
+        RETVAL = newSVpv(SLIC3R_BUILD_ID, 0);
     OUTPUT: RETVAL
 
 SV*
@@ -32,7 +32,7 @@ DEBUG_OUT_PATH_PREFIX()
 SV*
 FORK_NAME()
     CODE:
-        RETVAL = newSVpv(SLIC3R_FORK_NAME, 0);
+        RETVAL = newSVpv(SLIC3R_APP_NAME, 0);
     OUTPUT: RETVAL
 
 void